Changeset 1337 for trunk/examples/extended/electromagnetic/TestEm0/src

Timestamp:

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

Author:

garnier

Message:

tag geant4.9.4 beta 1 + modifs locales

Location:

trunk/examples/extended/electromagnetic/TestEm0/src

Files:

• DetectorConstruction.cc (modified) (1 diff)
• DetectorMessenger.cc (modified) (1 diff)
• PhysListEmStandard.cc (modified) (1 diff)
• PhysicsList.cc (modified) (6 diffs)
• PhysicsListMessenger.cc (modified) (1 diff)
• PrimaryGeneratorAction.cc (modified) (1 diff)
• RunAction.cc (modified) (5 diffs)

trunk/examples/extended/electromagnetic/TestEm0/src/DetectorConstruction.cc

@@ -27 +27 @@
 //
 // $Id: DetectorConstruction.cc,v 1.10 2009/11/14 18:04:20 maire Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm0/src/DetectorMessenger.cc

@@ -25 +25 @@
 //
 // $Id: DetectorMessenger.cc,v 1.2 2006/06/29 16:35:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/electromagnetic/TestEm0/src/PhysListEmStandard.cc

@@ -26 +26 @@
 //
 // $Id: PhysListEmStandard.cc,v 1.3 2009/11/14 18:04:20 maire Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/electromagnetic/TestEm0/src/PhysicsList.cc

@@ -25 +25 @@
 //
 // 
-// $Id: PhysicsList.cc,v 1.8 2009/11/17 22:48:26 maire Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: PhysicsList.cc,v 1.9 2010/03/21 19:07:53 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -35 +35 @@
  
 #include "PhysListEmStandard.hh"
+#include "G4EmStandardPhysics.hh"
+#include "G4EmStandardPhysics_option1.hh"
+#include "G4EmStandardPhysics_option2.hh"
+#include "G4EmStandardPhysics_option3.hh"
 #include "G4EmLivermorePhysics.hh"
 #include "G4EmPenelopePhysics.hh"
@@ -58 +62 @@
 
   // EM physics
-  emName = G4String("standard");
+  emName = G4String("local");
   emPhysicsList = new PhysListEmStandard(emName);
 
@@ -189 +193 @@
   //physics tables
   //
-  emOptions.SetMinEnergy(100*eV);       //default    
-  emOptions.SetMaxEnergy(100*TeV);      //default  
-  emOptions.SetDEDXBinning(12*20);      //default=12*7  
-  emOptions.SetLambdaBinning(12*20);    //default=12*7
+  //emOptions.SetMinEnergy(100*eV);     //default    
+  //emOptions.SetMaxEnergy(100*TeV);    //default  
+  //emOptions.SetDEDXBinning(12*20);    //default=12*7  
+  //emOptions.SetLambdaBinning(12*20);  //default=12*7
 
   emOptions.SetBuildCSDARange(true);     
-  emOptions.SetMaxEnergyForCSDARange(100*TeV);
-  emOptions.SetDEDXBinningForCSDARange(12*20);
-  
-  emOptions.SetSplineFlag(true);        //default
+  //emOptions.SetMaxEnergyForCSDARange(100*TeV);
+  //emOptions.SetDEDXBinningForCSDARange(12*20);
+  
+  //emOptions.SetSplineFlag(true);      //default
      
   emOptions.SetVerbose(0);  
@@ -213 +217 @@
   if (name == emName) return;
 
-  if (name == "standard") {
+  if (name == "local") {
 
     emName = name;
@@ -219 +223 @@
     emPhysicsList = new PhysListEmStandard(name);
 
-  } else if (name == "penelope"){
+  } else if (name == "emstandard_opt0"){
+    emName = name;
+    delete emPhysicsList;
+    emPhysicsList = new G4EmStandardPhysics();
+
+  } else if (name == "emstandard_opt1"){
+    emName = name;
+    delete emPhysicsList;
+    emPhysicsList = new G4EmStandardPhysics_option1();
+
+  } else if (name == "emstandard_opt2"){
+    emName = name;
+    delete emPhysicsList;
+    emPhysicsList = new G4EmStandardPhysics_option2();
+
+  } else if (name == "emstandard_opt3"){
+    emName = name;
+    delete emPhysicsList;
+    emPhysicsList = new G4EmStandardPhysics_option3();
+
+  } else if (name == "empenelope"){
     emName = name;
     delete emPhysicsList;
     emPhysicsList = new G4EmPenelopePhysics();
 
-  } else if (name == "livermore"){
+  } else if (name == "emlivermore"){
     emName = name;
     delete emPhysicsList;

trunk/examples/extended/electromagnetic/TestEm0/src/PhysicsListMessenger.cc

@@ -25 +25 @@
 //
 // $Id: PhysicsListMessenger.cc,v 1.2 2006/06/29 16:35:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/electromagnetic/TestEm0/src/PrimaryGeneratorAction.cc

@@ -26 +26 @@
 //
 // $Id: PrimaryGeneratorAction.cc,v 1.2 2006/06/29 16:35:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: RunAction.cc,v 1.10 2007/12/17 17:22:44 maire Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: RunAction.cc,v 1.15 2010/05/10 13:45:49 maire Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -104 +104 @@
   G4double range = emCal.GetCSDARange(Tmax,G4Electron::Electron(),material);
   
-  G4cout << "\n Max_energy _transferable : " << G4BestUnit(Tmax,"Energy")
+  G4cout << "\n  Max_energy _transferable  : " << G4BestUnit(Tmax,"Energy")
          << " (" << G4BestUnit(range,"Length") << ")" << G4endl;            
   }
@@ -148 +148 @@
     sigma0.push_back(sigtot);
 
-    G4cout << "\n \n  cross section per atom   : ";
+    G4cout << "\n \n  cross section per atom    : ";
     for (size_t j=0; j<sigma0.size();j++) {          
       G4cout << "\t" << std::setw(13) << G4BestUnit(sigma0[j], "Surface");
@@ -156 +156 @@
     
   //get cross section per volume 
+  std::vector<G4double> sigma0;
   std::vector<G4double> sigma1;
-  std::vector<G4double> sigma2;  
-  G4double Sig, Sigtot = 0.;
+  std::vector<G4double> sigma2;
+  G4double Sig, SigtotComp = 0., Sigtot = 0.;
 
   for (size_t j=0; j<emName.size();j++) {
-    Sig = emCal.GetCrossSectionPerVolume(energy,particle,emName[j],material);
-    if (Sig == 0.) Sig = emCal.ComputeCrossSectionPerVolume
-                     (energy,particle,emName[j],material,enerCut[j]);
-    Sigtot += Sig;                           
+    Sig = emCal.ComputeCrossSectionPerVolume
+      (energy,particle,emName[j],material,enerCut[j]);  
+    SigtotComp += Sig;    
+    sigma0.push_back(Sig);
+    Sig = emCal.GetCrossSectionPerVolume(energy,particle,emName[j],material);      
+    Sigtot += Sig;    
     sigma1.push_back(Sig);
     sigma2.push_back(Sig/density);                      
   }
+  sigma0.push_back(SigtotComp);
   sigma1.push_back(Sigtot);
   sigma2.push_back(Sigtot/density);       
     
   //print cross sections
-  G4cout << "\n \n  cross section per volume : ";
+  G4cout << "\n \n  compCrossSectionPerVolume : ";
+  for (size_t j=0; j<sigma0.size();j++) {            
+    G4cout << "\t" << std::setw(13) << sigma0[j]*cm << " cm^-1";
+  }
+  G4cout << "\n  cross section per volume : ";
   for (size_t j=0; j<sigma1.size();j++) {            
     G4cout << "\t" << std::setw(13) << sigma1[j]*cm << " cm^-1";
@@ -179 +187 @@
   G4cout << "\n  cross section per mass   : ";
   for (size_t j=0; j<sigma2.size();j++) {
-    G4cout << "\t" << std::setw(13) << G4BestUnit(sigma2[j], "Surface/Mass");
+    G4cout << "\t" << std::setw(13) 
+           << G4BestUnit(sigma2[j], "Surface/Mass");
   }