Changeset 1315 for trunk/source/run/include

Timestamp:

Jun 18, 2010, 11:42:07 AM (15 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

Location:

trunk/source/run/include

Files:

• G4RunManager.hh (modified) (6 diffs)
• G4RunManagerKernel.hh (modified) (4 diffs)

trunk/source/run/include/G4RunManager.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4RunManager.hh,v 1.52 2009/11/13 23:14:46 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4RunManager.hh,v 1.53 2010/06/11 09:02:14 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -92 +92 @@
 #include "globals.hh"
 #include <vector>
-#include <stdlib.h>
+#include <algorithm>
 
 class G4RunManager
@@ -202 +202 @@
     // the user needs not invoke.
 
-    void DumpRegion(G4String rname) const;
+    void DumpRegion(const G4String& rname) const;
     // Dump information of a region.
 
@@ -260 +260 @@
     virtual void rndmSaveThisRun();
     virtual void rndmSaveThisEvent();
-    virtual void RestoreRandomNumberStatus(G4String fileN);
+    virtual void RestoreRandomNumberStatus(const G4String& fileN);
 
   public: // with description
@@ -320 +320 @@
       // he/she can use the corresponding ENUM in G4ClassificationOfNewTrack.
 
-    inline G4String GetVersionString() const
+    inline const G4String& GetVersionString() const
     { return kernel->GetVersionString(); }
 
@@ -343 +343 @@
     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 += "/";
+#ifndef WIN32
+      G4String shellCmd = "mkdir -p ";
+#else
+      std::replace(dirStr.begin(), dirStr.end(),'/','\\');
+      G4String shellCmd = "mkdir ";
+#endif
+      shellCmd += dirStr;
       randomNumberStatusDir = dirStr;
-      G4String shellCmd = "mkdir -p ";
-      shellCmd += dirStr;
       system(shellCmd);
     }
-    inline G4String GetRandomNumberStoreDir() const
+    inline const G4String& GetRandomNumberStoreDir() const
     { return randomNumberStatusDir; }
     inline const G4String& GetRandomNumberStatusForThisRun() const

trunk/source/run/include/G4RunManagerKernel.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4RunManagerKernel.hh,v 1.9 2007/05/30 00:42:09 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4RunManagerKernel.hh,v 1.10 2010/06/11 09:02:55 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -86 +86 @@
   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
@@ -121 +121 @@
     // the user needs not invoke.
 
-    void DumpRegion(G4String rname) const;
+    void DumpRegion(const G4String& rname) const;
     // Dump information of a region.
 
@@ -170 +170 @@
     { return eventManager->GetPrimaryTransformer(); }
 
-    inline G4String GetVersionString() const
+    inline const G4String& GetVersionString() const
     { return versionString; }