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

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed Dec  9 14:39:31 2009
New Revision: 2155

Log:
CDF 1988 fixed and VALIDATED

Modified:
   trunk/data/anainfo/CDF_1988_S1865951.info
   trunk/data/plotinfo/CDF_1988_S1865951.plot
   trunk/src/Analyses/CDF_1988_S1865951.cc

Modified: trunk/data/anainfo/CDF_1988_S1865951.info
==============================================================================
--- trunk/data/anainfo/CDF_1988_S1865951.info	Wed Dec  9 10:08:29 2009	(r2154)
+++ trunk/data/anainfo/CDF_1988_S1865951.info	Wed Dec  9 14:39:31 2009	(r2155)
@@ -1,14 +1,18 @@
 Name: CDF_1988_S1865951
 SpiresID: 1865951
-Summary: "CDF transverse momentum distributions at 630 GeV and 1800 GeV."
-Description: "Transverse momentum distributions at 630 GeV and 1800 GeV
-	     based on data from the CDF experiment at the Tevatron collider."
-RunInfo: Generic QCD events at sqrtS = 630 GeV and 1800 GeV, |eta| < 1.0.
-Status: UNVALIDATED
+Summary: CDF transverse momentum distributions at 630 GeV and 1800 GeV.
+Description: 
+  Transverse momentum distributions at 630 GeV and 1800 GeV
+  based on data from the CDF experiment at the Tevatron collider.
+Status: VALIDATED
 Experiment: CDF
-Collider: Tevatron
+Collider: Tevatron Run I
 Year: 1988
 Authors:
- - Christophe Vaillant <c.l.j.j.vaillant at durham.ac.uk>
+  - Christophe Vaillant <c.l.j.j.vaillant at durham.ac.uk>
+  - Andy Buckley <andy.buckley at cern.ch>
 References:
- - "Phys. Rev. Lett.61:1819, 1988. doi: 10.1103/PhysRevLett.61.1819"
\ No newline at end of file
+  - Phys.Rev.Lett.61:1819,1988
+  - doi:10.1103/PhysRevLett.61.1819
+RunInfo: QCD min bias events at sqrtS = 630 GeV and 1800 GeV, |eta| < 1.0.
+Energies: [630,1800]

Modified: trunk/data/plotinfo/CDF_1988_S1865951.plot
==============================================================================
--- trunk/data/plotinfo/CDF_1988_S1865951.plot	Wed Dec  9 10:08:29 2009	(r2154)
+++ trunk/data/plotinfo/CDF_1988_S1865951.plot	Wed Dec  9 14:39:31 2009	(r2155)
@@ -1,11 +1,11 @@
 # BEGIN PLOT /CDF_1988_S1865951/d01-x01-y01
 Title=$p_\perp$ distribution at $\sqrt{s} = 1800$ GeV
 XLabel=$p_\perp$
-YLabel=$E \frac{d^3 \sigma}{d p^3}$
+YLabel=$E \, \mathrm{d}^3\sigma/\mathrm{d}p^3$
 # END PLOT
 
 # BEGIN PLOT /CDF_1988_S1865951/d02-x01-y01
 Title=$p_\perp$ distribution at $\sqrt{s} = 630$ GeV
 XLabel=$p_\perp$
-YLabel=$E \frac{d^3 \sigma}{d p^3}$
+YLabel=$E \, \mathrm{d}^3\sigma/\mathrm{d}p^3$
 # END PLOT

Modified: trunk/src/Analyses/CDF_1988_S1865951.cc
==============================================================================
--- trunk/src/Analyses/CDF_1988_S1865951.cc	Wed Dec  9 10:08:29 2009	(r2154)
+++ trunk/src/Analyses/CDF_1988_S1865951.cc	Wed Dec  9 14:39:31 2009	(r2155)
@@ -1,10 +1,7 @@
 // -*- C++ -*-
 #include "Rivet/Analysis.hh"
 #include "Rivet/RivetAIDA.hh"
-#include "Rivet/Projections/FinalState.hh"
 #include "Rivet/Projections/ChargedFinalState.hh"
-#include "Rivet/Projections/TotalVisibleMomentum.hh"
-#include "Rivet/Projections/Beam.hh"
 #include "Rivet/Projections/TriggerCDFRun0Run1.hh"
 
 namespace Rivet {
@@ -18,22 +15,26 @@
       : Analysis("CDF_1988_S1865951")
     {
       setBeams(PROTON, ANTIPROTON);
+      _sumWTrig = 0;
     }
 
 
     /// @name Analysis methods
     //@{
  
-    /// Book histograms
+    /// Book histograms and set up projections
     void init() {
+      // Set up projections
       addProjection(TriggerCDFRun0Run1(), "Trigger");
       const ChargedFinalState cfs(-1.0, 1.0, 0.4*GeV);
       addProjection(cfs, "CFS");
-      addProjection(TotalVisibleMomentum(cfs), "Mom");
-      addProjection(Beam(), "Beam");
 
-      _hist_pt1800 = bookHistogram1D(1, 1, 1);
-      _hist_pt630 = bookHistogram1D(2, 1, 1);
+      // Book histo
+      if (fuzzyEquals(sqrtS()/GeV, 1800, 1E-3)) {
+        _hist_pt = bookHistogram1D(1, 1, 1);
+      } else if (fuzzyEquals(sqrtS()/GeV, 630, 1E-3)) {
+        _hist_pt = bookHistogram1D(2, 1, 1);
+      }
     }
  
  
@@ -43,39 +44,36 @@
       const bool trigger = applyProjection<TriggerCDFRun0Run1>(event, "Trigger").minBiasDecision();
       if (!trigger) vetoEvent;
       const double weight = event.weight();
+      _sumWTrig += weight;
 
-      const double sqrtS = applyProjection<Beam>(event, "Beam").sqrtS();
-      const FinalState& trackfs = applyProjection<ChargedFinalState>(event, "CFS");
-   
+      const FinalState& trackfs = applyProjection<ChargedFinalState>(event, "CFS");   
       foreach (Particle p, trackfs.particles()) {
         const double pt = p.momentum().pT();
         // Effective weight for d3sig/dp3 = weight / ( Delta eta * 2pi * pt ), with Delta(eta) = 2
-        const double eff_weight = weight/(2*TWOPI*pt);
-        if (fuzzyEquals(sqrtS, 630/GeV)) {
-          _hist_pt630->fill(pt, eff_weight);
-        } else if (fuzzyEquals(sqrtS, 1800/GeV)) {
-          _hist_pt1800->fill(pt, eff_weight);
-        }
-     
+        const double eff_weight = weight/(2*2*TWOPI*pt);
+        _hist_pt->fill(pt, eff_weight);
       }
     }
  
  
     /// Scale histos
     void finalize() {
-      /// @todo Total cross section hard-coded, needs a way to pass variable from generator
-      scale(_hist_pt630, 32.6/sumOfWeights());
-      scale(_hist_pt1800, 38.5/sumOfWeights());
+      scale(_hist_pt, crossSectionPerEvent()/millibarn);
     }
 
     //@}
 
+
   private:
+
+    /// @name Counters
+    //@{
+    double _sumWTrig;
+    //@}
  
     /// @name Histos
     //@{
-    AIDA::IHistogram1D* _hist_pt630;
-    AIDA::IHistogram1D* _hist_pt1800;
+    AIDA::IHistogram1D* _hist_pt;
     //@}
 
   };