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

blackhole at projects.hepforge.org blackhole at projects.hepforge.org
Fri Jan 25 15:46:07 GMT 2013


Author: fsiegert
Date: Fri Jan 25 15:46:06 2013
New Revision: 4109

Log:
svn merge -r4104:4108 $REPO/rivet/branches/2012-06-aidarivet .
(Split MC_*JETS analyses into three separate bits.)

Added:
   trunk/data/anainfo/MC_HINC.info
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/anainfo/MC_HINC.info
   trunk/data/anainfo/MC_HKTSPLITTINGS.info
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/anainfo/MC_HKTSPLITTINGS.info
   trunk/data/anainfo/MC_KTSPLITTINGS.info
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/anainfo/MC_KTSPLITTINGS.info
   trunk/data/anainfo/MC_PHOTONINC.info
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/anainfo/MC_PHOTONINC.info
   trunk/data/anainfo/MC_PHOTONKTSPLITTINGS.info
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/anainfo/MC_PHOTONKTSPLITTINGS.info
   trunk/data/anainfo/MC_WINC.info
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/anainfo/MC_WINC.info
   trunk/data/anainfo/MC_WKTSPLITTINGS.info
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/anainfo/MC_WKTSPLITTINGS.info
   trunk/data/anainfo/MC_WWINC.info
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/anainfo/MC_WWINC.info
   trunk/data/anainfo/MC_WWKTSPLITTINGS.info
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/anainfo/MC_WWKTSPLITTINGS.info
   trunk/data/anainfo/MC_ZINC.info
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/anainfo/MC_ZINC.info
   trunk/data/anainfo/MC_ZKTSPLITTINGS.info
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/anainfo/MC_ZKTSPLITTINGS.info
   trunk/data/anainfo/MC_ZZINC.info
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/anainfo/MC_ZZINC.info
   trunk/data/anainfo/MC_ZZKTSPLITTINGS.info
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/anainfo/MC_ZZKTSPLITTINGS.info
   trunk/data/plotinfo/MC_HINC.plot
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_HINC.plot
   trunk/data/plotinfo/MC_HKTSPLITTINGS.plot
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_HKTSPLITTINGS.plot
   trunk/data/plotinfo/MC_KTSPLITTINGS.plot
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_KTSPLITTINGS.plot
   trunk/data/plotinfo/MC_PHOTONINC.plot
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_PHOTONINC.plot
   trunk/data/plotinfo/MC_PHOTONKTSPLITTINGS.plot
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_PHOTONKTSPLITTINGS.plot
   trunk/data/plotinfo/MC_WINC.plot
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_WINC.plot
   trunk/data/plotinfo/MC_WKTSPLITTINGS.plot
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_WKTSPLITTINGS.plot
   trunk/data/plotinfo/MC_WWINC.plot
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_WWINC.plot
   trunk/data/plotinfo/MC_WWKTSPLITTINGS.plot
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_WWKTSPLITTINGS.plot
   trunk/data/plotinfo/MC_ZINC.plot
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_ZINC.plot
   trunk/data/plotinfo/MC_ZKTSPLITTINGS.plot
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_ZKTSPLITTINGS.plot
   trunk/data/plotinfo/MC_ZZINC.plot
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_ZZINC.plot
   trunk/data/plotinfo/MC_ZZKTSPLITTINGS.plot
      - copied unchanged from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_ZZKTSPLITTINGS.plot
   trunk/include/Rivet/Analyses/MC_JetSplittings.hh
      - copied, changed from r4107, branches/2012-06-aidarivet/include/Rivet/Analyses/MC_JetSplittings.hh
   trunk/src/Analyses/MC_HINC.cc
      - copied, changed from r4107, branches/2012-06-aidarivet/src/Analyses/MC_HINC.cc
   trunk/src/Analyses/MC_HKTSPLITTINGS.cc
      - copied, changed from r4107, branches/2012-06-aidarivet/src/Analyses/MC_HKTSPLITTINGS.cc
   trunk/src/Analyses/MC_JetSplittings.cc
      - copied, changed from r4107, branches/2012-06-aidarivet/src/Analyses/MC_JetSplittings.cc
   trunk/src/Analyses/MC_KTSPLITTINGS.cc
      - copied, changed from r4107, branches/2012-06-aidarivet/src/Analyses/MC_KTSPLITTINGS.cc
   trunk/src/Analyses/MC_PHOTONINC.cc
      - copied, changed from r4107, branches/2012-06-aidarivet/src/Analyses/MC_PHOTONINC.cc
   trunk/src/Analyses/MC_PHOTONKTSPLITTINGS.cc
      - copied, changed from r4107, branches/2012-06-aidarivet/src/Analyses/MC_PHOTONKTSPLITTINGS.cc
   trunk/src/Analyses/MC_WINC.cc
      - copied, changed from r4107, branches/2012-06-aidarivet/src/Analyses/MC_WINC.cc
   trunk/src/Analyses/MC_WKTSPLITTINGS.cc
      - copied, changed from r4107, branches/2012-06-aidarivet/src/Analyses/MC_WKTSPLITTINGS.cc
   trunk/src/Analyses/MC_WWINC.cc
      - copied, changed from r4107, branches/2012-06-aidarivet/src/Analyses/MC_WWINC.cc
   trunk/src/Analyses/MC_WWKTSPLITTINGS.cc
      - copied, changed from r4107, branches/2012-06-aidarivet/src/Analyses/MC_WWKTSPLITTINGS.cc
   trunk/src/Analyses/MC_ZINC.cc
      - copied, changed from r4107, branches/2012-06-aidarivet/src/Analyses/MC_ZINC.cc
   trunk/src/Analyses/MC_ZKTSPLITTINGS.cc
      - copied, changed from r4107, branches/2012-06-aidarivet/src/Analyses/MC_ZKTSPLITTINGS.cc
   trunk/src/Analyses/MC_ZZINC.cc
      - copied, changed from r4107, branches/2012-06-aidarivet/src/Analyses/MC_ZZINC.cc
   trunk/src/Analyses/MC_ZZKTSPLITTINGS.cc
      - copied, changed from r4107, branches/2012-06-aidarivet/src/Analyses/MC_ZZKTSPLITTINGS.cc
Modified:
   trunk/ChangeLog
   trunk/data/anainfo/MC_WJETS.info
   trunk/data/anainfo/Makefile.am
   trunk/data/plotinfo/MC_HJETS.plot
   trunk/data/plotinfo/MC_JETS.plot
   trunk/data/plotinfo/MC_PHOTONJETS.plot
   trunk/data/plotinfo/MC_WJETS.plot
   trunk/data/plotinfo/MC_WWJETS.plot
   trunk/data/plotinfo/MC_ZJETS.plot
   trunk/data/plotinfo/MC_ZZJETS.plot
   trunk/data/plotinfo/Makefile.am
   trunk/include/Rivet/Analyses/MC_JetAnalysis.hh
   trunk/include/Rivet/Makefile.am
   trunk/include/Rivet/Projections/ZFinder.hh
   trunk/src/Analyses/MC_HJETS.cc
   trunk/src/Analyses/MC_JETS.cc
   trunk/src/Analyses/MC_JetAnalysis.cc
   trunk/src/Analyses/MC_PHOTONJETS.cc
   trunk/src/Analyses/MC_WJETS.cc
   trunk/src/Analyses/MC_WWJETS.cc
   trunk/src/Analyses/MC_ZJETS.cc
   trunk/src/Analyses/MC_ZZJETS.cc
   trunk/src/Analyses/Makefile.am
   trunk/src/Projections/ZFinder.cc

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/ChangeLog	Fri Jan 25 15:46:06 2013	(r4109)
@@ -1,3 +1,10 @@
+2013-01-25  Frank Siegert  <frank.siegert at cern.ch>
+
+	* Split MC_*JETS analyses into three separate bits:
+	MC_*INC (inclusive properties)
+	MC_*JETS (jet properties)
+	MC_*KTSPLITTINGS (kT splitting scales).
+
 2013-01-22  Hendrik Hoeth <hendrik.hoeth at cern.ch>
 
 	* Fix TeX variable in the rivetenv scripts, especially for csh

Copied: trunk/data/anainfo/MC_HINC.info (from r4107, branches/2012-06-aidarivet/data/anainfo/MC_HINC.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/MC_HINC.info	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/anainfo/MC_HINC.info)
@@ -0,0 +1,12 @@
+Name: MC_HINC
+Summary: Monte Carlo validation observables for $h[\tau^+ \, \tau^-]$ production
+Status: VALIDATED
+Authors:
+ - Frank Siegert <frank.siegert at cern.ch>
+RunInfo:
+  $h [\to \tau^+ \tau^-]$.
+NumEvents: 1000000
+PtCuts: [0]
+Description:
+  Monte Carlo validation observables for $h[\tau^+ \, \tau^-]$ production
+NeedCrossSection: yes

Copied: trunk/data/anainfo/MC_HKTSPLITTINGS.info (from r4107, branches/2012-06-aidarivet/data/anainfo/MC_HKTSPLITTINGS.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/MC_HKTSPLITTINGS.info	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/anainfo/MC_HKTSPLITTINGS.info)
@@ -0,0 +1,12 @@
+Name: MC_HKTSPLITTINGS
+Summary: Monte Carlo validation observables for $h[\tau^+ \, \tau^-]$ + jets production
+Status: VALIDATED
+Authors:
+ - Frank Siegert <frank.siegert at cern.ch>
+RunInfo:
+  $h [\to \tau^+ \tau^-]$ + jets.
+NumEvents: 1000000
+PtCuts: [0]
+Description:
+  Monte Carlo validation observables for $h[\tau^+ \, \tau^-]$ + jets production
+NeedCrossSection: yes

Copied: trunk/data/anainfo/MC_KTSPLITTINGS.info (from r4107, branches/2012-06-aidarivet/data/anainfo/MC_KTSPLITTINGS.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/MC_KTSPLITTINGS.info	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/anainfo/MC_KTSPLITTINGS.info)
@@ -0,0 +1,13 @@
+Name: MC_KTSPLITTINGS
+Summary: Monte Carlo validation observables for jet production
+Status: VALIDATED
+Authors:
+ - Frank Siegert <frank.siegert at cern.ch>
+References:
+RunInfo:
+  Pure QCD jet production events at an arbitrary collider.
+NumEvents: 1000000
+PtCuts: [15]
+Description:
+  Monte Carlo validation observables for jet production
+NeedCrossSection: yes

Copied: trunk/data/anainfo/MC_PHOTONINC.info (from r4107, branches/2012-06-aidarivet/data/anainfo/MC_PHOTONINC.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/MC_PHOTONINC.info	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/anainfo/MC_PHOTONINC.info)
@@ -0,0 +1,13 @@
+Name: MC_PHOTONINC
+Summary: Monte Carlo validation observables for single isolated photon production
+Status: VALIDATED
+Authors:
+ - Frank Siegert <frank.siegert at cern.ch>
+References:
+RunInfo:
+  Tevatron Run II ppbar -> gamma + jets.
+NumEvents: 10000000
+PtCuts: [0]
+Description:
+  Monte Carlo validation observables for single isolated photon production
+NeedCrossSection: yes

Copied: trunk/data/anainfo/MC_PHOTONKTSPLITTINGS.info (from r4107, branches/2012-06-aidarivet/data/anainfo/MC_PHOTONKTSPLITTINGS.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/MC_PHOTONKTSPLITTINGS.info	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/anainfo/MC_PHOTONKTSPLITTINGS.info)
@@ -0,0 +1,13 @@
+Name: MC_PHOTONKTSPLITTINGS
+Summary: Monte Carlo validation observables for photon + jets production
+Status: VALIDATED
+Authors:
+ - Frank Siegert <frank.siegert at cern.ch>
+References:
+RunInfo:
+  Tevatron Run II ppbar -> gamma + jets.
+NumEvents: 10000000
+PtCuts: [0]
+Description:
+  Monte Carlo validation observables for photon + jets production
+NeedCrossSection: yes

Copied: trunk/data/anainfo/MC_WINC.info (from r4107, branches/2012-06-aidarivet/data/anainfo/MC_WINC.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/MC_WINC.info	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/anainfo/MC_WINC.info)
@@ -0,0 +1,13 @@
+Name: MC_WINC
+Summary: Monte Carlo validation observables for inclusive $W[e \, \nu]$ production
+Status: VALIDATED
+Authors:
+ - Frank Siegert <frank.siegert at cern.ch>
+References:
+RunInfo:
+  $e \, \nu$ + jets analysis.
+NumEvents: 1000000
+PtCuts: [0]
+Description:
+  Monte Carlo validation observables for inclusive $W[e \, \nu]$ production
+NeedCrossSection: yes

Modified: trunk/data/anainfo/MC_WJETS.info
==============================================================================
--- trunk/data/anainfo/MC_WJETS.info	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/data/anainfo/MC_WJETS.info	Fri Jan 25 15:46:06 2013	(r4109)
@@ -9,8 +9,5 @@
 NumEvents: 1000000
 PtCuts: [0]
 Description:
-  Available observables are W mass, pT of jets 1-4, jet multiplicity,
-  $\Delta\eta(W, \text{jet1})$, $\Delta R(\text{jet2}, \text{jet3})$,
-  differential jet rates 0->1, 1->2, 2->3, 3->4, integrated 0--4 jet
-  rates.
+  Monte Carlo validation observables for $W[e \, \nu]$ + jets production
 NeedCrossSection: yes

Copied: trunk/data/anainfo/MC_WKTSPLITTINGS.info (from r4107, branches/2012-06-aidarivet/data/anainfo/MC_WKTSPLITTINGS.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/MC_WKTSPLITTINGS.info	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/anainfo/MC_WKTSPLITTINGS.info)
@@ -0,0 +1,13 @@
+Name: MC_WKTSPLITTINGS
+Summary: Monte Carlo validation observables for $k_\perp$ splitting scales in $W[e \, \nu]$ + jets events
+Status: VALIDATED
+Authors:
+ - Frank Siegert <frank.siegert at cern.ch>
+References:
+RunInfo:
+  $e \, \nu$ + jets analysis.
+NumEvents: 1000000
+PtCuts: [0]
+Description:
+  Monte Carlo validation observables for $k_\perp$ splitting scales in $W[e \, \nu]$ + jets events
+NeedCrossSection: yes

Copied: trunk/data/anainfo/MC_WWINC.info (from r4107, branches/2012-06-aidarivet/data/anainfo/MC_WWINC.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/MC_WWINC.info	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/anainfo/MC_WWINC.info)
@@ -0,0 +1,13 @@
+Name: MC_WWINC
+Summary: Monte Carlo validation observables for $W^+[e^+ \, \nu]W^-[\mu^- \, \nu]$ production
+Status: VALIDATED
+Authors:
+ - Frank Siegert <frank.siegert at cern.ch>
+References:
+RunInfo:
+  $WW$ analysis.
+NumEvents: 1000000
+PtCuts: [0]
+Description:
+  Monte Carlo validation observables for $W^+[e^+ \, \nu]W^-[\mu^- \, \nu]$ production
+NeedCrossSection: yes

Copied: trunk/data/anainfo/MC_WWKTSPLITTINGS.info (from r4107, branches/2012-06-aidarivet/data/anainfo/MC_WWKTSPLITTINGS.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/MC_WWKTSPLITTINGS.info	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/anainfo/MC_WWKTSPLITTINGS.info)
@@ -0,0 +1,13 @@
+Name: MC_WWKTSPLITTINGS
+Summary: Monte Carlo validation observables for $W^+[e^+ \, \nu]W^-[\mu^- \, \nu]$ + jets production
+Status: VALIDATED
+Authors:
+ - Frank Siegert <frank.siegert at cern.ch>
+References:
+RunInfo:
+  $WW$ + jets analysis.
+NumEvents: 1000000
+PtCuts: [0]
+Description:
+  Monte Carlo validation observables for $W^+[e^+ \, \nu]W^-[\mu^- \, \nu]$ + jets production
+NeedCrossSection: yes

Copied: trunk/data/anainfo/MC_ZINC.info (from r4107, branches/2012-06-aidarivet/data/anainfo/MC_ZINC.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/MC_ZINC.info	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/anainfo/MC_ZINC.info)
@@ -0,0 +1,14 @@
+Name: MC_ZINC
+Summary: Monte Carlo validation observables for $Z[e^+ \, e^-]$ production
+Status: VALIDATED
+Authors:
+ - Frank Siegert <frank.siegert at cern.ch>
+References:
+RunInfo:
+  $e^+ e^-$ analysis. Needs mass cut on lepton pair to avoid
+  photon singularity, e.g. a min range of $66 < m_{ee} < 116$ GeV
+NumEvents: 1000000
+PtCuts: [0]
+Description:
+  Monte Carlo validation observables for $Z[e^+ \, e^-]$ production
+NeedCrossSection: yes

Copied: trunk/data/anainfo/MC_ZKTSPLITTINGS.info (from r4107, branches/2012-06-aidarivet/data/anainfo/MC_ZKTSPLITTINGS.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/MC_ZKTSPLITTINGS.info	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/anainfo/MC_ZKTSPLITTINGS.info)
@@ -0,0 +1,14 @@
+Name: MC_ZKTSPLITTINGS
+Summary: Monte Carlo validation observables for $Z[e^+ \, e^-]$ + jets production
+Status: VALIDATED
+Authors:
+ - Frank Siegert <frank.siegert at cern.ch>
+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
+NumEvents: 1000000
+PtCuts: [0]
+Description:
+  Monte Carlo validation observables for $Z[e^+ \, e^-]$ + jets production
+NeedCrossSection: yes

Copied: trunk/data/anainfo/MC_ZZINC.info (from r4107, branches/2012-06-aidarivet/data/anainfo/MC_ZZINC.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/MC_ZZINC.info	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/anainfo/MC_ZZINC.info)
@@ -0,0 +1,14 @@
+Name: MC_ZZINC
+Summary: Monte Carlo validation observables for $Z[e^+ \, e^-]Z[\mu^+ \, \mu^-]$ production
+Status: VALIDATED
+Authors:
+ - Frank Siegert <frank.siegert at cern.ch>
+References:
+RunInfo:
+  $ZZ$ + jets analysis. Needs mass cut on lepton pairs to avoid
+  photon singularity, e.g. a min range of $66 < m_{ee} < 116$ GeV
+NumEvents: 1000000
+PtCuts: [0]
+Description:
+  Monte Carlo validation observables for $Z[e^+ \, e^-]Z[\mu^+ \, \mu^-]$ production
+NeedCrossSection: yes

Copied: trunk/data/anainfo/MC_ZZKTSPLITTINGS.info (from r4107, branches/2012-06-aidarivet/data/anainfo/MC_ZZKTSPLITTINGS.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/MC_ZZKTSPLITTINGS.info	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/anainfo/MC_ZZKTSPLITTINGS.info)
@@ -0,0 +1,14 @@
+Name: MC_ZZKTSPLITTINGS
+Summary: Monte Carlo validation observables for $Z[e^+ \, e^-]Z[\mu^+ \, \mu^-]$ + jets production
+Status: VALIDATED
+Authors:
+ - Frank Siegert <frank.siegert at cern.ch>
+References:
+RunInfo:
+  $ZZ$ + jets analysis. Needs mass cut on lepton pairs to avoid
+  photon singularity, e.g. a min range of $66 < m_{ee} < 116$ GeV
+NumEvents: 1000000
+PtCuts: [0]
+Description:
+  Monte Carlo validation observables for $Z[e^+ \, e^-]Z[\mu^+ \, \mu^-]$ + jets production
+NeedCrossSection: yes

Modified: trunk/data/anainfo/Makefile.am
==============================================================================
--- trunk/data/anainfo/Makefile.am	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/data/anainfo/Makefile.am	Fri Jan 25 15:46:06 2013	(r4109)
@@ -169,24 +169,37 @@
   MC_DIJET.info \
   MC_DIPHOTON.info \
   MC_GENERIC.info \
+  MC_HINC.info \
   MC_HJETS.info \
+  MC_HKTSPLITTINGS.info \
   MC_IDENTIFIED.info \
   MC_JETS.info \
+  MC_KTSPLITTINGS.info \
   MC_LEADJETUE.info \
   MC_PDFS.info \
+  MC_PHOTONINC.info \
   MC_PHOTONJETS.info \
+  MC_PHOTONKTSPLITTINGS.info \
   MC_PHOTONJETUE.info \
   MC_PHOTONS.info \
   MC_PRINTEVENT.info \
   MC_SUSY.info \
   MC_TTBAR.info \
   MC_VH2BB.info \
+  MC_WINC.info \
   MC_WJETS.info \
+  MC_WKTSPLITTINGS.info \
   MC_WPOL.info \
+  MC_WWINC.info \
   MC_WWJETS.info \
+  MC_WWKTSPLITTINGS.info \
   MC_XS.info \
+  MC_ZINC.info \
   MC_ZJETS.info \
+  MC_ZKTSPLITTINGS.info \
+  MC_ZZINC.info \
   MC_ZZJETS.info \
+  MC_ZZKTSPLITTINGS.info \
   OPAL_1993_S2692198.info \
   OPAL_1994_S2927284.info \
   OPAL_1995_S3198391.info \

Copied: trunk/data/plotinfo/MC_HINC.plot (from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_HINC.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/MC_HINC.plot	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/plotinfo/MC_HINC.plot)
@@ -0,0 +1,50 @@
+# BEGIN PLOT /MC_HJETS/H_mass
+Title=Higgs boson mass
+XLabel=$m_{\text{h}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}m_{\text{h}}$ [pb/GeV]
+# END PLOT
+
+# BEGIN PLOT /MC_HJETS/H_pT$
+Title=Higgs boson $p_\perp$
+XLabel=$p_\perp^{\text{h}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{h}}$ [pb/GeV]
+LogX=1
+LegendXPos=0.15
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_HJETS/H_pT_peak
+Title=Higgs boson $p_\perp$ in peak region
+XLabel=$p_\perp^{\text{h}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{h}}$ [pb/GeV]
+LogY=0
+LegendYPos=0.5
+LegendXPos=0.30
+# END PLOT
+
+# BEGIN PLOT /MC_HJETS/H_y
+Title=Higgs boson rapidity
+XLabel=$y_{\text{h}}$
+YLabel=$\text{d}\sigma/\text{d}y_{\text{h}}$ [pb]
+LegendXPos=0.35
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_HJETS/H_phi
+Title=Higgs boson azimuthal angle
+XLabel=$\phi_{\text{h}}$
+YLabel=$\text{d}\sigma/\text{d}\phi_{\text{h}}$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_HJETS/lepton_pT
+Title=Lepton $p_\perp$
+XLabel=$p_\perp^{\text{l}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{l}}$ [pb/GeV]
+LogX=1
+# END PLOT
+
+# BEGIN PLOT /MC_HJETS/lepton_eta
+Title=Lepton $\eta$
+XLabel=$\eta_{\text{l}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}\eta_{\text{l}}$ [pb]
+# END PLOT

Modified: trunk/data/plotinfo/MC_HJETS.plot
==============================================================================
--- trunk/data/plotinfo/MC_HJETS.plot	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/data/plotinfo/MC_HJETS.plot	Fri Jan 25 15:46:06 2013	(r4109)
@@ -10,57 +10,6 @@
 YLabel=$\text{d}\sigma/\text{d}\Delta{\eta}(\text{h, 1st jet})$ [pb]
 # END PLOT
 
-# BEGIN PLOT /MC_HJETS/H_mass
-Title=Higgs boson mass
-XLabel=$m_{\text{h}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}m_{\text{h}}$ [pb/GeV]
-# END PLOT
-
-# BEGIN PLOT /MC_HJETS/H_pT$
-Title=Higgs boson $p_\perp$
-XLabel=$p_\perp^{\text{h}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{h}}$ [pb/GeV]
-LogX=1
-LegendXPos=0.15
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_HJETS/H_pT_peak
-Title=Higgs boson $p_\perp$ in peak region
-XLabel=$p_\perp^{\text{h}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{h}}$ [pb/GeV]
-LogY=0
-LegendYPos=0.5
-LegendXPos=0.30
-# END PLOT
-
-# BEGIN PLOT /MC_HJETS/H_y
-Title=Higgs boson rapidity
-XLabel=$y_{\text{h}}$
-YLabel=$\text{d}\sigma/\text{d}y_{\text{h}}$ [pb]
-LegendXPos=0.35
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_HJETS/H_phi
-Title=Higgs boson azimuthal angle
-XLabel=$\phi_{\text{h}}$
-YLabel=$\text{d}\sigma/\text{d}\phi_{\text{h}}$ [pb]
-# END PLOT
-
-# BEGIN PLOT /MC_HJETS/lepton_pT
-Title=Lepton $p_\perp$
-XLabel=$p_\perp^{\text{l}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{l}}$ [pb/GeV]
-LogX=1
-# END PLOT
-
-# BEGIN PLOT /MC_HJETS/lepton_eta
-Title=Lepton $\eta$
-XLabel=$\eta_{\text{l}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}\eta_{\text{l}}$ [pb]
-# END PLOT
-
 # BEGIN PLOT /MC_HJETS/jets_dR_
 Title=$\Delta R$ separation between jets
 LegendXPos=0.10
@@ -279,79 +228,6 @@
 ErrorBands=1
 # END PLOT
 
-# BEGIN PLOT /MC_HJETS/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}$
-Rebin=2
-LegendYPos=0.8
-LegendXPos=0.75
-# END PLOT
-
-# BEGIN PLOT /MC_HJETS/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_HJETS/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_HJETS/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_HJETS/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_HJETS/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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# BEGIN PLOT /MC_HJETS/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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# BEGIN PLOT /MC_HJETS/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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# BEGIN PLOT /MC_HJETS/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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
 # BEGIN PLOT /MC_HJETS/jet_pT_1
 Title=Transverse momentum of leading jet
 XLabel=$p_\perp(\text{jet 1})$ [GeV]

Copied: trunk/data/plotinfo/MC_HKTSPLITTINGS.plot (from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_HKTSPLITTINGS.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/MC_HKTSPLITTINGS.plot	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/plotinfo/MC_HKTSPLITTINGS.plot)
@@ -0,0 +1,72 @@
+# BEGIN PLOT /MC_HKTSPLITTINGS/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}$
+Rebin=2
+LegendYPos=0.8
+LegendXPos=0.75
+# END PLOT
+
+# BEGIN PLOT /MC_HKTSPLITTINGS/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_HKTSPLITTINGS/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_HKTSPLITTINGS/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_HKTSPLITTINGS/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_HKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_HKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_HKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_HKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT

Modified: trunk/data/plotinfo/MC_JETS.plot
==============================================================================
--- trunk/data/plotinfo/MC_JETS.plot	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/data/plotinfo/MC_JETS.plot	Fri Jan 25 15:46:06 2013	(r4109)
@@ -216,79 +216,6 @@
 ErrorBands=1
 # END PLOT
 
-# BEGIN PLOT /MC_JETS/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}$
-Rebin=2
-LegendYPos=0.8
-LegendXPos=0.75
-# END PLOT
-
-# BEGIN PLOT /MC_JETS/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_JETS/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_JETS/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_JETS/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_JETS/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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# BEGIN PLOT /MC_JETS/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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# BEGIN PLOT /MC_JETS/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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# BEGIN PLOT /MC_JETS/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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
 # BEGIN PLOT /MC_JETS/jet_pT_1
 Title=Transverse momentum of leading jet
 XLabel=$p_\perp(\text{jet 1})$ [GeV]

Copied: trunk/data/plotinfo/MC_KTSPLITTINGS.plot (from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_KTSPLITTINGS.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/MC_KTSPLITTINGS.plot	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/plotinfo/MC_KTSPLITTINGS.plot)
@@ -0,0 +1,72 @@
+# BEGIN PLOT /MC_KTSPLITTINGS/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}$
+Rebin=2
+LegendYPos=0.8
+LegendXPos=0.75
+# END PLOT
+
+# BEGIN PLOT /MC_KTSPLITTINGS/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_KTSPLITTINGS/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_KTSPLITTINGS/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_KTSPLITTINGS/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_KTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_KTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_KTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_KTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT

Copied: trunk/data/plotinfo/MC_PHOTONINC.plot (from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_PHOTONINC.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/MC_PHOTONINC.plot	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/plotinfo/MC_PHOTONINC.plot)
@@ -0,0 +1,18 @@
+# BEGIN PLOT /MC_PHOTONJETS/photon_pT$
+Title=Photon $p_\perp$
+XLabel=$p_\perp^{\gamma}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\gamma}$ [pb/GeV]
+LogX=1
+# END PLOT
+
+# BEGIN PLOT /MC_PHOTONJETS/photon_pT_lin$
+Title=Photon $p_\perp$
+XLabel=$p_\perp^{\gamma}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}y_{\gamma}$ [pb/GeV]
+# END PLOT
+
+# BEGIN PLOT /MC_PHOTONJETS/photon_y
+Title=Photon rapidity
+XLabel=$y_{\gamma}$
+YLabel=$\text{d}\sigma/\text{d}y_{\gamma}$ [pb]
+# END PLOT

Modified: trunk/data/plotinfo/MC_PHOTONJETS.plot
==============================================================================
--- trunk/data/plotinfo/MC_PHOTONJETS.plot	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/data/plotinfo/MC_PHOTONJETS.plot	Fri Jan 25 15:46:06 2013	(r4109)
@@ -16,25 +16,6 @@
 YLabel=$\text{d}\sigma/\text{d}\Delta{\phi}(\gamma\text{, 1st jet})$ [pb]
 # END PLOT
 
-# BEGIN PLOT /MC_PHOTONJETS/photon_pT$
-Title=Photon $p_\perp$
-XLabel=$p_\perp^{\gamma}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}p_\perp^{\gamma}$ [pb/GeV]
-LogX=1
-# END PLOT
-
-# BEGIN PLOT /MC_PHOTONJETS/photon_pT_lin$
-Title=Photon $p_\perp$
-XLabel=$p_\perp^{\gamma}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}y_{\gamma}$ [pb/GeV]
-# END PLOT
-
-# BEGIN PLOT /MC_PHOTONJETS/photon_y
-Title=Photon rapidity
-XLabel=$y_{\gamma}$
-YLabel=$\text{d}\sigma/\text{d}y_{\gamma}$ [pb]
-# END PLOT
-
 # BEGIN PLOT /MC_PHOTONJETS/jets_dR_
 Title=$\Delta R$ separation between jets
 LegendXPos=0.10
@@ -253,79 +234,6 @@
 ErrorBands=1
 # END PLOT
 
-# 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}$
-Rebin=2
-LegendYPos=0.8
-LegendXPos=0.75
-# END PLOT
-
-# 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_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_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_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_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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# 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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# 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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# 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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
 # BEGIN PLOT /MC_PHOTONJETS/jet_pT_1
 Title=Transverse momentum of leading jet
 XLabel=$p_\perp(\text{jet 1})$ [GeV]

Copied: trunk/data/plotinfo/MC_PHOTONKTSPLITTINGS.plot (from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_PHOTONKTSPLITTINGS.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/MC_PHOTONKTSPLITTINGS.plot	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/plotinfo/MC_PHOTONKTSPLITTINGS.plot)
@@ -0,0 +1,72 @@
+# BEGIN PLOT /MC_PHOTONKTSPLITTINGS/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}$
+Rebin=2
+LegendYPos=0.8
+LegendXPos=0.75
+# END PLOT
+
+# BEGIN PLOT /MC_PHOTONKTSPLITTINGS/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_PHOTONKTSPLITTINGS/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_PHOTONKTSPLITTINGS/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_PHOTONKTSPLITTINGS/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_PHOTONKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_PHOTONKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_PHOTONKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_PHOTONKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT

Copied: trunk/data/plotinfo/MC_WINC.plot (from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_WINC.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/MC_WINC.plot	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/plotinfo/MC_WINC.plot)
@@ -0,0 +1,89 @@
+# BEGIN PLOT /MC_WINC/W_chargeasymm_eta
+Title=Charge asymmetry vs. $\eta(\ell)$
+XLabel=$\eta(\ell)$ [GeV]
+YLabel=$(\mathrm{d}\sigma(\ell^+)-\mathrm{d}\sigma(\ell^-))\;/\;(\mathrm{d}\sigma(\ell^+)+\mathrm{d}\sigma(\ell^-))$
+LogY=0
+Scale=1.0
+# END PLOT
+
+# BEGIN PLOT /MC_WINC/W_chargeasymm_pT
+Title=Charge asymmetry vs. $p_\perp(W)$
+XLabel=$p_\perp(W)$ [GeV]
+YLabel=$\mathrm{d}\sigma(W^+)\;/\;\mathrm{d}\sigma(W^-)$
+LogX=1
+LogY=0
+Scale=1.0
+YMin=0.0
+YMax=3.0
+# END PLOT
+
+# BEGIN PLOT /MC_WINC/W_mass
+Title=W mass
+XLabel=$m_{\text{W}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}m_{\text{W}}$ [pb/GeV]
+# END PLOT
+
+# BEGIN PLOT /MC_WINC/W_pT$
+Title=W boson $p_\perp$
+XLabel=$p_\perp^{\text{W}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{W}}$ [pb/GeV]
+LogX=1
+LegendXPos=0.05
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_WINC/W_pT_peak
+Title=W boson $p_\perp$ in peak region
+XLabel=$p_\perp^{\text{W}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{W}}$ [pb/GeV]
+LogY=0
+LogX=0
+LegendYPos=0.5
+LegendXPos=0.30
+# END PLOT
+
+# BEGIN PLOT /MC_WINC/W_y
+Title=W boson rapidity
+XLabel=$y_{\text{W}}$
+YLabel=$\text{d}\sigma/\text{d}y_{\text{W}}$ [pb]
+LegendXPos=0.35
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_WINC/W_phi
+Title=W azimuthal angle
+XLabel=$\phi_{\text{W}}$
+YLabel=$\text{d}\sigma/\text{d}\phi_{\text{W}}$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_WINC/Wplus_pT$
+Title=$p_\perp$ of $W^+$ boson
+XLabel=$p_\perp^{W^+}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{W^+}$ [pb/GeV]
+LogX=1
+LegendXPos=0.05
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_WINC/Wminus_pT$
+Title=$p_\perp$ of $W^-$ boson
+XLabel=$p_\perp^{W^-}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{W^-}$ [pb/GeV]
+LogX=1
+LegendXPos=0.05
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_WINC/lepton_pT
+Title=Lepton $p_\perp$
+XLabel=$p_\perp^{\text{l}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{l}}$ [pb/GeV]
+LogX=1
+# END PLOT
+
+# BEGIN PLOT /MC_WINC/lepton_eta
+Title=Lepton $\eta$
+XLabel=$\eta_{\text{l}}$
+YLabel=$\text{d}\sigma/\text{d}\eta_{\text{l}}$ [pb]
+# END PLOT
+

Modified: trunk/data/plotinfo/MC_WJETS.plot
==============================================================================
--- trunk/data/plotinfo/MC_WJETS.plot	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/data/plotinfo/MC_WJETS.plot	Fri Jan 25 15:46:06 2013	(r4109)
@@ -1,22 +1,3 @@
-# BEGIN PLOT /MC_WJETS/W_chargeasymm_eta
-Title=Charge asymmetry vs. $\eta(\ell)$
-XLabel=$\eta(\ell)$ [GeV]
-YLabel=$(\mathrm{d}\sigma(\ell^+)-\mathrm{d}\sigma(\ell^-))\;/\;(\mathrm{d}\sigma(\ell^+)+\mathrm{d}\sigma(\ell^-))$
-LogY=0
-Scale=1.0
-# END PLOT
-
-# BEGIN PLOT /MC_WJETS/W_chargeasymm_pT
-Title=Charge asymmetry vs. $p_\perp(W)$
-XLabel=$p_\perp(W)$ [GeV]
-YLabel=$\mathrm{d}\sigma(W^+)\;/\;\mathrm{d}\sigma(W^-)$
-LogX=1
-LogY=0
-Scale=1.0
-YMin=0.0
-YMax=3.0
-# END PLOT
-
 # BEGIN PLOT /MC_WJETS/W_jet1_dR
 Title=Separation between W boson and leading jet
 XLabel=$\Delta R(\text{W, 1st jet})$
@@ -31,76 +12,6 @@
 YLabel=$\text{d}\sigma/\text{d}\Delta{\eta}(\text{W, 1st jet})$ [pb]
 # END PLOT
 
-# BEGIN PLOT /MC_WJETS/W_mass
-Title=W mass
-XLabel=$m_{\text{W}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}m_{\text{W}}$ [pb/GeV]
-# END PLOT
-
-# BEGIN PLOT /MC_WJETS/W_pT$
-Title=W boson $p_\perp$
-XLabel=$p_\perp^{\text{W}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{W}}$ [pb/GeV]
-LogX=1
-LegendXPos=0.05
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_WJETS/W_pT_peak
-Title=W boson $p_\perp$ in peak region
-XLabel=$p_\perp^{\text{W}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{W}}$ [pb/GeV]
-LogY=0
-LogX=0
-LegendYPos=0.5
-LegendXPos=0.30
-# END PLOT
-
-# BEGIN PLOT /MC_WJETS/W_y
-Title=W boson rapidity
-XLabel=$y_{\text{W}}$
-YLabel=$\text{d}\sigma/\text{d}y_{\text{W}}$ [pb]
-LegendXPos=0.35
-LegendYPos=0.5
-# 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}}$ [pb]
-# END PLOT
-
-# BEGIN PLOT /MC_WJETS/Wplus_pT$
-Title=$p_\perp$ of $W^+$ boson
-XLabel=$p_\perp^{W^+}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}p_\perp^{W^+}$ [pb/GeV]
-LogX=1
-LegendXPos=0.05
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_WJETS/Wminus_pT$
-Title=$p_\perp$ of $W^-$ boson
-XLabel=$p_\perp^{W^-}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}p_\perp^{W^-}$ [pb/GeV]
-LogX=1
-LegendXPos=0.05
-LegendYPos=0.5
-# 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}}$ [pb/GeV]
-LogX=1
-# END PLOT
-
-# BEGIN PLOT /MC_WJETS/lepton_eta
-Title=Lepton $\eta$
-XLabel=$\eta_{\text{l}}$
-YLabel=$\text{d}\sigma/\text{d}\eta_{\text{l}}$ [pb]
-# END PLOT
-
 # BEGIN PLOT /MC_WJETS/jets_dR_
 Title=$\Delta R$ separation between jets
 LegendXPos=0.10
@@ -319,79 +230,6 @@
 ErrorBands=1
 # END PLOT
 
-# 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}$
-Rebin=2
-LegendYPos=0.8
-LegendXPos=0.75
-# END PLOT
-
-# 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_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_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_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_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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# 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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# 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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# 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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
 # BEGIN PLOT /MC_WJETS/jet_pT_1
 Title=Transverse momentum of leading jet
 XLabel=$p_\perp(\text{jet 1})$ [GeV]

Copied: trunk/data/plotinfo/MC_WKTSPLITTINGS.plot (from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_WKTSPLITTINGS.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/MC_WKTSPLITTINGS.plot	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/plotinfo/MC_WKTSPLITTINGS.plot)
@@ -0,0 +1,72 @@
+# BEGIN PLOT /MC_WKTSPLITTINGS/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}$
+Rebin=2
+LegendYPos=0.8
+LegendXPos=0.75
+# END PLOT
+
+# BEGIN PLOT /MC_WKTSPLITTINGS/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_WKTSPLITTINGS/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_WKTSPLITTINGS/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_WKTSPLITTINGS/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_WKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_WKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_WKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_WKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT

Copied: trunk/data/plotinfo/MC_WWINC.plot (from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_WWINC.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/MC_WWINC.plot	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/plotinfo/MC_WWINC.plot)
@@ -0,0 +1,136 @@
+# BEGIN PLOT /MC_WWJETS/WW_pT$
+Title=Transverse momentum of boson pair
+XLabel=$p_\perp^{\text{WW}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{WW}}$ [pb/GeV]
+LogX=1
+LegendXPos=0.05
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_WWJETS/WW_pT_peak
+Title=Peak region of transverse momentum of boson pair
+XLabel=$p_\perp^{\text{WW}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{WW}}$ [pb/GeV]
+LogY=0
+LegendYPos=0.5
+LegendXPos=0.30
+# END PLOT
+
+# BEGIN PLOT /MC_WWJETS/WW_eta
+Title=Pseudorapidity of boson pair
+XLabel=$\eta_{\text{WW}}$
+YLabel=$\text{d}\sigma/\text{d}\eta_{\text{WW}}$ [pb]
+LegendXPos=0.35
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_WWJETS/WW_phi
+Title=Azimuthal angle of boson pair
+XLabel=$\phi_{\text{WW}}$
+YLabel=$\text{d}\sigma/\text{d}\phi_{\text{WW}}$ [pb]
+LogY=0
+# END PLOT
+
+# BEGIN PLOT /MC_WWJETS/WW_m
+Title=Invariant mass of boson pair
+XLabel=$m_{\text{WW}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}m_{\text{WW}}$ [pb/GeV]
+LogX=1
+LegendXPos=0.05
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_WWJETS/WW_dphi
+Title=Azimuthal angle difference of boson pair
+XLabel=$\Delta\phi_{\text{WW}}$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi_{\text{WW}}$ [pb]
+LegendXPos=0.10
+# END PLOT
+
+# BEGIN PLOT /MC_WWJETS/WW_deta
+Title=Pseudorapidity difference of boson pair
+XLabel=$\Delta\eta_{\text{WW}}$
+YLabel=$\text{d}\sigma/\text{d}\Delta\eta_{\text{WW}}$ [pb]
+LegendXPos=0.35
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_WWJETS/WW_dR
+Title=Separation of boson pair
+XLabel=$\Delta R_{\text{WW}}$
+YLabel=$\text{d}\sigma/\text{d}\Delta R_{\text{WW}}$ [pb]
+LegendXPos=0.35
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_WWJETS/WW_dpT
+Title=Transverse momentum difference of boson pair
+XLabel=$\Delta p_\perp^{\text{WW}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}\Delta p_\perp^{\text{WW}}$ [pb/GeV]
+LogX=1
+LegendXPos=0.05
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_WWJETS/WW_costheta_planes
+Title=Angle between the boson decay planes
+XLabel=$\cos(\Psi_{\text{e}\nu,\mu\nu})$
+YLabel=$\text{d}\sigma/\text{d}\cos(\Psi_{\text{e}\nu,\mu\nu})$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_WWJETS/W_pT
+Title=W $p_\perp$
+XLabel=$p_\perp^{\text{W}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{W}}$ [pb/GeV]
+LogX=1
+LegendXPos=0.05
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_WWJETS/W_eta
+Title=W pseudorapidity
+XLabel=$\eta_{\text{W}}$
+YLabel=$\text{d}\sigma/\text{d}\eta_{\text{W}}$ [pb]
+LegendXPos=0.35
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_WWJETS/Wl_pT
+Title=Lepton $p_\perp$
+XLabel=$p_\perp^{\text{l}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{l}}$ [pb/GeV]
+LogX=1
+# END PLOT
+
+# BEGIN PLOT /MC_WWJETS/Wl_eta
+Title=Lepton $\eta$
+XLabel=$\eta_{\text{l}}$
+YLabel=$\text{d}\sigma/\text{d}\eta_{\text{l}}$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_WWJETS/WeWm_dphi
+Title=Azimuthal angle difference between oppositely charged leptons
+XLabel=$\Delta\phi_{e^+,\mu^-}$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi$ [pb]
+LegendXPos=0.10
+# END PLOT
+
+# BEGIN PLOT /MC_WWJETS/WeWm_deta
+Title=Pseudorapidity difference between oppositely charged leptons
+XLabel=$\Delta\eta_{e^+,\mu^-}$
+YLabel=$\text{d}\sigma/\text{d}\Delta\eta$ [pb]
+LegendXPos=0.30
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_WWJETS/WeWm_dR
+Title=Separation between oppositely charged leptons
+XLabel=$\Delta R_{e^+,\mu^-}$
+YLabel=$\text{d}\sigma/\text{d}\Delta R$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_WWJETS/WeWm_m
+Title=Invariant mass of oppositely charged leptons
+XLabel=$m_{e^+,\mu^-}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}m$ [pb/GeV]
+# END PLOT

Modified: trunk/data/plotinfo/MC_WWJETS.plot
==============================================================================
--- trunk/data/plotinfo/MC_WWJETS.plot	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/data/plotinfo/MC_WWJETS.plot	Fri Jan 25 15:46:06 2013	(r4109)
@@ -1,140 +1,3 @@
-# BEGIN PLOT /MC_WWJETS/WW_pT$
-Title=Transverse momentum of boson pair
-XLabel=$p_\perp^{\text{WW}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{WW}}$ [pb/GeV]
-LogX=1
-LegendXPos=0.05
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/WW_pT_peak
-Title=Peak region of transverse momentum of boson pair
-XLabel=$p_\perp^{\text{WW}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{WW}}$ [pb/GeV]
-LogY=0
-LegendYPos=0.5
-LegendXPos=0.30
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/WW_eta
-Title=Pseudorapidity of boson pair
-XLabel=$\eta_{\text{WW}}$
-YLabel=$\text{d}\sigma/\text{d}\eta_{\text{WW}}$ [pb]
-LegendXPos=0.35
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/WW_phi
-Title=Azimuthal angle of boson pair
-XLabel=$\phi_{\text{WW}}$
-YLabel=$\text{d}\sigma/\text{d}\phi_{\text{WW}}$ [pb]
-LogY=0
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/WW_m
-Title=Invariant mass of boson pair
-XLabel=$m_{\text{WW}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}m_{\text{WW}}$ [pb/GeV]
-LogX=1
-LegendXPos=0.05
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/WW_dphi
-Title=Azimuthal angle difference of boson pair
-XLabel=$\Delta\phi_{\text{WW}}$
-YLabel=$\text{d}\sigma/\text{d}\Delta\phi_{\text{WW}}$ [pb]
-LegendXPos=0.10
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/WW_deta
-Title=Pseudorapidity difference of boson pair
-XLabel=$\Delta\eta_{\text{WW}}$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta_{\text{WW}}$ [pb]
-LegendXPos=0.35
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/WW_dR
-Title=Separation of boson pair
-XLabel=$\Delta R_{\text{WW}}$
-YLabel=$\text{d}\sigma/\text{d}\Delta R_{\text{WW}}$ [pb]
-LegendXPos=0.35
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/WW_dpT
-Title=Transverse momentum difference of boson pair
-XLabel=$\Delta p_\perp^{\text{WW}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}\Delta p_\perp^{\text{WW}}$ [pb/GeV]
-LogX=1
-LegendXPos=0.05
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/WW_costheta_planes
-Title=Angle between the boson decay planes
-XLabel=$\cos(\Psi_{\text{e}\nu,\mu\nu})$
-YLabel=$\text{d}\sigma/\text{d}\cos(\Psi_{\text{e}\nu,\mu\nu})$ [pb]
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/W_pT
-Title=W $p_\perp$
-XLabel=$p_\perp^{\text{W}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{W}}$ [pb/GeV]
-LogX=1
-LegendXPos=0.05
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/W_eta
-Title=W pseudorapidity
-XLabel=$\eta_{\text{W}}$
-YLabel=$\text{d}\sigma/\text{d}\eta_{\text{W}}$ [pb]
-LegendXPos=0.35
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/Wl_pT
-Title=Lepton $p_\perp$
-XLabel=$p_\perp^{\text{l}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{l}}$ [pb/GeV]
-LogX=1
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/Wl_eta
-Title=Lepton $\eta$
-XLabel=$\eta_{\text{l}}$
-YLabel=$\text{d}\sigma/\text{d}\eta_{\text{l}}$ [pb]
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/WeWm_dphi
-Title=Azimuthal angle difference between oppositely charged leptons
-XLabel=$\Delta\phi_{e^+,\mu^-}$
-YLabel=$\text{d}\sigma/\text{d}\Delta\phi$ [pb]
-LegendXPos=0.10
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/WeWm_deta
-Title=Pseudorapidity difference between oppositely charged leptons
-XLabel=$\Delta\eta_{e^+,\mu^-}$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta$ [pb]
-LegendXPos=0.30
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/WeWm_dR
-Title=Separation between oppositely charged leptons
-XLabel=$\Delta R_{e^+,\mu^-}$
-YLabel=$\text{d}\sigma/\text{d}\Delta R$ [pb]
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/WeWm_m
-Title=Invariant mass of oppositely charged leptons
-XLabel=$m_{e^+,\mu^-}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}m$ [pb/GeV]
-# END PLOT
-
 # BEGIN PLOT /MC_WWJETS/WW_jet1_dR
 Title=Separation between W boson pair and leading jet
 XLabel=$\Delta R(\text{WW, 1st jet})$
@@ -396,79 +259,6 @@
 ErrorBands=1
 # END PLOT
 
-# BEGIN PLOT /MC_WWJETS/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}$
-Rebin=2
-LegendYPos=0.8
-LegendXPos=0.75
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/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_WWJETS/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_WWJETS/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_WWJETS/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_WWJETS/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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# BEGIN PLOT /MC_WWJETS/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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
 # BEGIN PLOT /MC_WWJETS/jet_pT_1
 Title=Transverse momentum of leading jet
 XLabel=$p_\perp(\text{jet 1})$ [GeV]

Copied: trunk/data/plotinfo/MC_WWKTSPLITTINGS.plot (from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_WWKTSPLITTINGS.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/MC_WWKTSPLITTINGS.plot	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/plotinfo/MC_WWKTSPLITTINGS.plot)
@@ -0,0 +1,72 @@
+# BEGIN PLOT /MC_WWKTSPLITTINGS/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}$
+Rebin=2
+LegendYPos=0.8
+LegendXPos=0.75
+# END PLOT
+
+# BEGIN PLOT /MC_WWKTSPLITTINGS/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_WWKTSPLITTINGS/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_WWKTSPLITTINGS/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_WWKTSPLITTINGS/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_WWKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_WWKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_WWKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_WWKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT

Copied: trunk/data/plotinfo/MC_ZINC.plot (from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_ZINC.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/MC_ZINC.plot	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/plotinfo/MC_ZINC.plot)
@@ -0,0 +1,50 @@
+# BEGIN PLOT /MC_ZJETS/Z_mass
+Title=Z mass
+XLabel=$m_{\text{Z}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}m_{\text{Z}}$ [pb/GeV]
+# END PLOT
+
+# BEGIN PLOT /MC_ZJETS/Z_pT$
+Title=Z $p_\perp$
+XLabel=$p_\perp^{\text{Z}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{Z}}$ [pb/GeV]
+LogX=1
+LegendXPos=0.05
+LegendYPos=0.5
+# 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}}$ [pb/GeV]
+LogY=0
+LegendYPos=0.5
+LegendXPos=0.30
+# END PLOT
+
+# BEGIN PLOT /MC_ZJETS/Z_y
+Title=Z rapidity
+XLabel=$y_{\text{Z}}$
+YLabel=$\text{d}\sigma/\text{d}y_{\text{Z}}$ [pb]
+LegendXPos=0.35
+LegendYPos=0.5
+# 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}}$ [pb]
+# 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}}$ [pb/GeV]
+LogX=1
+# 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}}$ [pb/GeV]
+# END PLOT

Modified: trunk/data/plotinfo/MC_ZJETS.plot
==============================================================================
--- trunk/data/plotinfo/MC_ZJETS.plot	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/data/plotinfo/MC_ZJETS.plot	Fri Jan 25 15:46:06 2013	(r4109)
@@ -12,57 +12,6 @@
 YLabel=$\text{d}\sigma/\text{d}\Delta{\eta}(\text{Z, 1st jet})$ [pb]
 # 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}}$ [pb/GeV]
-# END PLOT
-
-# BEGIN PLOT /MC_ZJETS/Z_pT$
-Title=Z $p_\perp$
-XLabel=$p_\perp^{\text{Z}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{Z}}$ [pb/GeV]
-LogX=1
-LegendXPos=0.05
-LegendYPos=0.5
-# 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}}$ [pb/GeV]
-LogY=0
-LegendYPos=0.5
-LegendXPos=0.30
-# END PLOT
-
-# BEGIN PLOT /MC_ZJETS/Z_y
-Title=Z rapidity
-XLabel=$y_{\text{Z}}$
-YLabel=$\text{d}\sigma/\text{d}y_{\text{Z}}$ [pb]
-LegendXPos=0.35
-LegendYPos=0.5
-# 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}}$ [pb]
-# 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}}$ [pb/GeV]
-LogX=1
-# 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}}$ [pb/GeV]
-# END PLOT
-
 # BEGIN PLOT /MC_ZJETS/jets_dR_
 Title=$\Delta R$ separation between jets
 LegendXPos=0.10
@@ -281,79 +230,6 @@
 ErrorBands=1
 # END PLOT
 
-# 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}$
-Rebin=2
-LegendYPos=0.8
-LegendXPos=0.75
-# END PLOT
-
-# 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_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_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_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_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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# 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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# 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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# 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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
 # BEGIN PLOT /MC_ZJETS/jet_pT_1
 Title=Transverse momentum of leading jet
 XLabel=$p_\perp(\text{jet 1})$ [GeV]

Copied: trunk/data/plotinfo/MC_ZKTSPLITTINGS.plot (from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_ZKTSPLITTINGS.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/MC_ZKTSPLITTINGS.plot	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/plotinfo/MC_ZKTSPLITTINGS.plot)
@@ -0,0 +1,72 @@
+# BEGIN PLOT /MC_ZKTSPLITTINGS/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}$
+Rebin=2
+LegendYPos=0.8
+LegendXPos=0.75
+# END PLOT
+
+# BEGIN PLOT /MC_ZKTSPLITTINGS/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_ZKTSPLITTINGS/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_ZKTSPLITTINGS/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_ZKTSPLITTINGS/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_ZKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_ZKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_ZKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_ZKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT

Copied: trunk/data/plotinfo/MC_ZZINC.plot (from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_ZZINC.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/MC_ZZINC.plot	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/plotinfo/MC_ZZINC.plot)
@@ -0,0 +1,133 @@
+# BEGIN PLOT /MC_ZZJETS/ZZ_pT$
+Title=Transverse momentum of boson pair
+XLabel=$p_\perp^{\text{ZZ}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{ZZ}}$ [pb/GeV]
+LogX=1
+LegendXPos=0.05
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_ZZJETS/ZZ_pT_peak
+Title=Peak region of transverse momentum of boson pair
+XLabel=$p_\perp^{\text{ZZ}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{ZZ}}$ [pb/GeV]
+LogY=0
+LegendYPos=0.5
+LegendXPos=0.30
+# END PLOT
+
+# BEGIN PLOT /MC_ZZJETS/ZZ_eta
+Title=Pseudorapidity of boson pair
+XLabel=$\eta_{\text{ZZ}}$
+YLabel=$\text{d}\sigma/\text{d}\eta_{\text{ZZ}}$ [pb]
+LegendXPos=0.35
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_ZZJETS/ZZ_phi
+Title=Azimuthal angle of boson pair
+XLabel=$\phi_{\text{ZZ}}$
+YLabel=$\text{d}\sigma/\text{d}\phi_{\text{ZZ}}$ [pb]
+LogY=0
+# END PLOT
+
+# BEGIN PLOT /MC_ZZJETS/ZZ_m
+Title=Invariant mass of boson pair
+XLabel=$m_{\text{ZZ}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}m_{\text{ZZ}}$ [pb/GeV]
+LogX=1
+LegendXPos=0.05
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_ZZJETS/ZZ_dphi
+Title=Azimuthal angle difference of boson pair
+XLabel=$\Delta\phi_{\text{ZZ}}$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi_{\text{ZZ}}$ [pb]
+LegendXPos=0.10
+# END PLOT
+
+# BEGIN PLOT /MC_ZZJETS/ZZ_deta
+Title=Pseudorapidity difference of boson pair
+XLabel=$\Delta\eta_{\text{ZZ}}$
+YLabel=$\text{d}\sigma/\text{d}\Delta\eta_{\text{ZZ}}$ [pb]
+LegendXPos=0.35
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_ZZJETS/ZZ_dR
+Title=Separation of boson pair
+XLabel=$\Delta R_{\text{ZZ}}$
+YLabel=$\text{d}\sigma/\text{d}\Delta R_{\text{ZZ}}$ [pb]
+LegendXPos=0.35
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_ZZJETS/ZZ_dpT
+Title=Transverse momentum difference of boson pair
+XLabel=$\Delta p_\perp^{\text{ZZ}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}\Delta p_\perp^{\text{ZZ}}$ [pb/GeV]
+LogX=1
+LegendXPos=0.05
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_ZZJETS/ZZ_costheta_planes
+Title=Angle between the boson decay planes
+XLabel=$\cos(\Psi_{\text{ee},\mu\mu})$
+YLabel=$\text{d}\sigma/\text{d}\cos(\Psi_{\text{ee},\mu\mu})$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_ZZJETS/Z_pT
+Title=Z $p_\perp$
+XLabel=$p_\perp^{\text{Z}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{Z}}$ [pb/GeV]
+LogX=1
+LegendXPos=0.05
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_ZZJETS/Z_eta
+Title=Z pseudorapidity
+XLabel=$\eta_{\text{Z}}$
+YLabel=$\text{d}\sigma/\text{d}\eta_{\text{Z}}$ [pb]
+LegendXPos=0.35
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_ZZJETS/Zl_pT
+Title=Lepton $p_\perp$
+XLabel=$p_\perp^{\text{l}}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{l}}$ [pb/GeV]
+LogX=1
+# END PLOT
+
+# BEGIN PLOT /MC_ZZJETS/Zl_eta
+Title=Lepton $\eta$
+XLabel=$\eta_{\text{l}}$
+YLabel=$\text{d}\sigma/\text{d}\eta_{\text{l}}$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_ZZJETS/ZeZm_dphi
+Title=Azimuthal angle difference between oppositely charged leptons
+XLabel=$\Delta\phi_{e^+,\mu^-}$
+YLabel=$\text{d}\sigma/\text{d}\Delta\phi$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_ZZJETS/ZeZm_deta
+Title=Pseudorapidity difference between oppositely charged leptons
+XLabel=$\Delta\eta_{e^+,\mu^-}$
+YLabel=$\text{d}\sigma/\text{d}\Delta\eta$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_ZZJETS/ZeZm_dR
+Title=Separation between oppositely charged leptons
+XLabel=$\Delta R_{e^+,\mu^-}$
+YLabel=$\text{d}\sigma/\text{d}\Delta R$ [pb]
+# END PLOT
+
+# BEGIN PLOT /MC_ZZJETS/ZeZm_m
+Title=Invariant mass of oppositely charged leptons
+XLabel=$m_{e^+,\mu^-}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}m$ [pb/GeV]
+# END PLOT

Modified: trunk/data/plotinfo/MC_ZZJETS.plot
==============================================================================
--- trunk/data/plotinfo/MC_ZZJETS.plot	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/data/plotinfo/MC_ZZJETS.plot	Fri Jan 25 15:46:06 2013	(r4109)
@@ -1,137 +1,3 @@
-# BEGIN PLOT /MC_ZZJETS/ZZ_pT$
-Title=Transverse momentum of boson pair
-XLabel=$p_\perp^{\text{ZZ}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{ZZ}}$ [pb/GeV]
-LogX=1
-LegendXPos=0.05
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/ZZ_pT_peak
-Title=Peak region of transverse momentum of boson pair
-XLabel=$p_\perp^{\text{ZZ}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{ZZ}}$ [pb/GeV]
-LogY=0
-LegendYPos=0.5
-LegendXPos=0.30
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/ZZ_eta
-Title=Pseudorapidity of boson pair
-XLabel=$\eta_{\text{ZZ}}$
-YLabel=$\text{d}\sigma/\text{d}\eta_{\text{ZZ}}$ [pb]
-LegendXPos=0.35
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/ZZ_phi
-Title=Azimuthal angle of boson pair
-XLabel=$\phi_{\text{ZZ}}$
-YLabel=$\text{d}\sigma/\text{d}\phi_{\text{ZZ}}$ [pb]
-LogY=0
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/ZZ_m
-Title=Invariant mass of boson pair
-XLabel=$m_{\text{ZZ}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}m_{\text{ZZ}}$ [pb/GeV]
-LogX=1
-LegendXPos=0.05
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/ZZ_dphi
-Title=Azimuthal angle difference of boson pair
-XLabel=$\Delta\phi_{\text{ZZ}}$
-YLabel=$\text{d}\sigma/\text{d}\Delta\phi_{\text{ZZ}}$ [pb]
-LegendXPos=0.10
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/ZZ_deta
-Title=Pseudorapidity difference of boson pair
-XLabel=$\Delta\eta_{\text{ZZ}}$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta_{\text{ZZ}}$ [pb]
-LegendXPos=0.35
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/ZZ_dR
-Title=Separation of boson pair
-XLabel=$\Delta R_{\text{ZZ}}$
-YLabel=$\text{d}\sigma/\text{d}\Delta R_{\text{ZZ}}$ [pb]
-LegendXPos=0.35
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/ZZ_dpT
-Title=Transverse momentum difference of boson pair
-XLabel=$\Delta p_\perp^{\text{ZZ}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}\Delta p_\perp^{\text{ZZ}}$ [pb/GeV]
-LogX=1
-LegendXPos=0.05
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/ZZ_costheta_planes
-Title=Angle between the boson decay planes
-XLabel=$\cos(\Psi_{\text{ee},\mu\mu})$
-YLabel=$\text{d}\sigma/\text{d}\cos(\Psi_{\text{ee},\mu\mu})$ [pb]
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/Z_pT
-Title=Z $p_\perp$
-XLabel=$p_\perp^{\text{Z}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{Z}}$ [pb/GeV]
-LogX=1
-LegendXPos=0.05
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/Z_eta
-Title=Z pseudorapidity
-XLabel=$\eta_{\text{Z}}$
-YLabel=$\text{d}\sigma/\text{d}\eta_{\text{Z}}$ [pb]
-LegendXPos=0.35
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/Zl_pT
-Title=Lepton $p_\perp$
-XLabel=$p_\perp^{\text{l}}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}p_\perp^{\text{l}}$ [pb/GeV]
-LogX=1
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/Zl_eta
-Title=Lepton $\eta$
-XLabel=$\eta_{\text{l}}$
-YLabel=$\text{d}\sigma/\text{d}\eta_{\text{l}}$ [pb]
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/ZeZm_dphi
-Title=Azimuthal angle difference between oppositely charged leptons
-XLabel=$\Delta\phi_{e^+,\mu^-}$
-YLabel=$\text{d}\sigma/\text{d}\Delta\phi$ [pb]
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/ZeZm_deta
-Title=Pseudorapidity difference between oppositely charged leptons
-XLabel=$\Delta\eta_{e^+,\mu^-}$
-YLabel=$\text{d}\sigma/\text{d}\Delta\eta$ [pb]
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/ZeZm_dR
-Title=Separation between oppositely charged leptons
-XLabel=$\Delta R_{e^+,\mu^-}$
-YLabel=$\text{d}\sigma/\text{d}\Delta R$ [pb]
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/ZeZm_m
-Title=Invariant mass of oppositely charged leptons
-XLabel=$m_{e^+,\mu^-}$ [GeV]
-YLabel=$\text{d}\sigma/\text{d}m$ [pb/GeV]
-# END PLOT
-
 # BEGIN PLOT /MC_ZZJETS/ZZ_jet1_dR
 Title=Separation between Z boson pair and leading jet
 XLabel=$\Delta R(\text{ZZ, 1st jet})$
@@ -390,70 +256,6 @@
 LegendXPos=0.75
 # END PLOT
 
-# BEGIN PLOT /MC_ZZJETS/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_ZZJETS/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_ZZJETS/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_ZZJETS/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_ZZJETS/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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
-# BEGIN PLOT /MC_ZZJETS/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}/\text{GeV})$ [pb]
-LegendXPos=0.15
-LegendYPos=0.5
-Rebin=2
-# END PLOT
-
 # BEGIN PLOT /MC_ZZJETS/jet_pT_1
 Title=Transverse momentum of leading jet
 XLabel=$p_\perp(\text{jet 1})$ [GeV]

Copied: trunk/data/plotinfo/MC_ZZKTSPLITTINGS.plot (from r4107, branches/2012-06-aidarivet/data/plotinfo/MC_ZZKTSPLITTINGS.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/MC_ZZKTSPLITTINGS.plot	Fri Jan 25 15:46:06 2013	(r4109, copy of r4107, branches/2012-06-aidarivet/data/plotinfo/MC_ZZKTSPLITTINGS.plot)
@@ -0,0 +1,72 @@
+# BEGIN PLOT /MC_ZZKTSPLITTINGS/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}$
+Rebin=2
+LegendYPos=0.8
+LegendXPos=0.75
+# END PLOT
+
+# BEGIN PLOT /MC_ZZKTSPLITTINGS/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_ZZKTSPLITTINGS/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_ZZKTSPLITTINGS/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_ZZKTSPLITTINGS/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_ZZKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_ZZKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_ZZKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT
+
+# BEGIN PLOT /MC_ZZKTSPLITTINGS/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}/\text{GeV})$ [pb]
+LegendXPos=0.15
+LegendYPos=0.5
+Rebin=2
+# END PLOT

Modified: trunk/data/plotinfo/Makefile.am
==============================================================================
--- trunk/data/plotinfo/Makefile.am	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/data/plotinfo/Makefile.am	Fri Jan 25 15:46:06 2013	(r4109)
@@ -172,17 +172,30 @@
   MC_SUSY.plot \
   MC_TTBAR.plot \
   MC_JETS.plot \
+  MC_KTSPLITTINGS.plot \
+  MC_PHOTONINC.plot \
   MC_PHOTONJETS.plot \
+  MC_PHOTONKTSPLITTINGS.plot \
   MC_PHOTONS.plot \
   MC_VH2BB.plot \
+  MC_HINC.plot \
   MC_HJETS.plot \
+  MC_HKTSPLITTINGS.plot \
   MC_PDFS.plot \
+  MC_WINC.plot \
   MC_WJETS.plot \
+  MC_WKTSPLITTINGS.plot \
   MC_WPOL.plot \
+  MC_WWINC.plot \
   MC_WWJETS.plot \
+  MC_WWKTSPLITTINGS.plot \
   MC_XS.plot \
+  MC_ZINC.plot \
   MC_ZJETS.plot \
+  MC_ZKTSPLITTINGS.plot \
+  MC_ZZINC.plot \
   MC_ZZJETS.plot \
+  MC_ZZKTSPLITTINGS.plot \
   OPAL_1993_S2692198.plot \
   OPAL_1994_S2927284.plot \
   OPAL_1995_S3198391.plot \

Modified: trunk/include/Rivet/Analyses/MC_JetAnalysis.hh
==============================================================================
--- trunk/include/Rivet/Analyses/MC_JetAnalysis.hh	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/include/Rivet/Analyses/MC_JetAnalysis.hh	Fri Jan 25 15:46:06 2013	(r4109)
@@ -43,8 +43,6 @@
 
     /// @name Histograms
     //@{
-    std::vector<Histo1DPtr> _h_log10_d;
-    std::vector<Scatter2DPtr> _h_log10_R;
     std::vector<Histo1DPtr> _h_pT_jet;
     std::vector<Histo1DPtr> _h_eta_jet;
     std::vector<Histo1DPtr> _h_eta_jet_plus, _h_eta_jet_minus;

Copied and modified: trunk/include/Rivet/Analyses/MC_JetSplittings.hh (from r4107, branches/2012-06-aidarivet/include/Rivet/Analyses/MC_JetSplittings.hh)
==============================================================================
--- branches/2012-06-aidarivet/include/Rivet/Analyses/MC_JetSplittings.hh	Fri Jan 25 13:44:47 2013	(r4107, copy source)
+++ trunk/include/Rivet/Analyses/MC_JetSplittings.hh	Fri Jan 25 15:46:06 2013	(r4109)
@@ -4,7 +4,6 @@
 
 #include "Rivet/Analysis.hh"
 #include "Rivet/Projections/FinalState.hh"
-#include "LWH/Histogram1D.h"
 
 namespace Rivet {
 
@@ -38,8 +37,8 @@
 
     /// @name Histograms
     //@{
-    std::vector<AIDA::IHistogram1D *> _h_log10_d;
-    std::vector<AIDA::IDataPointSet *> _h_log10_R;
+    std::vector<Histo1DPtr> _h_log10_d;
+    std::vector<Scatter2DPtr> _h_log10_R;
     //@}
 
   };

Modified: trunk/include/Rivet/Makefile.am
==============================================================================
--- trunk/include/Rivet/Makefile.am	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/include/Rivet/Makefile.am	Fri Jan 25 15:46:06 2013	(r4109)
@@ -80,7 +80,8 @@
 
 ## Analysis base class headers
 nobase_pkginclude_HEADERS += \
-  Analyses/MC_JetAnalysis.hh
+  Analyses/MC_JetAnalysis.hh \
+  Analyses/MC_JetSplittings.hh
 
 
 ## Tools

Modified: trunk/include/Rivet/Projections/ZFinder.hh
==============================================================================
--- trunk/include/Rivet/Projections/ZFinder.hh	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/include/Rivet/Projections/ZFinder.hh	Fri Jan 25 15:46:06 2013	(r4109)
@@ -84,6 +84,7 @@
 
     /// Access to the Z constituent clustered leptons
     /// (e.g. for more fine-grained cuts on the clustered leptons)
+    /// The order is going to be: positive charge constituent 1st, negative 2nd
     const vector<Particle>& constituents() const { return _constituents; }
 
     /// Access to the remaining particles, after the Z and clustered photons

Copied and modified: trunk/src/Analyses/MC_HINC.cc (from r4107, branches/2012-06-aidarivet/src/Analyses/MC_HINC.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/MC_HINC.cc	Fri Jan 25 13:44:47 2013	(r4107, copy source)
+++ trunk/src/Analyses/MC_HINC.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -2,7 +2,7 @@
 #include "Rivet/Analysis.hh"
 #include "Rivet/Projections/ZFinder.hh"
 #include "Rivet/Tools/Logging.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 
 namespace Rivet {
 
@@ -26,13 +26,13 @@
       ZFinder hfinder(fs, -3.5, 3.5, 25.0*GeV, TAU, 115.0*GeV, 125.0*GeV, 0.0, false, false);
       addProjection(hfinder, "Hfinder");
 
-      _h_H_mass = bookHistogram1D("H_mass", 50, 119.7, 120.3);
-      _h_H_pT = bookHistogram1D("H_pT", logBinEdges(100, 1.0, 0.5*sqrtS()));
-      _h_H_pT_peak = bookHistogram1D("H_pT_peak", 25, 0.0, 25.0);
-      _h_H_y = bookHistogram1D("H_y", 40, -4.0, 4.0);
-      _h_H_phi = bookHistogram1D("H_phi", 25, 0.0, TWOPI);
-      _h_lepton_pT = bookHistogram1D("lepton_pT", logBinEdges(100, 10.0, 0.25*sqrtS()));
-      _h_lepton_eta = bookHistogram1D("lepton_eta", 40, -4.0, 4.0);
+      _h_H_mass = bookHisto1D("H_mass", 50, 119.7, 120.3);
+      _h_H_pT = bookHisto1D("H_pT", logspace(100, 1.0, 0.5*sqrtS()));
+      _h_H_pT_peak = bookHisto1D("H_pT_peak", 25, 0.0, 25.0);
+      _h_H_y = bookHisto1D("H_y", 40, -4.0, 4.0);
+      _h_H_phi = bookHisto1D("H_phi", 25, 0.0, TWOPI);
+      _h_lepton_pT = bookHisto1D("lepton_pT", logspace(100, 10.0, 0.25*sqrtS()));
+      _h_lepton_eta = bookHisto1D("lepton_eta", 40, -4.0, 4.0);
 
     }
 
@@ -77,13 +77,13 @@
 
     /// @name Histograms
     //@{
-    AIDA::IHistogram1D * _h_H_mass;
-    AIDA::IHistogram1D * _h_H_pT;
-    AIDA::IHistogram1D * _h_H_pT_peak;
-    AIDA::IHistogram1D * _h_H_y;
-    AIDA::IHistogram1D * _h_H_phi;
-    AIDA::IHistogram1D * _h_lepton_pT;
-    AIDA::IHistogram1D * _h_lepton_eta;
+    Histo1DPtr _h_H_mass;
+    Histo1DPtr _h_H_pT;
+    Histo1DPtr _h_H_pT_peak;
+    Histo1DPtr _h_H_y;
+    Histo1DPtr _h_H_phi;
+    Histo1DPtr _h_lepton_pT;
+    Histo1DPtr _h_lepton_eta;
     //@}
 
   };

Modified: trunk/src/Analyses/MC_HJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_HJETS.cc	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/src/Analyses/MC_HJETS.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -26,18 +26,11 @@
       FinalState fs;
       ZFinder hfinder(fs, -3.5, 3.5, 25.0*GeV, TAU, 115.0*GeV, 125.0*GeV, 0.0, false, false);
       addProjection(hfinder, "Hfinder");
-      FastJets jetpro(hfinder.remainingFinalState(), FastJets::KT, 0.7);
+      FastJets jetpro(hfinder.remainingFinalState(), FastJets::ANTIKT, 0.4);
       addProjection(jetpro, "Jets");
 
-      _h_H_mass = bookHisto1D("H_mass", 50, 119.7, 120.3);
-      _h_H_pT = bookHisto1D("H_pT", logspace(100, 1.0, 0.5*sqrtS()));
-      _h_H_pT_peak = bookHisto1D("H_pT_peak", 25, 0.0, 25.0);
-      _h_H_y = bookHisto1D("H_y", 40, -4.0, 4.0);
-      _h_H_phi = bookHisto1D("H_phi", 25, 0.0, TWOPI);
       _h_H_jet1_deta = bookHisto1D("H_jet1_deta", 50, -5.0, 5.0);
       _h_H_jet1_dR = bookHisto1D("H_jet1_dR", 25, 0.5, 7.0);
-      _h_lepton_pT = bookHisto1D("lepton_pT", logspace(100, 10.0, 0.25*sqrtS()));
-      _h_lepton_eta = bookHisto1D("lepton_eta", 40, -4.0, 4.0);
 
       MC_JetAnalysis::init();
     }
@@ -53,18 +46,7 @@
       const double weight = e.weight();
 
       FourMomentum hmom(hfinder.bosons()[0].momentum());
-      _h_H_mass->fill(hmom.mass(),weight);
-      _h_H_pT->fill(hmom.pT(),weight);
-      _h_H_pT_peak->fill(hmom.pT(),weight);
-      _h_H_y->fill(hmom.rapidity(),weight);
-      _h_H_phi->fill(hmom.azimuthalAngle(),weight);
-      foreach (const Particle& l, hfinder.constituents()) {
-        _h_lepton_pT->fill(l.momentum().pT(), weight);
-        _h_lepton_eta->fill(l.momentum().eta(), weight);
-      }
-
-      const FastJets& jetpro = applyProjection<FastJets>(e, "Jets");
-      const Jets& jets = jetpro.jetsByPt(20.0*GeV);
+      const Jets& jets = applyProjection<FastJets>(e, "Jets").jetsByPt(m_jetptcut);
       if (jets.size() > 0) {
         _h_H_jet1_deta->fill(hmom.eta()-jets[0].momentum().eta(), weight);
         _h_H_jet1_dR->fill(deltaR(hmom, jets[0].momentum()), weight);
@@ -76,15 +58,8 @@
 
     /// Finalize
     void finalize() {
-      scale(_h_H_mass, crossSection()/sumOfWeights());
-      scale(_h_H_pT, crossSection()/sumOfWeights());
-      scale(_h_H_pT_peak, crossSection()/sumOfWeights());
-      scale(_h_H_y, crossSection()/sumOfWeights());
-      scale(_h_H_phi, crossSection()/sumOfWeights());
       scale(_h_H_jet1_deta, crossSection()/sumOfWeights());
       scale(_h_H_jet1_dR, crossSection()/sumOfWeights());
-      scale(_h_lepton_pT, crossSection()/sumOfWeights());
-      scale(_h_lepton_eta, crossSection()/sumOfWeights());
 
       MC_JetAnalysis::finalize();
     }
@@ -96,15 +71,8 @@
 
     /// @name Histograms
     //@{
-    Histo1DPtr _h_H_mass;
-    Histo1DPtr _h_H_pT;
-    Histo1DPtr _h_H_pT_peak;
-    Histo1DPtr _h_H_y;
-    Histo1DPtr _h_H_phi;
     Histo1DPtr _h_H_jet1_deta;
     Histo1DPtr _h_H_jet1_dR;
-    Histo1DPtr _h_lepton_pT;
-    Histo1DPtr _h_lepton_eta;
     //@}
 
   };

Copied and modified: trunk/src/Analyses/MC_HKTSPLITTINGS.cc (from r4107, branches/2012-06-aidarivet/src/Analyses/MC_HKTSPLITTINGS.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/MC_HKTSPLITTINGS.cc	Fri Jan 25 13:44:47 2013	(r4107, copy source)
+++ trunk/src/Analyses/MC_HKTSPLITTINGS.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -3,7 +3,7 @@
 #include "Rivet/Projections/ZFinder.hh"
 #include "Rivet/Projections/FastJets.hh"
 #include "Rivet/Tools/Logging.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 
 namespace Rivet {
 

Modified: trunk/src/Analyses/MC_JETS.cc
==============================================================================
--- trunk/src/Analyses/MC_JETS.cc	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/src/Analyses/MC_JETS.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -21,7 +21,7 @@
 
     void init() {
       FinalState fs;
-      FastJets jetpro(fs, FastJets::KT, 0.7);
+      FastJets jetpro(fs, FastJets::ANTIKT, 0.4);
       addProjection(jetpro, "Jets");
 
       MC_JetAnalysis::init();

Modified: trunk/src/Analyses/MC_JetAnalysis.cc
==============================================================================
--- trunk/src/Analyses/MC_JetAnalysis.cc	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/src/Analyses/MC_JetAnalysis.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -12,7 +12,7 @@
                                  const string& jetpro_name,
                                  double jetptcut)
     : Analysis(name), m_njet(njet), m_jetpro_name(jetpro_name), m_jetptcut(jetptcut),
-      _h_log10_d(njet), _h_log10_R(njet+1), _h_pT_jet(njet),
+      _h_pT_jet(njet),
       _h_eta_jet(njet), _h_eta_jet_plus(njet), _h_eta_jet_minus(njet),
       _h_rap_jet(njet), _h_rap_jet_plus(njet), _h_rap_jet_minus(njet),
      _h_mass_jet(njet)
@@ -26,15 +26,6 @@
   void MC_JetAnalysis::init() {
 
     for (size_t i=0; i < m_njet; ++i) {
-      stringstream dname;
-      dname << "log10_d_" << i << i+1;
-
-      _h_log10_d[i] = bookHisto1D(dname.str(), 50, 0.2, log10(0.5*sqrtS()));
-
-      stringstream Rname;
-      Rname << "log10_R_" << i;
-      _h_log10_R[i] = bookScatter2D(Rname.str(), 50, 0.2, log10(0.5*sqrtS()));
-
       stringstream pTname;
       pTname << "jet_pT_" << i+1;
       double pTmax = 1.0/(double(i)+2.0) * sqrtS()/GeV/2.0;
@@ -75,9 +66,6 @@
         _h_dR_jets.insert(make_pair(ij, bookHisto1D(dRname.str(), 25, 0.0, 5.0)));
       }
     }
-    stringstream Rname;
-    Rname << "log10_R_" << m_njet;
-    _h_log10_R[m_njet] = bookScatter2D(Rname.str(), 50, 0.2, log10(0.5*sqrtS()));
 
     _h_jet_multi_exclusive = bookHisto1D("jet_multi_exclusive", m_njet+3, -0.5, m_njet+3-0.5);
     _h_jet_multi_inclusive = bookHisto1D("jet_multi_inclusive", m_njet+3, -0.5, m_njet+3-0.5);
@@ -91,42 +79,8 @@
   void MC_JetAnalysis::analyze(const Event & e) {
     const double weight = e.weight();
 
-    const FastJets& jetpro = applyProjection<FastJets>(e, m_jetpro_name);
-
-    // Jet resolutions and integrated jet rates
-    const fastjet::ClusterSequence* seq = jetpro.clusterSeq();
-    if (seq != NULL) {
-      double previous_dij = 10.0;
-      for (size_t i = 0; i < m_njet; ++i) {
-        // Jet resolution i -> j
-        double d_ij = log10(sqrt(seq->exclusive_dmerge_max(i)));
-
-        // Fill differential jet resolution
-        _h_log10_d[i]->fill(d_ij, weight);
-
-        // Fill integrated jet resolution
-        for (size_t ibin = 0; ibin < _h_log10_R[i]->numPoints(); ++ibin) {
-          Point2D & dp = _h_log10_R[i]->point(ibin);
-          double dcut = dp.x();
-          if (d_ij < dcut && previous_dij > dcut) {
-            dp.setY(dp.y() + weight);
-          }
-        }
-        previous_dij = d_ij;
-      }
-      // One remaining integrated jet resolution
-      for (size_t ibin = 0; ibin<_h_log10_R[m_njet]->numPoints(); ++ibin) {
-        Point2D & dp = _h_log10_R[m_njet]->point(ibin);
-        double dcut = dp.x();
-        if (previous_dij > dcut) {
-          dp.setY(dp.y() + weight);
-        }
-      }
-    }
-
-    const Jets& jets = jetpro.jetsByPt(m_jetptcut);
+    const Jets& jets = applyProjection<FastJets>(e, m_jetpro_name).jetsByPt(m_jetptcut);
 
-    // The remaining direct jet observables
     for (size_t i = 0; i < m_njet; ++i) {
       if (jets.size() < i+1) continue;
       _h_pT_jet[i]->fill(jets[i].momentum().pT()/GeV, weight);
@@ -192,12 +146,6 @@
   // Finalize
   void MC_JetAnalysis::finalize() {
     for (size_t i = 0; i < m_njet; ++i) {
-      scale(_h_log10_d[i], crossSection()/sumOfWeights());
-      for (size_t ibin = 0; ibin<_h_log10_R[i]->numPoints(); ++ibin) {
-        Point2D & dp = _h_log10_R[i]->point(ibin);
-        dp.setY(dp.y()*crossSection()/sumOfWeights());
-      }
-
       scale(_h_pT_jet[i], crossSection()/sumOfWeights());
       scale(_h_mass_jet[i], crossSection()/sumOfWeights());
       scale(_h_eta_jet[i], crossSection()/sumOfWeights());
@@ -213,11 +161,6 @@
       // histogramFactory().divide(histoPath(rapname.str()), *_h_rap_jet_plus[i], *_h_rap_jet_minus[i]);
     }
 
-    for (size_t ibin = 0; ibin < _h_log10_R[m_njet]->numPoints(); ++ibin) {
-      Point2D & dp =_h_log10_R[m_njet]->point(ibin);
-      dp.setY(dp.y()*crossSection()/sumOfWeights());
-    }
-
     // Scale the d{eta,R} histograms
     map<pair<size_t, size_t>, Histo1DPtr>::iterator it;
     for (it = _h_deta_jets.begin(); it != _h_deta_jets.end(); ++it) {

Copied and modified: trunk/src/Analyses/MC_JetSplittings.cc (from r4107, branches/2012-06-aidarivet/src/Analyses/MC_JetSplittings.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/MC_JetSplittings.cc	Fri Jan 25 13:44:47 2013	(r4107, copy source)
+++ trunk/src/Analyses/MC_JetSplittings.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -2,7 +2,7 @@
 #include "Rivet/Analyses/MC_JetSplittings.hh"
 #include "Rivet/Projections/FastJets.hh"
 #include "Rivet/Tools/Logging.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 
 namespace Rivet {
 
@@ -11,7 +11,7 @@
                                      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_log10_d(njet), _h_log10_R(njet+1)
   {
     setNeedsCrossSection(true); // legitimate use, since a base class has no .info file!
   }
@@ -25,15 +25,15 @@
       stringstream dname;
       dname << "log10_d_" << i << i+1;
 
-      _h_log10_d[i] = bookHistogram1D(dname.str(), 100, 0.2, log10(0.5*sqrtS()));
+      _h_log10_d[i] = bookHisto1D(dname.str(), 100, 0.2, log10(0.5*sqrtS()));
 
       stringstream Rname;
       Rname << "log10_R_" << i;
-      _h_log10_R[i] = bookDataPointSet(Rname.str(), 100, 0.2, log10(0.5*sqrtS()));
+      _h_log10_R[i] = bookScatter2D(Rname.str(), 50, 0.2, log10(0.5*sqrtS()));
     }
     stringstream Rname;
     Rname << "log10_R_" << m_njet;
-    _h_log10_R[m_njet] = bookDataPointSet(Rname.str(), 100, 0.2, log10(0.5*sqrtS()));
+    _h_log10_R[m_njet] = bookScatter2D(Rname.str(), 50, 0.2, log10(0.5*sqrtS()));
   }
 
 
@@ -56,21 +56,21 @@
         _h_log10_d[i]->fill(d_ij, weight);
 
         // Fill integrated jet resolution
-        for (int ibin = 0; ibin < _h_log10_R[i]->size(); ++ibin) {
-          IDataPoint* dp = _h_log10_R[i]->point(ibin);
-          double dcut = dp->coordinate(0)->value();
+        for (size_t ibin = 0; ibin < _h_log10_R[i]->numPoints(); ++ibin) {
+          Point2D & dp = _h_log10_R[i]->point(ibin);
+          double dcut = dp.x();
           if (d_ij < dcut && previous_dij > dcut) {
-            dp->coordinate(1)->setValue(dp->coordinate(1)->value() + weight);
+            dp.setY(dp.y() + weight);
           }
         }
         previous_dij = d_ij;
       }
       // One remaining integrated jet resolution
-      for (int ibin = 0; ibin<_h_log10_R[m_njet]->size(); ++ibin) {
-        IDataPoint* dp = _h_log10_R[m_njet]->point(ibin);
-        double dcut = dp->coordinate(0)->value();
+      for (size_t ibin = 0; ibin<_h_log10_R[m_njet]->numPoints(); ++ibin) {
+        Point2D & dp = _h_log10_R[m_njet]->point(ibin);
+        double dcut = dp.x();
         if (previous_dij > dcut) {
-          dp->coordinate(1)->setValue(dp->coordinate(1)->value() + weight);
+          dp.setY(dp.y() + weight);
         }
       }
     }
@@ -82,15 +82,15 @@
   void MC_JetSplittings::finalize() {
     for (size_t i = 0; i < m_njet; ++i) {
       scale(_h_log10_d[i], crossSection()/sumOfWeights());
-      for (int ibin = 0; ibin<_h_log10_R[i]->size(); ++ibin) {
-        IDataPoint* dp = _h_log10_R[i]->point(ibin);
-        dp->coordinate(1)->setValue(dp->coordinate(1)->value()*crossSection()/sumOfWeights());
+      for (size_t ibin = 0; ibin<_h_log10_R[i]->numPoints(); ++ibin) {
+        Point2D & dp = _h_log10_R[i]->point(ibin);
+        dp.setY(dp.y()*crossSection()/sumOfWeights());
       }
     }
 
-    for (int ibin = 0; ibin < _h_log10_R[m_njet]->size(); ++ibin) {
-      IDataPoint* dp =_h_log10_R[m_njet]->point(ibin);
-      dp->coordinate(1)->setValue(dp->coordinate(1)->value()*crossSection()/sumOfWeights());
+    for (size_t ibin = 0; ibin < _h_log10_R[m_njet]->numPoints(); ++ibin) {
+      Point2D & dp =_h_log10_R[m_njet]->point(ibin);
+      dp.setY(dp.y()*crossSection()/sumOfWeights());
     }
   }
 

Copied and modified: trunk/src/Analyses/MC_KTSPLITTINGS.cc (from r4107, branches/2012-06-aidarivet/src/Analyses/MC_KTSPLITTINGS.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/MC_KTSPLITTINGS.cc	Fri Jan 25 13:44:47 2013	(r4107, copy source)
+++ trunk/src/Analyses/MC_KTSPLITTINGS.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -3,7 +3,7 @@
 #include "Rivet/Projections/FinalState.hh"
 #include "Rivet/Projections/FastJets.hh"
 #include "Rivet/Tools/Logging.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 
 namespace Rivet {
 

Copied and modified: trunk/src/Analyses/MC_PHOTONINC.cc (from r4107, branches/2012-06-aidarivet/src/Analyses/MC_PHOTONINC.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/MC_PHOTONINC.cc	Fri Jan 25 13:44:47 2013	(r4107, copy source)
+++ trunk/src/Analyses/MC_PHOTONINC.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -3,7 +3,7 @@
 #include "Rivet/Projections/LeadingParticlesFinalState.hh"
 #include "Rivet/Projections/VetoedFinalState.hh"
 #include "Rivet/Tools/Logging.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 
 namespace Rivet {
 
@@ -37,9 +37,9 @@
       vfs.addVetoOnThisFinalState(photonfs);
       addProjection(vfs, "JetFS");
 
-      _h_photon_pT = bookHistogram1D("photon_pT", logBinEdges(50, 30.0, 0.5*sqrtS()));
-      _h_photon_pT_lin = bookHistogram1D("photon_pT_lin", 50, 0.0, 70.0);
-      _h_photon_y = bookHistogram1D("photon_y", 50, -5.0, 5.0);
+      _h_photon_pT = bookHisto1D("photon_pT", logspace(50, 30.0, 0.5*sqrtS()));
+      _h_photon_pT_lin = bookHisto1D("photon_pT_lin", 50, 0.0, 70.0);
+      _h_photon_y = bookHisto1D("photon_y", 50, -5.0, 5.0);
     }
 
 
@@ -94,9 +94,9 @@
 
     /// @name Histograms
     //@{
-    AIDA::IHistogram1D * _h_photon_pT;
-    AIDA::IHistogram1D * _h_photon_pT_lin;
-    AIDA::IHistogram1D * _h_photon_y;
+    Histo1DPtr _h_photon_pT;
+    Histo1DPtr _h_photon_pT_lin;
+    Histo1DPtr _h_photon_y;
     //@}
 
   };

Modified: trunk/src/Analyses/MC_PHOTONJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_PHOTONJETS.cc	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/src/Analyses/MC_PHOTONJETS.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -37,12 +37,9 @@
       VetoedFinalState vfs(fs);
       vfs.addVetoOnThisFinalState(photonfs);
       addProjection(vfs, "JetFS");
-      FastJets jetpro(vfs, FastJets::KT, 0.7);
+      FastJets jetpro(vfs, FastJets::ANTIKT, 0.4);
       addProjection(jetpro, "Jets");
 
-      _h_photon_pT = bookHisto1D("photon_pT", logspace(50, 30.0, 0.5*sqrtS()));
-      _h_photon_pT_lin = bookHisto1D("photon_pT_lin", 50, 0.0, 70.0);
-      _h_photon_y = bookHisto1D("photon_y", 50, -5.0, 5.0);
       _h_photon_jet1_deta = bookHisto1D("photon_jet1_deta", 50, -5.0, 5.0);
       _h_photon_jet1_dphi = bookHisto1D("photon_jet1_dphi", 20, 0.0, M_PI);
       _h_photon_jet1_dR = bookHisto1D("photon_jet1_dR", 25, 0.5, 7.0);
@@ -54,6 +51,7 @@
     /// Do the analysis
     void analyze(const Event& e) {
       // Get the photon
+      /// @todo share IsolatedPhoton projection between all MC_*PHOTON* analyses
       const ParticleVector photons = applyProjection<FinalState>(e, "LeadingPhoton").particles();
       if (photons.size() != 1) {
         vetoEvent;
@@ -82,12 +80,7 @@
         }
       }
 
-      _h_photon_pT->fill(photon.pT(),weight);
-      _h_photon_pT_lin->fill(photon.pT(),weight);
-      _h_photon_y->fill(photon.rapidity(),weight);
-
-      const FastJets& jetpro = applyProjection<FastJets>(e, "Jets");
-      const Jets& jets = jetpro.jetsByPt(20.0*GeV);
+      const Jets& jets = applyProjection<FastJets>(e, "Jets").jetsByPt(m_jetptcut);
       if (jets.size()>0) {
         _h_photon_jet1_deta->fill(photon.eta()-jets[0].momentum().eta(), weight);
         _h_photon_jet1_dphi->fill(mapAngle0ToPi(photon.phi()-jets[0].momentum().phi()), weight);
@@ -100,9 +93,6 @@
 
     // Finalize
     void finalize() {
-      scale(_h_photon_pT, crossSectionPerEvent());
-      scale(_h_photon_pT_lin, crossSectionPerEvent());
-      scale(_h_photon_y, crossSectionPerEvent());
       scale(_h_photon_jet1_deta, crossSectionPerEvent());
       scale(_h_photon_jet1_dphi, crossSectionPerEvent());
       scale(_h_photon_jet1_dR, crossSectionPerEvent());
@@ -117,9 +107,6 @@
 
     /// @name Histograms
     //@{
-    Histo1DPtr _h_photon_pT;
-    Histo1DPtr _h_photon_pT_lin;
-    Histo1DPtr _h_photon_y;
     Histo1DPtr _h_photon_jet1_deta;
     Histo1DPtr _h_photon_jet1_dphi;
     Histo1DPtr _h_photon_jet1_dR;

Copied and modified: trunk/src/Analyses/MC_PHOTONKTSPLITTINGS.cc (from r4107, branches/2012-06-aidarivet/src/Analyses/MC_PHOTONKTSPLITTINGS.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/MC_PHOTONKTSPLITTINGS.cc	Fri Jan 25 13:44:47 2013	(r4107, copy source)
+++ trunk/src/Analyses/MC_PHOTONKTSPLITTINGS.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -4,7 +4,7 @@
 #include "Rivet/Projections/VetoedFinalState.hh"
 #include "Rivet/Projections/FastJets.hh"
 #include "Rivet/Tools/Logging.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 
 namespace Rivet {
 

Copied and modified: trunk/src/Analyses/MC_WINC.cc (from r4107, branches/2012-06-aidarivet/src/Analyses/MC_WINC.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/MC_WINC.cc	Fri Jan 25 13:44:47 2013	(r4107, copy source)
+++ trunk/src/Analyses/MC_WINC.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -2,7 +2,7 @@
 #include "Rivet/Analysis.hh"
 #include "Rivet/Projections/WFinder.hh"
 #include "Rivet/Tools/Logging.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 #include "Rivet/Tools/ParticleIdUtils.hh"
 
 namespace Rivet {
@@ -27,17 +27,20 @@
       WFinder wfinder(fs, -3.5, 3.5, 25.0*GeV, ELECTRON, 60.0*GeV, 100.0*GeV, 25.0*GeV, 0.2);
       addProjection(wfinder, "WFinder");
 
-      _h_W_mass = bookHistogram1D("W_mass", 50, 55.0, 105.0);
-      _h_W_pT = bookHistogram1D("W_pT", logBinEdges(100, 1.0, 0.5*sqrtS()));
-      _h_W_pT_peak = bookHistogram1D("W_pT_peak", 25, 0.0, 125.0);
-      _h_W_y = bookHistogram1D("W_y", 40, -4.0, 4.0);
-      _h_W_phi = bookHistogram1D("W_phi", 25, 0.0, TWOPI);
-      _h_Wplus_pT = bookHistogram1D("Wplus_pT", logBinEdges(25, 10.0, 0.5*sqrtS()));
-      _h_Wminus_pT = bookHistogram1D("Wminus_pT", logBinEdges(25, 10.0, 0.5*sqrtS()));
-      _h_lepton_pT = bookHistogram1D("lepton_pT", logBinEdges(100, 10.0, 0.25*sqrtS()));
-      _h_lepton_eta = bookHistogram1D("lepton_eta", 40, -4.0, 4.0);
-      _htmp_dsigminus_deta = bookHistogram1D("lepton_dsigminus_deta", 20, 0.0, 4.0);
-      _htmp_dsigplus_deta  = bookHistogram1D("lepton_dsigplus_deta", 20, 0.0, 4.0);
+      _h_W_mass = bookHisto1D("W_mass", 50, 55.0, 105.0);
+      _h_W_pT = bookHisto1D("W_pT", logspace(100, 1.0, 0.5*sqrtS()));
+      _h_W_pT_peak = bookHisto1D("W_pT_peak", 25, 0.0, 125.0);
+      _h_W_y = bookHisto1D("W_y", 40, -4.0, 4.0);
+      _h_W_phi = bookHisto1D("W_phi", 25, 0.0, TWOPI);
+      _h_Wplus_pT = bookHisto1D("Wplus_pT", logspace(25, 10.0, 0.5*sqrtS()));
+      _h_Wminus_pT = bookHisto1D("Wminus_pT", logspace(25, 10.0, 0.5*sqrtS()));
+      _h_lepton_pT = bookHisto1D("lepton_pT", logspace(100, 10.0, 0.25*sqrtS()));
+      _h_lepton_eta = bookHisto1D("lepton_eta", 40, -4.0, 4.0);
+      _htmp_dsigminus_deta = bookHisto1D("lepton_dsigminus_deta", 20, 0.0, 4.0);
+      _htmp_dsigplus_deta  = bookHisto1D("lepton_dsigplus_deta", 20, 0.0, 4.0);
+
+      _h_asym = bookScatter2D("W_chargeasymm_eta");
+      _h_asym_pT = bookScatter2D("W_chargeasymm_pT");
     }
 
 
@@ -96,18 +99,14 @@
       scale(_h_lepton_eta, crossSection()/sumOfWeights());
 
       // Construct asymmetry: (dsig+/deta - dsig-/deta) / (dsig+/deta + dsig-/deta) for each Et region
-      AIDA::IHistogramFactory& hf = histogramFactory();
-      IHistogram1D* numtmp = hf.subtract("/numtmp", *_htmp_dsigplus_deta, *_htmp_dsigminus_deta);
-      IHistogram1D* dentmp = hf.add("/dentmp", *_htmp_dsigplus_deta, *_htmp_dsigminus_deta);
-      assert(numtmp && dentmp);
-      hf.divide(histoDir() + "/W_chargeasymm_eta", *numtmp, *dentmp);
-      hf.destroy(numtmp);
-      hf.destroy(dentmp);
-      hf.destroy(_htmp_dsigminus_deta);
-      hf.destroy(_htmp_dsigplus_deta);
+      divide(*_htmp_dsigplus_deta - *_htmp_dsigminus_deta,
+             *_htmp_dsigplus_deta + *_htmp_dsigminus_deta,
+             _h_asym);
+
+      // // W charge asymmetry vs. pTW: dsig+/dpT / dsig-/dpT
+      divide(_h_Wplus_pT, _h_Wminus_pT, 
+             _h_asym_pT);
 
-      // W charge asymmetry vs. pTW: dsig+/dpT / dsig-/dpT
-      hf.divide(histoDir() + "/W_chargeasymm_pT", *_h_Wplus_pT, *_h_Wminus_pT);
       scale(_h_Wplus_pT, crossSection()/sumOfWeights());
       scale(_h_Wminus_pT, crossSection()/sumOfWeights());
     }
@@ -119,18 +118,21 @@
 
     /// @name Histograms
     //@{
-    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_Wplus_pT;
-    AIDA::IHistogram1D * _h_Wminus_pT;
-    AIDA::IHistogram1D * _h_lepton_pT;
-    AIDA::IHistogram1D * _h_lepton_eta;
+    Histo1DPtr _h_W_mass;
+    Histo1DPtr _h_W_pT;
+    Histo1DPtr _h_W_pT_peak;
+    Histo1DPtr _h_W_y;
+    Histo1DPtr _h_W_phi;
+    Histo1DPtr _h_Wplus_pT;
+    Histo1DPtr _h_Wminus_pT;
+    Histo1DPtr _h_lepton_pT;
+    Histo1DPtr _h_lepton_eta;
+
+    Histo1DPtr _htmp_dsigminus_deta;
+    Histo1DPtr _htmp_dsigplus_deta;
 
-    AIDA::IHistogram1D * _htmp_dsigminus_deta;
-    AIDA::IHistogram1D * _htmp_dsigplus_deta;
+    Scatter2DPtr _h_asym;
+    Scatter2DPtr _h_asym_pT;
     //@}
 
   };

Modified: trunk/src/Analyses/MC_WJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_WJETS.cc	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/src/Analyses/MC_WJETS.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -28,25 +28,11 @@
       FinalState fs;
       WFinder wfinder(fs, -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);
+      FastJets jetpro(wfinder.remainingFinalState(), FastJets::ANTIKT, 0.4);
       addProjection(jetpro, "Jets");
 
-      _h_W_mass = bookHisto1D("W_mass", 50, 55.0, 105.0);
-      _h_W_pT = bookHisto1D("W_pT", logspace(100, 1.0, 0.5*sqrtS()));
-      _h_W_pT_peak = bookHisto1D("W_pT_peak", 25, 0.0, 125.0);
-      _h_W_y = bookHisto1D("W_y", 40, -4.0, 4.0);
-      _h_W_phi = bookHisto1D("W_phi", 25, 0.0, TWOPI);
       _h_W_jet1_deta = bookHisto1D("W_jet1_deta", 50, -5.0, 5.0);
       _h_W_jet1_dR = bookHisto1D("W_jet1_dR", 25, 0.5, 7.0);
-      _h_Wplus_pT = bookHisto1D("Wplus_pT", logspace(25, 10.0, 0.5*sqrtS()));
-      _h_Wminus_pT = bookHisto1D("Wminus_pT", logspace(25, 10.0, 0.5*sqrtS()));
-      _h_lepton_pT = bookHisto1D("lepton_pT", logspace(100, 10.0, 0.25*sqrtS()));
-      _h_lepton_eta = bookHisto1D("lepton_eta", 40, -4.0, 4.0);
-      _htmp_dsigminus_deta = bookHisto1D("lepton_dsigminus_deta", 20, 0.0, 4.0);
-      _htmp_dsigplus_deta  = bookHisto1D("lepton_dsigplus_deta", 20, 0.0, 4.0);
-
-      _h_asym = bookScatter2D("W_chargeasymm_eta");
-      _h_asym_pT = bookScatter2D("W_chargeasymm_pT");
 
       MC_JetAnalysis::init();
     }
@@ -55,46 +41,15 @@
 
     /// Do the analysis
     void analyze(const Event & e) {
+      const double weight = e.weight();
+
       const WFinder& wfinder = applyProjection<WFinder>(e, "WFinder");
       if (wfinder.bosons().size() != 1) {
         vetoEvent;
       }
-      const double weight = e.weight();
-
-      double charge3_x_eta = 0;
-      int charge3 = 0;
-      FourMomentum emom;
       FourMomentum wmom(wfinder.bosons().front().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);
-      Particle l=wfinder.constituentLeptons()[0];
-      _h_lepton_pT->fill(l.momentum().pT(), weight);
-      _h_lepton_eta->fill(l.momentum().eta(), weight);
-      if (PID::threeCharge(l.pdgId()) != 0) {
-        emom = l.momentum();
-        charge3_x_eta = PID::threeCharge(l.pdgId()) * emom.eta();
-        charge3 = PID::threeCharge(l.pdgId());
-      }
-      assert(charge3_x_eta != 0);
-      assert(charge3!=0);
-      if (emom.Et() > 30/GeV) {
-        if (charge3_x_eta < 0) {
-          _htmp_dsigminus_deta->fill(emom.eta(), weight);
-        } else {
-          _htmp_dsigplus_deta->fill(emom.eta(), weight);
-        }
-      }
-      if (charge3 < 0) {
-        _h_Wminus_pT->fill(wmom.pT(), weight);
-      } else {
-        _h_Wplus_pT->fill(wmom.pT(), weight);
-      }
 
-      const FastJets& jetpro = applyProjection<FastJets>(e, "Jets");
-      const Jets& jets = jetpro.jetsByPt(20.0*GeV);
+      const Jets& jets = applyProjection<FastJets>(e, "Jets").jetsByPt(m_jetptcut);
       if (jets.size() > 0) {
         _h_W_jet1_deta->fill(wmom.eta()-jets[0].momentum().eta(), weight);
         _h_W_jet1_dR->fill(deltaR(wmom, jets[0].momentum()), weight);
@@ -106,27 +61,8 @@
 
     /// Finalize
     void finalize() {
-      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());
-
-      // Construct asymmetry: (dsig+/deta - dsig-/deta) / (dsig+/deta + dsig-/deta) for each Et region
-      divide(*_htmp_dsigplus_deta - *_htmp_dsigminus_deta,
-	     *_htmp_dsigplus_deta + *_htmp_dsigminus_deta,
-	     _h_asym);
-
-      // // W charge asymmetry vs. pTW: dsig+/dpT / dsig-/dpT
-      divide(_h_Wplus_pT, _h_Wminus_pT, 
-	     _h_asym_pT);
-
-      scale(_h_Wplus_pT, crossSection()/sumOfWeights());
-      scale(_h_Wminus_pT, crossSection()/sumOfWeights());
 
       MC_JetAnalysis::finalize();
     }
@@ -138,25 +74,8 @@
 
     /// @name Histograms
     //@{
-    Histo1DPtr _h_W_mass;
-    Histo1DPtr _h_W_pT;
-    Histo1DPtr _h_W_pT_peak;
-    Histo1DPtr _h_W_y;
-    Histo1DPtr _h_W_phi;
     Histo1DPtr _h_W_jet1_deta;
     Histo1DPtr _h_W_jet1_dR;
-    Histo1DPtr _h_Wplus_pT;
-    Histo1DPtr _h_Wminus_pT;
-    Histo1DPtr _h_lepton_pT;
-    Histo1DPtr _h_lepton_eta;
-
-    Histo1DPtr _htmp_dsigminus_deta;
-    Histo1DPtr _htmp_dsigplus_deta;
-
-    Scatter2DPtr _h_asym;
-    Scatter2DPtr _h_asym_pT;
-
-
     //@}
 
   };

Copied and modified: trunk/src/Analyses/MC_WKTSPLITTINGS.cc (from r4107, branches/2012-06-aidarivet/src/Analyses/MC_WKTSPLITTINGS.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/MC_WKTSPLITTINGS.cc	Fri Jan 25 13:44:47 2013	(r4107, copy source)
+++ trunk/src/Analyses/MC_WKTSPLITTINGS.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -3,7 +3,7 @@
 #include "Rivet/Projections/WFinder.hh"
 #include "Rivet/Projections/FastJets.hh"
 #include "Rivet/Tools/Logging.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 #include "Rivet/Tools/ParticleIdUtils.hh"
 
 namespace Rivet {

Copied and modified: trunk/src/Analyses/MC_WWINC.cc (from r4107, branches/2012-06-aidarivet/src/Analyses/MC_WWINC.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/MC_WWINC.cc	Fri Jan 25 13:44:47 2013	(r4107, copy source)
+++ trunk/src/Analyses/MC_WWINC.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -4,7 +4,7 @@
 #include "Rivet/Projections/VetoedFinalState.hh"
 #include "Rivet/Tools/Logging.hh"
 #include "Rivet/Tools/ParticleIdUtils.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 
 namespace Rivet {
 
@@ -34,35 +34,35 @@
       addProjection(wmnufinder, "WmnuFinder");
 
       // properties of the pair momentum
-      _h_WW_pT = bookHistogram1D("WW_pT", logBinEdges(100, 1.0, 0.5*sqrtS()));
-      _h_WW_pT_peak = bookHistogram1D("WW_pT_peak", 25, 0.0, 25.0);
-      _h_WW_eta = bookHistogram1D("WW_eta", 40, -7.0, 7.0);
-      _h_WW_phi = bookHistogram1D("WW_phi", 25, 0.0, TWOPI);
-      _h_WW_m = bookHistogram1D("WW_m", logBinEdges(100, 150.0, 180.0+0.25*sqrtS()));
+      _h_WW_pT = bookHisto1D("WW_pT", logspace(100, 1.0, 0.5*sqrtS()));
+      _h_WW_pT_peak = bookHisto1D("WW_pT_peak", 25, 0.0, 25.0);
+      _h_WW_eta = bookHisto1D("WW_eta", 40, -7.0, 7.0);
+      _h_WW_phi = bookHisto1D("WW_phi", 25, 0.0, TWOPI);
+      _h_WW_m = bookHisto1D("WW_m", logspace(100, 150.0, 180.0+0.25*sqrtS()));
 
       // correlations between the WW
-      _h_WW_dphi = bookHistogram1D("WW_dphi", 25, 0.0, PI);  /// @todo non-linear?
-      _h_WW_deta = bookHistogram1D("WW_deta", 25, -7.0, 7.0);
-      _h_WW_dR = bookHistogram1D("WW_dR", 25, 0.5, 7.0);
-      _h_WW_dpT = bookHistogram1D("WW_dpT", logBinEdges(100, 1.0, 0.5*sqrtS()));
-      _h_WW_costheta_planes = bookHistogram1D("WW_costheta_planes", 25, -1.0, 1.0);
+      _h_WW_dphi = bookHisto1D("WW_dphi", 25, 0.0, PI);  /// @todo non-linear?
+      _h_WW_deta = bookHisto1D("WW_deta", 25, -7.0, 7.0);
+      _h_WW_dR = bookHisto1D("WW_dR", 25, 0.5, 7.0);
+      _h_WW_dpT = bookHisto1D("WW_dpT", logspace(100, 1.0, 0.5*sqrtS()));
+      _h_WW_costheta_planes = bookHisto1D("WW_costheta_planes", 25, -1.0, 1.0);
 
       /// @todo fuer WW: missing ET
 
       // properties of the W bosons
-      _h_W_pT = bookHistogram1D("W_pT", logBinEdges(100, 10.0, 0.25*sqrtS()));
-      _h_W_eta = bookHistogram1D("W_eta", 70, -7.0, 7.0);
+      _h_W_pT = bookHisto1D("W_pT", logspace(100, 10.0, 0.25*sqrtS()));
+      _h_W_eta = bookHisto1D("W_eta", 70, -7.0, 7.0);
 
       // properties of the leptons
-      _h_Wl_pT = bookHistogram1D("Wl_pT", logBinEdges(100, 30.0, 0.1
+      _h_Wl_pT = bookHisto1D("Wl_pT", logspace(100, 30.0, 0.1
                                                       *sqrtS()));
-      _h_Wl_eta = bookHistogram1D("Wl_eta", 40, -3.5, 3.5);
+      _h_Wl_eta = bookHisto1D("Wl_eta", 40, -3.5, 3.5);
 
       // correlations between the opposite charge leptons
-      _h_WeWm_dphi = bookHistogram1D("WeWm_dphi", 25, 0.0, PI);
-      _h_WeWm_deta = bookHistogram1D("WeWm_deta", 25, -5.0, 5.0);
-      _h_WeWm_dR = bookHistogram1D("WeWm_dR", 25, 0.5, 5.0);
-      _h_WeWm_m = bookHistogram1D("WeWm_m", 100, 0.0, 300.0);
+      _h_WeWm_dphi = bookHisto1D("WeWm_dphi", 25, 0.0, PI);
+      _h_WeWm_deta = bookHisto1D("WeWm_deta", 25, -5.0, 5.0);
+      _h_WeWm_dR = bookHisto1D("WeWm_dR", 25, 0.5, 5.0);
+      _h_WeWm_m = bookHisto1D("WeWm_m", 100, 0.0, 300.0);
     }
 
 
@@ -156,24 +156,24 @@
 
     /// @name Histograms
     //@{
-    AIDA::IHistogram1D * _h_WW_pT;
-    AIDA::IHistogram1D * _h_WW_pT_peak;
-    AIDA::IHistogram1D * _h_WW_eta;
-    AIDA::IHistogram1D * _h_WW_phi;
-    AIDA::IHistogram1D * _h_WW_m;
-    AIDA::IHistogram1D * _h_WW_dphi;
-    AIDA::IHistogram1D * _h_WW_deta;
-    AIDA::IHistogram1D * _h_WW_dR;
-    AIDA::IHistogram1D * _h_WW_dpT;
-    AIDA::IHistogram1D * _h_WW_costheta_planes;
-    AIDA::IHistogram1D * _h_W_pT;
-    AIDA::IHistogram1D * _h_W_eta;
-    AIDA::IHistogram1D * _h_Wl_pT;
-    AIDA::IHistogram1D * _h_Wl_eta;
-    AIDA::IHistogram1D * _h_WeWm_dphi;
-    AIDA::IHistogram1D * _h_WeWm_deta;
-    AIDA::IHistogram1D * _h_WeWm_dR;
-    AIDA::IHistogram1D * _h_WeWm_m;
+    Histo1DPtr _h_WW_pT;
+    Histo1DPtr _h_WW_pT_peak;
+    Histo1DPtr _h_WW_eta;
+    Histo1DPtr _h_WW_phi;
+    Histo1DPtr _h_WW_m;
+    Histo1DPtr _h_WW_dphi;
+    Histo1DPtr _h_WW_deta;
+    Histo1DPtr _h_WW_dR;
+    Histo1DPtr _h_WW_dpT;
+    Histo1DPtr _h_WW_costheta_planes;
+    Histo1DPtr _h_W_pT;
+    Histo1DPtr _h_W_eta;
+    Histo1DPtr _h_Wl_pT;
+    Histo1DPtr _h_Wl_eta;
+    Histo1DPtr _h_WeWm_dphi;
+    Histo1DPtr _h_WeWm_deta;
+    Histo1DPtr _h_WeWm_dR;
+    Histo1DPtr _h_WeWm_m;
     //@}
 
   };

Modified: trunk/src/Analyses/MC_WWJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_WWJETS.cc	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/src/Analyses/MC_WWJETS.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -38,40 +38,9 @@
       jetinput
           .addVetoOnThisFinalState(wenufinder)
           .addVetoOnThisFinalState(wmnufinder);
-      FastJets jetpro(jetinput, FastJets::KT, 0.7);
+      FastJets jetpro(jetinput, FastJets::ANTIKT, 0.4);
       addProjection(jetpro, "Jets");
 
-      // properties of the pair momentum
-      _h_WW_pT = bookHisto1D("WW_pT", logspace(100, 1.0, 0.5*sqrtS()));
-      _h_WW_pT_peak = bookHisto1D("WW_pT_peak", 25, 0.0, 25.0);
-      _h_WW_eta = bookHisto1D("WW_eta", 40, -7.0, 7.0);
-      _h_WW_phi = bookHisto1D("WW_phi", 25, 0.0, TWOPI);
-      _h_WW_m = bookHisto1D("WW_m", logspace(100, 150.0, 180.0+0.25*sqrtS()));
-
-      // correlations between the WW
-      _h_WW_dphi = bookHisto1D("WW_dphi", 25, 0.0, PI);  /// @todo non-linear?
-      _h_WW_deta = bookHisto1D("WW_deta", 25, -7.0, 7.0);
-      _h_WW_dR = bookHisto1D("WW_dR", 25, 0.5, 7.0);
-      _h_WW_dpT = bookHisto1D("WW_dpT", logspace(100, 1.0, 0.5*sqrtS()));
-      _h_WW_costheta_planes = bookHisto1D("WW_costheta_planes", 25, -1.0, 1.0);
-
-      /// @todo fuer WW: missing ET
-
-      // properties of the W bosons
-      _h_W_pT = bookHisto1D("W_pT", logspace(100, 10.0, 0.25*sqrtS()));
-      _h_W_eta = bookHisto1D("W_eta", 70, -7.0, 7.0);
-
-      // properties of the leptons
-      _h_Wl_pT = bookHisto1D("Wl_pT", logspace(100, 30.0, 0.1
-                                                      *sqrtS()));
-      _h_Wl_eta = bookHisto1D("Wl_eta", 40, -3.5, 3.5);
-
-      // correlations between the opposite charge leptons
-      _h_WeWm_dphi = bookHisto1D("WeWm_dphi", 25, 0.0, PI);
-      _h_WeWm_deta = bookHisto1D("WeWm_deta", 25, -5.0, 5.0);
-      _h_WeWm_dR = bookHisto1D("WeWm_dR", 25, 0.5, 5.0);
-      _h_WeWm_m = bookHisto1D("WeWm_m", 100, 0.0, 300.0);
-
       // correlations with jets
       _h_WW_jet1_deta = bookHisto1D("WW_jet1_deta", 70, -7.0, 7.0);
       _h_WW_jet1_dR = bookHisto1D("WW_jet1_dR", 25, 1.5, 7.0);
@@ -109,42 +78,7 @@
       FourMomentum mm=wmnufinder.constituentLeptons()[0].momentum();
       FourMomentum mnu=wmnufinder.constituentNeutrinos()[0].momentum();
 
-      _h_WW_pT->fill(ww.pT(),weight);
-      _h_WW_pT_peak->fill(ww.pT(),weight);
-      _h_WW_eta->fill(ww.eta(),weight);
-      _h_WW_phi->fill(ww.azimuthalAngle(),weight);
-      double mww2=ww.mass2();
-      if (mww2>0.0) _h_WW_m->fill(sqrt(mww2), weight);
-
-      _h_WW_dphi->fill(mapAngle0ToPi(wenu.phi()-wmnu.phi()), weight);
-      _h_WW_deta->fill(wenu.eta()-wmnu.eta(), weight);
-      _h_WW_dR->fill(deltaR(wenu,wmnu), weight);
-      _h_WW_dpT->fill(fabs(wenu.pT()-wmnu.pT()), weight);
-
-      Vector3 crossWenu = ep.vector3().cross(enu.vector3());
-      Vector3 crossWmnu = mm.vector3().cross(mnu.vector3());
-      double costheta = crossWenu.dot(crossWmnu)/crossWenu.mod()/crossWmnu.mod();
-      _h_WW_costheta_planes->fill(costheta, weight);
-
-      _h_W_pT->fill(wenu.pT(),weight);
-      _h_W_pT->fill(wmnu.pT(),weight);
-      _h_W_eta->fill(wenu.eta(),weight);
-      _h_W_eta->fill(wmnu.eta(),weight);
-
-      _h_Wl_pT->fill(ep.pT(), weight);
-      _h_Wl_pT->fill(mm.pT(), weight);
-      _h_Wl_eta->fill(ep.eta(), weight);
-      _h_Wl_eta->fill(mm.eta(), weight);
-
-      _h_WeWm_dphi->fill(mapAngle0ToPi(ep.phi()-mm.phi()), weight);
-      _h_WeWm_deta->fill(ep.eta()-mm.eta(), weight);
-      _h_WeWm_dR->fill(deltaR(ep,mm), weight);
-      double m2=FourMomentum(ep+mm).mass2();
-      if (m2 < 0) m2 = 0.0;
-      _h_WeWm_m->fill(sqrt(m2), weight);
-
-      const FastJets& jetpro = applyProjection<FastJets>(e, "Jets");
-      const Jets& jets = jetpro.jetsByPt(20.0*GeV);
+      const Jets& jets = applyProjection<FastJets>(e, "Jets").jetsByPt(m_jetptcut);
       if (jets.size() > 0) {
         _h_WW_jet1_deta->fill(ww.eta()-jets[0].momentum().eta(), weight);
         _h_WW_jet1_dR->fill(deltaR(ww, jets[0].momentum()), weight);
@@ -170,24 +104,6 @@
     /// Finalize
     void finalize() {
       double norm=crossSection()/sumOfWeights();
-      scale(_h_WW_pT, norm);
-      scale(_h_WW_pT_peak, norm);
-      scale(_h_WW_eta, norm);
-      scale(_h_WW_phi, norm);
-      scale(_h_WW_m, norm);
-      scale(_h_WW_dphi, norm);
-      scale(_h_WW_deta, norm);
-      scale(_h_WW_dR, norm);
-      scale(_h_WW_dpT, norm);
-      scale(_h_WW_costheta_planes, norm);
-      scale(_h_W_pT, norm);
-      scale(_h_W_eta, norm);
-      scale(_h_Wl_pT, norm);
-      scale(_h_Wl_eta, norm);
-      scale(_h_WeWm_dphi, norm);
-      scale(_h_WeWm_deta, norm);
-      scale(_h_WeWm_dR, norm);
-      scale(_h_WeWm_m, norm);
       scale(_h_WW_jet1_deta, norm);
       scale(_h_WW_jet1_dR, norm);
       scale(_h_We_jet1_dR, norm);
@@ -204,24 +120,6 @@
 
     /// @name Histograms
     //@{
-    Histo1DPtr _h_WW_pT;
-    Histo1DPtr _h_WW_pT_peak;
-    Histo1DPtr _h_WW_eta;
-    Histo1DPtr _h_WW_phi;
-    Histo1DPtr _h_WW_m;
-    Histo1DPtr _h_WW_dphi;
-    Histo1DPtr _h_WW_deta;
-    Histo1DPtr _h_WW_dR;
-    Histo1DPtr _h_WW_dpT;
-    Histo1DPtr _h_WW_costheta_planes;
-    Histo1DPtr _h_W_pT;
-    Histo1DPtr _h_W_eta;
-    Histo1DPtr _h_Wl_pT;
-    Histo1DPtr _h_Wl_eta;
-    Histo1DPtr _h_WeWm_dphi;
-    Histo1DPtr _h_WeWm_deta;
-    Histo1DPtr _h_WeWm_dR;
-    Histo1DPtr _h_WeWm_m;
     Histo1DPtr _h_WW_jet1_deta;
     Histo1DPtr _h_WW_jet1_dR;
     Histo1DPtr _h_We_jet1_dR;

Copied and modified: trunk/src/Analyses/MC_WWKTSPLITTINGS.cc (from r4107, branches/2012-06-aidarivet/src/Analyses/MC_WWKTSPLITTINGS.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/MC_WWKTSPLITTINGS.cc	Fri Jan 25 13:44:47 2013	(r4107, copy source)
+++ trunk/src/Analyses/MC_WWKTSPLITTINGS.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -4,7 +4,7 @@
 #include "Rivet/Projections/FastJets.hh"
 #include "Rivet/Projections/VetoedFinalState.hh"
 #include "Rivet/Tools/Logging.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 
 namespace Rivet {
 

Copied and modified: trunk/src/Analyses/MC_ZINC.cc (from r4107, branches/2012-06-aidarivet/src/Analyses/MC_ZINC.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/MC_ZINC.cc	Fri Jan 25 13:44:47 2013	(r4107, copy source)
+++ trunk/src/Analyses/MC_ZINC.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -2,7 +2,7 @@
 #include "Rivet/Analysis.hh"
 #include "Rivet/Projections/ZFinder.hh"
 #include "Rivet/Tools/Logging.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 
 namespace Rivet {
 
@@ -26,13 +26,13 @@
       ZFinder zfinder(fs, -3.5, 3.5, 25.0*GeV, ELECTRON, 65.0*GeV, 115.0*GeV, 0.2, true, true);
       addProjection(zfinder, "ZFinder");
 
-      _h_Z_mass = bookHistogram1D("Z_mass", 50, 66.0, 116.0);
-      _h_Z_pT = bookHistogram1D("Z_pT", logBinEdges(100, 1.0, 0.5*sqrtS()));
-      _h_Z_pT_peak = bookHistogram1D("Z_pT_peak", 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_lepton_pT = bookHistogram1D("lepton_pT", logBinEdges(100, 10.0, 0.25*sqrtS()));
-      _h_lepton_eta = bookHistogram1D("lepton_eta", 40, -4.0, 4.0);
+      _h_Z_mass = bookHisto1D("Z_mass", 50, 66.0, 116.0);
+      _h_Z_pT = bookHisto1D("Z_pT", logspace(100, 1.0, 0.5*sqrtS()));
+      _h_Z_pT_peak = bookHisto1D("Z_pT_peak", 25, 0.0, 25.0);
+      _h_Z_y = bookHisto1D("Z_y", 40, -4.0, 4.0);
+      _h_Z_phi = bookHisto1D("Z_phi", 25, 0.0, TWOPI);
+      _h_lepton_pT = bookHisto1D("lepton_pT", logspace(100, 10.0, 0.25*sqrtS()));
+      _h_lepton_eta = bookHisto1D("lepton_eta", 40, -4.0, 4.0);
 
     }
 
@@ -77,13 +77,13 @@
 
     /// @name Histograms
     //@{
-    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_lepton_pT;
-    AIDA::IHistogram1D * _h_lepton_eta;
+    Histo1DPtr _h_Z_mass;
+    Histo1DPtr _h_Z_pT;
+    Histo1DPtr _h_Z_pT_peak;
+    Histo1DPtr _h_Z_y;
+    Histo1DPtr _h_Z_phi;
+    Histo1DPtr _h_lepton_pT;
+    Histo1DPtr _h_lepton_eta;
     //@}
 
   };

Modified: trunk/src/Analyses/MC_ZJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_ZJETS.cc	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/src/Analyses/MC_ZJETS.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -26,18 +26,11 @@
       FinalState fs;
       ZFinder zfinder(fs, -3.5, 3.5, 25.0*GeV, ELECTRON, 65.0*GeV, 115.0*GeV, 0.2, true, true);
       addProjection(zfinder, "ZFinder");
-      FastJets jetpro(zfinder.remainingFinalState(), FastJets::KT, 0.7);
+      FastJets jetpro(zfinder.remainingFinalState(), FastJets::ANTIKT, 0.4);
       addProjection(jetpro, "Jets");
 
-      _h_Z_mass = bookHisto1D("Z_mass", 50, 66.0, 116.0);
-      _h_Z_pT = bookHisto1D("Z_pT", logspace(100, 1.0, 0.5*sqrtS()));
-      _h_Z_pT_peak = bookHisto1D("Z_pT_peak", 25, 0.0, 25.0);
-      _h_Z_y = bookHisto1D("Z_y", 40, -4.0, 4.0);
-      _h_Z_phi = bookHisto1D("Z_phi", 25, 0.0, TWOPI);
       _h_Z_jet1_deta = bookHisto1D("Z_jet1_deta", 50, -5.0, 5.0);
       _h_Z_jet1_dR = bookHisto1D("Z_jet1_dR", 25, 0.5, 7.0);
-      _h_lepton_pT = bookHisto1D("lepton_pT", logspace(100, 10.0, 0.25*sqrtS()));
-      _h_lepton_eta = bookHisto1D("lepton_eta", 40, -4.0, 4.0);
 
       MC_JetAnalysis::init();
     }
@@ -53,18 +46,8 @@
       const double weight = e.weight();
 
       FourMomentum zmom(zfinder.bosons()[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.constituents()) {
-        _h_lepton_pT->fill(l.momentum().pT(), weight);
-        _h_lepton_eta->fill(l.momentum().eta(), weight);
-      }
 
-      const FastJets& jetpro = applyProjection<FastJets>(e, "Jets");
-      const Jets& jets = jetpro.jetsByPt(20.0*GeV);
+      const Jets& jets = applyProjection<FastJets>(e, "Jets").jetsByPt(m_jetptcut);
       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);
@@ -76,15 +59,8 @@
 
     /// Finalize
     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());
-      scale(_h_lepton_eta, crossSection()/sumOfWeights());
 
       MC_JetAnalysis::finalize();
     }
@@ -96,15 +72,8 @@
 
     /// @name Histograms
     //@{
-    Histo1DPtr _h_Z_mass;
-    Histo1DPtr _h_Z_pT;
-    Histo1DPtr _h_Z_pT_peak;
-    Histo1DPtr _h_Z_y;
-    Histo1DPtr _h_Z_phi;
     Histo1DPtr _h_Z_jet1_deta;
     Histo1DPtr _h_Z_jet1_dR;
-    Histo1DPtr _h_lepton_pT;
-    Histo1DPtr _h_lepton_eta;
     //@}
 
   };

Copied and modified: trunk/src/Analyses/MC_ZKTSPLITTINGS.cc (from r4107, branches/2012-06-aidarivet/src/Analyses/MC_ZKTSPLITTINGS.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/MC_ZKTSPLITTINGS.cc	Fri Jan 25 13:44:47 2013	(r4107, copy source)
+++ trunk/src/Analyses/MC_ZKTSPLITTINGS.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -3,7 +3,7 @@
 #include "Rivet/Projections/ZFinder.hh"
 #include "Rivet/Projections/FastJets.hh"
 #include "Rivet/Tools/Logging.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 
 namespace Rivet {
 

Copied and modified: trunk/src/Analyses/MC_ZZINC.cc (from r4107, branches/2012-06-aidarivet/src/Analyses/MC_ZZINC.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/MC_ZZINC.cc	Fri Jan 25 13:44:47 2013	(r4107, copy source)
+++ trunk/src/Analyses/MC_ZZINC.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -4,7 +4,7 @@
 #include "Rivet/Projections/VetoedFinalState.hh"
 #include "Rivet/Tools/Logging.hh"
 #include "Rivet/Tools/ParticleIdUtils.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 
 namespace Rivet {
 
@@ -33,33 +33,33 @@
       addProjection(zmmfinder, "ZmmFinder");
 
       // properties of the pair momentum
-      _h_ZZ_pT = bookHistogram1D("ZZ_pT", logBinEdges(100, 1.0, 0.5*sqrtS()));
-      _h_ZZ_pT_peak = bookHistogram1D("ZZ_pT_peak", 25, 0.0, 25.0);
-      _h_ZZ_eta = bookHistogram1D("ZZ_eta", 40, -7.0, 7.0);
-      _h_ZZ_phi = bookHistogram1D("ZZ_phi", 25, 0.0, TWOPI);
-      _h_ZZ_m = bookHistogram1D("ZZ_m", logBinEdges(100, 150.0, 180.0+0.25*sqrtS()));
+      _h_ZZ_pT = bookHisto1D("ZZ_pT", logspace(100, 1.0, 0.5*sqrtS()));
+      _h_ZZ_pT_peak = bookHisto1D("ZZ_pT_peak", 25, 0.0, 25.0);
+      _h_ZZ_eta = bookHisto1D("ZZ_eta", 40, -7.0, 7.0);
+      _h_ZZ_phi = bookHisto1D("ZZ_phi", 25, 0.0, TWOPI);
+      _h_ZZ_m = bookHisto1D("ZZ_m", logspace(100, 150.0, 180.0+0.25*sqrtS()));
 
       // correlations between the ZZ
-      _h_ZZ_dphi = bookHistogram1D("ZZ_dphi", 25, 0.0, PI);  /// @todo non-linear?
-      _h_ZZ_deta = bookHistogram1D("ZZ_deta", 25, -7.0, 7.0);
-      _h_ZZ_dR = bookHistogram1D("ZZ_dR", 25, 0.5, 7.0);
-      _h_ZZ_dpT = bookHistogram1D("ZZ_dpT", logBinEdges(100, 1.0, 0.5*sqrtS()));
-      _h_ZZ_costheta_planes = bookHistogram1D("ZZ_costheta_planes", 25, -1.0, 1.0);
+      _h_ZZ_dphi = bookHisto1D("ZZ_dphi", 25, 0.0, PI);  /// @todo non-linear?
+      _h_ZZ_deta = bookHisto1D("ZZ_deta", 25, -7.0, 7.0);
+      _h_ZZ_dR = bookHisto1D("ZZ_dR", 25, 0.5, 7.0);
+      _h_ZZ_dpT = bookHisto1D("ZZ_dpT", logspace(100, 1.0, 0.5*sqrtS()));
+      _h_ZZ_costheta_planes = bookHisto1D("ZZ_costheta_planes", 25, -1.0, 1.0);
 
       // properties of the Z bosons
-      _h_Z_pT = bookHistogram1D("Z_pT", logBinEdges(100, 10.0, 0.25*sqrtS()));
-      _h_Z_eta = bookHistogram1D("Z_eta", 70, -7.0, 7.0);
+      _h_Z_pT = bookHisto1D("Z_pT", logspace(100, 10.0, 0.25*sqrtS()));
+      _h_Z_eta = bookHisto1D("Z_eta", 70, -7.0, 7.0);
 
       // properties of the leptons
-      _h_Zl_pT = bookHistogram1D("Zl_pT", logBinEdges(100, 30.0, 0.1
+      _h_Zl_pT = bookHisto1D("Zl_pT", logspace(100, 30.0, 0.1
                                                       *sqrtS()));
-      _h_Zl_eta = bookHistogram1D("Zl_eta", 40, -3.5, 3.5);
+      _h_Zl_eta = bookHisto1D("Zl_eta", 40, -3.5, 3.5);
 
       // correlations between the opposite charge leptons
-      _h_ZeZm_dphi = bookHistogram1D("ZeZm_dphi", 25, 0.0, PI);
-      _h_ZeZm_deta = bookHistogram1D("ZeZm_deta", 25, -5.0, 5.0);
-      _h_ZeZm_dR = bookHistogram1D("ZeZm_dR", 25, 0.5, 5.0);
-      _h_ZeZm_m = bookHistogram1D("ZeZm_m", 100, 0.0, 300.0);
+      _h_ZeZm_dphi = bookHisto1D("ZeZm_dphi", 25, 0.0, PI);
+      _h_ZeZm_deta = bookHisto1D("ZeZm_deta", 25, -5.0, 5.0);
+      _h_ZeZm_dR = bookHisto1D("ZeZm_dR", 25, 0.5, 5.0);
+      _h_ZeZm_m = bookHisto1D("ZeZm_m", 100, 0.0, 300.0);
 
     }
 
@@ -159,24 +159,24 @@
 
     /// @name Histograms
     //@{
-    AIDA::IHistogram1D * _h_ZZ_pT;
-    AIDA::IHistogram1D * _h_ZZ_pT_peak;
-    AIDA::IHistogram1D * _h_ZZ_eta;
-    AIDA::IHistogram1D * _h_ZZ_phi;
-    AIDA::IHistogram1D * _h_ZZ_m;
-    AIDA::IHistogram1D * _h_ZZ_dphi;
-    AIDA::IHistogram1D * _h_ZZ_deta;
-    AIDA::IHistogram1D * _h_ZZ_dR;
-    AIDA::IHistogram1D * _h_ZZ_dpT;
-    AIDA::IHistogram1D * _h_ZZ_costheta_planes;
-    AIDA::IHistogram1D * _h_Z_pT;
-    AIDA::IHistogram1D * _h_Z_eta;
-    AIDA::IHistogram1D * _h_Zl_pT;
-    AIDA::IHistogram1D * _h_Zl_eta;
-    AIDA::IHistogram1D * _h_ZeZm_dphi;
-    AIDA::IHistogram1D * _h_ZeZm_deta;
-    AIDA::IHistogram1D * _h_ZeZm_dR;
-    AIDA::IHistogram1D * _h_ZeZm_m;
+    Histo1DPtr _h_ZZ_pT;
+    Histo1DPtr _h_ZZ_pT_peak;
+    Histo1DPtr _h_ZZ_eta;
+    Histo1DPtr _h_ZZ_phi;
+    Histo1DPtr _h_ZZ_m;
+    Histo1DPtr _h_ZZ_dphi;
+    Histo1DPtr _h_ZZ_deta;
+    Histo1DPtr _h_ZZ_dR;
+    Histo1DPtr _h_ZZ_dpT;
+    Histo1DPtr _h_ZZ_costheta_planes;
+    Histo1DPtr _h_Z_pT;
+    Histo1DPtr _h_Z_eta;
+    Histo1DPtr _h_Zl_pT;
+    Histo1DPtr _h_Zl_eta;
+    Histo1DPtr _h_ZeZm_dphi;
+    Histo1DPtr _h_ZeZm_deta;
+    Histo1DPtr _h_ZeZm_dR;
+    Histo1DPtr _h_ZeZm_m;
     //@}
 
   };

Modified: trunk/src/Analyses/MC_ZZJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_ZZJETS.cc	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/src/Analyses/MC_ZZJETS.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -37,40 +37,9 @@
       jetinput
           .addVetoOnThisFinalState(zeefinder)
           .addVetoOnThisFinalState(zmmfinder);
-      FastJets jetpro(jetinput, FastJets::KT, 0.7);
+      FastJets jetpro(jetinput, FastJets::ANTIKT, 0.4);
       addProjection(jetpro, "Jets");
 
-      // properties of the pair momentum
-      _h_ZZ_pT = bookHisto1D("ZZ_pT", logspace(100, 1.0, 0.5*sqrtS()));
-      _h_ZZ_pT_peak = bookHisto1D("ZZ_pT_peak", 25, 0.0, 25.0);
-      _h_ZZ_eta = bookHisto1D("ZZ_eta", 40, -7.0, 7.0);
-      _h_ZZ_phi = bookHisto1D("ZZ_phi", 25, 0.0, TWOPI);
-      _h_ZZ_m = bookHisto1D("ZZ_m", logspace(100, 150.0, 180.0+0.25*sqrtS()));
-
-      // correlations between the ZZ
-      _h_ZZ_dphi = bookHisto1D("ZZ_dphi", 25, 0.0, PI);  /// @todo non-linear?
-      _h_ZZ_deta = bookHisto1D("ZZ_deta", 25, -7.0, 7.0);
-      _h_ZZ_dR = bookHisto1D("ZZ_dR", 25, 0.5, 7.0);
-      _h_ZZ_dpT = bookHisto1D("ZZ_dpT", logspace(100, 1.0, 0.5*sqrtS()));
-      _h_ZZ_costheta_planes = bookHisto1D("ZZ_costheta_planes", 25, -1.0, 1.0);
-
-      /// @todo fuer WW: missing ET
-
-      // properties of the Z bosons
-      _h_Z_pT = bookHisto1D("Z_pT", logspace(100, 10.0, 0.25*sqrtS()));
-      _h_Z_eta = bookHisto1D("Z_eta", 70, -7.0, 7.0);
-
-      // properties of the leptons
-      _h_Zl_pT = bookHisto1D("Zl_pT", logspace(100, 30.0, 0.1
-                                                      *sqrtS()));
-      _h_Zl_eta = bookHisto1D("Zl_eta", 40, -3.5, 3.5);
-
-      // correlations between the opposite charge leptons
-      _h_ZeZm_dphi = bookHisto1D("ZeZm_dphi", 25, 0.0, PI);
-      _h_ZeZm_deta = bookHisto1D("ZeZm_deta", 25, -5.0, 5.0);
-      _h_ZeZm_dR = bookHisto1D("ZeZm_dR", 25, 0.5, 5.0);
-      _h_ZeZm_m = bookHisto1D("ZeZm_m", 100, 0.0, 300.0);
-
       // correlations with jets
       _h_ZZ_jet1_deta = bookHisto1D("ZZ_jet1_deta", 70, -7.0, 7.0);
       _h_ZZ_jet1_dR = bookHisto1D("ZZ_jet1_dR", 25, 1.5, 7.0);
@@ -102,65 +71,12 @@
       FourMomentum zmm(zmmfinder.bosons()[0].momentum());
       FourMomentum zz(zee+zmm);
       // find leptons
-      FourMomentum ep(0.0,0.0,0.0,0.0), em(0.0,0.0,0.0,0.0);
-      if (PID::threeCharge(zeefinder.constituents()[0])>0.0) {
-        ep=zeefinder.constituents()[0].momentum();
-        em=zeefinder.constituents()[1].momentum();
-      }
-      else {
-        ep=zeefinder.constituents()[1].momentum();
-        em=zeefinder.constituents()[0].momentum();
-      }
-      FourMomentum mp(0.0,0.0,0.0,0.0), mm(0.0,0.0,0.0,0.0);
-      if (PID::threeCharge(zmmfinder.constituents()[0])>0.0) {
-        mp=zmmfinder.constituents()[0].momentum();
-        mm=zmmfinder.constituents()[1].momentum();
-      }
-      else {
-        mp=zmmfinder.constituents()[1].momentum();
-        mm=zmmfinder.constituents()[0].momentum();
-      }
-
-      _h_ZZ_pT->fill(zz.pT(),weight);
-      _h_ZZ_pT_peak->fill(zz.pT(),weight);
-      _h_ZZ_eta->fill(zz.eta(),weight);
-      _h_ZZ_phi->fill(zz.azimuthalAngle(),weight);
-      double mzz2=zz.mass2();
-      if (mzz2>0.0) _h_ZZ_m->fill(sqrt(mzz2), weight);
-
-      _h_ZZ_dphi->fill(mapAngle0ToPi(zee.phi()-zmm.phi()), weight);
-      _h_ZZ_deta->fill(zee.eta()-zmm.eta(), weight);
-      _h_ZZ_dR->fill(deltaR(zee,zmm), weight);
-      _h_ZZ_dpT->fill(fabs(zee.pT()-zmm.pT()), weight);
-
-      Vector3 crossZee = ep.vector3().cross(em.vector3());
-      Vector3 crossZmm = mp.vector3().cross(mm.vector3());
-      double costheta = crossZee.dot(crossZmm)/crossZee.mod()/crossZmm.mod();
-      _h_ZZ_costheta_planes->fill(costheta, weight);
-
-      _h_Z_pT->fill(zee.pT(),weight);
-      _h_Z_pT->fill(zmm.pT(),weight);
-      _h_Z_eta->fill(zee.eta(),weight);
-      _h_Z_eta->fill(zmm.eta(),weight);
-
-      _h_Zl_pT->fill(ep.pT(), weight);
-      _h_Zl_pT->fill(em.pT(), weight);
-      _h_Zl_pT->fill(mp.pT(), weight);
-      _h_Zl_pT->fill(mm.pT(), weight);
-      _h_Zl_eta->fill(ep.eta(), weight);
-      _h_Zl_eta->fill(em.eta(), weight);
-      _h_Zl_eta->fill(mp.eta(), weight);
-      _h_Zl_eta->fill(mm.eta(), weight);
-
-      _h_ZeZm_dphi->fill(mapAngle0ToPi(ep.phi()-mm.phi()), weight);
-      _h_ZeZm_deta->fill(ep.eta()-mm.eta(), weight);
-      _h_ZeZm_dR->fill(deltaR(ep,mm), weight);
-      double m2=FourMomentum(ep+mm).mass2();
-      if (m2 < 0) m2 = 0.0;
-      _h_ZeZm_m->fill(sqrt(m2), weight);
+      FourMomentum ep(zeefinder.constituents()[0].momentum()),
+        em(zeefinder.constituents()[1].momentum()),
+        mp(zmmfinder.constituents()[0].momentum()),
+        mm(zmmfinder.constituents()[1].momentum());
 
-      const FastJets& jetpro = applyProjection<FastJets>(e, "Jets");
-      const Jets& jets = jetpro.jetsByPt(20.0*GeV);
+      const Jets& jets = applyProjection<FastJets>(e, "Jets").jetsByPt(m_jetptcut);
       if (jets.size() > 0) {
         _h_ZZ_jet1_deta->fill(zz.eta()-jets[0].momentum().eta(), weight);
         _h_ZZ_jet1_dR->fill(deltaR(zz, jets[0].momentum()), weight);
@@ -180,24 +96,6 @@
     /// Finalize
     void finalize() {
       double norm=crossSection()/sumOfWeights();
-      scale(_h_ZZ_pT, norm);
-      scale(_h_ZZ_pT_peak, norm);
-      scale(_h_ZZ_eta, norm);
-      scale(_h_ZZ_phi, norm);
-      scale(_h_ZZ_m, norm);
-      scale(_h_ZZ_dphi, norm);
-      scale(_h_ZZ_deta, norm);
-      scale(_h_ZZ_dR, norm);
-      scale(_h_ZZ_dpT, norm);
-      scale(_h_ZZ_costheta_planes, norm);
-      scale(_h_Z_pT, norm);
-      scale(_h_Z_eta, norm);
-      scale(_h_Zl_pT, norm);
-      scale(_h_Zl_eta, norm);
-      scale(_h_ZeZm_dphi, norm);
-      scale(_h_ZeZm_deta, norm);
-      scale(_h_ZeZm_dR, norm);
-      scale(_h_ZeZm_m, norm);
       scale(_h_ZZ_jet1_deta, norm);
       scale(_h_ZZ_jet1_dR, norm);
       scale(_h_Ze_jet1_dR, norm);
@@ -213,24 +111,6 @@
 
     /// @name Histograms
     //@{
-    Histo1DPtr _h_ZZ_pT;
-    Histo1DPtr _h_ZZ_pT_peak;
-    Histo1DPtr _h_ZZ_eta;
-    Histo1DPtr _h_ZZ_phi;
-    Histo1DPtr _h_ZZ_m;
-    Histo1DPtr _h_ZZ_dphi;
-    Histo1DPtr _h_ZZ_deta;
-    Histo1DPtr _h_ZZ_dR;
-    Histo1DPtr _h_ZZ_dpT;
-    Histo1DPtr _h_ZZ_costheta_planes;
-    Histo1DPtr _h_Z_pT;
-    Histo1DPtr _h_Z_eta;
-    Histo1DPtr _h_Zl_pT;
-    Histo1DPtr _h_Zl_eta;
-    Histo1DPtr _h_ZeZm_dphi;
-    Histo1DPtr _h_ZeZm_deta;
-    Histo1DPtr _h_ZeZm_dR;
-    Histo1DPtr _h_ZeZm_m;
     Histo1DPtr _h_ZZ_jet1_deta;
     Histo1DPtr _h_ZZ_jet1_dR;
     Histo1DPtr _h_Ze_jet1_dR;

Copied and modified: trunk/src/Analyses/MC_ZZKTSPLITTINGS.cc (from r4107, branches/2012-06-aidarivet/src/Analyses/MC_ZZKTSPLITTINGS.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/MC_ZZKTSPLITTINGS.cc	Fri Jan 25 13:44:47 2013	(r4107, copy source)
+++ trunk/src/Analyses/MC_ZZKTSPLITTINGS.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -4,7 +4,7 @@
 #include "Rivet/Projections/FastJets.hh"
 #include "Rivet/Projections/VetoedFinalState.hh"
 #include "Rivet/Tools/Logging.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 
 namespace Rivet {
 

Modified: trunk/src/Analyses/Makefile.am
==============================================================================
--- trunk/src/Analyses/Makefile.am	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/src/Analyses/Makefile.am	Fri Jan 25 15:46:06 2013	(r4109)
@@ -5,7 +5,8 @@
 
 noinst_LTLIBRARIES = libRivetAnalysisTools.la
 libRivetAnalysisTools_la_SOURCES = \
-    MC_JetAnalysis.cc
+    MC_JetAnalysis.cc \
+    MC_JetSplittings.cc
 
 ## ANALYSIS CATEGORIES
 ##
@@ -336,23 +337,35 @@
     EXAMPLE.cc \
     MC_DIPHOTON.cc \
     MC_GENERIC.cc \
+    MC_HINC.cc \
     MC_HJETS.cc \
+    MC_HKTSPLITTINGS.cc \
     MC_IDENTIFIED.cc \
     MC_JETS.cc \
     MC_LEADJETUE.cc \
     MC_PDFS.cc \
+    MC_PHOTONINC.cc \
     MC_PHOTONJETS.cc \
+    MC_PHOTONKTSPLITTINGS.cc \
     MC_PHOTONS.cc \
     MC_PRINTEVENT.cc \
     MC_SUSY.cc \
     MC_TTBAR.cc \
     MC_VH2BB.cc \
+    MC_WINC.cc \
     MC_WJETS.cc \
+    MC_WKTSPLITTINGS.cc \
     MC_WPOL.cc \
+    MC_WWINC.cc \
     MC_WWJETS.cc \
+    MC_WWKTSPLITTINGS.cc \
     MC_XS.cc \
+    MC_ZINC.cc \
     MC_ZJETS.cc \
-    MC_ZZJETS.cc
+    MC_ZKTSPLITTINGS.cc \
+    MC_ZZINC.cc \
+    MC_ZZJETS.cc \
+    MC_ZZKTSPLITTINGS.cc
 
 
 if ENABLE_UNVALIDATED

Modified: trunk/src/Projections/ZFinder.cc
==============================================================================
--- trunk/src/Projections/ZFinder.cc	Fri Jan 25 15:12:05 2013	(r4108)
+++ trunk/src/Projections/ZFinder.cc	Fri Jan 25 15:46:06 2013	(r4109)
@@ -116,7 +116,12 @@
     if (imfs.particlePairs().size() < 1) return;
     ParticlePair Zconstituents(imfs.particlePairs()[0]);
     Particle l1(Zconstituents.first), l2(Zconstituents.second);
-    _constituents += l1, l2;
+    if (PID::threeCharge(l1)>0.0) {
+      _constituents += l1, l2;
+    }
+    else {
+      _constituents += l2, l1;
+    }
     FourMomentum pZ = l1.momentum() + l2.momentum();
     const int z3charge = PID::threeCharge(l1.pdgId()) + PID::threeCharge(l2.pdgId());
     assert(z3charge == 0);


More information about the Rivet-svn mailing list