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

Timestamp:

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

Author:

garnier

Message:

update processes

File:

• trunk/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyLoss.cc (modified) (9 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4hLowEnergyLoss.cc,v 1.23 2006/06/29 19:42:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4hLowEnergyLoss.cc,v 1.28 2009/02/20 10:49:54 sincerti Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -----------------------------------------------------------
@@ -145 +145 @@
 G4double G4hLowEnergyLoss::HighestKineticEnergy= 100.*GeV;
 G4int    G4hLowEnergyLoss::TotBin = 360;
-G4double G4hLowEnergyLoss::RTable,G4hLowEnergyLoss::LOGRTable;
+G4double G4hLowEnergyLoss::RTable =1.1;
+G4double G4hLowEnergyLoss::LOGRTable = 1.1;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -772 +773 @@
     theRangeTable = theRangepbarTable ;
   }
- 
   G4double R2 = RTable*RTable ;
   G4double R1 = RTable+1.;
@@ -796 +796 @@
       else
       {
-        Tim = Ti/RTable ;
+        // ---- MGP ---- Modified to avoid a floating point exception
+        // The correction is just a temporary patch, the whole class should be redesigned 
+        // Original: Tim = Ti/RTable  results in 0./0. 
+        if (RTable != 0.)
+          {
+            Tim = Ti/RTable ;
+          }
+        else
+          {
+            Tim = 0.;
+          }
         Rim = rangeVector->GetValue(Tim,isOut);
       }
@@ -806 +816 @@
         Rip = rangeVector->GetValue(Tip,isOut);
       }
-      Value = (w1*Rip + w2*Ri + w3*Rim)/(Ti*Ti) ; 
+      if (Ti!=0) Value = (w1*Rip + w2*Ri + w3*Rim)/(Ti*Ti); else Value=0; 
 
       aVector->PutValue(i,Value);
@@ -868 +878 @@
       else
       {
-        Tim = Ti/RTable ;
+        if (RTable!=0) Tim = Ti/RTable ; else Tim =0;
         Rim = rangeVector->GetValue(Tim,isOut);
       }
@@ -878 +888 @@
         Rip = rangeVector->GetValue(Tip,isOut);
       }
-      Value = (w1*Rip + w2*Ri + w3*Rim)/Ti;
+      if (Ti!=0) Value = (w1*Rip + w2*Ri + w3*Rim)/Ti; else Value=0;
 
       aVector->PutValue(i,Value);
@@ -939 +949 @@
       else
       {
-        Tim = Ti/RTable ;
+        if (RTable!=0) Tim = Ti/RTable ; else Tim=0;
         Rim = rangeVector->GetValue(Tim,isOut);
       }
@@ -1052 +1062 @@
 {
   G4double LowEdgeRange,A,B,C,discr,KineticEnergy ;
-  G4double Tbin = LowestKineticEnergy/RTable ;
+  G4double Tbin = 0;
+  if (RTable !=0.) Tbin = LowestKineticEnergy/RTable ;
   G4double rangebin = 0.0 ;
   G4int binnumber = -1 ;