Changeset 1203 for trunk/source/physics_lists/builders/src/G4EmStandardPhysics.cc

Timestamp:

Nov 27, 2009, 11:46:04 AM (15 years ago)

Author:

garnier

Message:

update CVS

File:

• trunk/source/physics_lists/builders/src/G4EmStandardPhysics.cc (modified) (5 diffs)

trunk/source/physics_lists/builders/src/G4EmStandardPhysics.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4EmStandardPhysics.cc,v 1.16 2008/11/21 16:50:30 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4EmStandardPhysics.cc,v 1.20 2009/10/30 18:36:15 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------
@@ -54 +54 @@
 #include "G4PhotoElectricEffect.hh"
 
-#include "G4MultipleScattering.hh"
+#include "G4eMultipleScattering.hh"
+#include "G4MuMultipleScattering.hh"
 #include "G4hMultipleScattering.hh"
-#include "G4eMultipleScattering.hh"
 
 #include "G4eIonisation.hh"
@@ -155 +155 @@
     } else if (particleName == "e-") {
 
-      pmanager->AddProcess(new G4eMultipleScattering,-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+") {
 
-      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);
+      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-"    ) {
 
-      pmanager->AddProcess(new G4hMultipleScattering,-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 == "alpha" ||
-               particleName == "He3" ||
-               particleName == "GenericIon") {
+               particleName == "He3") {
+
+      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
+      pmanager->AddProcess(new G4ionIonisation,       -1, 2, 2);
+
+    } else if (particleName == "GenericIon") {
 
       pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
@@ -183 +187 @@
     } else if (particleName == "pi+" ||
                particleName == "pi-" ||
+               particleName == "kaon+" ||
+               particleName == "kaon-" ||
                particleName == "proton" ) {
 
@@ -206 +212 @@
                particleName == "anti_xi-" ||
                particleName == "deuteron" ||
-               particleName == "kaon+" ||
-               particleName == "kaon-" ||
                particleName == "lambda_c+" ||
                particleName == "omega-" ||