[Rivet-svn] r3930 - in branches/2012-06-aidarivet: data/anainfo data/plotinfo src/Analyses

blackhole at projects.hepforge.org blackhole at projects.hepforge.org
Mon Sep 17 09:41:46 BST 2012


Author: richardn
Date: Mon Sep 17 09:41:46 2012
New Revision: 3930

Log:
latest ATLAS SUSY analyses at 8 TeV

Added:
   branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_103.info
      - copied, changed from r3927, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1117704.info
   branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_104.info
      - copied, changed from r3929, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1180197.info
   branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_105.info
      - copied, changed from r3929, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I943401.info
   branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_109.info
      - copied, changed from r3927, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1125961.info
   branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_103.plot
      - copied, changed from r3927, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1117704.plot
   branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_104.plot
      - copied, changed from r3929, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1180197.plot
   branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_105.plot
      - copied, changed from r3929, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I943401.plot
   branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_109.plot
      - copied, changed from r3927, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1125961.plot
   branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_103.cc
      - copied, changed from r3927, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1117704.cc
   branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_104.cc
      - copied, changed from r3929, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1180197.cc
   branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_105.cc
      - copied, changed from r3927, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I943401.cc
   branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_109.cc
      - copied, changed from r3927, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1125961.cc
Modified:
   branches/2012-06-aidarivet/data/anainfo/Makefile.am
   branches/2012-06-aidarivet/data/plotinfo/Makefile.am
   branches/2012-06-aidarivet/src/Analyses/Makefile.am

Copied and modified: branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_103.info (from r3927, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1117704.info)
==============================================================================
--- branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1117704.info	Wed Sep 12 17:36:56 2012	(r3927, copy source)
+++ branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_103.info	Mon Sep 17 09:41:46 2012	(r3930)
@@ -1,24 +1,25 @@
-Name: ATLAS_2012_I1117704
+Name: ATLAS_2012_CONF_2012_103
 Year: 2012
 Summary: High jet multiplicity squark and gluino search
 Experiment: ATLAS
 Collider: LHC
-Status: VALIDATED
+Status: UNVALIDATED
 Authors:
  - Peter Richardson <peter.richardson at durham.ac.uk>
 References:
+ - ATLAS-CONF-2012-103
  - arXiv:1206.1760
 RunInfo:
-  BSM signal events at 7000 GeV.
+  BSM signal events at 8000 GeV.
 NumEvents: 25000 for BSM signals
 Beams: [p+, p+]
-Energies: [7000]
+Energies: [8000]
 NeedCrossSection: yes
 Description:
   'Search for SUSY using events with 6 or more jets in
    association with missing transverse momentum produced in proton-proton
-   collisions at a centre-of-mass energy of 7 TeV. The data sample has a total
-   integrated luminosity of 4.7 fb$^{-1}$. Distributions
+   collisions at a centre-of-mass energy of 8 TeV. The data sample has a total
+   integrated luminosity of 5.8 fb$^{-1}$. Distributions
    in the W and top control regions are not produced, while in addition to
    the plots from the paper the count of events in the different signal regions
-   is included.'
+   is included. The analysis is identical to the previous 7 TeV paper.'

Copied and modified: branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_104.info (from r3929, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1180197.info)
==============================================================================
--- branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1180197.info	Fri Sep 14 15:08:41 2012	(r3929, copy source)
+++ branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_104.info	Mon Sep 17 09:41:46 2012	(r3930)
@@ -1,24 +1,21 @@
-Name: ATLAS_2012_I1180197
+Name: ATLAS_2012_CONF_2012_104
 Year: 2012
-Summary: Search for supersymmetry at 7 TeV in final states with jets, missing transverse momentum and isolated leptons with the ATLAS detector.
+Summary: Search for supersymmetry at 8 TeV in final states with jets, missing transverse momentum and one lepton with the ATLAS detector.
 Experiment: ATLAS
 Collider: LHC
-SpiresID: 
 Status: UNVALIDATED
 Authors:
  - Peter Richardson <Peter.Richardson at durham.ac.uk>
 References:
- - ATLAS-CONF-2012-041
- - arXiv:1208.4688 
+ - ATLAS-CONF-2012-104
 RunInfo:
-  BSM signal events at 7000 GeV.
+  BSM signal events at 8000 GeV.
 NumEvents: 25000 for BSM signals
 Beams: [p+, p+]
-Energies: [7000]
+Energies: [8000]
 Description:
-  'One and two lepton search for supersymmmetric particles by ATLAS at 7 TeV.
+  'One lepton search for supersymmmetric particles by ATLAS at 8 TeV with $5.8\,\text{fb}^{-1}$ integrated luminosity.
   Event counts in the signal regions are implemented as one-bin histograms.
   Histograms for effective mass are implemented for the two
   signal hard lepton signal regions and the ratio of missing transverse energy
-  to effective mass for the soft lepton region. Only the one lepton plots are
-  currently implemented as taken from a conf note originally.'
+  to effective mass for the soft lepton region.'

Copied and modified: branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_105.info (from r3929, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I943401.info)
==============================================================================
--- branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I943401.info	Fri Sep 14 15:08:41 2012	(r3929, copy source)
+++ branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_105.info	Mon Sep 17 09:41:46 2012	(r3930)
@@ -1,43 +1,22 @@
-Name: ATLAS_2012_I943401
+Name: ATLAS_2012_CONF_2012_105
 Year: 2012
-Summary: Search for supersymmetry with 2 leptons and missing transverse energy
+Summary: Search for supersymmetry with 2 same-sign leptons, jets and missing transverse energy
 Experiment: ATLAS
 Collider: LHC
-InspireID: 943401
-Status: VALIDATED
+Status: UNVALIDATED
 Authors:
  - Peter Richardson <Peter.Richardson at durham.ac.uk>
 References:
- - arXiv:1110.6189
+ - ATLAS-CONF-2012-105
 RunInfo:
-  BSM signal events at 7000 GeV.
+  BSM signal events at 8000 GeV.
 NumEvents: 25000 for BSM signals
 Beams: [p+, p+]
-Energies: [7000]
+Energies: [8000]
 Description:
-  'Results of three searches for the production of supersymmetric particles decaying into final
-   states with missing transverse momentum and exactly two isolated leptons, electrons or muons.
-   The analysis uses a data sample collected during the first half of 2011 that
-   corresponds to a total integrated luminosity of 1 $\text{fb}^{-1}$ of $\sqrt{s} = 7$\,TeV
+  'Results of the search for the production of supersymmetric particles decaying into final
+   states with missing transverse momentum and two isolated same-sign leptons, electrons or muons.
+   The analysis uses a data sample collected during the first half of 2012 that
+   corresponds to a total integrated luminosity o1 $5.8\,\text{fb}^{-1}$ of $\sqrt{s} = 8$\,TeV
    proton-proton collisions recorded with the ATLAS detector at the Large Hadron Collider.
-   Opposite-sign and same-sign dilepton events are studied separately.
-   Additionally, in opposite- sign events, a search is made for an excess of same-flavour
-   over different-flavour lepton pairs.'
-BibKey: Aad:2011cwa
-BibTeX: '@article{Aad:2011cwa,
-      author         = "Aad, Georges and others",
-      title          = "{Searches for supersymmetry with the ATLAS detector using
-                        final states with two leptons and missing transverse
-                        momentum in sqrt{s} = 7 TeV proton-proton collisions}",
-      collaboration  = "ATLAS Collaboration",
-      journal        = "Phys.Lett.",
-      volume         = "B709",
-      pages          = "137-157",
-      doi            = "10.1016/j.physletb.2012.01.076",
-      year           = "2012",
-      eprint         = "1110.6189",
-      archivePrefix  = "arXiv",
-      primaryClass   = "hep-ex",
-      reportNumber   = "CERN-PH-EP-2011-165",
-      SLACcitation   = "%%CITATION = ARXIV:1110.6189;%%",
-}'
+   Opposite-sign and same-sign dilepton events are studied separately.'

Copied and modified: branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_109.info (from r3927, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1125961.info)
==============================================================================
--- branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1125961.info	Wed Sep 12 17:36:56 2012	(r3927, copy source)
+++ branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_109.info	Mon Sep 17 09:41:46 2012	(r3930)
@@ -1,22 +1,23 @@
-Name: ATLAS_2012_I1125961
+Name: ATLAS_2012_CONF_2012_109
 Year: 2012
 Summary: 0-lepton squark and gluino search
 Experiment: ATLAS
 Collider: LHC
 InspireID: 1125961
-Status: VALIDATED
+Status: UNVALIDATED
 Authors:
  - Peter Richardson <Peter.Richardson at durham.ac.uk>
  - David Grellscheid <david.grellscheid at durham.ac.uk>
  - Chris Wymant <c.m.wymant at durham.ac.uk>
 References:
- - arXiv:1208.0949 
+ - arXiv:1208.0949
+ - ATLAS-CONF-2012-109 
 RunInfo:
-  BSM signal events at 7000 GeV.
+  BSM signal events at 8000 GeV.
 NumEvents: 10000 for BSM signals
 Beams: [p+, p+]
-Energies: [7000]
+Energies: [8000]
 Description:
-  '0-lepton search for squarks and gluinos by ATLAS at 7 TeV.
+  '0-lepton search for squarks and gluinos by ATLAS at 8 TeV.
   Event counts in five signal regions are implemented as one-bin
   histograms.'

Modified: branches/2012-06-aidarivet/data/anainfo/Makefile.am
==============================================================================
--- branches/2012-06-aidarivet/data/anainfo/Makefile.am	Fri Sep 14 15:08:41 2012	(r3929)
+++ branches/2012-06-aidarivet/data/anainfo/Makefile.am	Mon Sep 17 09:41:46 2012	(r3930)
@@ -58,6 +58,10 @@
   ATLAS_2012_I1125961.info \
   ATLAS_2012_I1117704.info \
   ATLAS_2012_I1180197.info \
+  ATLAS_2012_CONF_2012_103.info \
+  ATLAS_2012_CONF_2012_104.info \
+  ATLAS_2012_CONF_2012_105.info \
+  ATLAS_2012_CONF_2012_109.info \
   BABAR_2005_S6181155.info \
   BABAR_2007_S6895344.info \
   BABAR_2007_S7266081.info \

Copied and modified: branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_103.plot (from r3927, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1117704.plot)
==============================================================================
--- branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1117704.plot	Wed Sep 12 17:36:56 2012	(r3927, copy source)
+++ branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_103.plot	Mon Sep 17 09:41:46 2012	(r3930)
@@ -1,28 +1,28 @@
-# BEGIN PLOT /ATLAS_2012_I1117704/count_7j55
+# BEGIN PLOT /ATLAS_2012_CONF_2012_103/count_7j55
 Title=Number of events in 7 jet, $p_\perp>55$\,GeV signal region
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1117704/count_8j55
+# BEGIN PLOT /ATLAS_2012_CONF_2012_103/count_8j55
 Title=Number of events in 8 jet, $p_\perp>55$\,GeV signal region
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1117704/count_9j55
+# BEGIN PLOT /ATLAS_2012_CONF_2012_103/count_9j55
 Title=Number of events in 9 jet, $p_\perp>55$\,GeV signal region
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1117704/count_6j80
+# BEGIN PLOT /ATLAS_2012_CONF_2012_103/count_6j80
 Title=Number of events in 6 jet, $p_\perp>80$\,GeV signal region
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1117704/count_7j80
+# BEGIN PLOT /ATLAS_2012_CONF_2012_103/count_7j80
 Title=Number of events in 7 jet, $p_\perp>80$\,GeV signal region
 XLabel=
 YLabel=Number of Events
@@ -35,51 +35,51 @@
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /ATLAS_2012_I1117704/hist_njet55
+# BEGIN PLOT /ATLAS_2012_CONF_2012_103/hist_njet55
 Title=Observed number of jets with $p_\perp>55$\,GeV for $E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}>4\,\mathrm{GeV}^{\frac12}$
 XLabel=Number of Jets
 YLabel=Number of events
 LogY=1
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1117704/hist_njet80
+# BEGIN PLOT /ATLAS_2012_CONF_2012_103/hist_njet80
 Title=Observed number of jets with $p_\perp>80$\,GeV for $E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}>4\,\mathrm{GeV}^{\frac12}$
 XLabel=Number of Jets
 YLabel=Number of events
 LogY=1
 # END PLOT
 
-# BEGIN PLOT /ATLAS_2012_I1117704/etmiss_HT_7j55
+# BEGIN PLOT /ATLAS_2012_CONF_2012_103/etmiss_HT_7j55
 Title=Observed $E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ for 7 jets with $p_\perp>55$\,GeV
 XLabel=$E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ [$\mathrm{GeV}^{\frac12}$]
 YLabel=$\mathrm{Events}/2$\,GeV
 LogY=1
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1117704/etmiss_HT_8j55
+# BEGIN PLOT /ATLAS_2012_CONF_2012_103/etmiss_HT_8j55
 Title=Observed $E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ for 8 jets with $p_\perp>55$\,GeV
 XLabel=$E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ [$\mathrm{GeV}^{\frac12}$]
 YLabel=$\mathrm{Events}/2$\,GeV
 LogY=1
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1117704/etmiss_HT_9j55
+# BEGIN PLOT /ATLAS_2012_CONF_2012_103/etmiss_HT_9j55
 Title=Observed $E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ for 9 jets with $p_\perp>55$\,GeV
 XLabel=$E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ [$\mathrm{GeV}^{\frac12}$]
 YLabel=$\mathrm{Events}/2$\,GeV
 LogY=1
 # END PLOT
 
-# BEGIN PLOT /ATLAS_2012_I1117704/etmiss_HT_6j80
+# BEGIN PLOT /ATLAS_2012_CONF_2012_103/etmiss_HT_6j80
 Title=Observed $E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ for 6 jets with $p_\perp>80$\,GeV
 XLabel=$E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ [$\mathrm{GeV}^{\frac12}$]
 YLabel=$\mathrm{Events}/2$\,GeV
 LogY=1
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1117704/etmiss_HT_7j80
+# BEGIN PLOT /ATLAS_2012_CONF_2012_103/etmiss_HT_7j80
 Title=Observed $E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ for 7 jets with $p_\perp>80$\,GeV
 XLabel=$E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ [$\mathrm{GeV}^{\frac12}$]
 YLabel=$\mathrm{Events}/2$\,GeV
 LogY=1
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1117704/etmiss_HT_8j80
+# BEGIN PLOT /ATLAS_2012_CONF_2012_103/etmiss_HT_8j80
 Title=Observed $E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ for 8 jets with $p_\perp>80$\,GeV
 XLabel=$E_{\mathrm{T}}/\sqrt{H_{\mathrm{T}}}$ [$\mathrm{GeV}^{\frac12}$]
 YLabel=$\mathrm{Events}/2$\,GeV

Copied and modified: branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_104.plot (from r3929, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1180197.plot)
==============================================================================
--- branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1180197.plot	Fri Sep 14 15:08:41 2012	(r3929, copy source)
+++ branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_104.plot	Mon Sep 17 09:41:46 2012	(r3930)
@@ -1,39 +1,32 @@
-# BEGIN PLOT /ATLAS_2012_I1180197/count_3jet_channel
-Title=Number of events in the 3 jet channel
+# BEGIN PLOT /ATLAS_2012_CONF_2012_104/count_e
+Title=Number of events in the electron channel
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1180197/count_4jet_channel
-Title=Number of events in the 4 jet channel
+# BEGIN PLOT /ATLAS_2012_CONF_2012_104/count_mu
+Title=Number of events in the muon channel
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1180197/count_soft_channel
+# BEGIN PLOT /ATLAS_2012_CONF_2012_104/count_soft_channel
 Title=Number of events in the soft lepton channel
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /ATLAS_2012_I1180197/hist_m_eff_3jet
-Title=Effective Mass in the 3 jet channe
-XLabel=$m_{\mathrm{eff}}$ [GeV]
-YLabel=$\mathrm{Events}/200 \mathrm{GeV}$
+# BEGIN PLOT /ATLAS_2012_CONF_2012_104/hist_eTmiss_e
+Title=$E_{\mathrm{T}}^{\rm miss}$ in the electron channel
+XLabel=$E_{\mathrm{T}}^{\rm miss}$
+YLabel=$\mathrm{Events}/40\,$GeV
 LogY=1
 # END PLOT
 
-# BEGIN PLOT /ATLAS_2012_I1180197/hist_m_eff_4jet
-Title=Effective Mass in the 4 jet channe
-XLabel=$m_{\mathrm{eff}}$ [GeV]
-YLabel=$\mathrm{Events}/200 \mathrm{GeV}$
-LogY=1
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2012_I1180197/hist_eTmiss_m_eff_soft
-Title=Ratio $E_{\mathrm{T}}^{\rm miss}/m_{\mathrm{eff}}$ in the soft lepton channel
-XLabel=$E_{\mathrm{T}}^{\rm miss}/m_{\mathrm{eff}}$
-YLabel=$\mathrm{Events}/0.1$
+# BEGIN PLOT /ATLAS_2012_CONF_2012_104/hist_eTmiss_mu
+Title=$E_{\mathrm{T}}^{\rm miss}$ in the muon channel
+XLabel=$E_{\mathrm{T}}^{\rm miss}$
+YLabel=$\mathrm{Events}/40\,$GeV
 LogY=1
 # END PLOT

Copied and modified: branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_105.plot (from r3929, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I943401.plot)
==============================================================================
--- branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I943401.plot	Fri Sep 14 15:08:41 2012	(r3929, copy source)
+++ branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_105.plot	Mon Sep 17 09:41:46 2012	(r3930)
@@ -1,252 +1,48 @@
-# BEGIN PLOT /ATLAS_2012_I943401/count_OS_SR1
-Title=Number of events in the OS-SR1 signal region
+# BEGIN PLOT /ATLAS_2012_CONF_2012_105/count_ee
+Title=Number of $ee$ signal events 
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/count_OS_SR2
-Title=Number of events in the OS-SR2 signal region
+# BEGIN PLOT /ATLAS_2012_CONF_2012_105/count_mumu
+Title=Number of $\mu\mu$ signal events 
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/count_OS_SR3
-Title=Number of events in the OS-SR3 signal region
+# BEGIN PLOT /ATLAS_2012_CONF_2012_105/count_emu
+Title=Number of $e\mu$ signal events 
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/count_SS_SR1
-Title=Number of events in the SS-SR1 signal region
+# BEGIN PLOT /ATLAS_2012_CONF_2012_105/count_ll
+Title=Number of $\ell\ell$ signal events 
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/count_SS_SR2
-Title=Number of events in the SS-SR2 signal region
-XLabel=
-YLabel=Number of Events
-LogY=0
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/count_FS_SR1
-Title=Number of events in the FS-SR1 signal region
-XLabel=
-YLabel=Number of Events
-LogY=0
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/count_FS_SR2
-Title=Number of events in the FS-SR2 signal region
-XLabel=
-YLabel=Number of Events
-LogY=0
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/count_FS_SR3
-Title=Number of events in the FS-SR3 signal region
-XLabel=
-YLabel=Number of Events
-LogY=0
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d01-x01-y01
-Title=$m_{\ell\ell}$ for same-sign events (data)
-XLabel=$m_{\ell\ell}$ [GeV]
-YLabel=$\mathrm{Events}/20$\,GeV
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d01-x01-y02
-Title=$m_{\ell\ell}$ for same-sign events (back)
-XLabel=$m_{\ell\ell}$ [GeV]
-YLabel=$\mathrm{Events}/20$\,GeV
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d02-x01-y01
-Title=Missing Transverse Energy for same-sign events (data)
-XLabel=$E^{\rm miss}_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/20$\,GeV
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d02-x01-y02
-Title=Missing Transverse Energy for same-sign events (back)
+# BEGIN PLOT /ATLAS_2012_CONF_2012_105/eTmiss_ee
+Title=Missing Transverse Energy for $ee$ events
 XLabel=$E^{\rm miss}_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/20$\,GeV
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d03-x01-y01
-Title=$m_{\ell\ell}$ for same-sign events with 2 jets (data)
-XLabel=$m_{\ell\ell}$ [GeV]
 YLabel=$\mathrm{Events}/50$\,GeV
 LogY=1
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d03-x01-y02
-Title=$m_{\ell\ell}$ for same-sign events with 2 jets (back)
-XLabel=$m_{\ell\ell}$ [GeV]
-YLabel=$\mathrm{Events}/50$\,GeV
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d05-x01-y01
-Title=Number of Jets for same-sign events (data)
-XLabel=Number of Jets
-YLabel=Events
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d05-x01-y02
-Title=Number of Jets for same-sign events (back)
-XLabel=Number of Jets
-YLabel=Events
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d06-x01-y01
-Title=$p_{\mathrm{T}}$ of the leading jet for same-sign events (data)
-XLabel=$p_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/20 \mathrm{GeV}$
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d06-x01-y02
-Title=$p_{\mathrm{T}}$ of the leading jet for same-sign events (back)
-XLabel=$p_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/20 \mathrm{GeV}$
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d07-x01-y01
-Title=$p_{\mathrm{T}}$ of the second jet for same-sign events (data)
-XLabel=$p_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/20 \mathrm{GeV}$
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d07-x01-y02
-Title=$p_{\mathrm{T}}$ of the second jet for same-sign events (back)
-XLabel=$p_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/20 \mathrm{GeV}$
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d08-x01-y01
-Title=$p_{\mathrm{T}}$ of the leading lepton for same-sign events (data)
-XLabel=$p_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/5 \mathrm{GeV}$
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d08-x01-y02
-Title=$p_{\mathrm{T}}$ of the leading lepton for same-sign events (back)
-XLabel=$p_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/5 \mathrm{GeV}$
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d09-x01-y01
-Title=$p_{\mathrm{T}}$ of the second lepton for same-sign events (data)
-XLabel=$p_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/5 \mathrm{GeV}$
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d09-x01-y02
-Title=$p_{\mathrm{T}}$ of the second lepton for same-sign events (back)
-XLabel=$p_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/5 \mathrm{GeV}$
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d10-x01-y01
-Title=$m_{\ell\ell}$ for opposite-sign events (data)
-XLabel=$m_{\ell\ell}$ [GeV]
-YLabel=$\mathrm{Events}/10$\,GeV
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d10-x01-y02
-Title=$m_{\ell\ell}$ for opposite-sign events (back)
-XLabel=$m_{\ell\ell}$ [GeV]
-YLabel=$\mathrm{Events}/10$\,GeV
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d11-x01-y01
-Title=Missing Transverse Energy for opposite-sign events (data)
+# BEGIN PLOT /ATLAS_2012_CONF_2012_105/eTmiss_emu
+Title=Missing Transverse Energy for $e\mu$ events
 XLabel=$E^{\rm miss}_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/10$\,GeV
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d11-x01-y02
-Title=Missing Transverse Energy for opposite-sign events (back)
-XLabel=$E^{\rm miss}_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/10$\,GeV
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d12-x01-y01
-Title=Missing Transverse Energy for opposite-sign events with 3 jets (data)
-XLabel=$E^{\rm miss}_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/10$\,GeV
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d12-x01-y02
-Title=Missing Transverse Energy for opposite-sign events  with 3 jets (back)
-XLabel=$E^{\rm miss}_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/10$\,GeV
+YLabel=$\mathrm{Events}/50$\,GeV
 LogY=1
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d13-x01-y01
-Title=Missing Transverse Energy for opposite-sign events with 4 jets (data)
+# BEGIN PLOT /ATLAS_2012_CONF_2012_105/eTmiss_mumu
+Title=Missing Transverse Energy for $\mu\mu$ events
 XLabel=$E^{\rm miss}_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/10$\,GeV
+YLabel=$\mathrm{Events}/50$\,GeV
 LogY=1
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d13-x01-y02
-Title=Missing Transverse Energy for opposite-sign events  with 4 jets (back)
+# BEGIN PLOT /ATLAS_2012_CONF_2012_105/eTmiss_ll
+Title=Missing Transverse Energy for $\ell\ell$ events
 XLabel=$E^{\rm miss}_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/10$\,GeV
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d14-x01-y01
-Title=Number of Jets for opposite-sign events (data)
-XLabel=Number of Jets
-YLabel=Events
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d14-x01-y02
-Title=Number of Jets for opposite-sign events (back)
-XLabel=Number of Jets
-YLabel=Events
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d15-x01-y01
-Title=$p_{\mathrm{T}}$ of the leading jet for opposite-sign events (data)
-XLabel=$p_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/20 \mathrm{GeV}$
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d15-x01-y02
-Title=$p_{\mathrm{T}}$ of the leading jet for opposite-sign events (back)
-XLabel=$p_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/20 \mathrm{GeV}$
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d16-x01-y01
-Title=$p_{\mathrm{T}}$ of the second jet for opposite-sign events (data)
-XLabel=$p_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/20 \mathrm{GeV}$
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d16-x01-y02
-Title=$p_{\mathrm{T}}$ of the second jet for opposite-sign events (back)
-XLabel=$p_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/20 \mathrm{GeV}$
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d17-x01-y01
-Title=$p_{\mathrm{T}}$ of the leading lepton for opposite-sign events (data)
-XLabel=$p_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/20 \mathrm{GeV}$
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d17-x01-y02
-Title=$p_{\mathrm{T}}$ of the leading lepton for opposite-sign events (back)
-XLabel=$p_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/20 \mathrm{GeV}$
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d18-x01-y01
-Title=$p_{\mathrm{T}}$ of the second lepton for opposite-sign events (data)
-XLabel=$p_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/20 \mathrm{GeV}$
-LogY=1
-# END PLOT
-# BEGIN PLOT /ATLAS_2012_I943401/d18-x01-y02
-Title=$p_{\mathrm{T}}$ of the second lepton for opposite-sign events (back)
-XLabel=$p_{\mathrm{T}}$ [GeV]
-YLabel=$\mathrm{Events}/20 \mathrm{GeV}$
+YLabel=$\mathrm{Events}/50$\,GeV
 LogY=1
 # END PLOT

Copied and modified: branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_109.plot (from r3927, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1125961.plot)
==============================================================================
--- branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1125961.plot	Wed Sep 12 17:36:56 2012	(r3927, copy source)
+++ branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_109.plot	Mon Sep 17 09:41:46 2012	(r3930)
@@ -1,108 +1,136 @@
-# BEGIN PLOT /ATLAS_2012_I1125961/count_A_tight
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/count_A_tight
 Title=Number of events in the tight A signal region
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1125961/count_A_medium
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/count_A_medium
 Title=Number of events in the medium A signal region
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1125961/count_A_loose
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/count_A_loose
 Title=Number of events in the loose A signal region
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1125961/count_Ap_medium
-Title=Number of events in the medium ${\rm A}'$ signal region
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/count_B_tight
+Title=Number of events in the tight B signal region
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1125961/count_B_tight
-Title=Number of events in the tight B signal region
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/count_B_medium
+Title=Number of events in the medium B signal region
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1125961/count_C_tight
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/count_C_tight
 Title=Number of events in the tight C signal region
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1125961/count_C_medium
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/count_C_medium
 Title=Number of events in the medium C signal region
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1125961/count_C_loose
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/count_C_loose
 Title=Number of events in the loose C signal region
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1125961/count_D_tight
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/count_D_tight
 Title=Number of events in the tight D signal region
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1125961/count_E_tight
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/count_E_tight
 Title=Number of events in the tight E signal region
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1125961/count_E_medium
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/count_E_medium
 Title=Number of events in the medium E signal region
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1125961/count_E_loose
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/count_E_loose
 Title=Number of events in the loose E signal region
 XLabel=
 YLabel=Number of Events
 LogY=0
 # END PLOT
 
-# BEGIN PLOT /ATLAS_2012_I1125961/hist_m_eff_A
-Title=Effective Mass in the A Signal Region
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/hist_m_eff_A_medium
+Title=Effective Mass in the loose/medium A Signal Region
+XLabel=$M_{\mathrm{eff}}$ [GeV]
+YLabel=$\mathrm{Events}/100 \mathrm{GeV}$
+LogY=1
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/hist_m_eff_A_tight
+Title=Effective Mass in the tight A Signal Region
+XLabel=$M_{\mathrm{eff}}$ [GeV]
+YLabel=$\mathrm{Events}/100 \mathrm{GeV}$
+LogY=1
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/hist_m_eff_B_medium
+Title=Effective Mass in the medium B Signal Region
 XLabel=$M_{\mathrm{eff}}$ [GeV]
 YLabel=$\mathrm{Events}/100 \mathrm{GeV}$
 LogY=1
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1125961/hist_m_eff_Ap
-Title=Effective Mass in the ${\rm A}'$ Signal Region
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/hist_m_eff_B_tight
+Title=Effective Mass in the tight B Signal Region
 XLabel=$M_{\mathrm{eff}}$ [GeV]
 YLabel=$\mathrm{Events}/100 \mathrm{GeV}$
 LogY=1
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1125961/hist_m_eff_B
-Title=Effective Mass in the B Signal Region
+
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/hist_m_eff_C_medium
+Title=Effective Mass in the loose/medium C Signal Region
 XLabel=$M_{\mathrm{eff}}$ [GeV]
 YLabel=$\mathrm{Events}/100 \mathrm{GeV}$
 LogY=1
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1125961/hist_m_eff_C
-Title=Effective Mass in the C Signal Region
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/hist_m_eff_C_tight
+Title=Effective Mass in the tight C Signal Region
 XLabel=$M_{\mathrm{eff}}$ [GeV]
 YLabel=$\mathrm{Events}/100 \mathrm{GeV}$
 LogY=1
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1125961/hist_m_eff_D
+
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/hist_m_eff_D
 Title=Effective Mass in the D Signal Region
 XLabel=$M_{\mathrm{eff}}$ [GeV]
 YLabel=$\mathrm{Events}/100 \mathrm{GeV}$
 LogY=1
 # END PLOT
-# BEGIN PLOT /ATLAS_2012_I1125961/hist_m_eff_E
-Title=Effective Mass in the E Signal Region
+
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/hist_m_eff_E_loose
+Title=Effective Mass in the loose E Signal Region
+XLabel=$M_{\mathrm{eff}}$ [GeV]
+YLabel=$\mathrm{Events}/100 \mathrm{GeV}$
+LogY=1
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/hist_m_eff_E_medium
+Title=Effective Mass in the medium E Signal Region
+XLabel=$M_{\mathrm{eff}}$ [GeV]
+YLabel=$\mathrm{Events}/100 \mathrm{GeV}$
+LogY=1
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_CONF_2012_109/hist_m_eff_E_tight
+Title=Effective Mass in the tight E Signal Region
 XLabel=$M_{\mathrm{eff}}$ [GeV]
 YLabel=$\mathrm{Events}/100 \mathrm{GeV}$
 LogY=1

Modified: branches/2012-06-aidarivet/data/plotinfo/Makefile.am
==============================================================================
--- branches/2012-06-aidarivet/data/plotinfo/Makefile.am	Fri Sep 14 15:08:41 2012	(r3929)
+++ branches/2012-06-aidarivet/data/plotinfo/Makefile.am	Mon Sep 17 09:41:46 2012	(r3930)
@@ -55,6 +55,10 @@
   ATLAS_2012_I1117704.plot \
   ATLAS_2012_I1180197.plot \
   ATLAS_2012_I1082009.plot \
+  ATLAS_2012_CONF_2012_103.plot \
+  ATLAS_2012_CONF_2012_104.plot \
+  ATLAS_2012_CONF_2012_105.plot \
+  ATLAS_2012_CONF_2012_109.plot \
   BABAR_2005_S6181155.plot \
   BABAR_2007_S6895344.plot \
   BABAR_2007_S7266081.plot \

Copied and modified: branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_103.cc (from r3927, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1117704.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1117704.cc	Wed Sep 12 17:36:56 2012	(r3927, copy source)
+++ branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_103.cc	Mon Sep 17 09:41:46 2012	(r3930)
@@ -14,15 +14,15 @@
 namespace Rivet {
 
 
-  class ATLAS_2012_I1117704 : public Analysis {
+  class ATLAS_2012_CONF_2012_103 : public Analysis {
   public:
 
     /// @name Constructors etc.
     //@{
 
     /// Constructor
-    ATLAS_2012_I1117704()
-      : Analysis("ATLAS_2012_I1117704")
+    ATLAS_2012_CONF_2012_103()
+      : Analysis("ATLAS_2012_CONF_2012_103")
     {    }
 
     //@}
@@ -60,9 +60,6 @@
       addProjection(FastJets(vfs, FastJets::ANTIKT, 0.4),
                     "AntiKtJets04");
 
-      // all tracks (to do deltaR with leptons)
-      addProjection(ChargedFinalState(-3.0,3.0),"cfs");
-
       /// Book histograms
       _etmiss_HT_7j55 = bookHistogram1D("etmiss_HT_7j55", 8, 0., 16.);
       _etmiss_HT_8j55 = bookHistogram1D("etmiss_HT_8j55", 8, 0., 16.);
@@ -71,8 +68,8 @@
       _etmiss_HT_7j80 = bookHistogram1D("etmiss_HT_7j80", 8, 0., 16.);
       _etmiss_HT_8j80 = bookHistogram1D("etmiss_HT_8j80", 8, 0., 16.);
 
-      _hist_njet55 = bookHistogram1D("hist_njet55", 11, 2.5, 13.5);
-      _hist_njet80 = bookHistogram1D("hist_njet80", 11, 2.5, 13.5);
+      _hist_njet55 = bookHistogram1D("hist_njet55", 4, 5.5, 9.5);
+      _hist_njet80 = bookHistogram1D("hist_njet80", 4, 4.5, 8.5);
 
       _count_7j55 = bookHistogram1D("count_7j55", 1, 0., 1.);
       _count_8j55 = bookHistogram1D("count_8j55", 1, 0., 1.);
@@ -98,20 +95,9 @@
       }
 
       // candidate muons
-      ParticleVector cand_mu;
-      ParticleVector chg_tracks =
-        applyProjection<ChargedFinalState>(event, "cfs").particles();
-      foreach ( const Particle & mu,
-                applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt() ) {
-        double pTinCone = -mu.momentum().pT();
-        foreach ( const Particle & track, chg_tracks ) {
-          if ( deltaR(mu.momentum(),track.momentum()) <= 0.2 )
-            pTinCone += track.momentum().pT();
-        }
-        if ( pTinCone < 1.8*GeV )
-          cand_mu.push_back(mu);
-      }
-
+      ParticleVector cand_mu = 
+	applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt();
+      
       // candidate electrons
       ParticleVector cand_e  =
         applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt();
@@ -193,6 +179,8 @@
       double ratio = eTmiss/sqrt(HT);
 
       if(ratio>4.) {
+	if(njet55>9) njet55 = 9;
+	if(njet80>8) njet80 = 8;
 	_hist_njet55->fill(njet55,weight);
 	_hist_njet80->fill(njet80,weight);
 	// 7j55
@@ -202,7 +190,7 @@
 	if(njet55>=8) 
 	  _count_8j55->fill( 0.5, weight) ;
 	// 8j55
-	if(njet55>=9)
+	if(njet55==9)
 	  _count_9j55->fill( 0.5, weight) ;
 	// 6j80
 	if(njet80>=6)
@@ -211,7 +199,7 @@
 	if(njet80>=7)
 	  _count_7j80->fill( 0.5, weight) ;
 	// 8j80
-	if(njet80>=7)
+	if(njet80==8)
 	  _count_8j80->fill( 0.5, weight) ;
       }
 
@@ -230,7 +218,7 @@
       if(njet80>=7)
 	_etmiss_HT_7j80->fill( ratio, weight) ;
       // 8j80
-      if(njet80>=7)
+      if(njet80>=8)
 	_etmiss_HT_8j80->fill( ratio, weight) ;
 
     }
@@ -238,7 +226,7 @@
     //@}
 
     void finalize() {
-      double norm = crossSection()/femtobarn*4.7/sumOfWeights();
+      double norm = crossSection()/femtobarn*5.8/sumOfWeights();
 
       scale(_etmiss_HT_7j55,2.*norm);
       scale(_etmiss_HT_8j55,2.*norm);
@@ -283,6 +271,6 @@
   };
 
   // The hook for the plugin system
-  DECLARE_RIVET_PLUGIN(ATLAS_2012_I1117704);
+  DECLARE_RIVET_PLUGIN(ATLAS_2012_CONF_2012_103);
 
 }

Copied and modified: branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_104.cc (from r3929, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1180197.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1180197.cc	Fri Sep 14 15:08:41 2012	(r3929, copy source)
+++ branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_104.cc	Mon Sep 17 09:41:46 2012	(r3930)
@@ -13,7 +13,7 @@
 namespace Rivet {
 
 
-  class ATLAS_2012_I1180197 : public Analysis {
+  class ATLAS_2012_CONF_2012_104 : public Analysis {
   public:
 
     /// @name Constructors etc.
@@ -21,8 +21,8 @@
 
     /// Constructor
 
-    ATLAS_2012_I1180197()
-      : Analysis("ATLAS_2012_I1180197")
+    ATLAS_2012_CONF_2012_104()
+      : Analysis("ATLAS_2012_CONF_2012_104")
     {    }
 
     //@}
@@ -39,14 +39,14 @@
       // projection to find the electrons
       std::vector<std::pair<double, double> > eta_e;
       eta_e.push_back(make_pair(-2.47,2.47));
-      IdentifiedFinalState elecs(eta_e, 7.0*GeV);
+      IdentifiedFinalState elecs(eta_e, 10.0*GeV);
       elecs.acceptIdPair(ELECTRON);
       addProjection(elecs, "elecs");
 
       // projection to find the muons
       std::vector<std::pair<double, double> > eta_m;
       eta_m.push_back(make_pair(-2.4,2.4));
-      IdentifiedFinalState muons(eta_m, 6.0*GeV);
+      IdentifiedFinalState muons(eta_m, 10.0*GeV);
       muons.acceptIdPair(MUON);
       addProjection(muons, "muons");
 
@@ -63,13 +63,11 @@
       addProjection(VisibleFinalState(-4.9,4.9),"vfs");
 
       // Book histograms
-      _count_3jet_channel = bookHistogram1D("count_3jet_channel", 1, 0., 1.);
-      _count_4jet_channel = bookHistogram1D("count_4jet_channel", 1, 0., 1.);
-      _count_soft_channel = bookHistogram1D("count_soft_channel", 1, 0., 1.);
-
-      _hist_m_eff_3jet        = bookHistogram1D("hist_m_eff_3jet"       ,  6, 400., 1600.);
-      _hist_m_eff_4jet        = bookHistogram1D("hist_m_eff_4jet"       ,  6, 400., 1600.);
-      _hist_eTmiss_m_eff_soft = bookHistogram1D("hist_eTmiss_m_eff_soft",  6, 0.1 , 0.7  );
+      _count_e  = bookHistogram1D("count_e" , 1, 0., 1.);
+      _count_mu = bookHistogram1D("count_mu", 1, 0., 1.);
+
+      _hist_eTmiss_e  = bookHistogram1D("hist_eTmiss_e"  , 25, 0., 1000.); 
+      _hist_eTmiss_mu = bookHistogram1D("hist_eTmiss_mu" , 25, 0., 1000.); 
 
     }
 
@@ -81,17 +79,15 @@
       Jets cand_jets;
       foreach ( const Jet& jet,
                 applyProjection<FastJets>(event, "AntiKtJets04").jetsByPt(20.0*GeV) ) {
-        if ( fabs( jet.momentum().eta() ) < 4.5 ) {
+        if ( fabs( jet.momentum().eta() ) < 2.8 ) {
           cand_jets.push_back(jet);
         }
       }
 
       // get the candidate "medium" leptons without isolation
-      ParticleVector cand_soft_e,cand_hard_e;
+      ParticleVector cand_e;
       foreach( const Particle & e,
                applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt()) {
-        double pT  = e.momentum().perp();
-        double eta = e.momentum().eta();
         // remove any leptons within 0.4 of any candidate jets
         bool e_near_jet = false;
         foreach ( const Jet& jet, cand_jets ) {
@@ -101,19 +97,11 @@
             break;
           }
         }
-        if ( e_near_jet ) continue;
-        // soft selection
-        if(pT>7.&&!(fabs(eta)>1.37&&fabs(eta)<1.52)) {
-          cand_soft_e.push_back(e);
-        }
-        // hard selection
-        if(pT>10.) cand_hard_e.push_back(e);
+        if ( ! e_near_jet ) cand_e.push_back(e);
       }
-      ParticleVector cand_soft_mu,cand_hard_mu;
+      ParticleVector cand_mu;
       foreach( const Particle & mu,
                applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt()) {
-        double pT  = mu.momentum().perp();
-        double eta = mu.momentum().eta();
         // remove any leptons within 0.4 of any candidate jets
         bool mu_near_jet = false;
         foreach ( const Jet& jet, cand_jets ) {
@@ -122,60 +110,32 @@
             break;
           }
         }
-        if ( mu_near_jet ) continue;
-        // soft selection
-        if(pT>6.&&!(fabs(eta)>1.37&&fabs(eta)<1.52)) {
-          cand_soft_mu.push_back(mu);
-        }
-        // hard selection
-        if(pT>10.) cand_hard_mu.push_back(mu);
+        if ( ! mu_near_jet ) cand_mu.push_back(mu);
       }
       // apply the isolation
       ParticleVector chg_tracks =
         applyProjection<ChargedFinalState>(event, "cfs").particles();
       // pTcone around muon track (hard)
-      ParticleVector recon_hard_mu;
-      foreach ( const Particle & mu, cand_hard_mu ) {
-        double pTinCone = -mu.momentum().pT();
-        if(-pTinCone<20.) continue;
-        foreach ( const Particle & track, chg_tracks ) {
-          if ( deltaR(mu.momentum(),track.momentum()) < 0.2 )
-            pTinCone += track.momentum().pT();
-        }
-        if ( pTinCone < 1.8*GeV ) recon_hard_mu.push_back(mu);
-      }
-      // pTcone around muon track (soft)
-      ParticleVector recon_soft_mu;
-      foreach ( const Particle & mu, cand_soft_mu ) {
+      ParticleVector recon_mu;
+      foreach ( const Particle & mu, cand_mu ) {
         double pTinCone = -mu.momentum().pT();
-        if(-pTinCone>20.) continue;
+        if(-pTinCone<25.) continue;
         foreach ( const Particle & track, chg_tracks ) {
           if ( deltaR(mu.momentum(),track.momentum()) < 0.2 )
             pTinCone += track.momentum().pT();
         }
-        if ( pTinCone < 1.8*GeV ) recon_soft_mu.push_back(mu);
+        if ( pTinCone < 1.8*GeV ) recon_mu.push_back(mu);
       }
       // pTcone around electron track (hard)
-      ParticleVector recon_hard_e;
-      foreach ( const Particle & e, cand_hard_e ) {
+      ParticleVector recon_e;
+      foreach ( const Particle & e, cand_e ) {
         double pTinCone = -e.momentum().pT();
         if(-pTinCone<25.) continue;
         foreach ( const Particle & track, chg_tracks ) {
           if ( deltaR(e.momentum(),track.momentum()) < 0.2 )
             pTinCone += track.momentum().pT();
         }
-        if ( pTinCone < 0.1 * e.momentum().pT() ) recon_hard_e.push_back(e);
-      }
-      // pTcone around electron track (soft)
-      ParticleVector recon_soft_e;
-      foreach ( const Particle & e, cand_soft_e ) {
-        double pTinCone = -e.momentum().pT();
-        if(-pTinCone>25.) continue;
-        foreach ( const Particle & track, chg_tracks ) {
-          if ( deltaR(e.momentum(),track.momentum()) < 0.2 )
-            pTinCone += track.momentum().pT();
-        }
-        if ( pTinCone < 0.1 * e.momentum().pT() ) recon_soft_e.push_back(e);
+        if ( pTinCone < 0.1 * e.momentum().pT() ) recon_e.push_back(e);
       }
 
       // discard jets that overlap with electrons
@@ -184,7 +144,7 @@
         if(fabs(jet.momentum().eta())>2.5||
            jet.momentum().perp()<25.) continue;
         bool away_from_e = true;
-        foreach ( const Particle & e, cand_hard_e ) {
+        foreach ( const Particle & e, cand_e ) {
           if ( deltaR(e.momentum(),jet.momentum()) < 0.2 ) {
             away_from_e = false;
             break;
@@ -201,76 +161,51 @@
       }
       double eTmiss = pTmiss.pT();
 
-      // both selections require at least 2 jets
-      if(recon_jets.size()<2) vetoEvent;
+      // at least 4 jets with pT>80.
+      if(recon_jets.size()<4 || recon_jets[3].momentum().perp()<80.) vetoEvent;
+
+      // only 1 signal lepton
+      if( recon_e.size() + recon_mu.size() != 1 )
+	vetoEvent;
+      if( cand_e .size() + cand_mu .size() != 1 )
+	vetoEvent;
 
       // start of meff calculation
       double HT=0.;
       foreach( const Jet & jet, recon_jets) {
-        HT += jet.momentum().perp();
+	double pT = jet.momentum().perp();
+        if(pT>40.) HT += pT; 
       }
-      double m_eff_inc  = HT+eTmiss;
 
-      // hard selection exactly one candidate
-      // and 1 recon and at least 3 jets
-      if( cand_hard_e.size()  +  cand_hard_mu.size() == 1 &&
-          recon_hard_e.size() + recon_hard_mu.size() == 1 &&
-          recon_jets.size() >= 3 ) {
-        // get the lepton
-        Particle lepton = recon_hard_e.empty() ?
-          recon_hard_mu[0] : recon_hard_e[0];
-        // lepton variables
-        double pT = lepton.momentum().perp();
-        double mT  = 2.*(pT*eTmiss -
-                         lepton.momentum().x()*pTmiss.x() -
-                         lepton.momentum().y()*pTmiss.y());
-        mT = sqrt(mT);
-        HT += pT;
-        m_eff_inc += pT;
-        double m_eff = pT+eTmiss+recon_jets[0].momentum().perp()+
-          recon_jets[1].momentum().perp()+recon_jets[2].momentum().perp();
-        // three jet selection
-        if(recon_jets[0].momentum().perp()>100. &&
-           (recon_jets.size() == 3 ||
-            recon_jets[3].momentum().perp() < 80. ) &&
-           mT>100. && eTmiss>250. && eTmiss/m_eff>0.3) {
-          if(m_eff_inc>1200.) _count_3jet_channel->fill(0.5,weight);
-          _hist_m_eff_3jet->fill(min(1599.,m_eff_inc),weight);
-        }
-        // four jet selecton
-        if(recon_jets.size() >= 4) {
-          m_eff += recon_jets[3].momentum().perp();
-          if(recon_jets[3].momentum().perp() > 80.  &&
-             mT>100. && eTmiss>250. && eTmiss/m_eff>0.2) {
-            if(m_eff_inc>800.) _count_4jet_channel->fill(0.5,weight);
-            _hist_m_eff_4jet->fill(min(1599.,m_eff_inc),weight);
-          }
-        }
-      }
+      // get the lepton
+      Particle lepton = recon_e.empty() ? recon_mu[0] : recon_e[0];
 
-      // soft selection exactly one candidate
-      // and 1 recon and 4 jets
-      if( cand_soft_e.size()  +  cand_soft_mu.size() == 1 &&
-          recon_soft_e.size() + recon_soft_mu.size() == 1 &&
-          recon_jets.size() >= 2 &&
-          recon_jets[0].momentum().perp()>130.) {
-        // get the lepton
-        Particle lepton = recon_soft_e.empty() ?
-          recon_soft_mu[0] : recon_soft_e[0];
-        // lepton variables
-        double pT = lepton.momentum().perp();
-        double mT  = 2.*(pT*eTmiss -
-                         lepton.momentum().x()*pTmiss.x() -
-                         lepton.momentum().y()*pTmiss.y());
-        mT = sqrt(mT);
-        HT += pT;
-        m_eff_inc += pT;
-        double m_eff = pT+eTmiss+recon_jets[0].momentum().perp()+
-          recon_jets[1].momentum().perp();
-        if (mT>100. && eTmiss>250.) {
-          if( eTmiss/m_eff>0.3 ) _count_soft_channel->fill(0.5,weight);
-          _hist_eTmiss_m_eff_soft->fill( eTmiss/m_eff_inc,weight);
-        }
+      // lepton variables
+      double pT = lepton.momentum().perp();
+
+      double mT  = 2.*(pT*eTmiss -
+		       lepton.momentum().x()*pTmiss.x() -
+		       lepton.momentum().y()*pTmiss.y());
+      mT = sqrt(mT);
+      HT += pT;
+      double m_eff_inc  = HT + eTmiss + pT;
+      double m_eff_4 = eTmiss + pT;
+      for(unsigned int ix=0;ix<4;++ix)
+	m_eff_4 +=  recon_jets[ix].momentum().perp();
+
+      // four jet selecton
+      if(mT>100.&& eTmiss/m_eff_4>0.2 &&
+	 m_eff_inc > 800.) {
+	if( eTmiss > 250. ) {
+	  if(abs(lepton.pdgId())==ELECTRON) 
+	    _count_e->fill(0.5,weight);
+	  else if(abs(lepton.pdgId())==MUON) 
+	    _count_mu->fill(0.5,weight);
+	}
+	if(abs(lepton.pdgId())==ELECTRON) 
+	  _hist_eTmiss_e ->fill(eTmiss,weight);
+	else if(abs(lepton.pdgId())==MUON) 
+	  _hist_eTmiss_mu->fill(eTmiss,weight);
       }
     }
     //@}
@@ -278,13 +213,11 @@
 
     void finalize() {
 
-      double norm = 4.7* crossSection()/sumOfWeights()/femtobarn;
-      scale(_count_3jet_channel    ,norm);
-      scale(_count_4jet_channel    ,norm);
-      scale(_count_soft_channel    ,norm);
-      scale(_hist_m_eff_3jet       ,200.*norm);
-      scale(_hist_m_eff_4jet       ,200.*norm);
-      scale(_hist_eTmiss_m_eff_soft,0.1*norm);
+      double norm = 5.8* crossSection()/sumOfWeights()/femtobarn;
+      scale(_count_e ,norm);
+      scale(_count_mu,norm);
+      scale(_hist_eTmiss_e  ,40.*norm);
+      scale(_hist_eTmiss_mu ,40.*norm);
 
     }
 
@@ -292,18 +225,16 @@
 
     /// @name Histograms
     //@{
-    AIDA::IHistogram1D* _count_3jet_channel;
-    AIDA::IHistogram1D* _count_4jet_channel;
-    AIDA::IHistogram1D* _count_soft_channel;
-
-    AIDA::IHistogram1D* _hist_m_eff_3jet;
-    AIDA::IHistogram1D* _hist_m_eff_4jet;
-    AIDA::IHistogram1D* _hist_eTmiss_m_eff_soft;
+    AIDA::IHistogram1D* _count_e ;
+    AIDA::IHistogram1D* _count_mu;
+
+    AIDA::IHistogram1D* _hist_eTmiss_e ;
+    AIDA::IHistogram1D* _hist_eTmiss_mu;
     //@}
 
   };
 
   // The hook for the plugin system
-  DECLARE_RIVET_PLUGIN(ATLAS_2012_I1180197);
+  DECLARE_RIVET_PLUGIN(ATLAS_2012_CONF_2012_104);
 
 }

Copied and modified: branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_105.cc (from r3927, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I943401.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I943401.cc	Wed Sep 12 17:36:56 2012	(r3927, copy source)
+++ branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_105.cc	Mon Sep 17 09:41:46 2012	(r3930)
@@ -13,7 +13,7 @@
 namespace Rivet {
 
 
-  class ATLAS_2012_I943401 : public Analysis {
+  class ATLAS_2012_CONF_2012_105 : public Analysis {
   public:
 
     /// @name Constructors etc.
@@ -21,8 +21,8 @@
 
     /// Constructor
 
-    ATLAS_2012_I943401()
-      : Analysis("ATLAS_2012_I943401")
+    ATLAS_2012_CONF_2012_105()
+      : Analysis("ATLAS_2012_CONF_2012_105")
     {    }
 
     //@}
@@ -46,7 +46,7 @@
       // projection to find the muons
       std::vector<std::pair<double, double> > eta_m;
       eta_m.push_back(make_pair(-2.4,2.4));
-      IdentifiedFinalState muons(eta_m, 10.0*GeV);
+      IdentifiedFinalState muons(eta_m, 20.0*GeV);
       muons.acceptIdPair(MUON);
       addProjection(muons, "muons");
 
@@ -65,54 +65,16 @@
       // book histograms
 
       // counts in signal regions
-      _count_OS_SR1 = bookHistogram1D("count_OS_SR1", 1, 0., 1.);
-      _count_OS_SR2 = bookHistogram1D("count_OS_SR2", 1, 0., 1.);
-      _count_OS_SR3 = bookHistogram1D("count_OS_SR3", 1, 0., 1.);
-      _count_SS_SR1 = bookHistogram1D("count_SS_SR1", 1, 0., 1.);
-      _count_SS_SR2 = bookHistogram1D("count_SS_SR2", 1, 0., 1.);
-      _count_FS_SR1 = bookHistogram1D("count_FS_SR1", 1, 0., 1.);
-      _count_FS_SR2 = bookHistogram1D("count_FS_SR2", 1, 0., 1.);
-      _count_FS_SR3 = bookHistogram1D("count_FS_SR3", 1, 0., 1.);
+      _count_ee   = bookHistogram1D("count_ee"  , 1, 0., 1.);
+      _count_emu  = bookHistogram1D("count_emu" , 1, 0., 1.);
+      _count_mumu = bookHistogram1D("count_mumu", 1, 0., 1.);
+      _count_ll   = bookHistogram1D("count_ll"  , 1, 0., 1.);
 
       // histograms from paper
-
-      _hist_mll_SS_D         = bookHistogram1D( 1,1,1);
-      _hist_mll_SS_B         = bookHistogram1D( 1,1,2);
-      _hist_eTmiss_SS_D      = bookHistogram1D( 2,1,1);
-      _hist_eTmiss_SS_B      = bookHistogram1D( 2,1,2);
-      _hist_mll_SS_2Jet_D    = bookHistogram1D( 3,1,1);
-      _hist_mll_SS_2Jet_B    = bookHistogram1D( 3,1,2);
-      _hist_njet_SS_D        = bookHistogram1D( 5,1,1);
-      _hist_njet_SS_B        = bookHistogram1D( 5,1,2);
-      _hist_pT_j1_SS_D       = bookHistogram1D( 6,1,1);
-      _hist_pT_j1_SS_B       = bookHistogram1D( 6,1,2);
-      _hist_pT_j2_SS_D       = bookHistogram1D( 7,1,1);
-      _hist_pT_j2_SS_B       = bookHistogram1D( 7,1,2);
-      _hist_pT_l1_SS_D       = bookHistogram1D( 8,1,1);
-      _hist_pT_l1_SS_B       = bookHistogram1D( 8,1,2);
-      _hist_pT_l2_SS_D       = bookHistogram1D( 9,1,1);
-      _hist_pT_l2_SS_B       = bookHistogram1D( 9,1,2);
-      _hist_mll_OS_D         = bookHistogram1D(10,1,1);
-      _hist_mll_OS_B         = bookHistogram1D(10,1,2);
-      _hist_eTmiss_OS_D      = bookHistogram1D(11,1,1);
-      _hist_eTmiss_OS_B      = bookHistogram1D(11,1,2);
-      _hist_eTmiss_3Jet_OS_D = bookHistogram1D(12,1,1);
-      _hist_eTmiss_3Jet_OS_B = bookHistogram1D(12,1,2);
-      _hist_eTmiss_4Jet_OS_D = bookHistogram1D(13,1,1);
-      _hist_eTmiss_4Jet_OS_B = bookHistogram1D(13,1,2);
-      _hist_njet_OS_D        = bookHistogram1D(14,1,1);
-      _hist_njet_OS_B        = bookHistogram1D(14,1,2);
-      _hist_pT_j1_OS_D       = bookHistogram1D(15,1,1);
-      _hist_pT_j1_OS_B       = bookHistogram1D(15,1,2);
-      _hist_pT_j2_OS_D       = bookHistogram1D(16,1,1);
-      _hist_pT_j2_OS_B       = bookHistogram1D(16,1,2);
-      _hist_pT_l1_OS_D       = bookHistogram1D(17,1,1);
-      _hist_pT_l1_OS_B       = bookHistogram1D(17,1,2);
-      _hist_pT_l2_OS_D       = bookHistogram1D(18,1,1);
-      _hist_pT_l2_OS_B       = bookHistogram1D(18,1,2);
-      //????
-      //   <dataPointSet name="d04-x01-y01" dimension="2" path="/REF/ATLAS_2011_I943401" title="EVENTS/10 GEV" >
-      //   <dataPointSet name="d04-x01-y02" dimension="2" path="/REF/ATLAS_2011_I943401" title="EVENTS/10 GEV" >
+      _hist_eTmiss_ee   = bookHistogram1D("eTmiss_ee"  , 8, 0., 400.);
+      _hist_eTmiss_emu  = bookHistogram1D("eTmiss_emu" , 8, 0., 400.);
+      _hist_eTmiss_mumu = bookHistogram1D("eTmiss_mumu", 8, 0., 400.);
+      _hist_eTmiss_ll   = bookHistogram1D("eTmiss_ll"  , 8, 0., 400.);
     }
 
     /// Perform the event analysis
@@ -150,7 +112,7 @@
         applyProjection<ChargedFinalState>(event, "cfs").particles();
 
       // Reconstructed electrons
-      ParticleVector recon_e;
+      ParticleVector recon_leptons;
       foreach ( const Particle & e, cand_e ) {
         // check not near a jet
         bool e_near_jet = false;
@@ -168,11 +130,10 @@
             pTinCone += track.momentum().pT();
         }
         if ( pTinCone < 0.1*e.momentum().perp() )
-          recon_e.push_back(e);
+          recon_leptons.push_back(e);
       }
 
       // Reconstructed Muons
-      ParticleVector recon_mu;
       ParticleVector cand_mu =
         applyProjection<IdentifiedFinalState>(event,"muons").particlesByPt();
       foreach ( const Particle & mu, cand_mu ) {
@@ -192,7 +153,7 @@
             pTinCone += track.momentum().pT();
         }
         if ( pTinCone < 1.8*GeV )
-          recon_mu.push_back(mu);
+          recon_leptons.push_back(mu);
       }
 
       // pTmiss
@@ -204,162 +165,36 @@
       }
       double eTmiss = pTmiss.pT();
 
-      // ATLAS calo problem
-      if(rand()/static_cast<double>(RAND_MAX)<=0.42) {
-        foreach ( const Particle & e, recon_e ) {
-          double eta = e.momentum().eta();
-          double phi = e.momentum().azimuthalAngle(MINUSPI_PLUSPI);
-          if(eta>-0.1&&eta<1.5&&phi>-0.9&&phi<-0.5)
-            vetoEvent;
-        }
-        foreach ( const Jet & jet, recon_jets ) {
-          double eta = jet.momentum().rapidity();
-          double phi = jet.momentum().azimuthalAngle(MINUSPI_PLUSPI);
-          if(jet.momentum().perp()>40 && eta>-0.1&&eta<1.5&&phi>-0.9&&phi<-0.5)
-            vetoEvent;
-        }
-      }
-
       // Exactly two leptons for each event
-      if ( recon_mu.size() + recon_e.size() != 2)
-        vetoEvent;
-      // two electrons highest pT > 25
-      ParticleVector recon_leptons;
-      if(recon_e.size()==2&&recon_e[0].momentum().perp()>25.) {
-        recon_leptons = recon_e;
-      }
-      // two muons highest pT > 20
-      else if(recon_mu.size()==2&&recon_mu[0].momentum().perp()>20.) {
-        recon_leptons = recon_mu;
-      }
-      else if(recon_e.size()==1 && recon_mu.size()==1 &&
-              (recon_e[0].momentum().perp()>25. ||recon_mu[0].momentum().perp()>20. )) {
-        if(recon_mu[0].momentum().perp()<recon_e[0].momentum().perp()) {
-          recon_leptons.push_back(recon_e [0]);
-          recon_leptons.push_back(recon_mu[0]);
-        }
-        else {
-          recon_leptons.push_back(recon_mu[0]);
-          recon_leptons.push_back(recon_e [0]);
-        }
-      }
-      // fails trigger
-      else
-        vetoEvent;
-
-      double mll = (recon_leptons[0].momentum()+recon_leptons[1].momentum()).mass();
-      // lepton pair mass > 12.
-      if(mll < 12.) vetoEvent;
-
-      // same sign or opposite sign event
-      int sign = recon_leptons[0].pdgId()*recon_leptons[1].pdgId();
-
-      // same sign leptons
-      if(sign>0) {
-        _hist_mll_SS_D   ->fill(mll   ,weight);
-        _hist_mll_SS_B   ->fill(mll   ,weight);
-        _hist_eTmiss_SS_D->fill(eTmiss,weight);
-        _hist_eTmiss_SS_B->fill(eTmiss,weight);
-        if(recon_jets.size()>=2) {
-          _hist_mll_SS_2Jet_D   ->fill(mll   ,weight);
-          _hist_mll_SS_2Jet_B   ->fill(mll   ,weight);
-        }
-        _hist_njet_SS_D ->fill(recon_jets.size(),weight);
-        _hist_njet_SS_B ->fill(recon_jets.size(),weight);
-        if(!recon_jets.empty()) {
-          _hist_pT_j1_SS_D->fill(recon_jets[0].momentum().perp(),weight);
-          _hist_pT_j1_SS_B->fill(recon_jets[0].momentum().perp(),weight);
-        }
-        if(recon_jets.size()>2) {
-          _hist_pT_j2_SS_D->fill(recon_jets[1].momentum().perp(),weight);
-          _hist_pT_j2_SS_B->fill(recon_jets[1].momentum().perp(),weight);
-        }
-        _hist_pT_l1_SS_D->fill(recon_leptons[0].momentum().perp(),weight);
-        _hist_pT_l1_SS_B->fill(recon_leptons[0].momentum().perp(),weight);
-        _hist_pT_l2_SS_D->fill(recon_leptons[1].momentum().perp(),weight);
-        _hist_pT_l2_SS_B->fill(recon_leptons[1].momentum().perp(),weight);
-        // SS-SR1
-        if(eTmiss>100.) {
-          _count_SS_SR1->fill(0.5,weight);
-        }
-        // SS-SR2
-        if(eTmiss>80. && recon_jets.size()>=2 &&
-           recon_jets[1].momentum().perp()>50.) {
-          _count_SS_SR2->fill(0.5,weight);
-        }
-      }
-      // opposite sign
-      else {
-        _hist_mll_OS_D->fill(mll   ,weight);
-        _hist_mll_OS_B->fill(mll   ,weight);
-        _hist_eTmiss_OS_D->fill(eTmiss,weight);
-        _hist_eTmiss_OS_B->fill(eTmiss,weight);
-        if(recon_jets.size()>=3){
-          _hist_eTmiss_3Jet_OS_D->fill(eTmiss,weight);
-          _hist_eTmiss_3Jet_OS_B->fill(eTmiss,weight);
-        }
-        if(recon_jets.size()>=4){
-          _hist_eTmiss_4Jet_OS_D->fill(eTmiss,weight);
-          _hist_eTmiss_4Jet_OS_B->fill(eTmiss,weight);
-        }
-        _hist_njet_OS_D->fill(recon_jets.size(),weight);
-        _hist_njet_OS_B->fill(recon_jets.size(),weight);
-        if(!recon_jets.empty()) {
-          _hist_pT_j1_OS_D->fill(recon_jets[0].momentum().perp(),weight);
-          _hist_pT_j1_OS_B->fill(recon_jets[0].momentum().perp(),weight);
-        }
-        if(recon_jets.size()>2) {
-          _hist_pT_j2_OS_D->fill(recon_jets[1].momentum().perp(),weight);
-          _hist_pT_j2_OS_B->fill(recon_jets[1].momentum().perp(),weight);
-        }
-        _hist_pT_l1_OS_D->fill(recon_leptons[0].momentum().perp(),weight);
-        _hist_pT_l1_OS_B->fill(recon_leptons[0].momentum().perp(),weight);
-        _hist_pT_l2_OS_D->fill(recon_leptons[1].momentum().perp(),weight);
-        _hist_pT_l2_OS_B->fill(recon_leptons[1].momentum().perp(),weight);
-        // different signal regions
-        // OS-SR1
-        if(eTmiss>250.) {
-          _count_OS_SR1->fill(0.5,weight);
-        }
-        // OS-SR2
-        if(eTmiss>220. && recon_jets.size()>=3 &&
-           recon_jets[0].momentum().perp()>80. &&
-           recon_jets[2].momentum().perp()>40.) {
-          _count_OS_SR2->fill(0.5,weight);
-        }
-        // OS-SR3
-        if(eTmiss>100. && recon_jets.size()>=4 &&
-           recon_jets[0].momentum().perp()>100. &&
-           recon_jets[3].momentum().perp()>70.) {
-          _count_OS_SR3->fill(0.5,weight);
-        }
-        // same flavour analysis
-        static const double beta   = 0.75;
-        static const double tau_e  = 0.96;
-        static const double tau_mu = 0.816;
-        double fs_weight = weight;
-        if(abs(recon_leptons[0].pdgId())==ELECTRON && abs(recon_leptons[1].pdgId())==ELECTRON) {
-          fs_weight /= beta*(1.-sqr(1.-tau_e));
-        }
-        else if(abs(recon_leptons[0].pdgId())==MUON && abs(recon_leptons[1].pdgId())==MUON) {
-          fs_weight *= beta/(1.-sqr(1.-tau_mu));
-        }
-        else {
-          fs_weight /= -(1.-(1.-tau_e)*(1.-tau_mu));
-        }
-        // FS-SR1
-        if(eTmiss>80.&& (mll<80.||mll>100.)) {
-          _count_FS_SR1->fill(0.5,fs_weight);
-        }
-        // FS-SR2
-        if(eTmiss>80.&&recon_jets.size()>=2) {
-          _count_FS_SR2->fill(0.5,fs_weight);
-        }
-        // FS-SR3
-        if(eTmiss>250.) {
-          _count_FS_SR3->fill(0.5,fs_weight);
-        }
+      if ( recon_leptons.size() != 2) vetoEvent;
+      // ensure 1st hardest
+      if(recon_leptons[0].momentum().perp()<recon_leptons[1].momentum().perp())
+	swap(recon_leptons[0],recon_leptons[1]);
+      // only keep same sign
+      if(recon_leptons[0].pdgId()*recon_leptons[1].pdgId()<0)
+	vetoEvent;
+      // at least 4 jets pt>50
+      if(recon_jets.size()<4||recon_jets[3].momentum().perp()<50.)
+	vetoEvent;
+
+      if(recon_leptons[0].pdgId()!=recon_leptons[1].pdgId()) 
+	_hist_eTmiss_emu ->fill(eTmiss,weight);
+      else if(abs(recon_leptons[0].pdgId())==ELECTRON)
+	_hist_eTmiss_ee ->fill(eTmiss,weight);
+      else if(abs(recon_leptons[0].pdgId())==MUON)
+	_hist_eTmiss_mumu->fill(eTmiss,weight);
+      _hist_eTmiss_ll->fill(eTmiss,weight);
+
+      if(eTmiss>150.) {
+	if(recon_leptons[0].pdgId()!=recon_leptons[1].pdgId()) 
+	  _count_emu ->fill(0.5,weight);
+	else if(abs(recon_leptons[0].pdgId())==ELECTRON)
+	  _count_ee  ->fill(0.5,weight);
+	else if(abs(recon_leptons[0].pdgId())==MUON)
+	  _count_mumu->fill(0.5,weight);
+	_count_ll->fill(0.5,weight);
       }
+
     }
 
     //@}
@@ -367,106 +202,37 @@
 
     void finalize() {
 
-      double norm = crossSection()/femtobarn*1.04/sumOfWeights();
+      double norm = crossSection()/femtobarn*5.8/sumOfWeights();
       // event counts
-      scale(_count_OS_SR1,norm);
-      scale(_count_OS_SR2,norm);
-      scale(_count_OS_SR3,norm);
-      scale(_count_SS_SR1,norm);
-      scale(_count_SS_SR2,norm);
-      scale(_count_FS_SR1,norm);
-      scale(_count_FS_SR2,norm);
-      scale(_count_FS_SR3,norm);
+      scale(_count_ee  ,norm);
+      scale(_count_emu ,norm);
+      scale(_count_mumu,norm);
+      scale(_count_ll  ,norm);
       // histograms
-      scale(_hist_mll_SS_D     ,norm*20.);
-      scale(_hist_mll_SS_B     ,norm*20.);
-      scale(_hist_eTmiss_SS_D  ,norm*20.);
-      scale(_hist_eTmiss_SS_B  ,norm*20.);
-      scale(_hist_mll_SS_2Jet_D,norm*50.);
-      scale(_hist_mll_SS_2Jet_B,norm*50.);
-      scale(_hist_njet_SS_D    ,norm    );
-      scale(_hist_njet_SS_B    ,norm    );
-      scale(_hist_pT_j1_SS_D   ,norm*20.);
-      scale(_hist_pT_j1_SS_B   ,norm*20.);
-      scale(_hist_pT_j2_SS_D   ,norm*20.);
-      scale(_hist_pT_j2_SS_B   ,norm*20.);
-      scale(_hist_pT_l1_SS_D   ,norm*5. );
-      scale(_hist_pT_l1_SS_B   ,norm*5. );
-      scale(_hist_pT_l2_SS_D   ,norm*5. );
-      scale(_hist_pT_l2_SS_B   ,norm*5. );
-
-      scale(_hist_mll_OS_D        ,norm*10.);
-      scale(_hist_mll_OS_B        ,norm*10.);
-      scale(_hist_eTmiss_OS_D     ,norm*10.);
-      scale(_hist_eTmiss_OS_B     ,norm*10.);
-      scale(_hist_eTmiss_3Jet_OS_D,norm*10.);
-      scale(_hist_eTmiss_3Jet_OS_B,norm*10.);
-      scale(_hist_eTmiss_4Jet_OS_D,norm*10.);
-      scale(_hist_eTmiss_4Jet_OS_B,norm*10.);
-      scale(_hist_njet_OS_D       ,norm    );
-      scale(_hist_njet_OS_B       ,norm    );
-      scale(_hist_pT_j1_OS_D      ,norm*20.);
-      scale(_hist_pT_j1_OS_B      ,norm*20.);
-      scale(_hist_pT_j2_OS_D      ,norm*20.);
-      scale(_hist_pT_j2_OS_B      ,norm*20.);
-      scale(_hist_pT_l1_OS_D      ,norm*20.);
-      scale(_hist_pT_l1_OS_B      ,norm*20.);
-      scale(_hist_pT_l2_OS_D      ,norm*20.);
-      scale(_hist_pT_l2_OS_B      ,norm*20.);
+      scale(_hist_eTmiss_ee  ,norm*50.);
+      scale(_hist_eTmiss_emu ,norm*50.);
+      scale(_hist_eTmiss_mumu,norm*50.);
+      scale(_hist_eTmiss_ll  ,norm*50.);
+
     }
 
   private:
 
     /// @name Histograms
     //@{
-    AIDA::IHistogram1D* _count_OS_SR1;
-    AIDA::IHistogram1D* _count_OS_SR2;
-    AIDA::IHistogram1D* _count_OS_SR3;
-    AIDA::IHistogram1D* _count_SS_SR1;
-    AIDA::IHistogram1D* _count_SS_SR2;
-    AIDA::IHistogram1D* _count_FS_SR1;
-    AIDA::IHistogram1D* _count_FS_SR2;
-    AIDA::IHistogram1D* _count_FS_SR3;
-
-    AIDA::IHistogram1D* _hist_mll_SS_D;
-    AIDA::IHistogram1D* _hist_mll_SS_B;
-    AIDA::IHistogram1D* _hist_eTmiss_SS_D;
-    AIDA::IHistogram1D* _hist_eTmiss_SS_B;
-    AIDA::IHistogram1D* _hist_mll_SS_2Jet_D;
-    AIDA::IHistogram1D* _hist_mll_SS_2Jet_B;
-    AIDA::IHistogram1D* _hist_njet_SS_D;
-    AIDA::IHistogram1D* _hist_njet_SS_B;
-    AIDA::IHistogram1D* _hist_pT_j1_SS_D;
-    AIDA::IHistogram1D* _hist_pT_j1_SS_B;
-    AIDA::IHistogram1D* _hist_pT_j2_SS_D;
-    AIDA::IHistogram1D* _hist_pT_j2_SS_B;
-    AIDA::IHistogram1D* _hist_pT_l1_SS_D;
-    AIDA::IHistogram1D* _hist_pT_l1_SS_B;
-    AIDA::IHistogram1D* _hist_pT_l2_SS_D;
-    AIDA::IHistogram1D* _hist_pT_l2_SS_B;
-
-    AIDA::IHistogram1D* _hist_mll_OS_D;
-    AIDA::IHistogram1D* _hist_mll_OS_B;
-    AIDA::IHistogram1D* _hist_eTmiss_OS_D;
-    AIDA::IHistogram1D* _hist_eTmiss_OS_B;
-    AIDA::IHistogram1D* _hist_eTmiss_3Jet_OS_D;
-    AIDA::IHistogram1D* _hist_eTmiss_3Jet_OS_B;
-    AIDA::IHistogram1D* _hist_eTmiss_4Jet_OS_D;
-    AIDA::IHistogram1D* _hist_eTmiss_4Jet_OS_B;
-    AIDA::IHistogram1D* _hist_njet_OS_D ;
-    AIDA::IHistogram1D* _hist_njet_OS_B ;
-    AIDA::IHistogram1D* _hist_pT_j1_OS_D;
-    AIDA::IHistogram1D* _hist_pT_j1_OS_B;
-    AIDA::IHistogram1D* _hist_pT_j2_OS_D;
-    AIDA::IHistogram1D* _hist_pT_j2_OS_B;
-    AIDA::IHistogram1D* _hist_pT_l1_OS_D;
-    AIDA::IHistogram1D* _hist_pT_l1_OS_B;
-    AIDA::IHistogram1D* _hist_pT_l2_OS_D;
-    AIDA::IHistogram1D* _hist_pT_l2_OS_B;
+    AIDA::IHistogram1D* _count_ee  ;
+    AIDA::IHistogram1D* _count_emu ;
+    AIDA::IHistogram1D* _count_mumu;
+    AIDA::IHistogram1D* _count_ll  ;
+
+    AIDA::IHistogram1D* _hist_eTmiss_ee;
+    AIDA::IHistogram1D* _hist_eTmiss_emu;
+    AIDA::IHistogram1D* _hist_eTmiss_mumu;
+    AIDA::IHistogram1D* _hist_eTmiss_ll;
     //@}
   };
 
   // The hook for the plugin system
-  DECLARE_RIVET_PLUGIN(ATLAS_2012_I943401);
+  DECLARE_RIVET_PLUGIN(ATLAS_2012_CONF_2012_105);
 
 }

Copied and modified: branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_109.cc (from r3927, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1125961.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1125961.cc	Wed Sep 12 17:36:56 2012	(r3927, copy source)
+++ branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_109.cc	Mon Sep 17 09:41:46 2012	(r3930)
@@ -9,19 +9,20 @@
 #include "Rivet/Projections/IdentifiedFinalState.hh"
 #include "Rivet/Projections/FastJets.hh"
 #include "Rivet/Projections/VetoedFinalState.hh"
+#include "Rivet/Tools/ParticleIdUtils.hh"
 
 namespace Rivet {
 
   /// @author Peter Richardson
-  class ATLAS_2012_I1125961 : public Analysis {
+  class ATLAS_2012_CONF_2012_109 : public Analysis {
   public:
 
     /// @name Constructors etc.
     //@{
 
     /// Constructor
-    ATLAS_2012_I1125961()
-      : Analysis("ATLAS_2012_I1125961")
+    ATLAS_2012_CONF_2012_109()
+      : Analysis("ATLAS_2012_CONF_2012_109")
     {    }
 
     //@}
@@ -63,8 +64,9 @@
       // Book histograms
       _count_A_tight   = bookHistogram1D("count_A_tight"   , 1, 0., 1.);
       _count_A_medium  = bookHistogram1D("count_A_medium"  , 1, 0., 1.);
-      _count_Ap_medium = bookHistogram1D("count_Ap_medium" , 1, 0., 1.);
+      _count_A_loose   = bookHistogram1D("count_A_loose"   , 1, 0., 1.);
       _count_B_tight   = bookHistogram1D("count_B_tight"   , 1, 0., 1.);
+      _count_B_medium  = bookHistogram1D("count_B_medium"  , 1, 0., 1.);
       _count_C_tight   = bookHistogram1D("count_C_tight"   , 1, 0., 1.);
       _count_C_medium  = bookHistogram1D("count_C_medium"  , 1, 0., 1.);
       _count_C_loose   = bookHistogram1D("count_C_loose"   , 1, 0., 1.);
@@ -73,12 +75,16 @@
       _count_E_medium  = bookHistogram1D("count_E_medium"  , 1, 0., 1.);
       _count_E_loose   = bookHistogram1D("count_E_loose"   , 1, 0., 1.);
 
-      _hist_meff_A  = bookHistogram1D("hist_m_eff_A" , 30, 0., 3000.);
-      _hist_meff_Ap = bookHistogram1D("hist_m_eff_Ap", 30, 0., 3000.);
-      _hist_meff_B  = bookHistogram1D("hist_m_eff_B" , 30, 0., 3000.);
-      _hist_meff_C  = bookHistogram1D("hist_m_eff_C" , 30, 0., 3000.);
-      _hist_meff_D  = bookHistogram1D("hist_m_eff_D" , 30, 0., 3000.);
-      _hist_meff_E  = bookHistogram1D("hist_m_eff_E" , 30, 0., 3000.);
+     _hist_meff_A_medium = bookHistogram1D("meff_A_medium" , 40, 0., 4000.);
+     _hist_meff_A_tight  = bookHistogram1D("meff_A_tight"  , 40, 0., 4000.);
+     _hist_meff_B_medium = bookHistogram1D("meff_B_medium" , 40, 0., 4000.);
+     _hist_meff_B_tight  = bookHistogram1D("meff_B_tight"  , 40, 0., 4000.);
+     _hist_meff_C_medium = bookHistogram1D("meff_C_medium" , 40, 0., 4000.);
+     _hist_meff_C_tight  = bookHistogram1D("meff_C_tight"  , 40, 0., 4000.);
+     _hist_meff_D        = bookHistogram1D("meff_D"        , 40, 0., 4000.);
+     _hist_meff_E_loose  = bookHistogram1D("meff_E_loose"  , 40, 0., 4000.);
+     _hist_meff_E_medium = bookHistogram1D("meff_E_medium" , 40, 0., 4000.);
+     _hist_meff_E_tight  = bookHistogram1D("meff_E_tight"  , 40, 0., 4000.);
 
     }
 
@@ -173,6 +179,7 @@
         vetoEvent;
       }
 
+      // check the hardest two jets
       if ( recon_jets.size()<2 || 
 	   recon_jets[0].momentum().pT() <= 130.0 * GeV || 
 	   recon_jets[0].momentum().pT() <=  60.0 * GeV ) {
@@ -180,6 +187,26 @@
         vetoEvent;
       }
 
+      // check the charged and EM fractions of the hard jets to avoid
+      // photons
+      for(unsigned int ix=0;ix<2;++ix) {
+	// jets over 100 GeV
+	if(recon_jets[ix].momentum().pT()<100. ||
+	   recon_jets[ix].momentum().eta()>2.) continue;
+	double fch(0.), fem(0.), eTotal(0.);
+	foreach(const Particle & part, recon_jets[ix].particles()) {
+	  long id = abs(part.pdgId());
+	  if(PID::threeCharge(id)!=0)
+	    fch += part.momentum().E();
+	  if(id==PHOTON||id==EMINUS||id==PI0)
+	    fem += part.momentum().E();
+	}
+	fch /= eTotal;
+	fem /= eTotal;
+	// reomve events with hard photon
+	if(fch<0.02|| (fch<0.05&&fem>0.09))
+	  vetoEvent;
+      }
       // ==================== observables ====================
 
       int Njets = 0;
@@ -187,15 +214,13 @@
       double min_dPhi_2   = 999.999;
       double min_dPhi_3   = 999.999;
       double pTmiss_phi = pTmiss.phi();
+
       foreach ( const Jet& jet, recon_jets ) {
         if ( jet.momentum().pT() < 40 * GeV ) continue;
-	if ( Njets < 2 ) {
-	  min_dPhi_2 = min( min_dPhi_2, deltaPhi( pTmiss_phi, jet.momentum().phi() ) );
-	}
-	if( Njets < 3) {
-	  min_dPhi_3 = min( min_dPhi_3, deltaPhi( pTmiss_phi, jet.momentum().phi() ) );
-	}
-	min_dPhi_All = min( min_dPhi_All, deltaPhi( pTmiss_phi, jet.momentum().phi() ) );
+	double dPhi = deltaPhi( pTmiss_phi, jet.momentum().phi());
+	if ( Njets < 2 ) min_dPhi_2 = min( min_dPhi_2, dPhi );
+	if ( Njets < 3 ) min_dPhi_3 = min( min_dPhi_3, dPhi );
+	min_dPhi_All = min( min_dPhi_All, dPhi );
 	++Njets;
       }
 
@@ -209,15 +234,15 @@
       // region A
       double m_eff_Nj = eTmiss + recon_jets[0].momentum().pT() + recon_jets[1].momentum().pT();
       if( min_dPhi_2 > 0.4 && eTmiss/m_eff_Nj > 0.3 ) {
-	_hist_meff_A->fill(m_eff_inc,weight);
-	if(m_eff_inc>1900.) _count_A_tight ->fill(0.5,weight);
-	if(m_eff_inc>1400.) _count_A_medium->fill(0.5,weight);
-      }
-
-      // region A'
-      if( min_dPhi_2 > 0.4 && eTmiss/m_eff_Nj > 0.4 ) {
-	_hist_meff_Ap->fill(m_eff_inc,weight);
-	if(m_eff_inc>1200.) _count_Ap_medium->fill(0.5,weight);
+	_hist_meff_A_tight ->fill(m_eff_inc,weight);
+	if(eTmiss/m_eff_Nj > 0.4) 
+	  _hist_meff_A_medium->fill(m_eff_inc,weight);
+	if(m_eff_inc>1900.) 
+	  _count_A_tight ->fill(0.5,weight);
+	if(m_eff_inc>1300. && eTmiss/m_eff_Nj > 0.4)
+	  _count_A_medium->fill(0.5,weight);
+	if(m_eff_inc>1300. && eTmiss/m_eff_Nj > 0.4)
+	  _count_A_loose ->fill(0.5,weight);
       }
 
       // for rest of regions 3 jets pT> 60 needed
@@ -227,8 +252,13 @@
       // region B
       m_eff_Nj +=  recon_jets[2].momentum().perp();
       if( min_dPhi_3 > 0.4 && eTmiss/m_eff_Nj > 0.25 ) {
-	_hist_meff_B->fill(m_eff_inc,weight);
-	if(m_eff_inc>1900.) _count_B_tight ->fill(0.5,weight);
+	_hist_meff_B_tight->fill(m_eff_inc,weight);
+	if(eTmiss/m_eff_Nj > 0.3)
+	  _hist_meff_B_medium->fill(m_eff_inc,weight);
+	if(m_eff_inc>1900.) 
+	  _count_B_tight ->fill(0.5,weight);
+	if(m_eff_inc>1300. && eTmiss/m_eff_Nj > 0.3) 
+	  _count_B_medium->fill(0.5,weight);
       }
 
       // for rest of regions 4 jets pT> 60 needed
@@ -238,10 +268,15 @@
       // region C
       m_eff_Nj +=  recon_jets[3].momentum().perp();
       if( min_dPhi_3 > 0.4 && min_dPhi_All > 0.2 && eTmiss/m_eff_Nj > 0.25 ) {
-	_hist_meff_C->fill(m_eff_inc,weight);
-	if(m_eff_inc>1500.) _count_C_tight ->fill(0.5,weight);
-	if(m_eff_inc>1200.) _count_C_medium->fill(0.5,weight);
-	if(m_eff_inc> 900.) _count_C_loose ->fill(0.5,weight);
+	_hist_meff_C_tight->fill(m_eff_inc,weight);
+	if( eTmiss/m_eff_Nj > 0.3 ) 
+	  _hist_meff_C_medium->fill(m_eff_inc,weight);
+	if(m_eff_inc>1900.) 
+	  _count_C_tight ->fill(0.5,weight);
+	if(m_eff_inc>1300. && eTmiss/m_eff_Nj > 0.3)
+	  _count_C_medium->fill(0.5,weight);
+	if(m_eff_inc>1000. && eTmiss/m_eff_Nj > 0.3)
+	  _count_C_loose ->fill(0.5,weight);
       }
 
       // for rest of regions 5 jets pT> 40 needed
@@ -250,9 +285,9 @@
 
       // region D
       m_eff_Nj +=  recon_jets[4].momentum().perp();
-      if( min_dPhi_3 > 0.4 && min_dPhi_All > 0.2 && eTmiss/m_eff_Nj > 0.2 ) {
+      if( min_dPhi_3 > 0.4 && min_dPhi_All > 0.2 && eTmiss/m_eff_Nj > 0.15 ) {
 	_hist_meff_D->fill(m_eff_inc,weight);
-	if(m_eff_inc>1500.) _count_D_tight ->fill(0.5,weight);
+	if(m_eff_inc>1700.) _count_D_tight ->fill(0.5,weight);
       }
 
       // for rest of regions 6 jets pT> 40 needed
@@ -262,29 +297,40 @@
       // region E
       m_eff_Nj +=  recon_jets[5].momentum().perp();
       if( min_dPhi_3 > 0.4 && min_dPhi_All > 0.2 && eTmiss/m_eff_Nj > 0.15 ) {
-	_hist_meff_E->fill(m_eff_inc,weight);
+	_hist_meff_E_tight->fill(m_eff_inc,weight);
+	if( eTmiss/m_eff_Nj > 0.25 ) 
+	  _hist_meff_E_medium->fill(m_eff_inc,weight);
+	if( eTmiss/m_eff_Nj > 0.3 ) 
+	  _hist_meff_E_loose->fill(m_eff_inc,weight);
 	if(m_eff_inc>1400.) _count_E_tight ->fill(0.5,weight);
-	if(m_eff_inc>1200.) _count_E_medium->fill(0.5,weight);
-	if(m_eff_inc> 900.) _count_E_loose ->fill(0.5,weight);
+	if(m_eff_inc>1300.&& eTmiss/m_eff_Nj > 0.25 )
+	  _count_E_medium->fill(0.5,weight);
+	if(m_eff_inc>1000.&& eTmiss/m_eff_Nj > 0.3  )
+	  _count_E_loose ->fill(0.5,weight);
       }
     }
 
 
     void finalize() {
 
-      double norm = crossSection()/femtobarn*4.7/sumOfWeights();
-      // these are number of events at 4.7fb^-1 per 100 GeV
-      scale( _hist_meff_A , 100. * norm );
-      scale( _hist_meff_Ap, 100. * norm );
-      scale( _hist_meff_B , 100. * norm );
-      scale( _hist_meff_C , 100. * norm );
-      scale( _hist_meff_D , 100. * norm );
-      scale( _hist_meff_E , 100. * norm );
-      // these are number of events at 4.7fb^-1
+      double norm = crossSection()/femtobarn*5.8/sumOfWeights();
+      // these are number of events at 5.8fb^-1 per 100 GeV
+      scale( _hist_meff_A_medium , 100. * norm );
+      scale( _hist_meff_A_tight  , 100. * norm );
+      scale( _hist_meff_B_medium , 100. * norm );
+      scale( _hist_meff_B_tight  , 100. * norm );
+      scale( _hist_meff_C_medium , 100. * norm );
+      scale( _hist_meff_C_tight  , 100. * norm );
+      scale( _hist_meff_D 	 , 100. * norm );
+      scale( _hist_meff_E_loose  , 100. * norm );
+      scale( _hist_meff_E_medium , 100. * norm );
+      scale( _hist_meff_E_tight  , 100. * norm );
+      // these are number of events at 5.8fb^-1
       scale(_count_A_tight  ,norm);
       scale(_count_A_medium ,norm);
-      scale(_count_Ap_medium,norm);
+      scale(_count_A_loose  ,norm);
       scale(_count_B_tight  ,norm);
+      scale(_count_B_medium ,norm);
       scale(_count_C_tight  ,norm);
       scale(_count_C_medium ,norm);
       scale(_count_C_loose  ,norm);
@@ -296,13 +342,13 @@
 
     //@}
 
-
   private:
 
     AIDA::IHistogram1D* _count_A_tight;
     AIDA::IHistogram1D* _count_A_medium;
-    AIDA::IHistogram1D* _count_Ap_medium;
+    AIDA::IHistogram1D* _count_A_loose;
     AIDA::IHistogram1D* _count_B_tight;
+    AIDA::IHistogram1D* _count_B_medium;
     AIDA::IHistogram1D* _count_C_tight;
     AIDA::IHistogram1D* _count_C_medium;
     AIDA::IHistogram1D* _count_C_loose;
@@ -311,17 +357,21 @@
     AIDA::IHistogram1D* _count_E_medium;
     AIDA::IHistogram1D* _count_E_loose;
     
-    AIDA::IHistogram1D* _hist_meff_A ;
-    AIDA::IHistogram1D* _hist_meff_Ap;
-    AIDA::IHistogram1D* _hist_meff_B ;
-    AIDA::IHistogram1D* _hist_meff_C ;
-    AIDA::IHistogram1D* _hist_meff_D ;
-    AIDA::IHistogram1D* _hist_meff_E ;
+    AIDA::IHistogram1D* _hist_meff_A_medium;
+    AIDA::IHistogram1D* _hist_meff_A_tight;
+    AIDA::IHistogram1D* _hist_meff_B_medium;
+    AIDA::IHistogram1D* _hist_meff_B_tight;
+    AIDA::IHistogram1D* _hist_meff_C_medium;
+    AIDA::IHistogram1D* _hist_meff_C_tight;
+    AIDA::IHistogram1D* _hist_meff_D;
+    AIDA::IHistogram1D* _hist_meff_E_loose;
+    AIDA::IHistogram1D* _hist_meff_E_medium;
+    AIDA::IHistogram1D* _hist_meff_E_tight; 
     
   };
 
 
   // This global object acts as a hook for the plugin system
-  DECLARE_RIVET_PLUGIN(ATLAS_2012_I1125961);
+  DECLARE_RIVET_PLUGIN(ATLAS_2012_CONF_2012_109);
 
 }

Modified: branches/2012-06-aidarivet/src/Analyses/Makefile.am
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/Makefile.am	Fri Sep 14 15:08:41 2012	(r3929)
+++ branches/2012-06-aidarivet/src/Analyses/Makefile.am	Mon Sep 17 09:41:46 2012	(r3930)
@@ -93,7 +93,11 @@
     ATLAS_2012_I1095236.cc \
     ATLAS_2012_I1082009.cc \
     ATLAS_2012_I946427.cc \
-    ATLAS_2012_I1180197.cc
+    ATLAS_2012_I1180197.cc \
+    ATLAS_2012_CONF_2012_103.cc \
+    ATLAS_2012_CONF_2012_104.cc \
+    ATLAS_2012_CONF_2012_105.cc \
+    ATLAS_2012_CONF_2012_109.cc
 endif
 
 


More information about the Rivet-svn mailing list