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

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

@@ -35 +35 @@
 // First implementation: 11. 03. 2009
 //
-// Modifications: 
-//
+// Modifications: 12. 11 .2009 - Function BuildDEDXTable: Using adapted build 
+//                               methods of stopping power classes according
+//                               to interface change in G4VIonDEDXTable.
+//                               Function UpdateCacheValue: Using adapted
+//                               ScalingFactorEnergy function according to
+//                               interface change in G4VIonDEDXScaling-
+//                               Algorithm (AL)
 //
 // Class description:
@@ -227 +232 @@
   const G4String& materialName = material -> GetName();
 
-  isApplicable = table -> IsApplicable(atomicNumberBase, chemFormula);
+  isApplicable = table -> BuildPhysicsVector(atomicNumberBase, chemFormula);
 
   if(isApplicable) { 
@@ -235 +240 @@
   }
 
-  isApplicable = table -> IsApplicable(atomicNumberBase, materialName);
+  isApplicable = table -> BuildPhysicsVector(atomicNumberBase, materialName);
   if(isApplicable) { 
      stoppingPowerTable[key] = 
@@ -253 +258 @@
       G4int atomicNumberMat = G4int((*elementVector)[i] -> GetZ());
 
-      isApplicable = table -> IsApplicable(atomicNumberBase, atomicNumberMat);
+      isApplicable = table -> BuildPhysicsVector(atomicNumberBase, atomicNumberMat);
 
       if(isApplicable) { 
@@ -274 +279 @@
         size_t nmbdEdxBins = dEdxTable[0] -> GetVectorLength();
         G4double lowerEdge = dEdxTable[0] -> GetLowEdgeEnergy(0);
-        G4double upperEdge = dEdxTable[0] -> GetLowEdgeEnergy(nmbdEdxBins);
+        G4double upperEdge = dEdxTable[0] -> GetLowEdgeEnergy(nmbdEdxBins-1);
 
         G4LPhysicsFreeVector* dEdxBragg = 
@@ -339 +344 @@
      G4double nmbNucleons = G4double(particle -> GetAtomicMass());
      value.energyScaling = 
-            algorithm -> ScalingFactorEnergy(particle) / nmbNucleons;
+           algorithm -> ScalingFactorEnergy(particle, material) / nmbNucleons;
 
      size_t nmbdEdxBins = value.dedxVector -> GetVectorLength();