|
|
[Rivet-svn] r4168 - in trunk: . data/anainfo data/plotinfo data/refdata src/Analyses
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Mon Feb 18 15:36:51 GMT 2013
Author: hoeth
Date: Mon Feb 18 15:36:51 2013
New Revision: 4168
Log:
merge c4098 and c4099 from branches/2012-06-aidarivet
Added:
trunk/data/anainfo/ATLAS_2012_I1119557.info
- copied unchanged from r4098, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1119557.info
trunk/data/plotinfo/ATLAS_2012_I1119557.plot
- copied unchanged from r4098, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1119557.plot
trunk/data/refdata/ATLAS_2012_I1119557.aida
- copied unchanged from r4098, branches/2012-06-aidarivet/data/refdata/ATLAS_2012_I1119557.aida
trunk/src/Analyses/ATLAS_2012_I1119557.cc
- copied, changed from r4098, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1119557.cc
Modified:
trunk/ChangeLog
trunk/data/anainfo/Makefile.am
trunk/data/plotinfo/Makefile.am
trunk/data/refdata/Makefile.am
trunk/src/Analyses/Makefile.am
Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog Mon Feb 18 15:31:38 2013 (r4167)
+++ trunk/ChangeLog Mon Feb 18 15:36:51 2013 (r4168)
@@ -20,6 +20,14 @@
* Fix TeX variable in the rivetenv scripts, especially for csh
+2012-12-21 Andy Buckley <andy.buckley at cern.ch>
+
+ * Version 1.8.2 release!
+
+2012-12-20 Andy Buckley <andy.buckley at cern.ch>
+
+ * Adding ATLAS_2012_I1119557 analysis (from Roman Lysak and Lily Asquith).
+
2012-12-18 Andy Buckley <andy.buckley at cern.ch>
* Adding TOTEM_2012_002 analysis, from Sercan Sen.
Copied: trunk/data/anainfo/ATLAS_2012_I1119557.info (from r4098, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1119557.info)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/data/anainfo/ATLAS_2012_I1119557.info Mon Feb 18 15:36:51 2013 (r4168, copy of r4098, branches/2012-06-aidarivet/data/anainfo/ATLAS_2012_I1119557.info)
@@ -0,0 +1,48 @@
+Name: ATLAS_2012_I1119557
+Year: 2012
+Summary: Jet shapes and jet masses
+Experiment: ATLAS
+Collider: LHC 7TeV
+InspireID: 1119557
+Status: VALIDATED
+Authors:
+ - Lily Asquith <lasquith at hep.anl.gov>
+ - Roman Lysak <lysak at fzu.cz>
+References:
+ - Phys.Rev. D86 (2012) 072006
+ - doi:10.1103/PhysRevD.86.072006
+ - arXiv:1206.5369 [hep-ex]
+RunInfo:
+ QCD events at 7 TeV, leading-pT jets with $\pT > 300\;GeV$.
+NumEvents: 1000000
+NeedCrossSection: no
+Beams: [p+, p+]
+Energies: [7000]
+PtCuts: [300]
+Description:
+ 'Measurements are presented of the properties of high transverse
+ momentum jets, produced in proton-proton collisions at a
+ center-of-mass energy of $\sqrt{s} = 7$\;TeV. Jet mass, width,
+ eccentricity, planar flow and angularity are measured for jets
+ reconstructed using the anti-$k_t$ algorithm with distance parameters
+ $R = 0.6$ and 1.0, with transverse momentum $pT > 300$\;GeV and
+ pseudorapidity $|\eta| < 2$.'
+BibKey: Aad:2012meb
+BibTeX: '@article{Aad:2012meb,
+ author = "Aad, Georges and others",
+ title = "{ATLAS measurements of the properties of jets for boosted
+ particle searches}",
+ collaboration = "ATLAS Collaboration",
+ journal = "Phys.Rev.",
+ volume = "D86",
+ pages = "072006",
+ doi = "10.1103/PhysRevD.86.072006",
+ year = "2012",
+ eprint = "1206.5369",
+ archivePrefix = "arXiv",
+ primaryClass = "hep-ex",
+ reportNumber = "CERN-PH-EP-2012-149",
+ SLACcitation = "%%CITATION = ARXIV:1206.5369;%%",
+}'
+ToDo:
+ - Validate the eccentricity plot (commented out for now)
Modified: trunk/data/anainfo/Makefile.am
==============================================================================
--- trunk/data/anainfo/Makefile.am Mon Feb 18 15:31:38 2013 (r4167)
+++ trunk/data/anainfo/Makefile.am Mon Feb 18 15:36:51 2013 (r4168)
@@ -55,6 +55,7 @@
ATLAS_2012_I943401.info \
ATLAS_2012_I1082009.info \
ATLAS_2012_I1091481.info \
+ ATLAS_2012_I1119557.info \
ATLAS_2012_I1183818.info \
ATLAS_2012_I1188891.info \
ATLAS_2012_I946427.info \
Copied: trunk/data/plotinfo/ATLAS_2012_I1119557.plot (from r4098, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1119557.plot)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/data/plotinfo/ATLAS_2012_I1119557.plot Mon Feb 18 15:36:51 2013 (r4168, copy of r4098, branches/2012-06-aidarivet/data/plotinfo/ATLAS_2012_I1119557.plot)
@@ -0,0 +1,55 @@
+# BEGIN PLOT /ATLAS_2012_I1119557/d01-x01-y01
+Title=Anti-$k_T$ jets, $R = 0.6$, $p_T > 300$\;GeV, $|\eta|<2$
+XLabel=Jet mass [GeV]
+YLabel=$1/N\cdot \text{d}N/\text{d}M$~[GeV$^{-1}$]
+LogY=0
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2012_I1119557/d01-x02-y01
+Title=Anti-$k_T$ jets, $R = 1.0$, $p_T > 300 $\;GeV, $|\eta|<2$
+XLabel=Jet mass [GeV]
+YLabel=$1/N\cdot \text{d}N/\text{d}M$~[GeV$^{-1}$]
+LogY=0
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2012_I1119557/d02-x01-y01
+Title=Anti-$k_T$ jets, $R = 0.6$, $p_T > 300$\;GeV, $|\eta|<2$
+XLabel=Width
+YLabel=$1/N\cdot \text{d}N/\text{d}W$
+LogY=0
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2012_I1119557/d02-x02-y01
+Title=Anti-$k_T$ jets, $R = 1.0$, $p_T > 300$\;GeV, $|\eta|<2$
+XLabel=Width
+YLabel=$1/N\cdot \text{d}N/\text{d}W$
+LogY=0
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2012_I1119557/d03-x01-y01
+#Title=Anti-$k_T$ jets, $R = 0.6$, $p_T > 300$\;GeV, $|\eta|<0.7$, $M > 100$\;GeV
+#XLabel=Eccentricity
+#YLabel=$1/N\cdot \text{d}N/\text{d}E$
+#LogY=0
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2012_I1119557/d03-x02-y01
+#Title=Anti-$k_T$ jets, $R = 1.0$, $p_T > 300$\;GeV, $|\eta|<0.7$, $M > 100$\;GeV
+#XLabel=Eccentricity
+#YLabel=$1/N\cdot \text{d}N/\text{d}E$
+#LogY=0
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2012_I1119557/d04-x02-y01
+Title=Anti-$k_T$ jets, $R = 1.0$, $p_T > 300$\;GeV, $|\eta|<0.7$, $130 < M < 210$\;GeV
+XLabel=Planar flow
+YLabel=$1/N\cdot \text{d}N/\text{d}P$
+LogY=0
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2012_I1119557/d05-x01-y01
+Title=Anti-$k_T$ jets, $R = 0.6$, $p_T > 300$\;GeV, $|\eta|<0.7$, $100 < M < 130$\;GeV
+XLabel=Angularity $\tau_{-2}$
+YLabel=$1/N\cdot \text{d}N/\text{d}$\tau_{-2}$
+LogY=0
+# END PLOT
Modified: trunk/data/plotinfo/Makefile.am
==============================================================================
--- trunk/data/plotinfo/Makefile.am Mon Feb 18 15:31:38 2013 (r4167)
+++ trunk/data/plotinfo/Makefile.am Mon Feb 18 15:36:51 2013 (r4168)
@@ -53,6 +53,7 @@
ATLAS_2012_I943401.plot \
ATLAS_2012_I946427.plot \
ATLAS_2012_CONF_2012_001.plot \
+ ATLAS_2012_I1119557.plot \
ATLAS_2012_I1112263.plot \
ATLAS_2012_I1125961.plot \
ATLAS_2012_I1126136.plot \
Copied: trunk/data/refdata/ATLAS_2012_I1119557.aida (from r4098, branches/2012-06-aidarivet/data/refdata/ATLAS_2012_I1119557.aida)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/data/refdata/ATLAS_2012_I1119557.aida Mon Feb 18 15:36:51 2013 (r4168, copy of r4098, branches/2012-06-aidarivet/data/refdata/ATLAS_2012_I1119557.aida)
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd">
+<aida version="3.3">
+ <implementation version="1.0" package="HepData"/>
+ <dataPointSet name="d01-x01-y01" dimension="2" path="/REF/ATLAS_2012_I1119557" title="(1/N)*D(N)/DMASS(C=JET) IN GEV**-1" >
+ <dataPoint>
+ <measurement value="30.0" errorPlus="10.0" errorMinus="10.0"/>
+ <measurement value="0.0212" errorPlus="0.0034058772731852802" errorMinus="0.0034058772731852802"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="50.0" errorPlus="10.0" errorMinus="10.0"/>
+ <measurement value="0.0152" errorPlus="0.0016031219541881396" errorMinus="0.0016031219541881396"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="70.0" errorPlus="10.0" errorMinus="10.0"/>
+ <measurement value="0.0065" errorPlus="0.001004987562112089" errorMinus="0.001104536101718726"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="95.0" errorPlus="15.0" errorMinus="15.0"/>
+ <measurement value="0.0024" errorPlus="4.123105625617661E-4" errorMinus="4.123105625617661E-4"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="125.0" errorPlus="15.0" errorMinus="15.0"/>
+ <measurement value="5.0E-4" errorPlus="8.246211251235322E-5" errorMinus="1.2165525060596439E-4"/>
+ </dataPoint>
+ </dataPointSet>
+ <dataPointSet name="d01-x02-y01" dimension="2" path="/REF/ATLAS_2012_I1119557" title="(1/N)*D(N)/DMASS(C=JET) IN GEV**-1" >
+ <dataPoint>
+ <measurement value="37.5" errorPlus="17.5" errorMinus="17.5"/>
+ <measurement value="0.0069" errorPlus="0.0023021728866442675" errorMinus="0.0024020824298928625"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="72.5" errorPlus="17.5" errorMinus="17.5"/>
+ <measurement value="0.0122" errorPlus="0.0017029386365926401" errorMinus="0.0018027756377319946"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="107.5" errorPlus="17.5" errorMinus="17.5"/>
+ <measurement value="0.0056" errorPlus="0.0013038404810405296" errorMinus="0.0013038404810405296"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="142.5" errorPlus="17.5" errorMinus="17.5"/>
+ <measurement value="0.00236" errorPlus="3.22490309931942E-4" errorMinus="3.423448553724738E-4"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="180.0" errorPlus="20.0" errorMinus="20.0"/>
+ <measurement value="9.0E-4" errorPlus="2.408318915758459E-4" errorMinus="2.3086792761230392E-4"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="220.0" errorPlus="20.0" errorMinus="20.0"/>
+ <measurement value="4.3E-4" errorPlus="2.1095023109728986E-4" errorMinus="1.8110770276274834E-4"/>
+ </dataPoint>
+ </dataPointSet>
+ <dataPointSet name="d02-x01-y01" dimension="2" path="/REF/ATLAS_2012_I1119557" title="(1/N)*D(N)/DWIDTH(C=JET)" >
+ <dataPoint>
+ <measurement value="0.0125" errorPlus="0.0125" errorMinus="0.0125"/>
+ <measurement value="6.11" errorPlus="0.8287339742040264" errorMinus="0.8584287972802402"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.037500000000000006" errorPlus="0.012499999999999997" errorMinus="0.012500000000000004"/>
+ <measurement value="10.6" errorPlus="1.2041594578792296" errorMinus="1.104536101718726"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.07500000000000001" errorPlus="0.024999999999999994" errorMinus="0.02500000000000001"/>
+ <measurement value="5.53" errorPlus="1.0007996802557444" errorMinus="0.9008884503644167"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.125" errorPlus="0.024999999999999994" errorMinus="0.024999999999999994"/>
+ <measurement value="2.64" errorPlus="0.40112342240263166" errorMinus="0.3014962686336267"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.175" errorPlus="0.025000000000000022" errorMinus="0.024999999999999994"/>
+ <measurement value="1.4" errorPlus="0.20223748416156687" errorMinus="0.20223748416156687"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.225" errorPlus="0.024999999999999994" errorMinus="0.024999999999999994"/>
+ <measurement value="0.77" errorPlus="0.13152946437965907" errorMinus="0.1216552506059644"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.275" errorPlus="0.024999999999999967" errorMinus="0.025000000000000022"/>
+ <measurement value="0.4" errorPlus="0.09219544457292887" errorMinus="0.07280109889280519"/>
+ </dataPoint>
+ </dataPointSet>
+ <dataPointSet name="d02-x02-y01" dimension="2" path="/REF/ATLAS_2012_I1119557" title="(1/N)*D(N)/DWIDTH(C=JET)" >
+ <dataPoint>
+ <measurement value="0.0125" errorPlus="0.0125" errorMinus="0.0125"/>
+ <measurement value="1.21" errorPlus="0.48259714048054614" errorMinus="0.5024937810560445"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.037500000000000006" errorPlus="0.012499999999999997" errorMinus="0.012500000000000004"/>
+ <measurement value="5.53" errorPlus="1.502131818450032" errorMinus="1.502131818450032"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.07500000000000001" errorPlus="0.024999999999999994" errorMinus="0.02500000000000001"/>
+ <measurement value="5.08" errorPlus="0.8209750300709516" errorMinus="0.751065909225016"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.125" errorPlus="0.024999999999999994" errorMinus="0.024999999999999994"/>
+ <measurement value="3.36" errorPlus="0.4909175083453431" errorMinus="0.45099889135118726"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.175" errorPlus="0.025000000000000022" errorMinus="0.024999999999999994"/>
+ <measurement value="2.18" errorPlus="0.3313608305156178" errorMinus="0.3014962686336267"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.225" errorPlus="0.024999999999999994" errorMinus="0.024999999999999994"/>
+ <measurement value="1.51" errorPlus="0.21095023109728983" errorMinus="0.191049731745428"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.275" errorPlus="0.024999999999999967" errorMinus="0.025000000000000022"/>
+ <measurement value="1.04" errorPlus="0.2408318915758459" errorMinus="0.22090722034374521"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.32499999999999996" errorPlus="0.025000000000000022" errorMinus="0.024999999999999967"/>
+ <measurement value="0.73" errorPlus="0.22090722034374521" errorMinus="0.21095023109728983"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.375" errorPlus="0.025000000000000022" errorMinus="0.025000000000000022"/>
+ <measurement value="0.59" errorPlus="0.161245154965971" errorMinus="0.14142135623730953"/>
+ </dataPoint>
+ </dataPointSet>
+<!-- comment out eccentricity plots for now since not validated
+ <dataPointSet name="d03-x01-y01" dimension="2" path="/REF/ATLAS_2012_I1119557" title="(1/N)*D(N)/DECCENTRICITY(C=JET)" >
+ <dataPoint>
+ <measurement value="0.1" errorPlus="0.1" errorMinus="0.1"/>
+ <measurement value="0.02" errorPlus="0.022360679774997897" errorMinus="0.022360679774997897"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.30000000000000004" errorPlus="0.09999999999999998" errorMinus="0.10000000000000003"/>
+ <measurement value="0.11" errorPlus="0.0670820393249937" errorMinus="0.0670820393249937"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.5" errorPlus="0.09999999999999998" errorMinus="0.09999999999999998"/>
+ <measurement value="0.51" errorPlus="0.16552945357246848" errorMinus="0.147648230602334"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.7" errorPlus="0.10000000000000009" errorMinus="0.09999999999999998"/>
+ <measurement value="1.1" errorPlus="0.15811388300841897" errorMinus="0.1664331697709324"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.9" errorPlus="0.09999999999999998" errorMinus="0.09999999999999998"/>
+ <measurement value="3.29" errorPlus="0.29410882339705485" errorMinus="0.3190611226708764"/>
+ </dataPoint>
+ </dataPointSet>
+ <dataPointSet name="d03-x02-y01" dimension="2" path="/REF/ATLAS_2012_I1119557" title="(1/N)*D(N)/DECCENTRICITY(C=JET)" >
+ <dataPoint>
+ <measurement value="0.1" errorPlus="0.1" errorMinus="0.1"/>
+ <measurement value="0.08" errorPlus="0.03162277660168379" errorMinus="0.03162277660168379"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.30000000000000004" errorPlus="0.09999999999999998" errorMinus="0.10000000000000003"/>
+ <measurement value="0.42" errorPlus="0.09219544457292887" errorMinus="0.09219544457292887"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.5" errorPlus="0.09999999999999998" errorMinus="0.09999999999999998"/>
+ <measurement value="0.98" errorPlus="0.12369316876852982" errorMinus="0.14317821063276354"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.7" errorPlus="0.10000000000000009" errorMinus="0.09999999999999998"/>
+ <measurement value="1.72" errorPlus="0.20396078054371142" errorMinus="0.22360679774997896"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.9" errorPlus="0.09999999999999998" errorMinus="0.09999999999999998"/>
+ <measurement value="1.86" errorPlus="0.28284271247461906" errorMinus="0.27294688127912364"/>
+ </dataPoint>
+ </dataPointSet>
+-->
+ <dataPointSet name="d04-x02-y01" dimension="2" path="/REF/ATLAS_2012_I1119557" title="(1/N)*D(N)/DPLANARFLOW(C=JET)" >
+ <dataPoint>
+ <measurement value="0.1" errorPlus="0.1" errorMinus="0.1"/>
+ <measurement value="0.51" errorPlus="0.15652475842498528" errorMinus="0.15652475842498528"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.30000000000000004" errorPlus="0.09999999999999998" errorMinus="0.10000000000000003"/>
+ <measurement value="1.36" errorPlus="0.28460498941515416" errorMinus="0.3132091952673165"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.5" errorPlus="0.09999999999999998" errorMinus="0.09999999999999998"/>
+ <measurement value="1.38" errorPlus="0.30364452901377953" errorMinus="0.28460498941515416"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.7" errorPlus="0.10000000000000009" errorMinus="0.09999999999999998"/>
+ <measurement value="0.95" errorPlus="0.14422205101855956" errorMinus="0.12041594578792295"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.9" errorPlus="0.09999999999999998" errorMinus="0.09999999999999998"/>
+ <measurement value="0.81" errorPlus="0.16552945357246848" errorMinus="0.18384776310850237"/>
+ </dataPoint>
+ </dataPointSet>
+ <dataPointSet name="d05-x01-y01" dimension="2" path="/REF/ATLAS_2012_I1119557" title="(1/N)*D(N)/DANGULARITY(C=JET)" >
+ <dataPoint>
+ <measurement value="0.001" errorPlus="0.001" errorMinus="0.001"/>
+ <measurement value="75.0" errorPlus="39.293765408777" errorMinus="47.07440918375928"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.003" errorPlus="0.001" errorMinus="0.001"/>
+ <measurement value="223.0" errorPlus="30.886890422961002" errorMinus="31.76476034853718"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.005" errorPlus="0.001" errorMinus="0.001"/>
+ <measurement value="158.0" errorPlus="45.880278987817846" errorMinus="35.4682957019364"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.007" errorPlus="0.001" errorMinus="0.001"/>
+ <measurement value="40.0" errorPlus="33.54101966249684" errorMinus="33.54101966249684"/>
+ </dataPoint>
+ <dataPoint>
+ <measurement value="0.009000000000000001" errorPlus="9.999999999999992E-4" errorMinus="0.0010000000000000009"/>
+ <measurement value="9.0" errorPlus="26.476404589747453" errorMinus="10.295630140987"/>
+ </dataPoint>
+ </dataPointSet>
+</aida>
Modified: trunk/data/refdata/Makefile.am
==============================================================================
--- trunk/data/refdata/Makefile.am Mon Feb 18 15:31:38 2013 (r4167)
+++ trunk/data/refdata/Makefile.am Mon Feb 18 15:36:51 2013 (r4168)
@@ -57,6 +57,7 @@
ATLAS_2012_I943401.aida \
ATLAS_2012_I1082009.aida \
ATLAS_2012_I1118269.aida \
+ ATLAS_2012_I1119557.aida \
ATLAS_2012_I1183818.aida \
ATLAS_2012_I1188891.aida \
ATLAS_2012_CONF_2012_001.aida \
Copied and modified: trunk/src/Analyses/ATLAS_2012_I1119557.cc (from r4098, branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1119557.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/ATLAS_2012_I1119557.cc Thu Dec 20 17:25:43 2012 (r4098, copy source)
+++ trunk/src/Analyses/ATLAS_2012_I1119557.cc Mon Feb 18 15:36:51 2013 (r4168)
@@ -1,6 +1,6 @@
// -*- C++ -*-
#include "Rivet/Analysis.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
#include "Rivet/Tools/Logging.hh"
#include "Rivet/Projections/FastJets.hh"
#include "Rivet/Projections/FinalState.hh"
@@ -34,13 +34,13 @@
addProjection(fj10, "AntiKT10");
for (size_t alg = 0; alg < 2; ++alg) {
- _hs_mass[alg] = bookHistogram1D(1, alg+1, 1);
- _hs_width[alg] = bookHistogram1D(2, alg+1, 1);
+ _hs_mass[alg] = bookHisto1D(1, alg+1, 1);
+ _hs_width[alg] = bookHisto1D(2, alg+1, 1);
/// @todo Commented eccentricity out for now: reinstate
- // _hs_eccentricity[alg] = bookHistogram1D(3, alg+1, 1);
+ // _hs_eccentricity[alg] = bookHisto1D(3, alg+1, 1);
}
- _h_planarFlow = bookHistogram1D(4, 2, 1);
- _h_angularity = bookHistogram1D(5, 1, 1);
+ _h_planarFlow = bookHisto1D(4, 2, 1);
+ _h_angularity = bookHisto1D(5, 1, 1);
}
@@ -87,12 +87,12 @@
private:
- AIDA::IHistogram1D *_hs_mass[2];
- AIDA::IHistogram1D *_hs_width[2];
+ Histo1DPtr _hs_mass[2];
+ Histo1DPtr _hs_width[2];
/// @todo Commented eccentricity out for now: reinstate
- // AIDA::IHistogram1D *_hs_eccentricity[2];
- AIDA::IHistogram1D *_h_planarFlow;
- AIDA::IHistogram1D *_h_angularity;
+ // Histo1DPtr _hs_eccentricity[2];
+ Histo1DPtr _h_planarFlow;
+ Histo1DPtr _h_angularity;
};
Modified: trunk/src/Analyses/Makefile.am
==============================================================================
--- trunk/src/Analyses/Makefile.am Mon Feb 18 15:31:38 2013 (r4167)
+++ trunk/src/Analyses/Makefile.am Mon Feb 18 15:36:51 2013 (r4168)
@@ -81,6 +81,7 @@
ATLAS_2012_I1112263.cc \
ATLAS_2012_I1117704.cc \
ATLAS_2012_I1118269.cc \
+ ATLAS_2012_I1119557.cc \
ATLAS_2012_I1125961.cc \
ATLAS_2012_I1183818.cc \
ATLAS_2012_I1188891.cc \
More information about the Rivet-svn
mailing list
|