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

[blackhole at projects.hepforge.org]

Author: fsiegert
Date: Wed Oct 21 21:29:18 2009
New Revision: 1948

Log:
First analysis which fills cross section histograms and then normalises
only in the *.plot file.

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

Modified: trunk/data/plotinfo/CDF_1996_S3108457.plot
==============================================================================
--- trunk/data/plotinfo/CDF_1996_S3108457.plot	Wed Oct 21 20:56:33 2009	(r1947)
+++ trunk/data/plotinfo/CDF_1996_S3108457.plot	Wed Oct 21 21:29:18 2009	(r1948)
@@ -2,30 +2,40 @@
 Title=Multijet mass in 2-jet events
 XLabel=$m$ [GeV]
 YLabel=$1/N \mathrm{d}N/\mathrm{d}m$ [1/40 GeV]
+NormalizeToIntegral=1
+Scale=40.0
 # END PLOT
 
 # BEGIN PLOT /CDF_1996_S3108457/d02-x01-y01
 Title=Multijet mass in 3-jet events
 XLabel=$m$ [GeV]
 YLabel=$1/N \mathrm{d}N/\mathrm{d}m$ [1/40 GeV]
+NormalizeToIntegral=1
+Scale=40.0
 # END PLOT
 
 # BEGIN PLOT /CDF_1996_S3108457/d03-x01-y01
 Title=Multijet mass in 4-jet events
 XLabel=$m$ [GeV]
 YLabel=$1/N \mathrm{d}N/\mathrm{d}m$ [1/40 GeV]
+NormalizeToIntegral=1
+Scale=40.0
 # END PLOT
 
 # BEGIN PLOT /CDF_1996_S3108457/d04-x01-y01
 Title=Multijet mass in 5-jet events
 XLabel=$m$ [GeV]
 YLabel=$1/N \mathrm{d}N/\mathrm{d}m$ [1/40 GeV]
+NormalizeToIntegral=1
+Scale=40.0
 # END PLOT
 
 # BEGIN PLOT /CDF_1996_S3108457/d05-x01-y01
 Title=Multijet mass in 6-jet events
 XLabel=$m$ [GeV]
 YLabel=$1/N \mathrm{d}N/\mathrm{d}m$ [1/40 GeV]
+NormalizeToIntegral=1
+Scale=40.0
 # END PLOT
 
 # BEGIN PLOT /CDF_1996_S3108457/d10-x01-y01
@@ -33,6 +43,8 @@
 XLabel=$|\cos \theta^*|$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos\theta^*$
 LogY=0
+NormalizeToIntegral=1
+Scale=2.0
 # END PLOT
 
 # BEGIN PLOT /CDF_1996_S3108457/d11-x01-y01
@@ -40,6 +52,8 @@
 XLabel=$|\cos \theta^*|$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos\theta^*$
 LogY=0
+NormalizeToIntegral=1
+Scale=2.0
 # END PLOT
 
 # BEGIN PLOT /CDF_1996_S3108457/d12-x01-y01
@@ -47,6 +61,8 @@
 XLabel=$|\cos \theta^*|$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos\theta^*$
 LogY=0
+NormalizeToIntegral=1
+Scale=2.0
 # END PLOT
 
 # BEGIN PLOT /CDF_1996_S3108457/d13-x01-y01
@@ -54,6 +70,8 @@
 XLabel=$|\cos \theta^*|$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos\theta^*$
 LogY=0
+NormalizeToIntegral=1
+Scale=2.0
 # END PLOT
 
 # BEGIN PLOT /CDF_1996_S3108457/d14-x01-y01
@@ -61,34 +79,46 @@
 XLabel=$|\cos \theta^*|$
 YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos\theta^*$
 LogY=0
+NormalizeToIntegral=1
+Scale=2.0
 # END PLOT
 
 # BEGIN PLOT /CDF_1996_S3108457/d15-x01-y01
 Title=Inclusive jet $p_\perp$ in 2-jet events
 XLabel=$p_\perp(\mathrm{jet})$ [GeV]
 YLabel=$1/N \mathrm{d}N/\mathrm{d}p_\perp$ [1/20 GeV]
+NormalizeToIntegral=1
+Scale=20.0
 # END PLOT
 
 # BEGIN PLOT /CDF_1996_S3108457/d16-x01-y01
 Title=Inclusive jet $p_\perp$ in 3-jet events
 XLabel=$p_\perp(\mathrm{jet})$ [GeV]
 YLabel=$1/N \mathrm{d}N/\mathrm{d}p_\perp$ [1/20 GeV]
+NormalizeToIntegral=1
+Scale=20.0
 # END PLOT
 
 # BEGIN PLOT /CDF_1996_S3108457/d17-x01-y01
 Title=Inclusive jet $p_\perp$ in 4-jet events
 XLabel=$p_\perp(\mathrm{jet})$ [GeV]
 YLabel=$1/N \mathrm{d}N/\mathrm{d}p_\perp$ [1/20 GeV]
+NormalizeToIntegral=1
+Scale=20.0
 # END PLOT
 
 # BEGIN PLOT /CDF_1996_S3108457/d18-x01-y01
 Title=Inclusive jet $p_\perp$ in 5-jet events
 XLabel=$p_\perp(\mathrm{jet})$ [GeV]
 YLabel=$1/N \mathrm{d}N/\mathrm{d}p_\perp$ [1/20 GeV]
+NormalizeToIntegral=1
+Scale=20.0
 # END PLOT
 
 # BEGIN PLOT /CDF_1996_S3108457/d19-x01-y01
 Title=Inclusive jet $p_\perp$ in 6-jet events
 XLabel=$p_\perp(\mathrm{jet})$ [GeV]
 YLabel=$1/N \mathrm{d}N/\mathrm{d}p_\perp$ [1/20 GeV]
+NormalizeToIntegral=1
+Scale=20.0
 # END PLOT

Modified: trunk/src/Analyses/CDF_1996_S3108457.cc
==============================================================================
--- trunk/src/Analyses/CDF_1996_S3108457.cc	Wed Oct 21 20:56:33 2009	(r1947)
+++ trunk/src/Analyses/CDF_1996_S3108457.cc	Wed Oct 21 21:29:18 2009	(r1948)
@@ -19,7 +19,7 @@
       : Analysis("CDF_1996_S3108457") 
     {
       setBeams(PROTON, ANTIPROTON);
-      setNeedsCrossSection(false);
+      setNeedsCrossSection(true);
     }
 
     //@}
@@ -101,9 +101,9 @@
       
       /// Normalise, scale and otherwise manipulate histograms here
       for (size_t i=0; i<5; ++i) {
-        normalize(_h_m[i], 40.0);
-        normalize(_h_costheta[i], 2.0);
-        normalize(_h_pT[i], 20.0);
+        scale(_h_m[i], crossSection()/sumOfWeights());
+        scale(_h_costheta[i], crossSection()/sumOfWeights());
+        scale(_h_pT[i], crossSection()/sumOfWeights());
       }
       
     }