Changeset 1337 for trunk/examples/extended/electromagnetic/TestEm14/src/RunAction.cc

Timestamp:

Sep 30, 2010, 2:47:17 PM (14 years ago)

Author:

garnier

Message:

tag geant4.9.4 beta 1 + modifs locales

File:

• trunk/examples/extended/electromagnetic/TestEm14/src/RunAction.cc (modified) (7 diffs)

trunk/examples/extended/electromagnetic/TestEm14/src/RunAction.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: RunAction.cc,v 1.4 2006/09/06 09:56:06 maire Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: RunAction.cc,v 1.5 2010/04/05 18:02:39 maire Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -49 +49 @@
 RunAction::RunAction(DetectorConstruction* det, PrimaryGeneratorAction* prim,
                      HistoManager* histo)
-  : detector(det), primary(prim), ProcCounter(0), histoManager(histo)
+  : detector(det), primary(prim), histoManager(histo)
 { }
 
@@ -67 +67 @@
   CLHEP::HepRandom::showEngineStatus();
 
-  ProcCounter = new ProcessesCount;
   totalCount = 0;
   sumTrack = sumTrack2 = 0.;
@@ -73 +72 @@
   
   histoManager->book();
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-void RunAction::CountProcesses(G4String procName)
-{
-   //does the process  already encounted ?
-   size_t nbProc = ProcCounter->size();
-   size_t i = 0;
-   while ((i<nbProc)&&((*ProcCounter)[i]->GetName()!=procName)) i++;
-   if (i == nbProc) ProcCounter->push_back( new OneProcessCount(procName));
-
-   (*ProcCounter)[i]->Count();
 }
 
@@ -113 +99 @@
   //frequency of processes
   G4cout << "\n Process calls frequency --->";
-  for (size_t i=0; i< ProcCounter->size();i++) {
-     G4String procName = (*ProcCounter)[i]->GetName();
-     G4int    count    = (*ProcCounter)[i]->GetCounter(); 
+  std::map<G4String,G4int>::iterator it;  
+  for (it = procCounter.begin(); it != procCounter.end(); it++) {
+     G4String procName = it->first;
+     G4int    count    = it->second;
      G4cout << "\t" << procName << " = " << count;
      if (procName == "Transportation") survive = count;
   }
-  
+      
   if (survive > 0) {
     G4cout << "\n\n Nb of incident particles surviving after "
@@ -160 +147 @@
   G4EmCalculator emCalculator;
   G4double sumc = 0.0;  
-  for (size_t i=0; i< ProcCounter->size();i++) {
-    G4String procName = (*ProcCounter)[i]->GetName();
+  for (it = procCounter.begin(); it != procCounter.end(); it++) {
+    G4String procName = it->first;      
     G4double massSigma = 
     emCalculator.GetCrossSectionPerVolume(energy,particle,
@@ -177 +164 @@
                  
   //restore default format       
-  G4cout.precision(prec);         
-
-  // delete and remove all contents in ProcCounter 
-  while (ProcCounter->size()>0){
-    OneProcessCount* aProcCount=ProcCounter->back();
-    ProcCounter->pop_back();
-    delete aProcCount;
-  }
-  delete ProcCounter;
+  G4cout.precision(prec);
+           
+  // remove all contents in procCounter 
+  procCounter.clear();
   
   histoManager->save();