Changeset 1055 for trunk/source/processes/electromagnetic/lowenergy/src/G4eIonisationSpectrum.cc

Timestamp:

May 28, 2009, 4:26:57 PM (15 years ago)

Author:

garnier

Message:

maj sur la beta de geant 4.9.3

File:

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

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4eIonisationSpectrum.cc,v 1.25 2006/06/29 19:42:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4eIonisationSpectrum.cc,v 1.26 2009/03/23 09:13:44 pandola Exp $
+// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
 //
 // -------------------------------------------------------------------
@@ -46 +46 @@
 // 30.05.2002 VI            Update to 24-parameters data
 // 11.07.2002 VI            Fix in integration over spectrum
+// 23.03.2009 LP            Added protection against division by zero (for 
+//                          faulty database files), Bug Report 1042
 //
 // -------------------------------------------------------------------
@@ -125 +127 @@
   p.push_back((2.0*g - 1.0)/(g*g));
   
-  p[iMax-1] = Function(p[3], p);
+  //Add protection against division by zero: actually in Function() 
+  //parameter p[3] appears in the denominator. Bug report 1042
+  if (p[3] > 0)
+    p[iMax-1] = Function(p[3], p);
+  else
+    {
+      G4cout << "WARNING: G4eIonisationSpectrum::Probability "
+             << "parameter p[3] <= 0. G4LEDATA dabatase might be corrupted for Z = " 
+             << Z << ". Please check and/or update it " << G4endl;      
+    }
 
   if(e >= 1. && e <= 0. && Z == 4) p.push_back(0.0);
@@ -210 +221 @@
   p.push_back((2.0*g - 1.0)/(g*g));
 
-  p[iMax-1] = Function(p[3], p);
+  
+  //Add protection against division by zero: actually in Function() 
+  //parameter p[3] appears in the denominator. Bug report 1042
+  if (p[3] > 0)
+    p[iMax-1] = Function(p[3], p);
+  else
+    {
+      G4cout << "WARNING: G4eIonisationSpectrum::AverageEnergy "
+             << "parameter p[3] <= 0. G4LEDATA dabatase might be corrupted for Z = " 
+             << Z << ". Please check and/or update it " << G4endl;      
+    }
     
   G4double val = AverageValue(x1, x2, p);
@@ -288 +309 @@
   p.push_back((2.0*g - 1.0)/(g*g));
 
-  p[iMax-1] = Function(p[3], p);
+  
+  //Add protection against division by zero: actually in Function() 
+  //parameter p[3] appears in the denominator. Bug report 1042
+  if (p[3] > 0)
+    p[iMax-1] = Function(p[3], p);
+  else
+    {
+      G4cout << "WARNING: G4eIonisationSpectrum::SampleSpectrum "
+             << "parameter p[3] <= 0. G4LEDATA dabatase might be corrupted for Z = " 
+             << Z << ". Please check and/or update it " << G4endl;      
+    }
 
   G4double aria1 = 0.0;