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

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed Dec  2 00:37:25 2009
New Revision: 2126

Log:
Warning fixes

Modified:
   trunk/include/Rivet/ParticleName.hh
   trunk/src/Analyses/CDF_2004_S5839831.cc
   trunk/src/Analyses/CDF_2008_NOTE_9351.cc
   trunk/src/Analyses/UA1_1990_S2044935.cc

Modified: trunk/include/Rivet/ParticleName.hh
==============================================================================
--- trunk/include/Rivet/ParticleName.hh	Tue Dec  1 22:57:20 2009	(r2125)
+++ trunk/include/Rivet/ParticleName.hh	Wed Dec  2 00:37:25 2009	(r2126)
@@ -72,9 +72,9 @@
   }
 
   /// Convenience maker of particle ID pairs.
-  inline std::pair<PdgId,PdgId> make_pdgid_pair(ParticleName aname, ParticleName bname) {
-    return make_pdgid_pair(aname, bname);
-  }
+  // inline std::pair<PdgId,PdgId> make_pdgid_pair(ParticleName aname, ParticleName bname) {
+  //   return make_pdgid_pair(aname, bname);
+  // }
 
   /// Convenience maker of particle ID pairs.
   inline std::pair<PdgId,PdgId> make_pdgid_pair(std::pair<ParticleName,ParticleName> pnamepair) {

Modified: trunk/src/Analyses/CDF_2004_S5839831.cc
==============================================================================
--- trunk/src/Analyses/CDF_2004_S5839831.cc	Tue Dec  1 22:57:20 2009	(r2125)
+++ trunk/src/Analyses/CDF_2004_S5839831.cc	Wed Dec  2 00:37:25 2009	(r2126)
@@ -179,15 +179,15 @@
               _pt90MinAvg1800->fill(ETlead/GeV, cones.ptMin/GeV, weight); // /numMin
               //
               const double ptTransTotal = cones.ptMax + cones.ptMin;
-              if (inRange(ETlead/GeV, 40, 80)) {
+              if (inRange(ETlead/GeV, 40., 80.)) {
                 _pt90Dbn1800Et40->fill(ptTransTotal/GeV, weight);
-              } else if (inRange(ETlead/GeV, 80, 120)) {
+              } else if (inRange(ETlead/GeV, 80., 120.)) {
                 _pt90Dbn1800Et80->fill(ptTransTotal/GeV, weight);
-              } else if (inRange(ETlead/GeV, 120, 160)) {
+              } else if (inRange(ETlead/GeV, 120., 160.)) {
                 _pt90Dbn1800Et120->fill(ptTransTotal/GeV, weight);
-              } else if (inRange(ETlead/GeV, 160, 200)) {
+              } else if (inRange(ETlead/GeV, 160., 200.)) {
                 _pt90Dbn1800Et160->fill(ptTransTotal/GeV, weight);
-              } else if (inRange(ETlead/GeV, 200, 270)) {
+              } else if (inRange(ETlead/GeV, 200., 270.)) {
                 _pt90Dbn1800Et200->fill(ptTransTotal/GeV, weight);
               }
             }

Modified: trunk/src/Analyses/CDF_2008_NOTE_9351.cc
==============================================================================
--- trunk/src/Analyses/CDF_2008_NOTE_9351.cc	Tue Dec  1 22:57:20 2009	(r2125)
+++ trunk/src/Analyses/CDF_2008_NOTE_9351.cc	Wed Dec  2 00:37:25 2009	(r2126)
@@ -103,7 +103,7 @@
 
       // Lepton pair should have an invariant mass between 70 and 110 and |eta| < 6
       const FourMomentum dilepton = leptons[0].momentum() + leptons[1].momentum();
-      if (!inRange(dilepton.mass()/GeV, 70, 110) || fabs(dilepton.eta()) >= 6) vetoEvent;
+      if (!inRange(dilepton.mass()/GeV, 70., 110.) || fabs(dilepton.eta()) >= 6) vetoEvent;
       getLog() << Log::DEBUG << "Dilepton mass = " << mass(dilepton)/GeV << " GeV" << endl;
       getLog() << Log::DEBUG << "Dilepton pT   = " << pT(dilepton)/GeV << " GeV" << endl;
    

Modified: trunk/src/Analyses/UA1_1990_S2044935.cc
==============================================================================
--- trunk/src/Analyses/UA1_1990_S2044935.cc	Tue Dec  1 22:57:20 2009	(r2125)
+++ trunk/src/Analyses/UA1_1990_S2044935.cc	Wed Dec  2 00:37:25 2009	(r2126)
@@ -111,7 +111,7 @@
           _hist_Esigd3p900->fill(pt/GeV, scaled_weight);
           // Also fill for specific dNch/deta ranges for 900 GeV
           /// @todo Check normalisation factor: currently low by factor of ~10-20
-          if (inRange(dnch_deta, 0.8, 4)) {
+          if (inRange(dnch_deta, 0.8, 4.0)) {
             _sumwTrig08 += weight;
             _hist_Esigd3p08->fill(pt/GeV, scaled_weight);
           } else if (dnch_deta > 4 && dnch_deta <= 8) {