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

blackhole at projects.hepforge.org blackhole at projects.hepforge.org
Wed Nov 14 15:40:33 GMT 2012


Author: buckley
Date: Wed Nov 14 15:40:33 2012
New Revision: 3983

Log:
Merge changeset [3930] from AIDA branch, and adapt new analyses to use YODA objects and functions

Added:
   trunk/data/anainfo/ATLAS_2012_CONF_2012_103.info
      - copied unchanged from r3930, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_103.info
   trunk/data/anainfo/ATLAS_2012_CONF_2012_104.info
      - copied unchanged from r3930, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_104.info
   trunk/data/anainfo/ATLAS_2012_CONF_2012_105.info
      - copied unchanged from r3930, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_105.info
   trunk/data/anainfo/ATLAS_2012_CONF_2012_109.info
      - copied unchanged from r3930, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_109.info
   trunk/data/plotinfo/ATLAS_2012_CONF_2012_103.plot
      - copied unchanged from r3930, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_103.plot
   trunk/data/plotinfo/ATLAS_2012_CONF_2012_104.plot
      - copied unchanged from r3930, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_104.plot
   trunk/data/plotinfo/ATLAS_2012_CONF_2012_105.plot
      - copied unchanged from r3930, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_105.plot
   trunk/data/plotinfo/ATLAS_2012_CONF_2012_109.plot
      - copied unchanged from r3930, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_109.plot
   trunk/src/Analyses/ATLAS_2012_CONF_2012_103.cc
      - copied, changed from r3930, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_103.cc
   trunk/src/Analyses/ATLAS_2012_CONF_2012_104.cc
      - copied, changed from r3930, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_104.cc
   trunk/src/Analyses/ATLAS_2012_CONF_2012_105.cc
      - copied, changed from r3930, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_105.cc
   trunk/src/Analyses/ATLAS_2012_CONF_2012_109.cc
      - copied, changed from r3930, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_109.cc
Modified:
   trunk/data/anainfo/Makefile.am
   trunk/data/plotinfo/Makefile.am
   trunk/src/Analyses/Makefile.am

Copied: trunk/data/anainfo/ATLAS_2012_CONF_2012_103.info (from r3930, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_103.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/ATLAS_2012_CONF_2012_103.info	Wed Nov 14 15:40:33 2012	(r3983, copy of r3930, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_103.info)
@@ -0,0 +1,25 @@
+Name: ATLAS_2012_CONF_2012_103
+Year: 2012
+Summary: High jet multiplicity squark and gluino search
+Experiment: ATLAS
+Collider: LHC
+Status: UNVALIDATED
+Authors:
+ - Peter Richardson <peter.richardson at durham.ac.uk>
+References:
+ - ATLAS-CONF-2012-103
+ - arXiv:1206.1760
+RunInfo:
+  BSM signal events at 8000 GeV.
+NumEvents: 25000 for BSM signals
+Beams: [p+, p+]
+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 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. The analysis is identical to the previous 7 TeV paper.'

Copied: trunk/data/anainfo/ATLAS_2012_CONF_2012_104.info (from r3930, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_104.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/ATLAS_2012_CONF_2012_104.info	Wed Nov 14 15:40:33 2012	(r3983, copy of r3930, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_104.info)
@@ -0,0 +1,21 @@
+Name: ATLAS_2012_CONF_2012_104
+Year: 2012
+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
+Status: UNVALIDATED
+Authors:
+ - Peter Richardson <Peter.Richardson at durham.ac.uk>
+References:
+ - ATLAS-CONF-2012-104
+RunInfo:
+  BSM signal events at 8000 GeV.
+NumEvents: 25000 for BSM signals
+Beams: [p+, p+]
+Energies: [8000]
+Description:
+  '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.'

Copied: trunk/data/anainfo/ATLAS_2012_CONF_2012_105.info (from r3930, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_105.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/ATLAS_2012_CONF_2012_105.info	Wed Nov 14 15:40:33 2012	(r3983, copy of r3930, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_105.info)
@@ -0,0 +1,22 @@
+Name: ATLAS_2012_CONF_2012_105
+Year: 2012
+Summary: Search for supersymmetry with 2 same-sign leptons, jets and missing transverse energy
+Experiment: ATLAS
+Collider: LHC
+Status: UNVALIDATED
+Authors:
+ - Peter Richardson <Peter.Richardson at durham.ac.uk>
+References:
+ - ATLAS-CONF-2012-105
+RunInfo:
+  BSM signal events at 8000 GeV.
+NumEvents: 25000 for BSM signals
+Beams: [p+, p+]
+Energies: [8000]
+Description:
+  '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.'

Copied: trunk/data/anainfo/ATLAS_2012_CONF_2012_109.info (from r3930, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_109.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/ATLAS_2012_CONF_2012_109.info	Wed Nov 14 15:40:33 2012	(r3983, copy of r3930, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_CONF_2012_109.info)
@@ -0,0 +1,23 @@
+Name: ATLAS_2012_CONF_2012_109
+Year: 2012
+Summary: 0-lepton squark and gluino search
+Experiment: ATLAS
+Collider: LHC
+InspireID: 1125961
+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
+ - ATLAS-CONF-2012-109 
+RunInfo:
+  BSM signal events at 8000 GeV.
+NumEvents: 10000 for BSM signals
+Beams: [p+, p+]
+Energies: [8000]
+Description:
+  '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: trunk/data/anainfo/Makefile.am
==============================================================================
--- trunk/data/anainfo/Makefile.am	Wed Nov 14 15:25:01 2012	(r3982)
+++ trunk/data/anainfo/Makefile.am	Wed Nov 14 15:40:33 2012	(r3983)
@@ -59,6 +59,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: trunk/data/plotinfo/ATLAS_2012_CONF_2012_103.plot (from r3930, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_103.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/ATLAS_2012_CONF_2012_103.plot	Wed Nov 14 15:40:33 2012	(r3983, copy of r3930, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_103.plot)
@@ -0,0 +1,87 @@
+# 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_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_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_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_CONF_2012_103/count_7j80
+Title=Number of events in 7 jet, $p_\perp>80$\,GeV signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+# BEGIN PLOT /ATLAS_2012_CONF_2012_038/count_8j80
+Title=Number of events in 8 jet, $p_\perp>80$\,GeV signal region
+XLabel=
+YLabel=Number of Events
+LogY=0
+# END PLOT
+
+# 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_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_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_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_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_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_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_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
+LogY=1
+# END PLOT

Copied: trunk/data/plotinfo/ATLAS_2012_CONF_2012_104.plot (from r3930, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_104.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/ATLAS_2012_CONF_2012_104.plot	Wed Nov 14 15:40:33 2012	(r3983, copy of r3930, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_104.plot)
@@ -0,0 +1,32 @@
+# 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_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_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_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_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: trunk/data/plotinfo/ATLAS_2012_CONF_2012_105.plot (from r3930, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_105.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/ATLAS_2012_CONF_2012_105.plot	Wed Nov 14 15:40:33 2012	(r3983, copy of r3930, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_105.plot)
@@ -0,0 +1,48 @@
+# 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_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_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_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_CONF_2012_105/eTmiss_ee
+Title=Missing Transverse Energy for $ee$ events
+XLabel=$E^{\rm miss}_{\mathrm{T}}$ [GeV]
+YLabel=$\mathrm{Events}/50$\,GeV
+LogY=1
+# END PLOT
+# 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}/50$\,GeV
+LogY=1
+# END PLOT
+# 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}/50$\,GeV
+LogY=1
+# END PLOT
+# 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}/50$\,GeV
+LogY=1
+# END PLOT

Copied: trunk/data/plotinfo/ATLAS_2012_CONF_2012_109.plot (from r3930, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_109.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/ATLAS_2012_CONF_2012_109.plot	Wed Nov 14 15:40:33 2012	(r3983, copy of r3930, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_CONF_2012_109.plot)
@@ -0,0 +1,137 @@
+# 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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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
+# END PLOT

Modified: trunk/data/plotinfo/Makefile.am
==============================================================================
--- trunk/data/plotinfo/Makefile.am	Wed Nov 14 15:25:01 2012	(r3982)
+++ trunk/data/plotinfo/Makefile.am	Wed Nov 14 15:40:33 2012	(r3983)
@@ -56,6 +56,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: trunk/src/Analyses/ATLAS_2012_CONF_2012_103.cc (from r3930, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_103.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_103.cc	Mon Sep 17 09:41:46 2012	(r3930, copy source)
+++ trunk/src/Analyses/ATLAS_2012_CONF_2012_103.cc	Wed Nov 14 15:40:33 2012	(r3983)
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 #include "Rivet/Analysis.hh"
 #include "Rivet/Tools/BinnedHistogram.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 #include "Rivet/Tools/Logging.hh"
 #include "Rivet/Projections/FinalState.hh"
 #include "Rivet/Projections/ChargedFinalState.hh"
@@ -61,22 +61,22 @@
                     "AntiKtJets04");
 
       /// Book histograms
-      _etmiss_HT_7j55 = bookHistogram1D("etmiss_HT_7j55", 8, 0., 16.);
-      _etmiss_HT_8j55 = bookHistogram1D("etmiss_HT_8j55", 8, 0., 16.);
-      _etmiss_HT_9j55 = bookHistogram1D("etmiss_HT_9j55", 8, 0., 16.);
-      _etmiss_HT_6j80 = bookHistogram1D("etmiss_HT_6j80", 8, 0., 16.);
-      _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", 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.);
-      _count_9j55 = bookHistogram1D("count_9j55", 1, 0., 1.);
-      _count_6j80 = bookHistogram1D("count_6j80", 1, 0., 1.);
-      _count_7j80 = bookHistogram1D("count_7j80", 1, 0., 1.);
-      _count_8j80 = bookHistogram1D("count_8j80", 1, 0., 1.);
+      _etmiss_HT_7j55 = bookHisto1D("etmiss_HT_7j55", 8, 0., 16.);
+      _etmiss_HT_8j55 = bookHisto1D("etmiss_HT_8j55", 8, 0., 16.);
+      _etmiss_HT_9j55 = bookHisto1D("etmiss_HT_9j55", 8, 0., 16.);
+      _etmiss_HT_6j80 = bookHisto1D("etmiss_HT_6j80", 8, 0., 16.);
+      _etmiss_HT_7j80 = bookHisto1D("etmiss_HT_7j80", 8, 0., 16.);
+      _etmiss_HT_8j80 = bookHisto1D("etmiss_HT_8j80", 8, 0., 16.);
+
+      _hist_njet55 = bookHisto1D("hist_njet55", 4, 5.5, 9.5);
+      _hist_njet80 = bookHisto1D("hist_njet80", 4, 4.5, 8.5);
+
+      _count_7j55 = bookHisto1D("count_7j55", 1, 0., 1.);
+      _count_8j55 = bookHisto1D("count_8j55", 1, 0., 1.);
+      _count_9j55 = bookHisto1D("count_9j55", 1, 0., 1.);
+      _count_6j80 = bookHisto1D("count_6j80", 1, 0., 1.);
+      _count_7j80 = bookHisto1D("count_7j80", 1, 0., 1.);
+      _count_8j80 = bookHisto1D("count_8j80", 1, 0., 1.);
 
     }
 
@@ -95,9 +95,9 @@
       }
 
       // candidate muons
-      ParticleVector cand_mu = 
-	applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt();
-      
+      ParticleVector cand_mu =
+        applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt();
+
       // candidate electrons
       ParticleVector cand_e  =
         applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt();
@@ -107,14 +107,14 @@
       foreach ( const Jet& jet, cand_jets ) {
         // candidates after |eta| < 2.8
         if ( fabs( jet.momentum().eta() ) >= 2.8 ) continue;
-	bool away_from_e = true;
-	foreach ( const Particle & e, cand_e ) {
-	  if ( deltaR(e.momentum(),jet.momentum()) <= 0.2 ) {
-	    away_from_e = false;
-	    break;
-	  }
-	}
-	if ( away_from_e ) recon_jets.push_back( jet );
+        bool away_from_e = true;
+        foreach ( const Particle & e, cand_e ) {
+          if ( deltaR(e.momentum(),jet.momentum()) <= 0.2 ) {
+            away_from_e = false;
+            break;
+          }
+        }
+        if ( away_from_e ) recon_jets.push_back( jet );
       }
 
       // only keep electrons more than R=0.4 from jets
@@ -179,47 +179,47 @@
       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
-	if(njet55>=7) 
-	  _count_7j55->fill( 0.5, weight); 
-	// 8j55
-	if(njet55>=8) 
-	  _count_8j55->fill( 0.5, weight) ;
-	// 8j55
-	if(njet55==9)
-	  _count_9j55->fill( 0.5, weight) ;
-	// 6j80
-	if(njet80>=6)
-	  _count_6j80->fill( 0.5, weight) ;
-	// 7j80
-	if(njet80>=7)
-	  _count_7j80->fill( 0.5, weight) ;
-	// 8j80
-	if(njet80==8)
-	  _count_8j80->fill( 0.5, weight) ;
+        if(njet55>9) njet55 = 9;
+        if(njet80>8) njet80 = 8;
+        _hist_njet55->fill(njet55,weight);
+        _hist_njet80->fill(njet80,weight);
+        // 7j55
+        if(njet55>=7)
+          _count_7j55->fill( 0.5, weight);
+        // 8j55
+        if(njet55>=8)
+          _count_8j55->fill( 0.5, weight) ;
+        // 8j55
+        if(njet55==9)
+          _count_9j55->fill( 0.5, weight) ;
+        // 6j80
+        if(njet80>=6)
+          _count_6j80->fill( 0.5, weight) ;
+        // 7j80
+        if(njet80>=7)
+          _count_7j80->fill( 0.5, weight) ;
+        // 8j80
+        if(njet80==8)
+          _count_8j80->fill( 0.5, weight) ;
       }
 
-      if(njet55>=7) 
-	_etmiss_HT_7j55->fill( ratio, weight); 
+      if(njet55>=7)
+        _etmiss_HT_7j55->fill( ratio, weight);
       // 8j55
-      if(njet55>=8) 
-	_etmiss_HT_8j55->fill( ratio, weight) ;
+      if(njet55>=8)
+        _etmiss_HT_8j55->fill( ratio, weight) ;
       // 8j55
       if(njet55>=9)
-	_etmiss_HT_9j55->fill( ratio, weight) ;
+        _etmiss_HT_9j55->fill( ratio, weight) ;
       // 6j80
       if(njet80>=6)
-	_etmiss_HT_6j80->fill( ratio, weight) ;
+        _etmiss_HT_6j80->fill( ratio, weight) ;
       // 7j80
       if(njet80>=7)
-	_etmiss_HT_7j80->fill( ratio, weight) ;
+        _etmiss_HT_7j80->fill( ratio, weight) ;
       // 8j80
       if(njet80>=8)
-	_etmiss_HT_8j80->fill( ratio, weight) ;
+        _etmiss_HT_8j80->fill( ratio, weight) ;
 
     }
 
@@ -250,22 +250,22 @@
 
     /// @name Histograms
     //@{
-    AIDA::IHistogram1D* _etmiss_HT_7j55;
-    AIDA::IHistogram1D* _etmiss_HT_8j55;
-    AIDA::IHistogram1D* _etmiss_HT_9j55;
-    AIDA::IHistogram1D* _etmiss_HT_6j80;
-    AIDA::IHistogram1D* _etmiss_HT_7j80;
-    AIDA::IHistogram1D* _etmiss_HT_8j80;
-
-    AIDA::IHistogram1D* _hist_njet55;
-    AIDA::IHistogram1D* _hist_njet80;
-
-    AIDA::IHistogram1D* _count_7j55;
-    AIDA::IHistogram1D* _count_8j55;
-    AIDA::IHistogram1D* _count_9j55;
-    AIDA::IHistogram1D* _count_6j80;
-    AIDA::IHistogram1D* _count_7j80;
-    AIDA::IHistogram1D* _count_8j80;
+    Histo1DPtr _etmiss_HT_7j55;
+    Histo1DPtr _etmiss_HT_8j55;
+    Histo1DPtr _etmiss_HT_9j55;
+    Histo1DPtr _etmiss_HT_6j80;
+    Histo1DPtr _etmiss_HT_7j80;
+    Histo1DPtr _etmiss_HT_8j80;
+
+    Histo1DPtr _hist_njet55;
+    Histo1DPtr _hist_njet80;
+
+    Histo1DPtr _count_7j55;
+    Histo1DPtr _count_8j55;
+    Histo1DPtr _count_9j55;
+    Histo1DPtr _count_6j80;
+    Histo1DPtr _count_7j80;
+    Histo1DPtr _count_8j80;
     //@}
 
   };

Copied and modified: trunk/src/Analyses/ATLAS_2012_CONF_2012_104.cc (from r3930, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_104.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_104.cc	Mon Sep 17 09:41:46 2012	(r3930, copy source)
+++ trunk/src/Analyses/ATLAS_2012_CONF_2012_104.cc	Wed Nov 14 15:40:33 2012	(r3983)
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 #include "Rivet/Analysis.hh"
 #include "Rivet/Tools/BinnedHistogram.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 #include "Rivet/Tools/Logging.hh"
 #include "Rivet/Projections/FinalState.hh"
 #include "Rivet/Projections/ChargedFinalState.hh"
@@ -37,14 +37,14 @@
     void init() {
 
       // projection to find the electrons
-      std::vector<std::pair<double, double> > eta_e;
+      vector<pair<double, double> > eta_e;
       eta_e.push_back(make_pair(-2.47,2.47));
       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;
+      vector<pair<double, double> > eta_m;
       eta_m.push_back(make_pair(-2.4,2.4));
       IdentifiedFinalState muons(eta_m, 10.0*GeV);
       muons.acceptIdPair(MUON);
@@ -53,8 +53,7 @@
       // Jet finder
       VetoedFinalState vfs;
       vfs.addVetoPairId(MUON);
-      addProjection(FastJets(vfs, FastJets::ANTIKT, 0.4),
-                   "AntiKtJets04");
+      addProjection(FastJets(vfs, FastJets::ANTIKT, 0.4), "AntiKtJets04");
 
       // all tracks (to do deltaR with leptons)
       addProjection(ChargedFinalState(-3.0,3.0,0.5*GeV),"cfs");
@@ -63,11 +62,11 @@
       addProjection(VisibleFinalState(-4.9,4.9),"vfs");
 
       // Book histograms
-      _count_e  = bookHistogram1D("count_e" , 1, 0., 1.);
-      _count_mu = bookHistogram1D("count_mu", 1, 0., 1.);
+      _count_e  = bookHisto1D("count_e" , 1, 0., 1.);
+      _count_mu = bookHisto1D("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.); 
+      _hist_eTmiss_e  = bookHisto1D("hist_eTmiss_e"  , 25, 0., 1000.);
+      _hist_eTmiss_mu = bookHisto1D("hist_eTmiss_mu" , 25, 0., 1000.);
 
     }
 
@@ -166,15 +165,15 @@
 
       // only 1 signal lepton
       if( recon_e.size() + recon_mu.size() != 1 )
-	vetoEvent;
+        vetoEvent;
       if( cand_e .size() + cand_mu .size() != 1 )
-	vetoEvent;
+        vetoEvent;
 
       // start of meff calculation
       double HT=0.;
       foreach( const Jet & jet, recon_jets) {
-	double pT = jet.momentum().perp();
-        if(pT>40.) HT += pT; 
+        double pT = jet.momentum().perp();
+        if(pT>40.) HT += pT;
       }
 
       // get the lepton
@@ -184,28 +183,28 @@
       double pT = lepton.momentum().perp();
 
       double mT  = 2.*(pT*eTmiss -
-		       lepton.momentum().x()*pTmiss.x() -
-		       lepton.momentum().y()*pTmiss.y());
+                       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();
+        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);
+         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);
       }
     }
     //@}
@@ -225,11 +224,11 @@
 
     /// @name Histograms
     //@{
-    AIDA::IHistogram1D* _count_e ;
-    AIDA::IHistogram1D* _count_mu;
+    Histo1DPtr _count_e ;
+    Histo1DPtr _count_mu;
 
-    AIDA::IHistogram1D* _hist_eTmiss_e ;
-    AIDA::IHistogram1D* _hist_eTmiss_mu;
+    Histo1DPtr _hist_eTmiss_e ;
+    Histo1DPtr _hist_eTmiss_mu;
     //@}
 
   };

Copied and modified: trunk/src/Analyses/ATLAS_2012_CONF_2012_105.cc (from r3930, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_105.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_105.cc	Mon Sep 17 09:41:46 2012	(r3930, copy source)
+++ trunk/src/Analyses/ATLAS_2012_CONF_2012_105.cc	Wed Nov 14 15:40:33 2012	(r3983)
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 #include "Rivet/Analysis.hh"
 #include "Rivet/Tools/BinnedHistogram.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 #include "Rivet/Tools/Logging.hh"
 #include "Rivet/Projections/FinalState.hh"
 #include "Rivet/Projections/ChargedFinalState.hh"
@@ -54,7 +54,7 @@
       VetoedFinalState vfs;
       vfs.addVetoPairId(MUON);
       addProjection(FastJets(vfs, FastJets::ANTIKT, 0.4),
-                   "AntiKtJets04");
+                    "AntiKtJets04");
 
       // all tracks (to do deltaR with leptons)
       addProjection(ChargedFinalState(-3.0,3.0,0.5*GeV),"cfs");
@@ -65,16 +65,16 @@
       // book histograms
 
       // counts in signal regions
-      _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.);
+      _count_ee   = bookHisto1D("count_ee"  , 1, 0., 1.);
+      _count_emu  = bookHisto1D("count_emu" , 1, 0., 1.);
+      _count_mumu = bookHisto1D("count_mumu", 1, 0., 1.);
+      _count_ll   = bookHisto1D("count_ll"  , 1, 0., 1.);
 
       // histograms from paper
-      _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.);
+      _hist_eTmiss_ee   = bookHisto1D("eTmiss_ee"  , 8, 0., 400.);
+      _hist_eTmiss_emu  = bookHisto1D("eTmiss_emu" , 8, 0., 400.);
+      _hist_eTmiss_mumu = bookHisto1D("eTmiss_mumu", 8, 0., 400.);
+      _hist_eTmiss_ll   = bookHisto1D("eTmiss_ll"  , 8, 0., 400.);
     }
 
     /// Perform the event analysis
@@ -85,7 +85,7 @@
       // get the jet candidates
       Jets cand_jets;
       foreach (const Jet& jet,
-        applyProjection<FastJets>(event, "AntiKtJets04").jetsByPt(20.0*GeV) ) {
+               applyProjection<FastJets>(event, "AntiKtJets04").jetsByPt(20.0*GeV) ) {
         if ( fabs( jet.momentum().eta() ) < 2.8 ) {
           cand_jets.push_back(jet);
         }
@@ -99,13 +99,13 @@
       Jets recon_jets;
       foreach ( const Jet& jet, cand_jets ) {
         bool away_from_e = true;
-          foreach ( const Particle & e, cand_e ) {
-            if ( deltaR(e.momentum(),jet.momentum()) <= 0.2 ) {
-              away_from_e = false;
-              break;
-            }
+        foreach ( const Particle & e, cand_e ) {
+          if ( deltaR(e.momentum(),jet.momentum()) <= 0.2 ) {
+            away_from_e = false;
+            break;
           }
-          if ( away_from_e ) recon_jets.push_back( jet );
+        }
+        if ( away_from_e ) recon_jets.push_back( jet );
       }
       // get the charged tracks for isolation
       ParticleVector chg_tracks =
@@ -169,30 +169,30 @@
       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]);
+        swap(recon_leptons[0],recon_leptons[1]);
       // only keep same sign
       if(recon_leptons[0].pdgId()*recon_leptons[1].pdgId()<0)
-	vetoEvent;
+        vetoEvent;
       // at least 4 jets pt>50
       if(recon_jets.size()<4||recon_jets[3].momentum().perp()<50.)
-	vetoEvent;
+        vetoEvent;
 
-      if(recon_leptons[0].pdgId()!=recon_leptons[1].pdgId()) 
-	_hist_eTmiss_emu ->fill(eTmiss,weight);
+      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);
+        _hist_eTmiss_ee ->fill(eTmiss,weight);
       else if(abs(recon_leptons[0].pdgId())==MUON)
-	_hist_eTmiss_mumu->fill(eTmiss,weight);
+        _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);
+        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);
       }
 
     }
@@ -220,15 +220,15 @@
 
     /// @name Histograms
     //@{
-    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;
+    Histo1DPtr _count_ee  ;
+    Histo1DPtr _count_emu ;
+    Histo1DPtr _count_mumu;
+    Histo1DPtr _count_ll  ;
+
+    Histo1DPtr _hist_eTmiss_ee;
+    Histo1DPtr _hist_eTmiss_emu;
+    Histo1DPtr _hist_eTmiss_mumu;
+    Histo1DPtr _hist_eTmiss_ll;
     //@}
   };
 

Copied and modified: trunk/src/Analyses/ATLAS_2012_CONF_2012_109.cc (from r3930, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_109.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_CONF_2012_109.cc	Mon Sep 17 09:41:46 2012	(r3930, copy source)
+++ trunk/src/Analyses/ATLAS_2012_CONF_2012_109.cc	Wed Nov 14 15:40:33 2012	(r3983)
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 #include "Rivet/Analysis.hh"
 #include "Rivet/Tools/BinnedHistogram.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 #include "Rivet/Tools/Logging.hh"
 #include "Rivet/Projections/FinalState.hh"
 #include "Rivet/Projections/ChargedFinalState.hh"
@@ -62,29 +62,29 @@
       addProjection(VisibleFinalState(-4.5,4.5),"vfs");
 
       // Book histograms
-      _count_A_tight   = bookHistogram1D("count_A_tight"   , 1, 0., 1.);
-      _count_A_medium  = bookHistogram1D("count_A_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.);
-      _count_D_tight   = bookHistogram1D("count_D_tight"   , 1, 0., 1.);
-      _count_E_tight   = bookHistogram1D("count_E_tight"   , 1, 0., 1.);
-      _count_E_medium  = bookHistogram1D("count_E_medium"  , 1, 0., 1.);
-      _count_E_loose   = bookHistogram1D("count_E_loose"   , 1, 0., 1.);
-
-     _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.);
+      _count_A_tight   = bookHisto1D("count_A_tight"   , 1, 0., 1.);
+      _count_A_medium  = bookHisto1D("count_A_medium"  , 1, 0., 1.);
+      _count_A_loose   = bookHisto1D("count_A_loose"   , 1, 0., 1.);
+      _count_B_tight   = bookHisto1D("count_B_tight"   , 1, 0., 1.);
+      _count_B_medium  = bookHisto1D("count_B_medium"  , 1, 0., 1.);
+      _count_C_tight   = bookHisto1D("count_C_tight"   , 1, 0., 1.);
+      _count_C_medium  = bookHisto1D("count_C_medium"  , 1, 0., 1.);
+      _count_C_loose   = bookHisto1D("count_C_loose"   , 1, 0., 1.);
+      _count_D_tight   = bookHisto1D("count_D_tight"   , 1, 0., 1.);
+      _count_E_tight   = bookHisto1D("count_E_tight"   , 1, 0., 1.);
+      _count_E_medium  = bookHisto1D("count_E_medium"  , 1, 0., 1.);
+      _count_E_loose   = bookHisto1D("count_E_loose"   , 1, 0., 1.);
+
+      _hist_meff_A_medium = bookHisto1D("meff_A_medium" , 40, 0., 4000.);
+      _hist_meff_A_tight  = bookHisto1D("meff_A_tight"  , 40, 0., 4000.);
+      _hist_meff_B_medium = bookHisto1D("meff_B_medium" , 40, 0., 4000.);
+      _hist_meff_B_tight  = bookHisto1D("meff_B_tight"  , 40, 0., 4000.);
+      _hist_meff_C_medium = bookHisto1D("meff_C_medium" , 40, 0., 4000.);
+      _hist_meff_C_tight  = bookHisto1D("meff_C_tight"  , 40, 0., 4000.);
+      _hist_meff_D        = bookHisto1D("meff_D"        , 40, 0., 4000.);
+      _hist_meff_E_loose  = bookHisto1D("meff_E_loose"  , 40, 0., 4000.);
+      _hist_meff_E_medium = bookHisto1D("meff_E_medium" , 40, 0., 4000.);
+      _hist_meff_E_tight  = bookHisto1D("meff_E_tight"  , 40, 0., 4000.);
 
     }
 
@@ -96,9 +96,9 @@
       Jets cand_jets;
       const Jets jets = applyProjection<FastJets>(event, "AntiKtJets04").jetsByPt(20.0*GeV);
       foreach (const Jet& jet, jets) {
-	if ( fabs( jet.momentum().eta() ) < 4.9 ) {
-	  cand_jets.push_back(jet);
-	}
+        if ( fabs( jet.momentum().eta() ) < 4.9 ) {
+          cand_jets.push_back(jet);
+        }
       }
 
       const ParticleVector cand_e  = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt();
@@ -120,15 +120,15 @@
       // Resolve jet-lepton overlap for jets with |eta| < 2.8
       Jets recon_jets;
       foreach ( const Jet& jet, cand_jets ) {
-	if ( fabs( jet.momentum().eta() ) >= 2.8 ) continue;
-	bool away_from_e = true;
-	foreach ( const Particle & e, cand_e ) {
-	  if ( deltaR(e.momentum(),jet.momentum()) <= 0.2 ) {
-	    away_from_e = false;
-	    break;
-	  }
-	}
-	if ( away_from_e ) recon_jets.push_back( jet );
+        if ( fabs( jet.momentum().eta() ) >= 2.8 ) continue;
+        bool away_from_e = true;
+        foreach ( const Particle & e, cand_e ) {
+          if ( deltaR(e.momentum(),jet.momentum()) <= 0.2 ) {
+            away_from_e = false;
+            break;
+          }
+        }
+        if ( away_from_e ) recon_jets.push_back( jet );
       }
 
       ParticleVector recon_e, recon_mu;
@@ -173,16 +173,16 @@
         MSG_DEBUG("Charged leptons left after selection");
         vetoEvent;
       }
-      
+
       if ( eTmiss <= 160 * GeV ) {
         MSG_DEBUG("Not enough eTmiss: " << eTmiss << " < 130");
         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 ) {
+      if ( recon_jets.size()<2 ||
+           recon_jets[0].momentum().pT() <= 130.0 * GeV ||
+           recon_jets[0].momentum().pT() <=  60.0 * GeV ) {
         MSG_DEBUG("No hard leading jet in " << recon_jets.size() << " jets");
         vetoEvent;
       }
@@ -190,22 +190,22 @@
       // 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;
+        // 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 ====================
 
@@ -217,96 +217,96 @@
 
       foreach ( const Jet& jet, recon_jets ) {
         if ( jet.momentum().pT() < 40 * GeV ) continue;
-	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;
+        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;
       }
 
       // inclusive meff
       double m_eff_inc =  eTmiss;
       foreach ( const Jet& jet, recon_jets ) {
-	double perp =  jet.momentum().pT();
-	if(perp>40.) m_eff_inc += perp;
+        double perp =  jet.momentum().pT();
+        if(perp>40.) m_eff_inc += perp;
       }
 
       // 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_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);
+        _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
-      if(recon_jets.size()<3 || recon_jets[2].momentum().perp()<60.) 
-	vetoEvent;
+      if(recon_jets.size()<3 || recon_jets[2].momentum().perp()<60.)
+        vetoEvent;
 
       // 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_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);
+        _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
-      if(recon_jets.size()<4 || recon_jets[3].momentum().perp()<60.) 
-	vetoEvent;
+      if(recon_jets.size()<4 || recon_jets[3].momentum().perp()<60.)
+        vetoEvent;
 
       // 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_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);
+        _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
-      if(recon_jets.size()<5 || recon_jets[4].momentum().perp()<40.) 
-	vetoEvent;
+      if(recon_jets.size()<5 || recon_jets[4].momentum().perp()<40.)
+        vetoEvent;
 
       // 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.15 ) {
-	_hist_meff_D->fill(m_eff_inc,weight);
-	if(m_eff_inc>1700.) _count_D_tight ->fill(0.5,weight);
+        _hist_meff_D->fill(m_eff_inc,weight);
+        if(m_eff_inc>1700.) _count_D_tight ->fill(0.5,weight);
       }
 
       // for rest of regions 6 jets pT> 40 needed
-      if(recon_jets.size()<6 || recon_jets[5].momentum().perp()<40.) 
-	vetoEvent;
+      if(recon_jets.size()<6 || recon_jets[5].momentum().perp()<40.)
+        vetoEvent;
 
       // 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_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>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);
+        _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>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);
       }
     }
 
@@ -321,7 +321,7 @@
       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_D    , 100. * norm );
       scale( _hist_meff_E_loose  , 100. * norm );
       scale( _hist_meff_E_medium , 100. * norm );
       scale( _hist_meff_E_tight  , 100. * norm );
@@ -344,30 +344,30 @@
 
   private:
 
-    AIDA::IHistogram1D* _count_A_tight;
-    AIDA::IHistogram1D* _count_A_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;
-    AIDA::IHistogram1D* _count_D_tight;
-    AIDA::IHistogram1D* _count_E_tight;
-    AIDA::IHistogram1D* _count_E_medium;
-    AIDA::IHistogram1D* _count_E_loose;
-    
-    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; 
-    
+    Histo1DPtr _count_A_tight;
+    Histo1DPtr _count_A_medium;
+    Histo1DPtr _count_A_loose;
+    Histo1DPtr _count_B_tight;
+    Histo1DPtr _count_B_medium;
+    Histo1DPtr _count_C_tight;
+    Histo1DPtr _count_C_medium;
+    Histo1DPtr _count_C_loose;
+    Histo1DPtr _count_D_tight;
+    Histo1DPtr _count_E_tight;
+    Histo1DPtr _count_E_medium;
+    Histo1DPtr _count_E_loose;
+
+    Histo1DPtr _hist_meff_A_medium;
+    Histo1DPtr _hist_meff_A_tight;
+    Histo1DPtr _hist_meff_B_medium;
+    Histo1DPtr _hist_meff_B_tight;
+    Histo1DPtr _hist_meff_C_medium;
+    Histo1DPtr _hist_meff_C_tight;
+    Histo1DPtr _hist_meff_D;
+    Histo1DPtr _hist_meff_E_loose;
+    Histo1DPtr _hist_meff_E_medium;
+    Histo1DPtr _hist_meff_E_tight;
+
   };
 
 

Modified: trunk/src/Analyses/Makefile.am
==============================================================================
--- trunk/src/Analyses/Makefile.am	Wed Nov 14 15:25:01 2012	(r3982)
+++ trunk/src/Analyses/Makefile.am	Wed Nov 14 15:40:33 2012	(r3983)
@@ -94,7 +94,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