Changeset 1209 for trunk/examples/novice/N03/src

Timestamp:

Dec 2, 2009, 3:57:26 PM (16 years ago)

Author:

garnier

Message:

CVS update

Location:

trunk/examples/novice/N03/src

Files:

• ExN03DetectorConstruction.cc (modified) (2 diffs)
• ExN03DetectorMessenger.cc (modified) (1 diff)
• ExN03EventAction.cc (modified) (3 diffs)
• ExN03EventActionMessenger.cc (modified) (1 diff)
• ExN03PhysicsList.cc (modified) (4 diffs)
• ExN03PrimaryGeneratorAction.cc (modified) (1 diff)
• ExN03PrimaryGeneratorMessenger.cc (modified) (1 diff)
• ExN03RunAction.cc (modified) (3 diffs)
• ExN03SteppingAction.cc (modified) (1 diff)
• ExN03SteppingVerbose.cc (modified) (1 diff)

trunk/examples/novice/N03/src/ExN03DetectorConstruction.cc

@@ -25 +25 @@
 //
 //
-// $Id: ExN03DetectorConstruction.cc,v 1.23 2006/06/29 17:48:54 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN03DetectorConstruction.cc,v 1.24 2008/08/12 20:00:03 gum Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 
@@ -184 +184 @@
 
 G4Material* CO2 = 
-new G4Material("CarbonicGas", density= 27.*mg/cm3, ncomponents=2,
+new G4Material("CarbonicGas", density= 1.842*mg/cm3, ncomponents=2,
                               kStateGas, 325.*kelvin, 50.*atmosphere);
 CO2->AddElement(C, natoms=1);

trunk/examples/novice/N03/src/ExN03DetectorMessenger.cc

@@ -26 +26 @@
 //
 // $Id: ExN03DetectorMessenger.cc,v 1.10 2006/06/29 17:48:58 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/novice/N03/src/ExN03EventAction.cc

@@ -25 +25 @@
 //
 //
-// $Id: ExN03EventAction.cc,v 1.28 2006/10/26 14:30:05 allison Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN03EventAction.cc,v 1.29 2008/01/17 17:31:32 maire Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 
@@ -66 +66 @@
 void ExN03EventAction::BeginOfEventAction(const G4Event* evt)
 {  
- G4int evtNb = evt->GetEventID();
- if (evtNb%printModulo == 0) { 
-   G4cout << "\n---> Begin of event: " << evtNb << G4endl;
-   CLHEP::HepRandom::showEngineStatus();
- }
+  G4int evtNb = evt->GetEventID();
+  if (evtNb%printModulo == 0) { 
+    G4cout << "\n---> Begin of event: " << evtNb << G4endl;
+    CLHEP::HepRandom::showEngineStatus();
+}
  
  // initialisation per event
@@ -103 +103 @@
        << G4endl;
           
-  }  
+  }
 }  
 

trunk/examples/novice/N03/src/ExN03EventActionMessenger.cc

@@ -26 +26 @@
 //
 // $Id: ExN03EventActionMessenger.cc,v 1.12 2006/10/26 14:28:00 allison Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/novice/N03/src/ExN03PhysicsList.cc

@@ -25 +25 @@
 //
 //
-// $Id: ExN03PhysicsList.cc,v 1.21 2007/07/02 13:22:08 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN03PhysicsList.cc,v 1.26 2009/11/15 14:48:40 maire Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 
@@ -142 +142 @@
 #include "G4PhotoElectricEffect.hh"
 
-#include "G4MultipleScattering.hh"
-
+#include "G4eMultipleScattering.hh"
 #include "G4eIonisation.hh"
 #include "G4eBremsstrahlung.hh"
 #include "G4eplusAnnihilation.hh"
 
+#include "G4MuMultipleScattering.hh"
 #include "G4MuIonisation.hh"
 #include "G4MuBremsstrahlung.hh"
 #include "G4MuPairProduction.hh"
 
+#include "G4hMultipleScattering.hh"
 #include "G4hIonisation.hh"
+#include "G4hBremsstrahlung.hh"
+#include "G4hPairProduction.hh"
+
+#include "G4ionIonisation.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -172 +177 @@
     } else if (particleName == "e-") {
       //electron
-      pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
-      pmanager->AddProcess(new G4eIonisation,       -1, 2,2);
-      pmanager->AddProcess(new G4eBremsstrahlung,   -1, 3,3);      
+      pmanager->AddProcess(new G4eMultipleScattering,-1, 1, 1);
+      pmanager->AddProcess(new G4eIonisation,        -1, 2, 2);
+      pmanager->AddProcess(new G4eBremsstrahlung,    -1, 3, 3);      
 
     } else if (particleName == "e+") {
       //positron
-      pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
-      pmanager->AddProcess(new G4eIonisation,       -1, 2,2);
-      pmanager->AddProcess(new G4eBremsstrahlung,   -1, 3,3);
-      pmanager->AddProcess(new G4eplusAnnihilation,  0,-1,4);
-
+      pmanager->AddProcess(new G4eMultipleScattering,-1, 1, 1);
+      pmanager->AddProcess(new G4eIonisation,        -1, 2, 2);
+      pmanager->AddProcess(new G4eBremsstrahlung,    -1, 3, 3);
+      pmanager->AddProcess(new G4eplusAnnihilation,   0,-1, 4);
+    
     } else if( particleName == "mu+" || 
                particleName == "mu-"    ) {
       //muon  
-      pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
-      pmanager->AddProcess(new G4MuIonisation,      -1, 2,2);
-      pmanager->AddProcess(new G4MuBremsstrahlung,  -1, 3,3);
-      pmanager->AddProcess(new G4MuPairProduction,  -1, 4,4);       
+      pmanager->AddProcess(new G4MuMultipleScattering,-1, 1, 1);
+      pmanager->AddProcess(new G4MuIonisation,       -1, 2, 2);
+      pmanager->AddProcess(new G4MuBremsstrahlung,   -1, 3, 3);
+      pmanager->AddProcess(new G4MuPairProduction,   -1, 4, 4);
+             
+    } else if( particleName == "proton" ||
+               particleName == "pi-" ||
+               particleName == "pi+"    ) {
+      //proton  
+      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
+      pmanager->AddProcess(new G4hIonisation,         -1, 2, 2);
+      pmanager->AddProcess(new G4hBremsstrahlung,     -1, 3, 3);
+      pmanager->AddProcess(new G4hPairProduction,     -1, 4, 4);       
      
-    } else if ((!particle->IsShortLived()) &&
+    } else if( particleName == "alpha" || 
+               particleName == "He3" )     {
+      //alpha 
+      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
+      pmanager->AddProcess(new G4ionIonisation,       -1, 2, 2);
+     
+    } else if( particleName == "GenericIon" ) { 
+      //Ions 
+      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
+      pmanager->AddProcess(new G4ionIonisation,       -1, 2, 2);     
+      
+      } else if ((!particle->IsShortLived()) &&
                (particle->GetPDGCharge() != 0.0) && 
                (particle->GetParticleName() != "chargedgeantino")) {
       //all others charged particles except geantino
-      pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
-      pmanager->AddProcess(new G4hIonisation,       -1, 2,2); 
-    }
+      pmanager->AddProcess(new G4hMultipleScattering,-1, 1, 1);
+      pmanager->AddProcess(new G4hIonisation,        -1, 2, 2);        
+    }     
   }
 }
@@ -237 +262 @@
   SetCutValue(defaultCutValue, "e-");
   SetCutValue(defaultCutValue, "e+");
+  SetCutValue(defaultCutValue, "proton");
 
   if (verboseLevel>0) DumpCutValuesTable();

trunk/examples/novice/N03/src/ExN03PrimaryGeneratorAction.cc

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

trunk/examples/novice/N03/src/ExN03PrimaryGeneratorMessenger.cc

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

trunk/examples/novice/N03/src/ExN03RunAction.cc

@@ -25 +25 @@
 //
 //
-// $Id: ExN03RunAction.cc,v 1.18 2006/06/29 17:49:11 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: ExN03RunAction.cc,v 1.19 2008/01/17 17:31:32 maire Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -55 +55 @@
   //inform the runManager to save random number seed
   G4RunManager::GetRunManager()->SetRandomNumberStore(true);
-  
+    
   //initialize cumulative quantities
   //
@@ -117 +117 @@
      << " +- "                               << G4BestUnit(rmsLGap,"Length")
      << "\n------------------------------------------------------------\n"
-     << G4endl;   
+     << G4endl;
 }
 

trunk/examples/novice/N03/src/ExN03SteppingAction.cc

@@ -26 +26 @@
 //
 // $Id: ExN03SteppingAction.cc,v 1.15 2006/06/29 17:49:13 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/novice/N03/src/ExN03SteppingVerbose.cc

@@ -26 +26 @@
 //
 // $Id: ExN03SteppingVerbose.cc,v 1.13 2006/06/29 17:49:16 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......