Changeset 1192 for trunk/source/processes/electromagnetic/lowenergy/src/G4DNAChampionElasticModel.cc

Timestamp:

Nov 19, 2009, 2:53:25 PM (15 years ago)

Author:

garnier

Message:

update par rapport a CVS

File:

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

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4DNAChampionElasticModel.cc,v 1.5 2009/04/29 17:25:21 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// $Id: G4DNAChampionElasticModel.cc,v 1.10 2009/11/03 15:04:25 sincerti Exp $
+// GEANT4 tag $Name: emlowen-V09-02-64 $
 //
 
@@ -43 +43 @@
   killBelowEnergy = 8.23*eV; // Minimum e- energy for energy loss by excitation
   lowEnergyLimit = 0 * eV; 
-  lowEnergyLimitOfModel = 7 * eV; // The model lower energy is 7 eV
+  lowEnergyLimitOfModel = 7.4 * eV; // The model lower energy is 7.4 eV
   highEnergyLimit = 10 * MeV;
   SetLowEnergyLimit(lowEnergyLimit);
@@ -56 +56 @@
   // 4 = entering in methods
   
-  G4cout << "Champion Elastic model is constructed " << G4endl
-         << "Energy range: "
-         << lowEnergyLimit / eV << " eV - "
-         << highEnergyLimit / MeV << " MeV"
-         << G4endl;
- 
+  if( verboseLevel>0 ) 
+  { 
+    G4cout << "Champion Elastic model is constructed " << G4endl
+           << "Energy range: "
+           << lowEnergyLimit / eV << " eV - "
+           << highEnergyLimit / MeV << " MeV"
+           << G4endl;
+  }
 }
 
@@ -174 +176 @@
     G4cout << "Loaded cross section files for Champion Elastic model" << G4endl;
 
-  G4cout << "Champion Elastic model is initialized " << G4endl
-         << "Energy range: "
-         << LowEnergyLimit() / eV << " eV - "
-         << HighEnergyLimit() / MeV << " MeV"
-         << G4endl;
+  if( verboseLevel>0 ) 
+  { 
+    G4cout << "Champion Elastic model is initialized " << G4endl
+           << "Energy range: "
+           << LowEnergyLimit() / eV << " eV - "
+           << HighEnergyLimit() / MeV << " MeV"
+           << G4endl;
+  }
 
   if(!isInitialised) 
@@ -210 +215 @@
             const G4Material* material = couple->GetMaterial();
 
-            size_t j = material->GetNumberOfElements();
-            while (j>0)
+            if (material->GetName() == "G4_WATER") 
             {
-               j--;
-               const G4Element* element(material->GetElement(j));
-               if (element->GetZ() == 8.)
-               {
-                  G4double density = material->GetAtomicNumDensityVector()[j];
-                  if (density > 0.) 
-                  { 
-                    flagMaterialIsWater = true; 
-                    densityWater = density; 
-                    
-                    if (verboseLevel > 3) 
-                    G4cout << "Water material is found with density(cm^-3)=" << density/(cm*cm*cm) << G4endl;
-                  }
-               }
+              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(numOfCouples>0)
 
   } // if (theCoupleTable)