Changeset 1315 for trunk/source/processes/electromagnetic/standard/src/G4hIonisation.cc

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

File:

• trunk/source/processes/electromagnetic/standard/src/G4hIonisation.cc (modified) (9 diffs)

trunk/source/processes/electromagnetic/standard/src/G4hIonisation.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4hIonisation.cc,v 1.82 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4hIonisation.cc,v 1.85 2010/06/04 09:22:14 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
@@ -79 +79 @@
 // 14-01-07 use SetEmModel() and SetFluctModel() from G4VEnergyLossProcess (mma)
 // 12-09-08 Removed CorrectionsAlongStep (VI)
+// 27-05-10 Added G4ICRU73QOModel for anti-protons (VI)
 //
 // -------------------------------------------------------------------
@@ -99 +100 @@
 #include "G4KaonPlus.hh"
 #include "G4KaonMinus.hh"
+#include "G4ICRU73QOModel.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -106 +108 @@
 G4hIonisation::G4hIonisation(const G4String& name)
   : G4VEnergyLossProcess(name),
-    isInitialised(false),
-    nuclearStopping(true)
-{
-  //  SetStepFunction(0.2, 1.0*mm);
+    isInitialised(false)
+{
+  //SetStepFunction(0.2, 1.0*mm);
   //SetIntegral(true);
   //SetVerboseLevel(1);
@@ -151 +152 @@
     const G4ParticleDefinition* theBaseParticle = 0;
     G4String pname = part->GetParticleName();
+    G4double q = part->GetPDGCharge();
 
     // standard base particles
@@ -163 +165 @@
     else if(bpart == 0) {
 
-      if(part->GetPDGSpin() == 0.0)
-        if(part->GetPDGCharge() > 0.0 ) {
-          theBaseParticle = G4KaonPlus::KaonPlus();
-        } else {
-          theBaseParticle = G4KaonMinus::KaonMinus();
-        }
-      else if(part->GetPDGCharge() > 0.0) {
-        theBaseParticle = G4Proton::Proton();
+      if(part->GetPDGSpin() == 0.0) {
+        if(q > 0.0) { theBaseParticle = G4KaonPlus::KaonPlus(); }
+        else { theBaseParticle = G4KaonMinus::KaonMinus(); }
       } else {
-        theBaseParticle = G4AntiProton::AntiProton();
+        if(q > 0.0) { theBaseParticle = G4Proton::Proton(); } 
+        else { theBaseParticle = G4AntiProton::AntiProton(); }
       }
+
       // base particle defined by interface
     } else { 
@@ -183 +182 @@
     mass  = part->GetPDGMass();
     ratio = electron_mass_c2/mass;
-
-    if(mass < 900.*MeV) nuclearStopping = false;
-
-    if (!EmModel(1)) SetEmModel(new G4BraggModel(),1);
+    eth   = 2.0*MeV*mass/proton_mass_c2;
+
+    if (!EmModel(1)) { 
+      if(q > 0.0) { SetEmModel(new G4BraggModel(),1); }
+      else { SetEmModel(new G4ICRU73QOModel(),1); }
+    }
     EmModel(1)->SetLowEnergyLimit(MinKinEnergy());
 
     // model limit defined for protons
-    eth = (EmModel(1)->HighEnergyLimit())*mass/proton_mass_c2;
+    //eth = (EmModel(1)->HighEnergyLimit())*mass/proton_mass_c2;
     EmModel(1)->SetHighEnergyLimit(eth);
     AddEmModel(1, EmModel(1), new G4IonFluctuations());
 
-    if (!FluctModel()) SetFluctModel(new G4UniversalFluctuation());
-
-    if (!EmModel(2)) SetEmModel(new G4BetheBlochModel(),2);  
+    if (!FluctModel()) { SetFluctModel(new G4UniversalFluctuation()); }
+
+    if (!EmModel(2)) { SetEmModel(new G4BetheBlochModel(),2); }
     EmModel(2)->SetLowEnergyLimit(eth);
     EmModel(2)->SetHighEnergyLimit(MaxKinEnergy());
@@ -203 +204 @@
     isInitialised = true;
   }
-  EmModel(1)->ActivateNuclearStopping(nuclearStopping);
-  EmModel(2)->ActivateNuclearStopping(nuclearStopping);
 }
 
@@ -210 +209 @@
 
 void G4hIonisation::PrintInfo()
-{
-  if(EmModel(1) && EmModel(2)) {
-    G4cout << "      NuclearStopping= " << nuclearStopping
-           << G4endl;
-  }
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+{}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void G4hIonisation::ActivateNuclearStopping(G4bool)
+{}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....