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

blackhole at projects.hepforge.org blackhole at projects.hepforge.org
Mon Mar 1 15:20:29 GMT 2010
Previous message: [Rivet-svn] r2276 - trunk/doc
Next message: [Rivet-svn] r2278 - in trunk/include/Rivet: . Projections
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: fsiegert
Date: Mon Mar  1 15:20:28 2010
New Revision: 2277

Log:
Merge Z and W analyses into MC_ZJETS and MC_WJETS.

Added:
   trunk/data/anainfo/MC_WJETS.info
      - copied, changed from r2275, trunk/data/anainfo/MC_ZJETS.info
   trunk/data/plotinfo/MC_WJETS.plot
      - copied, changed from r2275, trunk/data/plotinfo/MC_ZJETS.plot
   trunk/src/Analyses/MC_WJETS.cc
      - copied, changed from r2275, trunk/src/Analyses/MC_ZJETS.cc
Deleted:
   trunk/data/anainfo/MC_WANALYSIS.info
   trunk/data/anainfo/MC_ZANALYSIS.info
   trunk/data/plotinfo/MC_WANALYSIS.plot
   trunk/data/plotinfo/MC_ZANALYSIS.plot
   trunk/src/Analyses/MC_ZANALYSIS.cc
Modified:
   trunk/data/anainfo/Makefile.am
   trunk/data/plotinfo/MC_ZJETS.plot
   trunk/data/plotinfo/Makefile.am
   trunk/src/Analyses/MC_ZJETS.cc
   trunk/src/Analyses/Makefile.am

Copied and modified: trunk/data/anainfo/MC_WJETS.info (from r2275, trunk/data/anainfo/MC_ZJETS.info)
==============================================================================
--- trunk/data/anainfo/MC_ZJETS.info	Mon Mar  1 14:37:54 2010	(r2275, copy source)
+++ trunk/data/anainfo/MC_WJETS.info	Mon Mar  1 15:20:28 2010	(r2277)
@@ -1,15 +1,14 @@
-Name: MC_ZJETS
-Summary: Monte Carlo validation observables for Z[e+ e-] + jets production
+Name: MC_WJETS
+Summary: Monte Carlo validation observables for W[e nu] + jets production
 Status: VALIDATED
 Authors:
  - Frank Siegert <frank.siegert at durham.ac.uk>
 References:
 RunInfo:
-  $e^+ e^-$ + jets analysis. Needs mass cut on lepton pair to avoid 
-  photon singularity, e.g. a min range of $66 < m_{ee} < 116$ GeV
+  $e \nu$ + jets analysis.
 NumEvents: 1000000
 PtCuts: [0]
 Description:
-  Available observables are Z mass, pT of jets 1-4, jet multiplicity,
-  Delta eta (Z, jet1), Delta R (jet2, jet3), Differential jet
+  Available observables are W mass, pT of jets 1-4, jet multiplicity,
+  Delta eta (W, jet1), Delta R (jet2, jet3), Differential jet
   rates 0->1, 1->2, 2->3, 3->4, Integrated 0--4 jet rates

Modified: trunk/data/anainfo/Makefile.am
==============================================================================
--- trunk/data/anainfo/Makefile.am	Mon Mar  1 15:11:40 2010	(r2276)
+++ trunk/data/anainfo/Makefile.am	Mon Mar  1 15:20:28 2010	(r2277)
@@ -66,9 +66,8 @@
   MC_PHOTONJETUE.info \
   MC_SUSY.info \
   MC_TTBAR.info \
-  MC_WANALYSIS.info \
-  MC_ZANALYSIS.info \
   MC_PHOTONJETS.info \
+  MC_WJETS.info \
   MC_ZJETS.info \
   OPAL_1998_S3780481.info \
   OPAL_2004_S6132243.info \

Copied and modified: trunk/data/plotinfo/MC_WJETS.plot (from r2275, trunk/data/plotinfo/MC_ZJETS.plot)
==============================================================================
--- trunk/data/plotinfo/MC_ZJETS.plot	Mon Mar  1 14:37:54 2010	(r2275, copy source)
+++ trunk/data/plotinfo/MC_WJETS.plot	Mon Mar  1 15:20:28 2010	(r2277)
@@ -1,130 +1,154 @@
-# BEGIN PLOT /MC_ZJETS/Z_jet1_dR
+# BEGIN PLOT /MC_WJETS/W_jet1_dR
 Title=
-XLabel=$\Delta R(\text{Z, 1st jet})$
-YLabel=$\text{d}\sigma/\text{d}\Delta R(\text{Z, 1st jet})$
+XLabel=$\Delta R(\text{W, 1st jet})$
+YLabel=$\text{d}\sigma/\text{d}\Delta R(\text{W, 1st jet})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/Z_jet1_deta
+# BEGIN PLOT /MC_WJETS/W_jet1_deta
 Title=
-XLabel=$\Delta{\eta}(\text{Z, 1st jet})$
-YLabel=$\text{d}\sigma/\text{d}\Delta{\eta}(\text{Z, 1st jet})$
+XLabel=$\Delta{\eta}(\text{W, 1st jet})$
+YLabel=$\text{d}\sigma/\text{d}\Delta{\eta}(\text{W, 1st jet})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/Z_mass
-Title=Z mass
-XLabel=$m_{\text{Z}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}m_{\text{Z}}$
+# BEGIN PLOT /MC_WJETS/W_mass
+Title=W mass
+XLabel=$m_{\text{W}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}m_{\text{W}}$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/Z_pT
-Title=Z $p_\perp$
-XLabel=$p_\perp^{\text{Z}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}y_{\text{Z}}$
+# BEGIN PLOT /MC_WJETS/W_pT
+Title=W $p_\perp$
+XLabel=$p_\perp^{\text{W}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{W}}$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/Z_y
-Title=Z rapidity
-XLabel=$y_{\text{Z}}$
-YLabel=$\text{d}\sigma/\text{d}y_{\text{Z}}$
+# BEGIN PLOT /MC_WJETS/W_pT_peak
+Title=W $p_\perp$ in peak region
+XLabel=$p_\perp^{\text{W}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{W}}$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jets_dR_12
+# BEGIN PLOT /MC_WJETS/W_y
+Title=W rapidity
+XLabel=$y_{\text{W}}$
+YLabel=$\text{d}\sigma/\text{d}y_{\text{W}}$
+# END PLOT
+
+# BEGIN PLOT /MC_WJETS/W_phi
+Title=W azimuthal angle
+XLabel=$\phi_{\text{W}}$
+YLabel=$\text{d}\sigma/\text{d}\phi_{\text{W}}$
+# END PLOT
+
+# BEGIN PLOT /MC_WJETS/lepton_pT
+Title=Lepton $p_\perp$
+XLabel=$p_\perp^{\text{l}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{l}}$
+# END PLOT
+
+# BEGIN PLOT /MC_WJETS/lepton_eta
+Title=Lepton $\eta$
+XLabel=$\eta_{\text{l}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}\eta_{\text{l}}$
+# END PLOT
+
+# BEGIN PLOT /MC_WJETS/jets_dR_12
 Title=
 XLabel=$\Delta{R}(\text{jet 1, jet 2})$
 YLabel=$\text{d}\sigma/\text{d}\Delta{R}(\text{jet 1, jet 2})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jets_dR_13
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jets_dR_14
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jets_dR_23
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jets_dR_24
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jets_dR_34
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jets_deta_12
+# BEGIN PLOT /MC_WJETS/jets_deta_12
 Title=
 XLabel=$\Delta\eta(\text{jet 1, jet 2})$
 YLabel=$\text{d}\sigma/\text{d}\Delta\eta(\text{jet 1, jet 2})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jets_deta_13
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jets_deta_14
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jets_deta_23
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jets_deta_24
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jets_deta_34
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jet_eta_1
+# BEGIN PLOT /MC_WJETS/jet_eta_1
 Title=
 XLabel=$\eta(\text{jet 1})$
 YLabel=$\text{d}\sigma/\text{d}\eta(\text{jet 1})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jet_eta_2
+# BEGIN PLOT /MC_WJETS/jet_eta_2
 Title=
 XLabel=$\eta(\text{jet 2})$
 YLabel=$\text{d}\sigma/\text{d}\eta(\text{jet 2})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jet_eta_3
+# BEGIN PLOT /MC_WJETS/jet_eta_3
 Title=
 XLabel=$\eta(\text{jet 3})$
 YLabel=$\text{d}\sigma/\text{d}\eta(\text{jet 3})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jet_eta_4
+# BEGIN PLOT /MC_WJETS/jet_eta_4
 Title=
 XLabel=$\eta(\text{jet 4})$
 YLabel=$\text{d}\sigma/\text{d}\eta(\text{jet 4})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jet_multi_exclusive
+# BEGIN PLOT /MC_WJETS/jet_multi_exclusive
 Title=Exclusive jet multiplicity
 XLabel=$N_{\text{jet}}$
 YLabel=$\sigma(N_{\text{jet}})$
@@ -133,7 +157,7 @@
 ErrorBands=1
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jet_multi_inclusive
+# BEGIN PLOT /MC_WJETS/jet_multi_inclusive
 Title=Inclusive jet multiplicity
 XLabel=$N_{\text{jet}}$
 YLabel=$\sigma(\geq N_{\text{jet}})$
@@ -142,7 +166,7 @@
 ErrorBands=1
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jet_multi_ratio
+# BEGIN PLOT /MC_WJETS/jet_multi_ratio
 Title=Ratio of jet multiplicity
 XLabel=$N_{\text{jet}}$
 YLabel=$\sigma(\geq N_{\text{jet}})/\sigma(\geq N_{\text{jet}}-1)$
@@ -152,7 +176,7 @@
 ErrorBands=1
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/log10_R_0
+# BEGIN PLOT /MC_WJETS/log10_R_0
 Title=$\log_{10}$(Integrated $0$ jet rate in $k_\perp$ [GeV])
 XLabel=$\log_{10}(d_{\text{cut}}/\text{GeV})$
 YLabel=$R_{0}$
@@ -161,35 +185,35 @@
 LegendXPos=1.2
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/log10_R_1
+# BEGIN PLOT /MC_WJETS/log10_R_1
 Title=$\log_{10}$(Integrated $1$ jet rate in $k_\perp$ [GeV])
 XLabel=$\log_{10}(d_{\text{cut}}/\text{GeV})$
 YLabel=$R_{1}$
 Rebin=2
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/log10_R_2
+# BEGIN PLOT /MC_WJETS/log10_R_2
 Title=$\log_{10}$(Integrated $2$ jet rate in $k_\perp$ [GeV])
 XLabel=$\log_{10}(d_{\text{cut}}/\text{GeV})$
 YLabel=$R_{2}$
 Rebin=2
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/log10_R_3
+# BEGIN PLOT /MC_WJETS/log10_R_3
 Title=$\log_{10}$(Integrated $3$ jet rate in $k_\perp$ [GeV])
 XLabel=$\log_{10}(d_{\text{cut}}/\text{GeV})$
 YLabel=$R_{3}$
 Rebin=2
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/log10_R_4
+# BEGIN PLOT /MC_WJETS/log10_R_4
 Title=$\log_{10}$(Integrated $4$ jet rate in $k_\perp$ [GeV])
 XLabel=$\log_{10}(d_{\text{cut}}/\text{GeV})$
 YLabel=$R_{\geq4}$
 Rebin=2
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/log10_d_01
+# BEGIN PLOT /MC_WJETS/log10_d_01
 Title=$\log_{10}$($k_\perp$ jet resolution $0 \to 1$ [GeV])
 XLabel=$\log_{10}(d_{01}/\text{GeV})$
 YLabel=$\text{d}\sigma/\text{d}\log_{10}(d_{01})$
@@ -198,7 +222,7 @@
 Rebin=2
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/log10_d_12
+# BEGIN PLOT /MC_WJETS/log10_d_12
 Title=$\log_{10}$($k_\perp$ jet resolution $1 \to 2$ [GeV])
 XLabel=$\log_{10}(d_{12}/\text{GeV})$
 YLabel=$\text{d}\sigma/\text{d}\log_{10}(d_{12})$
@@ -207,7 +231,7 @@
 Rebin=2
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/log10_d_23
+# BEGIN PLOT /MC_WJETS/log10_d_23
 Title=$\log_{10}$($k_\perp$ jet resolution $2 \to 3$ [GeV])
 XLabel=$\log_{10}(d_{23}/\text{GeV})$
 YLabel=$\text{d}\sigma/\text{d}\log_{10}(d_{23})$
@@ -216,7 +240,7 @@
 Rebin=2
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/log10_d_34
+# BEGIN PLOT /MC_WJETS/log10_d_34
 Title=$\log_{10}$($k_\perp$ jet resolution $3 \to 4$ [GeV])
 XLabel=$\log_{10}(d_{34}/\text{GeV})$
 YLabel=$\text{d}\sigma/\text{d}\log_{10}(d_{34})$
@@ -225,25 +249,25 @@
 Rebin=2
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jet_pT_1
+# BEGIN PLOT /MC_WJETS/jet_pT_1
 Title=
 XLabel=$p_\perp(\text{jet 1})$
 YLabel=$\text{d}\sigma/\text{d}p_\perp(\text{jet 1})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jet_pT_2
+# BEGIN PLOT /MC_WJETS/jet_pT_2
 Title=
 XLabel=$p_\perp(\text{jet 2})$
 YLabel=$\text{d}\sigma/\text{d}p_\perp(\text{jet 2})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jet_pT_3
+# BEGIN PLOT /MC_WJETS/jet_pT_3
 Title=
 XLabel=$p_\perp(\text{jet 3})$
 YLabel=$\text{d}\sigma/\text{d}p_\perp(\text{jet 3})$
 # END PLOT
 
-# BEGIN PLOT /MC_ZJETS/jet_pT_4
+# BEGIN PLOT /MC_WJETS/jet_pT_4
 Title=
 XLabel=$p_\perp(\text{jet 4})$
 YLabel=$\text{d}\sigma/\text{d}p_\perp(\text{jet 4})$

Modified: trunk/data/plotinfo/MC_ZJETS.plot
==============================================================================
--- trunk/data/plotinfo/MC_ZJETS.plot	Mon Mar  1 15:11:40 2010	(r2276)
+++ trunk/data/plotinfo/MC_ZJETS.plot	Mon Mar  1 15:20:28 2010	(r2277)
@@ -19,7 +19,13 @@
 # BEGIN PLOT /MC_ZJETS/Z_pT
 Title=Z $p_\perp$
 XLabel=$p_\perp^{\text{Z}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}y_{\text{Z}}$
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{Z}}$
+# END PLOT
+
+# BEGIN PLOT /MC_ZJETS/Z_pT_peak
+Title=Z $p_\perp$ in peak region
+XLabel=$p_\perp^{\text{Z}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{Z}}$
 # END PLOT
 
 # BEGIN PLOT /MC_ZJETS/Z_y
@@ -28,6 +34,24 @@
 YLabel=$\text{d}\sigma/\text{d}y_{\text{Z}}$
 # END PLOT
 
+# BEGIN PLOT /MC_ZJETS/Z_phi
+Title=Z azimuthal angle
+XLabel=$\phi_{\text{Z}}$
+YLabel=$\text{d}\sigma/\text{d}\phi_{\text{Z}}$
+# END PLOT
+
+# BEGIN PLOT /MC_ZJETS/lepton_pT
+Title=Lepton $p_\perp$
+XLabel=$p_\perp^{\text{l}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{l}}$
+# END PLOT
+
+# BEGIN PLOT /MC_ZJETS/lepton_eta
+Title=Lepton $\eta$
+XLabel=$\eta_{\text{l}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}\eta_{\text{l}}$
+# END PLOT
+
 # BEGIN PLOT /MC_ZJETS/jets_dR_12
 Title=
 XLabel=$\Delta{R}(\text{jet 1, jet 2})$

Modified: trunk/data/plotinfo/Makefile.am
==============================================================================
--- trunk/data/plotinfo/Makefile.am	Mon Mar  1 15:11:40 2010	(r2276)
+++ trunk/data/plotinfo/Makefile.am	Mon Mar  1 15:20:28 2010	(r2277)
@@ -63,11 +63,10 @@
   MC_DIJET.plot \
   MC_DIPHOTON.plot \
   MC_PHOTONJETUE.plot \
-  MC_ZANALYSIS.plot \
-  MC_WANALYSIS.plot \
   MC_SUSY.plot \
   MC_TTBAR.plot \
   MC_PHOTONJETS.plot \
+  MC_WJETS.plot \
   MC_ZJETS.plot \
   OPAL_1998_S3780481.plot \
   OPAL_2004_S6132243.plot \

Copied and modified: trunk/src/Analyses/MC_WJETS.cc (from r2275, trunk/src/Analyses/MC_ZJETS.cc)
==============================================================================
--- trunk/src/Analyses/MC_ZJETS.cc	Mon Mar  1 14:37:54 2010	(r2275, copy source)
+++ trunk/src/Analyses/MC_WJETS.cc	Mon Mar  1 15:20:28 2010	(r2277)
@@ -1,21 +1,19 @@
 // -*- C++ -*-
 #include "Rivet/Analyses/MC_JetAnalysis.hh"
 #include "Rivet/Tools/Logging.hh"
-#include "Rivet/Projections/ZFinder.hh"
+#include "Rivet/Projections/WFinder.hh"
 #include "Rivet/Projections/FastJets.hh"
 #include "Rivet/RivetAIDA.hh"
 
 namespace Rivet {
 
-  /// @brief Monte Carlo validation observables for Z[e+ e-] + jets production at Tevatron Run II
-  /// @author Frank Siegert
-  class MC_ZJETS : public MC_JetAnalysis {
+  class MC_WJETS : public MC_JetAnalysis {
 
   public:
 
     /// Default constructor
-    MC_ZJETS()
-      : MC_JetAnalysis("MC_ZJETS", 4, "Jets")
+    MC_WJETS()
+      : MC_JetAnalysis("MC_WJETS", 4, "Jets")
     {
       setNeedsCrossSection(true);
     }
@@ -26,16 +24,18 @@
 
     /// Book histograms
     void init() {
-      ZFinder zfinder(-3.5, 3.5, 25.0*GeV, ELECTRON, 65.0*GeV, 115.0*GeV, 0.2);
-      addProjection(zfinder, "ZFinder");
-      FastJets jetpro(zfinder.remainingFinalState(), FastJets::KT, 0.7, 20.0*GeV);
+      WFinder wfinder(-3.5, 3.5, 25.0*GeV, ELECTRON, 60.0*GeV, 100.0*GeV, 25.0*GeV, 0.2);
+      addProjection(wfinder, "WFinder");
+      FastJets jetpro(wfinder.remainingFinalState(), FastJets::KT, 0.7, 20.0*GeV);
       addProjection(jetpro, "Jets");
 
-      _h_Z_mass = bookHistogram1D("Z_mass", 50, 66.0, 116.0);
-      _h_Z_pT = bookHistogram1D("Z_pT", 100, 0.0, 0.25*sqrtS());
-      _h_Z_y = bookHistogram1D("Z_y", 40, -4.0, 4.0);
-      _h_Z_jet1_deta = bookHistogram1D("Z_jet1_deta", 50, -5.0, 5.0);
-      _h_Z_jet1_dR = bookHistogram1D("Z_jet1_dR", 25, 0.5, 7.0);
+      _h_W_mass = bookHistogram1D("W_mass", 50, 66.0, 116.0);
+      _h_W_pT = bookHistogram1D("W_pT", 100, 0.0, 0.25*sqrtS());
+      _h_W_pT_peak = bookHistogram1D("W_pT", 25, 0.0, 25.0);
+      _h_W_y = bookHistogram1D("W_y", 40, -4.0, 4.0);
+      _h_W_phi = bookHistogram1D("W_phi", 25, 0.0, TWOPI);
+      _h_W_jet1_deta = bookHistogram1D("W_jet1_deta", 50, -5.0, 5.0);
+      _h_W_jet1_dR = bookHistogram1D("W_jet1_dR", 25, 0.5, 7.0);
       _h_lepton_pT = bookHistogram1D("lepton_pT", 100, 0.0, 0.25*sqrtS());
       _h_lepton_eta = bookHistogram1D("lepton_eta", 40, -4.0, 4.0);
    
@@ -46,17 +46,19 @@
  
     /// Do the analysis
     void analyze(const Event & e) {   
-      const ZFinder& zfinder = applyProjection<ZFinder>(e, "ZFinder");
-      if (zfinder.particles().size()!=1) {
+      const WFinder& wfinder = applyProjection<WFinder>(e, "WFinder");
+      if (wfinder.particles().size()!=1) {
         vetoEvent;
       }
       const double weight = e.weight();
    
-      FourMomentum zmom(zfinder.particles()[0].momentum());
-      _h_Z_mass->fill(zmom.mass(),weight);
-      _h_Z_pT->fill(zmom.pT(),weight);
-      _h_Z_y->fill(zmom.rapidity(),weight);
-      foreach (const Particle& l, zfinder.constituentsFinalState().particles()) {
+      FourMomentum wmom(wfinder.particles()[0].momentum());
+      _h_W_mass->fill(wmom.mass(),weight);
+      _h_W_pT->fill(wmom.pT(),weight);
+      _h_W_pT_peak->fill(wmom.pT(),weight);
+      _h_W_y->fill(wmom.rapidity(),weight);
+      _h_W_phi->fill(wmom.azimuthalAngle(),weight);
+      foreach (const Particle& l, wfinder.constituentLeptonsFinalState().particles()) {
         _h_lepton_pT->fill(l.momentum().pT(), weight);
         _h_lepton_eta->fill(l.momentum().eta(), weight);
       }
@@ -64,8 +66,8 @@
       const FastJets& jetpro = applyProjection<FastJets>(e, "Jets");
       const Jets& jets = jetpro.jetsByPt(20.0*GeV);
       if (jets.size() > 0) {
-        _h_Z_jet1_deta->fill(zmom.eta()-jets[0].momentum().eta(), weight);
-        _h_Z_jet1_dR->fill(deltaR(zmom, jets[0].momentum()), weight);
+        _h_W_jet1_deta->fill(wmom.eta()-jets[0].momentum().eta(), weight);
+        _h_W_jet1_dR->fill(deltaR(wmom, jets[0].momentum()), weight);
       }
    
       MC_JetAnalysis::analyze(e);
@@ -74,11 +76,13 @@
 
     /// Finalize
     void finalize() {
-      scale(_h_Z_mass, crossSection()/sumOfWeights());
-      scale(_h_Z_pT, crossSection()/sumOfWeights());
-      scale(_h_Z_y, crossSection()/sumOfWeights());
-      scale(_h_Z_jet1_deta, crossSection()/sumOfWeights());
-      scale(_h_Z_jet1_dR, crossSection()/sumOfWeights());
+      scale(_h_W_mass, crossSection()/sumOfWeights());
+      scale(_h_W_pT, crossSection()/sumOfWeights());
+      scale(_h_W_pT_peak, crossSection()/sumOfWeights());
+      scale(_h_W_y, crossSection()/sumOfWeights());
+      scale(_h_W_phi, crossSection()/sumOfWeights());
+      scale(_h_W_jet1_deta, crossSection()/sumOfWeights());
+      scale(_h_W_jet1_dR, crossSection()/sumOfWeights());
       scale(_h_lepton_pT, crossSection()/sumOfWeights());
       scale(_h_lepton_eta, crossSection()/sumOfWeights());
    
@@ -92,11 +96,13 @@
 
     /// @name Histograms
     //@{
-    AIDA::IHistogram1D * _h_Z_mass;
-    AIDA::IHistogram1D * _h_Z_pT;
-    AIDA::IHistogram1D * _h_Z_y;
-    AIDA::IHistogram1D * _h_Z_jet1_deta;
-    AIDA::IHistogram1D * _h_Z_jet1_dR;
+    AIDA::IHistogram1D * _h_W_mass;
+    AIDA::IHistogram1D * _h_W_pT;
+    AIDA::IHistogram1D * _h_W_pT_peak;
+    AIDA::IHistogram1D * _h_W_y;
+    AIDA::IHistogram1D * _h_W_phi;
+    AIDA::IHistogram1D * _h_W_jet1_deta;
+    AIDA::IHistogram1D * _h_W_jet1_dR;
     AIDA::IHistogram1D * _h_lepton_pT;
     AIDA::IHistogram1D * _h_lepton_eta;
     //@}
@@ -106,6 +112,6 @@
 
 
   // This global object acts as a hook for the plugin system
-  AnalysisBuilder<MC_ZJETS> plugin_MC_ZJETS;
+  AnalysisBuilder<MC_WJETS> plugin_MC_WJETS;
 
 }

Modified: trunk/src/Analyses/MC_ZJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_ZJETS.cc	Mon Mar  1 15:11:40 2010	(r2276)
+++ trunk/src/Analyses/MC_ZJETS.cc	Mon Mar  1 15:20:28 2010	(r2277)
@@ -7,8 +7,6 @@
 
 namespace Rivet {
 
-  /// @brief Monte Carlo validation observables for Z[e+ e-] + jets production at Tevatron Run II
-  /// @author Frank Siegert
   class MC_ZJETS : public MC_JetAnalysis {
 
   public:
@@ -33,7 +31,9 @@
 
       _h_Z_mass = bookHistogram1D("Z_mass", 50, 66.0, 116.0);
       _h_Z_pT = bookHistogram1D("Z_pT", 100, 0.0, 0.25*sqrtS());
+      _h_Z_pT_peak = bookHistogram1D("Z_pT", 25, 0.0, 25.0);
       _h_Z_y = bookHistogram1D("Z_y", 40, -4.0, 4.0);
+      _h_Z_phi = bookHistogram1D("Z_phi", 25, 0.0, TWOPI);
       _h_Z_jet1_deta = bookHistogram1D("Z_jet1_deta", 50, -5.0, 5.0);
       _h_Z_jet1_dR = bookHistogram1D("Z_jet1_dR", 25, 0.5, 7.0);
       _h_lepton_pT = bookHistogram1D("lepton_pT", 100, 0.0, 0.25*sqrtS());
@@ -55,7 +55,9 @@
       FourMomentum zmom(zfinder.particles()[0].momentum());
       _h_Z_mass->fill(zmom.mass(),weight);
       _h_Z_pT->fill(zmom.pT(),weight);
+      _h_Z_pT_peak->fill(zmom.pT(),weight);
       _h_Z_y->fill(zmom.rapidity(),weight);
+      _h_Z_phi->fill(zmom.azimuthalAngle(),weight);
       foreach (const Particle& l, zfinder.constituentsFinalState().particles()) {
         _h_lepton_pT->fill(l.momentum().pT(), weight);
         _h_lepton_eta->fill(l.momentum().eta(), weight);
@@ -76,7 +78,9 @@
     void finalize() {
       scale(_h_Z_mass, crossSection()/sumOfWeights());
       scale(_h_Z_pT, crossSection()/sumOfWeights());
+      scale(_h_Z_pT_peak, crossSection()/sumOfWeights());
       scale(_h_Z_y, crossSection()/sumOfWeights());
+      scale(_h_Z_phi, crossSection()/sumOfWeights());
       scale(_h_Z_jet1_deta, crossSection()/sumOfWeights());
       scale(_h_Z_jet1_dR, crossSection()/sumOfWeights());
       scale(_h_lepton_pT, crossSection()/sumOfWeights());
@@ -94,7 +98,9 @@
     //@{
     AIDA::IHistogram1D * _h_Z_mass;
     AIDA::IHistogram1D * _h_Z_pT;
+    AIDA::IHistogram1D * _h_Z_pT_peak;
     AIDA::IHistogram1D * _h_Z_y;
+    AIDA::IHistogram1D * _h_Z_phi;
     AIDA::IHistogram1D * _h_Z_jet1_deta;
     AIDA::IHistogram1D * _h_Z_jet1_dR;
     AIDA::IHistogram1D * _h_lepton_pT;

Modified: trunk/src/Analyses/Makefile.am
==============================================================================
--- trunk/src/Analyses/Makefile.am	Mon Mar  1 15:11:40 2010	(r2276)
+++ trunk/src/Analyses/Makefile.am	Mon Mar  1 15:20:28 2010	(r2277)
@@ -126,9 +126,8 @@
     ExampleAnalysis.cc \
     MC_JetAnalysis.cc \
     MC_PHOTONJETS.cc \
+    MC_WJETS.cc \
     MC_ZJETS.cc \
     MC_LEADINGJETS.cc \
     MC_DIPHOTON.cc \
-    MC_WANALYSIS.cc \
-    MC_ZANALYSIS.cc \
     MC_SUSY.cc
Previous message: [Rivet-svn] r2276 - trunk/doc
Next message: [Rivet-svn] r2278 - in trunk/include/Rivet: . Projections
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Rivet-svn mailing list