Changeset 1315 for trunk/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyIonisation.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/lowenergy/src/G4hLowEnergyIonisation.cc (modified) (8 diffs)

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

@@ -100 +100 @@
 //               parametrised proton model: min(user value, model limit)
 // 26 Jan   2005 S. Chauvie added PrintInfoDefinition() for antiproton
-
-
+// 30 Sep   2009 A.Mantero Removed dependencies to old shell Ionisation XS models
+// 07 Jun    2010 Code Celaning for June beta Release
 // -----------------------------------------------------------------------
 
@@ -121 +121 @@
 #include "G4ShellVacancy.hh"
 #include "G4VhShellCrossSection.hh"
-#include "G4hShellCrossSection.hh"
-#include "G4hShellCrossSectionExp.hh"
-#include "G4hShellCrossSectionDoubleExp.hh"
 #include "G4VEMDataSet.hh"
 #include "G4EMDataSet.hh"
@@ -132 +129 @@
 #include "G4ProcessManager.hh"
 #include "G4ProductionCutsTable.hh"
-
+#include "G4teoCrossSection.hh"
+#include "G4empCrossSection.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -153 +151 @@
     shellVacancy(0),
     shellCS(0),
-    theFluo(false),
-    expFlag(false)
+    theFluo(false)
 { 
   InitializeMe();
@@ -175 +172 @@
   verboseLevel         = 0;
 
-//****************************************************************************
-// By default the method of cross section's calculation is swiched on an 
-// 2nd implementation empirical model (G4hShellCrossSectionDoubleExp), 
-// if you want to use Gryzinski's model (G4hShellCrossSection()) or the
-// 1st empiric one (G4hShellCrossSectionExp), you must change the 
-// selection below and switching expFlag to FALSE
-//****************************************************************************
-
-  //shellCS = new G4hShellCrossSection();
-  //shellCS = new G4hShellCrossSectionExp();
-  shellCS = new G4hShellCrossSectionDoubleExp();
-  expFlag=true;
+  shellCS = new G4teoCrossSection("analytical");
+
 }
 
@@ -1280 +1267 @@
   //   G4cout << "Fluorescence is switched :" << theFluo << G4endl; 
 
+  // Fluorescence data start from element 6
   if(theFluo && Z > 5) {
 
 
 
-    // Atom total cross section for the Empiric Model    
-    if (expFlag) {    
+    // Atom total cross section     
     shellCS->SetTotalCS(totalCrossSectionMap[Z]);    
-    }
+
     G4int shell = shellCS->SelectRandomShell(Z, KineticEnergy,ParticleMass,DeltaKineticEnergy);
 
-    if (expFlag && shell==1) {        
-      aParticleChange.ProposeLocalEnergyDeposit (KineticEnergy);
-      aParticleChange.ProposeEnergy(0);      
-    }
-
-
-    const G4AtomicShell* atomicShell =
-                (G4AtomicTransitionManager::Instance())->Shell(Z, shell);
-    G4double bindingEnergy = atomicShell->BindingEnergy();
-
-    if(verboseLevel > 1) {
-      G4cout << "PostStep Z= " << Z << " shell= " << shell
-             << " bindingE(keV)= " << bindingEnergy/keV
-             << " finalE(keV)= " << finalKineticEnergy/keV
-             << G4endl;
-    }
-
-    // Fluorescence data start from element 6
-
-    if (finalKineticEnergy >= bindingEnergy
-         && (bindingEnergy >= minGammaEnergy
-         ||  bindingEnergy >= minElectronEnergy) ) {
-
-      G4int shellId = atomicShell->ShellId();
-      secondaryVector = deexcitationManager.GenerateParticles(Z, shellId);
-
-      if (secondaryVector != 0) {
-
-        nSecondaries = secondaryVector->size();
-        for (size_t i = 0; i<nSecondaries; i++) {
-
-          aSecondary = (*secondaryVector)[i];
-          if (aSecondary) {
-
-            G4double e = aSecondary->GetKineticEnergy();
-            type = aSecondary->GetDefinition();
-            if (e < finalKineticEnergy &&
-                 ((type == G4Gamma::Gamma() && e > minGammaEnergy ) ||
-                  (type == G4Electron::Electron() && e > minElectronEnergy ))) {
-
-              finalKineticEnergy -= e;
-              totalNumber++;
-
-            } else {
-
-              delete aSecondary;
-              (*secondaryVector)[i] = 0;
+    if (shell!=-1) {        
+      
+      const G4AtomicShell* atomicShell =
+        (G4AtomicTransitionManager::Instance())->Shell(Z, shell);
+      G4double bindingEnergy = atomicShell->BindingEnergy();
+      
+      if(verboseLevel > 1) {
+        G4cout << "PostStep Z= " << Z << " shell= " << shell
+               << " bindingE(keV)= " << bindingEnergy/keV
+               << " finalE(keV)= " << finalKineticEnergy/keV
+               << G4endl;
+      }
+      
+      
+      
+      if (finalKineticEnergy >= bindingEnergy
+          && (bindingEnergy >= minGammaEnergy
+              ||  bindingEnergy >= minElectronEnergy) ) {
+        
+        G4int shellId = atomicShell->ShellId();
+        secondaryVector = deexcitationManager.GenerateParticles(Z, shellId);
+        
+        if (secondaryVector != 0) {
+          
+          nSecondaries = secondaryVector->size();
+          for (size_t i = 0; i<nSecondaries; i++) {
+            
+            aSecondary = (*secondaryVector)[i];
+            if (aSecondary) {
+              
+              G4double e = aSecondary->GetKineticEnergy();
+              type = aSecondary->GetDefinition();
+              if (e < finalKineticEnergy &&
+                  ((type == G4Gamma::Gamma() && e > minGammaEnergy ) ||
+                   (type == G4Electron::Electron() && e > minElectronEnergy ))) {
+                
+                finalKineticEnergy -= e;
+                totalNumber++;
+                
+              } else {
+                
+                delete aSecondary;
+                (*secondaryVector)[i] = 0;
+              }
             }
           }
@@ -1343 +1327 @@
     }
   }
-
+  
   // Save delta-electrons
 
@@ -1401 +1385 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-std::vector<G4DynamicParticle*>*
-G4hLowEnergyIonisation::DeexciteAtom(const G4MaterialCutsCouple* couple,
+
+
+void G4hLowEnergyIonisation::SelectShellIonisationCS(G4String val) {
+
+  if (val == "analytical" )  {  
+    if (shellCS) delete shellCS;
+    shellCS = new G4teoCrossSection(val);
+  }
+  else if (val == "empirical") {
+    if (shellCS) delete shellCS;
+    shellCS = new G4empCrossSection();
+  }
+}
+
+
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+
+std::vector<G4DynamicParticle*>* G4hLowEnergyIonisation::DeexciteAtom(const G4MaterialCutsCouple* couple,
                                            G4double incidentEnergy,
                                            G4double hMass,