[Rivet-svn] r3076 - in trunk/src: Analyses Projections

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Tue May  3 13:33:16 2011
New Revision: 3076

Log:
fixing some more compiler warnings

Modified:
   trunk/src/Analyses/MC_WWJETS.cc
   trunk/src/Analyses/STAR_2008_S7869363.cc
   trunk/src/Projections/WFinder.cc

Modified: trunk/src/Analyses/MC_WWJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_WWJETS.cc	Tue May  3 13:32:50 2011	(r3075)
+++ trunk/src/Analyses/MC_WWJETS.cc	Tue May  3 13:33:16 2011	(r3076)
@@ -77,7 +77,7 @@
 
       // global stuff
       _h_HT = bookHistogram1D("HT", logBinEdges(100, 100.0, 0.5*sqrtS()));
-      _h_jets_dphi_12 = bookHistogram1D("jets_dphi_12", 25.0, 0.0, PI);
+      _h_jets_dphi_12 = bookHistogram1D("jets_dphi_12", 25, 0.0, PI);
       _h_jets_m_12 = bookHistogram1D("jets_m_12", logBinEdges(100, 1.0, 0.25*sqrtS()));
 
       MC_JetAnalysis::init();

Modified: trunk/src/Analyses/STAR_2008_S7869363.cc
==============================================================================
--- trunk/src/Analyses/STAR_2008_S7869363.cc	Tue May  3 13:32:50 2011	(r3075)
+++ trunk/src/Analyses/STAR_2008_S7869363.cc	Tue May  3 13:33:16 2011	(r3076)
@@ -17,7 +17,7 @@
     // Return true to throw away a particle
     bool operator()(const Particle& p) {
       /// @todo Use a better RNG?
-      size_t idx = floor(p.momentum().pT()/MeV/50);
+      size_t idx = int(floor(p.momentum().pT()/MeV/50));
       if (idx > 11) idx = 11;
       return (rand()/static_cast<double>(RAND_MAX) > _trkeff[idx]);
     }

Modified: trunk/src/Projections/WFinder.cc
==============================================================================
--- trunk/src/Projections/WFinder.cc	Tue May  3 13:32:50 2011	(r3075)
+++ trunk/src/Projections/WFinder.cc	Tue May  3 13:33:16 2011	(r3076)
@@ -159,21 +159,21 @@
     else {
       // no candiate, return
       if(imfs.particles().empty()) {
-	getLog() << Log::DEBUG << "No W+- candidates found" << " "
-		 << imfs.particles().size() << " " << endl;
-	return;
+        getLog() << Log::DEBUG << "No W+- candidates found" << " "
+                 << imfs.particles().size() << " " << endl;
+        return;
       }
       // more than one, pick the one nearer the W mass
       double deltaM = 1e30;
       for(unsigned int ix=0;ix<imfs.particlePairs().size();++ix) {
-	FourMomentum pW = imfs.particlePairs()[ix].first .momentum()+
-	  imfs.particlePairs()[ix].second.momentum();
-	double mW = pW.mass();
-	if(abs(mW-80.403)<deltaM) {
-	  deltaM = abs(mW-80.4);
-	  p1 = imfs.particlePairs()[ix].first ;
-	  p2 = imfs.particlePairs()[ix].second;
-	}
+        FourMomentum pW = imfs.particlePairs()[ix].first .momentum()+
+          imfs.particlePairs()[ix].second.momentum();
+        double mW = pW.mass();
+        if(fabs(mW-80.403)<deltaM) {
+          deltaM = fabs(mW-80.4);
+          p1 = imfs.particlePairs()[ix].first ;
+          p2 = imfs.particlePairs()[ix].second;
+        }
       }
     }