Changeset 1315 for trunk/source/run/src/G4RunManager.cc

Timestamp:

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

Author:

garnier

Message:

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

File:

• trunk/source/run/src/G4RunManager.cc (modified) (6 diffs)

trunk/source/run/src/G4RunManager.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4RunManager.cc,v 1.108 2007/11/09 13:57:39 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4RunManager.cc,v 1.110 2010/06/11 09:02:55 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -137 +137 @@
     numberOfEventToBeProcessed = n_event;
     ConstructScoringWorlds();
-    printf("G4RunManager::BeamOn before INIT\n");
     RunInitialization();
-    printf("G4RunManager::BeamOn after INIT\n");
     if(n_event>0) DoEventLoop(n_event,macroFile,n_select);
-    printf("G4RunManager::BeamOn before END\n");
     RunTermination();
-    printf("G4RunManager::BeamOn after END\n");
   }
 }
@@ -236 +232 @@
   for( i_event=0; i_event<n_event; i_event++ )
   {
-    printf("1\n");
     currentEvent = GenerateEvent(i_event);
-    printf("2\n");
     eventManager->ProcessOneEvent(currentEvent);
-    printf("3\n");
     AnalyzeEvent(currentEvent);
-    printf("4\n");
     UpdateScoring();
-    printf("5\n");
     if(i_event<n_select) G4UImanager::GetUIpointer()->ApplyCommand(msg);
-    printf("6\n");
     StackPreviousEvent(currentEvent);
-    printf("7\n");
     currentEvent = 0;
-    printf("8\n");
     if(runAborted) break;
-    printf("9\n");
   }
 
@@ -261 +248 @@
     G4cout << "Run Summary" << G4endl;
     if(runAborted)
-    { G4cout << "  Run Aborted after " << i_event << " events processed." << G4endl; }
+    { G4cout << "  Run Aborted after " << i_event + 1 << " events processed." << G4endl; }
     else
     { G4cout << "  Number of events processed : " << n_event << G4endl; }
@@ -467 +454 @@
 }
   
-void G4RunManager::RestoreRandomNumberStatus(G4String fileN)
+void G4RunManager::RestoreRandomNumberStatus(const G4String& fileN)
 {
   G4String fileNameWithDirectory;
@@ -481 +468 @@
 }
 
-void G4RunManager::DumpRegion(G4String rname) const
+void G4RunManager::DumpRegion(const G4String& rname) const
 {
   kernel->UpdateRegion();