Import Geant4 10.3.0 source tree

source/global/HEPNumerics/include/G4StatDouble.hh

@@ -47,8 +47,31 @@ class G4StatDouble
 
   public:
     G4StatDouble();
+    G4StatDouble(G4double);
     virtual ~G4StatDouble();
 
+  public:
+    G4StatDouble& operator=(const G4double &rhs) 
+    {
+      reset();
+      fill(rhs);
+      return *this;
+    }
+    G4StatDouble& operator=(const G4StatDouble &rhs) 
+    {
+      m_sum_wx = rhs.m_sum_wx;
+      m_sum_wx2 = rhs.m_sum_wx2;
+      m_n = rhs.m_n;
+      m_sum_w = rhs.m_sum_w;
+      m_sum_w2 = rhs.m_sum_w2;
+      m_scale = rhs.m_scale;
+      return *this;
+    }
+    G4StatDouble& operator+=(const G4double &rhs) 
+    { fill(rhs); return *this; }
+    G4StatDouble& operator+=(const G4StatDouble &rhs) 
+    { add(&rhs); return *this; }
+
   public:
 
     void reset();

source/global/HEPNumerics/src/G4StatDouble.cc

@@ -41,6 +41,12 @@ G4StatDouble::G4StatDouble()
   reset();
 }
 
+G4StatDouble::G4StatDouble(G4double x)
+{
+  reset();
+  fill(x);
+}
+
 void G4StatDouble::reset()
 {
   m_sum_wx  = 0.;
@@ -118,10 +124,10 @@ G4double G4StatDouble::rms(G4double ssum_wx, G4double ssum_wx2,
       // and dividing it by sqrt[n] to go from rms of distribution to the
       // rms of the mean value
 
-      (1. / (xn - 1))
+      (xn / (xn - 1))
       * ((ssum_wx2 / ssum_w) - (vmean * vmean));
 
-    if (tmp < 0.) tmp=0.; // this avoids observed computation problem
+    tmp = std::max(tmp, 0.0); // this avoids observed computation problem
     vrms = std::sqrt( tmp );
 //  G4cout << "[G4StatDoubleElement::rms] m_sum_wx: " << m_sum_wx
 //         << "  m_sum_wx2: " << m_sum_wx2 << "  m_sum_w: " << m_sum_w