[Rivet-svn] r2158 - in trunk: data/plotinfo src/Analyses

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed Dec  9 22:35:59 2009
New Revision: 2158

Log:
Fixing compile warnings

Modified:
   trunk/data/plotinfo/UA1_1990_S2044935.plot
   trunk/src/Analyses/UA1_1990_S2044935.cc
   trunk/src/Analyses/UA5_1989_S1926373.cc

Modified: trunk/data/plotinfo/UA1_1990_S2044935.plot
==============================================================================
--- trunk/data/plotinfo/UA1_1990_S2044935.plot	Wed Dec  9 18:29:17 2009	(r2157)
+++ trunk/data/plotinfo/UA1_1990_S2044935.plot	Wed Dec  9 22:35:59 2009	(r2158)
@@ -85,7 +85,7 @@
 # BEGIN PLOT /UA1_1990_S2044935/d11-x01-y01
 Title=Transverse energy cross section at $\sqrt{s} = \unit{900}{\GeV}$ and $|\eta|<6$
 XLabel=$\Sigma E_\perp$ [GeV]
-YLabel=$\mathrm{d}{\sigma}/\mathrm{d}{\Sigma E_\perp}$ [\unit{\millibarn \inverse\GeV}]
+YLabel=$\mathrm{d}{\sigma}/\mathrm{d}{\Sigma E_\perp}$ [\unit{\millibarn\,\inverse\GeV}]
 # END PLOT
 
 # BEGIN PLOT /UA1_1990_S2044935/d12-x01-y01

Modified: trunk/src/Analyses/UA1_1990_S2044935.cc
==============================================================================
--- trunk/src/Analyses/UA1_1990_S2044935.cc	Wed Dec  9 18:29:17 2009	(r2157)
+++ trunk/src/Analyses/UA1_1990_S2044935.cc	Wed Dec  9 22:35:59 2009	(r2158)
@@ -105,7 +105,7 @@
           if (inRange(dnch_deta, 0.8, 4.0)) {
             _sumwTrig08 += weight;
             _hist_Esigd3p08->fill(pt/GeV, scaled_weight);
-          } else if (inRange(dnch_deta, 4.0, 8)) {
+          } else if (inRange(dnch_deta, 4.0, 8.0)) {
             _sumwTrig40 += weight;
             _hist_Esigd3p40->fill(pt/GeV, scaled_weight);
           } else if(dnch_deta > 8.0) {

Modified: trunk/src/Analyses/UA5_1989_S1926373.cc
==============================================================================
--- trunk/src/Analyses/UA5_1989_S1926373.cc	Wed Dec  9 18:29:17 2009	(r2157)
+++ trunk/src/Analyses/UA5_1989_S1926373.cc	Wed Dec  9 22:35:59 2009	(r2158)
@@ -2,7 +2,6 @@
 #include "Rivet/Analysis.hh"
 #include "Rivet/RivetAIDA.hh"
 #include "Rivet/Tools/Logging.hh"
-#include "Rivet/Projections/Beam.hh"
 #include "Rivet/Projections/ChargedFinalState.hh"
 #include "Rivet/Projections/TriggerUA5.hh"
 
@@ -25,7 +24,6 @@
     /// Book histograms and projections
     void init() {
       addProjection(TriggerUA5(), "Trigger");
-      addProjection(Beam(), "Beams");
       addProjection(ChargedFinalState(-0.5, 0.5), "CFS05");
       addProjection(ChargedFinalState(-1.5, 1.5), "CFS15");
       addProjection(ChargedFinalState(-3.0, 3.0), "CFS30");
@@ -58,7 +56,6 @@
       const TriggerUA5& trigger = applyProjection<TriggerUA5>(event, "Trigger");
       if (!trigger.nsdDecision()) vetoEvent;
 
-      const double sqrtS = applyProjection<Beam>(event, "Beams").sqrtS();
       const double weight = event.weight();
       _sumWPassed += weight;