Changeset 1340 for trunk/source/processes/electromagnetic/standard/src/G4alphaIonisation.cc

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/electromagnetic/standard/src/G4alphaIonisation.cc (modified) (8 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4alphaIonisation.cc,v 1.1 2009/11/10 11:50:30 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4alphaIonisation.cc,v 1.3 2010/10/26 10:06:12 vnivanch Exp $
+// GEANT4 tag $Name: emstand-V09-03-24 $
 //
 // -------------------------------------------------------------------
@@ -64 +64 @@
   : G4VEnergyLossProcess(name),
     theParticle(0),
-    isInitialised(false),
-    nuclearStopping(true)
+    isInitialised(false)
 {
   //  SetLinearLossLimit(0.15);
@@ -74 +73 @@
   mass = 0.0;
   ratio = 0.0;
+  eth = 8*MeV;
 }
 
@@ -85 +85 @@
 G4bool G4alphaIonisation::IsApplicable(const G4ParticleDefinition& p)
 {
-  return (p.GetPDGCharge() == 2*eplus);
+  return (!p.IsShortLived() &&
+          std::fabs(p.GetPDGCharge() - 2*CLHEP::eplus) < 0.01);
 }
 
@@ -122 +123 @@
     SetSecondaryParticle(G4Electron::Electron());
 
-    if (!EmModel(1)) SetEmModel(new G4BraggIonModel(), 1);
+    if (!EmModel(1)) { SetEmModel(new G4BraggIonModel(), 1); }
     EmModel(1)->SetLowEnergyLimit(MinKinEnergy());
 
@@ -129 +130 @@
     EmModel(1)->SetHighEnergyLimit(eth);
 
-    if (!FluctModel()) SetFluctModel(new G4UniversalFluctuation());
+    if (!FluctModel()) { SetFluctModel(new G4UniversalFluctuation()); }
     AddEmModel(1, EmModel(1), new G4IonFluctuations());
 
-    if (!EmModel(2)) SetEmModel(new G4BetheBlochModel(),2);  
+    if (!EmModel(2)) { SetEmModel(new G4BetheBlochModel(),2); }  
     EmModel(2)->SetLowEnergyLimit(eth);
     EmModel(2)->SetHighEnergyLimit(MaxKinEnergy());
@@ -139 +140 @@
     isInitialised = true;
   }
-  // reinitialisation of corrections for the new run
-  EmModel(1)->ActivateNuclearStopping(nuclearStopping);
-  EmModel(2)->ActivateNuclearStopping(nuclearStopping);
 }
 
@@ -147 +145 @@
 
 void G4alphaIonisation::PrintInfo()
-{
-  if (G4Alpha::Alpha() == theParticle) {
-    if(EmModel(1) && EmModel(2)) {
-      G4cout << "      NuclearStopping= " << nuclearStopping
-             << G4endl;
-    }
-  }
-}
+{}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....