Changeset 1347 for trunk/source/materials/src/G4ExtDEDXTable.cc

Timestamp:

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

Author:

garnier

Message:

geant4 tag 9.4

File:

• trunk/source/materials/src/G4ExtDEDXTable.cc (modified) (12 diffs)

trunk/source/materials/src/G4ExtDEDXTable.cc

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4ExtDEDXTable.cc,v 1.4 2010/11/01 18:18:57 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // ===========================================================================
@@ -39 +41 @@
 // 03.11.2009 A. Lechner:  Added new methods BuildPhysicsVector according
 //            to interface changes in base class G4VIonDEDXTable.
+// 25.10.2010 V.Ivanchenko fixed bug in usage of iterators reported by the 
+//            Coverity tool
+// 01.11.2010 V.Ivanchenko fixed remaining bugs reported by Coverity 
 //
 //
@@ -220 +225 @@
 
 #ifdef G4VERBOSE
-     G4cerr << "G4IonDEDXTable::AddPhysicsVector() Error: Pointer to vector"
+     G4cout << "G4IonDEDXTable::AddPhysicsVector() Error: Pointer to vector"
             << " is null-pointer."
             << G4endl;
@@ -231 +236 @@
 
 #ifdef G4VERBOSE
-     G4cerr << "G4IonDEDXTable::AddPhysicsVector() Error: "
+     G4cout << "G4IonDEDXTable::AddPhysicsVector() Error: "
             << "Cannot add physics vector. Invalid name."
             << G4endl;
@@ -242 +247 @@
 
 #ifdef G4VERBOSE
-     G4cerr << "G4IonDEDXTable::AddPhysicsVector() Error: "
+     G4cout << "G4IonDEDXTable::AddPhysicsVector() Error: "
             << "Cannot add physics vector. Illegal atomic number."
             << G4endl;
@@ -257 +262 @@
 
 #ifdef G4VERBOSE
-        G4cerr << "G4IonDEDXTable::AddPhysicsVector() Error: "
+        G4cout << "G4IonDEDXTable::AddPhysicsVector() Error: "
                << "Vector already exists. Remove first before replacing."
                << G4endl;
@@ -272 +277 @@
 
 #ifdef G4VERBOSE
-     G4cerr << "G4IonDEDXTable::AddPhysicsVector() Error: "
+     G4cout << "G4IonDEDXTable::AddPhysicsVector() Error: "
             << "Vector already exists. Remove first before replacing."
             << G4endl;
@@ -302 +307 @@
 
 #ifdef G4VERBOSE
-    G4cerr << "G4IonDEDXTable::RemovePhysicsVector() Warning: "
-            << "Cannot remove physics vector. Vector not found."
-             << G4endl;
-#endif
-
-     return false;
+    G4cout << "G4IonDEDXTable::RemovePhysicsVector() Warning: "
+           << "Cannot remove physics vector. Vector not found."
+           << G4endl;
+#endif
+
+    return false;
   }
 
@@ -314 +319 @@
 
   // Deleting key of physics vector from elemental material map (if it exists)
-  G4IonDEDXMapElem::iterator iter_beg = dedxMapElements.begin();
-  G4IonDEDXMapElem::iterator iter_end = dedxMapElements.end();
+  G4IonDEDXMapElem::iterator it;
   
-  for(;iter_beg != iter_end; iter_beg++) {
-
-     if( (*iter_beg).second == physicsVector ) {
-
-        dedxMapElements.erase(iter_beg);
+  for(it=dedxMapElements.begin(); it!=dedxMapElements.end(); ++it) {
+
+     if( (*it).second == physicsVector ) {
+        dedxMapElements.erase(it);
+        break;
      }
   }
@@ -345 +349 @@
 
 #ifdef G4VERBOSE
-     G4cerr << "G4ExtDEDXTable::StorePhysicsVector() " 
+     G4cout << "G4ExtDEDXTable::StorePhysicsVector() " 
             << " Cannot open file "<< fileName 
             << G4endl;
@@ -388 +392 @@
 
 #ifdef G4VERBOSE
-              G4cerr << "G4ExtDEDXTable::StorePhysicsVector() " 
+              G4cout << "G4ExtDEDXTable::StorePhysicsVector() " 
                      << " Cannot store physics vector." 
                      << G4endl;
@@ -409 +413 @@
 
   std::ifstream ifilestream;
-
   ifilestream.open( fileName, std::ios::in );
-
-  if( !ifilestream ) {
-
-#ifdef G4VERBOSE
-     G4cerr << "G4ExtDEDXTable::RetrievePhysicsVector() " 
-            << " Cannot open file "<< fileName 
-            << G4endl;
-#endif
-      
-     return false;
+  if( ! ifilestream ) {
+#ifdef G4VERBOSE
+    G4cout << "G4ExtDEDXTable::RetrievePhysicsVector() " 
+           << " Cannot open file "<< fileName 
+           << G4endl;
+#endif
+    return false;
   }   
 
-  G4int nmbVectors;
-
+  std::string::size_type nmbVectors = 0;
   ifilestream >> nmbVectors;
-  
-  for(G4int i = 0; i < nmbVectors; i++) {
-
-      G4String line = "";
-
-      while( line.empty() ) {
-
-         getline( ifilestream, line );
-
-         if( ifilestream.fail() ) { 
-
+
+  if(nmbVectors == std::string::npos || nmbVectors == 0) {
+#ifdef G4VERBOSE
+    G4cout << "G4ExtDEDXTable::RetrievePhysicsVector() " 
+           << " The file is empty "<< nmbVectors 
+           << G4endl;
+#endif
+    return false;
+  }  
+  for(size_t i = 0; i<nmbVectors; ++i) {
+
+    G4String line = "";
+    while( line.empty() ) {
+
+      getline( ifilestream, line );
+      if( ifilestream.fail() ) { 
 #ifdef G4VERBOSE  
-            G4cerr << "G4ExtDEDXTable::RetrievePhysicsTable() " 
-                   << " File content of " << fileName << " ill-formated." 
-                   << G4endl;
+        G4cout << "G4ExtDEDXTable::RetrievePhysicsTable() " 
+               << " File content of " << fileName << " ill-formated." 
+               << G4endl;
 #endif          
-            ifilestream.close(); 
-            return false; 
-         }
-
-         size_t pos = line.find_first_of("#");
-         line = line.substr(0, pos);
+        ifilestream.close(); 
+        return false; 
       }
 
-      std::istringstream headerstream( line );     
-
-      G4int atomicNumberIon;
-      headerstream >> atomicNumberIon;
-
-      G4String materialName;
-      headerstream >> materialName;
-
-      if( headerstream.fail() ) {
+      std::string::size_type pos = line.find_first_of("#");
+      if(pos != std::string::npos && pos > 0) {
+        line = line.substr(0, pos);
+      }
+    }
+
+    std::istringstream headerstream( line );     
+
+    std::string::size_type atomicNumberIon;
+    headerstream >> atomicNumberIon;
+
+    G4String materialName;
+    headerstream >> materialName;
+
+    if( headerstream.fail() || std::string::npos == atomicNumberIon) {
  
 #ifdef G4VERBOSE  
-         G4cerr << "G4ExtDEDXTable::RetrievePhysicsTable() " 
-                << " File content of " << fileName << " ill-formated "
-                << " (vector header)." 
-                << G4endl;
+      G4cout << "G4ExtDEDXTable::RetrievePhysicsTable() " 
+             << " File content of " << fileName << " ill-formated "
+             << " (vector header)." 
+             << G4endl;
 #endif          
-         ifilestream.close();
-         return false;
-      } 
-
-      G4int atomicNumberMat;
-      headerstream >> atomicNumberMat;
-
-      if( headerstream.eof() ) atomicNumberMat = 0; 
-
-      G4int vectorType;
-
-      ifilestream >>  vectorType;
+      ifilestream.close();
+      return false;
+    } 
+
+    std::string::size_type atomicNumberMat;
+    headerstream >> atomicNumberMat;
+
+    if( headerstream.eof() || std::string::npos == atomicNumberMat) { 
+      atomicNumberMat = 0; 
+    }
+
+    G4int vectorType;
+    ifilestream >> vectorType;
       
-      G4PhysicsVector* physicsVector = CreatePhysicsVector(vectorType);
-
-      if(physicsVector == 0) {
-
+    G4PhysicsVector* physicsVector = CreatePhysicsVector(vectorType);
+
+    if(physicsVector == 0) {
 #ifdef G4VERBOSE  
-         G4cerr << "G4ExtDEDXTable::RetrievePhysicsTable  "
-                << " illegal physics Vector type " << vectorType
-                << " in  " << fileName 
-                << G4endl;
+      G4cout << "G4ExtDEDXTable::RetrievePhysicsTable  "
+             << " illegal physics Vector type " << vectorType
+             << " in  " << fileName 
+             << G4endl;
 #endif          
-         ifilestream.close();
-         return false;
-      }
-
-      if( !physicsVector -> Retrieve(ifilestream, true) ) {
- 
+      ifilestream.close();
+      return false;
+    }
+
+    if( !physicsVector -> Retrieve(ifilestream, true) ) {
+        
 #ifdef G4VERBOSE  
-         G4cerr << "G4ExtDEDXTable::RetrievePhysicsTable() " 
-                << " File content of " << fileName << " ill-formated." 
-                << G4endl;
+      G4cout << "G4ExtDEDXTable::RetrievePhysicsTable() " 
+             << " File content of " << fileName << " ill-formated." 
+             << G4endl;
 #endif          
-         ifilestream.close();
-         return false;
-      } 
-
-      physicsVector -> SetSpline(true);
-
-      // Retrieved vector is added to material store
-      if( !AddPhysicsVector(physicsVector, atomicNumberIon, 
-                            materialName, atomicNumberMat) ) {
-
-         delete physicsVector;
-         ifilestream.close();
-         return false;
-      }
+      ifilestream.close();
+      return false;
+    } 
+
+    physicsVector -> SetSpline(true);
+
+    // Retrieved vector is added to material store
+    if( !AddPhysicsVector(physicsVector, (G4int)atomicNumberIon, 
+                          materialName, (G4int)atomicNumberMat) ) {
+
+      delete physicsVector;
+      ifilestream.close();
+      return false;
+    }
   }