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

blackhole at projects.hepforge.org blackhole at projects.hepforge.org
Thu Oct 22 21:56:38 BST 2009
Previous message: [Rivet-svn] r1952 - trunk/src/Analyses
Next message: [Rivet-svn] r1954 - trunk/src/Analyses
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: fsiegert
Date: Thu Oct 22 21:56:38 2009
New Revision: 1953

Log:
Transform all my analyses to scale to cross section in the finalize
method and normalize only in the *.plot files.

Modified:
   trunk/data/plotinfo/D0_1996_S3214044.plot
   trunk/data/plotinfo/D0_1996_S3324664.plot
   trunk/data/plotinfo/D0_2004_S5992206.plot
   trunk/data/plotinfo/D0_2007_S7075677.plot
   trunk/data/plotinfo/D0_2008_S6879055.plot
   trunk/data/plotinfo/D0_2008_S7554427.plot
   trunk/data/plotinfo/D0_2009_S8320160.plot
   trunk/src/Analyses/D0_1996_S3214044.cc
   trunk/src/Analyses/D0_1996_S3324664.cc
   trunk/src/Analyses/D0_2004_S5992206.cc
   trunk/src/Analyses/D0_2007_S7075677.cc
   trunk/src/Analyses/D0_2008_S6879055.cc
   trunk/src/Analyses/D0_2008_S7554427.cc
   trunk/src/Analyses/D0_2009_S8320160.cc

Modified: trunk/data/plotinfo/D0_1996_S3214044.plot
==============================================================================
--- trunk/data/plotinfo/D0_1996_S3214044.plot	Wed Oct 21 22:14:34 2009	(r1952)
+++ trunk/data/plotinfo/D0_1996_S3214044.plot	Thu Oct 22 21:56:38 2009	(r1953)
@@ -3,6 +3,7 @@
 XLabel=$x_3 = \frac{2E_3}{\sqrt{s}}$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}x_3$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d02-x01-y01
@@ -10,6 +11,7 @@
 XLabel=$x_5 = \frac{2E_5}{\sqrt{s}}$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}x_5$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d03-x01-y01
@@ -17,6 +19,7 @@
 XLabel=$\cos(\theta_3^*)$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos(\theta_3^*)$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d04-x01-y01
@@ -24,6 +27,7 @@
 XLabel=$\psi^*$ (degree)
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\psi^*$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d05-x01-y01
@@ -31,6 +35,7 @@
 XLabel=$\mu_{34}$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\mu_{34}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d06-x01-y01
@@ -38,6 +43,7 @@
 XLabel=$\mu_{35}$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\mu_{35}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d07-x01-y01
@@ -45,6 +51,7 @@
 XLabel=$\mu_{45}$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\mu_{45}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d08-x01-y01
@@ -52,6 +59,7 @@
 XLabel=$x_3 = \frac{2E_3}{\sqrt{s}}$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}x_3$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d09-x01-y01
@@ -59,6 +67,7 @@
 XLabel=$x_4 = \frac{2E_4}{\sqrt{s}}$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}x_4$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d10-x01-y01
@@ -66,6 +75,7 @@
 XLabel=$x_5 = \frac{2E_5}{\sqrt{s}}$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}x_5$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d11-x01-y01
@@ -73,6 +83,7 @@
 XLabel=$x_6 = \frac{2E_6}{\sqrt{s}}$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}x_6$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d12-x01-y01
@@ -80,6 +91,7 @@
 XLabel=$\cos(\theta_3^*)$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos(\theta_3^*)$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d13-x01-y01
@@ -87,6 +99,7 @@
 XLabel=$\cos(\theta_4^*)$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos(\theta_4^*)$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d14-x01-y01
@@ -94,6 +107,7 @@
 XLabel=$\cos(\theta_5^*)$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos(\theta_5^*)$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d15-x01-y01
@@ -101,6 +115,7 @@
 XLabel=$\cos(\theta_6^*)$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos(\theta_6^*)$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d16-x01-y01
@@ -108,6 +123,7 @@
 XLabel=$\cos(\omega_{34})$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos(\omega_{34}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d17-x01-y01
@@ -115,6 +131,7 @@
 XLabel=$\cos(\omega_{35})$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos(\omega_{35})$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d18-x01-y01
@@ -122,6 +139,7 @@
 XLabel=$\cos(\omega_{36})$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos(\omega_{36})$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d19-x01-y01
@@ -129,6 +147,7 @@
 XLabel=$\cos(\omega_{45})$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos(\omega_{45})$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d20-x01-y01
@@ -136,6 +155,7 @@
 XLabel=$\cos(\omega_{46})$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos(\omega_{46})$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d21-x01-y01
@@ -143,6 +163,7 @@
 XLabel=$\cos(\omega_{56})$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos(\omega_{56})$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d22-x01-y01
@@ -150,6 +171,7 @@
 XLabel=$\mu_{34}$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\mu_{34}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d23-x01-y01
@@ -157,6 +179,7 @@
 XLabel=$\mu_{35}$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\mu_{35}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d24-x01-y01
@@ -164,6 +187,7 @@
 XLabel=$\mu_{36}$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\mu_{36}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d25-x01-y01
@@ -171,6 +195,7 @@
 XLabel=$\mu_{45}$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\mu_{45}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d26-x01-y01
@@ -178,6 +203,7 @@
 XLabel=$\mu_{46}$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\mu_{46}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d27-x01-y01
@@ -185,6 +211,7 @@
 XLabel=$\mu_{56}$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\mu_{56}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d28-x01-y01
@@ -192,6 +219,7 @@
 XLabel=$\chi_\mathrm{BZ}$ (degree)
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\chi_\mathrm{BZ}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3214044/d29-x01-y01
@@ -199,4 +227,5 @@
 XLabel=$\cos(\theta_\mathrm{NR})$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos(\theta_\mathrm{NR})$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT

Modified: trunk/data/plotinfo/D0_1996_S3324664.plot
==============================================================================
--- trunk/data/plotinfo/D0_1996_S3324664.plot	Wed Oct 21 22:14:34 2009	(r1952)
+++ trunk/data/plotinfo/D0_1996_S3324664.plot	Thu Oct 22 21:56:38 2009	(r1953)
@@ -2,24 +2,39 @@
 Title=Pseudorapidity difference of the two opposite jets
 XLabel=$\Delta \eta = |\eta_1 - \eta_2|$
 YLabel=$\mathrm{d}N/\mathrm{d}\Delta\eta$
+NormalizeToIntegral=1
+# Normalised to #events
+Scale=8830.0
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3324664/d02-x01-y01
 Title=Azimuthal angle difference for $0 < \Delta \eta < 2$
 XLabel=$1 - \Delta \phi/\pi$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\Delta\phi$
+# I have no idea what this is normalised to... in the paper it says unity!
+# @todo Understand this!
+NormalizeToIntegral=1
+Scale=0.0798
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3324664/d02-x01-y02
 Title=Azimuthal angle difference for $2 < \Delta \eta < 4$
 XLabel=$1 - \Delta \phi/\pi$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\Delta\phi$
+# I have no idea what this is normalised to... in the paper it says unity!
+# @todo Understand this!
+NormalizeToIntegral=1
+Scale=0.0798
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3324664/d02-x01-y03
 Title=Azimuthal angle difference for $4 < \Delta \eta < 6$
 XLabel=$1 - \Delta \phi/\pi$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\Delta\phi$
+# I have no idea what this is normalised to... in the paper it says unity!
+# @todo Understand this!
+NormalizeToIntegral=1
+Scale=0.0798
 # END PLOT
 
 # BEGIN PLOT /D0_1996_S3324664/d03-x01-y01

Modified: trunk/data/plotinfo/D0_2004_S5992206.plot
==============================================================================
--- trunk/data/plotinfo/D0_2004_S5992206.plot	Wed Oct 21 22:14:34 2009	(r1952)
+++ trunk/data/plotinfo/D0_2004_S5992206.plot	Thu Oct 22 21:56:38 2009	(r1953)
@@ -2,23 +2,27 @@
 Title=Jet--jet azimuthal angle, $p_\perp^\text{max} \in [75,100]\text{ GeV}$
 XLabel=$\Delta \phi_\text{dijet}$ / rad
 YLabel=$1/\sigma_\text{dijet} \, \text{d}\sigma_\text{dijet}/\text{d}\Delta\phi_\text{dijet}$
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_2004_S5992206/d02-x02-y01
 Title=Jet--jet azimuthal angle, $p_\perp^\text{max} \in [100..130]\text{ GeV}$
 XLabel=$\Delta \phi_\text{dijet}$ / rad
 YLabel=$1/\sigma_\text{dijet} \, \text{d}\sigma_\text{dijet}/\text{d}\Delta\phi_\text{dijet}$
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_2004_S5992206/d03-x02-y01
 Title=Jet--jet azimuthal angle, $p_\perp^\text{max} \in [130..180]\text{ GeV}$
 XLabel=$\Delta \phi_\text{dijet}$ / rad
 YLabel=$1/\sigma_\text{dijet} \, \text{d}\sigma_\text{dijet}/\text{d}\Delta\phi_\text{dijet}$
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_2004_S5992206/d04-x02-y01
 Title=Jet--jet azimuthal angle, $p_\perp^\text{max} > 180\text{ GeV}$
 XLabel=$\Delta \phi_\text{dijet}$ / rad
 YLabel=$1/\sigma_\text{dijet} \, \text{d}\sigma_\text{dijet}/\text{d}\Delta\phi_\text{dijet}$
+NormalizeToIntegral=1
 # END PLOT
 

Modified: trunk/data/plotinfo/D0_2007_S7075677.plot
==============================================================================
--- trunk/data/plotinfo/D0_2007_S7075677.plot	Wed Oct 21 22:14:34 2009	(r1952)
+++ trunk/data/plotinfo/D0_2007_S7075677.plot	Thu Oct 22 21:56:38 2009	(r1953)
@@ -4,5 +4,9 @@
 YLabel=$1/\sigma \; \text{d}\sigma/\text{d}|y|(Z)$
 LegendXPos=0.5
 LegendYPos=0.6
+NormalizeToIntegral=1
+# Data seems to have been normalized for the avg of the two sides 
+# (+ve & -ve rapidity) rather than the sum, hence the 0.5:
+Scale=0.5
 # END PLOT
 

Modified: trunk/data/plotinfo/D0_2008_S6879055.plot
==============================================================================
--- trunk/data/plotinfo/D0_2008_S6879055.plot	Wed Oct 21 22:14:34 2009	(r1952)
+++ trunk/data/plotinfo/D0_2008_S6879055.plot	Thu Oct 22 21:56:38 2009	(r1953)
@@ -10,17 +10,32 @@
 Title=$p_\perp$ of 1st jet (not detector-corrected!)
 XLabel=$p_\perp$(1st jet) [GeV]
 YLabel=$1/\sigma \; \text{d}\sigma/\text{d}p_\perp$
+# Normalise jet pT's to integral of data
+# there is no other way to do this, because these quantities are not
+# detector corrected
+NormalizeToIntegral=1
+Scale=10439.0
 # END PLOT
 
 # BEGIN PLOT /D0_2008_S6879055/d03-x01-y01
 Title=$p_\perp$ of 2nd jet (not detector-corrected!)
 XLabel=$p_\perp$(2nd jet) [GeV]
 YLabel=$1/\sigma \; \text{d}\sigma/\text{d}p_\perp$
+# Normalise jet pT's to integral of data
+# there is no other way to do this, because these quantities are not
+# detector corrected
+NormalizeToIntegral=1
+Scale=1461.5
 # END PLOT
 
 # BEGIN PLOT /D0_2008_S6879055/d04-x01-y01
 Title=$p_\perp$ of 3rd jet (not detector-corrected!)
 XLabel=$p_\perp$(3rd jet) [GeV]
 YLabel=$1/\sigma \; \text{d}\sigma/\text{d}p_\perp$
+# Normalise jet pT's to integral of data
+# there is no other way to do this, because these quantities are not
+# detector corrected
+NormalizeToIntegral=1
+Scale=217.0
 # END PLOT
 

Modified: trunk/data/plotinfo/D0_2008_S7554427.plot
==============================================================================
--- trunk/data/plotinfo/D0_2008_S7554427.plot	Wed Oct 21 22:14:34 2009	(r1952)
+++ trunk/data/plotinfo/D0_2008_S7554427.plot	Thu Oct 22 21:56:38 2009	(r1953)
@@ -2,11 +2,13 @@
 Title=Z boson pT
 XLabel=$p_{\perp}$(Z) [GeV]
 YLabel=$1/\sigma \; \text{d}\sigma/\text{d}p_\perp(Z)$
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_2008_S7554427/d03-x01-y01
 Title=Z boson pT (forward region only)
 XLabel=$p_{\perp}$(Z) [GeV]
 YLabel=$1/\sigma \; \text{d}\sigma/\text{d}p_\perp(Z)$
+NormalizeToIntegral=1
 # END PLOT
 

Modified: trunk/data/plotinfo/D0_2009_S8320160.plot
==============================================================================
--- trunk/data/plotinfo/D0_2009_S8320160.plot	Wed Oct 21 22:14:34 2009	(r1952)
+++ trunk/data/plotinfo/D0_2009_S8320160.plot	Thu Oct 22 21:56:38 2009	(r1953)
@@ -3,6 +3,7 @@
 XLabel=$\chi_{\mathrm{dijet}} = \exp(|y_1-y_2|)$
 YLabel=$1/\sigma_{\mathrm{dijet}} \, \mathrm{d}\sigma/\mathrm{d}\chi_{\mathrm{dijet}}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_2009_S8320160/d02-x01-y01
@@ -10,6 +11,7 @@
 XLabel=$\chi_{\mathrm{dijet}} = \exp(|y_1-y_2|)$
 YLabel=$1/\sigma_{\mathrm{dijet}} \, \mathrm{d}\sigma/\mathrm{d}\chi_{\mathrm{dijet}}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_2009_S8320160/d03-x01-y01
@@ -17,6 +19,7 @@
 XLabel=$\chi_{\mathrm{dijet}} = \exp(|y_1-y_2|)$
 YLabel=$1/\sigma_{\mathrm{dijet}} \, \mathrm{d}\sigma/\mathrm{d}\chi_{\mathrm{dijet}}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_2009_S8320160/d04-x01-y01
@@ -24,6 +27,7 @@
 XLabel=$\chi_{\mathrm{dijet}} = \exp(|y_1-y_2|)$
 YLabel=$1/\sigma_{\mathrm{dijet}} \, \mathrm{d}\sigma/\mathrm{d}\chi_{\mathrm{dijet}}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_2009_S8320160/d05-x01-y01
@@ -31,6 +35,7 @@
 XLabel=$\chi_{\mathrm{dijet}} = \exp(|y_1-y_2|)$
 YLabel=$1/\sigma_{\mathrm{dijet}} \, \mathrm{d}\sigma/\mathrm{d}\chi_{\mathrm{dijet}}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_2009_S8320160/d06-x01-y01
@@ -38,6 +43,7 @@
 XLabel=$\chi_{\mathrm{dijet}} = \exp(|y_1-y_2|)$
 YLabel=$1/\sigma_{\mathrm{dijet}} \, \mathrm{d}\sigma/\mathrm{d}\chi_{\mathrm{dijet}}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_2009_S8320160/d07-x01-y01
@@ -45,6 +51,7 @@
 XLabel=$\chi_{\mathrm{dijet}} = \exp(|y_1-y_2|)$
 YLabel=$1/\sigma_{\mathrm{dijet}} \, \mathrm{d}\sigma/\mathrm{d}\chi_{\mathrm{dijet}}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_2009_S8320160/d08-x01-y01
@@ -52,6 +59,7 @@
 XLabel=$\chi_{\mathrm{dijet}} = \exp(|y_1-y_2|)$
 YLabel=$1/\sigma_{\mathrm{dijet}} \, \mathrm{d}\sigma/\mathrm{d}\chi_{\mathrm{dijet}}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_2009_S8320160/d09-x01-y01
@@ -59,6 +67,7 @@
 XLabel=$\chi_{\mathrm{dijet}} = \exp(|y_1-y_2|)$
 YLabel=$1/\sigma_{\mathrm{dijet}} \, \mathrm{d}\sigma/\mathrm{d}\chi_{\mathrm{dijet}}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT
 
 # BEGIN PLOT /D0_2009_S8320160/d10-x01-y01
@@ -66,4 +75,5 @@
 XLabel=$\chi_{\mathrm{dijet}} = \exp(|y_1-y_2|)$
 YLabel=$1/\sigma_{\mathrm{dijet}} \, \mathrm{d}\sigma/\mathrm{d}\chi_{\mathrm{dijet}}$
 LogY=0
+NormalizeToIntegral=1
 # END PLOT

Modified: trunk/src/Analyses/D0_1996_S3214044.cc
==============================================================================
--- trunk/src/Analyses/D0_1996_S3214044.cc	Wed Oct 21 22:14:34 2009	(r1952)
+++ trunk/src/Analyses/D0_1996_S3214044.cc	Thu Oct 22 21:56:38 2009	(r1953)
@@ -21,7 +21,7 @@
     D0_1996_S3214044() : Analysis("D0_1996_S3214044") 
     {
       setBeams(PROTON, ANTIPROTON);
-      setNeedsCrossSection(false);
+      setNeedsCrossSection(true);
     }
     
     
@@ -103,35 +103,36 @@
 
 
     void finalize() {
-      normalize(_h_3j_x3, 1.0);
-      normalize(_h_3j_x5, 1.0);
-      normalize(_h_3j_costheta3, 1.0);
-      normalize(_h_3j_psi, 1.0);
-      normalize(_h_3j_mu34, 1.0);
-      normalize(_h_3j_mu35, 1.0);
-      normalize(_h_3j_mu45, 1.0);
-      normalize(_h_4j_x3, 1.0);
-      normalize(_h_4j_x4, 1.0);
-      normalize(_h_4j_x5, 1.0);
-      normalize(_h_4j_x6, 1.0);
-      normalize(_h_4j_costheta3, 1.0);
-      normalize(_h_4j_costheta4, 1.0);
-      normalize(_h_4j_costheta5, 1.0);
-      normalize(_h_4j_costheta6, 1.0);
-      normalize(_h_4j_cosomega34, 1.0);
-      normalize(_h_4j_cosomega35, 1.0);
-      normalize(_h_4j_cosomega36, 1.0);
-      normalize(_h_4j_cosomega45, 1.0);
-      normalize(_h_4j_cosomega46, 1.0);
-      normalize(_h_4j_cosomega56, 1.0);
-      normalize(_h_4j_mu34, 1.0);
-      normalize(_h_4j_mu35, 1.0);
-      normalize(_h_4j_mu36, 1.0);
-      normalize(_h_4j_mu45, 1.0);
-      normalize(_h_4j_mu46, 1.0);
-      normalize(_h_4j_mu56, 1.0);
-      normalize(_h_4j_theta_BZ, 1.0);
-      normalize(_h_4j_costheta_NR, 1.0);
+      const double factor = crossSection()/sumOfWeights();
+      scale(_h_3j_x3, factor);
+      scale(_h_3j_x5, factor);
+      scale(_h_3j_costheta3, factor);
+      scale(_h_3j_psi, factor);
+      scale(_h_3j_mu34, factor);
+      scale(_h_3j_mu35, factor);
+      scale(_h_3j_mu45, factor);
+      scale(_h_4j_x3, factor);
+      scale(_h_4j_x4, factor);
+      scale(_h_4j_x5, factor);
+      scale(_h_4j_x6, factor);
+      scale(_h_4j_costheta3, factor);
+      scale(_h_4j_costheta4, factor);
+      scale(_h_4j_costheta5, factor);
+      scale(_h_4j_costheta6, factor);
+      scale(_h_4j_cosomega34, factor);
+      scale(_h_4j_cosomega35, factor);
+      scale(_h_4j_cosomega36, factor);
+      scale(_h_4j_cosomega45, factor);
+      scale(_h_4j_cosomega46, factor);
+      scale(_h_4j_cosomega56, factor);
+      scale(_h_4j_mu34, factor);
+      scale(_h_4j_mu35, factor);
+      scale(_h_4j_mu36, factor);
+      scale(_h_4j_mu45, factor);
+      scale(_h_4j_mu46, factor);
+      scale(_h_4j_mu56, factor);
+      scale(_h_4j_theta_BZ, factor);
+      scale(_h_4j_costheta_NR, factor);
     }
     
     //@}

Modified: trunk/src/Analyses/D0_1996_S3324664.cc
==============================================================================
--- trunk/src/Analyses/D0_1996_S3324664.cc	Wed Oct 21 22:14:34 2009	(r1952)
+++ trunk/src/Analyses/D0_1996_S3324664.cc	Thu Oct 22 21:56:38 2009	(r1953)
@@ -18,7 +18,7 @@
     /// Constructor
     D0_1996_S3324664() : Analysis("D0_1996_S3324664") {
       setBeams(PROTON, ANTIPROTON);
-      setNeedsCrossSection(false);
+      setNeedsCrossSection(true);
     }
     
     
@@ -85,13 +85,10 @@
     
     
     void finalize() {
-      // Normalised to #events
-      normalize(_h_deta, 8830.0); 
+      scale(_h_deta, crossSection()/sumOfWeights()); 
       
-      // I have no idea what this is normalised to... in the paper it says unity!
-      /// @todo Understand this!
       foreach (IHistogram1D* histo, _h_dphi.getHistograms()) {
-        normalize(histo, 0.0798);
+        scale(histo, crossSection()/sumOfWeights());
       }
       
     }

Modified: trunk/src/Analyses/D0_2004_S5992206.cc
==============================================================================
--- trunk/src/Analyses/D0_2004_S5992206.cc	Wed Oct 21 22:14:34 2009	(r1952)
+++ trunk/src/Analyses/D0_2004_S5992206.cc	Thu Oct 22 21:56:38 2009	(r1953)
@@ -108,11 +108,10 @@
     
     // Finalize
     void finalize() { 
-      // Normalize histograms to unit area
-      normalize(_histJetAzimuth_pTmax75_100);
-      normalize(_histJetAzimuth_pTmax100_130);
-      normalize(_histJetAzimuth_pTmax130_180);
-      normalize(_histJetAzimuth_pTmax180_);
+      scale(_histJetAzimuth_pTmax75_100, crossSection()/sumOfWeights());
+      scale(_histJetAzimuth_pTmax100_130, crossSection()/sumOfWeights());
+      scale(_histJetAzimuth_pTmax130_180, crossSection()/sumOfWeights());
+      scale(_histJetAzimuth_pTmax180_, crossSection()/sumOfWeights());
     }
     
     //@}

Modified: trunk/src/Analyses/D0_2007_S7075677.cc
==============================================================================
--- trunk/src/Analyses/D0_2007_S7075677.cc	Wed Oct 21 22:14:34 2009	(r1952)
+++ trunk/src/Analyses/D0_2007_S7075677.cc	Thu Oct 22 21:56:38 2009	(r1953)
@@ -20,6 +20,7 @@
     {
       // Run II Z rapidity
       setBeams(PROTON, ANTIPROTON);
+      setNeedsCrossSection(true);
     }
     
 
@@ -62,9 +63,7 @@
     
     // Finalize
     void finalize() {
-      // Data seems to have been normalized for the avg of the two sides 
-      // (+ve & -ve rapidity) rather than the sum, hence the 0.5:
-      normalize(_h_yZ, 0.5);
+      scale(_h_yZ, crossSection()/sumOfWeights());
     }
 
     //@}

Modified: trunk/src/Analyses/D0_2008_S6879055.cc
==============================================================================
--- trunk/src/Analyses/D0_2008_S6879055.cc	Wed Oct 21 22:14:34 2009	(r1952)
+++ trunk/src/Analyses/D0_2008_S6879055.cc	Thu Oct 22 21:56:38 2009	(r1953)
@@ -20,6 +20,7 @@
     D0_2008_S6879055() : Analysis("D0_2008_S6879055")
     {
       setBeams(PROTON, ANTIPROTON);
+      setNeedsCrossSection(true);
     } 
 
 
@@ -144,12 +145,9 @@
       // Now divide by the inclusive result
       _crossSectionRatio->scale(1.0/_crossSectionRatio->binHeight(0));
       
-      // Normalise jet pT's to integral of data
-      // there is no other way to do this, because these quantities are not
-      // detector corrected
-      normalize(_pTjet1, 10439.0);
-      normalize(_pTjet2, 1461.5);
-      normalize(_pTjet3, 217.0);
+      scale(_pTjet1, crossSection()/sumOfWeights());
+      scale(_pTjet2, crossSection()/sumOfWeights());
+      scale(_pTjet3, crossSection()/sumOfWeights());
     }
     
     //@}

Modified: trunk/src/Analyses/D0_2008_S7554427.cc
==============================================================================
--- trunk/src/Analyses/D0_2008_S7554427.cc	Wed Oct 21 22:14:34 2009	(r1952)
+++ trunk/src/Analyses/D0_2008_S7554427.cc	Thu Oct 22 21:56:38 2009	(r1953)
@@ -21,6 +21,7 @@
     {
       // Run II Z pT
       setBeams(PROTON, ANTIPROTON);
+      setNeedsCrossSection(true);
     } 
     
     
@@ -62,8 +63,8 @@
     
     // Finalize
     void finalize() {
-      normalize(_h_ZpT);
-      normalize(_h_forward_ZpT);
+      scale(_h_ZpT, crossSection()/sumOfWeights());
+      scale(_h_forward_ZpT, crossSection()/sumOfWeights());
     }
     
     //@}

Modified: trunk/src/Analyses/D0_2009_S8320160.cc
==============================================================================
--- trunk/src/Analyses/D0_2009_S8320160.cc	Wed Oct 21 22:14:34 2009	(r1952)
+++ trunk/src/Analyses/D0_2009_S8320160.cc	Thu Oct 22 21:56:38 2009	(r1953)
@@ -21,6 +21,7 @@
     D0_2009_S8320160() : Analysis("D0_2009_S8320160")
     {
       setBeams(PROTON, ANTIPROTON);
+      setNeedsCrossSection(true);
     } 
     
     //@}
@@ -73,7 +74,7 @@
     /// Finalize
     void finalize() {
       foreach (AIDA::IHistogram1D* hist, _h_chi_dijet.getHistograms()) {
-        normalize(hist);
+        scale(hist, crossSection()/sumOfWeights());
       }
     }
Previous message: [Rivet-svn] r1952 - trunk/src/Analyses
Next message: [Rivet-svn] r1954 - trunk/src/Analyses
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Rivet-svn mailing list