|
|
[Rivet-svn] r2003 - in trunk: data/plotinfo src/Analyses
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Wed Nov 4 15:50:14 GMT 2009
Author: fsiegert
Date: Wed Nov 4 15:50:14 2009
New Revision: 2003
Log:
Change also the two new analyses to normalize in the finalize method
instead of in *.plot.
Modified:
trunk/data/plotinfo/CDF_1996_S3108457.plot
trunk/data/plotinfo/CDF_1996_S3349578.plot
trunk/src/Analyses/CDF_1996_S3108457.cc
trunk/src/Analyses/CDF_1996_S3349578.cc
Modified: trunk/data/plotinfo/CDF_1996_S3108457.plot
==============================================================================
--- trunk/data/plotinfo/CDF_1996_S3108457.plot Wed Nov 4 15:42:56 2009 (r2002)
+++ trunk/data/plotinfo/CDF_1996_S3108457.plot Wed Nov 4 15:50:14 2009 (r2003)
@@ -2,40 +2,30 @@
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
@@ -43,8 +33,6 @@
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
@@ -52,8 +40,6 @@
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
@@ -61,8 +47,6 @@
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
@@ -70,8 +54,6 @@
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
@@ -79,46 +61,34 @@
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/data/plotinfo/CDF_1996_S3349578.plot
==============================================================================
--- trunk/data/plotinfo/CDF_1996_S3349578.plot Wed Nov 4 15:42:56 2009 (r2002)
+++ trunk/data/plotinfo/CDF_1996_S3349578.plot Wed Nov 4 15:50:14 2009 (r2003)
@@ -2,21 +2,18 @@
Title=Multijet mass in inclusive 3-jet events
XLabel=$m_{3J}$ [GeV]
YLabel=$1/N \mathrm{d}N/\mathrm{d}m$ [1/GeV]
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d01-x01-y02
Title=Multijet mass in inclusive 4-jet events
XLabel=$m_{4J}$ [GeV]
YLabel=$1/N \mathrm{d}N/\mathrm{d}m$ [1/GeV]
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d01-x01-y03
Title=Multijet mass in inclusive 5-jet events
XLabel=$m_{5J}$ [GeV]
YLabel=$1/N \mathrm{d}N/\mathrm{d}m$ [1/GeV]
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d02-x01-y01
@@ -24,7 +21,6 @@
XLabel=$X_3$
YLabel=$1/N \mathrm{d}N/\mathrm{d}X_3$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d03-x01-y01
@@ -32,7 +28,6 @@
XLabel=$X_4$
YLabel=$1/N \mathrm{d}N/\mathrm{d}X_4$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d04-x01-y01
@@ -40,7 +35,6 @@
XLabel=$X_3^{'}$
YLabel=$1/N \mathrm{d}N/\mathrm{d}X_3^{'}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d05-x01-y01
@@ -48,7 +42,6 @@
XLabel=$X_4^{'}$
YLabel=$1/N \mathrm{d}N/\mathrm{d}X_4^{'}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d06-x01-y01
@@ -56,7 +49,6 @@
XLabel=$X_3^{''}$
YLabel=$1/N \mathrm{d}N/\mathrm{d}X_3^{''}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d07-x01-y01
@@ -64,7 +56,6 @@
XLabel=$X_4^{''}$
YLabel=$1/N \mathrm{d}N/\mathrm{d}X_4^{''}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d08-x01-y01
@@ -72,7 +63,6 @@
XLabel=$|\cos \theta_3|$
YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos\theta_3$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d09-x01-y01
@@ -80,7 +70,6 @@
XLabel=$\Psi_3$
YLabel=$1/N \mathrm{d}N/\mathrm{d}\Psi_3$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d10-x01-y01
@@ -88,7 +77,6 @@
XLabel=$|\cos \theta_{3^'}|$
YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos\theta_{3^'}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d11-x01-y01
@@ -96,7 +84,6 @@
XLabel=$\Psi_{3^'}$
YLabel=$1/N \mathrm{d}N/\mathrm{d}\Psi_{3^'}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d12-x01-y01
@@ -104,7 +91,6 @@
XLabel=$|\cos \theta_{3^{''}}|$
YLabel=$1/N \mathrm{d}N/\mathrm{d}\cos\theta_{3^{''}}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d13-x01-y01
@@ -112,7 +98,6 @@
XLabel=$\Psi_{3^{''}}$
YLabel=$1/N \mathrm{d}N/\mathrm{d}\Psi_{3^{''}}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d14-x01-y01
@@ -120,7 +105,6 @@
XLabel=$f_3$
YLabel=$1/N \mathrm{d}N/\mathrm{d}f_3$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d14-x01-y02
@@ -128,7 +112,6 @@
XLabel=$f_4$
YLabel=$1/N \mathrm{d}N/\mathrm{d}f_4$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d14-x01-y03
@@ -136,7 +119,6 @@
XLabel=$f_5$
YLabel=$1/N \mathrm{d}N/\mathrm{d}f_5$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d15-x01-y01
@@ -144,7 +126,6 @@
XLabel=$f_3^{'}$
YLabel=$1/N \mathrm{d}N/\mathrm{d}f_3^{'}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d15-x01-y02
@@ -152,7 +133,6 @@
XLabel=$f_4^{'}$
YLabel=$1/N \mathrm{d}N/\mathrm{d}f_4^{'}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d15-x01-y03
@@ -160,7 +140,6 @@
XLabel=$f_5^{'}$
YLabel=$1/N \mathrm{d}N/\mathrm{d}f_5^{'}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d16-x01-y01
@@ -168,7 +147,6 @@
XLabel=$f_3^{''}$
YLabel=$1/N \mathrm{d}N/\mathrm{d}f_3^{''}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d16-x01-y02
@@ -176,7 +154,6 @@
XLabel=$f_4^{''}$
YLabel=$1/N \mathrm{d}N/\mathrm{d}f_4^{''}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d16-x01-y03
@@ -184,7 +161,6 @@
XLabel=$f_5^{''}$
YLabel=$1/N \mathrm{d}N/\mathrm{d}f_5^{''}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d17-x01-y01
@@ -192,7 +168,6 @@
XLabel=$X_A$
YLabel=$1/N \mathrm{d}N/\mathrm{d}X_A$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d18-x01-y01
@@ -200,7 +175,6 @@
XLabel=$X_A^{'}$
YLabel=$1/N \mathrm{d}N/\mathrm{d}X_A^{'}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d18-x01-y02
@@ -208,7 +182,6 @@
XLabel=$X_C$
YLabel=$1/N \mathrm{d}N/\mathrm{d}X_C$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d19-x01-y01
@@ -216,7 +189,6 @@
XLabel=$\Psi^{'}_{AB}$
YLabel=$1/N \mathrm{d}N/\mathrm{d}\Psi^{'}_{AB}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d20-x01-y01
@@ -224,7 +196,6 @@
XLabel=$\Psi^{''}_{A^{'}B^{'}}$
YLabel=$1/N \mathrm{d}N/\mathrm{d}\Psi^{''}_{A^{'}B^{'}}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d20-x01-y02
@@ -232,7 +203,6 @@
XLabel=$\Psi^{''}_{CD}$
YLabel=$1/N \mathrm{d}N/\mathrm{d}\Psi^{''}_{CD}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d21-x01-y01
@@ -240,7 +210,6 @@
XLabel=$f_A$
YLabel=$1/N \mathrm{d}N/\mathrm{d}f_A$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d21-x01-y02
@@ -248,7 +217,6 @@
XLabel=$f_B$
YLabel=$1/N \mathrm{d}N/\mathrm{d}f_B$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d22-x01-y01
@@ -256,7 +224,6 @@
XLabel=$f_A^{'}$
YLabel=$1/N \mathrm{d}N/\mathrm{d}f_A^{'}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d23-x01-y01
@@ -264,7 +231,6 @@
XLabel=$f_B^{'}$
YLabel=$1/N \mathrm{d}N/\mathrm{d}f_B^{'}$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d24-x01-y01
@@ -272,7 +238,6 @@
XLabel=$f_C$
YLabel=$1/N \mathrm{d}N/\mathrm{d}f_C$
LogY=0
-NormalizeToIntegral=1
# END PLOT
# BEGIN PLOT /CDF_1996_S3349578/d25-x01-y01
@@ -280,5 +245,4 @@
XLabel=$f_D$
YLabel=$1/N \mathrm{d}N/\mathrm{d}f_D$
LogY=0
-NormalizeToIntegral=1
# END PLOT
Modified: trunk/src/Analyses/CDF_1996_S3108457.cc
==============================================================================
--- trunk/src/Analyses/CDF_1996_S3108457.cc Wed Nov 4 15:42:56 2009 (r2002)
+++ trunk/src/Analyses/CDF_1996_S3108457.cc Wed Nov 4 15:50:14 2009 (r2003)
@@ -101,9 +101,9 @@
/// Normalise, scale and otherwise manipulate histograms here
for (size_t i=0; i<5; ++i) {
- scale(_h_m[i], crossSection()/sumOfWeights());
- scale(_h_costheta[i], crossSection()/sumOfWeights());
- scale(_h_pT[i], crossSection()/sumOfWeights());
+ normalize(_h_m[i], 40.0);
+ normalize(_h_costheta[i], 2.0);
+ normalize(_h_pT[i], 20.0);
}
}
Modified: trunk/src/Analyses/CDF_1996_S3349578.cc
==============================================================================
--- trunk/src/Analyses/CDF_1996_S3349578.cc Wed Nov 4 15:42:56 2009 (r2002)
+++ trunk/src/Analyses/CDF_1996_S3349578.cc Wed Nov 4 15:50:14 2009 (r2003)
@@ -311,44 +311,44 @@
void finalize() {
/// Normalise, scale and otherwise manipulate histograms here
- scale(_h_3_mNJ, crossSection()/sumOfWeights());
- scale(_h_3_X3, crossSection()/sumOfWeights());
- scale(_h_3_X4, crossSection()/sumOfWeights());
- scale(_h_3_costheta3, crossSection()/sumOfWeights());
- scale(_h_3_psi3, crossSection()/sumOfWeights());
- scale(_h_3_f3, crossSection()/sumOfWeights());
- scale(_h_3_f4, crossSection()/sumOfWeights());
- scale(_h_3_f5, crossSection()/sumOfWeights());
+ normalize(_h_3_mNJ, 1.0);
+ normalize(_h_3_X3, 1.0);
+ normalize(_h_3_X4, 1.0);
+ normalize(_h_3_costheta3, 1.0);
+ normalize(_h_3_psi3, 1.0);
+ normalize(_h_3_f3, 1.0);
+ normalize(_h_3_f4, 1.0);
+ normalize(_h_3_f5, 1.0);
- scale(_h_4_mNJ, crossSection()/sumOfWeights());
- scale(_h_4_X3, crossSection()/sumOfWeights());
- scale(_h_4_X4, crossSection()/sumOfWeights());
- scale(_h_4_costheta3, crossSection()/sumOfWeights());
- scale(_h_4_psi3, crossSection()/sumOfWeights());
- scale(_h_4_f3, crossSection()/sumOfWeights());
- scale(_h_4_f4, crossSection()/sumOfWeights());
- scale(_h_4_f5, crossSection()/sumOfWeights());
- scale(_h_4_XA, crossSection()/sumOfWeights());
- scale(_h_4_psiAB, crossSection()/sumOfWeights());
- scale(_h_4_fA, crossSection()/sumOfWeights());
- scale(_h_4_fB, crossSection()/sumOfWeights());
+ normalize(_h_4_mNJ, 1.0);
+ normalize(_h_4_X3, 1.0);
+ normalize(_h_4_X4, 1.0);
+ normalize(_h_4_costheta3, 1.0);
+ normalize(_h_4_psi3, 1.0);
+ normalize(_h_4_f3, 1.0);
+ normalize(_h_4_f4, 1.0);
+ normalize(_h_4_f5, 1.0);
+ normalize(_h_4_XA, 1.0);
+ normalize(_h_4_psiAB, 1.0);
+ normalize(_h_4_fA, 1.0);
+ normalize(_h_4_fB, 1.0);
- scale(_h_5_mNJ, crossSection()/sumOfWeights());
- scale(_h_5_X3, crossSection()/sumOfWeights());
- scale(_h_5_X4, crossSection()/sumOfWeights());
- scale(_h_5_costheta3, crossSection()/sumOfWeights());
- scale(_h_5_psi3, crossSection()/sumOfWeights());
- scale(_h_5_f3, crossSection()/sumOfWeights());
- scale(_h_5_f4, crossSection()/sumOfWeights());
- scale(_h_5_f5, crossSection()/sumOfWeights());
- scale(_h_5_XA, crossSection()/sumOfWeights());
- scale(_h_5_XC, crossSection()/sumOfWeights());
- scale(_h_5_psiAB, crossSection()/sumOfWeights());
- scale(_h_5_psiCD, crossSection()/sumOfWeights());
- scale(_h_5_fA, crossSection()/sumOfWeights());
- scale(_h_5_fB, crossSection()/sumOfWeights());
- scale(_h_5_fC, crossSection()/sumOfWeights());
- scale(_h_5_fD, crossSection()/sumOfWeights());
+ normalize(_h_5_mNJ, 1.0);
+ normalize(_h_5_X3, 1.0);
+ normalize(_h_5_X4, 1.0);
+ normalize(_h_5_costheta3, 1.0);
+ normalize(_h_5_psi3, 1.0);
+ normalize(_h_5_f3, 1.0);
+ normalize(_h_5_f4, 1.0);
+ normalize(_h_5_f5, 1.0);
+ normalize(_h_5_XA, 1.0);
+ normalize(_h_5_XC, 1.0);
+ normalize(_h_5_psiAB, 1.0);
+ normalize(_h_5_psiCD, 1.0);
+ normalize(_h_5_fA, 1.0);
+ normalize(_h_5_fB, 1.0);
+ normalize(_h_5_fC, 1.0);
+ normalize(_h_5_fD, 1.0);
}
More information about the Rivet-svn
mailing list
|