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

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Tue May 31 13:39:08 2011
New Revision: 3108

Log:
Fix OPAL_2004_S6132243 to use charged+neutral.

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

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Tue May 31 13:23:01 2011	(r3107)
+++ trunk/ChangeLog	Tue May 31 13:39:08 2011	(r3108)
@@ -2,6 +2,8 @@
 
 	* Add basic infrastructure for Taylor plots in make-plots
 
+	* Fix OPAL_2004_S6132243: They are using charged+neutral.
+
 2011-05-22  Andy Buckley  <andy at insectnation.org>
 
 	* Adding plots of stable and decayed PID multiplicities to

Modified: trunk/src/Analyses/OPAL_2004_S6132243.cc
==============================================================================
--- trunk/src/Analyses/OPAL_2004_S6132243.cc	Tue May 31 13:23:01 2011	(r3107)
+++ trunk/src/Analyses/OPAL_2004_S6132243.cc	Tue May 31 13:39:08 2011	(r3108)
@@ -3,6 +3,7 @@
 #include "Rivet/RivetAIDA.hh"
 #include "Rivet/Tools/Logging.hh"
 #include "Rivet/Projections/Beam.hh"
+#include "Rivet/Projections/FinalState.hh"
 #include "Rivet/Projections/ChargedFinalState.hh"
 #include "Rivet/Projections/Sphericity.hh"
 #include "Rivet/Projections/Thrust.hh"
@@ -55,12 +56,14 @@
     void init() {
       // Projections
       addProjection(Beam(), "Beams");
+      const FinalState fs;
+      addProjection(fs, "FS");
       const ChargedFinalState cfs;
-      addProjection(cfs, "FS");
-      addProjection(FastJets(cfs, FastJets::DURHAM, 0.7), "DurhamJets");
-      addProjection(Sphericity(cfs), "Sphericity");
-      addProjection(ParisiTensor(cfs), "Parisi");
-      const Thrust thrust(cfs);
+      addProjection(cfs, "CFS");
+      addProjection(FastJets(fs, FastJets::DURHAM, 0.7), "DurhamJets");
+      addProjection(Sphericity(fs), "Sphericity");
+      addProjection(ParisiTensor(fs), "Parisi");
+      const Thrust thrust(fs);
       addProjection(thrust, "Thrust");
       addProjection(Hemispheres(thrust), "Hemispheres");
 
@@ -100,7 +103,7 @@
 
     void analyze(const Event& event) {
       // Even if we only generate hadronic events, we still need a cut on numCharged >= 2.
-      const FinalState& cfs = applyProjection<FinalState>(event, "FS");
+      const FinalState& cfs = applyProjection<FinalState>(event, "CFS");
       if (cfs.size() < 2) vetoEvent;
 
       // Increment passed-cuts weight sum