Changeset 1340 for trunk/source/processes/electromagnetic/standard/src/G4ionIonisation.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/G4ionIonisation.cc (modified) (8 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4ionIonisation.cc,v 1.70 2009/11/27 20:06:32 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4ionIonisation.cc,v 1.72 2010/10/26 10:42:04 vnivanch Exp $
+// GEANT4 tag $Name: emstand-V09-03-24 $
 //
 // -------------------------------------------------------------------
@@ -66 +66 @@
 #include "G4Electron.hh"
 #include "G4Proton.hh"
-//#include "G4Alpha.hh"
 #include "G4GenericIon.hh"
 #include "G4BraggModel.hh"
@@ -83 +82 @@
 G4ionIonisation::G4ionIonisation(const G4String& name)
   : G4VEnergyLossProcess(name),
-    corr(0),
     theParticle(0),
     isInitialised(false),
-    stopDataActive(true),
-    nuclearStopping(true)
+    stopDataActive(true)
 {
   SetLinearLossLimit(0.02);
@@ -95 +92 @@
   //  SetVerboseLevel(1);
   corr = G4LossTableManager::Instance()->EmCorrections();
+  eth = 2*MeV;
 }
 
@@ -136 +134 @@
     const G4ParticleDefinition* theBaseParticle = 0;
 
-    if(part == ion)     theBaseParticle = 0;
-    else if(bpart == 0) theBaseParticle = ion;
-    else                theBaseParticle = bpart;
+    if(part == ion)     { theBaseParticle = 0; }
+    else if(bpart == 0) { theBaseParticle = ion; }
+    else                { theBaseParticle = bpart; }
 
     SetBaseParticle(theBaseParticle);
     SetSecondaryParticle(G4Electron::Electron());
 
-    if (!EmModel(1)) SetEmModel(new G4BraggIonModel(), 1);
+    if (!EmModel(1)) { SetEmModel(new G4BraggIonModel(), 1); }
     EmModel(1)->SetLowEnergyLimit(MinKinEnergy());
 
@@ -150 +148 @@
     EmModel(1)->SetHighEnergyLimit(eth);
 
-    if (!FluctModel()) SetFluctModel(new G4IonFluctuations());
+    if (!FluctModel()) { SetFluctModel(new G4IonFluctuations()); }
     AddEmModel(1, EmModel(1), FluctModel());
 
-    if (!EmModel(2)) SetEmModel(new G4BetheBlochModel(),2);  
+    if (!EmModel(2)) { SetEmModel(new G4BetheBlochModel(),2); }  
     EmModel(2)->SetLowEnergyLimit(eth);
     EmModel(2)->SetHighEnergyLimit(MaxKinEnergy());
@@ -166 +164 @@
   }
   // reinitialisation of corrections for the new run
-  EmModel(1)->ActivateNuclearStopping(nuclearStopping);
-  EmModel(2)->ActivateNuclearStopping(nuclearStopping);
-  if(part == ion) corr->InitialiseForNewRun();
+  if(part == ion) { corr->InitialiseForNewRun(); }
 }
 
@@ -178 +174 @@
     G4cout << "      Stopping Power data for " 
            << corr->GetNumberOfStoppingVectors()
-           << " ion/material pairs, nuclearStopping: " << nuclearStopping
+           << " ion/material pairs "
            << G4endl;
   }