Import Geant4 9.4.0 source tree

source/run/include/G4AdjointPrimaryGeneratorAction.hh

@@ -23,11 +23,11 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4AdjointPrimaryGeneratorAction.hh,v 1.2 2009/11/18 18:02:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4AdjointPrimaryGeneratorAction.hh,v 1.3 2010/07/21 14:21:19 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04 $
 //
 /////////////////////////////////////////////////////////////////////////////////
-//      Class Name:	G4AdjointPosOnPhysVolGenerator
+//      Class Name:	G4AdjointPrimaryGeneratorAction
 //	Author:       	L. Desorgher
 // 	Organisation: 	SpaceIT GmbH
 //	Contract:	ESA contract 21435/08/NL/AT

source/run/include/G4RunManager.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4RunManager.hh,v 1.52 2009/11/13 23:14:46 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4RunManager.hh,v 1.55 2010/11/15 09:49:32 asaim Exp $
+// GEANT4 tag $Name: geant4-09-04 $
 //
 // 
 
@@ -79,6 +79,7 @@ class G4UserTrackingAction;
 class G4UserSteppingAction;
 
 class G4VPhysicalVolume;
+class G4LogicalVolume;
 class G4Region;
 class G4Timer;
 class G4RunMessenger;
@@ -91,7 +92,7 @@ class G4PrimaryTransformer;
 #include "G4EventManager.hh"
 #include "globals.hh"
 #include <vector>
-#include <stdlib.h>
+#include <algorithm>
 
 class G4RunManager
 {
@@ -201,7 +202,7 @@ class G4RunManager
     // At RunInitialization(), this method is automatically invoked, and thus
     // the user needs not invoke.
 
-    void DumpRegion(G4String rname) const;
+    void DumpRegion(const G4String& rname) const;
     // Dump information of a region.
 
     void DumpRegion(G4Region* region=0) const;
@@ -259,7 +260,7 @@ class G4RunManager
   public:
     virtual void rndmSaveThisRun();
     virtual void rndmSaveThisEvent();
-    virtual void RestoreRandomNumberStatus(G4String fileN);
+    virtual void RestoreRandomNumberStatus(const G4String& fileN);
 
   public: // with description
     inline void SetUserInitialization(G4VUserDetectorConstruction* userInit)
@@ -319,7 +320,7 @@ class G4RunManager
       // Once the user set the number of additional waiting stacks,
       // he/she can use the corresponding ENUM in G4ClassificationOfNewTrack.
 
-    inline G4String GetVersionString() const
+    inline const G4String& GetVersionString() const
     { return kernel->GetVersionString(); }
 
     inline void SetPrimaryTransformer(G4PrimaryTransformer* pt)
@@ -342,16 +343,21 @@ class G4RunManager
     { storeRandomNumberStatus = flag; }
     inline G4bool GetRandomNumberStore() const
     { return storeRandomNumberStatus; }
-    inline void SetRandomNumberStoreDir(G4String dir)
+    inline void SetRandomNumberStoreDir(const G4String& dir)
     { 
       G4String dirStr = dir;
       if( dirStr(dirStr.length()-1) != '/' ) dirStr += "/";
-      randomNumberStatusDir = dirStr;
+#ifndef WIN32
       G4String shellCmd = "mkdir -p ";
+#else
+      std::replace(dirStr.begin(), dirStr.end(),'/','\\');
+      G4String shellCmd = "mkdir ";
+#endif
       shellCmd += dirStr;
+      randomNumberStatusDir = dirStr;
       system(shellCmd);
     }
-    inline G4String GetRandomNumberStoreDir() const
+    inline const G4String& GetRandomNumberStoreDir() const
     { return randomNumberStatusDir; }
     inline const G4String& GetRandomNumberStatusForThisRun() const
     { return randomNumberStatusForThisRun; }
@@ -384,6 +390,17 @@ class G4RunManager
       G4cerr << "It is safe to remove invoking this method." << G4endl;
     }  
 
+  public: // with description
+    void ReOptimizeMotherOf(G4VPhysicalVolume*);
+    //  This method may be used if the orientation and/or size of this
+    // particular physical volume has been modified while rest of the
+    // geometries in the world has not been changed. This avoids the
+    // full re-optimization of the entire geometry tree which is forced
+    // if GeometryHasBeenModified() method is invoked.
+
+    void ReOptimize(G4LogicalVolume*);
+    //  Same as above, but the mother logical volume is specified.
+
   public:
     inline void SetVerboseLevel(G4int vl)
     { verboseLevel = vl; 

source/run/include/G4RunManagerKernel.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4RunManagerKernel.hh,v 1.9 2007/05/30 00:42:09 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4RunManagerKernel.hh,v 1.11 2010/11/18 13:46:06 asaim Exp $
+// GEANT4 tag $Name: geant4-09-04 $
 //
 // 
 
@@ -85,7 +85,7 @@ class G4RunManagerKernel
 
   public: // with description
     void DefineWorldVolume(G4VPhysicalVolume * worldVol,
-                                   G4bool topologyIsChanged=true);
+                           G4bool topologyIsChanged=true);
     //  This method must be invoked if the geometry setup has been changed between
     // runs. The flag 'topologyIsChanged' will specify if the geometry topology is
     // different from the original one used in the previous run; if not, it must be
@@ -120,7 +120,7 @@ class G4RunManagerKernel
     // At RunInitialization(), this method is automatically invoked, and thus
     // the user needs not invoke.
 
-    void DumpRegion(G4String rname) const;
+    void DumpRegion(const G4String& rname) const;
     // Dump information of a region.
 
     void DumpRegion(G4Region* region=0) const;
@@ -169,7 +169,7 @@ class G4RunManagerKernel
     inline G4PrimaryTransformer* GetPrimaryTransformer() const
     { return eventManager->GetPrimaryTransformer(); }
 
-    inline G4String GetVersionString() const
+    inline const G4String& GetVersionString() const
     { return versionString; }
 
     inline void SetVerboseLevel(G4int vl)
@@ -190,7 +190,9 @@ class G4RunManagerKernel
     { numberOfParallelWorld = i; }
 
   private:
+    void CheckRegularGeometry();
     G4bool ConfirmCoupledTransportation();
+    void SetScoreSplitter();
 };
 
 #endif