Changeset 1340 for trunk/source/global/management/src/G4DataVector.cc

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/global/management/src/G4DataVector.cc (modified) (5 diffs)

trunk/source/global/management/src/G4DataVector.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4DataVector.cc,v 1.9 2007/11/13 17:35:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4DataVector.cc,v 1.12 2010/11/01 13:55:53 gcosmo Exp $
+// GEANT4 tag $Name: global-V09-03-22 $
 //
 // 
@@ -88 +88 @@
 {
   clear();
-  size_t sizeV=0;
+  G4int sizeV=0;
   
   // retrieve in ascii mode
@@ -96 +96 @@
     fIn >> sizeV;
     if (fIn.fail())  { return false; }
-    
+    if (sizeV<=0)
+    {
+#ifdef G4VERBOSE  
+      G4cerr << "G4DataVector::Retrieve():";
+      G4cerr << " Invalid vector size: " << sizeV << G4endl;
+#endif
+      return false;
+    }
+
     reserve(sizeV);
-    for(size_t i = 0; i < sizeV ; i++)
+    for(G4int i = 0; i < sizeV ; i++)
     {
       G4double vData=0.0;
@@ -120 +128 @@
 
   reserve(sizeV);
-  for(size_t i = 0; i < sizeV; i++) 
+  for(G4int i = 0; i < sizeV; i++) 
   {
     push_back(value[i]);
@@ -130 +138 @@
 std::ostream& operator<<(std::ostream& out, const G4DataVector& pv)
 {
-  out << pv.size() << G4endl; 
+  out << pv.size() << std::setprecision(12) << G4endl; 
   for(size_t i = 0; i < pv.size(); i++)
   {
-    out << std::setprecision(12) << pv[i] << G4endl;
+    out << pv[i] << G4endl;
   }
+  out << std::setprecision(6);
 
   return out;