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

blackhole at projects.hepforge.org blackhole at projects.hepforge.org
Mon Feb 18 15:53:45 GMT 2013


Author: hoeth
Date: Mon Feb 18 15:53:44 2013
New Revision: 4171

Log:
merge c4134 from branches/2012-06-aidarivet

Added:
   trunk/data/anainfo/BABAR_2003_I593379.info
      - copied unchanged from r4134, branches/2012-06-aidarivet/data/anainfo/BABAR_2003_I593379.info
   trunk/data/plotinfo/BABAR_2003_I593379.plot
      - copied unchanged from r4134, branches/2012-06-aidarivet/data/plotinfo/BABAR_2003_I593379.plot
   trunk/data/refdata/BABAR_2003_I593379.aida
      - copied unchanged from r4134, branches/2012-06-aidarivet/data/refdata/BABAR_2003_I593379.aida
   trunk/src/Analyses/BABAR_2003_I593379.cc
      - copied, changed from r4134, branches/2012-06-aidarivet/src/Analyses/BABAR_2003_I593379.cc
Modified:
   trunk/data/anainfo/Makefile.am
   trunk/data/plotinfo/Makefile.am
   trunk/data/refdata/Makefile.am
   trunk/src/Analyses/Makefile.am

Copied: trunk/data/anainfo/BABAR_2003_I593379.info (from r4134, branches/2012-06-aidarivet/data/anainfo/BABAR_2003_I593379.info)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/anainfo/BABAR_2003_I593379.info	Mon Feb 18 15:53:44 2013	(r4171, copy of r4134, branches/2012-06-aidarivet/data/anainfo/BABAR_2003_I593379.info)
@@ -0,0 +1,37 @@
+Name: BABAR_2003_I593379
+Summary: Measurement of inclusive charmonium production
+Status: VALIDATED
+Authors:
+ - Peter Richardson <Peter.Richardson at durham.ac.uk>
+References:
+ - Phys.Rev. D67 032002, 2003
+ - hep-ex/0207097
+RunInfo:
+  Production of charmionum at the $\Upslion(4S)$ resonace.
+NumEvents: 1000000
+InspireID: 593379
+Beams: [e+, e-]
+Energies: [[3.5, 8.0]]
+PtCuts: [0]
+Description: Measurement of  $J/\Psi$, $\Psi'$, $\chi_{c1}$ and 
+    $\chi_{c2}$ production using
+ a data sample corresponding to an integrated luminosity of 20.3$\mathrm{fb}^{-1}$ collected
+ with the BABAR detector at the SLAC PEP-II electron-positron storage ring operating
+ at a centre-of-mass energy near 10.58 GeV.
+BibKey: Aubert:2002hc
+BibTeX: '@article{Aubert:2002hc,
+      author         = "Aubert, Bernard and others",
+      title          = "{Study of inclusive production of charmonium mesons in
+                        $B$ decay}",
+      collaboration  = "BABAR Collaboration",
+      journal        = "Phys.Rev.",
+      volume         = "D67",
+      pages          = "032002",
+      doi            = "10.1103/PhysRevD.67.032002",
+      year           = "2003",
+      eprint         = "hep-ex/0207097",
+      archivePrefix  = "arXiv",
+      primaryClass   = "hep-ex",
+      reportNumber   = "SLAC-PUB-9327, BABAR-PUB-02-04",
+      SLACcitation   = "%%CITATION = HEP-EX/0207097;%%",
+}'

Modified: trunk/data/anainfo/Makefile.am
==============================================================================
--- trunk/data/anainfo/Makefile.am	Mon Feb 18 15:41:05 2013	(r4170)
+++ trunk/data/anainfo/Makefile.am	Mon Feb 18 15:53:44 2013	(r4171)
@@ -74,6 +74,7 @@
   ATLAS_2012_CONF_2012_109.info \
   ATLAS_2012_CONF_2012_153.info \
   ATLAS_2013_I1217867.info \
+  BABAR_2003_I593379.info \
   BABAR_2005_S6181155.info \
   BABAR_2007_S6895344.info \
   BABAR_2007_S7266081.info \

Copied: trunk/data/plotinfo/BABAR_2003_I593379.plot (from r4134, branches/2012-06-aidarivet/data/plotinfo/BABAR_2003_I593379.plot)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/plotinfo/BABAR_2003_I593379.plot	Mon Feb 18 15:53:44 2013	(r4171, copy of r4134, branches/2012-06-aidarivet/data/plotinfo/BABAR_2003_I593379.plot)
@@ -0,0 +1,72 @@
+# BEGIN PLOT /BABAR_2003_I593379/d01-x01-y01
+Title=${\rm Br}(B\to J/\Psi)$ at the $\Upsilon(4S)$
+XLabel=
+YLabel=${\rm Br}(B\to J/\Psi)$ [\%]
+LogY=0
+# END PLOT
+# BEGIN PLOT /BABAR_2003_I593379/d01-x01-y02
+Title=${\rm Br}(B\to J/\Psi)$~direct at the $\Upsilon(4S)$
+XLabel=
+YLabel=${\rm Br}(B\to J/\Psi)$ [\%]
+LogY=0
+# END PLOT
+# BEGIN PLOT /BABAR_2003_I593379/d01-x01-y03
+Title=${\rm Br}(B\to \chi_{c1})$ at the $\Upsilon(4S)$
+XLabel=
+YLabel=${\rm Br}(B\to \chi_{c1})$ [\%]
+LogY=0
+# END PLOT
+# BEGIN PLOT /BABAR_2003_I593379/d01-x01-y04
+Title=${\rm Br}(B\to \chi_{c1})$~direct at the $\Upsilon(4S)$
+XLabel=
+YLabel=${\rm Br}(B\to \chi_{c1})$ [\%]
+LogY=0
+# END PLOT
+# BEGIN PLOT /BABAR_2003_I593379/d01-x01-y05
+Title=${\rm Br}(B\to \chi_{c2})$ at the $\Upsilon(4S)$
+XLabel=
+YLabel=${\rm Br}(B\to \chi_{c2})$ [\%]
+LogY=0
+# END PLOT
+# BEGIN PLOT /BABAR_2003_I593379/d01-x01-y06
+Title=${\rm Br}(B\to \chi_{c2})$~direct at the $\Upsilon(4S)$
+XLabel=
+YLabel=${\rm Br}(B\to \chi_{c2})$ [\%]
+LogY=0
+# END PLOT
+# BEGIN PLOT /BABAR_2003_I593379/d01-x01-y07
+Title=${\rm Br}(B\to \Psi')$ at the $\Upsilon(4S)$
+XLabel=
+YLabel=${\rm Br}(B\to \Psi')$ [\%]
+LogY=0
+# END PLOT
+# BEGIN PLOT /BABAR_2003_I593379/d06-x01-y01
+Title=${\rm Br}(B\to J/\Psi)$ at the $\Upsilon(4S)$
+XLabel=$p^*_{J/\Psi}$ [GeV]
+YLabel=$\text{d}B/\text{d}p^*_{J/\Psi}$ [0.1/GeV]
+LogY=0
+# END PLOT
+# BEGIN PLOT /BABAR_2003_I593379/d07-x01-y01
+Title=${\rm Br}(B\to \chi_{c1})$ at the $\Upsilon(4S)$
+XLabel=$p^*_{\chi_{c1}}$ [GeV]
+YLabel=$\text{d}B/\text{d}p^*_{\chi_{c1}}$ [0.1/GeV]
+LogY=0
+# END PLOT
+# BEGIN PLOT /BABAR_2003_I593379/d07-x01-y02
+Title=${\rm Br}(B\to \chi_{c2})$ at the $\Upsilon(4S)$
+XLabel=$p^*_{\chi_{c2}}$ [GeV]
+YLabel=$\text{d}B/\text{d}p^*_{\chi_{c2}}$ [0.1/GeV]
+LogY=0
+# END PLOT
+# BEGIN PLOT /BABAR_2003_I593379/d08-x01-y01
+Title=${\rm Br}(B\to \Psi')$ at the $\Upsilon(4S)$
+XLabel=$p^*_{\Psi'}$ [GeV]
+YLabel=$\text{d}B/\text{d}p^*_{\Psi'}$ [0.1/GeV]
+LogY=0
+# END PLOT
+# BEGIN PLOT /BABAR_2003_I593379/d10-x01-y01
+Title=${\rm Br}(B\to J/\Psi)$~(direct) at the $\Upsilon(4S)$
+XLabel=$p^*_{J/\Psi}$ [GeV]
+YLabel=$\text{d}B/\text{d}p^*_{J/\Psi}$ [0.1/GeV]
+LogY=0
+# END PLOT
\ No newline at end of file

Modified: trunk/data/plotinfo/Makefile.am
==============================================================================
--- trunk/data/plotinfo/Makefile.am	Mon Feb 18 15:41:05 2013	(r4170)
+++ trunk/data/plotinfo/Makefile.am	Mon Feb 18 15:53:44 2013	(r4171)
@@ -71,6 +71,7 @@
   ATLAS_2012_CONF_2012_109.plot \
   ATLAS_2012_CONF_2012_153.plot \
   ATLAS_2013_I1217867.plot \
+  BABAR_2003_I593379.plot \
   BABAR_2005_S6181155.plot \
   BABAR_2007_S6895344.plot \
   BABAR_2007_S7266081.plot \

Copied: trunk/data/refdata/BABAR_2003_I593379.aida (from r4134, branches/2012-06-aidarivet/data/refdata/BABAR_2003_I593379.aida)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/data/refdata/BABAR_2003_I593379.aida	Mon Feb 18 15:53:44 2013	(r4171, copy of r4134, branches/2012-06-aidarivet/data/refdata/BABAR_2003_I593379.aida)
@@ -0,0 +1,417 @@
+<?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="d06-x01-y01" dimension="2" path="/REF/BABAR_2003_I593379" title="B" >
+<dataPoint>
+<measurement value="0.05" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="4.69838884761e-06" errorPlus="1.15981979842e-05" errorMinus="1.16037222509e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.15" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="6.97770129737e-05" errorPlus="1.16009601176e-05" errorMinus="1.16009601175e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.25" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000158063081602" errorPlus="1.1598197984e-05" errorMinus="1.3921152141e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.35" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000313629194645" errorPlus="1.6241344164e-05" errorMinus="1.8561536188e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.45" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000432074997445" errorPlus="1.8561536188e-05" errorMinus="2.3201920235e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.55" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000515717919893" errorPlus="2.0884490345e-05" errorMinus="2.5522112259e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.65" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.00055760014805" errorPlus="2.5516587992e-05" errorMinus="2.7842304282e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.75" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000703885492999" errorPlus="2.3201920235e-05" errorMinus="2.5519350125e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.85" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000743447529134" errorPlus="2.5516587992e-05" errorMinus="3.0159734173e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.95" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000708760658382" errorPlus="2.7839542149e-05" errorMinus="2.7845066415e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.05" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000769198898461" errorPlus="2.7842304282e-05" errorMinus="2.7842304282e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.15" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000776278246266" errorPlus="2.7839542149e-05" errorMinus="2.5519350125e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.25" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000822795334204" errorPlus="2.7842304282e-05" errorMinus="3.0165258439e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.35" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000818270959758" errorPlus="2.5522112259e-05" errorMinus="2.7845066415e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.45" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000964561828974" errorPlus="3.0159734173e-05" errorMinus="3.0162496305e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.55" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000839384707172" errorPlus="2.7842304283e-05" errorMinus="3.0162496305e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.65" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000718850731551" errorPlus="2.7839542149e-05" errorMinus="2.5519350125e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.75" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.00051015222117" errorPlus="2.3199158101e-05" errorMinus="2.7845066416e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.85" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.00024112319391" errorPlus="2.0881728212e-05" errorMinus="2.5519350125e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.95" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="-7.02134300448e-06" errorPlus="2.32019202351e-05" errorMinus="2.31991581017e-05"/>
+</dataPoint>
+  </dataPointSet>
+<dataPointSet name="d07-x01-y01" dimension="2" path="/REF/BABAR_2003_I593379" title="B" >
+<dataPoint>
+<measurement value="0.05" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="7.89771449333e-06" errorPlus="1.04804581394e-05" errorMinus="9.17040087199e-06"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.15" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="5.25268603263e-05" errorPlus="2.7511202616e-05" errorMinus="7.61076463525e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.25" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="1.46244744719e-05" errorPlus="3.79895845949e-05" errorMinus="-1.16991643454e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.35" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000128684579318" errorPlus="4.8472118895e-05" errorMinus="4.97821761622e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.45" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.00019427464143" errorPlus="6.4192806104e-05" errorMinus="6.5504939532e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.55" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000320127337843" errorPlus="7.7293378778e-05" errorMinus="7.7293378778e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.65" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000187898752574" errorPlus="6.8122977906e-05" errorMinus="6.9433035174e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.75" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.00012903337428" errorPlus="7.2053149708e-05" errorMinus="7.33632069761e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.85" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000413403000052" errorPlus="8.3841588955e-05" errorMinus="8.3841588955e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.95" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000353229640651" errorPlus="8.5151646222e-05" errorMinus="8.7773836917e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.05" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000392616481254" errorPlus="7.8601359885e-05" errorMinus="7.8603436046e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.15" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.0003547140954" errorPlus="7.8601359885e-05" errorMinus="7.8605512207e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.25" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000336458416236" errorPlus="7.0743092441e-05" errorMinus="7.2053149709e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.35" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000375847332999" errorPlus="6.9433035173e-05" errorMinus="6.9435111334e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.45" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000216109621274" errorPlus="5.7642519767e-05" errorMinus="5.7642519767e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.55" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000169032682226" errorPlus="5.7642519767e-05" errorMinus="5.8952577034e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.65" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="1.22493468745e-07" errorPlus="4.97801000018e-05" errorMinus="4.84721188947e-05"/>
+</dataPoint>
+  </dataPointSet>
+<dataPointSet name="d07-x01-y02" dimension="2" path="/REF/BABAR_2003_I593379" title="B" >
+<dataPoint>
+<measurement value="0.05" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="5.24017467249e-06" errorPlus="1.17903930131e-05" errorMinus="1.17903930131e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.15" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="3.27510917031e-05" errorPlus="2.48908296943e-05" errorMinus="2.62008733625e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.25" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="-3.93013100437e-06" errorPlus="4.97816593887e-05" errorMinus="4.58515283842e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.35" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.00011135371179" errorPlus="7.2052401747e-05" errorMinus="7.20524017463e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.45" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000168995633188" errorPlus="7.8602620087e-05" errorMinus="7.86026200876e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.55" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000205676855895" errorPlus="8.9082969433e-05" errorMinus="8.9082969432e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.65" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000144104803493" errorPlus="9.1703056769e-05" errorMinus="9.30131004362e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.75" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000117903930131" errorPlus="0.00010480349345" errorMinus="0.000100873362445"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.85" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.00016768558952" errorPlus="0.000103493449781" errorMinus="0.000106113537118"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.95" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000203056768559" errorPlus="0.000102183406113" errorMinus="0.000100873362445"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.05" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000267248908297" errorPlus="0.000102183406113" errorMinus="0.000102183406114"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.15" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="3.01310043668e-05" errorPlus="0.00010480349345" errorMinus="0.000100873362445"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.25" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000184716157205" errorPlus="0.00010480349345" errorMinus="0.000106113537118"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.35" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000221397379913" errorPlus="9.1703056768e-05" errorMinus="9.0393013101e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.45" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="7.4672489083e-05" errorPlus="9.4323144105e-05" errorMinus="9.5633187773e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.55" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="-7.4672489083e-05" errorPlus="9.69432314411e-05" errorMinus="0.000107423580786"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.65" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="-1.70305676856e-05" errorPlus="0.000136244541485" errorMinus="0.000133624454148"/>
+</dataPoint>
+  </dataPointSet>
+<dataPointSet name="d08-x01-y01" dimension="2" path="/REF/BABAR_2003_I593379" title="B" >
+<dataPoint>
+<measurement value="0.05" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="6.32545081525e-06" errorPlus="4.53514739225e-06" errorMinus="4.5340675953e-06"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.15" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="2.3514739229e-05" errorPlus="1.08854335385e-05" errorMinus="1.08843537415e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.25" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="8.15192743764e-05" errorPlus="1.99546485256e-05" errorMinus="1.99546485261e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.35" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000138616780045" errorPlus="2.3583846237e-05" errorMinus="2.4489795918e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.45" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000173038548753" errorPlus="2.9931972789e-05" errorMinus="3.1744951949e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.55" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000235578231293" errorPlus="3.2653061224e-05" errorMinus="3.35611705e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.65" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000229182593672" errorPlus="3.5375229457e-05" errorMinus="3.5374149659e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.75" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000214624770543" errorPlus="3.5375229457e-05" errorMinus="3.8093078501e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.85" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000254488716121" errorPlus="3.7189288414e-05" errorMinus="3.7187128819e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.95" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000222698412698" errorPlus="3.8094158299e-05" errorMinus="3.9002267573e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.05" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000297029478458" errorPlus="3.8095238095e-05" errorMinus="3.8095238095e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.15" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000296076017709" errorPlus="3.9002267573e-05" errorMinus="4.0816326531e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.25" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000325962639024" errorPlus="3.9911456646e-05" errorMinus="4.1723356009e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.35" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000216167800454" errorPlus="3.3560090702e-05" errorMinus="3.5373069863e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.45" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000119977324263" errorPlus="3.4466040384e-05" errorMinus="3.44671201814e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.55" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="-9.77324263039e-06" errorPlus="2.53968253968e-05" errorMinus="2.44897959184e-05"/>
+</dataPoint>
+  </dataPointSet>
+<dataPointSet name="d10-x01-y01" dimension="2" path="/REF/BABAR_2003_I593379" title="B" >
+<dataPoint>
+<measurement value="0.05" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="2.25173210162e-06" errorPlus="1.15473441109e-05" errorMinus="1.15473441109e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.15" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="1.59930715935e-05" errorPlus="1.84757505774e-05" errorMinus="1.84757505773e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.25" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="8.51589134499e-05" errorPlus="2.54069064111e-05" errorMinus="2.54014076762e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.35" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="8.04272517321e-05" errorPlus="3.69515011549e-05" errorMinus="3.46420323326e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.45" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.00020733256351" errorPlus="4.1570438799e-05" errorMinus="3.9260969977e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.55" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000227999560101" errorPlus="4.6192125811e-05" errorMinus="4.6186627076e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.65" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.00033411965248" errorPlus="4.3882656989e-05" errorMinus="4.3879907621e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.75" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000350173210162" errorPlus="4.8501594633e-05" errorMinus="5.0811063456e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.85" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000384697019685" errorPlus="4.8501594634e-05" errorMinus="5.0808314087e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="0.95" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000391509952711" errorPlus="4.8501594633e-05" errorMinus="4.849334653e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.05" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000467609699769" errorPlus="4.8501594633e-05" errorMinus="5.0808314088e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.15" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.00048827669636" errorPlus="5.3120532277e-05" errorMinus="4.6186627076e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.25" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000605946882217" errorPlus="4.8498845266e-05" errorMinus="5.0808314088e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.35" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000712064225228" errorPlus="4.3885406357e-05" errorMinus="4.6186627076e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.45" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000868992631695" errorPlus="5.0811063455e-05" errorMinus="5.0802815353e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.55" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000792664687122" errorPlus="6.2358407566e-05" errorMinus="6.2352908831e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.65" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000684006928406" errorPlus="6.0048938745e-05" errorMinus="6.0043440008e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.75" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.00049451226218" errorPlus="3.9263719344e-05" errorMinus="4.1567689432e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.85" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="0.000226501154734" errorPlus="4.1570438799e-05" errorMinus="4.3879907621e-05"/>
+</dataPoint>
+<dataPoint>
+<measurement value="1.95" errorPlus="0.05" errorMinus="0.05"/>
+<measurement value="-1.61112944023e-05" errorPlus="3.00285934235e-05" errorMinus="3.23270647751e-05"/>
+</dataPoint>
+  </dataPointSet>
+<dataPointSet name="d01-x01-y01" dimension="2" path="/REF/BABAR_2003_I593379" title="B" >
+<dataPoint>
+<measurement value="10.58" errorPlus="0.5" errorMinus="0.5"/>
+<measurement value="1.057" errorPlus="0.0417612260356" errorMinus="0.0417612260356"/>
+</dataPoint>
+</dataPointSet>
+<dataPointSet name="d01-x01-y02" dimension="2" path="/REF/BABAR_2003_I593379" title="B" >
+<dataPoint>
+<measurement value="10.58" errorPlus="0.5" errorMinus="0.5"/>
+<measurement value="0.74" errorPlus="0.0487647413609" errorMinus="0.0487647413609"/>
+</dataPoint>
+</dataPointSet>
+<dataPointSet name="d01-x01-y03" dimension="2" path="/REF/BABAR_2003_I593379" title="B" >
+<dataPoint>
+<measurement value="10.58" errorPlus="0.5" errorMinus="0.5"/>
+<measurement value="0.21" errorPlus="0.0546443043693" errorMinus="0.0546443043693"/>
+</dataPoint>
+</dataPointSet>
+<dataPointSet name="d01-x01-y04" dimension="2" path="/REF/BABAR_2003_I593379" title="B" >
+<dataPoint>
+<measurement value="10.58" errorPlus="0.5" errorMinus="0.5"/>
+<measurement value="0.19" errorPlus="0.0535350352573" errorMinus="0.0535350352573"/>
+</dataPoint>
+</dataPointSet>
+<dataPointSet name="d01-x01-y05" dimension="2" path="/REF/BABAR_2003_I593379" title="B" >
+<dataPoint>
+<measurement value="10.58" errorPlus="0.5" errorMinus="0.5"/>
+<measurement value="0.21" errorPlus="0.0546443043693" errorMinus="0.0546443043693"/>
+</dataPoint>
+</dataPointSet>
+<dataPointSet name="d01-x01-y06" dimension="2" path="/REF/BABAR_2003_I593379" title="B" >
+<dataPoint>
+<measurement value="10.58" errorPlus="0.5" errorMinus="0.5"/>
+<measurement value="0.19" errorPlus="0.0535350352573" errorMinus="0.0535350352573"/>
+</dataPoint>
+</dataPointSet>
+<dataPointSet name="d01-x01-y07" dimension="2" path="/REF/BABAR_2003_I593379" title="B" >
+<dataPoint>
+<measurement value="10.58" errorPlus="0.5" errorMinus="0.5"/>
+<measurement value="0.297" errorPlus="0.0282842712475" errorMinus="0.0282842712475"/>
+</dataPoint>
+</dataPointSet>
+</aida>

Modified: trunk/data/refdata/Makefile.am
==============================================================================
--- trunk/data/refdata/Makefile.am	Mon Feb 18 15:41:05 2013	(r4170)
+++ trunk/data/refdata/Makefile.am	Mon Feb 18 15:53:44 2013	(r4171)
@@ -62,6 +62,7 @@
   ATLAS_2012_I1188891.aida \
   ATLAS_2012_CONF_2012_001.aida \
   ATLAS_2013_I1217867.aida \
+  BABAR_2003_I593379.aida \
   BABAR_2005_S6181155.aida \
   BABAR_2006_S6511112.aida \
   BABAR_2007_S6895344.aida \

Copied and modified: trunk/src/Analyses/BABAR_2003_I593379.cc (from r4134, branches/2012-06-aidarivet/src/Analyses/BABAR_2003_I593379.cc)
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/BABAR_2003_I593379.cc	Sat Feb  9 11:22:51 2013	(r4134, copy source)
+++ trunk/src/Analyses/BABAR_2003_I593379.cc	Mon Feb 18 15:53:44 2013	(r4171)
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 #include <iostream>
 #include "Rivet/Analysis.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 #include "Rivet/Tools/ParticleIdUtils.hh"
 #include "Rivet/Projections/Beam.hh"
 #include "Rivet/Projections/UnstableFinalState.hh"
@@ -14,7 +14,7 @@
   class BABAR_2003_I593379 : public Analysis {
   public:
 
-    BABAR_2003_I593379() 
+    BABAR_2003_I593379()
       : Analysis("BABAR_2003_I593379"), _weightSum(0.)
     { }
 
@@ -26,102 +26,97 @@
       ParticleVector upsilons;
       // first in unstable final state
       foreach (const Particle& p, ufs.particles())
-	if(p.pdgId()==300553) upsilons.push_back(p);
+        if (p.pdgId()==300553) upsilons.push_back(p);
       // then in whole event if fails
-      if(upsilons.empty()) {
-	foreach (GenParticle* p, Rivet::particles(e.genEvent())) { 
-	  if(p->pdg_id()!=300553) continue;
-	  const GenVertex* pv = p->production_vertex();
-	  bool passed = true;
-	  if (pv) {
-	    for (GenVertex::particles_in_const_iterator pp = pv->particles_in_const_begin() ;
-		 pp != pv->particles_in_const_end() ; ++pp) {
-	      if ( p->pdg_id() == (*pp)->pdg_id() ) {
-		passed = false;
-		break;
-	      }
-	    }
-	  }
-	  if(passed) upsilons.push_back(Particle(*p));
-	}
+      if (upsilons.empty()) {
+        foreach (GenParticle* p, Rivet::particles(e.genEvent())) {
+          if (p->pdg_id()!=300553) continue;
+          const GenVertex* pv = p->production_vertex();
+          bool passed = true;
+          if (pv) {
+            for (GenVertex::particles_in_const_iterator pp = pv->particles_in_const_begin() ;
+                 pp != pv->particles_in_const_end() ; ++pp) {
+              if ( p->pdg_id() == (*pp)->pdg_id() ) {
+                passed = false;
+                break;
+              }
+            }
+          }
+          if (passed) upsilons.push_back(Particle(*p));
+        }
       }
 
       // find an upsilons
       foreach (const Particle& p, upsilons) {
-	_weightSum += weight;
-	// find the charmonium resonances
-	vector<GenParticle *> allJpsi,primaryJpsi,Psiprime,
-	  all_chi_c1,all_chi_c2,primary_chi_c1,primary_chi_c2;
-	findDecayProducts(p.genParticle(),allJpsi,primaryJpsi,Psiprime,
-			  all_chi_c1,all_chi_c2,primary_chi_c1,primary_chi_c2);
-	LorentzTransform cms_boost(-p.momentum().boostVector());
-	for(unsigned int ix=0;ix<allJpsi.size();++ix) {
-	  double pcm = 
-	    cms_boost.transform(FourMomentum(allJpsi[ix]->momentum())).vector3().mod();
-	  _hist_all_Jpsi->fill(pcm,weight);
-	}
-	_mult_JPsi->fill(10.58,weight*double(allJpsi.size()));
-	for(unsigned int ix=0;ix<primaryJpsi.size();++ix) {
-	  double pcm = 
-	    cms_boost.transform(FourMomentum(primaryJpsi[ix]->momentum())).vector3().mod();
-	  _hist_primary_Jpsi->fill(pcm,weight);
-	}
-	_mult_JPsi_direct->fill(10.58,weight*double(primaryJpsi.size()));
-	for(unsigned int ix=0;ix<Psiprime.size();++ix) {
-	  double pcm = 
-	    cms_boost.transform(FourMomentum(Psiprime[ix]->momentum())).vector3().mod();
-	  _hist_Psi_prime->fill(pcm,weight);
-	}
-	_mult_Psi2S->fill(10.58,weight*double(Psiprime.size()));
-	for(unsigned int ix=0;ix<all_chi_c1.size();++ix) {
-	  double pcm = 
-	    cms_boost.transform(FourMomentum(all_chi_c1[ix]->momentum())).vector3().mod();
-	  _hist_chi_c1->fill(pcm,weight);
-	}
-	_mult_chi_c1->fill(10.58,weight*double(all_chi_c1.size()));
-	_mult_chi_c1_direct->fill(10.58,weight*double(primary_chi_c1.size()));
-	for(unsigned int ix=0;ix<all_chi_c2.size();++ix) {
-	  double pcm = 
-	    cms_boost.transform(FourMomentum(all_chi_c2[ix]->momentum())).vector3().mod();
-	  _hist_chi_c2->fill(pcm,weight);
-	}
-	_mult_chi_c2->fill(10.58,weight*double(all_chi_c2.size()));
-	_mult_chi_c2_direct->fill(10.58,weight*double(primary_chi_c2.size()));
+        _weightSum += weight;
+        // find the charmonium resonances
+        vector<GenParticle *> allJpsi, primaryJpsi, Psiprime,
+          all_chi_c1, all_chi_c2, primary_chi_c1, primary_chi_c2;
+        findDecayProducts(p.genParticle(), allJpsi, primaryJpsi, Psiprime,
+                          all_chi_c1, all_chi_c2, primary_chi_c1, primary_chi_c2);
+        LorentzTransform cms_boost(-p.momentum().boostVector());
+        for (size_t i=0; i<allJpsi.size(); i++) {
+          double pcm = cms_boost.transform(FourMomentum(allJpsi[i]->momentum())).vector3().mod();
+          _hist_all_Jpsi->fill(pcm, weight);
+        }
+        _mult_JPsi->fill(10.58, weight*double(allJpsi.size()));
+        for (size_t i=0; i<primaryJpsi.size(); i++) {
+          double pcm = cms_boost.transform(FourMomentum(primaryJpsi[i]->momentum())).vector3().mod();
+          _hist_primary_Jpsi->fill(pcm, weight);
+        }
+        _mult_JPsi_direct->fill(10.58, weight*double(primaryJpsi.size()));
+        for (size_t i=0; i<Psiprime.size(); i++) {
+          double pcm = cms_boost.transform(FourMomentum(Psiprime[i]->momentum())).vector3().mod();
+          _hist_Psi_prime->fill(pcm, weight);
+        }
+        _mult_Psi2S->fill(10.58, weight*double(Psiprime.size()));
+        for (size_t i=0; i<all_chi_c1.size(); i++) {
+          double pcm = cms_boost.transform(FourMomentum(all_chi_c1[i]->momentum())).vector3().mod();
+          _hist_chi_c1->fill(pcm, weight);
+        }
+        _mult_chi_c1->fill(10.58, weight*double(all_chi_c1.size()));
+        _mult_chi_c1_direct->fill(10.58, weight*double(primary_chi_c1.size()));
+        for (size_t i=0; i<all_chi_c2.size(); i++) {
+          double pcm = cms_boost.transform(FourMomentum(all_chi_c2[i]->momentum())).vector3().mod();
+          _hist_chi_c2->fill(pcm, weight);
+        }
+        _mult_chi_c2->fill(10.58, weight*double(all_chi_c2.size()));
+        _mult_chi_c2_direct->fill(10.58, weight*double(primary_chi_c2.size()));
       }
     } // analyze
 
     void finalize() {
 
-      scale(_hist_all_Jpsi    ,0.5*0.1/_weightSum);
-      scale(_hist_chi_c1      ,0.5*0.1/_weightSum);
-      scale(_hist_chi_c2      ,0.5*0.1/_weightSum);
-      scale(_hist_Psi_prime   ,0.5*0.1/_weightSum);
-      scale(_hist_primary_Jpsi,0.5*0.1/_weightSum);
-      scale(_mult_JPsi         ,0.5*100./_weightSum);
-      scale(_mult_JPsi_direct  ,0.5*100./_weightSum);
-      scale(_mult_chi_c1       ,0.5*100./_weightSum);
-      scale(_mult_chi_c1_direct,0.5*100./_weightSum);
-      scale(_mult_chi_c2       ,0.5*100./_weightSum);
-      scale(_mult_chi_c2_direct,0.5*100./_weightSum);
-      scale(_mult_Psi2S        ,0.5*100./_weightSum);
+      scale(_hist_all_Jpsi     , 0.5*0.1/_weightSum);
+      scale(_hist_chi_c1       , 0.5*0.1/_weightSum);
+      scale(_hist_chi_c2       , 0.5*0.1/_weightSum);
+      scale(_hist_Psi_prime    , 0.5*0.1/_weightSum);
+      scale(_hist_primary_Jpsi , 0.5*0.1/_weightSum);
+      scale(_mult_JPsi         , 0.5*100./_weightSum);
+      scale(_mult_JPsi_direct  , 0.5*100./_weightSum);
+      scale(_mult_chi_c1       , 0.5*100./_weightSum);
+      scale(_mult_chi_c1_direct, 0.5*100./_weightSum);
+      scale(_mult_chi_c2       , 0.5*100./_weightSum);
+      scale(_mult_chi_c2_direct, 0.5*100./_weightSum);
+      scale(_mult_Psi2S        , 0.5*100./_weightSum);
     } // finalize
 
 
     void init() {
       addProjection(UnstableFinalState(), "UFS");
 
-      _mult_JPsi          = bookHistogram1D(1, 1, 1);
-      _mult_JPsi_direct   = bookHistogram1D(1, 1, 2);
-      _mult_chi_c1        = bookHistogram1D(1, 1, 3);
-      _mult_chi_c1_direct = bookHistogram1D(1, 1, 4);
-      _mult_chi_c2        = bookHistogram1D(1, 1, 5);
-      _mult_chi_c2_direct = bookHistogram1D(1, 1, 6);
-      _mult_Psi2S         = bookHistogram1D(1, 1, 7);
-      _hist_all_Jpsi      = bookHistogram1D(6, 1, 1);
-      _hist_chi_c1        = bookHistogram1D(7, 1, 1);
-      _hist_chi_c2        = bookHistogram1D(7, 1, 2);
-      _hist_Psi_prime     = bookHistogram1D(8, 1, 1);
-      _hist_primary_Jpsi  = bookHistogram1D(10, 1, 1);
+      _mult_JPsi          = bookHisto1D(1, 1, 1);
+      _mult_JPsi_direct   = bookHisto1D(1, 1, 2);
+      _mult_chi_c1        = bookHisto1D(1, 1, 3);
+      _mult_chi_c1_direct = bookHisto1D(1, 1, 4);
+      _mult_chi_c2        = bookHisto1D(1, 1, 5);
+      _mult_chi_c2_direct = bookHisto1D(1, 1, 6);
+      _mult_Psi2S         = bookHisto1D(1, 1, 7);
+      _hist_all_Jpsi      = bookHisto1D(6, 1, 1);
+      _hist_chi_c1        = bookHisto1D(7, 1, 1);
+      _hist_chi_c2        = bookHisto1D(7, 1, 2);
+      _hist_Psi_prime     = bookHisto1D(8, 1, 1);
+      _hist_primary_Jpsi  = bookHisto1D(10, 1, 1);
     } // init
 
   private:
@@ -130,62 +125,62 @@
     // count of weights
     double _weightSum;
     /// Histograms
-    AIDA::IHistogram1D* _hist_all_Jpsi;
-    AIDA::IHistogram1D* _hist_chi_c1;
-    AIDA::IHistogram1D* _hist_chi_c2;
-    AIDA::IHistogram1D* _hist_Psi_prime;
-    AIDA::IHistogram1D* _hist_primary_Jpsi;
-
-    AIDA::IHistogram1D* _mult_JPsi;
-    AIDA::IHistogram1D* _mult_JPsi_direct;
-    AIDA::IHistogram1D* _mult_chi_c1;
-    AIDA::IHistogram1D* _mult_chi_c1_direct;
-    AIDA::IHistogram1D* _mult_chi_c2;
-    AIDA::IHistogram1D* _mult_chi_c2_direct;
-    AIDA::IHistogram1D* _mult_Psi2S;
+    Histo1DPtr _hist_all_Jpsi;
+    Histo1DPtr _hist_chi_c1;
+    Histo1DPtr _hist_chi_c2;
+    Histo1DPtr _hist_Psi_prime;
+    Histo1DPtr _hist_primary_Jpsi;
+
+    Histo1DPtr _mult_JPsi;
+    Histo1DPtr _mult_JPsi_direct;
+    Histo1DPtr _mult_chi_c1;
+    Histo1DPtr _mult_chi_c1_direct;
+    Histo1DPtr _mult_chi_c2;
+    Histo1DPtr _mult_chi_c2_direct;
+    Histo1DPtr _mult_Psi2S;
     //@}
 
     void findDecayProducts(const GenParticle & p,
-			   vector<GenParticle *> & allJpsi,
-			   vector<GenParticle *> & primaryJpsi,
-			   vector<GenParticle *> & Psiprime,
-			   vector<GenParticle *> & all_chi_c1,
-			   vector<GenParticle *> & all_chi_c2,
-			   vector<GenParticle *> & primary_chi_c1,
-			   vector<GenParticle *> & primary_chi_c2) {
+                           vector<GenParticle *> & allJpsi,
+                           vector<GenParticle *> & primaryJpsi,
+                           vector<GenParticle *> & Psiprime,
+                           vector<GenParticle *> & all_chi_c1,
+                           vector<GenParticle *> & all_chi_c2,
+                           vector<GenParticle *> & primary_chi_c1,
+                           vector<GenParticle *> & primary_chi_c2) {
       const GenVertex* dv = p.end_vertex();
       bool isOnium(false);
       for (GenVertex::particles_in_const_iterator pp = dv->particles_in_const_begin() ;
-	   pp != dv->particles_in_const_end() ; ++pp) {
-	int id = (*pp)->pdg_id();
-	id = id%1000;
-	id -= id%10;
-	id /= 10;
-	if(id==44) isOnium = true;
+           pp != dv->particles_in_const_end() ; ++pp) {
+        int id = (*pp)->pdg_id();
+        id = id%1000;
+        id -= id%10;
+        id /= 10;
+        if (id==44) isOnium = true;
       }
       for (GenVertex::particles_out_const_iterator
-	     pp = dv->particles_out_const_begin();
-	   pp != dv->particles_out_const_end(); ++pp) {
-	int id = (*pp)->pdg_id();
-	if(id==100443) {
-	  Psiprime.push_back(*pp);
-	}
-	else if(id==20443) {
-	  all_chi_c1.push_back(*pp);
-	  if(!isOnium) primary_chi_c1.push_back(*pp);
-	}
-	else if(id==445) {
-	  all_chi_c2.push_back(*pp);
-	  if(!isOnium) primary_chi_c2.push_back(*pp);
-	}
-	else if(id==443) {
-	  allJpsi.push_back(*pp);
-	  if(!isOnium) primaryJpsi.push_back(*pp);
-	}
-	if((*pp)->end_vertex()) {
-	  findDecayProducts(**pp,allJpsi,primaryJpsi,Psiprime,
-			    all_chi_c1,all_chi_c2,primary_chi_c1,primary_chi_c2);
-	}
+             pp = dv->particles_out_const_begin();
+           pp != dv->particles_out_const_end(); ++pp) {
+        int id = (*pp)->pdg_id();
+        if (id==100443) {
+          Psiprime.push_back(*pp);
+        }
+        else if (id==20443) {
+          all_chi_c1.push_back(*pp);
+          if (!isOnium) primary_chi_c1.push_back(*pp);
+        }
+        else if (id==445) {
+          all_chi_c2.push_back(*pp);
+          if (!isOnium) primary_chi_c2.push_back(*pp);
+        }
+        else if (id==443) {
+          allJpsi.push_back(*pp);
+          if (!isOnium) primaryJpsi.push_back(*pp);
+        }
+        if ((*pp)->end_vertex()) {
+          findDecayProducts(**pp, allJpsi, primaryJpsi, Psiprime,
+                            all_chi_c1, all_chi_c2, primary_chi_c1, primary_chi_c2);
+        }
       }
     }
   };

Modified: trunk/src/Analyses/Makefile.am
==============================================================================
--- trunk/src/Analyses/Makefile.am	Mon Feb 18 15:41:05 2013	(r4170)
+++ trunk/src/Analyses/Makefile.am	Mon Feb 18 15:53:44 2013	(r4171)
@@ -332,6 +332,7 @@
     ARGUS_1993_S2653028.cc \
     ARGUS_1993_S2669951.cc \
     ARGUS_1993_S2789213.cc \
+    BABAR_2003_I593379.cc \
     BABAR_2005_S6181155.cc \
     BABAR_2007_S6895344.cc \
     BABAR_2007_S7266081.cc \


More information about the Rivet-svn mailing list