[Rivet-svn] r3168 - in trunk: include/Rivet include/Rivet/Math src/Analyses

[blackhole at projects.hepforge.org]

Author: dgrell
Date: Wed Jun 29 12:35:43 2011
New Revision: 3168

Log:
Fixed #455: abs behaviour

Modified:
   trunk/include/Rivet/Math/MathHeader.hh
   trunk/include/Rivet/RivetSTL.hh
   trunk/src/Analyses/CDF_2008_LEADINGJETS.cc
   trunk/src/Analyses/CDF_2008_NOTE_9351.cc
   trunk/src/Analyses/CDF_2010_S8591881_DY.cc
   trunk/src/Analyses/CDF_2010_S8591881_QCD.cc

Modified: trunk/include/Rivet/Math/MathHeader.hh
==============================================================================
--- trunk/include/Rivet/Math/MathHeader.hh	Wed Jun 29 12:23:06 2011	(r3167)
+++ trunk/include/Rivet/Math/MathHeader.hh	Wed Jun 29 12:35:43 2011	(r3168)
@@ -36,6 +36,7 @@
   using std::transform;
   using std::min;
   using std::max;
+  using std::abs;
 
   const double MAXDOUBLE = std::numeric_limits<double>::max();
   const double MAXINT = std::numeric_limits<int>::max();

Modified: trunk/include/Rivet/RivetSTL.hh
==============================================================================
--- trunk/include/Rivet/RivetSTL.hh	Wed Jun 29 12:23:06 2011	(r3167)
+++ trunk/include/Rivet/RivetSTL.hh	Wed Jun 29 12:35:43 2011	(r3168)
@@ -35,6 +35,7 @@
   using std::runtime_error;
   using std::min;
   using std::max;
+  using std::abs;
   using std::numeric_limits;
   using std::ostream;
   using std::istream;

Modified: trunk/src/Analyses/CDF_2008_LEADINGJETS.cc
==============================================================================
--- trunk/src/Analyses/CDF_2008_LEADINGJETS.cc	Wed Jun 29 12:23:06 2011	(r3167)
+++ trunk/src/Analyses/CDF_2008_LEADINGJETS.cc	Wed Jun 29 12:35:43 2011	(r3168)
@@ -104,7 +104,8 @@
       // Get the final states to work with for filling the distributions
       const FinalState& cfs = applyProjection<ChargedFinalState>(e, "CFS");
 
-      size_t numOverall(0),     numToward(0),     numTrans1(0),     numTrans2(0),     numAway(0)  ;
+      size_t numOverall(0),     numToward(0),      numAway(0)  ;
+      long int    numTrans1(0),     numTrans2(0);
       double ptSumOverall(0.0), ptSumToward(0.0), ptSumTrans1(0.0), ptSumTrans2(0.0), ptSumAway(0.0);
       //double EtSumOverall(0.0), EtSumToward(0.0), EtSumTrans1(0.0), EtSumTrans2(0.0), EtSumAway(0.0);
       double ptMaxOverall(0.0), ptMaxToward(0.0), ptMaxTrans1(0.0), ptMaxTrans2(0.0), ptMaxAway(0.0);

Modified: trunk/src/Analyses/CDF_2008_NOTE_9351.cc
==============================================================================
--- trunk/src/Analyses/CDF_2008_NOTE_9351.cc	Wed Jun 29 12:23:06 2011	(r3167)
+++ trunk/src/Analyses/CDF_2008_NOTE_9351.cc	Wed Jun 29 12:35:43 2011	(r3168)
@@ -108,7 +108,8 @@
       getLog() << Log::DEBUG << "Dilepton pT   = " << pT(dilepton)/GeV << " GeV" << endl;
 
       // Calculate the observables
-      size_t   numToward(0),     numTrans1(0),     numTrans2(0),     numAway(0);
+      size_t   numToward(0),     numAway(0);
+      long int numTrans1(0),     numTrans2(0);
       double ptSumToward(0.0), ptSumTrans1(0.0), ptSumTrans2(0.0), ptSumAway(0.0);
       double ptMaxToward(0.0), ptMaxTrans1(0.0), ptMaxTrans2(0.0), ptMaxAway(0.0);
       const double phiZ = azimuthalAngle(dilepton);

Modified: trunk/src/Analyses/CDF_2010_S8591881_DY.cc
==============================================================================
--- trunk/src/Analyses/CDF_2010_S8591881_DY.cc	Wed Jun 29 12:23:06 2011	(r3167)
+++ trunk/src/Analyses/CDF_2010_S8591881_DY.cc	Wed Jun 29 12:35:43 2011	(r3168)
@@ -102,7 +102,8 @@
       getLog() << Log::DEBUG << "Dilepton pT   = " << pT(dilepton)/GeV << " GeV" << endl;
 
       // Calculate the observables
-      size_t   numToward(0),     numTrans1(0),     numTrans2(0),     numAway(0);
+      size_t   numToward(0),     numAway(0);
+      long int numTrans1(0),     numTrans2(0);
       double ptSumToward(0.0), ptSumTrans1(0.0), ptSumTrans2(0.0), ptSumAway(0.0);
       double ptMaxToward(0.0), ptMaxTrans1(0.0), ptMaxTrans2(0.0), ptMaxAway(0.0);
       const double phiZ = azimuthalAngle(dilepton);

Modified: trunk/src/Analyses/CDF_2010_S8591881_QCD.cc
==============================================================================
--- trunk/src/Analyses/CDF_2010_S8591881_QCD.cc	Wed Jun 29 12:23:06 2011	(r3167)
+++ trunk/src/Analyses/CDF_2010_S8591881_QCD.cc	Wed Jun 29 12:35:43 2011	(r3168)
@@ -102,7 +102,8 @@
       // Get the final states to work with for filling the distributions
       const FinalState& cfs = applyProjection<ChargedFinalState>(e, "CFS");
 
-      size_t numOverall(0),     numToward(0),     numTrans1(0),     numTrans2(0),     numAway(0)  ;
+      size_t numOverall(0),     numToward(0),          numAway(0)  ;
+      long int numTrans1(0),     numTrans2(0);
       double ptSumOverall(0.0), ptSumToward(0.0), ptSumTrans1(0.0), ptSumTrans2(0.0), ptSumAway(0.0);
       double ptMaxOverall(0.0), ptMaxToward(0.0), ptMaxTrans1(0.0), ptMaxTrans2(0.0), ptMaxAway(0.0);