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

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Wed Nov 25 15:55:55 2009
New Revision: 2095

Log:
Normalising CDF_2000_S4155203 to generator cross-section
and fixing the plotting in the .plot file.

Modified:
   trunk/data/plotinfo/CDF_2000_S4155203.plot
   trunk/src/Analyses/CDF_2000_S4155203.cc

Modified: trunk/data/plotinfo/CDF_2000_S4155203.plot
==============================================================================
--- trunk/data/plotinfo/CDF_2000_S4155203.plot	Wed Nov 25 15:44:55 2009	(r2094)
+++ trunk/data/plotinfo/CDF_2000_S4155203.plot	Wed Nov 25 15:55:55 2009	(r2095)
@@ -4,5 +4,7 @@
 YLabel=$\mathrm{d}{\sigma}/\mathrm{d}{p_\perp(Z)}$
 LogY=0
 XMax=45
+NormalizeToIntegral=1
+Scale=247.4
 # END PLOT
 

Modified: trunk/src/Analyses/CDF_2000_S4155203.cc
==============================================================================
--- trunk/src/Analyses/CDF_2000_S4155203.cc	Wed Nov 25 15:44:55 2009	(r2094)
+++ trunk/src/Analyses/CDF_2000_S4155203.cc	Wed Nov 25 15:55:55 2009	(r2095)
@@ -18,9 +18,11 @@
 
     /// Constructor
     CDF_2000_S4155203()
-      : Analysis("CDF_2000_S4155203")
+      : Analysis("CDF_2000_S4155203"),
+        _sumWeightSelected(0.0)
     {
       setBeams(PROTON, ANTIPROTON);
+      setNeedsCrossSection(true);
     }
 
 
@@ -49,13 +51,12 @@
       getLog() << Log::DEBUG << "Dilepton mass = " << pZ.mass()/GeV << " GeV"  << endl;
       getLog() << Log::DEBUG << "Dilepton pT   = " << pZ.pT()/GeV << " GeV" << endl;
       _hist_zpt->fill(pZ.pT()/GeV, e.weight());
+      _sumWeightSelected += e.weight();
     }
  
  
     void finalize() {
-      // Normalize to the experimental cross-section
-      /// @todo Get norm from generator cross-section
-      normalize(_hist_zpt, 247.4);
+      scale(_hist_zpt, crossSection()/picobarn/_sumWeightSelected);
     }
  
     //@}
@@ -63,7 +64,8 @@
 
   private:
 
-    // Histogram
+    double _sumWeightSelected;
+
     AIDA::IHistogram1D *_hist_zpt;
 
   };