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

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu Dec 10 09:35:54 2009
New Revision: 2160

Log:
Fixing factor of 2 in CDF 1990 dN/deta distribution: VALIDATED

Modified:
   trunk/data/anainfo/CDF_1990_S2089246.info
   trunk/src/Analyses/CDF_1990_S2089246.cc

Modified: trunk/data/anainfo/CDF_1990_S2089246.info
==============================================================================
--- trunk/data/anainfo/CDF_1990_S2089246.info	Thu Dec 10 09:24:30 2009	(r2159)
+++ trunk/data/anainfo/CDF_1990_S2089246.info	Thu Dec 10 09:35:54 2009	(r2160)
@@ -4,17 +4,18 @@
 Experiment: CDF
 Collider: Tevatron Run 0
 SpiresID: 2089246
-Status: UNVALIDATED
+Status: VALIDATED
 Authors:
  - Andy Buckley <andy.buckley at cern.ch>
 References:
  - Phys.Rev.D41:2330,1990
  - doi:10.1103/PhysRevD.41.2330
 RunInfo:
-  QCD events at sqrt(s) = 630 and 1800 GeV.
-  Particles with ctau>10cm should be set stable.
+  QCD min bias events at sqrt(s) = 630 and 1800 GeV.
+  Particles with ctau > 10cm should be set stable.
 NumEvents: 1000000
 PtCuts: [0]
+Energies: [630, 1800]
 Description:
   Pseudorapidity distributions based on the CDF 630 and 1800 GeV runs
   from 1987. All data is detector corrected. The data confirms the UA5

Modified: trunk/src/Analyses/CDF_1990_S2089246.cc
==============================================================================
--- trunk/src/Analyses/CDF_1990_S2089246.cc	Thu Dec 10 09:24:30 2009	(r2159)
+++ trunk/src/Analyses/CDF_1990_S2089246.cc	Thu Dec 10 09:35:54 2009	(r2160)
@@ -3,10 +3,6 @@
 #include "Rivet/Tools/Logging.hh"
 #include "Rivet/RivetAIDA.hh"
 #include "Rivet/Projections/ChargedFinalState.hh"
-#include "Rivet/Projections/Beam.hh"
-#include "Rivet/Projections/FastJets.hh"
-#include "Rivet/Projections/PVertex.hh"
-#include "Rivet/Projections/TotalVisibleMomentum.hh"
 #include "Rivet/Projections/TriggerCDFRun0Run1.hh"
 
 namespace Rivet {
@@ -23,6 +19,7 @@
       : Analysis("CDF_1990_S2089246")
     {
       setBeams(PROTON, ANTIPROTON);
+      _sumWTrig = 0;
     }
 
 
@@ -30,12 +27,16 @@
     //@{
 
     void init() {
+      // Setup projections
       addProjection(TriggerCDFRun0Run1(), "Trigger");
       addProjection(ChargedFinalState(-3.5, 3.5), "CFS");
-      addProjection(Beam(), "Beam");
 
-      _hist_eta1800 = bookHistogram1D(3, 1, 1);
-      _hist_eta630 = bookHistogram1D(4, 1, 1);
+      // Book histo
+      if (fuzzyEquals(sqrtS()/GeV, 1800, 1E-3)) {
+        _hist_eta = bookHistogram1D(3, 1, 1);
+      } else if (fuzzyEquals(sqrtS()/GeV, 630, 1E-3)) {
+        _hist_eta = bookHistogram1D(4, 1, 1);
+      }
     }
 
 
@@ -44,20 +45,14 @@
       // Trigger
       const bool trigger = applyProjection<TriggerCDFRun0Run1>(event, "Trigger").minBiasDecision();
       if (!trigger) vetoEvent;
-
-      // Get final state and energy
-      const double sqrtS = applyProjection<Beam>(event, "Beam").sqrtS();
-      const FinalState& fs = applyProjection<FinalState>(event, "CFS");
+      const double weight = event.weight();
+      _sumWTrig += weight;
 
       // Loop over final state charged particles to fill eta histos
-      const double weight = event.weight();
+      const FinalState& fs = applyProjection<FinalState>(event, "CFS");
       foreach (const Particle& p, fs.particles()) {
         const double eta = p.momentum().pseudorapidity();
-        if (fuzzyEquals(sqrtS/GeV, 630)) {
-          _hist_eta630->fill(fabs(eta), weight);
-        } else if (fuzzyEquals(sqrtS/GeV, 1800)) {
-          _hist_eta1800->fill(fabs(eta), weight);
-        }
+        _hist_eta->fill(fabs(eta), weight);
       }
     }
  
@@ -66,8 +61,8 @@
     /// Finalize
     void finalize() {
       // Divide through by num events to get d<N>/d(eta) in bins
-      scale(_hist_eta630, 1/sumOfWeights());
-      scale(_hist_eta1800, 1/sumOfWeights());
+      // Factor of 1/2 for |eta| -> eta
+      scale(_hist_eta, 0.5/_sumWTrig);
     }
 
     //@}
@@ -75,10 +70,14 @@
 
   private:
 
+    /// @name Weight counter
+    //@{
+    double _sumWTrig;
+    //@}
+
     /// @name Histogram collections
     //@{
-    AIDA::IHistogram1D* _hist_eta630;
-    AIDA::IHistogram1D* _hist_eta1800;
+    AIDA::IHistogram1D* _hist_eta;
     //@}
 
   };