Import Geant4 10.3.0 source tree

source/intercoms/include/G4UIcommandTree.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4UIcommandTree.hh 77651 2013-11-27 08:47:55Z gcosmo $
+// $Id: G4UIcommandTree.hh 99838 2016-10-07 10:06:37Z gcosmo $
 //
 
 #ifndef G4UIcommandTree_h
@@ -56,7 +56,8 @@ class G4UIcommandTree
       G4UIcommand* FindPath(const char* commandPath) const;
       G4UIcommandTree* FindCommandTree(const char* commandPath);
       G4String CompleteCommandPath(const G4String& commandPath);
-      // Complete most available caracters in common into command path in the command line 
+      G4String GetFirstMatchedString(const G4String&,const G4String&) const;
+      // Complete most available caracters in common into command path in the command line
       // given
 
       void List() const;
@@ -67,7 +68,6 @@ class G4UIcommandTree
   private:
       G4String CreateFileName(const char* pName);
       G4String ModStr(const char* strS);
-      G4String GetFirstMatchedString(const G4String&,const G4String&) const;
 
       std::vector<G4UIcommand*> command;
       std::vector<G4UIcommandTree*> tree;

source/intercoms/include/G4UIcontrolMessenger.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4UIcontrolMessenger.hh 80641 2014-05-05 15:10:28Z gcosmo $
+// $Id: G4UIcontrolMessenger.hh 98731 2016-08-09 10:49:49Z gcosmo $
 //
 
 #ifndef G4UIcontrolMessenger_h
@@ -67,6 +67,12 @@ class G4UIcommand;
 //   /control/subtract
 //   /control/multiply
 //   /control/divide
+//   /control/strif
+//   /control/strdoif
+//   /control/ifBatch
+//   /control/ifInteractive
+//   /control/doifBatch
+//   /control/doifInteractive
 
 class G4UIcontrolMessenger : public G4UImessenger 
 {
@@ -103,6 +109,12 @@ class G4UIcontrolMessenger : public G4UImessenger
       G4UIcommand * multiplyCommand;
       G4UIcommand * divideCommand;
       G4UIcommand * remainderCommand;
+      G4UIcommand * strifCommand;
+      G4UIcommand * strdoifCommand;
+      G4UIcmdWithAString * ifBatchCommand;
+      G4UIcmdWithAString * ifInteractiveCommand;
+      G4UIcmdWithAString * doifBatchCommand;
+      G4UIcmdWithAString * doifInteractiveCommand;
 };
 
 #endif

source/intercoms/include/G4UIsession.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4UIsession.hh 67965 2013-03-13 09:35:29Z gcosmo $
+// $Id: G4UIsession.hh 98731 2016-08-09 10:49:49Z gcosmo $
 //
 // $id$
 
@@ -46,6 +46,7 @@ class G4UIsession : public G4coutDestination
   
   public:
       G4UIsession();
+      G4UIsession(G4int iBatch);
       virtual ~G4UIsession();
 
       virtual G4UIsession * SessionStart();
@@ -60,6 +61,11 @@ class G4UIsession : public G4coutDestination
       virtual G4int ReceiveG4cerr(const G4String& cerrString);
       // These two methods will be invoked by G4strstreambuf.
 
+  protected:
+      static G4int inSession;
+      G4int ifBatch;
+  public:
+      static G4int InSession() { return inSession; }
 };