Changeset 1347 for trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeComptonModel.cc

Timestamp:

Dec 22, 2010, 3:52:27 PM (13 years ago)

Author:

garnier

Message:

geant4 tag 9.4

File:

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

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4PenelopeComptonModel.cc,v 1.9 2010/03/26 09:32:50 pandola Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4PenelopeComptonModel.cc,v 1.11 2010/12/01 15:20:26 pandola Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // Author: Luciano Pandola
@@ -108 +108 @@
 {  
   std::map <G4int,G4DataVector*>::iterator i;
-  for (i=ionizationEnergy->begin();i != ionizationEnergy->end();i++)
-    if (i->second) delete i->second;
-  for (i=hartreeFunction->begin();i != hartreeFunction->end();i++)
-    if (i->second) delete i->second;
-  for (i=occupationNumber->begin();i != occupationNumber->end();i++)
-    if (i->second) delete i->second;
-
-
   if (ionizationEnergy)
-    delete ionizationEnergy;
+    {
+      for (i=ionizationEnergy->begin();i != ionizationEnergy->end();i++)
+        if (i->second) delete i->second;
+      delete ionizationEnergy;
+    }
   if (hartreeFunction)
-    delete hartreeFunction;
+    {
+      for (i=hartreeFunction->begin();i != hartreeFunction->end();i++)
+        if (i->second) delete i->second;
+      delete hartreeFunction;
+    }
   if (occupationNumber)
-    delete occupationNumber;
+    {
+      for (i=occupationNumber->begin();i != occupationNumber->end();i++)
+        if (i->second) delete i->second;
+      delete occupationNumber;
+    }
 }
 
@@ -265 +269 @@
 
   const G4int nmax = 64;
-  G4double rn[nmax],pac[nmax];
+  G4double rn[nmax]={0.0};
+  G4double pac[nmax]={0.0};
   
   G4double ki,ki1,ki2,ki3,taumin,a1,a2;
@@ -629 +634 @@
       G4String excep = "G4PenelopeComptonModel - G4LEDATA environment variable not set!";
       G4Exception(excep);
+      return;
     }
   G4String pathString(path);
@@ -648 +654 @@
       G4String excep = "G4PenelopeComptonModel: problem with reading data from file";
       G4Exception(excep);
+      return;
     }
 
   do{
     G4double harOfElectronsBelowThreshold = 0;
-    G4int nbOfElectronsBelowThreshold = 0;
+    G4int nbOfElectronsBelowThreshold = 0; 
+    file >> Z >> nLevels;
+    //Check for nLevels validity, before using it in a loop
+    if (nLevels<0 || nLevels>64)
+      {
+        G4String excep = "G4PenelopeComptonModel: corrupted data file?";
+        G4Exception(excep);
+        return;
+      }
     G4DataVector* occVector = new G4DataVector;
     G4DataVector* harVector = new G4DataVector;
     G4DataVector* bindingEVector = new G4DataVector;
-    file >> Z >> nLevels;
     for (G4int h=0;h<nLevels;h++)
       {