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

Timestamp:

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

Author:

garnier

Message:

tag geant4.9.4 beta 1 + modifs locales

Location:

trunk/examples/extended/electromagnetic/TestEm9/src

Files:

• DetectorConstruction.cc (modified) (2 diffs)
• DetectorMessenger.cc (modified) (1 diff)
• EmAcceptance.cc (modified) (1 diff)
• EventAction.cc (modified) (3 diffs)
• EventActionMessenger.cc (modified) (1 diff)
• HistoManager.cc (modified) (5 diffs)
• HistoMessenger.cc (modified) (1 diff)
• PhysListEmStandard.cc (modified) (1 diff)
• PhysicsList.cc (modified) (3 diffs)
• PhysicsListMessenger.cc (modified) (1 diff)
• PrimaryGeneratorAction.cc (modified) (1 diff)
• StepMax.cc (modified) (1 diff)
• StepMaxMessenger.cc (modified) (1 diff)
• SteppingAction.cc (modified) (1 diff)

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

@@ -25 +25 @@
 //
 //
-// $Id: DetectorConstruction.cc,v 1.11 2008/04/07 18:09:05 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: DetectorConstruction.cc,v 1.14 2009/11/21 17:28:16 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //
@@ -251 +251 @@
   G4double vertWidth = ecalWidth/5.;
   G4int npads = (G4int)(vertWidth/padWidth);
+  //G4cout << " vertWidth= " << vertWidth << " padWidth= " << padWidth 
+  //     << " npads= " << npads << G4endl;
+  // insure beam to hit a middle of central pad
   npads = (npads/2)*2 + 1;
-  x0 = -0.5*padWidth*((G4double)(npads-1));
-  G4double x1 = std::fabs(x0) + 0.5*padWidth + gap; 
+  x0 = -0.5*(padWidth + vertWidth);
+  G4double x1 = 0.5*vertWidth + gap; 
   G4double z  = -(vertexLength+absLength);
 

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

@@ -26 +26 @@
 //
 // $Id: DetectorMessenger.cc,v 1.3 2006/06/29 17:03:01 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //

trunk/examples/extended/electromagnetic/TestEm9/src/EmAcceptance.cc

@@ -26 +26 @@
 //
 // $Id: EmAcceptance.cc,v 1.4 2006/06/29 17:03:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //

trunk/examples/extended/electromagnetic/TestEm9/src/EventAction.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: EventAction.cc,v 1.4 2006/06/29 17:03:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: EventAction.cc,v 1.6 2010/06/07 05:40:46 perl Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -35 +35 @@
 
 #include "G4UImanager.hh"
-#include "G4TrajectoryContainer.hh"
-#include "G4Trajectory.hh"
-#include "G4VVisManager.hh"
 #include "G4Gamma.hh"
 #include "G4ios.hh"
@@ -92 +89 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-void EventAction::EndOfEventAction(const G4Event* evt)
+void EventAction::EndOfEventAction(const G4Event*)
 {
   (HistoManager::GetPointer())->EndOfEvent();
-  G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
-
-  if(pVVisManager) {
-    G4TrajectoryContainer* trjc = evt->GetTrajectoryContainer();
-    G4int n_trajectories = 0;
-    if (trjc) n_trajectories = trjc->entries();
-
-    for(G4int i=0; i<n_trajectories; i++) {
-      G4Trajectory* t = (G4Trajectory*)((*(evt->GetTrajectoryContainer()))[i]);
-      if (drawFlag == "all") t->DrawTrajectory(1000);
-      else if ((drawFlag == "charged")&&(t->GetCharge() != 0.))
-                             t->DrawTrajectory(1000);
-    }
-  }
 
   if(verbose > 0) {

trunk/examples/extended/electromagnetic/TestEm9/src/EventActionMessenger.cc

@@ -25 +25 @@
 //
 // $Id: EventActionMessenger.cc,v 1.3 2006/06/29 17:03:08 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/TestEm9/src/HistoManager.cc

@@ -38 +38 @@
 
 #include "HistoManager.hh"
+#include "G4MaterialCutsCouple.hh"
+#include "G4EmProcessSubType.hh"
+#include "G4VProcess.hh"
+#include "G4VEmProcess.hh"
+#include "G4VEnergyLossProcess.hh"
 #include "G4UnitsTable.hh"
 #include "Histo.hh"
@@ -163 +168 @@
 
   histo->book();
+
+  brem.resize(93,0.0);
+  phot.resize(93,0.0);
+  comp.resize(93,0.0);
+  conv.resize(93,0.0);
 
   if(verbose > 0) {
@@ -280 +290 @@
   }
   if(isStarted) acc.EndOfAcceptance();
+
+  // atom frequency
+  G4cout << "   Z  bremsstrahlung photoeffect  compton    conversion" << G4endl;
+  for(j=1; j<93; ++j) {
+    G4int n1 = G4int(brem[j]*x);
+    G4int n2 = G4int(phot[j]*x);
+    G4int n3 = G4int(comp[j]*x);
+    G4int n4 = G4int(conv[j]*x);
+    if(n1 + n2 + n3 + n4 > 0) {
+      G4cout << std::setw(4) << j << std::setw(12) << n1 << std::setw(12) << n2
+             << std::setw(12) << n3 << std::setw(12) << n4 << G4endl;
+    }
+  }
 }
 
@@ -390 +413 @@
   G4ThreeVector pos = aTrack->GetVertexPosition();
 
+  // primary
   if(0 == pid) {
 
@@ -414 +438 @@
     }
 
+    // secondary
+  } else {
+    const G4VProcess* proc = aTrack->GetCreatorProcess();
+    G4int type = proc->GetProcessSubType();
+    if(type == fBremsstrahlung) {
+      const G4Element* elm = static_cast<const G4VEnergyLossProcess*>(proc)->GetCurrentElement();
+      if(elm) {
+        G4int Z = G4int(elm->GetZ());
+        if(Z > 0 && Z < 93) { brem[Z] += 1.0; }
+      }
+    } else if(type == fPhotoElectricEffect) {
+      const G4Element* elm = static_cast<const G4VEmProcess*>(proc)->GetCurrentElement();
+      if(elm) {
+        G4int Z = G4int(elm->GetZ());
+        if(Z > 0 && Z < 93) { phot[Z] += 1.0; }
+      }
+    } else if(type == fGammaConversion) {
+      const G4Element* elm = static_cast<const G4VEmProcess*>(proc)->GetCurrentElement();
+      if(elm) {
+        G4int Z = G4int(elm->GetZ());
+        if(Z > 0 && Z < 93) { conv[Z] += 1.0; }
+      }
+    } else if(type == fComptonScattering) {
+      const G4Element* elm = static_cast<const G4VEmProcess*>(proc)->GetCurrentElement();
+      if(elm) {
+        G4int Z = G4int(elm->GetZ());
+        if(Z > 0 && Z < 93) { comp[Z] += 1.0; }
+      }
+    }
+
     // delta-electron
-  } else if (0 < pid && "e-" == name) {
-    if(1 < verbose) {
-      G4cout << "TrackingAction: Secondary electron " << G4endl;
-    }
-    AddDeltaElectron(dynParticle);
-
-  } else if (0 < pid && "e+" == name) {
-    if(1 < verbose) {
-      G4cout << "TrackingAction: Secondary positron " << G4endl;
-    }
-    AddPositron(dynParticle);
-
-  } else if (0 < pid && "gamma" == name) {
-    if(1 < verbose) {
-      G4cout << "TrackingAction: Secondary gamma; parentID= " << pid
-             << " E= " << kinE << G4endl;
-    }
-    AddPhoton(dynParticle);
-
+    if (0 < pid && "e-" == name) {
+      if(1 < verbose) {
+        G4cout << "TrackingAction: Secondary electron " << G4endl;
+      }
+      AddDeltaElectron(dynParticle);
+
+    } else if (0 < pid && "e+" == name) {
+      if(1 < verbose) {
+        G4cout << "TrackingAction: Secondary positron " << G4endl;
+      }
+      AddPositron(dynParticle);
+
+    } else if (0 < pid && "gamma" == name) {
+      if(1 < verbose) {
+        G4cout << "TrackingAction: Secondary gamma; parentID= " << pid
+               << " E= " << kinE << G4endl;
+      }
+      AddPhoton(dynParticle);
+    }
   }
 }

trunk/examples/extended/electromagnetic/TestEm9/src/HistoMessenger.cc

@@ -26 +26 @@
 //
 // $Id: HistoMessenger.cc,v 1.7 2008/08/22 14:11:53 vnivanch 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/TestEm9/src/PhysListEmStandard.cc

@@ -25 +25 @@
 //
 //
-// $Id: PhysListEmStandard.cc,v 1.13 2008/11/16 21:01:10 maire Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: PhysListEmStandard.cc,v 1.15 2009/11/20 20:27:21 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: PhysicsList.cc,v 1.24 2008/10/16 11:48:58 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: PhysicsList.cc,v 1.25 2009/11/20 20:22:44 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //---------------------------------------------------------------------------
@@ -50 +50 @@
 #include "G4EmStandardPhysics_option2.hh"
 #include "G4EmStandardPhysics_option3.hh"
-#include "PhysListEmLivermore.hh"
-#include "PhysListEmPenelope.hh"
+#include "G4EmLivermorePhysics.hh"
+#include "G4EmPenelopePhysics.hh"
 #include "G4DecayPhysics.hh"
 #include "G4HadronElasticPhysics.hh"
@@ -188 +188 @@
       G4cout << "PhysicsList::Set " << name << " EM physics" << G4endl;
 
-  } else if (name == "livermore") {
-    emName = name;
-    delete emPhysicsList;
-    emPhysicsList = new PhysListEmLivermore();
-    if (verboseLevel > 0) 
-      G4cout << "PhysicsList::Set Livermore EM physics" << G4endl;
-
-  } else if (name == "penelope") {
-    emName = name;
-    delete emPhysicsList;
-    emPhysicsList = new PhysListEmPenelope();
-    if (verboseLevel > 0) 
-      G4cout << "PhysicsList::Set Penelope EM physics" << G4endl;
+  } else if (name == "emlivermore") {
+    emName = name;
+    delete emPhysicsList;
+    emPhysicsList = new G4EmLivermorePhysics();
+
+  } else if (name == "empenelope") {
+    emName = name;
+    delete emPhysicsList;
+    emPhysicsList = new G4EmPenelopePhysics();
 
   } else if (name == "elastic" && !helIsRegisted) {

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

@@ -26 +26 @@
 //
 // $Id: PhysicsListMessenger.cc,v 1.4 2008/04/03 15:07:55 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 

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

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

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

@@ -25 +25 @@
 //
 // $Id: StepMax.cc,v 1.3 2006/06/29 17:03:52 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/TestEm9/src/StepMaxMessenger.cc

@@ -25 +25 @@
 //
 // $Id: StepMaxMessenger.cc,v 1.2 2006/06/29 17:03:54 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/TestEm9/src/SteppingAction.cc

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