Changeset 1342 for trunk/examples/extended/electromagnetic/TestEm7/src/RunAction.cc

Timestamp:

Nov 5, 2010, 4:08:39 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/examples/extended/electromagnetic/TestEm7/src/RunAction.cc (modified) (8 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: RunAction.cc,v 1.24 2008/08/22 18:30:27 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: RunAction.cc,v 1.25 2010/09/17 18:45:43 maire Exp $
+// GEANT4 tag $Name: examples-V09-03-09 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -34 +34 @@
 #include "PhysicsList.hh"
 #include "StepMax.hh"
+#include "HistoManager.hh"
 #include "PrimaryGeneratorAction.hh"
 
@@ -42 +43 @@
 
 #include "Randomize.hh"
-#include "Histo.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 RunAction::RunAction(DetectorConstruction* det, PhysicsList* phys,
-                     PrimaryGeneratorAction* kin)
-:detector(det), physics(phys), kinematic(kin)
+                     HistoManager* histo, PrimaryGeneratorAction* kin)
+:detector(det), physics(phys),histoManager(histo), kinematic(kin)
 { 
   tallyEdep = new G4double[MaxTally];
-  binLength = offsetX = 0.;
-  histo = new Histo();
-  histo->setFileName("testem7");
-  histo->add1D("1","Edep (MeV/mm) along absorber (mm)", 100, 0, 100);
-  histo->add1D("2","Edep (MeV/mm) along absorber zoomed (mm)", 100, 0, 100);
-  histo->add1D("3","Projectile range (mm)", 100, 0, 100);
 }
 
@@ -64 +58 @@
 {
   delete [] tallyEdep;
-  delete histo;  
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-void RunAction::FillHisto(G4int ih, G4double x, G4double weight)
-{
-  histo->fill(ih, x, weight);
 }
 
@@ -94 +80 @@
 
   // define "1" histogram binning
-  length  = detector->GetAbsorSizeX();
+  // histogram "1" is defined by the length of the target
+  // zoomed histograms are defined by UI command  
+  G4double length  = detector->GetAbsorSizeX();
   G4double stepMax = physics->GetStepMaxProcess()->GetMaxStep();
-  const G4int nbmin = 100;
+  G4int nbmin = 100;
   G4int nbBins = (G4int)(0.5 + length/stepMax);
   if (nbBins < nbmin) nbBins = nbmin;
-  binLength = length/nbBins;
-  offsetX   = 0.5*length;
-   
-  // histogram "1" is defined by the length of the target
-  // zoomed histograms are defined by UI command
-  histo->setHisto1D(0, nbBins, 0, length, mm);
+  histoManager->SetHisto(1, nbBins, 0., length, "mm");
  
-  histo->book();
+  histoManager->book();
 }
 
@@ -147 +130 @@
   G4cout << " Mean number of primary steps = "<< nstep << G4endl;
 
-  //compute energy deposition and NIEL
+  //compute energy deposition and niel
   //
   edeptot /= NbofEvents; 
@@ -153 +136 @@
          << G4endl;
   eniel /= NbofEvents; 
-  G4cout << " NIEL energy deposit = "<< G4BestUnit(eniel,"Energy")
+  G4cout << " niel energy deposit = "<< G4BestUnit(eniel,"Energy")
          << G4endl;
      
@@ -176 +159 @@
   }
 
-  // normalize histogram
-  G4double fac = (mm/MeV)/(NbofEvents *  binLength);
-  for (G4int j=0; j<3; j++) {histo->scale(j, fac);}
+  // normalize histograms
+  for (G4int j=1; j<3; j++) {  
+    G4double binWidth = histoManager->GetBinWidth(j);
+    G4double fac = (mm/MeV)/(NbofEvents * binWidth);
+    histoManager->Scale(j, fac);
+  }
+  histoManager->Scale(3, 1./NbofEvents);
  
   // save and clean histo
-  histo->save();
+  histoManager->save();
  
   // show Rndm status