[Rivet-svn] r2168 - trunk/include/Rivet/Projections

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Thu Dec 10 16:41:31 2009
New Revision: 2168

Log:
repair all the omitted squares in Hemispheres.

Modified:
   trunk/include/Rivet/Projections/Hemispheres.hh

Modified: trunk/include/Rivet/Projections/Hemispheres.hh
==============================================================================
--- trunk/include/Rivet/Projections/Hemispheres.hh	Thu Dec 10 16:00:55 2009	(r2167)
+++ trunk/include/Rivet/Projections/Hemispheres.hh	Thu Dec 10 16:41:31 2009	(r2168)
@@ -102,7 +102,7 @@
     //@{
 
     double E2vis() const { return _E2vis; }
-    double Evis() const { return sqrt(E2vis()); }
+    double Evis() const { return sqrt(_E2vis); }
 
     double M2high() const { return _M2high; }
     double Mhigh() const { return sqrt(M2high()); }
@@ -111,25 +111,25 @@
     double Mlow() const { return sqrt(M2low()); }
 
     double M2diff() const { return _M2high -_M2low; }
-    double Mdiff() const { return sqrt(Mhigh() - Mlow()); }
+    double Mdiff() const { return sqrt(M2diff()); }
 
     double scaledM2high() const {
-      if (M2high() == 0.0) return 0.0;
-      if (E2vis() != 0.0) return M2high()/E2vis();
+      if (_M2high == 0.0) return 0.0;
+      if (_E2vis != 0.0) return _M2high/_E2vis;
       else return std::numeric_limits<double>::max();
     }
     double scaledMhigh() const { return sqrt(scaledM2high()); }
 
     double scaledM2low() const {
-      if (M2low() == 0.0) return 0.0;
-      if (E2vis() != 0.0) return M2low()/E2vis();
+      if (_M2low == 0.0) return 0.0;
+      if (_E2vis != 0.0) return _M2low/_E2vis;
       else return std::numeric_limits<double>::max();
     }
     double scaledMlow() const { return sqrt(scaledM2low()); }
 
     double scaledM2diff() const {
-      if (Mdiff() == 0.0) return 0.0;
-      if (Evis() != 0.0) return Mdiff()/Evis();
+      if (M2diff() == 0.0) return 0.0;
+      if (_E2vis != 0.0) return M2diff()/_E2vis;
       else return std::numeric_limits<double>::max();
     }
     double scaledMdiff() const { return sqrt(scaledM2diff()); }