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

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed Dec  9 09:54:02 2009
New Revision: 2153

Log:
UA5 1982 now matches the data: VALIDATED. For some reason, the pp and ppbar <Nch> measures differ in normalisation by a factor of 2...

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

Modified: trunk/data/anainfo/UA5_1982_S875503.info
==============================================================================
--- trunk/data/anainfo/UA5_1982_S875503.info	Tue Dec  8 23:37:57 2009	(r2152)
+++ trunk/data/anainfo/UA5_1982_S875503.info	Wed Dec  9 09:54:02 2009	(r2153)
@@ -1,15 +1,18 @@
 Name: UA5_1982_S875503
 SpiresID: 875503
-Summary: "UA5 multiplicity and pseudorapidity distributions for PP and PPBar."
-Description: "Comparisons of multiplicity and pseudorapidity distributions for PP
-	     and PPBar collisions at 53 GeV, based on the UA5 53GeV runs in 1982.
-             Data confirms the lack of significant difference between the two beams."
-RunInfo: Generic QCD events at sqrtS = 53 GeV.
-Status: UNVALIDATED
+Summary: UA5 multiplicity and pseudorapidity distributions for pp and ppbar.
+Status: VALIDATED
 Experiment: UA5
 Collider: SPS
 Year: 1982
+RunInfo: Min bias QCD events at sqrtS = 53~GeV. Run with both pp and ppbar beams.
+Energies: [53]
 Authors:
+ - Andy Buckley <andy.buckley at cern.ch>
  - Christophe Vaillant <c.l.j.j.vaillant at durham.ac.uk>
 References:
- - "Phys. Lett.112B: 183, 1982"
\ No newline at end of file
+ - Phys.Lett.112B:183,1982
+Description: 
+  Comparisons of multiplicity and pseudorapidity distributions for pp
+  and ppbar collisions at 53 GeV, based on the UA5 53~GeV runs in 1982.
+  Data confirms the lack of significant difference between the two beams.

Modified: trunk/data/plotinfo/UA5_1982_S875503.plot
==============================================================================
--- trunk/data/plotinfo/UA5_1982_S875503.plot	Tue Dec  8 23:37:57 2009	(r2152)
+++ trunk/data/plotinfo/UA5_1982_S875503.plot	Wed Dec  9 09:54:02 2009	(r2153)
@@ -1,23 +1,23 @@
 # BEGIN PLOT /UA5_1982_S875503/d02-x01-y01
-Title=Mean charged multiplicity for PP collisions at $\sqrt{s} = 53$ \unit{GeV}
-XLabel=\unit{GeV}
-YLabel=$\left< N_\text{ch} \right>$
+Title=Mean charged multiplicity for $pp$ collisions at $\sqrt{s} = 53~\text{GeV}$
+XLabel=$\sqrt{s}$ / GeV
+YLabel=$\langle N_\text{ch} \rangle$
 # END PLOT
 
 # BEGIN PLOT /UA5_1982_S875503/d02-x01-y02
-Title=Mean charged multiplicity for PPbar collisions at $\sqrt{s} = 53$ \unit{GeV}
-XLabel=\unit{GeV}
-YLabel=$\left< N_\text{ch} \right>$
+Title=Mean charged multiplicity for $p\bar{p}$ collisions at $\sqrt{s} = 53~\text{GeV}$
+XLabel=$\sqrt{s}$ / GeV
+YLabel=$\langle N_\text{ch} \rangle$
 # END PLOT
 
 # BEGIN PLOT /UA5_1982_S875503/d03-x01-y01
-Title=Pseudorapidity distribution for PP collisions at $\sqrt{s} = 53$ \unit{GeV}
-XLabel=$\left|\eta\right|$
-YLabel=$\frac{1}{\sigma} \frac{d \sigma}{d \eta}$
+Title=Pseudorapidity for $pp$ collisions at $\sqrt{s} = 53~\text{GeV}$
+XLabel=$\eta$
+YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$
 # END PLOT
 
 # BEGIN PLOT /UA5_1982_S875503/d04-x01-y01
-Title=Pseudorapidity distribution for PPbar collisions at $\sqrt{s} = 53$ \unit{GeV}
-XLabel=$\left|\eta\right|$
-YLabel=$\frac{1}{\sigma} \frac{d \sigma}{d \eta}$
+Title=Pseudorapidity for $p\bar{p}$ collisions at $\sqrt{s} = 53~\text{GeV}$
+XLabel=$\eta$
+YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$
 # END PLOT

Modified: trunk/src/Analyses/UA5_1982_S875503.cc
==============================================================================
--- trunk/src/Analyses/UA5_1982_S875503.cc	Tue Dec  8 23:37:57 2009	(r2152)
+++ trunk/src/Analyses/UA5_1982_S875503.cc	Wed Dec  9 09:54:02 2009	(r2153)
@@ -1,33 +1,37 @@
 // -*- C++ -*-
 #include "Rivet/Analysis.hh"
 #include "Rivet/RivetAIDA.hh"
-#include "Rivet/Tools/ParticleIdUtils.hh"
-#include "Rivet/Projections/Beam.hh"
 #include "Rivet/Projections/ChargedFinalState.hh"
 #include "Rivet/Projections/TriggerUA5.hh"
 
 namespace Rivet {
 
+
   class UA5_1982_S875503 : public Analysis {
   public:
  
     /// Default constructor
     UA5_1982_S875503() : Analysis("UA5_1982_S875503") {
-      //
+      _sumWTrig = 0;
     }
 
 
     /// @name Analysis methods
     //@{
 
+    /// Set up projections and book histos
     void init() {
       addProjection(TriggerUA5(), "Trigger");
       addProjection(ChargedFinalState(-3.5, 3.5), "CFS");
 
-      _hist_nch_pp    = bookHistogram1D(2,1,1);
-      _hist_nch_ppbar = bookHistogram1D(2,1,2);
-      _hist_eta_pp    = bookHistogram1D(3,1,1);
-      _hist_eta_ppbar = bookHistogram1D(4,1,1);
+      // Book histos based on pp or ppbar beams
+      if (beams().first == beams().second) {
+        _hist_nch = bookHistogram1D(2,1,1);
+        _hist_eta = bookHistogram1D(3,1,1);
+      } else {
+        _hist_nch = bookHistogram1D(2,1,2);
+        _hist_eta = bookHistogram1D(4,1,1);
+      }
     }
  
  
@@ -35,48 +39,48 @@
       // Trigger
       const TriggerUA5& trigger = applyProjection<TriggerUA5>(event, "Trigger");
       if (!trigger.nsdDecision()) vetoEvent;
+      const double weight = event.weight();
+      _sumWTrig += weight;
 
       // Get tracks
-      const double weight = event.weight();
       const ChargedFinalState& cfs = applyProjection<ChargedFinalState>(event, "CFS");
    
       // Fill mean charged multiplicity histos
-      if (trigger.samebeams()) { // PP
-        _hist_nch_pp->fill(_hist_nch_pp->binMean(0), cfs.size());
-      } else { // PPbar
-        _hist_nch_ppbar->fill(_hist_nch_ppbar->binMean(0), cfs.size());
-      }
+      _hist_nch->fill(_hist_nch->binMean(0), cfs.size());
 
       // Iterate over all tracks and fill eta histograms
       foreach (const Particle& p, cfs.particles()) {
-        if (trigger.samebeams()) { // PP
-          _hist_eta_pp->fill(fabs(p.momentum().eta()), weight);
-        } else { // PPbar
-          _hist_eta_ppbar->fill(fabs(p.momentum().eta()), weight);
-        }
+        const double eta = fabs(p.momentum().pseudorapidity());
+        _hist_eta->fill(eta, weight);
       }
          
     }
  
  
     void finalize() {
-      scale(_hist_nch_pp,    1.0/sumOfWeights());
-      scale(_hist_nch_ppbar, 1.0/sumOfWeights());
-      normalize(_hist_eta_pp,    5.28);
-      normalize(_hist_eta_ppbar, 5.29);
+      /// @todo Why the factor of 2 on Nch for ppbar?
+      if (beams().first == beams().second) {
+        scale(_hist_nch, 1.0/_sumWTrig);
+      } else {
+        scale(_hist_nch, 0.5/_sumWTrig);
+      }
+      scale(_hist_eta, 0.5/_sumWTrig);
     }
 
     //@}
  
 
   private:
+
+    /// @name Counters
+    //@{
+    double _sumWTrig;
+    //@}
  
     /// @name Histogram collections
     //@{
-    AIDA::IHistogram1D* _hist_nch_pp;
-    AIDA::IHistogram1D* _hist_nch_ppbar;
-    AIDA::IHistogram1D* _hist_eta_pp;
-    AIDA::IHistogram1D* _hist_eta_ppbar;
+    AIDA::IHistogram1D* _hist_nch;
+    AIDA::IHistogram1D* _hist_eta;
     //@}
  
   };