[Rivet-svn] r4295 - in trunk: . src/Analyses

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed May 15 15:32:14 2013
New Revision: 4295

Log:
Many 1.0 -> weight bugfixes in ATLAS_2011_I945498.

Modified:
   trunk/ChangeLog
   trunk/src/Analyses/ATLAS_2011_I945498.cc

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Wed May 15 14:00:48 2013	(r4294)
+++ trunk/ChangeLog	Wed May 15 15:32:14 2013	(r4295)
@@ -1,5 +1,7 @@
 2013-05-15  Andy Buckley  <andy.buckley at cern.ch>
 
+	* Many 1.0 -> weight bugfixes in ATLAS_2011_I945498.
+
 	* yaml-cpp v3 support re-introduced in .info parsing.
 
 	* Lots of analysis clean-ups for YODA TODO issues.

Modified: trunk/src/Analyses/ATLAS_2011_I945498.cc
==============================================================================
--- trunk/src/Analyses/ATLAS_2011_I945498.cc	Wed May 15 14:00:48 2013	(r4294)
+++ trunk/src/Analyses/ATLAS_2011_I945498.cc	Wed May 15 15:32:14 2013	(r4295)
@@ -4,15 +4,11 @@
 #include "Rivet/Tools/Logging.hh"
 
 #include "Rivet/Projections/ZFinder.hh"
-#include "Rivet/Particle.fhh"
-
 #include "Rivet/Projections/FastJets.hh"
-
 #include "Rivet/Projections/FinalState.hh"
 #include "Rivet/Projections/VetoedFinalState.hh"
 #include "Rivet/Projections/IdentifiedFinalState.hh"
 #include "Rivet/Projections/LeadingParticlesFinalState.hh"
-
 #include "Rivet/Projections/ClusteredPhotons.hh"
 
 
@@ -126,29 +122,29 @@
       // that selected events require at least one jet with 20 GeV
       switch (jets.size()) {
       case 0:
-        weights_nj0[chn] += 1.0;
+        weights_nj0[chn] += weight;
         break;
       case 1:
-        weights_nj0[chn] += 1.0;
-        weights_nj1[chn] += 1.0;
+        weights_nj0[chn] += weight;
+        weights_nj1[chn] += weight;
         break;
       case 2:
-        weights_nj0[chn] += 1.0;
-        weights_nj1[chn] += 1.0;
-        weights_nj2[chn] += 1.0;
+        weights_nj0[chn] += weight;
+        weights_nj1[chn] += weight;
+        weights_nj2[chn] += weight;
         break;
       case 3:
-        weights_nj0[chn] += 1.0;
-        weights_nj1[chn] += 1.0;
-        weights_nj2[chn] += 1.0;
-        weights_nj3[chn] += 1.0;
+        weights_nj0[chn] += weight;
+        weights_nj1[chn] += weight;
+        weights_nj2[chn] += weight;
+        weights_nj3[chn] += weight;
         break;
       default: // >= 4
-        weights_nj0[chn] += 1.0;
-        weights_nj1[chn] += 1.0;
-        weights_nj2[chn] += 1.0;
-        weights_nj3[chn] += 1.0;
-        weights_nj4[chn] += 1.0;
+        weights_nj0[chn] += weight;
+        weights_nj1[chn] += weight;
+        weights_nj2[chn] += weight;
+        weights_nj3[chn] += weight;
+        weights_nj4[chn] += weight;
       }
 
       // Require at least one jet