[Rivet-svn] r2171 - in trunk: . data/anainfo data/plotinfo include/Rivet/Analyses src/Analyses

blackhole at projects.hepforge.org blackhole at projects.hepforge.org
Thu Dec 10 18:20:09 GMT 2009
Previous message: [Rivet-svn] r2170 - trunk/data/anainfo
Next message: [Rivet-svn] r2172 - trunk/pyext
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: buckley
Date: Thu Dec 10 18:20:08 2009
New Revision: 2171

Log:
Renaming MC_ analyses to be non-collider-specific, and moving JADE_OPAL bookings into init()

Added:
   trunk/data/anainfo/MC_DIJET.info
      - copied, changed from r2168, trunk/data/anainfo/MC_LHC_DIJET.info
   trunk/data/anainfo/MC_DIPHOTON.info
      - copied, changed from r2168, trunk/data/anainfo/MC_LHC_DIPHOTON.info
   trunk/data/anainfo/MC_LEADINGJETS.info
      - copied, changed from r2168, trunk/data/anainfo/MC_LHC_LEADINGJETS.info
   trunk/data/anainfo/MC_PHOTONJETS.info
      - copied, changed from r2168, trunk/data/anainfo/MC_TVT1960_PHOTONJETS.info
   trunk/data/anainfo/MC_PHOTONJETUE.info
      - copied, changed from r2168, trunk/data/anainfo/MC_LHC_PHOTONJETUE.info
   trunk/data/anainfo/MC_SUSY.info
      - copied, changed from r2168, trunk/data/anainfo/MC_LHC_SUSY.info
   trunk/data/anainfo/MC_TTBAR.info
      - copied, changed from r2168, trunk/data/anainfo/MC_LHC_TTBAR.info
   trunk/data/anainfo/MC_WANALYSIS.info
      - copied, changed from r2168, trunk/data/anainfo/MC_LHC_WANALYSIS.info
   trunk/data/anainfo/MC_ZANALYSIS.info
      - copied, changed from r2168, trunk/data/anainfo/MC_LHC_ZANALYSIS.info
   trunk/data/anainfo/MC_ZJETS.info
      - copied, changed from r2168, trunk/data/anainfo/MC_TVT1960_ZJETS.info
   trunk/data/plotinfo/MC_DIJET.plot
      - copied, changed from r2168, trunk/data/plotinfo/MC_LHC_DIJET.plot
   trunk/data/plotinfo/MC_DIPHOTON.plot
      - copied, changed from r2168, trunk/data/plotinfo/MC_LHC_DIPHOTON.plot
   trunk/data/plotinfo/MC_LEADINGJETS.plot
      - copied, changed from r2168, trunk/data/plotinfo/MC_LHC_LEADINGJETS.plot
   trunk/data/plotinfo/MC_PHOTONJETS.plot
      - copied, changed from r2168, trunk/data/plotinfo/MC_TVT1960_PHOTONJETS.plot
   trunk/data/plotinfo/MC_PHOTONJETUE.plot
      - copied, changed from r2168, trunk/data/plotinfo/MC_LHC_PHOTONJETUE.plot
   trunk/data/plotinfo/MC_SUSY.plot
      - copied, changed from r2168, trunk/data/plotinfo/MC_LHC_SUSY.plot
   trunk/data/plotinfo/MC_TTBAR.plot
      - copied, changed from r2168, trunk/data/plotinfo/MC_LHC_TTBAR.plot
   trunk/data/plotinfo/MC_WANALYSIS.plot
      - copied, changed from r2168, trunk/data/plotinfo/MC_LHC_WANALYSIS.plot
   trunk/data/plotinfo/MC_ZANALYSIS.plot
      - copied, changed from r2168, trunk/data/plotinfo/MC_LHC_ZANALYSIS.plot
   trunk/data/plotinfo/MC_ZJETS.plot
      - copied, changed from r2168, trunk/data/plotinfo/MC_TVT1960_ZJETS.plot
   trunk/src/Analyses/MC_DIJET.cc
      - copied, changed from r2168, trunk/src/Analyses/MC_LHC_DIJET.cc
   trunk/src/Analyses/MC_DIPHOTON.cc
      - copied, changed from r2168, trunk/src/Analyses/MC_LHC_DIPHOTON.cc
   trunk/src/Analyses/MC_LEADINGJETS.cc
      - copied, changed from r2168, trunk/src/Analyses/MC_LHC_LEADINGJETS.cc
   trunk/src/Analyses/MC_PHOTONJETS.cc
      - copied, changed from r2168, trunk/src/Analyses/MC_TVT1960_PHOTONJETS.cc
   trunk/src/Analyses/MC_PHOTONJETUE.cc
      - copied, changed from r2168, trunk/src/Analyses/MC_LHC_PHOTONJETUE.cc
   trunk/src/Analyses/MC_SUSY.cc
      - copied, changed from r2168, trunk/src/Analyses/MC_LHC_SUSY.cc
   trunk/src/Analyses/MC_TTBAR.cc
      - copied, changed from r2168, trunk/src/Analyses/MC_LHC_TTBAR.cc
   trunk/src/Analyses/MC_WANALYSIS.cc
      - copied, changed from r2168, trunk/src/Analyses/MC_LHC_WANALYSIS.cc
   trunk/src/Analyses/MC_ZANALYSIS.cc
      - copied, changed from r2168, trunk/src/Analyses/MC_LHC_ZANALYSIS.cc
   trunk/src/Analyses/MC_ZJETS.cc
      - copied, changed from r2168, trunk/src/Analyses/MC_TVT1960_ZJETS.cc
Deleted:
   trunk/data/anainfo/MC_LHC_DIJET.info
   trunk/data/anainfo/MC_LHC_DIPHOTON.info
   trunk/data/anainfo/MC_LHC_LEADINGJETS.info
   trunk/data/anainfo/MC_LHC_PHOTONJETUE.info
   trunk/data/anainfo/MC_LHC_SUSY.info
   trunk/data/anainfo/MC_LHC_TTBAR.info
   trunk/data/anainfo/MC_LHC_WANALYSIS.info
   trunk/data/anainfo/MC_LHC_ZANALYSIS.info
   trunk/data/anainfo/MC_TVT1960_PHOTONJETS.info
   trunk/data/anainfo/MC_TVT1960_ZJETS.info
   trunk/data/plotinfo/MC_LHC_DIJET.plot
   trunk/data/plotinfo/MC_LHC_DIPHOTON.plot
   trunk/data/plotinfo/MC_LHC_LEADINGJETS.plot
   trunk/data/plotinfo/MC_LHC_PHOTONJETUE.plot
   trunk/data/plotinfo/MC_LHC_SUSY.plot
   trunk/data/plotinfo/MC_LHC_TTBAR.plot
   trunk/data/plotinfo/MC_LHC_WANALYSIS.plot
   trunk/data/plotinfo/MC_LHC_ZANALYSIS.plot
   trunk/data/plotinfo/MC_TVT1960_PHOTONJETS.plot
   trunk/data/plotinfo/MC_TVT1960_ZJETS.plot
   trunk/src/Analyses/MC_LHC_DIJET.cc
   trunk/src/Analyses/MC_LHC_DIPHOTON.cc
   trunk/src/Analyses/MC_LHC_LEADINGJETS.cc
   trunk/src/Analyses/MC_LHC_PHOTONJETUE.cc
   trunk/src/Analyses/MC_LHC_SUSY.cc
   trunk/src/Analyses/MC_LHC_TTBAR.cc
   trunk/src/Analyses/MC_LHC_WANALYSIS.cc
   trunk/src/Analyses/MC_LHC_ZANALYSIS.cc
   trunk/src/Analyses/MC_TVT1960_PHOTONJETS.cc
   trunk/src/Analyses/MC_TVT1960_ZJETS.cc
Modified:
   trunk/ChangeLog
   trunk/data/anainfo/Makefile.am
   trunk/data/plotinfo/Makefile.am
   trunk/include/Rivet/Analyses/MC_JetAnalysis.hh
   trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc
   trunk/src/Analyses/MC_JetAnalysis.cc
   trunk/src/Analyses/Makefile.am

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Thu Dec 10 17:24:19 2009	(r2170)
+++ trunk/ChangeLog	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,5 +1,12 @@
 2009-12-10  Andy Buckley  <andy at insectnation.org>
 
+	* Updating JADE_OPAL to do the histo booking in init(), since
+	sqrtS() is now available at that stage.
+
+	* Renaming and slightly re-engineering all MC_*_* analyses to not
+	be collider-specific (now the Analysis::sqrtS/beams()) methods
+	mean that histograms can be dynamically binned.
+
 	* Creating RivetUnvalidated.so plugin library for unvalidated
 	analyses. Unvalidated analyses now need to be explicitly enabled
 	with a --enable-unvalidated flag on the configure script.

Copied and modified: trunk/data/anainfo/MC_DIJET.info (from r2168, trunk/data/anainfo/MC_LHC_DIJET.info)
==============================================================================
--- trunk/data/anainfo/MC_LHC_DIJET.info	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/anainfo/MC_DIJET.info	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,4 +1,4 @@
-Name: MC_LHC_DIJET
+Name: MC_DIJET
 SpiresID: NONE
 Summary: "Analysis of dijet events at the LHC."
 Description: "Analysis of dijet events for the upcoming runs at the LHC,

Copied and modified: trunk/data/anainfo/MC_DIPHOTON.info (from r2168, trunk/data/anainfo/MC_LHC_DIPHOTON.info)
==============================================================================
--- trunk/data/anainfo/MC_LHC_DIPHOTON.info	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/anainfo/MC_DIPHOTON.info	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,4 +1,4 @@
-Name: MC_LHC_DIPHOTON
+Name: MC_DIPHOTON
 Year: NONE
 Summary: Monte Carlo validation observables for diphoton production at LHC
 Experiment: MC

Copied and modified: trunk/data/anainfo/MC_LEADINGJETS.info (from r2168, trunk/data/anainfo/MC_LHC_LEADINGJETS.info)
==============================================================================
--- trunk/data/anainfo/MC_LHC_LEADINGJETS.info	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/anainfo/MC_LEADINGJETS.info	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,4 +1,4 @@
-Name: MC_LHC_LEADINGJETS
+Name: MC_LEADINGJETS
 Year: NONE
 Summary: Underlying event in leading jet events, extended to LHC
 Experiment: NONE

Copied and modified: trunk/data/anainfo/MC_PHOTONJETS.info (from r2168, trunk/data/anainfo/MC_TVT1960_PHOTONJETS.info)
==============================================================================
--- trunk/data/anainfo/MC_TVT1960_PHOTONJETS.info	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/anainfo/MC_PHOTONJETS.info	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,4 +1,4 @@
-Name: MC_TVT1960_PHOTONJETS
+Name: MC_PHOTONJETS
 Year: NONE
 Summary: Monte Carlo validation observables for photon + jets production at Tevatron Run II
 Experiment: MC

Copied and modified: trunk/data/anainfo/MC_PHOTONJETUE.info (from r2168, trunk/data/anainfo/MC_LHC_PHOTONJETUE.info)
==============================================================================
--- trunk/data/anainfo/MC_LHC_PHOTONJETUE.info	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/anainfo/MC_PHOTONJETUE.info	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,4 +1,4 @@
-Name: MC_LHC_PHOTONJETUE
+Name: MC_PHOTONJETUE
 SpiresID: None
 Summary: "Study the usual underlying event observables in photon+jet events"
 Description: "Modification of the MC leading jets underlying event analysis 

Copied and modified: trunk/data/anainfo/MC_SUSY.info (from r2168, trunk/data/anainfo/MC_LHC_SUSY.info)
==============================================================================
--- trunk/data/anainfo/MC_LHC_SUSY.info	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/anainfo/MC_SUSY.info	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,4 +1,4 @@
-Name: MC_LHC_SUSY
+Name: MC_SUSY
 SpiresID: None
 Summary: "Validate generic SUSY events, including various lepton invariant mass"
 Description: "Analysis of generic SUSY events at the LHC, based on Atlas 

Copied and modified: trunk/data/anainfo/MC_TTBAR.info (from r2168, trunk/data/anainfo/MC_LHC_TTBAR.info)
==============================================================================
--- trunk/data/anainfo/MC_LHC_TTBAR.info	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/anainfo/MC_TTBAR.info	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,17 +1,14 @@
-Name: MC_LHC_TTBAR
-Year: none
+Name: MC_TTBAR
 Summary: MC analysis for ttbar studies at the LHC
-Experiment: none
 Collider: LHC
-SpiresID: none
 Status: UNVALIDATED
 Authors:
  - Holger Schulz <hschulz at physik.hu-berlin.de>
-References:
+ - Andy Buckley <andy.buckley at cern.ch>
 RunInfo:
-  For Pythia6, set MSEL=6
-  For fortran Herwig/Jimmy select IPROC=1706
+  For Pythia6, set MSEL=6.
+  For Fortran Herwig/Jimmy select IPROC=1706.
 NumEvents: 10000
-PtCuts: 
+PtCuts: [0]
 Description:
   This is a pure Monte Carlo study for t-tbar production at the LHC.

Copied and modified: trunk/data/anainfo/MC_WANALYSIS.info (from r2168, trunk/data/anainfo/MC_LHC_WANALYSIS.info)
==============================================================================
--- trunk/data/anainfo/MC_LHC_WANALYSIS.info	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/anainfo/MC_WANALYSIS.info	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,4 +1,4 @@
-Name: MC_LHC_WANALYSIS
+Name: MC_WANALYSIS
 SpiresID: None
 Summary: "Finding leptonic Ws at the LHC, and analysis of the residual jets."
 Description: "Analysis of jets and W+- bosons at the LHC. Output gives

Copied and modified: trunk/data/anainfo/MC_ZANALYSIS.info (from r2168, trunk/data/anainfo/MC_LHC_ZANALYSIS.info)
==============================================================================
--- trunk/data/anainfo/MC_LHC_ZANALYSIS.info	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/anainfo/MC_ZANALYSIS.info	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,4 +1,4 @@
-Name: MC_LHC_ZANALYSIS
+Name: MC_ZANALYSIS
 SpiresID: none
 Summary: "Finding Zs at the LHC, and analysis of the residual jets."
 Description: "Analysis of jets and Z bosons at the LHC. Output gives

Copied and modified: trunk/data/anainfo/MC_ZJETS.info (from r2168, trunk/data/anainfo/MC_TVT1960_ZJETS.info)
==============================================================================
--- trunk/data/anainfo/MC_TVT1960_ZJETS.info	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/anainfo/MC_ZJETS.info	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,4 +1,4 @@
-Name: MC_TVT1960_ZJETS
+Name: MC_ZJETS
 Year: NONE
 Summary: Monte Carlo validation observables for Z[e+ e-] + jets production at Tevatron Run II
 Experiment: MC

Modified: trunk/data/anainfo/Makefile.am
==============================================================================
--- trunk/data/anainfo/Makefile.am	Thu Dec 10 17:24:19 2009	(r2170)
+++ trunk/data/anainfo/Makefile.am	Thu Dec 10 18:20:08 2009	(r2171)
@@ -57,16 +57,16 @@
   H1_1995_S3167097.info \
   H1_2000_S4129130.info \
   JADE_OPAL_2000_S4300807.info \
-  MC_LHC_LEADINGJETS.info \
-  MC_LHC_DIJET.info \
-  MC_LHC_DIPHOTON.info \
-  MC_LHC_PHOTONJETUE.info \
-  MC_LHC_SUSY.info \
-  MC_LHC_TTBAR.info \
-  MC_LHC_WANALYSIS.info \
-  MC_LHC_ZANALYSIS.info \
-  MC_TVT1960_PHOTONJETS.info \
-  MC_TVT1960_ZJETS.info \
+  MC_LEADINGJETS.info \
+  MC_DIJET.info \
+  MC_DIPHOTON.info \
+  MC_PHOTONJETUE.info \
+  MC_SUSY.info \
+  MC_TTBAR.info \
+  MC_WANALYSIS.info \
+  MC_ZANALYSIS.info \
+  MC_PHOTONJETS.info \
+  MC_ZJETS.info \
   OPAL_1998_S3780481.info \
   OPAL_2004_S6132243.info \
   PDG_HADRON_MULTIPLICITIES.info \

Copied and modified: trunk/data/plotinfo/MC_DIJET.plot (from r2168, trunk/data/plotinfo/MC_LHC_DIJET.plot)
==============================================================================
--- trunk/data/plotinfo/MC_LHC_DIJET.plot	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/plotinfo/MC_DIJET.plot	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,82 +1,82 @@
-# BEGIN PLOT /MC_LHC_DIJET/d01-x01-y01
+# BEGIN PLOT /MC_DIJET/d01-x01-y01
 Title=Jetcounts
 XLabel=Number of jets
 YLabel=
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_DIJET/d02-x01-y01
+# BEGIN PLOT /MC_DIJET/d02-x01-y01
 Title=Pt distributions of dijet events
 XLabel=$P_{t}$
 YLabel=$\\frac{d \\sigma}{d P_{t}}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_DIJET/d03-x01-y01
+# BEGIN PLOT /MC_DIJET/d03-x01-y01
 Title=$\\log{P_{t}}$ distributions of dijet events
 XLabel=$\\log{P_{t}}$
 YLabel=$\\frac{d \\sigma}{d P_{t}}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_DIJET/d04-x01-y01
+# BEGIN PLOT /MC_DIJET/d04-x01-y01
 Title=Pt distributions of leading jets in dijet events
 XLabel=$P_{t}$
 YLabel=$\\frac{d \\sigma}{d P_{t}}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_DIJET/d05-x01-y01
+# BEGIN PLOT /MC_DIJET/d05-x01-y01
 Title=Pt distributions of 2nd leading jets in dijet events
 XLabel=$P_{t}$
 YLabel=$\\frac{d \\sigma}{d P_{t}}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_DIJET/d06-x01-y01
+# BEGIN PLOT /MC_DIJET/d06-x01-y01
 Title=Phi distributions of dijet events
 XLabel=$\\phi$
 YLabel=$\\frac{d \\sigma}{d \\phi}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_DIJET/d07-x01-y01
+# BEGIN PLOT /MC_DIJET/d07-x01-y01
 Title=Pseudorapidity distributions of dijet events
 XLabel=$\\eta$
 YLabel=$\\frac{d \\sigma}{d P_{t}}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_DIJET/d08-x01-y01
+# BEGIN PLOT /MC_DIJET/d08-x01-y01
 Title=$\\Delta \\phi$ distributions of dijet events
 XLabel=$\\phi$
 YLabel=$\\frac{d \\sigma}{d \\phi}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_DIJET/d09-x01-y01
+# BEGIN PLOT /MC_DIJET/d09-x01-y01
 Title=$\\Delta \\eta$ distributions of dijet events
 XLabel=$\\eta$
 YLabel=$\\frac{d \\sigma}{d \\eta}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_DIJET/d10-x01-y01
+# BEGIN PLOT /MC_DIJET/d10-x01-y01
 Title=Multiplicity of charged particles
 XLabel=$n_{ch}$
 YLabel=$\\frac{d \\sigma}{d n_{ch}}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_DIJET/d11-x01-y01
+# BEGIN PLOT /MC_DIJET/d11-x01-y01
 Title=Mean $p_{T}$ of charged particles
 XLabel=$p_{T}^{\\mathrm{mean}}$
 YLabel=$\\frac{d \\sigma}{d p}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_DIJET/d12-x01-y01
+# BEGIN PLOT /MC_DIJET/d12-x01-y01
 Title=$p_{T}$ of charged particles
 XLabel=$p_{T}$
 YLabel=$\\frac{d \\sigma}{d p}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_DIJET/d13-x01-y01
+# BEGIN PLOT /MC_DIJET/d13-x01-y01
 Title=$\\log{p_{T}}$ of charged particles
 XLabel=$p_{T}$
 YLabel=$\\frac{d \\sigma}{d p}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_DIJET/d14-x01-y01
+# BEGIN PLOT /MC_DIJET/d14-x01-y01
 Title=RMS $p_{T}$ of charged particles
 XLabel=$p_{T}^{\\mathrm{RMS}}$
 YLabel=$\\frac{d \\sigma}{d p}$

Copied and modified: trunk/data/plotinfo/MC_DIPHOTON.plot (from r2168, trunk/data/plotinfo/MC_LHC_DIPHOTON.plot)
==============================================================================
--- trunk/data/plotinfo/MC_LHC_DIPHOTON.plot	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/plotinfo/MC_DIPHOTON.plot	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,16 +1,16 @@
-# BEGIN PLOT /MC_LHC_DIPHOTON/m_PP
+# BEGIN PLOT /MC_DIPHOTON/m_PP
 Title=Invariant mass of diphoton pair
 XLabel=$M_{\gamma \gamma}$ (GeV/$c^2$)
 YLabel=$\mathrm{d}\sigma/\mathrm{d}M_{\gamma \gamma}$ (pb/(GeV/$c^2$))
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_DIPHOTON/pT_PP
+# BEGIN PLOT /MC_DIPHOTON/pT_PP
 Title=Transverse momentum of diphoton pair
 XLabel=$p_{\perp}^{\gamma \gamma}$ (GeV/$c$)
 YLabel=$\mathrm{d}\sigma/\mathrm{d}p_{\perp}^{\gamma \gamma}$ (pb/(GeV/$c$))
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_DIPHOTON/dphi_PP
+# BEGIN PLOT /MC_DIPHOTON/dphi_PP
 Title=Azimuthal angle between photons
 XLabel=$\Delta\Phi_{\gamma \gamma}$ (rad)
 YLabel=$\mathrm{d}\sigma/\mathrm{d}\Delta\Phi_{\gamma \gamma}$ (pb/rad)

Copied and modified: trunk/data/plotinfo/MC_LEADINGJETS.plot (from r2168, trunk/data/plotinfo/MC_LHC_LEADINGJETS.plot)
==============================================================================
--- trunk/data/plotinfo/MC_LHC_LEADINGJETS.plot	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/plotinfo/MC_LEADINGJETS.plot	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,46 +1,46 @@
-# BEGIN PLOT /MC_LHC_LEADINGJETS/trans-nchg
+# BEGIN PLOT /MC_LEADINGJETS/trans-nchg
 Title=Transverse region charged particle density
 XLabel=Leading jet $p_\perp$ / GeV
 YLabel=$\mathrm{d}{N_\text{ch}}/\mathrm{d}{\phi}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_LEADINGJETS/trans-maxnchg
+# BEGIN PLOT /MC_LEADINGJETS/trans-maxnchg
 Title=TransMAX region charged particle density
 XLabel=Leading jet $p_\perp$ / GeV
 YLabel=$\mathrm{d}{N_\text{ch}}/\mathrm{d}{\phi}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_LEADINGJETS/trans-minnchg
+# BEGIN PLOT /MC_LEADINGJETS/trans-minnchg
 Title=TransMIN region charged particle density
 XLabel=Leading jet $p_\perp$ / GeV
 YLabel=$\mathrm{d}{N_\text{ch}}/\mathrm{d}{\phi}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_LEADINGJETS/trans-ptsum
+# BEGIN PLOT /MC_LEADINGJETS/trans-ptsum
 Title=Transverse region charged pT sum density
 XLabel=Leading jet $p_\perp$ / GeV
 YLabel=$\mathrm{d}{\sum p_\perp^\text{sum}}/\mathrm{d}{\phi}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_LEADINGJETS/trans-maxptsum
+# BEGIN PLOT /MC_LEADINGJETS/trans-maxptsum
 Title=TransMAX region charged pT sum density
 XLabel=Leading jet $p_\perp$ / GeV
 YLabel=$\mathrm{d}{\sum p_\perp^\text{sum}}/\mathrm{d}{\phi}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_LEADINGJETS/trans-minptsum
+# BEGIN PLOT /MC_LEADINGJETS/trans-minptsum
 Title=TransMIN region charged pT sum density
 XLabel=Leading jet $p_\perp$ / GeV
 YLabel=$\mathrm{d}{\sum p_\perp^\text{sum}}/\mathrm{d}{\phi}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_LEADINGJETS/trans-ptavg
+# BEGIN PLOT /MC_LEADINGJETS/trans-ptavg
 Title=Transverse region charged pT average
 XLabel=Leading jet $p_\perp$ / GeV
 YLabel=$\langle p_\perp \rangle$

Copied and modified: trunk/data/plotinfo/MC_PHOTONJETS.plot (from r2168, trunk/data/plotinfo/MC_TVT1960_PHOTONJETS.plot)
==============================================================================
--- trunk/data/plotinfo/MC_TVT1960_PHOTONJETS.plot	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/plotinfo/MC_PHOTONJETS.plot	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,130 +1,130 @@
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/photon_jet1_dR
+# BEGIN PLOT /MC_PHOTONJETS/photon_jet1_dR
 Title=
 XLabel=$\Delta R(\gamma\text{, 1st jet})$
 YLabel=$\text{d}\sigma/\text{d}\Delta R(\gamma\text{, 1st jet})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/photon_jet1_deta
+# BEGIN PLOT /MC_PHOTONJETS/photon_jet1_deta
 Title=
 XLabel=$\Delta{\eta}(\gamma\text{, 1st jet})$
 YLabel=$\text{d}\sigma/\text{d}\Delta{\eta}(\gamma\text{, 1st jet})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/photon_jet1_dphi
+# BEGIN PLOT /MC_PHOTONJETS/photon_jet1_dphi
 Title=
 XLabel=$\Delta{\phi}(\gamma\text{, 1st jet})$
 YLabel=$\text{d}\sigma/\text{d}\Delta{\phi}(\gamma\text{, 1st jet})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/photon_pT
+# BEGIN PLOT /MC_PHOTONJETS/photon_pT
 Title=Photon $p_\perp$
 XLabel=$p_\perp^{\gamma}$ [GeV]
 YLabel=$\text{d}\sigma/\text{d}y_{\gamma}$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/photon_y
+# BEGIN PLOT /MC_PHOTONJETS/photon_y
 Title=Photon rapidity
 XLabel=$y_{\gamma}$
 YLabel=$\text{d}\sigma/\text{d}y_{\gamma}$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/jets_dR_12
+# BEGIN PLOT /MC_PHOTONJETS/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_TVT1960_PHOTONJETS/jets_dR_13
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/jets_dR_14
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/jets_dR_23
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/jets_dR_24
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/jets_dR_34
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/jets_deta_12
+# BEGIN PLOT /MC_PHOTONJETS/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_TVT1960_PHOTONJETS/jets_deta_13
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/jets_deta_14
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/jets_deta_23
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/jets_deta_24
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/jets_deta_34
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/jet_eta_1
+# BEGIN PLOT /MC_PHOTONJETS/jet_eta_1
 Title=
 XLabel=$\eta(\text{jet 1})$
 YLabel=$\text{d}\sigma/\text{d}\eta(\text{jet 1})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/jet_eta_2
+# BEGIN PLOT /MC_PHOTONJETS/jet_eta_2
 Title=
 XLabel=$\eta(\text{jet 2})$
 YLabel=$\text{d}\sigma/\text{d}\eta(\text{jet 2})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/jet_eta_3
+# BEGIN PLOT /MC_PHOTONJETS/jet_eta_3
 Title=
 XLabel=$\eta(\text{jet 3})$
 YLabel=$\text{d}\sigma/\text{d}\eta(\text{jet 3})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/jet_eta_4
+# BEGIN PLOT /MC_PHOTONJETS/jet_eta_4
 Title=
 XLabel=$\eta(\text{jet 4})$
 YLabel=$\text{d}\sigma/\text{d}\eta(\text{jet 4})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/jet_multi_exclusive
+# BEGIN PLOT /MC_PHOTONJETS/jet_multi_exclusive
 Title=Exclusive jet multiplicity
 XLabel=$N_{\text{jet}}$
 YLabel=$\sigma(N_{\text{jet}})$
@@ -133,7 +133,7 @@
 ErrorBands=1
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/jet_multi_inclusive
+# BEGIN PLOT /MC_PHOTONJETS/jet_multi_inclusive
 Title=Inclusive jet multiplicity
 XLabel=$N_{\text{jet}}$
 YLabel=$\sigma(\geq N_{\text{jet}})$
@@ -142,7 +142,7 @@
 ErrorBands=1
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/jet_multi_ratio
+# BEGIN PLOT /MC_PHOTONJETS/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 +152,7 @@
 ErrorBands=1
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/log10_R_0
+# BEGIN PLOT /MC_PHOTONJETS/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 +161,35 @@
 LegendXPos=1.2
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/log10_R_1
+# BEGIN PLOT /MC_PHOTONJETS/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_TVT1960_PHOTONJETS/log10_R_2
+# BEGIN PLOT /MC_PHOTONJETS/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_TVT1960_PHOTONJETS/log10_R_3
+# BEGIN PLOT /MC_PHOTONJETS/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_TVT1960_PHOTONJETS/log10_R_4
+# BEGIN PLOT /MC_PHOTONJETS/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_TVT1960_PHOTONJETS/log10_d_01
+# BEGIN PLOT /MC_PHOTONJETS/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 +198,7 @@
 Rebin=2
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/log10_d_12
+# BEGIN PLOT /MC_PHOTONJETS/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 +207,7 @@
 Rebin=2
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/log10_d_23
+# BEGIN PLOT /MC_PHOTONJETS/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 +216,7 @@
 Rebin=2
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/log10_d_34
+# BEGIN PLOT /MC_PHOTONJETS/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 +225,25 @@
 Rebin=2
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_PHOTONJETS/jet_pT_1
+# BEGIN PLOT /MC_PHOTONJETS/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_TVT1960_PHOTONJETS/jet_pT_2
+# BEGIN PLOT /MC_PHOTONJETS/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_TVT1960_PHOTONJETS/jet_pT_3
+# BEGIN PLOT /MC_PHOTONJETS/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_TVT1960_PHOTONJETS/jet_pT_4
+# BEGIN PLOT /MC_PHOTONJETS/jet_pT_4
 Title=
 XLabel=$p_\perp(\text{jet 4})$
 YLabel=$\text{d}\sigma/\text{d}p_\perp(\text{jet 4})$

Copied and modified: trunk/data/plotinfo/MC_PHOTONJETUE.plot (from r2168, trunk/data/plotinfo/MC_LHC_PHOTONJETUE.plot)
==============================================================================
--- trunk/data/plotinfo/MC_LHC_PHOTONJETUE.plot	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/plotinfo/MC_PHOTONJETUE.plot	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,16 +1,16 @@
-# BEGIN PLOT /MC_LHC_PHOTONJETUE/gammajet-dR
+# BEGIN PLOT /MC_PHOTONJETUE/gammajet-dR
 Title=$\Delta{R}$ between leading jet and leading photon 
 XLabel=$\Delta{R}$
 YLabel=$\mathrm{d}N/\mathrm{d}\Delta{R}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_PHOTONJETUE/gammajet-dphi
+# BEGIN PLOT /MC_PHOTONJETUE/gammajet-dphi
 Title=$\Delta{\phi}$ between leading jet and leading photon 
 XLabel=$\Delta{\phi}$
 YLabel=$\mathrm{d}N/\mathrm{d}\Delta{\phi}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_PHOTONJETUE/trans-nchg
+# BEGIN PLOT /MC_PHOTONJETUE/trans-nchg
 Title=Transverse region charged particle density
 XLabel=Leading jet $p_\perp$ / GeV
 YLabel=$\mathrm{d}{N_\text{ch}}/\mathrm{d}{\phi}$
@@ -18,7 +18,7 @@
 XMin=20
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_PHOTONJETUE/trans-maxnchg
+# BEGIN PLOT /MC_PHOTONJETUE/trans-maxnchg
 Title=TransMAX region charged particle density
 XLabel=Leading jet $p_\perp$ / GeV
 YLabel=$\mathrm{d}{N_\text{ch}}/\mathrm{d}{\phi}$
@@ -26,7 +26,7 @@
 XMin=20
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_PHOTONJETUE/trans-minnchg
+# BEGIN PLOT /MC_PHOTONJETUE/trans-minnchg
 Title=TransMIN region charged particle density
 XLabel=Leading jet $p_\perp$ / GeV
 YLabel=$\mathrm{d}{N_\text{ch}}/\mathrm{d}{\phi}$
@@ -34,7 +34,7 @@
 XMin=20
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_PHOTONJETUE/trans-ptsum
+# BEGIN PLOT /MC_PHOTONJETUE/trans-ptsum
 Title=Transverse region charged pT sum density
 XLabel=Leading jet $p_\perp$ / GeV
 YLabel=$\mathrm{d}{\sum p_\perp^\text{sum}}/\mathrm{d}{\phi}$
@@ -42,7 +42,7 @@
 XMin=20
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_PHOTONJETUE/trans-maxptsum
+# BEGIN PLOT /MC_PHOTONJETUE/trans-maxptsum
 Title=TransMAX region charged pT sum density
 XLabel=Leading jet $p_\perp$ / GeV
 YLabel=$\mathrm{d}{\sum p_\perp^\text{sum}}/\mathrm{d}{\phi}$
@@ -50,7 +50,7 @@
 XMin=20
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_PHOTONJETUE/trans-minptsum
+# BEGIN PLOT /MC_PHOTONJETUE/trans-minptsum
 Title=TransMIN region charged pT sum density
 XLabel=Leading jet $p_\perp$ / GeV
 YLabel=$\mathrm{d}{\sum p_\perp^\text{sum}}/\mathrm{d}{\phi}$
@@ -58,7 +58,7 @@
 XMin=20
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_PHOTONJETUE/trans-ptavg
+# BEGIN PLOT /MC_PHOTONJETUE/trans-ptavg
 Title=Transverse region charged pT average
 XLabel=Leading jet $p_\perp$ / GeV
 YLabel=$\langle p_\perp \rangle$

Copied and modified: trunk/data/plotinfo/MC_SUSY.plot (from r2168, trunk/data/plotinfo/MC_LHC_SUSY.plot)
==============================================================================
--- trunk/data/plotinfo/MC_LHC_SUSY.plot	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/plotinfo/MC_SUSY.plot	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,39 +1,39 @@
-# BEGIN PLOT /MC_LHC_SUSY/eta-e
+# BEGIN PLOT /MC_SUSY/eta-e
 Title=$\eta$ distribution for $e^+$, $e^-$
 XLabel=$\eta$
 YLabel=$\mathrm{d}N_e/\mathrm{d}\eta$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/eta-gamma
+# BEGIN PLOT /MC_SUSY/eta-gamma
 Title=$\eta$ distribution for photons
 XLabel=$\eta$
 YLabel=$\mathrm{d}N_\gamma/\mathrm{d}\eta$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/eta-gamma-iso
+# BEGIN PLOT /MC_SUSY/eta-gamma-iso
 Title=$\eta$ distribution for $\Delta{R}=0.2$ jet-isolated photons
 XLabel=$\eta$
 YLabel=$\mathrm{d}N_{\gamma\text{iso}}/\mathrm{d}\eta$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/eta-jet
+# BEGIN PLOT /MC_SUSY/eta-jet
 Title=$\eta$ distribution for $R=0.7$ anti-$k_\perp$ jets
 XLabel=$\eta$
 YLabel=$\mathrm{d}N_\text{jet}/\mathrm{d}\eta$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/eta-mu
+# BEGIN PLOT /MC_SUSY/eta-mu
 Title=$\eta$ distribution for $\mu^+$, $\mu^-$
 XLabel=$\eta$
 YLabel=$\mathrm{d}N_\mu/\mathrm{d}\eta$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/eta-trk
+# BEGIN PLOT /MC_SUSY/eta-trk
 Title=$\eta$ distribution for charged tracks
 XLabel=$\eta$
 YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$
@@ -41,7 +41,7 @@
 # END PLOT
 
 
-# BEGIN PLOT /MC_LHC_SUSY/Etmiss
+# BEGIN PLOT /MC_SUSY/Etmiss
 Title=$E_\perp^\text{miss}$ distribution
 XLabel=$E_\perp^\text{miss}$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}E_\perp^\text{miss}$
@@ -49,63 +49,63 @@
 # END PLOT
 
 
-# BEGIN PLOT /MC_LHC_SUSY/mll-ossf-mumu
+# BEGIN PLOT /MC_SUSY/mll-ossf-mumu
 Title=$m_{\mu\mu}$ distribution for leading $\mu^+ \mu^-$
 XLabel=$m_{\mu\mu}$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}m_{\mu\mu}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/mll-2-ossf-mumu
+# BEGIN PLOT /MC_SUSY/mll-2-ossf-mumu
 Title=$m_{\mu\mu}$ distribution for clean $\mu^+ \mu^-$
 XLabel=$m_{\mu\mu}$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}m_{\mu\mu}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/mll-all-ossf-mumu
+# BEGIN PLOT /MC_SUSY/mll-all-ossf-mumu
 Title=$m_{\mu\mu}$ distribution for combinatoric $\mu^+ \mu^-$
 XLabel=$m_{\mu\mu}$
 YLabel=$\mathrm{d}N_\text{cand}/\mathrm{d}m_{\mu\mu}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/mll-ossf-ee
+# BEGIN PLOT /MC_SUSY/mll-ossf-ee
 Title=$m_{ee}$ distribution for leading $e^+ e^-$
 XLabel=$m_{ee}$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}m_{ee}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/mll-2-ossf-ee
+# BEGIN PLOT /MC_SUSY/mll-2-ossf-ee
 Title=$m_{ee}$ distribution for clean $e^+ e^-$
 XLabel=$m_{ee}$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}m_{ee}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/mll-all-ossf-ee
+# BEGIN PLOT /MC_SUSY/mll-all-ossf-ee
 Title=$m_{ee}$ distribution for combinatoric $e^+ e^-$
 XLabel=$m_{ee}$
 YLabel=$\mathrm{d}N_\text{cand}/\mathrm{d}m_{ee}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/mll-osof-emu
+# BEGIN PLOT /MC_SUSY/mll-osof-emu
 Title=$m_{e\mu}$ distribution for leading $e^\pm \mu^\mp$
 XLabel=$m_{e\mu}$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}m_{e\mu}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/mll-2-osof-emu
+# BEGIN PLOT /MC_SUSY/mll-2-osof-emu
 Title=$m_{e\mu}$ distribution for clean $e^\pm \mu^\mp$
 XLabel=$m_{e\mu}$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}m_{e\mu}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/mll-all-osof-emu
+# BEGIN PLOT /MC_SUSY/mll-all-osof-emu
 Title=$m_{e\mu}$ distribution for combinatoric $e^\pm \mu^\mp$
 XLabel=$m_{e\mu}$
 YLabel=$\mathrm{d}N_\text{cand}/\mathrm{d}m_{e\mu}$
@@ -113,42 +113,42 @@
 # END PLOT
 
 
-# BEGIN PLOT /MC_LHC_SUSY/n-e
+# BEGIN PLOT /MC_SUSY/n-e
 Title=Multiplicity distribution for $e^+$, $e^-$
 XLabel=$N$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}N_e$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/n-gamma
+# BEGIN PLOT /MC_SUSY/n-gamma
 Title=Multiplicity distribution for photons
 XLabel=$N_\gamma$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}N_\gamma$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/n-gamma-iso
+# BEGIN PLOT /MC_SUSY/n-gamma-iso
 Title=Multiplicity distribution for $\Delta{R}=0.2$ jet-isolated photons
 XLabel=$N_\gamma\text{iso}$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}N_\gamma\text{iso}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/n-jet
+# BEGIN PLOT /MC_SUSY/n-jet
 Title=Multiplicity distribution for $R=0.7$ anti-$k_\perp$ jets
 XLabel=$N_\text{jet}$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}N_\text{jet}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/n-mu
+# BEGIN PLOT /MC_SUSY/n-mu
 Title=Multiplicity distribution for $\mu^+$, $\mu^-$
 XLabel=$N_\mu$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}N_\mu$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/n-trk
+# BEGIN PLOT /MC_SUSY/n-trk
 Title=Multiplicity distribution for charged tracks
 XLabel=$N_\text{ch}$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}N_\text{ch}$
@@ -156,42 +156,42 @@
 # END PLOT
 
 
-# BEGIN PLOT /MC_LHC_SUSY/phi-e
+# BEGIN PLOT /MC_SUSY/phi-e
 Title=$\phi$ distribution for $e^+$, $e^-$
 XLabel=$\phi$
 YLabel=$\mathrm{d}N_e/\mathrm{d}\phi$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/phi-gamma
+# BEGIN PLOT /MC_SUSY/phi-gamma
 Title=$\phi$ distribution for photons
 XLabel=$\phi$
 YLabel=$\mathrm{d}N_\gamma/\mathrm{d}\phi$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/phi-gamma-iso
+# BEGIN PLOT /MC_SUSY/phi-gamma-iso
 Title=$\phi$ distribution for $\Delta{R}=0.2$ jet-isolated photons
 XLabel=$\phi$
 YLabel=$\mathrm{d}N_{\gamma\text{iso}}/\mathrm{d}\phi$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/phi-jet
+# BEGIN PLOT /MC_SUSY/phi-jet
 Title=$\phi$ distribution for $R=0.7$ anti-$k_\perp$ jets
 XLabel=$\phi$
 YLabel=$\mathrm{d}N_\text{jet}/\mathrm{d}\phi$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/phi-mu
+# BEGIN PLOT /MC_SUSY/phi-mu
 Title=$\phi$ distribution for $\mu^+$, $\mu^-$
 XLabel=$\phi$
 YLabel=$\mathrm{d}N_\mu/\mathrm{d}\phi$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/phi-trk
+# BEGIN PLOT /MC_SUSY/phi-trk
 Title=$\phi$ distribution for charged tracks
 XLabel=$\phi$
 YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\phi$
@@ -199,42 +199,42 @@
 # END PLOT
 
 
-# BEGIN PLOT /MC_LHC_SUSY/pt-e
+# BEGIN PLOT /MC_SUSY/pt-e
 Title=$p_\perp$ distribution for $e^+$, $e^-$
 XLabel=$p_\perp$
 YLabel=$\mathrm{d}N_e/\mathrm{d}p_\perp$
 LogY=1
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/pt-gamma
+# BEGIN PLOT /MC_SUSY/pt-gamma
 Title=$p_\perp$ distribution for photons
 XLabel=$p_\perp$
 YLabel=$\mathrm{d}N_\gamma/\mathrm{d}p_\perp$
 LogY=1
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/pt-gamma-iso
+# BEGIN PLOT /MC_SUSY/pt-gamma-iso
 Title=$p_\perp$ distribution for $\Delta{R}=0.2$ jet-isolated photons
 XLabel=$p_\perp$
 YLabel=$\mathrm{d}N_{\gamma\text{iso}}/\mathrm{d}p_\perp$
 LogY=1
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/pt-jet
+# BEGIN PLOT /MC_SUSY/pt-jet
 Title=$p_\perp$ distribution for $R=0.7$ anti-$k_\perp$ jets
 XLabel=$p_\perp$
 YLabel=$\mathrm{d}N_\text{jet}/\mathrm{d}p_\perp$
 LogY=1
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/pt-mu
+# BEGIN PLOT /MC_SUSY/pt-mu
 Title=$p_\perp$ distribution for $\mu^+$, $\mu^-$
 XLabel=$p_\perp$
 YLabel=$\mathrm{d}N_\mu/\mathrm{d}p_\perp$
 LogY=1
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_SUSY/pt-trk
+# BEGIN PLOT /MC_SUSY/pt-trk
 Title=$p_\perp$ distribution for charged tracks
 XLabel=$p_\perp$
 YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}p_\perp$

Copied and modified: trunk/data/plotinfo/MC_TTBAR.plot (from r2168, trunk/data/plotinfo/MC_LHC_TTBAR.plot)
==============================================================================
--- trunk/data/plotinfo/MC_LHC_TTBAR.plot	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/plotinfo/MC_TTBAR.plot	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,4 +1,4 @@
-# BEGIN PLOT /MC_LHC_TTBAR/pseudorap
+# BEGIN PLOT /MC_TTBAR/pseudorap
 Title=Pseudorapidity distribution
 XLabel=$\eta$
 YLabel=$\frac{dN}{d\eta}$

Copied and modified: trunk/data/plotinfo/MC_WANALYSIS.plot (from r2168, trunk/data/plotinfo/MC_LHC_WANALYSIS.plot)
==============================================================================
--- trunk/data/plotinfo/MC_LHC_WANALYSIS.plot	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/plotinfo/MC_WANALYSIS.plot	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,144 +1,144 @@
-# BEGIN PLOT /MC_LHC_WANALYSIS/track-n
+# BEGIN PLOT /MC_WANALYSIS/track-n
 Title=Charged multiplicity
 XLabel=$n_\text{ch}$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}n_\text{ch}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/w-n
+# BEGIN PLOT /MC_WANALYSIS/w-n
 Title=W candidate multiplicity
 XLabel=$n_\text{W}^\pm$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}n_\text{W}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/wplus-n
+# BEGIN PLOT /MC_WANALYSIS/wplus-n
 Title=\PWplus candidate multiplicity
 XLabel=$n_\text{W}^+$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}n_\text{W}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/wminus-n
+# BEGIN PLOT /MC_WANALYSIS/wminus-n
 Title=\PWminus candidate multiplicity
 XLabel=$n_\text{W}^-$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}n_\text{W}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/jet-n
+# BEGIN PLOT /MC_WANALYSIS/jet-n
 Title=Jet multiplicity
 XLabel=$n_\text{jet}$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}n_\text{jet}$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/track-pt
+# BEGIN PLOT /MC_WANALYSIS/track-pt
 Title=Charged track $p_\perp$
 XLabel=$p_\perp$ / GeV
 YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}p_\perp^\text{ch}$ / GeV$^{-1}$
 LogY=1
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/track-ptavg
+# BEGIN PLOT /MC_WANALYSIS/track-ptavg
 Title=Average charged track $p_\perp$
 XLabel=$\langle p_\perp^\text{ch} \rangle$ / GeV
 YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\langle p_\perp^\text{ch} \langle$ / GeV$^{-1}$
 LogY=1
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/track-ptrms
+# BEGIN PLOT /MC_WANALYSIS/track-ptrms
 Title=Width of charged track $p_\perp$
 XLabel=$\hat{\sigma}_{p_\perp^\text{ch}}$ / GeV
 YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\hat{\sigma}_{p_\perp^\text{ch}}$ / GeV$^{-1}$
 LogY=1
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/w-pt
+# BEGIN PLOT /MC_WANALYSIS/w-pt
 Title=W candidate $p_\perp$
 XLabel=$p_\perp(\text{W})$ / GeV
 YLabel=$\mathrm{d}N_\text{W}/\mathrm{d}p_\perp(\text{W})$ / GeV$^{-1}$
 LogY=1
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/wplus-pt
+# BEGIN PLOT /MC_WANALYSIS/wplus-pt
 Title=\PWplus candidate $p_\perp$
 XLabel=$p_\perp(\text{\PWplus})$ / GeV
 YLabel=$\mathrm{d}N_\text{W}/\mathrm{d}p_\perp(\text{W})$ / GeV$^{-1}$
 LogY=1
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/wminus-pt
+# BEGIN PLOT /MC_WANALYSIS/wminus-pt
 Title=\PWminus candidate $p_\perp$
 XLabel=$p_\perp(\text{\PWminus})$ / GeV
 YLabel=$\mathrm{d}N_\text{W}/\mathrm{d}p_\perp(\text{W})$ / GeV$^{-1}$
 LogY=1
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/jet-pt
+# BEGIN PLOT /MC_WANALYSIS/jet-pt
 Title=Jet $p_\perp$
 XLabel=$p_\perp(\text{jet})$ / GeV
 YLabel=$\mathrm{d}N_\text{jet}/\mathrm{d}p_\perp(\text{jet})$ / GeV$^{-1}$
 LogY=1
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/w-eta
+# BEGIN PLOT /MC_WANALYSIS/w-eta
 Title=W candidate $\eta$
 XLabel=$\eta(\text{W})$
 YLabel=$\mathrm{d}N_\text{W}/\mathrm{d}\eta(\text{W})$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/wplus-eta
+# BEGIN PLOT /MC_WANALYSIS/wplus-eta
 Title=\PWplus candidate $\eta$
 XLabel=$\eta(\text{W})$
 YLabel=$\mathrm{d}N_\text{W}/\mathrm{d}\eta(\text{W})$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/wminus-eta
+# BEGIN PLOT /MC_WANALYSIS/wminus-eta
 Title=\PWminus candidate $\eta$
 XLabel=$\eta(\text{W})$
 YLabel=$\mathrm{d}N_\text{W}/\mathrm{d}\eta(\text{W})$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/w-phi
+# BEGIN PLOT /MC_WANALYSIS/w-phi
 Title=W candidate $\phi$
 XLabel=$\phi(\text{W})$
 YLabel=$\mathrm{d}N_\text{W}/\mathrm{d}\phi(\text{W})$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/wplus-phi
+# BEGIN PLOT /MC_WANALYSIS/wplus-phi
 Title=\PWplus candidate $\phi$
 XLabel=$\phi(\text{W})$
 YLabel=$\mathrm{d}N_\text{W}/\mathrm{d}\phi(\text{W})$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/wminus-phi
+# BEGIN PLOT /MC_WANALYSIS/wminus-phi
 Title=\PWminus candidate $\phi$
 XLabel=$\phi(\text{W})$
 YLabel=$\mathrm{d}N_\text{W}/\mathrm{d}\phi(\text{W})$
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/w-m
+# BEGIN PLOT /MC_WANALYSIS/w-m
 Title=W candidate mass
 XLabel=$m(\text{W})$ / GeV
 YLabel=$\mathrm{d}N_\text{W}/\mathrm{d}m(\text{W})$ / GeV$^{-1}$
 LogY=1
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/wplus-m
+# BEGIN PLOT /MC_WANALYSIS/wplus-m
 Title=\PWplus candidate mass
 XLabel=$m(\text{W})$ / GeV
 YLabel=$\mathrm{d}N_\text{W}/\mathrm{d}m(\text{W})$ / GeV$^{-1}$
 LogY=1
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_WANALYSIS/wminus-m
+# BEGIN PLOT /MC_WANALYSIS/wminus-m
 Title=\PWminus candidate mass
 XLabel=$m(\text{W})$ / GeV
 YLabel=$\mathrm{d}N_\text{W}/\mathrm{d}m(\text{W})$ / GeV$^{-1}$

Copied and modified: trunk/data/plotinfo/MC_ZANALYSIS.plot (from r2168, trunk/data/plotinfo/MC_LHC_ZANALYSIS.plot)
==============================================================================
--- trunk/data/plotinfo/MC_LHC_ZANALYSIS.plot	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/plotinfo/MC_ZANALYSIS.plot	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,64 +1,64 @@
-# BEGIN PLOT /MC_LHC_ZANALYSIS/n-ch
+# BEGIN PLOT /MC_ZANALYSIS/n-ch
 Title=Charged multiplicity
 XLabel=$n_\text{ch}$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}n_\text{ch}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_ZANALYSIS/n-z
+# BEGIN PLOT /MC_ZANALYSIS/n-z
 Title=Z candidate multiplicity
 XLabel=$n_\text{Z}$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}n_\text{Z}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_ZANALYSIS/n-jet
+# BEGIN PLOT /MC_ZANALYSIS/n-jet
 Title=Jet multiplicity
 XLabel=$n_\text{jet}$
 YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}n_\text{jet}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_ZANALYSIS/pt-ch
+# BEGIN PLOT /MC_ZANALYSIS/pt-ch
 Title=Charged track $p_\perp$
 XLabel=$p_\perp$ / GeV
 YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}p_\perp^\text{ch}$ / GeV$^{-1}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_ZANALYSIS/ptavg-ch
+# BEGIN PLOT /MC_ZANALYSIS/ptavg-ch
 Title=Average charged track $p_\perp$
 XLabel=$\langle p_\perp^\text{ch} \rangle$ / GeV
 YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\langle p_\perp^\text{ch} \langle$ / GeV$^{-1}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_ZANALYSIS/ptrms-ch
+# BEGIN PLOT /MC_ZANALYSIS/ptrms-ch
 Title=Width of charged track $p_\perp$
 XLabel=$\hat{\sigma}_{p_\perp^\text{ch}}$ / GeV
 YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\hat{\sigma}_{p_\perp^\text{ch}}$ / GeV$^{-1}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_ZANALYSIS/pt-z
+# BEGIN PLOT /MC_ZANALYSIS/pt-z
 Title=Z candidate $p_\perp$
 XLabel=$p_\perp(\text{Z})$ / GeV
 YLabel=$\mathrm{d}N_\text{Z}/\mathrm{d}p_\perp(\text{Z})$ / GeV$^{-1}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_ZANALYSIS/pt-jet
+# BEGIN PLOT /MC_ZANALYSIS/pt-jet
 Title=Jet $p_\perp$
 XLabel=$p_\perp(\text{jet})$ / GeV
 YLabel=$\mathrm{d}N_\text{jet}/\mathrm{d}p_\perp(\text{jet})$ / GeV$^{-1}$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_ZANALYSIS/eta-z
+# BEGIN PLOT /MC_ZANALYSIS/eta-z
 Title=Z candidate $\eta$
 XLabel=$\eta(\text{Z})$
 YLabel=$\mathrm{d}N_\text{Z}/\mathrm{d}\eta(\text{Z})$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_ZANALYSIS/phi-z
+# BEGIN PLOT /MC_ZANALYSIS/phi-z
 Title=Z candidate $\phi$
 XLabel=$\phi(\text{Z})$
 YLabel=$\mathrm{d}N_\text{Z}/\mathrm{d}\phi(\text{Z})$
 # END PLOT
 
-# BEGIN PLOT /MC_LHC_ZANALYSIS/m-z
+# BEGIN PLOT /MC_ZANALYSIS/m-z
 Title=Z candidate mass
 XLabel=$m(\text{Z})$ / GeV
 YLabel=$\mathrm{d}N_\text{Z}/\mathrm{d}m(\text{Z})$ / GeV$^{-1}$

Copied and modified: trunk/data/plotinfo/MC_ZJETS.plot (from r2168, trunk/data/plotinfo/MC_TVT1960_ZJETS.plot)
==============================================================================
--- trunk/data/plotinfo/MC_TVT1960_ZJETS.plot	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/data/plotinfo/MC_ZJETS.plot	Thu Dec 10 18:20:08 2009	(r2171)
@@ -1,130 +1,130 @@
-# BEGIN PLOT /MC_TVT1960_ZJETS/Z_jet1_dR
+# BEGIN PLOT /MC_ZJETS/Z_jet1_dR
 Title=
 XLabel=$\Delta R(\text{Z, 1st jet})$
 YLabel=$\text{d}\sigma/\text{d}\Delta R(\text{Z, 1st jet})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/Z_jet1_deta
+# BEGIN PLOT /MC_ZJETS/Z_jet1_deta
 Title=
 XLabel=$\Delta{\eta}(\text{Z, 1st jet})$
 YLabel=$\text{d}\sigma/\text{d}\Delta{\eta}(\text{Z, 1st jet})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/Z_mass
+# BEGIN PLOT /MC_ZJETS/Z_mass
 Title=Z mass
 XLabel=$m_{\text{Z}}$ [GeV]
 YLabel=$\text{d}\sigma/\text{d}m_{\text{Z}}$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/Z_pT
+# 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}}$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/Z_y
+# BEGIN PLOT /MC_ZJETS/Z_y
 Title=Z rapidity
 XLabel=$y_{\text{Z}}$
 YLabel=$\text{d}\sigma/\text{d}y_{\text{Z}}$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/jets_dR_12
+# BEGIN PLOT /MC_ZJETS/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_TVT1960_ZJETS/jets_dR_13
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/jets_dR_14
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/jets_dR_23
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/jets_dR_24
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/jets_dR_34
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/jets_deta_12
+# BEGIN PLOT /MC_ZJETS/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_TVT1960_ZJETS/jets_deta_13
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/jets_deta_14
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/jets_deta_23
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/jets_deta_24
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/jets_deta_34
+# 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})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/jet_eta_1
+# BEGIN PLOT /MC_ZJETS/jet_eta_1
 Title=
 XLabel=$\eta(\text{jet 1})$
 YLabel=$\text{d}\sigma/\text{d}\eta(\text{jet 1})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/jet_eta_2
+# BEGIN PLOT /MC_ZJETS/jet_eta_2
 Title=
 XLabel=$\eta(\text{jet 2})$
 YLabel=$\text{d}\sigma/\text{d}\eta(\text{jet 2})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/jet_eta_3
+# BEGIN PLOT /MC_ZJETS/jet_eta_3
 Title=
 XLabel=$\eta(\text{jet 3})$
 YLabel=$\text{d}\sigma/\text{d}\eta(\text{jet 3})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/jet_eta_4
+# BEGIN PLOT /MC_ZJETS/jet_eta_4
 Title=
 XLabel=$\eta(\text{jet 4})$
 YLabel=$\text{d}\sigma/\text{d}\eta(\text{jet 4})$
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/jet_multi_exclusive
+# BEGIN PLOT /MC_ZJETS/jet_multi_exclusive
 Title=Exclusive jet multiplicity
 XLabel=$N_{\text{jet}}$
 YLabel=$\sigma(N_{\text{jet}})$
@@ -133,7 +133,7 @@
 ErrorBands=1
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/jet_multi_inclusive
+# BEGIN PLOT /MC_ZJETS/jet_multi_inclusive
 Title=Inclusive jet multiplicity
 XLabel=$N_{\text{jet}}$
 YLabel=$\sigma(\geq N_{\text{jet}})$
@@ -142,7 +142,7 @@
 ErrorBands=1
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/jet_multi_ratio
+# BEGIN PLOT /MC_ZJETS/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 +152,7 @@
 ErrorBands=1
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/log10_R_0
+# BEGIN PLOT /MC_ZJETS/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 +161,35 @@
 LegendXPos=1.2
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/log10_R_1
+# BEGIN PLOT /MC_ZJETS/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_TVT1960_ZJETS/log10_R_2
+# BEGIN PLOT /MC_ZJETS/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_TVT1960_ZJETS/log10_R_3
+# BEGIN PLOT /MC_ZJETS/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_TVT1960_ZJETS/log10_R_4
+# BEGIN PLOT /MC_ZJETS/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_TVT1960_ZJETS/log10_d_01
+# BEGIN PLOT /MC_ZJETS/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 +198,7 @@
 Rebin=2
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/log10_d_12
+# BEGIN PLOT /MC_ZJETS/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 +207,7 @@
 Rebin=2
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/log10_d_23
+# BEGIN PLOT /MC_ZJETS/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 +216,7 @@
 Rebin=2
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/log10_d_34
+# BEGIN PLOT /MC_ZJETS/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 +225,25 @@
 Rebin=2
 # END PLOT
 
-# BEGIN PLOT /MC_TVT1960_ZJETS/jet_pT_1
+# BEGIN PLOT /MC_ZJETS/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_TVT1960_ZJETS/jet_pT_2
+# BEGIN PLOT /MC_ZJETS/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_TVT1960_ZJETS/jet_pT_3
+# BEGIN PLOT /MC_ZJETS/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_TVT1960_ZJETS/jet_pT_4
+# BEGIN PLOT /MC_ZJETS/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/Makefile.am
==============================================================================
--- trunk/data/plotinfo/Makefile.am	Thu Dec 10 17:24:19 2009	(r2170)
+++ trunk/data/plotinfo/Makefile.am	Thu Dec 10 18:20:08 2009	(r2171)
@@ -56,16 +56,16 @@
   H1_1995_S3167097.plot \
   H1_2000_S4129130.plot \
   JADE_OPAL_2000_S4300807.plot \
-  MC_LHC_LEADINGJETS.plot \
-  MC_LHC_DIJET.plot \
-  MC_LHC_DIPHOTON.plot \
-  MC_LHC_PHOTONJETUE.plot \
-  MC_LHC_ZANALYSIS.plot \
-  MC_LHC_WANALYSIS.plot \
-  MC_LHC_SUSY.plot \
-  MC_LHC_TTBAR.plot \
-  MC_TVT1960_PHOTONJETS.plot \
-  MC_TVT1960_ZJETS.plot \
+  MC_LEADINGJETS.plot \
+  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_ZJETS.plot \
   OPAL_1998_S3780481.plot \
   OPAL_2004_S6132243.plot \
   PDG_HADRON_MULTIPLICITIES.plot \

Modified: trunk/include/Rivet/Analyses/MC_JetAnalysis.hh
==============================================================================
--- trunk/include/Rivet/Analyses/MC_JetAnalysis.hh	Thu Dec 10 17:24:19 2009	(r2170)
+++ trunk/include/Rivet/Analyses/MC_JetAnalysis.hh	Thu Dec 10 18:20:08 2009	(r2171)
@@ -13,8 +13,9 @@
   public:
 
     /// Default constructor.
-    MC_JetAnalysis(const std::string& name, const double& sqrts,
-                   const size_t& njet, const std::string& jetpro_name);
+    MC_JetAnalysis(const string& name,
+                   const size_t& njet, 
+                   const string& jetpro_name);
 
 
     /// @name Analysis methods
@@ -24,11 +25,10 @@
     virtual void finalize();
     //@}
 
+
   protected:
  
-    /// The energy scale and number of jets for which histograms are to be
-    /// initialised
-    double m_sqrts;
+    /// The number of jets for which histograms are to be initialised
     size_t m_njet;
  
     /// The name of the jet projection to be used for this analysis

Modified: trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc
==============================================================================
--- trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc	Thu Dec 10 17:24:19 2009	(r2170)
+++ trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc	Thu Dec 10 18:20:08 2009	(r2171)
@@ -3,7 +3,6 @@
 #include "Rivet/RivetAIDA.hh"
 #include "Rivet/Projections/FastJets.hh"
 #include "Rivet/Projections/FinalState.hh"
-#include "Rivet/Projections/Beam.hh"
 
 namespace Rivet {
 
@@ -11,23 +10,15 @@
   /**
    * @brief Jet rates in e+e- at OPAL and JADE
    * @author Frank Siegert
-   *
-   * @par Run conditions
-   *
-   * @arg LEP1 beam energy: \f$ \sqrt{s} = \$f 91.2 GeV
-   * @arg Run with generic QCD events.
    */
   class JADE_OPAL_2000_S4300807 : public Analysis {
-
   public:
 
     /// @name Constructors etc.
     //@{
 
     /// Constructor
-    JADE_OPAL_2000_S4300807() : Analysis("JADE_OPAL_2000_S4300807"),
-        _initialised(false)
-    {
+    JADE_OPAL_2000_S4300807() : Analysis("JADE_OPAL_2000_S4300807") {
       setBeams(ELECTRON, POSITRON);
     }
  
@@ -38,52 +29,47 @@
     //@{
 
     void init() {
-      addProjection(Beam(), "Beams");
+      // Projections
       const FinalState fs;
       addProjection(fs, "FS");
       addProjection(FastJets(fs, FastJets::JADE, 0.7), "JadeJets");
       addProjection(FastJets(fs, FastJets::DURHAM, 0.7), "DurhamJets");
+
+      // Histos
+      int offset = 0;
+      switch (int(sqrtS()/GeV + 0.5)) {
+      case 35: offset = 7; break;
+      case 44: offset = 8; break;
+      case 91: offset = 9; break;
+      case 133: offset = 10; break;
+      case 161: offset = 11; break;
+      case 172: offset = 12; break;
+      case 183: offset = 13; break;
+      case 189: offset = 14; break;
+      default:
+        getLog() << Log::ERROR
+                 << "CMS energy of events sqrt(s) = " << sqrtS()/GeV
+                 <<" doesn't match any available analysis energy." << endl;
+        /// @todo Really call exit()? I don't like the break of "command chain" that this implies
+        exit(1);
+      }
+      for (size_t i = 0; i < 5; ++i) {
+        _h_R_Jade[i] = bookDataPointSet(offset, 1, i+1);
+        _h_R_Durham[i] = bookDataPointSet(offset+9, 1, i+1);
+        if (i < 4) _h_y_Durham[i] = bookHistogram1D(offset+17, 1, i+1);
+      }
     }
 
 
 
     void analyze(const Event& e) {
-   
-      // Which CMS energy are we running at?
-      if (!_initialised) {
-        const double sqrts = applyProjection<Beam>(e, "Beams").sqrtS()/GeV;
-        int offset(0);
-        switch (int(sqrts+0.5)) {
-        case 35: offset = 7; break;
-        case 44: offset = 8; break;
-        case 91: offset = 9; break;
-        case 133: offset = 10; break;
-        case 161: offset = 11; break;
-        case 172: offset = 12; break;
-        case 183: offset = 13; break;
-        case 189: offset = 14; break;
-        default:
-          getLog() << Log::ERROR
-              << "CMS energy of events sqrt(s) = " << sqrts
-              <<" doesn't match any available analysis energy." << endl;
-          /// @todo Really call exit()? I don't like the break of "command chain" that this implies
-          exit(1);
-        }
-        for (size_t i=0; i<5; ++i) {
-          _h_R_Jade[i]=bookDataPointSet(offset, 1, i+1);
-          _h_R_Durham[i]=bookDataPointSet(offset+9, 1, i+1);
-          if (i<4)_h_y_Durham[i]=bookHistogram1D(offset+17, 1, i+1);
-        }
-        _initialised = true;
-      }
-     
-   
       // Jets
       getLog() << Log::DEBUG << "Using FastJet JADE patch to make diff jet rate plots:" << endl;
       const double weight = e.weight();
    
       const FastJets& jadejet = applyProjection<FastJets>(e, "JadeJets");
       if (jadejet.clusterSeq()) {
+        /// @todo Put this in an index loop?
         double y_23 = jadejet.clusterSeq()->exclusive_ymerge(2);
         double y_34 = jadejet.clusterSeq()->exclusive_ymerge(3);
         double y_45 = jadejet.clusterSeq()->exclusive_ymerge(4);
@@ -127,6 +113,7 @@
    
       const FastJets& durjet = applyProjection<FastJets>(e, "DurhamJets");
       if (durjet.clusterSeq()) {
+        /// @todo Put this in an index loop?
         double y_23 = durjet.clusterSeq()->exclusive_ymerge(2);
         double y_34 = durjet.clusterSeq()->exclusive_ymerge(3);
         double y_45 = durjet.clusterSeq()->exclusive_ymerge(4);
@@ -183,7 +170,7 @@
       }
    
       for (size_t n = 0; n < 5; ++n) {
-        /// scale integrated jet rates to 100%
+        // Scale integrated jet rates to 100%
         for (int i = 0; i < _h_R_Jade[n]->size(); ++i) {
           IDataPoint* dp = _h_R_Jade[n]->point(i);
           dp->coordinate(1)->setValue(dp->coordinate(1)->value()*100.0/sumOfWeights());
@@ -207,8 +194,6 @@
     AIDA::IHistogram1D *_h_y_Durham[4];
     //@}
 
-    bool _initialised;
-
   };
 
 

Copied and modified: trunk/src/Analyses/MC_DIJET.cc (from r2168, trunk/src/Analyses/MC_LHC_DIJET.cc)
==============================================================================
--- trunk/src/Analyses/MC_LHC_DIJET.cc	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/src/Analyses/MC_DIJET.cc	Thu Dec 10 18:20:08 2009	(r2171)
@@ -8,13 +8,12 @@
 namespace Rivet {
 
 
-  class MC_LHC_DIJET : public Analysis {
+  class MC_DIJET : public Analysis {
   public:
 
     /// Default constructor
-    MC_LHC_DIJET()
-      : Analysis("MC_LHC_DIJET") {
-    }
+    MC_DIJET() : Analysis("MC_DIJET") 
+    {    }
  
  
     /// @name Analysis methods
@@ -115,6 +114,6 @@
 
 
   // This global object acts as a hook for the plugin system
-  AnalysisBuilder<MC_LHC_DIJET> plugin_MC_LHC_DIJET;
+  AnalysisBuilder<MC_DIJET> plugin_MC_DIJET;
 
 }

Copied and modified: trunk/src/Analyses/MC_DIPHOTON.cc (from r2168, trunk/src/Analyses/MC_LHC_DIPHOTON.cc)
==============================================================================
--- trunk/src/Analyses/MC_LHC_DIPHOTON.cc	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/src/Analyses/MC_DIPHOTON.cc	Thu Dec 10 18:20:08 2009	(r2171)
@@ -8,11 +8,11 @@
 namespace Rivet {
 
 
-  class MC_LHC_DIPHOTON : public Analysis {
+  class MC_DIPHOTON : public Analysis {
   public:
 
     /// Constructor
-    MC_LHC_DIPHOTON() : Analysis("MC_LHC_DIPHOTON") {
+    MC_DIPHOTON() : Analysis("MC_DIPHOTON") {
       setNeedsCrossSection(true);
     }
 
@@ -96,7 +96,7 @@
 
 
   // This global object acts as a hook for the plugin system
-  AnalysisBuilder<MC_LHC_DIPHOTON> plugin_MC_LHC_DIPHOTON;
+  AnalysisBuilder<MC_DIPHOTON> plugin_MC_DIPHOTON;
 
 }
 

Modified: trunk/src/Analyses/MC_JetAnalysis.cc
==============================================================================
--- trunk/src/Analyses/MC_JetAnalysis.cc	Thu Dec 10 17:24:19 2009	(r2170)
+++ trunk/src/Analyses/MC_JetAnalysis.cc	Thu Dec 10 18:20:08 2009	(r2171)
@@ -7,9 +7,10 @@
 namespace Rivet {
 
 
-  MC_JetAnalysis::MC_JetAnalysis(const std::string& name, const double& sqrts,
-                                 const size_t& njet, const std::string& jetpro_name)
-    : Analysis(name), m_sqrts(sqrts), m_njet(njet), m_jetpro_name(jetpro_name),
+  MC_JetAnalysis::MC_JetAnalysis(const string& name,
+                                 const size_t& njet, 
+                                 const string& jetpro_name)
+    : Analysis(name), m_njet(njet), m_jetpro_name(jetpro_name),
     _h_log10_d(njet, NULL), _h_log10_R(njet+1, NULL), _h_pT_jet(njet, NULL),
     _h_eta_jet(njet, NULL)
   {
@@ -32,7 +33,7 @@
    
       stringstream pTname;
       pTname<<"jet_pT_"<<i+1;
-      double pTmax = 1.0/(double(i)+2.0)*m_sqrts/2.0;
+      double pTmax = 1.0/(double(i)+2.0)*sqrtS()/GeV/2.0;
       int nbins = 100/(i+1);
       _h_pT_jet[i] = bookHistogram1D(pTname.str(), nbins, 0.0, pTmax);
    

Copied and modified: trunk/src/Analyses/MC_LEADINGJETS.cc (from r2168, trunk/src/Analyses/MC_LHC_LEADINGJETS.cc)
==============================================================================
--- trunk/src/Analyses/MC_LHC_LEADINGJETS.cc	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/src/Analyses/MC_LEADINGJETS.cc	Thu Dec 10 18:20:08 2009	(r2171)
@@ -12,15 +12,13 @@
   /* Underlying event in leading jet, extended to the LHC
    * @author Andy Buckley
    */
-  class MC_LHC_LEADINGJETS : public Analysis {
+  class MC_LEADINGJETS : public Analysis {
   public:
  
     /// Constructor
-    MC_LHC_LEADINGJETS()
-      : Analysis("MC_LHC_LEADINGJETS")
-    {
-      setBeams(PROTON, PROTON);
-    }
+    MC_LEADINGJETS()
+      : Analysis("MC_LEADINGJETS")
+    {    }
  
  
     /// @name Analysis methods
@@ -168,6 +166,6 @@
 
 
   // This global object acts as a hook for the plugin system
-  AnalysisBuilder<MC_LHC_LEADINGJETS> plugin_MC_LHC_LEADINGJETS;
+  AnalysisBuilder<MC_LEADINGJETS> plugin_MC_LEADINGJETS;
 
 }

Copied and modified: trunk/src/Analyses/MC_PHOTONJETS.cc (from r2168, trunk/src/Analyses/MC_TVT1960_PHOTONJETS.cc)
==============================================================================
--- trunk/src/Analyses/MC_TVT1960_PHOTONJETS.cc	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/src/Analyses/MC_PHOTONJETS.cc	Thu Dec 10 18:20:08 2009	(r2171)
@@ -7,14 +7,13 @@
 
 namespace Rivet {
 
-  class MC_TVT1960_PHOTONJETS : public MC_JetAnalysis {
+  class MC_PHOTONJETS : public MC_JetAnalysis {
   public:
  
     /// Default constructor
-    MC_TVT1960_PHOTONJETS()
-      : MC_JetAnalysis("MC_TVT1960_PHOTONJETS", 1960.0, 4, "Jets")
+    MC_PHOTONJETS()
+      : MC_JetAnalysis("MC_PHOTONJETS", 4, "Jets")
     {
-      setBeams(PROTON, ANTIPROTON);
       setNeedsCrossSection(true);
     }
  
@@ -51,9 +50,7 @@
  
 
     /// Do the analysis
-    void analyze(const Event& e) {
-      const double weight = e.weight();
- 
+    void analyze(const Event& e) { 
       // Get the photon
       const ParticleVector photons = applyProjection<FinalState>(e, "LeadingPhoton").particles();
       if (photons.size() != 1) {
@@ -66,6 +63,9 @@
       if (fs.empty()) {
         vetoEvent;
       }
+
+      // Passed cuts, so get the weight
+      const double weight = e.weight();
    
       // Isolate photon by ensuring that a 0.4 cone around it contains less than 7% of the photon's energy
       const double egamma = photon.E();
@@ -97,11 +97,11 @@
  
     // Finalize
     void finalize() {
-      scale(_h_photon_pT, crossSection()/sumOfWeights());
-      scale(_h_photon_y, crossSection()/sumOfWeights());
-      scale(_h_photon_jet1_deta, crossSection()/sumOfWeights());
-      scale(_h_photon_jet1_dphi, crossSection()/sumOfWeights());
-      scale(_h_photon_jet1_dR, crossSection()/sumOfWeights());
+      scale(_h_photon_pT, crossSectionPerEvent());
+      scale(_h_photon_y, crossSectionPerEvent());
+      scale(_h_photon_jet1_deta, crossSectionPerEvent());
+      scale(_h_photon_jet1_dphi, crossSectionPerEvent());
+      scale(_h_photon_jet1_dR, crossSectionPerEvent());
    
       MC_JetAnalysis::finalize();
     }
@@ -125,6 +125,6 @@
  
 
   // This global object acts as a hook for the plugin system
-  AnalysisBuilder<MC_TVT1960_PHOTONJETS> plugin_MC_TVT1960_PHOTONJETS;
+  AnalysisBuilder<MC_PHOTONJETS> plugin_MC_PHOTONJETS;
 
 }

Copied and modified: trunk/src/Analyses/MC_PHOTONJETUE.cc (from r2168, trunk/src/Analyses/MC_LHC_PHOTONJETUE.cc)
==============================================================================
--- trunk/src/Analyses/MC_LHC_PHOTONJETUE.cc	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/src/Analyses/MC_PHOTONJETUE.cc	Thu Dec 10 18:20:08 2009	(r2171)
@@ -12,15 +12,13 @@
   /* Underlying event in jet + isolated photon events
    * @author Andy Buckley
    */
-  class MC_LHC_PHOTONJETUE : public Analysis {
+  class MC_PHOTONJETUE : public Analysis {
   public:
  
     /// Constructor
-    MC_LHC_PHOTONJETUE()
-      : Analysis("MC_LHC_PHOTONJETUE")
-    {
-      setBeams(PROTON, PROTON);
-    }
+    MC_PHOTONJETUE()
+      : Analysis("MC_PHOTONJETUE")
+    {    }
  
  
     /// @name Analysis methods
@@ -258,6 +256,6 @@
 
 
   // This global object acts as a hook for the plugin system
-  AnalysisBuilder<MC_LHC_PHOTONJETUE> plugin_MC_LHC_PHOTONJETUE;
+  AnalysisBuilder<MC_PHOTONJETUE> plugin_MC_PHOTONJETUE;
 
 }

Copied and modified: trunk/src/Analyses/MC_SUSY.cc (from r2168, trunk/src/Analyses/MC_LHC_SUSY.cc)
==============================================================================
--- trunk/src/Analyses/MC_LHC_SUSY.cc	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/src/Analyses/MC_SUSY.cc	Thu Dec 10 18:20:08 2009	(r2171)
@@ -16,15 +16,13 @@
   /* Basic SUSY type validation analysis for the LHC
    * @author Andy Buckley
    */
-  class MC_LHC_SUSY : public Analysis {
+  class MC_SUSY : public Analysis {
   public:
  
     /// Constructor
-    MC_LHC_SUSY()
-      : Analysis("MC_LHC_SUSY")
-    {
-      setBeams(PROTON, PROTON);
-    }
+    MC_SUSY()
+      : Analysis("MC_SUSY")
+    {    }
  
  
     /// @name Analysis methods
@@ -318,6 +316,6 @@
 
 
   // This global object acts as a hook for the plugin system
-  AnalysisBuilder<MC_LHC_SUSY> plugin_MC_LHC_SUSY;
+  AnalysisBuilder<MC_SUSY> plugin_MC_SUSY;
 
 }

Copied and modified: trunk/src/Analyses/MC_TTBAR.cc (from r2168, trunk/src/Analyses/MC_LHC_TTBAR.cc)
==============================================================================
--- trunk/src/Analyses/MC_LHC_TTBAR.cc	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/src/Analyses/MC_TTBAR.cc	Thu Dec 10 18:20:08 2009	(r2171)
@@ -8,22 +8,17 @@
 namespace Rivet {
 
 
-  class MC_LHC_TTBAR : public Analysis {
+  class MC_TTBAR : public Analysis {
   public:
 
     /// @name Constructors etc.
     //@{
 
     /// Constructor
-    MC_LHC_TTBAR()
-      : Analysis("MC_LHC_TTBAR")
+    MC_TTBAR()
+      : Analysis("MC_TTBAR")
     {
-      /// @todo Set approriate for your analysis
-      setBeams(PROTON, PROTON);
-   
-      /// @todo Set whether your finalize method needs the generator cross section
-      setNeedsCrossSection(false);
-
+      //setNeedsCrossSection(false);
     }
 
     //@}
@@ -41,7 +36,7 @@
       addProjection(cfs, "CFS");
 
       /// @todo Book histograms here, e.g.:
-       _histPseudorapidity = bookHistogram1D("pseudorap", 20, -5.0, 5.0);
+      _hist_nch_eta = bookHistogram1D("nch-eta", 20, -5.0, 5.0);
 
     }
 
@@ -53,16 +48,15 @@
    
       foreach (const Particle& p, cfs.particles()) {
         double eta = p.momentum().pseudorapidity();
-        _histPseudorapidity->fill(eta, weight);
-     }
+        _hist_nch_eta->fill(eta, weight);
+      }
 
     }
 
 
     /// Normalise histograms etc., after the run
     void finalize() {
-    scale(_histPseudorapidity, 1.0/sumOfWeights());
-   
+      scale(_hist_nch_eta, 1.0/sumOfWeights());
     }
 
 
@@ -70,8 +64,7 @@
 
     /// @name Histograms
     //@{
-
-    AIDA::IHistogram1D *_histPseudorapidity;
+    AIDA::IHistogram1D* _hist_nch_eta;
     //@}
 
   };
@@ -79,7 +72,7 @@
 
 
   // This global object acts as a hook for the plugin system
-  AnalysisBuilder<MC_LHC_TTBAR> plugin_MC_LHC_TTBAR;
+  AnalysisBuilder<MC_TTBAR> plugin_MC_TTBAR;
 
 
 }

Copied and modified: trunk/src/Analyses/MC_WANALYSIS.cc (from r2168, trunk/src/Analyses/MC_LHC_WANALYSIS.cc)
==============================================================================
--- trunk/src/Analyses/MC_LHC_WANALYSIS.cc	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/src/Analyses/MC_WANALYSIS.cc	Thu Dec 10 18:20:08 2009	(r2171)
@@ -9,11 +9,11 @@
 namespace Rivet {
 
 
-  class MC_LHC_WANALYSIS : public Analysis {
+  class MC_WANALYSIS : public Analysis {
   public:
 
     /// Default constructor
-    MC_LHC_WANALYSIS() : Analysis("MC_LHC_WANALYSIS")
+    MC_WANALYSIS() : Analysis("MC_WANALYSIS")
     {
       setNeedsCrossSection(true);
     }
@@ -185,6 +185,6 @@
 
 
   // This global object acts as a hook for the plugin system
-  AnalysisBuilder<MC_LHC_WANALYSIS> plugin_MC_LHC_WANALYSIS;
+  AnalysisBuilder<MC_WANALYSIS> plugin_MC_WANALYSIS;
 
 }

Copied and modified: trunk/src/Analyses/MC_ZANALYSIS.cc (from r2168, trunk/src/Analyses/MC_LHC_ZANALYSIS.cc)
==============================================================================
--- trunk/src/Analyses/MC_LHC_ZANALYSIS.cc	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/src/Analyses/MC_ZANALYSIS.cc	Thu Dec 10 18:20:08 2009	(r2171)
@@ -9,11 +9,11 @@
 namespace Rivet {
 
 
-  class MC_LHC_ZANALYSIS : public Analysis {
+  class MC_ZANALYSIS : public Analysis {
   public:
 
     /// Default constructor
-    MC_LHC_ZANALYSIS() : Analysis("MC_LHC_ZANALYSIS")
+    MC_ZANALYSIS() : Analysis("MC_ZANALYSIS")
     {
       setNeedsCrossSection(true);
     }
@@ -137,6 +137,6 @@
 
 
   // This global object acts as a hook for the plugin system
-  AnalysisBuilder<MC_LHC_ZANALYSIS> plugin_MC_LHC_ZANALYSIS;
+  AnalysisBuilder<MC_ZANALYSIS> plugin_MC_ZANALYSIS;
 
 }

Copied and modified: trunk/src/Analyses/MC_ZJETS.cc (from r2168, trunk/src/Analyses/MC_TVT1960_ZJETS.cc)
==============================================================================
--- trunk/src/Analyses/MC_TVT1960_ZJETS.cc	Thu Dec 10 16:41:31 2009	(r2168, copy source)
+++ trunk/src/Analyses/MC_ZJETS.cc	Thu Dec 10 18:20:08 2009	(r2171)
@@ -9,15 +9,14 @@
 
   /// @brief Monte Carlo validation observables for Z[e+ e-] + jets production at Tevatron Run II
   /// @author Frank Siegert
-  class MC_TVT1960_ZJETS : public MC_JetAnalysis {
+  class MC_ZJETS : public MC_JetAnalysis {
 
   public:
 
     /// Default constructor
-    MC_TVT1960_ZJETS()
-      : MC_JetAnalysis("MC_TVT1960_ZJETS", 1960.0, 4, "Jets")
+    MC_ZJETS()
+      : MC_JetAnalysis("MC_ZJETS", 4, "Jets")
     {
-      setBeams(PROTON, ANTIPROTON);
       setNeedsCrossSection(true);
     }
  
@@ -46,13 +45,12 @@
 
  
     /// Do the analysis
-    void analyze(const Event & e) {
-      const double weight = e.weight();
-   
+    void analyze(const Event & e) {   
       const ZFinder& zfinder = applyProjection<ZFinder>(e, "ZFinder");
       if (zfinder.particles().size()!=1) {
         vetoEvent;
       }
+      const double weight = e.weight();
    
       FourMomentum zmom(zfinder.particles()[0].momentum());
       _h_Z_mass->fill(zmom.mass(),weight);
@@ -108,6 +106,6 @@
 
 
   // This global object acts as a hook for the plugin system
-  AnalysisBuilder<MC_TVT1960_ZJETS> plugin_MC_TVT1960_ZJETS;
+  AnalysisBuilder<MC_ZJETS> plugin_MC_ZJETS;
 
 }

Modified: trunk/src/Analyses/Makefile.am
==============================================================================
--- trunk/src/Analyses/Makefile.am	Thu Dec 10 17:24:19 2009	(r2170)
+++ trunk/src/Analyses/Makefile.am	Thu Dec 10 18:20:08 2009	(r2171)
@@ -28,9 +28,9 @@
     DELPHI_2003_WUD_03_11.cc \
     E735_1998_S3905616.cc \
     H1_1995_S3167097.cc \
-    MC_LHC_DIJET.cc \
-    MC_LHC_PHOTONJETUE.cc \
-    MC_LHC_TTBAR.cc \
+    MC_DIJET.cc \
+    MC_PHOTONJETUE.cc \
+    MC_TTBAR.cc \
     SFM_1984_S1178091.cc \
     STAR_2008_S7993412.cc \
     UA1_1990_S2044935.cc \
@@ -123,10 +123,10 @@
 RivetMCAnalyses_la_SOURCES = \
     ExampleAnalysis.cc \
     MC_JetAnalysis.cc \
-    MC_TVT1960_PHOTONJETS.cc \
-    MC_TVT1960_ZJETS.cc \
-    MC_LHC_LEADINGJETS.cc \
-    MC_LHC_DIPHOTON.cc \
-    MC_LHC_WANALYSIS.cc \
-    MC_LHC_ZANALYSIS.cc \
-    MC_LHC_SUSY.cc
+    MC_PHOTONJETS.cc \
+    MC_ZJETS.cc \
+    MC_LEADINGJETS.cc \
+    MC_DIPHOTON.cc \
+    MC_WANALYSIS.cc \
+    MC_ZANALYSIS.cc \
+    MC_SUSY.cc
Previous message: [Rivet-svn] r2170 - trunk/data/anainfo
Next message: [Rivet-svn] r2172 - trunk/pyext
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Rivet-svn mailing list