Import Geant4 10.1.0 source tree

source/intercoms/include/G4GenericMessenger.hh

@@ -28,7 +28,7 @@
 //
 
 #ifndef G4GenericMessenger_h
-#define G4GenericMmessenger_h 1
+#define G4GenericMessenger_h 1
 
 #include "G4UImessenger.hh"
 #include "G4UIcommand.hh"
@@ -67,13 +67,16 @@ public:
     Command& SetStates(G4ApplicationState s0, G4ApplicationState s1, G4ApplicationState s2, G4ApplicationState s3) {command->AvailableForStates(s0,s1,s2,s3); return *this;}
     Command& SetStates(G4ApplicationState s0, G4ApplicationState s1, G4ApplicationState s2, G4ApplicationState s3, G4ApplicationState s4) {command->AvailableForStates(s0,s1,s2,s3,s4); return *this;}
     Command& SetRange(const G4String& range) {command->SetRange(range.c_str()); return *this;}
-    Command& SetGuidance(const G4String& s) { command->SetGuidance(s); return *this; }
+    Command& SetGuidance(const G4String& s0) { command->SetGuidance(s0); return *this; }
     Command& SetUnit(const G4String&, UnitSpec = UnitDefault);
     Command& SetUnitCategory(const G4String& u) {return SetUnit(u, UnitCategory);}
     Command& SetDefaultUnit(const G4String& u) {return SetUnit(u, UnitDefault);}
     Command& SetParameterName(const G4String&, G4bool, G4bool =false);
     Command& SetDefaultValue(const G4String&);
     Command& SetCandidates(const G4String&);
+    Command& SetToBeBroadcasted(G4bool s0) { command->SetToBeBroadcasted(s0); return *this; }
+    Command& SetToBeFlushed(G4bool s0) { command->SetToBeFlushed(s0); return *this; }
+    Command& SetWorkerThreadOnly(G4bool s0) { command->SetWorkerThreadOnly(s0); return *this; }
     
     G4UIcommand* command;
     const std::type_info* type;

source/intercoms/include/G4LocalThreadCoutMessenger.hh

@@ -60,6 +60,7 @@ class G4LocalThreadCoutMessenger: public G4UImessenger
     G4UIcmdWithABool*      bufferCoutCmd;
     G4UIcmdWithAString*    prefixCmd;
     G4UIcmdWithAnInteger*  ignoreCmd;
+    G4UIcmdWithABool*      ignoreInitCmd;
 };
 
 #endif

source/intercoms/include/G4UIcontrolMessenger.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4UIcontrolMessenger.hh 67965 2013-03-13 09:35:29Z gcosmo $
+// $Id: G4UIcontrolMessenger.hh 80641 2014-05-05 15:10:28Z gcosmo $
 //
 
 #ifndef G4UIcontrolMessenger_h
@@ -55,12 +55,14 @@ class G4UIcommand;
 //   /control/unalias
 //   /control/listAlias
 //   /control/getEnv
+//   /control/getVal
 //   /control/echo
 //   /control/shell
 //   /control/manual
 //   /control/createHTML
 //   /control/maximumStoredHistory
 //   /control/if
+//   /control/doif
 //   /control/add
 //   /control/subtract
 //   /control/multiply
@@ -86,6 +88,7 @@ class G4UIcontrolMessenger : public G4UImessenger
       G4UIcmdWithAString * unaliasCommand;
       G4UIcmdWithoutParameter * listAliasCommand;
       G4UIcmdWithAString * getEnvCmd;
+      G4UIcommand * getValCmd;
       G4UIcmdWithAString * echoCmd;
       G4UIcmdWithAString * shellCommand;
       G4UIcommand * loopCommand;
@@ -94,6 +97,7 @@ class G4UIcontrolMessenger : public G4UImessenger
       G4UIcmdWithAString * HTMLCommand;
       G4UIcmdWithAnInteger * maxStoredHistCommand;
       G4UIcommand * ifCommand;
+      G4UIcommand * doifCommand;
       G4UIcommand * addCommand;
       G4UIcommand * subtractCommand;
       G4UIcommand * multiplyCommand;

source/intercoms/include/G4UImanager.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4UImanager.hh 77651 2013-11-27 08:47:55Z gcosmo $
+// $Id: G4UImanager.hh 85249 2014-10-27 08:28:57Z gcosmo $
 //
 
 #ifndef G4UImanager_h
@@ -272,8 +272,12 @@ class G4UImanager : public G4VStateDependent
       std::vector<G4String>* GetCommandStack();
       void RegisterBridge(G4UIbridge* brg);
 
-  public: 
       void SetUpForAThread(G4int tId);
+      //Setups as before but for a non-worker thread (e.g. vis)
+      void SetUpForSpecialThread(G4String aPrefix);
+    
+      inline G4int GetThreadID() const
+      { return threadID; }
 
   private:
       G4int threadID;
@@ -286,6 +290,9 @@ class G4UImanager : public G4VStateDependent
       void SetThreadPrefixString(const G4String& s = "W");
       void SetThreadUseBuffer(G4bool flg = true);
       void SetThreadIgnore(G4int tid = 0);
+      void SetThreadIgnoreInit(G4bool flg = true);
+      inline G4MTcoutDestination* GetThreadCout() {return threadCout;};
+ 
 };
 
 #endif

source/intercoms/include/G4UImessenger.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4UImessenger.hh 74278 2013-10-02 15:04:18Z gcosmo $
+// $Id: G4UImessenger.hh 84281 2014-10-13 07:21:50Z gcosmo $
 //
 
 #ifndef G4UImessenger_h
@@ -89,6 +89,11 @@ class G4UImessenger
       template <typename T> T* CreateCommand(const G4String& cname, 
                                              const G4String& dsc);
 
+  protected:
+      G4bool commandsShouldBeInMaster;
+  public:
+      G4bool CommandsShouldBeInMaster() const
+      { return commandsShouldBeInMaster; }
 };
 
 template <typename T>