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

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4DNAEmfietzoglouExcitationModel.cc,v 1.8 2009/08/13 11:32:47 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4DNAEmfietzoglouExcitationModel.cc,v 1.10 2010/06/08 21:50:00 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 
@@ -45 +45 @@
   SetLowEnergyLimit(lowEnergyLimit);
   SetHighEnergyLimit(highEnergyLimit);
+
+  nLevels = waterExcitation.NumberOfLevels();
 
   verboseLevel= 0;
@@ -97 +99 @@
 
   //
-  
-  nLevels = waterExcitation.NumberOfLevels();
-
-  //
   if( verboseLevel>0 ) 
   { 
@@ -122 +120 @@
   // InitialiseElementSelectors(particle,cuts);
 
-  // Test if water material
-
-  flagMaterialIsWater= false;
-  densityWater = 0;
-
-  const G4ProductionCutsTable* theCoupleTable = G4ProductionCutsTable::GetProductionCutsTable();
-
-  if(theCoupleTable) 
-  {
-    G4int numOfCouples = theCoupleTable->GetTableSize();
-  
-    if(numOfCouples>0) 
-    {
-          for (G4int i=0; i<numOfCouples; i++) 
-          {
-            const G4MaterialCutsCouple* couple = theCoupleTable->GetMaterialCutsCouple(i);
-            const G4Material* material = couple->GetMaterial();
-
-            if (material->GetName() == "G4_WATER") 
-            {
-              G4double density = material->GetAtomicNumDensityVector()[1];
-              flagMaterialIsWater = true; 
-              densityWater = density; 
-              
-              if (verboseLevel > 3) 
-              G4cout << "****** Water material is found with density(cm^-3)=" << density/(cm*cm*cm) << G4endl;
-            }
-  
-          }
-
-    } // if(numOfCouples>0)
-
-  } // if (theCoupleTable)
-
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-G4double G4DNAEmfietzoglouExcitationModel::CrossSectionPerVolume(const G4Material*,
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+G4double G4DNAEmfietzoglouExcitationModel::CrossSectionPerVolume(const G4Material* material,
                                            const G4ParticleDefinition* particleDefinition,
                                            G4double ekin,
@@ -173 +137 @@
  G4double sigma=0;
  
- if (flagMaterialIsWater)
+ if (material->GetName() == "G4_WATER")
  {
 
@@ -188 +152 @@
     G4cout << "---> Kinetic energy(eV)=" << ekin/eV << G4endl;
     G4cout << " - Cross section per water molecule (cm^2)=" << sigma/cm/cm << G4endl;
-    G4cout << " - Cross section per water molecule (cm^-1)=" << sigma*densityWater/(1./cm) << G4endl;
+    G4cout << " - Cross section per water molecule (cm^-1)=" << sigma*material->GetAtomicNumDensityVector()[1]/(1./cm) << G4endl;
   } 
 
- } // if (flagMaterialIsWater)
-         
- return sigma*densityWater;                
+ } 
+       
+ return sigma*material->GetAtomicNumDensityVector()[1];            
 }
 
@@ -271 +235 @@
       sigma = excitationSigma / density;
   }
+
   return sigma;
 }