[Rivet-svn] r1957 - in trunk: . data/anainfo src/Analyses

[blackhole at projects.hepforge.org]

Author: buckley
Date: Fri Oct 23 15:59:22 2009
New Revision: 1957

Log:
Finally found and fixed bug in Swiss Cheese plots ;D

Modified:
   trunk/ChangeLog
   trunk/data/anainfo/CDF_2004_S5839831.info
   trunk/src/Analyses/CDF_2004_S5839831.cc

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Fri Oct 23 15:09:32 2009	(r1956)
+++ trunk/ChangeLog	Fri Oct 23 15:59:22 2009	(r1957)
@@ -1,3 +1,7 @@
+2009-10-23  Andy Buckley  <andy at insectnation.org>
+
+	* Fixing Cheese-3 plot in CDF 2004... at last!
+
 2009-10-23  Hendrik Hoeth <hendrik.hoeth at cern.ch>
 
 	* Fix muon veto in CDF_1994_S2952106, CDF_2005_S6217184,

Modified: trunk/data/anainfo/CDF_2004_S5839831.info
==============================================================================
--- trunk/data/anainfo/CDF_2004_S5839831.info	Fri Oct 23 15:09:32 2009	(r1956)
+++ trunk/data/anainfo/CDF_2004_S5839831.info	Fri Oct 23 15:59:22 2009	(r1957)
@@ -4,7 +4,7 @@
 Experiment: CDF
 Collider: Tevatron Run 2
 SpiresID: 5839831
-Status: UNVALIDATED
+Status: VALIDATED
 Authors:
  - Andy Buckley <andy.buckley at durham.ac.uk>
 References:
@@ -31,6 +31,3 @@
   included for $n = 2, 3$.  This analysis is useful for constraining the
   energy evolution of the underlying event, since it performs the same
   analyses at two distinct CoM energies.
-
-  WARNING, the Swiss Cheese plots are not considered validated, as we have not
-  yet been able to reproduce the MC curves shown in the paper.

Modified: trunk/src/Analyses/CDF_2004_S5839831.cc
==============================================================================
--- trunk/src/Analyses/CDF_2004_S5839831.cc	Fri Oct 23 15:09:32 2009	(r1956)
+++ trunk/src/Analyses/CDF_2004_S5839831.cc	Fri Oct 23 15:59:22 2009	(r1957)
@@ -280,11 +280,11 @@
           
           // Swiss Cheese sub 2,3 jets distributions for sqrt(s) = 630 GeV, 1800 GeV
           if (fuzzyEquals(sqrtS/GeV, 630)) {
-            _pTSum630_2Jet->fill(cheeseETlead/GeV, ptSumSub2/GeV, weight);
-            _pTSum630_3Jet->fill(cheeseETlead/GeV, ptSumSub3/GeV, weight);
+            if (!isZero(ptSumSub2)) _pTSum630_2Jet->fill(cheeseETlead/GeV, ptSumSub2/GeV, weight);
+            if (!isZero(ptSumSub3))_pTSum630_3Jet->fill(cheeseETlead/GeV, ptSumSub3/GeV, weight);
           } else if (fuzzyEquals(sqrtS/GeV, 1800)) {
-            _pTSum1800_2Jet->fill(cheeseETlead/GeV, ptSumSub2/GeV, weight);
-            _pTSum1800_3Jet->fill(cheeseETlead/GeV, ptSumSub3/GeV, weight);
+            if (!isZero(ptSumSub2))_pTSum1800_2Jet->fill(cheeseETlead/GeV, ptSumSub2/GeV, weight);
+            if (!isZero(ptSumSub3))_pTSum1800_3Jet->fill(cheeseETlead/GeV, ptSumSub3/GeV, weight);
           }
           
         }
@@ -295,30 +295,22 @@
     
     void finalize() { 
       // Normalize to actual number of entries in pT dbn histos
-      /// @todo Check this normalisation defn.
       normalize(_pt90Dbn1800Et40,  1656.75);
-      /// @todo Check this normalisation defn.
       normalize(_pt90Dbn1800Et80,  4657.5);
-      /// @todo Check this normalisation defn.
       normalize(_pt90Dbn1800Et120, 5395.5);
-      /// @todo Check this normalisation defn.
       normalize(_pt90Dbn1800Et160, 7248.75);
-      /// @todo Check this normalisation defn.
       normalize(_pt90Dbn1800Et200, 2442.0);
       
       // and for min bias distributions:
-      /// @todo Check this normalisation defn.
       normalize(_numTracksDbn1800MB, 309718.25);
-      /// @todo Check this normalisation defn.
       normalize(_numTracksDbn630MB, 1101024.0);
-      /// @todo Check this normalisation defn.
       normalize(_ptDbn1800MB, 33600.0);
-      /// @todo Check this normalisation defn.
       normalize(_ptDbn630MB, 105088.0);
     }
 
     //@}
 
+
   private:
 
     /// @name Histogram collections