[Rivet-svn] r2156 - trunk/src/Analyses

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed Dec  9 16:13:53 2009
New Revision: 2156

Log:
Warning fixes

Modified:
   trunk/src/Analyses/CDF_2004_S5839831.cc
   trunk/src/Analyses/CDF_2007_S7057202.cc
   trunk/src/Analyses/UA5_1986_S1583476.cc

Modified: trunk/src/Analyses/CDF_2004_S5839831.cc
==============================================================================
--- trunk/src/Analyses/CDF_2004_S5839831.cc	Wed Dec  9 14:39:31 2009	(r2155)
+++ trunk/src/Analyses/CDF_2004_S5839831.cc	Wed Dec  9 16:13:53 2009	(r2156)
@@ -294,14 +294,16 @@
  
  
     void finalize() {
-      // Normalize to actual number of entries in pT dbn histos
+      /// @todo Take these normalisations from the data histo (it can't come from just the MC)
+
+      // Normalize to actual number of entries in pT dbn histos...
       normalize(_pt90Dbn1800Et40,  1656.75);
       normalize(_pt90Dbn1800Et80,  4657.5);
       normalize(_pt90Dbn1800Et120, 5395.5);
       normalize(_pt90Dbn1800Et160, 7248.75);
       normalize(_pt90Dbn1800Et200, 2442.0);
    
-      // and for min bias distributions:
+      // ...and for min bias distributions:
       normalize(_numTracksDbn1800MB, 309718.25);
       normalize(_numTracksDbn630MB, 1101024.0);
       normalize(_ptDbn1800MB, 33600.0);

Modified: trunk/src/Analyses/CDF_2007_S7057202.cc
==============================================================================
--- trunk/src/Analyses/CDF_2007_S7057202.cc	Wed Dec  9 14:39:31 2009	(r2155)
+++ trunk/src/Analyses/CDF_2007_S7057202.cc	Wed Dec  9 16:13:53 2009	(r2156)
@@ -114,7 +114,7 @@
  
     // Normalise histograms to cross-section
     void finalize() {
-      const double xSecPerEvent = crossSection()/nanobarn / sumOfWeights();
+      const double xSecPerEvent = crossSectionPerEvent()/nanobarn;
       getLog() << Log::INFO << "Cross-section = " << crossSection()/nanobarn << " nb" << endl;
    
       for (map<IHistogram1D*,double>::iterator histIt = _eventsPassed.begin(),

Modified: trunk/src/Analyses/UA5_1986_S1583476.cc
==============================================================================
--- trunk/src/Analyses/UA5_1986_S1583476.cc	Wed Dec  9 14:39:31 2009	(r2155)
+++ trunk/src/Analyses/UA5_1986_S1583476.cc	Wed Dec  9 16:13:53 2009	(r2156)
@@ -57,7 +57,7 @@
       // Get the index corresponding to the max Nch range histo/sum(w) vector index
       const ChargedFinalState& cfs50 = applyProjection<ChargedFinalState>(event, "CFS50");
       const int numP = cfs50.size();
-      const int ni = floor(static_cast<float>(numP-2)/10.0);
+      const int ni = (int)floor(static_cast<float>(numP-2)/10.0);
       const int num_idx = min(ni, (int)_sumWn.size()-1);
       getLog() << Log::TRACE << "Multiplicity index: " << numP << " charged particles -> #" << num_idx << endl;