Changeset 1230 for trunk/examples/extended/electromagnetic/TestEm8/src

Timestamp:

Jan 8, 2010, 3:02:48 PM (14 years ago)

Author:

garnier

Message:

update to geant4.9.3

Location:

trunk/examples/extended/electromagnetic/TestEm8/src

Files:

• Em8CalorHit.cc (modified) (1 diff)
• Em8CalorimeterSD.cc (modified) (1 diff)
• Em8DetectorConstruction.cc (modified) (1 diff)
• Em8DetectorMessenger.cc (modified) (1 diff)
• Em8EventAction.cc (modified) (1 diff)
• Em8EventActionMessenger.cc (modified) (1 diff)
• Em8PrimaryGeneratorAction.cc (modified) (1 diff)
• Em8PrimaryGeneratorMessenger.cc (modified) (1 diff)
• Em8RunAction.cc (modified) (1 diff)
• Em8RunMessenger.cc (modified) (1 diff)
• Em8SteppingAction.cc (modified) (1 diff)
• Em8SteppingVerbose.cc (modified) (1 diff)
• PhysicsList.cc (modified) (8 diffs)
• PhysicsListMessenger.cc (modified) (1 diff)
• StepMax.cc (modified) (1 diff)
• StepMaxMessenger.cc (modified) (1 diff)

trunk/examples/extended/electromagnetic/TestEm8/src/Em8CalorHit.cc

@@ -26 +26 @@
 //
 // $Id: Em8CalorHit.cc,v 1.5 2006/06/29 17:00:03 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8CalorimeterSD.cc

@@ -26 +26 @@
 //
 // $Id: Em8CalorimeterSD.cc,v 1.7 2006/06/29 17:00:05 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8DetectorConstruction.cc

@@ -26 +26 @@
 //
 // $Id: Em8DetectorConstruction.cc,v 1.21 2007/10/02 10:12:47 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8DetectorMessenger.cc

@@ -26 +26 @@
 //
 // $Id: Em8DetectorMessenger.cc,v 1.8 2007/10/02 10:12:47 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8EventAction.cc

@@ -26 +26 @@
 //
 // $Id: Em8EventAction.cc,v 1.10 2007/11/12 10:54:49 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8EventActionMessenger.cc

@@ -26 +26 @@
 //
 // $Id: Em8EventActionMessenger.cc,v 1.5 2006/06/29 17:00:15 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorAction.cc

@@ -26 +26 @@
 //
 // $Id: Em8PrimaryGeneratorAction.cc,v 1.7 2006/06/29 17:00:18 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorMessenger.cc

@@ -26 +26 @@
 //
 // $Id: Em8PrimaryGeneratorMessenger.cc,v 1.5 2006/06/29 17:00:21 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8RunAction.cc

@@ -26 +26 @@
 //
 // $Id: Em8RunAction.cc,v 1.15 2007/11/12 10:54:49 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8RunMessenger.cc

@@ -26 +26 @@
 //
 // $Id: Em8RunMessenger.cc,v 1.7 2006/06/29 17:00:25 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8SteppingAction.cc

@@ -26 +26 @@
 //
 // $Id: Em8SteppingAction.cc,v 1.10 2007/11/12 10:54:49 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/Em8SteppingVerbose.cc

@@ -26 +26 @@
 //
 // $Id: Em8SteppingVerbose.cc,v 1.8 2006/06/29 17:00:29 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //

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

@@ -25 +25 @@
 //
 //
-// $Id: PhysicsList.cc,v 1.14 2007/09/26 10:23:17 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// $Id: PhysicsList.cc,v 1.16 2008/12/05 17:46:12 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 
@@ -36 +36 @@
 
 #include "G4EmStandardPhysics.hh"
+#include "G4EmStandardPhysics_option1.hh"
+#include "G4EmStandardPhysics_option2.hh"
+#include "G4EmStandardPhysics_option3.hh"
 #include "G4DecayPhysics.hh"
 
-#include "PhysListEmModelPai.hh"
-#include "PhysListEmPaiPhoton.hh"
-#include "PhysListEmPAI.hh"
+#include "G4PAIModel.hh"
+#include "G4PAIPhotonModel.hh"
 
 #include "G4Gamma.hh"
@@ -69 +71 @@
   pMessenger = new PhysicsListMessenger(this);
 
-  SetVerboseLevel(1);
-
   // Decay Physics is always defined
   generalPhysicsList = new G4DecayPhysics();
@@ -76 +76 @@
   // EM physics
   emName = G4String("emstandard");
-  emPhysicsList = new G4EmStandardPhysics();
-
+  emPhysicsList = new G4EmStandardPhysics(1);
+
+  SetVerboseLevel(1);
 }
 
@@ -104 +105 @@
   AddTransportation();
   emPhysicsList->ConstructProcess();
+  em_config.AddModels();
   generalPhysicsList->ConstructProcess();
   for(size_t i=0; i<hadronPhys.size(); i++) hadronPhys[i]->ConstructProcess();
@@ -113 +115 @@
 void PhysicsList::AddPhysicsList(const G4String& name)
 {
-  if (verboseLevel>-1) {
+  if (verboseLevel>1) {
     G4cout << "PhysicsList::AddPhysicsList: <" << name << ">" << G4endl;
   }
 
-  if (name == emName) return;
-
-  if (name == "pai") 
-  {
+  if (name == emName) {
+    return;
+
+  } else if (name == "emstandard_opt1") {
+
     emName = name;
     delete emPhysicsList;
-    emPhysicsList = new PhysListEmModelPai(name);
-    G4cout<<"PhysListEmModelPai is called"<<G4endl;
-  }
-  else if (name == "pai_photon") 
-  {
+    emPhysicsList = new G4EmStandardPhysics_option1();
+
+  } else if (name == "emstandard_opt2") {
+
     emName = name;
     delete emPhysicsList;
-    emPhysicsList = new PhysListEmPaiPhoton(name);
-    G4cout<<"PhysListEmModelPaiPhoton is called"<<G4endl;
-  } 
-  else if (name == "pai_brem") 
-  {
+    emPhysicsList = new G4EmStandardPhysics_option2();
+
+  } else if (name == "emstandard_opt3") {
+
     emName = name;
     delete emPhysicsList;
-    emPhysicsList = new PhysListEmPAI(name);
-    G4cout<<"PhysListEmPAI is called (bremsstrahlung dedx added)"<<G4endl;
-  } 
-  else 
-  {
+    emPhysicsList = new G4EmStandardPhysics_option3();
+
+  } else if (name == "pai") {
+
+    emName = name;
+    AddPAIModel(name);
+
+  } else if (name == "pai_photon") { 
+
+    emName = name;
+    AddPAIModel(name);
+
+  } else {
+
     G4cout << "PhysicsList::AddPhysicsList: <" << name << ">"
            << " is not defined"
@@ -156 +166 @@
 
   theParticleIterator->reset();
-
   while ((*theParticleIterator)())
   {
@@ -216 +225 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
+void PhysicsList::AddPAIModel(const G4String& modname)
+{
+  theParticleIterator->reset();
+  while ((*theParticleIterator)())
+  {
+    G4ParticleDefinition* particle = theParticleIterator->value();
+    G4String partname = particle->GetParticleName();
+    if(partname == "e-" || partname == "e+") {
+      NewPAIModel(particle, modname, "eIoni");
+
+    } else if(partname == "mu-" || partname == "mu+") {
+      NewPAIModel(particle, modname, "muIoni");
+
+    } else if(partname == "proton" ||
+              partname == "pi+" ||
+              partname == "pi-"   
+              ) {
+      NewPAIModel(particle, modname, "hIoni");
+    }
+  }
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+void PhysicsList::NewPAIModel(const G4ParticleDefinition* part, 
+                              const G4String& modname,
+                              const G4String& procname)
+{
+  G4String partname = part->GetParticleName();
+  if(modname == "pai") {
+    G4PAIModel* pai = new G4PAIModel(part,"PAIModel");
+    em_config.SetExtraEmModel(partname,procname,pai,"VertexDetector",
+                              0.0,100.*TeV,pai);
+  } else if(modname == "pai_photon") {
+    G4PAIPhotonModel* pai = new G4PAIPhotonModel(part,"PAIPhotModel");
+    em_config.SetExtraEmModel(partname,procname,pai,"VertexDetector",
+                              0.0,100.*TeV,pai);
+  }
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+

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

@@ -26 +26 @@
 //
 // $Id: PhysicsListMessenger.cc,v 1.2 2006/06/29 17:00:47 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm8/src/StepMax.cc

@@ -25 +25 @@
 //
 // $Id: StepMax.cc,v 1.3 2006/06/29 17:00:49 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/electromagnetic/TestEm8/src/StepMaxMessenger.cc

@@ -25 +25 @@
 //
 // $Id: StepMaxMessenger.cc,v 1.2 2006/06/29 17:00:52 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......