|
|
[Rivet-svn] r3416 - in branches/2011-07-aida2yoda: data/plotinfo include/Rivet/Analyses include/Rivet/Projections src/Analyses
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Thu Oct 6 18:31:34 BST 2011
Author: hoeth
Date: Thu Oct 6 18:31:33 2011
New Revision: 3416
Log:
merge r3359-3360 from trunk
Modified:
branches/2011-07-aida2yoda/data/plotinfo/MC_HJETS.plot
branches/2011-07-aida2yoda/data/plotinfo/MC_JETS.plot
branches/2011-07-aida2yoda/data/plotinfo/MC_PHOTONJETS.plot
branches/2011-07-aida2yoda/data/plotinfo/MC_WJETS.plot
branches/2011-07-aida2yoda/data/plotinfo/MC_WWJETS.plot
branches/2011-07-aida2yoda/data/plotinfo/MC_ZJETS.plot
branches/2011-07-aida2yoda/data/plotinfo/MC_ZZJETS.plot
branches/2011-07-aida2yoda/include/Rivet/Analyses/MC_JetAnalysis.hh
branches/2011-07-aida2yoda/include/Rivet/Projections/WFinder.hh
branches/2011-07-aida2yoda/include/Rivet/Projections/ZFinder.hh
branches/2011-07-aida2yoda/src/Analyses/MC_JetAnalysis.cc
Modified: branches/2011-07-aida2yoda/data/plotinfo/MC_HJETS.plot
==============================================================================
--- branches/2011-07-aida2yoda/data/plotinfo/MC_HJETS.plot Thu Oct 6 14:49:33 2011 (r3415)
+++ branches/2011-07-aida2yoda/data/plotinfo/MC_HJETS.plot Thu Oct 6 18:31:33 2011 (r3416)
@@ -61,90 +61,66 @@
YLabel=$\text{d}\sigma/\text{d}\eta_{\text{l}}$ [pb]
# END PLOT
+# BEGIN PLOT /MC_HJETS/jets_dR_
+Title=$\Delta R$ separation between jets
+LegendXPos=0.10
+LegendYPos=0.5
+# END PLOT
+
# BEGIN PLOT /MC_HJETS/jets_dR_12
-Title=Separation between leading and second leading jet
XLabel=$\Delta{R}(\text{jet 1, jet 2})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 2})$ [pb]
-LegendXPos=0.10
-LegendYPos=0.5
# END PLOT
# BEGIN PLOT /MC_HJETS/jets_dR_13
-Title=
XLabel=$\Delta{R}(\text{jet 1, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 3})$ [pb]
# END PLOT
-# BEGIN PLOT /MC_HJETS/jets_dR_14
-Title=
-XLabel=$\Delta{R}(\text{jet 1, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 4})$ [pb]
-# END PLOT
-
# BEGIN PLOT /MC_HJETS/jets_dR_23
-Title=
XLabel=$\Delta{R}(\text{jet 2, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 2, jet 3})$ [pb]
# END PLOT
-# BEGIN PLOT /MC_HJETS/jets_dR_24
-Title=
-XLabel=$\Delta{R}(\text{jet 2, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 2, jet 4})$ [pb]
-# END PLOT
-
-# BEGIN PLOT /MC_HJETS/jets_dR_34
-Title=
-XLabel=$\Delta{R}(\text{jet 3, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 3, jet 4})$ [pb]
+# BEGIN PLOT /MC_HJETS/jets_deta_
+Title=Pseudorapidity separation between jets
+LegendYPos=0.5
+LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_HJETS/jets_deta_12
-Title=$\eta$ difference between leading and second leading jet
XLabel=$\Delta\eta(\text{jet 1, jet 2})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 2})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_HJETS/jets_deta_13
-Title=
XLabel=$\Delta\eta(\text{jet 1, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 3})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
-# END PLOT
-
-# BEGIN PLOT /MC_HJETS/jets_deta_14
-Title=
-XLabel=$\Delta\eta(\text{jet 1, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_HJETS/jets_deta_23
-Title=
XLabel=$\Delta\eta(\text{jet 2, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 2, jet 3})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
-# BEGIN PLOT /MC_HJETS/jets_deta_24
-Title=
-XLabel=$\Delta\eta(\text{jet 2, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 2, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
+# BEGIN PLOT /MC_HJETS/jets_dphi_
+Title=Pseudorapidity separation between jets
+LegendXPos=0.1
# END PLOT
-# BEGIN PLOT /MC_HJETS/jets_deta_34
-Title=
-XLabel=$\Delta\eta(\text{jet 3, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 3, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
+# BEGIN PLOT /MC_HJETS/jets_dphi_12
+XLabel=$\Delta\phi(\text{jet 1, jet 2})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 1, jet 2})$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_HJETS/jets_dphi_13
+XLabel=$\Delta\phi(\text{jet 1, jet 3})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 1, jet 3})$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_HJETS/jets_dphi_23
+XLabel=$\Delta\phi(\text{jet 2, jet 3})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 2, jet 3})$ [pb]
# END PLOT
# BEGIN PLOT /MC_HJETS/jet_eta_1
Modified: branches/2011-07-aida2yoda/data/plotinfo/MC_JETS.plot
==============================================================================
--- branches/2011-07-aida2yoda/data/plotinfo/MC_JETS.plot Thu Oct 6 14:49:33 2011 (r3415)
+++ branches/2011-07-aida2yoda/data/plotinfo/MC_JETS.plot Thu Oct 6 18:31:33 2011 (r3416)
@@ -1,87 +1,63 @@
+# BEGIN PLOT /MC_JETS/jets_dR_
+Title=$\Delta R$ separation between jets
+LegendXPos=0.10
+LegendYPos=0.5
+# END PLOT
+
# BEGIN PLOT /MC_JETS/jets_dR_12
-Title=Separation between leading and second leading jet
XLabel=$\Delta{R}(\text{jet 1, jet 2})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 2})$ [pb]
-LegendXPos=0.10
-LegendYPos=0.5
# END PLOT
# BEGIN PLOT /MC_JETS/jets_dR_13
-Title=
XLabel=$\Delta{R}(\text{jet 1, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 3})$ [pb]
# END PLOT
-# BEGIN PLOT /MC_JETS/jets_dR_14
-Title=
-XLabel=$\Delta{R}(\text{jet 1, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 4})$ [pb]
-# END PLOT
-
# BEGIN PLOT /MC_JETS/jets_dR_23
-Title=
XLabel=$\Delta{R}(\text{jet 2, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 2, jet 3})$ [pb]
# END PLOT
-# BEGIN PLOT /MC_JETS/jets_dR_24
-Title=
-XLabel=$\Delta{R}(\text{jet 2, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 2, jet 4})$ [pb]
-# END PLOT
-
-# BEGIN PLOT /MC_JETS/jets_dR_34
-Title=
-XLabel=$\Delta{R}(\text{jet 3, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 3, jet 4})$ [pb]
+# BEGIN PLOT /MC_JETS/jets_deta_
+Title=Pseudorapidity separation between jets
+LegendYPos=0.5
+LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_JETS/jets_deta_12
-Title=$\eta$ difference between leading and second leading jet
XLabel=$\Delta\eta(\text{jet 1, jet 2})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 2})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_JETS/jets_deta_13
-Title=
XLabel=$\Delta\eta(\text{jet 1, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 3})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
-# END PLOT
-
-# BEGIN PLOT /MC_JETS/jets_deta_14
-Title=
-XLabel=$\Delta\eta(\text{jet 1, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_JETS/jets_deta_23
-Title=
XLabel=$\Delta\eta(\text{jet 2, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 2, jet 3})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
-# BEGIN PLOT /MC_JETS/jets_deta_24
-Title=
-XLabel=$\Delta\eta(\text{jet 2, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 2, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
+# BEGIN PLOT /MC_JETS/jets_dphi_
+Title=Pseudorapidity separation between jets
+LegendXPos=0.1
# END PLOT
-# BEGIN PLOT /MC_JETS/jets_deta_34
-Title=
-XLabel=$\Delta\eta(\text{jet 3, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 3, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
+# BEGIN PLOT /MC_JETS/jets_dphi_12
+XLabel=$\Delta\phi(\text{jet 1, jet 2})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 1, jet 2})$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_JETS/jets_dphi_13
+XLabel=$\Delta\phi(\text{jet 1, jet 3})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 1, jet 3})$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_JETS/jets_dphi_23
+XLabel=$\Delta\phi(\text{jet 2, jet 3})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 2, jet 3})$ [pb]
# END PLOT
# BEGIN PLOT /MC_JETS/jet_eta_1
Modified: branches/2011-07-aida2yoda/data/plotinfo/MC_PHOTONJETS.plot
==============================================================================
--- branches/2011-07-aida2yoda/data/plotinfo/MC_PHOTONJETS.plot Thu Oct 6 14:49:33 2011 (r3415)
+++ branches/2011-07-aida2yoda/data/plotinfo/MC_PHOTONJETS.plot Thu Oct 6 18:31:33 2011 (r3416)
@@ -35,90 +35,66 @@
YLabel=$\text{d}\sigma/\text{d}y_{\gamma}$ [pb]
# END PLOT
+# BEGIN PLOT /MC_PHOTONJETS/jets_dR_
+Title=$\Delta R$ separation between jets
+LegendXPos=0.10
+LegendYPos=0.5
+# END PLOT
+
# BEGIN PLOT /MC_PHOTONJETS/jets_dR_12
-Title=Separation between leading and second leading jet
XLabel=$\Delta{R}(\text{jet 1, jet 2})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 2})$ [pb]
-LegendXPos=0.10
-LegendYPos=0.5
# END PLOT
# BEGIN PLOT /MC_PHOTONJETS/jets_dR_13
-Title=
XLabel=$\Delta{R}(\text{jet 1, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 3})$ [pb]
# END PLOT
-# BEGIN PLOT /MC_PHOTONJETS/jets_dR_14
-Title=
-XLabel=$\Delta{R}(\text{jet 1, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 4})$ [pb]
-# END PLOT
-
# BEGIN PLOT /MC_PHOTONJETS/jets_dR_23
-Title=
XLabel=$\Delta{R}(\text{jet 2, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 2, jet 3})$ [pb]
# END PLOT
-# BEGIN PLOT /MC_PHOTONJETS/jets_dR_24
-Title=
-XLabel=$\Delta{R}(\text{jet 2, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 2, jet 4})$ [pb]
-# END PLOT
-
-# BEGIN PLOT /MC_PHOTONJETS/jets_dR_34
-Title=
-XLabel=$\Delta{R}(\text{jet 3, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 3, jet 4})$ [pb]
+# BEGIN PLOT /MC_PHOTONJETS/jets_deta_
+Title=Pseudorapidity separation between jets
+LegendYPos=0.5
+LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_PHOTONJETS/jets_deta_12
-Title=$\eta$ difference between leading and second leading jet
XLabel=$\Delta\eta(\text{jet 1, jet 2})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 2})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_PHOTONJETS/jets_deta_13
-Title=
XLabel=$\Delta\eta(\text{jet 1, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 3})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
-# END PLOT
-
-# BEGIN PLOT /MC_PHOTONJETS/jets_deta_14
-Title=
-XLabel=$\Delta\eta(\text{jet 1, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_PHOTONJETS/jets_deta_23
-Title=
XLabel=$\Delta\eta(\text{jet 2, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 2, jet 3})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
-# BEGIN PLOT /MC_PHOTONJETS/jets_deta_24
-Title=
-XLabel=$\Delta\eta(\text{jet 2, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 2, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
+# BEGIN PLOT /MC_PHOTONJETS/jets_dphi_
+Title=Pseudorapidity separation between jets
+LegendXPos=0.1
# END PLOT
-# BEGIN PLOT /MC_PHOTONJETS/jets_deta_34
-Title=
-XLabel=$\Delta\eta(\text{jet 3, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 3, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
+# BEGIN PLOT /MC_PHOTONJETS/jets_dphi_12
+XLabel=$\Delta\phi(\text{jet 1, jet 2})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 1, jet 2})$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_PHOTONJETS/jets_dphi_13
+XLabel=$\Delta\phi(\text{jet 1, jet 3})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 1, jet 3})$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_PHOTONJETS/jets_dphi_23
+XLabel=$\Delta\phi(\text{jet 2, jet 3})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 2, jet 3})$ [pb]
# END PLOT
# BEGIN PLOT /MC_PHOTONJETS/jet_eta_1
Modified: branches/2011-07-aida2yoda/data/plotinfo/MC_WJETS.plot
==============================================================================
--- branches/2011-07-aida2yoda/data/plotinfo/MC_WJETS.plot Thu Oct 6 14:49:33 2011 (r3415)
+++ branches/2011-07-aida2yoda/data/plotinfo/MC_WJETS.plot Thu Oct 6 18:31:33 2011 (r3416)
@@ -101,90 +101,66 @@
YLabel=$\text{d}\sigma/\text{d}\eta_{\text{l}}$ [pb]
# END PLOT
+# BEGIN PLOT /MC_WJETS/jets_dR_
+Title=$\Delta R$ separation between jets
+LegendXPos=0.10
+LegendYPos=0.5
+# END PLOT
+
# BEGIN PLOT /MC_WJETS/jets_dR_12
-Title=Separation between leading and second leading jet
XLabel=$\Delta{R}(\text{jet 1, jet 2})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 2})$ [pb]
-LegendXPos=0.10
-LegendYPos=0.5
# END PLOT
# BEGIN PLOT /MC_WJETS/jets_dR_13
-Title=
XLabel=$\Delta{R}(\text{jet 1, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 3})$ [pb]
# END PLOT
-# BEGIN PLOT /MC_WJETS/jets_dR_14
-Title=
-XLabel=$\Delta{R}(\text{jet 1, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 4})$ [pb]
-# END PLOT
-
# BEGIN PLOT /MC_WJETS/jets_dR_23
-Title=
XLabel=$\Delta{R}(\text{jet 2, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 2, jet 3})$ [pb]
# END PLOT
-# BEGIN PLOT /MC_WJETS/jets_dR_24
-Title=
-XLabel=$\Delta{R}(\text{jet 2, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 2, jet 4})$ [pb]
-# END PLOT
-
-# BEGIN PLOT /MC_WJETS/jets_dR_34
-Title=
-XLabel=$\Delta{R}(\text{jet 3, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 3, jet 4})$ [pb]
+# BEGIN PLOT /MC_WJETS/jets_deta_
+Title=Pseudorapidity separation between jets
+LegendYPos=0.5
+LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_WJETS/jets_deta_12
-Title=$\eta$ difference between leading and second leading jet
XLabel=$\Delta\eta(\text{jet 1, jet 2})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 2})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_WJETS/jets_deta_13
-Title=
XLabel=$\Delta\eta(\text{jet 1, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 3})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
-# END PLOT
-
-# BEGIN PLOT /MC_WJETS/jets_deta_14
-Title=
-XLabel=$\Delta\eta(\text{jet 1, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_WJETS/jets_deta_23
-Title=
XLabel=$\Delta\eta(\text{jet 2, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 2, jet 3})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
-# BEGIN PLOT /MC_WJETS/jets_deta_24
-Title=
-XLabel=$\Delta\eta(\text{jet 2, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 2, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
+# BEGIN PLOT /MC_WJETS/jets_dphi_
+Title=Pseudorapidity separation between jets
+LegendXPos=0.1
# END PLOT
-# BEGIN PLOT /MC_WJETS/jets_deta_34
-Title=
-XLabel=$\Delta\eta(\text{jet 3, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 3, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
+# BEGIN PLOT /MC_WJETS/jets_dphi_12
+XLabel=$\Delta\phi(\text{jet 1, jet 2})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 1, jet 2})$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_WJETS/jets_dphi_13
+XLabel=$\Delta\phi(\text{jet 1, jet 3})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 1, jet 3})$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_WJETS/jets_dphi_23
+XLabel=$\Delta\phi(\text{jet 2, jet 3})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 2, jet 3})$ [pb]
# END PLOT
# BEGIN PLOT /MC_WJETS/jet_eta_1
Modified: branches/2011-07-aida2yoda/data/plotinfo/MC_WWJETS.plot
==============================================================================
--- branches/2011-07-aida2yoda/data/plotinfo/MC_WWJETS.plot Thu Oct 6 14:49:33 2011 (r3415)
+++ branches/2011-07-aida2yoda/data/plotinfo/MC_WWJETS.plot Thu Oct 6 18:31:33 2011 (r3416)
@@ -178,90 +178,66 @@
LogX=1
# END PLOT
+# BEGIN PLOT /MC_WWJETS/jets_dR_
+Title=$\Delta R$ separation between jets
+LegendXPos=0.10
+LegendYPos=0.5
+# END PLOT
+
# BEGIN PLOT /MC_WWJETS/jets_dR_12
-Title=Separation between leading and second leading jet
XLabel=$\Delta{R}(\text{jet 1, jet 2})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 2})$ [pb]
-LegendXPos=0.10
-LegendYPos=0.5
# END PLOT
# BEGIN PLOT /MC_WWJETS/jets_dR_13
-Title=
XLabel=$\Delta{R}(\text{jet 1, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 3})$ [pb]
# END PLOT
-# BEGIN PLOT /MC_WWJETS/jets_dR_14
-Title=
-XLabel=$\Delta{R}(\text{jet 1, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 4})$ [pb]
-# END PLOT
-
# BEGIN PLOT /MC_WWJETS/jets_dR_23
-Title=
XLabel=$\Delta{R}(\text{jet 2, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 2, jet 3})$ [pb]
# END PLOT
-# BEGIN PLOT /MC_WWJETS/jets_dR_24
-Title=
-XLabel=$\Delta{R}(\text{jet 2, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 2, jet 4})$ [pb]
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/jets_dR_34
-Title=
-XLabel=$\Delta{R}(\text{jet 3, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 3, jet 4})$ [pb]
+# BEGIN PLOT /MC_WWJETS/jets_deta_
+Title=Pseudorapidity separation between jets
+LegendYPos=0.5
+LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_WWJETS/jets_deta_12
-Title=$\eta$ difference between leading and second leading jet
XLabel=$\Delta\eta(\text{jet 1, jet 2})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 2})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_WWJETS/jets_deta_13
-Title=
XLabel=$\Delta\eta(\text{jet 1, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 3})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/jets_deta_14
-Title=
-XLabel=$\Delta\eta(\text{jet 1, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_WWJETS/jets_deta_23
-Title=
XLabel=$\Delta\eta(\text{jet 2, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 2, jet 3})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
-# BEGIN PLOT /MC_WWJETS/jets_deta_24
-Title=
-XLabel=$\Delta\eta(\text{jet 2, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 2, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
+# BEGIN PLOT /MC_WWJETS/jets_dphi_
+Title=Pseudorapidity separation between jets
+LegendXPos=0.1
# END PLOT
-# BEGIN PLOT /MC_WWJETS/jets_deta_34
-Title=
-XLabel=$\Delta\eta(\text{jet 3, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 3, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
+# BEGIN PLOT /MC_WWJETS/jets_dphi_12
+XLabel=$\Delta\phi(\text{jet 1, jet 2})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 1, jet 2})$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_WWJETS/jets_dphi_13
+XLabel=$\Delta\phi(\text{jet 1, jet 3})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 1, jet 3})$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_WWJETS/jets_dphi_23
+XLabel=$\Delta\phi(\text{jet 2, jet 3})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 2, jet 3})$ [pb]
# END PLOT
# BEGIN PLOT /MC_WWJETS/jet_eta_1
Modified: branches/2011-07-aida2yoda/data/plotinfo/MC_ZJETS.plot
==============================================================================
--- branches/2011-07-aida2yoda/data/plotinfo/MC_ZJETS.plot Thu Oct 6 14:49:33 2011 (r3415)
+++ branches/2011-07-aida2yoda/data/plotinfo/MC_ZJETS.plot Thu Oct 6 18:31:33 2011 (r3416)
@@ -63,90 +63,66 @@
YLabel=$\text{d}\sigma/\text{d}\eta_{\text{l}}$ [pb/GeV]
# END PLOT
+# BEGIN PLOT /MC_ZJETS/jets_dR_
+Title=$\Delta R$ separation between jets
+LegendXPos=0.10
+LegendYPos=0.5
+# END PLOT
+
# BEGIN PLOT /MC_ZJETS/jets_dR_12
-Title=Separation between leading and second leading jet
XLabel=$\Delta{R}(\text{jet 1, jet 2})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 2})$ [pb]
-LegendXPos=0.10
-LegendYPos=0.5
# END PLOT
# BEGIN PLOT /MC_ZJETS/jets_dR_13
-Title=
XLabel=$\Delta{R}(\text{jet 1, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 3})$ [pb]
# END PLOT
-# BEGIN PLOT /MC_ZJETS/jets_dR_14
-Title=
-XLabel=$\Delta{R}(\text{jet 1, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 4})$ [pb]
-# END PLOT
-
# BEGIN PLOT /MC_ZJETS/jets_dR_23
-Title=
XLabel=$\Delta{R}(\text{jet 2, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 2, jet 3})$ [pb]
# END PLOT
-# BEGIN PLOT /MC_ZJETS/jets_dR_24
-Title=
-XLabel=$\Delta{R}(\text{jet 2, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 2, jet 4})$ [pb]
-# END PLOT
-
-# BEGIN PLOT /MC_ZJETS/jets_dR_34
-Title=
-XLabel=$\Delta{R}(\text{jet 3, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 3, jet 4})$ [pb]
+# BEGIN PLOT /MC_ZJETS/jets_deta_
+Title=Pseudorapidity separation between jets
+LegendYPos=0.5
+LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_ZJETS/jets_deta_12
-Title=$\eta$ difference between leading and second leading jet
XLabel=$\Delta\eta(\text{jet 1, jet 2})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 2})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_ZJETS/jets_deta_13
-Title=
XLabel=$\Delta\eta(\text{jet 1, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 3})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
-# END PLOT
-
-# BEGIN PLOT /MC_ZJETS/jets_deta_14
-Title=
-XLabel=$\Delta\eta(\text{jet 1, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_ZJETS/jets_deta_23
-Title=
XLabel=$\Delta\eta(\text{jet 2, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 2, jet 3})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
-# BEGIN PLOT /MC_ZJETS/jets_deta_24
-Title=
-XLabel=$\Delta\eta(\text{jet 2, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 2, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
+# BEGIN PLOT /MC_ZJETS/jets_dphi_
+Title=Pseudorapidity separation between jets
+LegendXPos=0.1
# END PLOT
-# BEGIN PLOT /MC_ZJETS/jets_deta_34
-Title=
-XLabel=$\Delta\eta(\text{jet 3, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 3, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
+# BEGIN PLOT /MC_ZJETS/jets_dphi_12
+XLabel=$\Delta\phi(\text{jet 1, jet 2})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 1, jet 2})$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_ZJETS/jets_dphi_13
+XLabel=$\Delta\phi(\text{jet 1, jet 3})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 1, jet 3})$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_ZJETS/jets_dphi_23
+XLabel=$\Delta\phi(\text{jet 2, jet 3})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 2, jet 3})$ [pb]
# END PLOT
# BEGIN PLOT /MC_ZJETS/jet_eta_1
Modified: branches/2011-07-aida2yoda/data/plotinfo/MC_ZZJETS.plot
==============================================================================
--- branches/2011-07-aida2yoda/data/plotinfo/MC_ZZJETS.plot Thu Oct 6 14:49:33 2011 (r3415)
+++ branches/2011-07-aida2yoda/data/plotinfo/MC_ZZJETS.plot Thu Oct 6 18:31:33 2011 (r3416)
@@ -163,90 +163,66 @@
LegendYPos=0.5
# END PLOT
+# BEGIN PLOT /MC_ZZJETS/jets_dR_
+Title=$\Delta R$ separation between jets
+LegendXPos=0.10
+LegendYPos=0.5
+# END PLOT
+
# BEGIN PLOT /MC_ZZJETS/jets_dR_12
-Title=Separation between leading and second leading jet
XLabel=$\Delta{R}(\text{jet 1, jet 2})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 2})$ [pb]
-LegendXPos=0.10
-LegendYPos=0.5
# END PLOT
# BEGIN PLOT /MC_ZZJETS/jets_dR_13
-Title=
XLabel=$\Delta{R}(\text{jet 1, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 3})$ [pb]
# END PLOT
-# BEGIN PLOT /MC_ZZJETS/jets_dR_14
-Title=
-XLabel=$\Delta{R}(\text{jet 1, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 4})$ [pb]
-# END PLOT
-
# BEGIN PLOT /MC_ZZJETS/jets_dR_23
-Title=
XLabel=$\Delta{R}(\text{jet 2, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 2, jet 3})$ [pb]
# END PLOT
-# BEGIN PLOT /MC_ZZJETS/jets_dR_24
-Title=
-XLabel=$\Delta{R}(\text{jet 2, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 2, jet 4})$ [pb]
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/jets_dR_34
-Title=
-XLabel=$\Delta{R}(\text{jet 3, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 3, jet 4})$ [pb]
+# BEGIN PLOT /MC_ZZJETS/jets_deta_
+Title=Pseudorapidity separation between jets
+LegendYPos=0.5
+LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_ZZJETS/jets_deta_12
-Title=$\eta$ difference between leading and second leading jet
XLabel=$\Delta\eta(\text{jet 1, jet 2})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 2})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_ZZJETS/jets_deta_13
-Title=
XLabel=$\Delta\eta(\text{jet 1, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 3})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/jets_deta_14
-Title=
-XLabel=$\Delta\eta(\text{jet 1, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
# BEGIN PLOT /MC_ZZJETS/jets_deta_23
-Title=
XLabel=$\Delta\eta(\text{jet 2, jet 3})$
YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 2, jet 3})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
# END PLOT
-# BEGIN PLOT /MC_ZZJETS/jets_deta_24
-Title=
-XLabel=$\Delta\eta(\text{jet 2, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 2, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
+# BEGIN PLOT /MC_ZZJETS/jets_dphi_
+Title=Pseudorapidity separation between jets
+LegendXPos=0.1
# END PLOT
-# BEGIN PLOT /MC_ZZJETS/jets_deta_34
-Title=
-XLabel=$\Delta\eta(\text{jet 3, jet 4})$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 3, jet 4})$ [pb]
-LegendYPos=0.5
-LegendXPos=0.30
+# BEGIN PLOT /MC_ZZJETS/jets_dphi_12
+XLabel=$\Delta\phi(\text{jet 1, jet 2})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 1, jet 2})$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_ZZJETS/jets_dphi_13
+XLabel=$\Delta\phi(\text{jet 1, jet 3})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 1, jet 3})$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_ZZJETS/jets_dphi_23
+XLabel=$\Delta\phi(\text{jet 2, jet 3})$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi(\text{jet 2, jet 3})$ [pb]
# END PLOT
# BEGIN PLOT /MC_ZZJETS/jet_eta_1
Modified: branches/2011-07-aida2yoda/include/Rivet/Analyses/MC_JetAnalysis.hh
==============================================================================
--- branches/2011-07-aida2yoda/include/Rivet/Analyses/MC_JetAnalysis.hh Thu Oct 6 14:49:33 2011 (r3415)
+++ branches/2011-07-aida2yoda/include/Rivet/Analyses/MC_JetAnalysis.hh Thu Oct 6 18:31:33 2011 (r3416)
@@ -52,6 +52,7 @@
std::vector<Histo1DPtr> _h_rap_jet_plus, _h_rap_jet_minus;
std::vector<Histo1DPtr> _h_mass_jet;
std::map<std::pair<size_t, size_t>, Histo1DPtr> _h_deta_jets;
+ std::map<std::pair<size_t, size_t>, Histo1DPtr> _h_dphi_jets;
std::map<std::pair<size_t, size_t>, Histo1DPtr> _h_dR_jets;
Histo1DPtr _h_jet_multi_exclusive;
Histo1DPtr _h_jet_multi_inclusive;
Modified: branches/2011-07-aida2yoda/include/Rivet/Projections/WFinder.hh
==============================================================================
--- branches/2011-07-aida2yoda/include/Rivet/Projections/WFinder.hh Thu Oct 6 14:49:33 2011 (r3415)
+++ branches/2011-07-aida2yoda/include/Rivet/Projections/WFinder.hh Thu Oct 6 18:31:33 2011 (r3416)
@@ -23,19 +23,17 @@
/// @name Constructors
//@{
- // /// Constructor taking a FinalState and type of the charged lepton, mass window,
- // /// and maximum dR of photons around the charged lepton to take into account for W
- // /// reconstruction.
- // WFinder(const ChargedFinalState& fs_l,
- // PdgId pid,
- // double minmass, double maxmass,
- // double missingET,
- // double dRmax, bool clusterPhotons, bool excludePhotonsFromRFS);
-
-
- /// Constructor taking single eta/pT bounds and type of the charged lepton, transverse mass
- /// window, and maximum dR of photons around the charged lepton to take into account
- /// for W reconstruction.
+ /// Constructor taking single eta/pT bounds
+ /// @param pid type of the charged lepton
+ /// @param minmass,maxmass (transverse) mass window
+ /// @param missingET minimal amount of missing ET (neutrinos) required
+ /// @param dRmax maximum dR of photons around charged lepton to take into account
+ /// for W reconstruction (only relevant if one of the following are true)
+ /// @param clusterPhotons whether such photons are supposed to be
+ /// clustered to the lepton object and thus W mom
+ /// @param trackPhotons whether such photons should be added to _theParticles
+ /// (cf. _trackPhotons)
+ /// @param useTransverseMass whether mass window should be applied using mT
WFinder(double etaMin, double etaMax,
double pTmin,
PdgId pid,
@@ -46,9 +44,17 @@
bool useTransverseMass=false);
- /// Constructor taking multiple eta/pT bounds and type of the charged lepton, transverse mass
- /// window, and maximum dR of photons around the charged lepton to take into account
- /// for W reconstruction.
+ /// Constructor taking multiple eta/pT bounds
+ /// @param pid type of the charged lepton
+ /// @param minmass,maxmass (transverse) mass window
+ /// @param missingET minimal amount of missing ET (neutrinos) required
+ /// @param dRmax maximum dR of photons around charged lepton to take into account
+ /// for W reconstruction (only relevant if one of the following are true)
+ /// @param clusterPhotons whether such photons are supposed to be
+ /// clustered to the lepton object and thus W mom
+ /// @param trackPhotons whether such photons should be added to _theParticles
+ /// (cf. _trackPhotons)
+ /// @param useTransverseMass whether mass window should be applied using mT
WFinder(const std::vector<std::pair<double, double> >& etaRanges,
double pTmin,
PdgId pid,
Modified: branches/2011-07-aida2yoda/include/Rivet/Projections/ZFinder.hh
==============================================================================
--- branches/2011-07-aida2yoda/include/Rivet/Projections/ZFinder.hh Thu Oct 6 14:49:33 2011 (r3415)
+++ branches/2011-07-aida2yoda/include/Rivet/Projections/ZFinder.hh Thu Oct 6 18:31:33 2011 (r3416)
@@ -24,12 +24,15 @@
/// @name Constructors
//@{
- /// Constructor taking single eta/pT bounds and type of the leptons, mass
- /// window, and maximum dR of photons around leptons to take into account
- /// for Z reconstruction.
- /// It has to be specified separately whether such photons are
- /// supposed to be clustered to the lepton objects and whether they should
- /// be excluded from the remaining FS.
+ /// Constructor taking single eta/pT bounds
+ /// @param pid type of the leptons
+ /// @param minmass,maxmass mass window
+ /// @param dRmax maximum dR of photons around leptons to take into account
+ /// for Z reconstruction (only relevant if one of the following are true)
+ /// @param clusterPhotons whether such photons are supposed to be
+ /// clustered to the lepton objects and thus Z mom
+ /// @param trackPhotons whether such photons should be added to _theParticles
+ /// (cf. _trackPhotons)
ZFinder(double etaMin, double etaMax,
double pTmin,
PdgId pid,
@@ -38,12 +41,15 @@
double masstarget=91.2*GeV);
- /// Constructor taking multiple eta/pT bounds and type of the leptons, mass
- /// window, and maximum dR of photons around leptons to take into account
- /// for Z reconstruction.
- /// It has to be specified separately whether such photons are
- /// supposed to be clustered to the lepton objects and whether they should
- /// be excluded from the remaining FS.
+ /// Constructor taking multiple eta/pT bounds
+ /// @param pid type of the leptons
+ /// @param minmass,maxmass mass window
+ /// @param dRmax maximum dR of photons around leptons to take into account
+ /// for Z reconstruction (only relevant if one of the following are true)
+ /// @param clusterPhotons whether such photons are supposed to be
+ /// clustered to the lepton objects and thus Z mom
+ /// @param trackPhotons whether such photons should be added to _theParticles
+ /// (cf. _trackPhotons)
ZFinder(const std::vector<std::pair<double, double> >& etaRanges,
double pTmin,
PdgId pid,
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_JetAnalysis.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_JetAnalysis.cc Thu Oct 6 14:49:33 2011 (r3415)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_JetAnalysis.cc Thu Oct 6 18:31:33 2011 (r3416)
@@ -59,13 +59,17 @@
_h_rap_jet_plus[i].reset(new Histo1D(i > 1 ? 15 : 25, 0, 5));
_h_rap_jet_minus[i].reset(new Histo1D(i > 1 ? 15 : 25, 0, 5));
- for (size_t j = i+1; j < m_njet; ++j) {
+ for (size_t j = i+1; j < min(size_t(3),m_njet); ++j) {
std::pair<size_t, size_t> ij = std::make_pair(i, j);
stringstream detaname;
detaname << "jets_deta_" << i+1 << j+1;
_h_deta_jets.insert(make_pair(ij, bookHisto1D(detaname.str(), 25, -5.0, 5.0)));
+ stringstream dphiname;
+ dphiname << "jets_dphi_" << i+1 << j+1;
+ _h_dphi_jets.insert(make_pair(ij, bookHisto1D(dphiname.str(), 25, 0.0, M_PI)));
+
stringstream dRname;
dRname << "jets_dR_" << i+1 << j+1;
_h_dR_jets.insert(make_pair(ij, bookHisto1D(dRname.str(), 25, 0.0, 5.0)));
@@ -158,12 +162,14 @@
}
// Inter-jet properties
- for (size_t j = i+1; j < m_njet; ++j) {
+ for (size_t j = i+1; j < min(size_t(3),m_njet); ++j) {
if (jets.size() < j+1) continue;
std::pair<size_t, size_t> ij = std::make_pair(i, j);
double deta = jets[i].momentum().eta()-jets[j].momentum().eta();
+ double dphi = deltaPhi(jets[i].momentum(),jets[j].momentum());
double dR = deltaR(jets[i].momentum(), jets[j].momentum());
_h_deta_jets[ij]->fill(deta, weight);
+ _h_dphi_jets[ij]->fill(dphi, weight);
_h_dR_jets[ij]->fill(dR, weight);
}
}
@@ -217,6 +223,9 @@
for (it = _h_deta_jets.begin(); it != _h_deta_jets.end(); ++it) {
scale(it->second, crossSection()/sumOfWeights());
}
+ for (it = _h_dphi_jets.begin(); it != _h_dphi_jets.end(); ++it) {
+ scale(it->second, crossSection()/sumOfWeights());
+ }
for (it = _h_dR_jets.begin(); it != _h_dR_jets.end(); ++it) {
scale(it->second, crossSection()/sumOfWeights());
}
More information about the Rivet-svn
mailing list
|