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

blackhole at projects.hepforge.org blackhole at projects.hepforge.org
Thu Sep 15 15:06:48 BST 2011


Author: fsiegert
Date: Thu Sep 15 15:06:47 2011
New Revision: 3359

Log:
Add dphi(jets) to MC_JetAnalysis.

Modified:
   trunk/data/plotinfo/MC_HJETS.plot
   trunk/data/plotinfo/MC_JETS.plot
   trunk/data/plotinfo/MC_PHOTONJETS.plot
   trunk/data/plotinfo/MC_WJETS.plot
   trunk/data/plotinfo/MC_WWJETS.plot
   trunk/data/plotinfo/MC_ZJETS.plot
   trunk/data/plotinfo/MC_ZZJETS.plot
   trunk/include/Rivet/Analyses/MC_JetAnalysis.hh
   trunk/src/Analyses/MC_JetAnalysis.cc

Modified: trunk/data/plotinfo/MC_HJETS.plot
==============================================================================
--- trunk/data/plotinfo/MC_HJETS.plot	Wed Sep 14 22:48:15 2011	(r3358)
+++ trunk/data/plotinfo/MC_HJETS.plot	Thu Sep 15 15:06:47 2011	(r3359)
@@ -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: trunk/data/plotinfo/MC_JETS.plot
==============================================================================
--- trunk/data/plotinfo/MC_JETS.plot	Wed Sep 14 22:48:15 2011	(r3358)
+++ trunk/data/plotinfo/MC_JETS.plot	Thu Sep 15 15:06:47 2011	(r3359)
@@ -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: trunk/data/plotinfo/MC_PHOTONJETS.plot
==============================================================================
--- trunk/data/plotinfo/MC_PHOTONJETS.plot	Wed Sep 14 22:48:15 2011	(r3358)
+++ trunk/data/plotinfo/MC_PHOTONJETS.plot	Thu Sep 15 15:06:47 2011	(r3359)
@@ -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: trunk/data/plotinfo/MC_WJETS.plot
==============================================================================
--- trunk/data/plotinfo/MC_WJETS.plot	Wed Sep 14 22:48:15 2011	(r3358)
+++ trunk/data/plotinfo/MC_WJETS.plot	Thu Sep 15 15:06:47 2011	(r3359)
@@ -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: trunk/data/plotinfo/MC_WWJETS.plot
==============================================================================
--- trunk/data/plotinfo/MC_WWJETS.plot	Wed Sep 14 22:48:15 2011	(r3358)
+++ trunk/data/plotinfo/MC_WWJETS.plot	Thu Sep 15 15:06:47 2011	(r3359)
@@ -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: trunk/data/plotinfo/MC_ZJETS.plot
==============================================================================
--- trunk/data/plotinfo/MC_ZJETS.plot	Wed Sep 14 22:48:15 2011	(r3358)
+++ trunk/data/plotinfo/MC_ZJETS.plot	Thu Sep 15 15:06:47 2011	(r3359)
@@ -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: trunk/data/plotinfo/MC_ZZJETS.plot
==============================================================================
--- trunk/data/plotinfo/MC_ZZJETS.plot	Wed Sep 14 22:48:15 2011	(r3358)
+++ trunk/data/plotinfo/MC_ZZJETS.plot	Thu Sep 15 15:06:47 2011	(r3359)
@@ -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: trunk/include/Rivet/Analyses/MC_JetAnalysis.hh
==============================================================================
--- trunk/include/Rivet/Analyses/MC_JetAnalysis.hh	Wed Sep 14 22:48:15 2011	(r3358)
+++ trunk/include/Rivet/Analyses/MC_JetAnalysis.hh	Thu Sep 15 15:06:47 2011	(r3359)
@@ -53,6 +53,7 @@
     std::vector<shared_ptr<LWH::Histogram1D> > _h_rap_jet_plus, _h_rap_jet_minus;
     std::vector<AIDA::IHistogram1D *> _h_mass_jet;
     std::map<std::pair<size_t, size_t>, AIDA::IHistogram1D*> _h_deta_jets;
+    std::map<std::pair<size_t, size_t>, AIDA::IHistogram1D*> _h_dphi_jets;
     std::map<std::pair<size_t, size_t>, AIDA::IHistogram1D*> _h_dR_jets;
     AIDA::IHistogram1D * _h_jet_multi_exclusive;
     AIDA::IHistogram1D * _h_jet_multi_inclusive;

Modified: trunk/src/Analyses/MC_JetAnalysis.cc
==============================================================================
--- trunk/src/Analyses/MC_JetAnalysis.cc	Wed Sep 14 22:48:15 2011	(r3358)
+++ trunk/src/Analyses/MC_JetAnalysis.cc	Thu Sep 15 15:06:47 2011	(r3359)
@@ -59,13 +59,17 @@
       _h_rap_jet_plus[i].reset(new LWH::Histogram1D(i > 1 ? 15 : 25, 0, 5));
       _h_rap_jet_minus[i].reset(new LWH::Histogram1D(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, bookHistogram1D(detaname.str(), 25, -5.0, 5.0)));
 
+        stringstream dphiname;
+        dphiname << "jets_dphi_" << i+1 << j+1;
+        _h_dphi_jets.insert(make_pair(ij, bookHistogram1D(dphiname.str(), 25, 0.0, M_PI)));
+
         stringstream dRname;
         dRname << "jets_dR_" << i+1 << j+1;
         _h_dR_jets.insert(make_pair(ij, bookHistogram1D(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);
       }
     }
@@ -216,6 +222,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