Changeset 1337 for trunk/examples/extended/exoticphysics/monopole/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/exoticphysics/monopole/src/RunAction.cc (modified) (12 diffs)

trunk/examples/extended/exoticphysics/monopole/src/RunAction.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: RunAction.cc,v 1.2 2008/06/11 14:34:19 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: RunAction.cc,v 1.4 2010/06/04 19:03:36 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -50 +50 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-RunAction::RunAction(DetectorConstruction* det, PrimaryGeneratorAction* kin):detector(det), kinematic(kin), af(0), tree(0)
+RunAction::RunAction(DetectorConstruction* det, PrimaryGeneratorAction* kin)
+  :detector(det), kinematic(kin), af(0), tree(0)
 { 
-  verboseLevel = 0;
+  verboseLevel = 1;
   binLength = offsetX = 0.;
   histo[0] = 0;
@@ -60 +61 @@
   // Creating the analysis factory
   af = AIDA_createAnalysisFactory();
-        ftype   = "hbook";
+  ftype   = "root";
   fname   = "monopole";
 #endif
@@ -68 +69 @@
 }
 
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
 RunAction::~RunAction()
 {
@@ -77 +78 @@
 }
 
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
 void RunAction::bookHisto()
 {
   G4double length  = detector->GetAbsorSizeX();
-  if(!binLength) binLength = 5 * mm;
-        if(binLength > detector->GetMaxStepSize()) binLength = detector->GetMaxStepSize();
+  if(!binLength) { binLength = 5 * mm; }
+  if(binLength > detector->GetMaxStepSize()) { 
+    binLength = detector->GetMaxStepSize();
+  }
   offsetX   = 0.5 * length;
  
 #ifdef G4ANALYSIS_USE
-  if(GetVerbose() > 0) G4cout << "\n----> Histogram Tree opened" << G4endl;
-
-  G4int nbBins = (int)(0.5 + length / binLength);
+  if(GetVerbose() > 0) { G4cout << "\n----> Histogram Tree opened" << G4endl; }
+
+  G4int nbBins = (G4int)(0.5 + length / binLength);
 
   // Create the tree factory
@@ -120 +123 @@
 }
 
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
 void RunAction::saveHisto()
 {
@@ -133 +136 @@
 }
 
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
 void RunAction::SetBinSize(G4double size)
 {
@@ -180 +183 @@
   G4Material* material = detector->GetAbsorMaterial();
   G4double density = material->GetDensity();
-   
-  G4String particle = kinematic->GetParticleGun()->GetParticleDefinition()->GetParticleName();    
+  const G4ParticleDefinition* part = 
+    kinematic->GetParticleGun()->GetParticleDefinition();
+  G4String particle = part->GetParticleName();    
   G4double energy = kinematic->GetParticleGun()->GetParticleEnergy();
 
@@ -209 +213 @@
   calc.SetVerbose(0);
   G4int i;
-  for(i = 0; i < 100; i++) {
+  for(i = 0; i < 100; ++i) {
     ekin[i] = std::pow(10., 0.1*G4double(i)) * keV;
     dedxproton[i] = calc.ComputeElectronicDEDX(ekin[i], "proton",  material->GetName());
@@ -215 +219 @@
   }
 
-  if(GetVerbose() > 1){
+  if(GetVerbose() > 0){
     G4cout << "### Stopping Powers" << G4endl;
     for(i=0; i<100; i++) {
@@ -223 +227 @@
     }
   };
-
+  G4cout << "### End of stopping power table" << G4endl;
 #ifdef G4ANALYSIS_USE
   // normalize histogram
@@ -234 +238 @@
         };
 
-
-  for(i=0; i<100; i++) {
+  for(i=0; i<100; ++i) {
     G4double e = std::log10(ekin[i] / MeV) + 0.05;
     histo[1]->fill(e, dedxproton[i]);