Changeset 921 for trunk/source/global/management/src/G4PhysicsLogVector.cc

Timestamp:

Feb 16, 2009, 10:14:30 AM (15 years ago)

Author:

garnier

Message:

en test de gl2ps. Problemes de libraries

File:

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

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

@@ -25 +25 @@
 //
 //
-// $Id: G4PhysicsLogVector.cc,v 1.16 2008/09/06 19:52:16 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4PhysicsLogVector.cc,v 1.21 2008/09/22 08:26:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // 
@@ -40 +40 @@
 //    26 Sep. 1996, K.Amako : Constructor with only 'bin size' added
 //    11 Nov. 2000, H.Kurashige : use STL vector for dataVector and binVector
-//    9  Mar. 2001, H.Kurashige : add PhysicsVector type and Retrieve
+//    9  Mar. 2001, H.Kurashige : added PhysicsVector type and Retrieve
 //    05 Sep. 2008, V.Ivanchenko : added protections for zero-length vector
 //
@@ -60 +60 @@
   // Add extra one bin (hidden to user) to handle correctly when 
   // Energy=theEmax in getValue. 
+  dataVector.reserve(theNbin+1);
+  binVector.reserve(theNbin+1); 
 
   numberOfBin = theNbin;
 
-  if(numberOfBin > 0) {
-    dataVector.resize(theNbin+1);
-    binVector.resize(theNbin+1); 
-    edgeMin = 1;
-    edgeMax = numberOfBin;
-    for (size_t i=0; i<=numberOfBin; i++) {
-      binVector[i] = i + 1;
-      dataVector[i]= 0.0;
-    }
+  for (size_t i=0; i<=numberOfBin; i++)
+  {
+     binVector.push_back(0.0);
+     dataVector.push_back(0.0);
   }
 }  
@@ -84 +81 @@
   // Add extra one bin (hidden to user) to handle correctly when 
   // Energy=theEmax in getValue. 
-  dataVector.resize(theNbin+1);
-  binVector.resize(theNbin+1); 
+  dataVector.reserve(theNbin+1);
+  binVector.reserve(theNbin+1); 
 
   numberOfBin = theNbin;
 
-  if(numberOfBin > 0) {
-    for (size_t i=0; i<=numberOfBin; i++) {
-      binVector[i] = std::pow(10., std::log10(theEmin)+i*dBin);
-      dataVector[i]= 0.0;
-    }
-    edgeMin = binVector[0];
-    edgeMax = binVector[numberOfBin-1];
+  for (size_t i=0; i<numberOfBin+1; i++)
+  {
+    binVector.push_back(std::pow(10., std::log10(theEmin)+i*dBin));
+    dataVector.push_back(0.0);
   }
+  edgeMin = binVector[0];
+  edgeMax = binVector[numberOfBin-1];
 }  
 
-G4PhysicsLogVector::~G4PhysicsLogVector(){}
+G4PhysicsLogVector::~G4PhysicsLogVector()
+{
+}
 
 G4bool G4PhysicsLogVector::Retrieve(std::ifstream& fIn, G4bool ascii)
@@ -112 +110 @@
   return success;
 }
+
+G4PhysicsLogVector::G4PhysicsLogVector(const G4PhysicsLogVector& right)
+  : G4PhysicsVector(right)
+{
+  dBin = right.dBin;
+  baseBin = right.baseBin;
+}
+
+G4PhysicsLogVector& 
+G4PhysicsLogVector::operator=(const G4PhysicsLogVector& right)
+{
+  // Check assignment to self
+  //
+  if(this == &right) { return *this; }
+
+  DeleteData();
+  CopyData(right);
+
+  dBin    = right.dBin;
+  baseBin = right.baseBin;
+  return *this;
+}