[Rivet-svn] r3508 - in branches/2011-07-aida2yoda: . data/anainfo data/plotinfo data/refdata src/Analyses

blackhole at projects.hepforge.org blackhole at projects.hepforge.org
Tue Dec 6 13:50:03 GMT 2011


Author: hoeth
Date: Tue Dec  6 13:50:03 2011
New Revision: 3508

Log:
merge r3476, 3477, 3479 from trunk

Added:
   branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_I925932.info
      - copied, changed from r3476, trunk/data/anainfo/ATLAS_2011_I925932.info
   branches/2011-07-aida2yoda/data/plotinfo/ATLAS_2011_I925932.plot
      - copied unchanged from r3476, trunk/data/plotinfo/ATLAS_2011_I925932.plot
   branches/2011-07-aida2yoda/data/refdata/ATLAS_2011_I925932.aida
      - copied unchanged from r3476, trunk/data/refdata/ATLAS_2011_I925932.aida
   branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_I925932.cc
      - copied, changed from r3476, trunk/src/Analyses/ATLAS_2011_I925932.cc
Modified:
   branches/2011-07-aida2yoda/ChangeLog
   branches/2011-07-aida2yoda/data/anainfo/Makefile.am
   branches/2011-07-aida2yoda/data/plotinfo/Makefile.am
   branches/2011-07-aida2yoda/data/refdata/Makefile.am
   branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9212183.cc
   branches/2011-07-aida2yoda/src/Analyses/Makefile.am

Modified: branches/2011-07-aida2yoda/ChangeLog
==============================================================================
--- branches/2011-07-aida2yoda/ChangeLog	Tue Dec  6 13:44:08 2011	(r3507)
+++ branches/2011-07-aida2yoda/ChangeLog	Tue Dec  6 13:50:03 2011	(r3508)
@@ -1,4 +1,11 @@
+2011-11-09  Andy Buckley  <andy at insectnation.org>
+
+	* Cosmetic fixes in ATLAS_2011_S9212183 SUSY analysis.
+
+	* Adding new ATLAS W pT analysis from Elena Yatsenko (slightly adapted).
+
 2011-10-20  Frank Siegert  <frank.siegert at cern.ch>
+
 	* Extend API of W/ZFinder to allow for specification of input final
 	state in which to search for leptons/photons.
 

Copied and modified: branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_I925932.info (from r3476, trunk/data/anainfo/ATLAS_2011_I925932.info)
==============================================================================
--- trunk/data/anainfo/ATLAS_2011_I925932.info	Wed Nov  9 16:24:45 2011	(r3476, copy source)
+++ branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_I925932.info	Tue Dec  6 13:50:03 2011	(r3508)
@@ -11,17 +11,17 @@
 References:
  - arXiv:1108.6308v1 [hep-ex]
 RunInfo:
-  Run with $W$ decays to $e\nu_e$ and/or $\mu\nu_{\mu}$.
+  Run with $W$ decays to $e\,\nu_e$ and/or $\mu\,\nu_\mu$.
 NumEvents: 100k
 Beams: [p+, p+]
 Energies: [7000]
 PtCuts: [0]
 Description:
-  'The W pT at $\sqrt{s} = 7$\;TeV is measured using $W\to e\nu_e$ and $W\to \mu\nu_{\mu}$
+  The W pT at $\sqrt{s} = 7$\;TeV is measured using $W\to e \, \nu_e$ and $W\to \mu \, \nu_\mu$
   decay channels. The dressed leptons kinematics calculated from the sum of the post-FSR
   lepton momentum and the momenta of all photons radiated in a cone around the lepton,
-  while the bare uses the lepton kinematics after all QED radiation.'
-BibKey:
+  while the bare uses the lepton kinematics after all QED radiation.
+BibKey: Aad:2011fp
 BibTeX: '@article{Aad:2011fp,
       author         = "Aad, Georges and others",
       title          = "Measurement of the transverse momentum distribution of $W$

Modified: branches/2011-07-aida2yoda/data/anainfo/Makefile.am
==============================================================================
--- branches/2011-07-aida2yoda/data/anainfo/Makefile.am	Tue Dec  6 13:44:08 2011	(r3507)
+++ branches/2011-07-aida2yoda/data/anainfo/Makefile.am	Tue Dec  6 13:50:03 2011	(r3508)
@@ -28,9 +28,10 @@
   ATLAS_2011_S9126244.info \
   ATLAS_2011_S9128077.info \
   ATLAS_2011_S9131140.info \
-  ATLAS_2011_I919017.info \
   ATLAS_2011_S9108483.info \
   ATLAS_2011_S9212183.info \
+  ATLAS_2011_I919017.info \
+  ATLAS_2011_I925932.info \
   BELLE_2006_S6265367.info \
   CDF_1988_S1865951.info \
   CDF_1990_S2089246.info \

Copied: branches/2011-07-aida2yoda/data/plotinfo/ATLAS_2011_I925932.plot (from r3476, trunk/data/plotinfo/ATLAS_2011_I925932.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2011-07-aida2yoda/data/plotinfo/ATLAS_2011_I925932.plot	Tue Dec  6 13:50:03 2011	(r3508, copy of r3476, trunk/data/plotinfo/ATLAS_2011_I925932.plot)
@@ -0,0 +1,27 @@
+# BEGIN PLOT /ATLAS_2011_I925932/d01-x01-y01
+Title=$W\to e\nu_e$ $p_\perp$ with "dressed" kinematics
+XLabel=$p_\perp^W$ [GeV]
+YLabel=$(1/\sigma_{fid})(\mathrm{d}\sigma_{fid}/\mathrm{d}p_\perp^W)$ [GeV$^{-1}$]
+YMin=0.000001
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2011_I925932/d01-x01-y02
+Title=$W\to e\nu_e$ $p_\perp$ with "bare" kinematics
+XLabel=$p_\perp^W$ [GeV]
+YLabel=$(1/\sigma_{fid})(\mathrm{d}\sigma_{fid}/\mathrm{d}p_\perp^W)$ [GeV$^{-1}$]
+YMin=0.000001
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2011_I925932/d02-x01-y01
+Title=$W\to \mu\nu_{\mu}$ $p_\perp$ with "dressed" kinematics
+XLabel=$p_\perp^W$ [GeV]
+YLabel=$(1/\sigma_{fid})(\mathrm{d}\sigma_{fid}/\mathrm{d}p_\perp^W)$ [GeV$^{-1}$]
+YMin=0.000001
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2011_I925932/d02-x01-y02
+Title=$W\to \mu\nu_{\mu}$ $p_\perp$ with "bare" kinematics
+XLabel=$p_\perp^W$ [GeV]
+YLabel=$(1/\sigma_{fid})(\mathrm{d}\sigma_{fid}/\mathrm{d}p_\perp^W)$ [GeV$^{-1}$]
+YMin=0.000001
+# END PLOT

Modified: branches/2011-07-aida2yoda/data/plotinfo/Makefile.am
==============================================================================
--- branches/2011-07-aida2yoda/data/plotinfo/Makefile.am	Tue Dec  6 13:44:08 2011	(r3507)
+++ branches/2011-07-aida2yoda/data/plotinfo/Makefile.am	Tue Dec  6 13:50:03 2011	(r3508)
@@ -23,7 +23,8 @@
   ATLAS_2011_S9126244.plot \
   ATLAS_2011_S9128077.plot \
   ATLAS_2011_S9131140.plot \
-  ATLAS_2011_I919017.plot \
+  ATLAS_2011_I919017.plot  \
+  ATLAS_2011_I925932.plot  \
   CDF_1988_S1865951.plot \
   CDF_1990_S2089246.plot \
   CDF_1993_S2742446.plot \

Copied: branches/2011-07-aida2yoda/data/refdata/ATLAS_2011_I925932.aida (from r3476, trunk/data/refdata/ATLAS_2011_I925932.aida)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2011-07-aida2yoda/data/refdata/ATLAS_2011_I925932.aida	Tue Dec  6 13:50:03 2011	(r3508, copy of r3476, trunk/data/refdata/ATLAS_2011_I925932.aida)
@@ -0,0 +1,217 @@
+<?xml version="1.0" ?>
+<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd">
+<aida version="3.3">
+  <implementation version="1.1" package="Rivet"/>
+  <dataPointSet name="d01-x01-y01" dimension="2"
+      path="/REF/ATLAS_2011_I925932" title="$W\to e\nu_e$ $p_\perp$ with Dressed kinematics">
+    <dimenstion dim="0" title="$p_\perp(W)$ [GeV]"/>
+    <dimenstion dim="1" title="$1/\sigma_{fid}\mathrm{d}\sigma_{fid}/\mathrm{d}p_\perp$ [GeV$^{-1}$]"/>
+    <annotation>
+      <item key="Title" value="$W\to e\nu_e$ $p_\perp$ with Dressed kinematics" sticky="true"/>
+      <item key="AidaPath" value="/REF/ATLAS_2011_I925932/d01-x01-y01" sticky="true"/>
+    </annotation>
+    <dataPoint>
+      <measurement errorPlus="4.000000e+00" value="4.000000e+00" errorMinus="4.000000e+00"/>
+      <measurement errorPlus="1.579120e-03" value="5.545800e-02" errorMinus="1.579120e-03"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="7.500000e+00" value="1.550000e+01" errorMinus="7.500000e+00"/>
+      <measurement errorPlus="7.397108e-04" value="2.515300e-02" errorMinus="7.397108e-04"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="7.500000e+00" value="3.050000e+01" errorMinus="7.500000e+00"/>
+      <measurement errorPlus="3.259063e-04" value="6.757800e-03" errorMinus="3.259063e-04"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="8.500000e+00" value="4.650000e+01" errorMinus="8.500000e+00"/>
+      <measurement errorPlus="1.249200e-04" value="2.461600e-03" errorMinus="1.249200e-04"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.000000e+01" value="6.500000e+01" errorMinus="1.000000e+01"/>
+      <measurement errorPlus="7.206898e-05" value="9.349100e-04" errorMinus="7.206898e-05"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.000000e+01" value="8.500000e+01" errorMinus="1.000000e+01"/>
+      <measurement errorPlus="3.739402e-05" value="3.729700e-04" errorMinus="3.739402e-05"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.250000e+01" value="1.075000e+02" errorMinus="1.250000e+01"/>
+      <measurement errorPlus="2.070585e-05" value="1.802800e-04" errorMinus="2.070585e-05"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.250000e+01" value="1.325000e+02" errorMinus="1.250000e+01"/>
+      <measurement errorPlus="1.138824e-05" value="9.488200e-05" errorMinus="1.138824e-05"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.500000e+01" value="1.600000e+02" errorMinus="1.500000e+01"/>
+      <measurement errorPlus="4.538466e-06" value="3.541300e-05" errorMinus="4.538466e-06"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.750000e+01" value="1.925000e+02" errorMinus="1.750000e+01"/>
+      <measurement errorPlus="2.325012e-06" value="1.583500e-05" errorMinus="2.325012e-06"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="4.500000e+01" value="2.550000e+02" errorMinus="4.500000e+01"/>
+      <measurement errorPlus="9.084369e-07" value="4.669900e-06" errorMinus="9.084369e-07"/>
+    </dataPoint>
+  </dataPointSet>
+  <dataPointSet name="d01-x01-y02" dimension="2"
+      path="/REF/ATLAS_2011_I925932" title="$W\to e\nu_e$ $p_\perp$ with Bare kinematics">
+    <dimenstion dim="0" title="$p_\perp(W)$ [GeV]"/>
+    <dimenstion dim="1" title="$1/\sigma_{fid}\mathrm{d}\sigma_{fid}/\mathrm{d}p_\perp$ [GeV$^{-1}$]"/>
+    <annotation>
+      <item key="Title" value="$W\to e\nu_e$ $p_\perp$ with Bare kinematics" sticky="true"/>
+      <item key="AidaPath" value="/REF/ATLAS_2011_I925932/d01-x01-y02" sticky="true"/>
+    </annotation>
+    <dataPoint>
+      <measurement errorPlus="4.000000e+00" value="4.000000e+00" errorMinus="4.000000e+00"/>
+      <measurement errorPlus="1.542774e-03" value="5.418400e-02" errorMinus="1.542774e-03"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="7.500000e+00" value="1.550000e+01" errorMinus="7.500000e+00"/>
+      <measurement errorPlus="7.528459e-04" value="2.559500e-02" errorMinus="7.528459e-04"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="7.500000e+00" value="3.050000e+01" errorMinus="7.500000e+00"/>
+      <measurement errorPlus="3.354188e-04" value="6.956100e-03" errorMinus="3.354188e-04"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="8.500000e+00" value="4.650000e+01" errorMinus="8.500000e+00"/>
+      <measurement errorPlus="1.248247e-04" value="2.460400e-03" errorMinus="1.248247e-04"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.000000e+01" value="6.500000e+01" errorMinus="1.000000e+01"/>
+      <measurement errorPlus="7.087936e-05" value="9.194400e-04" errorMinus="7.087936e-05"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.000000e+01" value="8.500000e+01" errorMinus="1.000000e+01"/>
+      <measurement errorPlus="3.651806e-05" value="3.642600e-04" errorMinus="3.651806e-05"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.250000e+01" value="1.075000e+02" errorMinus="1.250000e+01"/>
+      <measurement errorPlus="2.013000e-05" value="1.751900e-04" errorMinus="2.013000e-05"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.250000e+01" value="1.325000e+02" errorMinus="1.250000e+01"/>
+      <measurement errorPlus="1.103404e-05" value="9.192900e-05" errorMinus="1.103404e-05"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.500000e+01" value="1.600000e+02" errorMinus="1.500000e+01"/>
+      <measurement errorPlus="4.396985e-06" value="3.431000e-05" errorMinus="4.396985e-06"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.750000e+01" value="1.925000e+02" errorMinus="1.750000e+01"/>
+      <measurement errorPlus="2.237396e-06" value="1.523800e-05" errorMinus="2.237396e-06"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="4.500000e+01" value="2.550000e+02" errorMinus="4.500000e+01"/>
+      <measurement errorPlus="8.733905e-07" value="4.489500e-06" errorMinus="8.733905e-07"/>
+    </dataPoint>
+  </dataPointSet>
+  <dataPointSet name="d02-x01-y01" dimension="2"
+      path="/REF/ATLAS_2011_I925932" title="$W\to \mu\nu_{\mu}$ $p_\perp$ with Dressed kinematics">
+    <dimenstion dim="0" title="$p_\perp(W)$ [GeV]"/>
+    <dimenstion dim="1" title="$1/\sigma_{fid}\mathrm{d}\sigma_{fid}/\mathrm{d}p_\perp$ [GeV$^{-1}$]"/>
+    <annotation>
+      <item key="Title" value="$W\to \mu\nu_{\mu}$ $p_\perp$ with Dressed kinematics" sticky="true"/>
+      <item key="AidaPath" value="/REF/ATLAS_2011_I925932/d02-x01-y01" sticky="true"/>
+    </annotation>
+    <dataPoint>
+      <measurement errorPlus="4.000000e+00" value="4.000000e+00" errorMinus="4.000000e+00"/>
+      <measurement errorPlus="1.439678e-03" value="5.386700e-02" errorMinus="1.439678e-03"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="7.500000e+00" value="1.550000e+01" errorMinus="7.500000e+00"/>
+      <measurement errorPlus="6.549695e-04" value="2.538800e-02" errorMinus="6.549695e-04"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="7.500000e+00" value="3.050000e+01" errorMinus="7.500000e+00"/>
+      <measurement errorPlus="3.380087e-04" value="7.061900e-03" errorMinus="3.380087e-04"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="8.500000e+00" value="4.650000e+01" errorMinus="8.500000e+00"/>
+      <measurement errorPlus="1.064708e-04" value="2.554000e-03" errorMinus="1.064708e-04"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.000000e+01" value="6.500000e+01" errorMinus="1.000000e+01"/>
+      <measurement errorPlus="4.472192e-05" value="1.035300e-03" errorMinus="4.472192e-05"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.000000e+01" value="8.500000e+01" errorMinus="1.000000e+01"/>
+      <measurement errorPlus="2.244548e-05" value="4.373000e-04" errorMinus="2.244548e-05"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.250000e+01" value="1.075000e+02" errorMinus="1.250000e+01"/>
+      <measurement errorPlus="1.252288e-05" value="1.901300e-04" errorMinus="1.252288e-05"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.250000e+01" value="1.325000e+02" errorMinus="1.250000e+01"/>
+      <measurement errorPlus="6.730242e-06" value="7.291000e-05" errorMinus="6.730242e-06"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.500000e+01" value="1.600000e+02" errorMinus="1.500000e+01"/>
+      <measurement errorPlus="4.548983e-06" value="3.955700e-05" errorMinus="4.548983e-06"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.750000e+01" value="1.925000e+02" errorMinus="1.750000e+01"/>
+      <measurement errorPlus="3.260211e-06" value="1.863300e-05" errorMinus="3.260211e-06"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="4.500000e+01" value="2.550000e+02" errorMinus="4.500000e+01"/>
+      <measurement errorPlus="1.007665e-06" value="4.658200e-06" errorMinus="1.007665e-06"/>
+    </dataPoint>
+  </dataPointSet>
+  <dataPointSet name="d02-x01-y02" dimension="2"
+      path="/REF/ATLAS_2011_I925932" title="$W\to \mu\nu_{\mu}$ $p_\perp$ with Bare kinematics">
+    <dimenstion dim="0" title="$p_\perp(W)$ [GeV]"/>
+    <dimenstion dim="1" title="$1/\sigma_{fid}\mathrm{d}\sigma_{fid}/\mathrm{d}p_\perp$ [GeV$^{-1}$]"/>
+    <annotation>
+      <item key="Title" value="$W\to \mu\nu_{\mu}$ $p_\perp$ with Bare kinematics" sticky="true"/>
+      <item key="AidaPath" value="/REF/ATLAS_2011_I925932/d02-x01-y02" sticky="true"/>
+    </annotation>
+    <dataPoint>
+      <measurement errorPlus="4.000000e+00" value="4.000000e+00" errorMinus="4.000000e+00"/>
+      <measurement errorPlus="1.429632e-03" value="5.350700e-02" errorMinus="1.429632e-03"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="7.500000e+00" value="1.550000e+01" errorMinus="7.500000e+00"/>
+      <measurement errorPlus="6.590554e-04" value="2.554300e-02" errorMinus="6.590554e-04"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="7.500000e+00" value="3.050000e+01" errorMinus="7.500000e+00"/>
+      <measurement errorPlus="3.403427e-04" value="7.109900e-03" errorMinus="3.403427e-04"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="8.500000e+00" value="4.650000e+01" errorMinus="8.500000e+00"/>
+      <measurement errorPlus="1.063429e-04" value="2.549500e-03" errorMinus="1.063429e-04"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.000000e+01" value="6.500000e+01" errorMinus="1.000000e+01"/>
+      <measurement errorPlus="4.449831e-05" value="1.029000e-03" errorMinus="4.449831e-05"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.000000e+01" value="8.500000e+01" errorMinus="1.000000e+01"/>
+      <measurement errorPlus="2.225947e-05" value="4.336500e-04" errorMinus="2.225947e-05"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.250000e+01" value="1.075000e+02" errorMinus="1.250000e+01"/>
+      <measurement errorPlus="1.238083e-05" value="1.880700e-04" errorMinus="1.238083e-05"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.250000e+01" value="1.325000e+02" errorMinus="1.250000e+01"/>
+      <measurement errorPlus="6.655996e-06" value="7.210700e-05" errorMinus="6.655996e-06"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.500000e+01" value="1.600000e+02" errorMinus="1.500000e+01"/>
+      <measurement errorPlus="4.491681e-06" value="3.906100e-05" errorMinus="4.491681e-06"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="1.750000e+01" value="1.925000e+02" errorMinus="1.750000e+01"/>
+      <measurement errorPlus="3.212788e-06" value="1.836300e-05" errorMinus="3.212788e-06"/>
+    </dataPoint>
+    <dataPoint>
+      <measurement errorPlus="4.500000e+01" value="2.550000e+02" errorMinus="4.500000e+01"/>
+      <measurement errorPlus="9.844233e-07" value="4.550700e-06" errorMinus="9.844233e-07"/>
+    </dataPoint>
+  </dataPointSet>
+</aida>

Modified: branches/2011-07-aida2yoda/data/refdata/Makefile.am
==============================================================================
--- branches/2011-07-aida2yoda/data/refdata/Makefile.am	Tue Dec  6 13:44:08 2011	(r3507)
+++ branches/2011-07-aida2yoda/data/refdata/Makefile.am	Tue Dec  6 13:50:03 2011	(r3508)
@@ -28,6 +28,7 @@
   ATLAS_2011_S9128077.aida       \
   ATLAS_2011_S9131140.aida       \
   ATLAS_2011_I919017.aida        \
+  ATLAS_2011_I925932.aida        \
   BABAR_2006_S6511112.aida       \
   BELLE_2006_S6265367.aida       \
   CLEO_1997_S3486664.aida        \

Copied and modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_I925932.cc (from r3476, trunk/src/Analyses/ATLAS_2011_I925932.cc)
==============================================================================
--- trunk/src/Analyses/ATLAS_2011_I925932.cc	Wed Nov  9 16:24:45 2011	(r3476, copy source)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_I925932.cc	Tue Dec  6 13:50:03 2011	(r3508)
@@ -2,7 +2,7 @@
 // ATLAS W pT analysis
 
 #include "Rivet/Analysis.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 #include "Rivet/Tools/Logging.hh"
 #include "Rivet/Projections/WFinder.hh"
 
@@ -37,10 +37,10 @@
       _sumW_mu_bare = 0;
 
       // Book histograms
-      _hist_wpt_dressed_el  = bookHistogram1D(1, 1, 1);
-      _hist_wpt_bare_el     = bookHistogram1D(1, 1, 2);
-      _hist_wpt_dressed_mu  = bookHistogram1D(2, 1, 1);
-      _hist_wpt_bare_mu     = bookHistogram1D(2, 1, 2);
+      _hist_wpt_dressed_el  = bookHisto1D(1, 1, 1);
+      _hist_wpt_bare_el     = bookHisto1D(1, 1, 2);
+      _hist_wpt_dressed_mu  = bookHisto1D(2, 1, 1);
+      _hist_wpt_bare_mu     = bookHisto1D(2, 1, 2);
     }
 
 
@@ -121,10 +121,10 @@
 
 	double _sumW_e_dressed, _sumW_e_bare, _sumW_mu_dressed, _sumW_mu_bare;
 
-	AIDA::IHistogram1D* _hist_wpt_dressed_el;
-	AIDA::IHistogram1D* _hist_wpt_bare_el;
-	AIDA::IHistogram1D* _hist_wpt_dressed_mu;
-	AIDA::IHistogram1D* _hist_wpt_bare_mu;
+	Histo1DPtr _hist_wpt_dressed_el;
+	Histo1DPtr _hist_wpt_bare_el;
+	Histo1DPtr _hist_wpt_dressed_mu;
+	Histo1DPtr _hist_wpt_bare_mu;
 
   };
 

Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9212183.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9212183.cc	Tue Dec  6 13:44:08 2011	(r3507)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9212183.cc	Tue Dec  6 13:50:03 2011	(r3508)
@@ -11,6 +11,7 @@
 
 namespace Rivet {
 
+
   /// @author Chris Wymant
   class ATLAS_2011_S9212183 : public Analysis {
   public:
@@ -21,12 +22,9 @@
     /// Constructor
     ATLAS_2011_S9212183()
       : Analysis("ATLAS_2011_S9212183")
-    {
-      /// Set whether your finalize method needs the generator cross section
-      setNeedsCrossSection(false);
-    }
+    {    }
 
-  //@}
+    //@}
 
 
   public:
@@ -37,31 +35,31 @@
     /// Book histograms and initialise projections before the run
     void init() {
 
-      // projection to find the electrons
+      // 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, 20.0*GeV);
       elecs.acceptIdPair(ELECTRON);
       addProjection(elecs, "elecs");
 
-      // projection to find the muons
+      // 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);
       muons.acceptIdPair(MUON);
       addProjection(muons, "muons");
 
-      /// Jet finder
+      // Jet finder
       addProjection(FastJets(FinalState(), FastJets::ANTIKT, 0.4), "AntiKtJets04");
 
-      // all tracks (to do deltaR with leptons)
+      // All tracks (to do deltaR with leptons)
       addProjection(ChargedFinalState(-3.0,3.0),"cfs");
 
-      // used for pTmiss (N.B. the real 'vfs' extends beyond 4.5 to |eta| = 4.9)
+      // Used for pTmiss (N.B. the real 'vfs' extends beyond 4.5 to |eta| = 4.9)
       addProjection(VisibleFinalState(-4.5,4.5),"vfs");
 
 
-      /// Book histograms
+      // Book histograms
       _count_2j =   bookHisto1D("count_2j", 1, 0., 1.);
       _count_3j =   bookHisto1D("count_3j", 1, 0., 1.);
       _count_4j5 =  bookHisto1D("count_4j5", 1, 0., 1.);
@@ -77,252 +75,243 @@
     }
 
 
-  /// Perform the per-event analysis
-  void analyze(const Event& event) {
-    const double weight = event.weight();
-
-    Jets cand_jets;
-    foreach (const Jet& jet,
-      applyProjection<FastJets>(event, "AntiKtJets04").jetsByPt(20.0*GeV) ) {
-      if ( fabs( jet.momentum().eta() ) < 4.9 ) {
-        cand_jets.push_back(jet);
+    /// Perform the per-event analysis
+    void analyze(const Event& event) {
+      const double weight = event.weight();
+
+      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);
+        }
       }
-    }
 
-    ParticleVector cand_e  = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt();
+      const ParticleVector cand_e  = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt();
 
-    // muon isolation not mentioned in hep-exp 1109.6572, unlike in 1102.5290,
-    // but assumed to still be applicable
-    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();
+      // Muon isolation not mentioned in hep-exp 1109.6572, unlike in 1102.5290,
+      // but assumed to still be applicable
+      ParticleVector cand_mu;
+      const ParticleVector chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles();
+      const ParticleVector muons = applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt();
+      foreach (const Particle& mu, muons) {
+        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);
       }
-      if ( pTinCone < 1.8*GeV )
-      cand_mu.push_back(mu);
-    }
 
-    // resolve jet-lepton overlap for jets with |eta| < 2.8
-    Jets cand_jets_2;
-    foreach ( const Jet& jet, cand_jets ) {
-      if ( fabs( jet.momentum().eta() ) >= 2.8 )
-        cand_jets_2.push_back( jet );
-      else {
-        bool away_from_e = true;
-        foreach ( const Particle & e, cand_e ) {
-          if ( deltaR(e.momentum(),jet.momentum()) <= 0.2 ) {
-            away_from_e = false;
-            break;
+      // Resolve jet-lepton overlap for jets with |eta| < 2.8
+      Jets cand_jets_2;
+      foreach ( const Jet& jet, cand_jets ) {
+        if ( fabs( jet.momentum().eta() ) >= 2.8 ) {
+          cand_jets_2.push_back( jet );
+        } else {
+          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 ) cand_jets_2.push_back( jet );
         }
-        if ( away_from_e )
-          cand_jets_2.push_back( jet );
       }
-    }
 
 
-    ParticleVector recon_e, recon_mu;
+      ParticleVector recon_e, recon_mu;
 
-    foreach ( const Particle & e, cand_e ) {
-      bool away = true;
-      foreach ( const Jet& jet, cand_jets_2 ) {
-        if ( deltaR(e.momentum(),jet.momentum()) < 0.4 ) {
-          away = false;
-          break;
+      foreach ( const Particle & e, cand_e ) {
+        bool away = true;
+        foreach ( const Jet& jet, cand_jets_2 ) {
+          if ( deltaR(e.momentum(),jet.momentum()) < 0.4 ) {
+            away = false;
+            break;
+          }
         }
+        if ( away ) recon_e.push_back( e );
       }
-      if ( away )
-        recon_e.push_back( e );
-    }
 
-    foreach ( const Particle & mu, cand_mu ) {
-      bool away = true;
-      foreach ( const Jet& jet, cand_jets_2 ) {
-        if ( deltaR(mu.momentum(),jet.momentum()) < 0.4 ) {
-          away = false;
-          break;
+      foreach ( const Particle & mu, cand_mu ) {
+        bool away = true;
+        foreach ( const Jet& jet, cand_jets_2 ) {
+          if ( deltaR(mu.momentum(),jet.momentum()) < 0.4 ) {
+            away = false;
+            break;
+          }
         }
+        if ( away ) recon_mu.push_back( mu );
       }
-      if ( away )
-      recon_mu.push_back( mu );
-    }
 
 
-    // pTmiss
-    // based on all candidate electrons, muons and jets, plus everything else with |eta| < 4.5
-    // i.e. everything in our projection "vfs" plus the jets with |eta| > 4.5
-    ParticleVector vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles();
-    FourMomentum pTmiss;
-    foreach ( const Particle & p, vfs_particles ) {
-      pTmiss -= p.momentum();
-    }
-    foreach ( const Jet& jet, cand_jets_2 ) {
-      if ( fabs( jet.momentum().eta() ) > 4.5 )
-        pTmiss -= jet.momentum();
-    }
-    double eTmiss = pTmiss.pT();
+      // pTmiss
+      // Based on all candidate electrons, muons and jets, plus everything else with |eta| < 4.5
+      // i.e. everything in our projection "vfs" plus the jets with |eta| > 4.5
+      ParticleVector vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles();
+      FourMomentum pTmiss;
+      foreach ( const Particle & p, vfs_particles ) {
+        pTmiss -= p.momentum();
+      }
+      foreach ( const Jet& jet, cand_jets_2 ) {
+        if ( fabs( jet.momentum().eta() ) > 4.5 ) pTmiss -= jet.momentum();
+      }
+      double eTmiss = pTmiss.pT();
 
 
-    // final jet filter
-    Jets recon_jets;
-    foreach ( const Jet& jet, cand_jets_2 ) {
-      if ( fabs( jet.momentum().eta() ) <= 2.8 )
-        recon_jets.push_back( jet );
-    }
-    // NB it seems that jets with |eta| > 2.8 could have been thrown away at
-    // the start; we don't do so, in order to follow both the structure of
-    // the paper and the similar Rivet analysis ATLAS_2011_S8983313
-
-    // 'candidate' muons needed only 10 GeV, to cause a veto they need 20 GeV
-    ParticleVector veto_mu;
-    foreach ( const Particle & mu, cand_mu ) {
-      if ( mu.momentum().pT() >= 20.0*GeV )
-        veto_mu.push_back(mu);
-    }
+      // Final jet filter
+      Jets recon_jets;
+      foreach ( const Jet& jet, cand_jets_2 ) {
+        if ( fabs( jet.momentum().eta() ) <= 2.8 ) recon_jets.push_back( jet );
+      }
+      // NB. It seems that jets with |eta| > 2.8 could have been thrown away at
+      // the start; we don't do so, in order to follow both the structure of
+      // the paper and the similar Rivet analysis ATLAS_2011_S8983313
 
-    if ( ! ( veto_mu.empty() && recon_e.empty() ) ) {
-      MSG_DEBUG("Charged leptons left after selection");
-      vetoEvent;
-    }
+      // 'candidate' muons needed only 10 GeV, to cause a veto they need 20 GeV
+      ParticleVector veto_mu;
+      foreach ( const Particle & mu, cand_mu ) {
+        if ( mu.momentum().pT() >= 20.0*GeV ) veto_mu.push_back(mu);
+      }
 
-    if ( eTmiss <= 130 * GeV ) {
-      MSG_DEBUG("Not enough eTmiss: " << eTmiss << " < 130");
-      vetoEvent;
-    }
+      if ( ! ( veto_mu.empty() && recon_e.empty() ) ) {
+        MSG_DEBUG("Charged leptons left after selection");
+        vetoEvent;
+      }
+
+      if ( eTmiss <= 130 * GeV ) {
+        MSG_DEBUG("Not enough eTmiss: " << eTmiss << " < 130");
+        vetoEvent;
+      }
 
+      if ( recon_jets.empty() || recon_jets[0].momentum().pT() <= 130.0 * GeV ) {
+        MSG_DEBUG("No hard leading jet in " << recon_jets.size() << " jets");
+        vetoEvent;
+      }
 
-    if ( recon_jets.empty() || recon_jets[0].momentum().pT() <= 130.0 * GeV ) {
-      MSG_DEBUG("No hard leading jet in " << recon_jets.size() << " jets");
-      vetoEvent;
-    }
+      // ==================== observables ====================
 
-    // ==================== observables ====================
+      int Njets = 0;
+      double min_dPhi = 999.999;
+      double pTmiss_phi = pTmiss.phi();
+      foreach ( const Jet& jet, recon_jets ) {
+        if ( jet.momentum().pT() > 40 * GeV ) {
+          if ( Njets < 3 ) {
+            min_dPhi = min( min_dPhi, deltaPhi( pTmiss_phi, jet.momentum().phi() ) );
+          }
+          ++Njets;
+        }
+      }
 
-    int Njets = 0;
-    double min_dPhi = 999.999;
-    double pTmiss_phi = pTmiss.phi();
-    foreach ( const Jet& jet, recon_jets ) {
-      if ( jet.momentum().pT() > 40 * GeV ) {
-        if ( Njets < 3 )
-          min_dPhi = min( min_dPhi, deltaPhi( pTmiss_phi, jet.momentum().phi() ) );
-        ++Njets;
+      int NjetsHighMass = 0;
+      foreach ( const Jet& jet, recon_jets ) {
+        if ( jet.momentum().pT() > 80.0 * GeV ) {
+          ++NjetsHighMass;
+        }
       }
-    }
 
-    int NjetsHighMass = 0;
-    foreach ( const Jet& jet, recon_jets ) {
-      if ( jet.momentum().pT() > 80.0 * GeV ) {
-        ++NjetsHighMass;
+      if ( Njets < 2 ) {
+        MSG_DEBUG("Only " << Njets << " >40 GeV jets left");
+        vetoEvent;
       }
-    }
 
-    if ( Njets < 2 ) {
-      MSG_DEBUG("Only " << Njets << " >40 GeV jets left");
-      vetoEvent;
-    }
+      if ( min_dPhi <= 0.4 ) {
+        MSG_DEBUG("dPhi too small");
+        vetoEvent;
+      }
 
-    if ( min_dPhi <= 0.4 ) {
-      MSG_DEBUG("dPhi too small");
-      vetoEvent;
-    }
+      // m_eff
+      double m_eff_2j = eTmiss + recon_jets[0].momentum().pT() + recon_jets[1].momentum().pT();
+      double m_eff_3j = recon_jets.size() < 3 ? -999.0 : m_eff_2j + recon_jets[2].momentum().pT();
+      double m_eff_4j = recon_jets.size() < 4 ? -999.0 : m_eff_3j + recon_jets[3].momentum().pT();
+      double m_eff_HM = eTmiss;
+      foreach ( const Jet& jet, recon_jets ) {
+        if ( jet.momentum().pT() > 40.0 * GeV ) m_eff_HM += jet.momentum().pT();
+      }
 
-    // m_eff
-    double m_eff_2j = eTmiss + recon_jets[0].momentum().pT() + recon_jets[1].momentum().pT();
-    double m_eff_3j = recon_jets.size() < 3 ? -999.0 : m_eff_2j + recon_jets[2].momentum().pT();
-    double m_eff_4j = recon_jets.size() < 4 ? -999.0 : m_eff_3j + recon_jets[3].momentum().pT();
-    double m_eff_HM = eTmiss;
-    foreach ( const Jet& jet, recon_jets ) {
-      if ( jet.momentum().pT() > 40.0 * GeV )
-        m_eff_HM += jet.momentum().pT();
-    }
+      double et_meff_2j = eTmiss / m_eff_2j;
+      double et_meff_3j = eTmiss / m_eff_3j;
+      double et_meff_4j = eTmiss / m_eff_4j;
+      double et_meff_HM = eTmiss / m_eff_HM;
 
-    double et_meff_2j = eTmiss / m_eff_2j;
-    double et_meff_3j = eTmiss / m_eff_3j;
-    double et_meff_4j = eTmiss / m_eff_4j;
-    double et_meff_HM = eTmiss / m_eff_HM;
-
-
-    // ==================== FILL ====================
-
-    MSG_DEBUG( "Trying to fill "
-        << Njets << ' '
-        << m_eff_2j << ' '
-        << et_meff_2j << ' '
-        << m_eff_3j << ' '
-        << et_meff_3j << ' '
-        << m_eff_4j << ' '
-        << et_meff_4j << ' '
-        << m_eff_HM << ' '
-        << et_meff_HM );
-
-    _hist_eTmiss->fill(eTmiss, weight);
-
-
-    // 2j region
-    if ( et_meff_2j > 0.3 ) {
-      _hist_meff_2j->fill(m_eff_2j, weight);
-      if ( m_eff_2j > 1000 * GeV ) {
-        MSG_DEBUG("Hits 2j");
-        _count_2j->fill(0.5, weight);
-      }
-    }
 
+      // ==================== FILL ====================
+
+      MSG_DEBUG( "Trying to fill "
+                 << Njets << ' '
+                 << m_eff_2j << ' '
+                 << et_meff_2j << ' '
+                 << m_eff_3j << ' '
+                 << et_meff_3j << ' '
+                 << m_eff_4j << ' '
+                 << et_meff_4j << ' '
+                 << m_eff_HM << ' '
+                 << et_meff_HM );
 
-    // 3j region
-    if ( Njets >= 3 && et_meff_3j > 0.25 ) {
-      _hist_meff_3j->fill(m_eff_3j, weight);
-      if ( m_eff_3j > 1000 * GeV ) {
-        MSG_DEBUG("Hits 3j");
-        _count_3j->fill(0.5, weight);
-      }
-    }
 
+      _hist_eTmiss->fill(eTmiss, weight);
 
-    // 4j5 & 4j10 regions
-    if ( Njets >= 4 && et_meff_4j > 0.25 ) {
-      _hist_meff_4j->fill(m_eff_4j, weight);
-      if ( m_eff_4j > 500 * GeV ) {
-        MSG_DEBUG("Hits 4j5");
-        _count_4j5->fill(0.5, weight);
-      }
-      if ( m_eff_4j > 1000 * GeV ) {
-        MSG_DEBUG("Hits 4j10");
-        _count_4j10->fill(0.5, weight);
+
+      // 2j region
+      if ( et_meff_2j > 0.3 ) {
+        _hist_meff_2j->fill(m_eff_2j, weight);
+        if ( m_eff_2j > 1000 * GeV ) {
+          MSG_DEBUG("Hits 2j");
+          _count_2j->fill(0.5, weight);
+        }
       }
-    }
 
 
-    // High Mass region
-    if ( NjetsHighMass >= 4 && et_meff_HM > 0.2 ) {
-      _hist_meff_HM->fill(m_eff_HM, weight);
-      if ( m_eff_HM > 1100 * GeV ) {
-        MSG_DEBUG("Hits HM");
-        _count_HM->fill(0.5, weight);
+      // 3j region
+      if ( Njets >= 3 && et_meff_3j > 0.25 ) {
+        _hist_meff_3j->fill(m_eff_3j, weight);
+        if ( m_eff_3j > 1000 * GeV ) {
+          MSG_DEBUG("Hits 3j");
+          _count_3j->fill(0.5, weight);
+        }
       }
-    }
 
 
-  }
+      // 4j5 & 4j10 regions
+      if ( Njets >= 4 && et_meff_4j > 0.25 ) {
+        _hist_meff_4j->fill(m_eff_4j, weight);
+        if ( m_eff_4j > 500 * GeV ) {
+          MSG_DEBUG("Hits 4j5");
+          _count_4j5->fill(0.5, weight);
+        }
+        if ( m_eff_4j > 1000 * GeV ) {
+          MSG_DEBUG("Hits 4j10");
+          _count_4j10->fill(0.5, weight);
+        }
+      }
+
 
-  //@}
+      // High mass region
+      if ( NjetsHighMass >= 4 && et_meff_HM > 0.2 ) {
+        _hist_meff_HM->fill(m_eff_HM, weight);
+        if ( m_eff_HM > 1100 * GeV ) {
+          MSG_DEBUG("Hits HM");
+          _count_HM->fill(0.5, weight);
+        }
+      }
 
-  void finalize() {
+    }
 
-    // Two, three and four jet channels have bin width = 100 (GeV)
-    // High mass channel has bin width = 150 (GeV)
-    // Integrated luminosity = 1040 (pb)
 
-    scale( _hist_meff_2j, 100. * 1040 * crossSection()/sumOfWeights() );
-    scale( _hist_meff_3j, 100. * 1040 * crossSection()/sumOfWeights() );
-    scale( _hist_meff_4j, 100. * 1040 * crossSection()/sumOfWeights() );
-    scale( _hist_meff_HM, 150. * 1040 * crossSection()/sumOfWeights() );
+    void finalize() {
+      // Two, three and four jet channels have bin width = 100 (GeV)
+      // High mass channel has bin width = 150 (GeV)
+      // Integrated luminosity = 1040 (pb)
+      scale( _hist_meff_2j, 100. * 1040 * crossSection()/sumOfWeights() );
+      scale( _hist_meff_3j, 100. * 1040 * crossSection()/sumOfWeights() );
+      scale( _hist_meff_4j, 100. * 1040 * crossSection()/sumOfWeights() );
+      scale( _hist_meff_HM, 150. * 1040 * crossSection()/sumOfWeights() );
+    }
 
+    //@}
 
-  }
 
   private:
 
@@ -337,11 +326,10 @@
     Histo1DPtr _hist_meff_HM;
     Histo1DPtr _hist_eTmiss;
 
-
   };
 
 
   // This global object acts as a hook for the plugin system
-  AnalysisBuilder<ATLAS_2011_S9212183> plugin_ATLAS_2011_S9212183;
+  DECLARE_RIVET_PLUGIN(ATLAS_2011_S9212183);
 
 }

Modified: branches/2011-07-aida2yoda/src/Analyses/Makefile.am
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/Makefile.am	Tue Dec  6 13:44:08 2011	(r3507)
+++ branches/2011-07-aida2yoda/src/Analyses/Makefile.am	Tue Dec  6 13:50:03 2011	(r3508)
@@ -60,8 +60,9 @@
     ATLAS_2011_S9126244.cc \
     ATLAS_2011_S9128077.cc \
     ATLAS_2011_S9131140.cc \
+    ATLAS_2011_S9212183.cc \
     ATLAS_2011_I919017.cc  \
-    ATLAS_2011_S9212183.cc
+    ATLAS_2011_I925932.cc
 if ENABLE_UNVALIDATED
 RivetATLASAnalyses_la_SOURCES += \
     ATLAS_2010_CONF_2010_049.cc \


More information about the Rivet-svn mailing list