Changeset 961 for trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationMillerGreen.cc

Timestamp:

Apr 6, 2009, 12:21:12 PM (15 years ago)

Author:

garnier

Message:

update processes

File:

• trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationMillerGreen.cc (modified) (5 diffs)

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationMillerGreen.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-//
-// $Id: G4CrossSectionExcitationMillerGreen.cc,v 1.3 2007/11/09 20:11:04 pia Exp $
-// GEANT4 tag $Name:  $
-// 
-// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
-//
-// Reference: TNS Geant4-DNA paper
-// Reference for implementation model: NIM. 155, pp. 145-156, 1978
-
-// History:
-// -----------
-// Date         Name              Modification
-// 28 Apr 2007  M.G. Pia          Created in compliance with design described in TNS paper
-//
-// -------------------------------------------------------------------
-
-// Class description:
-// Geant4-DNA Cross total cross section for electron elastic scattering in water
-// Reference: TNS Geant4-DNA paper
-// S. Chauvie et al., Geant4 physics processes for microdosimetry simulation:
-// design foundation and implementation of the first set of models,
-// IEEE Trans. Nucl. Sci., vol. 54, no. 6, Dec. 2007.
-// Further documentation available from http://www.ge.infn.it/geant4/dna
-
-// -------------------------------------------------------------------
-
+// $Id: G4CrossSectionExcitationMillerGreen.cc,v 1.4 2008/07/14 20:47:34 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 
 #include "G4CrossSectionExcitationMillerGreen.hh"
-#include "G4Track.hh"
-#include "G4DynamicParticle.hh"
-#include "G4Proton.hh"
-#include "G4CrossSectionExcitationEmfietzoglouPartial.hh"
-#include "G4DNAGenericIonsManager.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 G4CrossSectionExcitationMillerGreen::G4CrossSectionExcitationMillerGreen()
 {
-  // Default energy limits (defined for protection against anomalous behaviour only)
-  name = "ExcitationMillerGreen";
   lowEnergyLimitDefault = 10 * eV;
   highEnergyLimitDefault = 10 * MeV;
@@ -78 +49 @@
 
   if (protonDef != 0)
-    {
-      proton = protonDef->GetParticleName();
-      lowEnergyLimit[proton] = 10. * eV;
-      highEnergyLimit[proton] = 500. * keV;
-    }
+  {
+    proton = protonDef->GetParticleName();
+    lowEnergyLimit[proton] = 10. * eV;
+    highEnergyLimit[proton] = 500. * keV;
+  }
   else
-    {
-      G4Exception("G4CrossSectionExcitationMillerGreen Constructor: proton is not defined");
-    }
+  {
+    G4Exception("G4CrossSectionExcitationMillerGreen Constructor: proton is not defined");
+  }
 
   if (alphaPlusPlusDef != 0)
-    {
-      alphaPlusPlus = alphaPlusPlusDef->GetParticleName();
-      lowEnergyLimit[alphaPlusPlus] = 1. * keV;
-      highEnergyLimit[alphaPlusPlus] = 10. * MeV;
-    }
+  {
+    alphaPlusPlus = alphaPlusPlusDef->GetParticleName();
+    lowEnergyLimit[alphaPlusPlus] = 1. * keV;
+    highEnergyLimit[alphaPlusPlus] = 10. * MeV;
+  }
   else
-    {
+  {
       G4Exception("G4CrossSectionExcitationMillerGreen Constructor: alphaPlusPlus is not defined");
-    }
+  }
 
   if (alphaPlusDef != 0)
-    {
-      alphaPlus = alphaPlusDef->GetParticleName();
-      lowEnergyLimit[alphaPlus] = 1. * keV;
-      highEnergyLimit[alphaPlus] = 10. * MeV;
-    }
+  {
+    alphaPlus = alphaPlusDef->GetParticleName();
+    lowEnergyLimit[alphaPlus] = 1. * keV;
+    highEnergyLimit[alphaPlus] = 10. * MeV;
+  }
   else
-    {
-      G4Exception("G4CrossSectionExcitationMillerGreen Constructor: alphaPlus is not defined");
-    }
+  {
+    G4Exception("G4CrossSectionExcitationMillerGreen Constructor: alphaPlus is not defined");
+  }
 
   if (heliumDef != 0)
-    {
-      helium = heliumDef->GetParticleName();
-      lowEnergyLimit[helium] = 1. * keV;
-      highEnergyLimit[helium] = 10. * MeV;
-    }
+  {
+    helium = heliumDef->GetParticleName();
+    lowEnergyLimit[helium] = 1. * keV;
+    highEnergyLimit[helium] = 10. * MeV;
+  }
   else
-    {
-      G4Exception("G4CrossSectionExcitationMillerGreen Constructor: helium is not defined");
-    }
-  
-  
+  {
+    G4Exception("G4CrossSectionExcitationMillerGreen Constructor: helium is not defined");
+  }
+    
 }
 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 G4CrossSectionExcitationMillerGreen::~G4CrossSectionExcitationMillerGreen()
 {}
  
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 G4double G4CrossSectionExcitationMillerGreen::CrossSection(const G4Track& track)
@@ -154 +126 @@
   const G4String& particleName = particle->GetDefinition()->GetParticleName();
 
-  // Retrieve energy limits for the current particle type
-
   std::map< G4String,G4double,std::less<G4String> >::iterator pos1;
   pos1 = lowEnergyLimit.find(particleName);
 
-  // Lower limit
   if (pos1 != lowEnergyLimit.end())
-    {
-      lowLim = pos1->second;
-    }
+  {
+    lowLim = pos1->second;
+  }
 
-  // Upper limit
   std::map< G4String,G4double,std::less<G4String> >::iterator pos2;
   pos2 = highEnergyLimit.find(particleName);
 
   if (pos2 != highEnergyLimit.end())
-    {
-      highLim = pos2->second;
-    }
+  {
+    highLim = pos2->second;
+  }
 
-  //
   const G4ParticleDefinition* particleDefinition = track.GetDefinition();
 
@@ -180 +147 @@
   
   if (k >= lowLim && k <= highLim)
+  {
+    crossSection = partialCrossSection.Sum(k,particleDefinition);
+    G4DNAGenericIonsManager *instance;
+    instance = G4DNAGenericIonsManager::Instance();
+
+    // add ONE or TWO electron-water excitation for alpha+ and helium
+  
+    if ( particleDefinition == instance->GetIon("alpha+") 
+         ||
+         particleDefinition == instance->GetIon("helium")
+       ) 
     {
-  
-      crossSection = partialCrossSection.Sum(k,particleDefinition);
-      G4DNAGenericIonsManager *instance;
-      instance = G4DNAGenericIonsManager::Instance();
-
-      // add ONE or TWO electron-water excitation for alpha+ and helium
-  
-      if ( particleDefinition == instance->GetIon("alpha+") 
-           ||
-           particleDefinition == instance->GetIon("helium")
-           ) 
-        {
           G4CrossSectionExcitationEmfietzoglouPartial * excitationXS = 
             new G4CrossSectionExcitationEmfietzoglouPartial();
+
           G4double sigmaExcitation=0;
           if (k*0.511/3728 > 7.4*eV && k*0.511/3728 < 10*keV) sigmaExcitation = excitationXS->Sum(k*0.511/3728);
@@ -200 +167 @@
           if ( particleDefinition == instance->GetIon("alpha+") ) 
             crossSection = crossSection +  sigmaExcitation ;
+          
           if ( particleDefinition == instance->GetIon("helium") ) 
             crossSection = crossSection + 2*sigmaExcitation ;
+          
           delete excitationXS;
-        }      
-    }
+    }      
+  }
      
   return crossSection;