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

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Fri Dec  4 21:37:36 2009
New Revision: 2136

Log:
Fixing an off-by-one error for the jet rates. Effectively this
is a noop, but if we want to follow this road, we should at
least do it correctly.

Modified:
   trunk/src/Analyses/DELPHI_1996_S3430090.cc

Modified: trunk/src/Analyses/DELPHI_1996_S3430090.cc
==============================================================================
--- trunk/src/Analyses/DELPHI_1996_S3430090.cc	Fri Dec  4 16:04:27 2009	(r2135)
+++ trunk/src/Analyses/DELPHI_1996_S3430090.cc	Fri Dec  4 21:37:36 2009	(r2136)
@@ -44,6 +44,7 @@
       _passedCutWeightSum = 0.0;
       _passedCut3WeightSum = 0.0;
       _passedCut4WeightSum = 0.0;
+      _passedCut5WeightSum = 0.0;
     }
  
  
@@ -52,7 +53,9 @@
 
     void init() {
       addProjection(Beam(), "Beams");
-      /// @todo pTmin and |eta| cuts
+      // Don't try to introduce a pT or eta cut here.
+      // It's all corrected back. Read the paper. It's
+      // in section 2.
       const ChargedFinalState cfs;
       addProjection(cfs, "FS");
       addProjection(UnstableFinalState(), "UFS");
@@ -177,15 +180,18 @@
       const FastJets& durjet = applyProjection<FastJets>(e, "DurhamJets");
       const FastJets& jadejet = applyProjection<FastJets>(e, "JadeJets");
       if (durjet.clusterSeq() && jadejet.clusterSeq()) {
-        _histDiffRate2Durham->fill(durjet.clusterSeq()->exclusive_ymerge(2), weight);
-        _histDiffRate2Jade->fill(jadejet.clusterSeq()->exclusive_ymerge(2), weight);
         if (numParticles >= 3) {
           _passedCut3WeightSum += weight;
-          _histDiffRate3Durham->fill(durjet.clusterSeq()->exclusive_ymerge(3), weight);
-          _histDiffRate3Jade->fill(jadejet.clusterSeq()->exclusive_ymerge(3), weight);
+          _histDiffRate2Durham->fill(durjet.clusterSeq()->exclusive_ymerge(2), weight);
+          _histDiffRate2Jade->fill(jadejet.clusterSeq()->exclusive_ymerge(2), weight);
         }
         if (numParticles >= 4) {
           _passedCut4WeightSum += weight;
+          _histDiffRate3Durham->fill(durjet.clusterSeq()->exclusive_ymerge(3), weight);
+          _histDiffRate3Jade->fill(jadejet.clusterSeq()->exclusive_ymerge(3), weight);
+        }
+        if (numParticles >= 5) {
+          _passedCut5WeightSum += weight;
           _histDiffRate4Durham->fill(durjet.clusterSeq()->exclusive_ymerge(4), weight);
           _histDiffRate4Jade->fill(jadejet.clusterSeq()->exclusive_ymerge(4), weight);
         }
@@ -437,12 +443,12 @@
       scale(_histCParam, 1.0/_passedCutWeightSum);
       scale(_histDParam, 1.0/_passedCutWeightSum);
 
-      scale(_histDiffRate2Durham, 1.0/_passedCutWeightSum);
-      scale(_histDiffRate2Jade, 1.0/_passedCutWeightSum);
-      scale(_histDiffRate3Durham, 1.0/_passedCut3WeightSum);
-      scale(_histDiffRate3Jade, 1.0/_passedCut3WeightSum);
-      scale(_histDiffRate4Durham, 1.0/_passedCut4WeightSum);
-      scale(_histDiffRate4Jade, 1.0/_passedCut4WeightSum);
+      scale(_histDiffRate2Durham, 1.0/_passedCut3WeightSum);
+      scale(_histDiffRate2Jade, 1.0/_passedCut3WeightSum);
+      scale(_histDiffRate3Durham, 1.0/_passedCut4WeightSum);
+      scale(_histDiffRate3Jade, 1.0/_passedCut4WeightSum);
+      scale(_histDiffRate4Durham, 1.0/_passedCut5WeightSum);
+      scale(_histDiffRate4Jade, 1.0/_passedCut5WeightSum);
     }
 
     //@}
@@ -460,6 +466,7 @@
     double _passedCutWeightSum;
     double _passedCut3WeightSum;
     double _passedCut4WeightSum;
+    double _passedCut5WeightSum;
     //@}
 
     /// @name Histograms