|
[Rivet-svn] r3417 - in branches/2011-07-aida2yoda: . data/anainfo data/plotinfo data/refdata src/Analysesblackhole at projects.hepforge.org blackhole at projects.hepforge.orgThu Oct 6 21:36:24 BST 2011
Author: hoeth Date: Thu Oct 6 21:36:24 2011 New Revision: 3417 Log: merge r3362-3363 from trunk Added: branches/2011-07-aida2yoda/data/anainfo/ALICE_2011_S8909580.info - copied unchanged from r3363, trunk/data/anainfo/ALICE_2011_S8909580.info branches/2011-07-aida2yoda/data/plotinfo/ALICE_2011_S8909580.plot - copied unchanged from r3363, trunk/data/plotinfo/ALICE_2011_S8909580.plot branches/2011-07-aida2yoda/data/refdata/ALICE_2011_S8909580.aida - copied unchanged from r3363, trunk/data/refdata/ALICE_2011_S8909580.aida branches/2011-07-aida2yoda/src/Analyses/ALICE_2011_S8909580.cc - copied, changed from r3363, trunk/src/Analyses/ALICE_2011_S8909580.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/ALICE_2011_S8945144.cc branches/2011-07-aida2yoda/src/Analyses/Makefile.am Modified: branches/2011-07-aida2yoda/ChangeLog ============================================================================== --- branches/2011-07-aida2yoda/ChangeLog Thu Oct 6 18:31:33 2011 (r3416) +++ branches/2011-07-aida2yoda/ChangeLog Thu Oct 6 21:36:24 2011 (r3417) @@ -1,3 +1,9 @@ +2011-09-18 Hendrik Hoeth <hendrik.hoeth at cern.ch> + + * Added ALICE_2011_S8909580 (strange particle production at 900 GeV) + + * Feed-down correction in ALICE_2011_S8945144 + 2011-09-14 Andy Buckley <andy at insectnation.org> * Adding the ATLAS Z pT measurement at 7 TeV (ATLAS_2011_S9131140) Copied: branches/2011-07-aida2yoda/data/anainfo/ALICE_2011_S8909580.info (from r3363, trunk/data/anainfo/ALICE_2011_S8909580.info) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2011-07-aida2yoda/data/anainfo/ALICE_2011_S8909580.info Thu Oct 6 21:36:24 2011 (r3417, copy of r3363, trunk/data/anainfo/ALICE_2011_S8909580.info) @@ -0,0 +1,37 @@ +Name: ALICE_2011_S8909580 +Year: 2011 +Summary: Strange particle production in proton-proton collisions at sqrt(s) = 0.9 TeV with ALICE at the LHC. +Experiment: ALICE +Collider: LHC +SpiresID: 8909580 +Status: VALIDATED +Authors: + - Pablo Bueno Gomez <UO189399 at uniovi.es> + - Eva Sicking <esicking at cern.ch> +References: + - Eur.Phys.J.C71:1594,2011. +RunInfo: + Diffractive events need to be switched on. +NumEvents: 5000000 +Beams: [p+, p+] +Energies: [900] +PtCuts: +Description: + 'Tranverse momentum spectra of strange particles (K0s, Lambdas, Phis and Xis) in pp collisions at $sqrt(s) = 0.9 TeV$ with ALICE at the LHC. The ratio of cross sections as a function of pT for LAMBDA/K0S is also included.' +BibKey: Aamodt:2011my +BibTeX: '@Article{Aamodt:2011my, + author = "Aamodt, K and others", + collaboration = "ALICE", + title = "{Strange particle production in proton-proton collisions at sqrt(s) = 0.9 TeV with ALICE at the LHC.}", + journal = "Eur.Phys.J. C", + volume = "71", + year = "2011", + pages = "1594", + eprint = "1012.3257", + archivePrefix = "arXiv", + primaryClass = "hep-ex", + doi = "10.1140/epjc/s10052-011-1594-5" + EXP CERN-LHC-ALICE | Reaction Data (Durham) + SLACcitation = "%%CITATION = 1012.3257;%%" +}' +ToDo: Modified: branches/2011-07-aida2yoda/data/anainfo/Makefile.am ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/Makefile.am Thu Oct 6 18:31:33 2011 (r3416) +++ branches/2011-07-aida2yoda/data/anainfo/Makefile.am Thu Oct 6 21:36:24 2011 (r3417) @@ -6,6 +6,7 @@ ALICE_2010_S8624100.info \ ALICE_2010_S8625980.info \ ALICE_2010_S8706239.info \ + ALICE_2011_S8909580.info \ ALICE_2011_S8945144.info \ ATLAS_2010_S8591806.info \ ATLAS_2010_S8817804.info \ Copied: branches/2011-07-aida2yoda/data/plotinfo/ALICE_2011_S8909580.plot (from r3363, trunk/data/plotinfo/ALICE_2011_S8909580.plot) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2011-07-aida2yoda/data/plotinfo/ALICE_2011_S8909580.plot Thu Oct 6 21:36:24 2011 (r3417, copy of r3363, trunk/data/plotinfo/ALICE_2011_S8909580.plot) @@ -0,0 +1,32 @@ +# BEGIN PLOT /ALICE_2011_S8909580/d0 +XLabel=$p_\perp$ $[\text{GeV}/c]$ +YLabel=$1/N_\text{evt} \, d^{2}N/dy\,dp_\perp$ $[(\text{GeV}/c)^{-1}]$ +# END PLOT + + +# BEGIN PLOT /ALICE_2011_S8909580/d01-x01-y01 +Title=$K^0_s$ transverse momentum, $|y|<0.75$, $\sqrt{s}=0.9\,\text{TeV}$ (INEL) +# END PLOT + +# BEGIN PLOT /ALICE_2011_S8909580/d02-x01-y01 +Title=$\Lambda$ transverse momentum, $|y|<0.75$, $\sqrt{s}=0.9\,\text{TeV}$ (INEL) +# END PLOT + +# BEGIN PLOT /ALICE_2011_S8909580/d03-x01-y01 +Title=$\bar \Lambda$ transverse momentum, $|y|<0.75$, $\sqrt{s}=0.9\,\text{TeV}$ (INEL) +# END PLOT + +# BEGIN PLOT /ALICE_2011_S8909580/d04-x01-y01 +Title=$\Xi$ transverse momentum, $|y|<0.8$, $\sqrt{s}=0.9\,\text{TeV}$ (INEL) +# END PLOT + +# BEGIN PLOT /ALICE_2011_S8909580/d05-x01-y01 +Title=$\phi(1020)$ transverse momentum, $|y|<0.6$, $\sqrt{s}=0.9\,\text{TeV}$ (INEL) +# END PLOT + +# BEGIN PLOT /ALICE_2011_S8909580/d06-x01-y01 +Title=$\Lambda / K^0_s$ ratio, $|y|<0.75$, $\sqrt{s}=0.9\,\text{TeV}$ (INEL) +YLabel=$(\sigma(\Lambda)+\sigma(\bar \Lambda))/2 \sigma(K^0_s)$ +LogY=0 +LegendYPos=0.4 +# END PLOT Modified: branches/2011-07-aida2yoda/data/plotinfo/Makefile.am ============================================================================== --- branches/2011-07-aida2yoda/data/plotinfo/Makefile.am Thu Oct 6 18:31:33 2011 (r3416) +++ branches/2011-07-aida2yoda/data/plotinfo/Makefile.am Thu Oct 6 21:36:24 2011 (r3417) @@ -6,6 +6,7 @@ ALICE_2010_S8624100.plot \ ALICE_2010_S8625980.plot \ ALICE_2010_S8706239.plot \ + ALICE_2011_S8909580.plot \ ALICE_2011_S8945144.plot \ ATLAS_2010_S8591806.plot \ ATLAS_2010_S8817804.plot \ Copied: branches/2011-07-aida2yoda/data/refdata/ALICE_2011_S8909580.aida (from r3363, trunk/data/refdata/ALICE_2011_S8909580.aida) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2011-07-aida2yoda/data/refdata/ALICE_2011_S8909580.aida Thu Oct 6 21:36:24 2011 (r3417, copy of r3363, trunk/data/refdata/ALICE_2011_S8909580.aida) @@ -0,0 +1,213 @@ +<?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/ALICE_2011_S8909580" title="(1/NEV)*S2(N)/DPT/DYRAP IN GEV**-1" > + <dataPoint> + <measurement value="0.25" errorPlus="0.04999999999999999" errorMinus="0.04999999999999999"/> + <measurement value="0.246131" errorPlus="0.030570921412348698" errorMinus="0.030570921412348698"/> + </dataPoint> + <dataPoint> + <measurement value="0.35" errorPlus="0.050000000000000044" errorMinus="0.04999999999999999"/> + <measurement value="0.228095" errorPlus="0.016149505069815606" errorMinus="0.016149505069815606"/> + </dataPoint> + <dataPoint> + <measurement value="0.45" errorPlus="0.04999999999999999" errorMinus="0.04999999999999999"/> + <measurement value="0.232746" errorPlus="0.015249528550089672" errorMinus="0.015249528550089672"/> + </dataPoint> + <dataPoint> + <measurement value="0.55" errorPlus="0.04999999999999993" errorMinus="0.050000000000000044"/> + <measurement value="0.182799" errorPlus="0.010472365396604533" errorMinus="0.010472365396604533"/> + </dataPoint> + <dataPoint> + <measurement value="0.6499999999999999" errorPlus="0.050000000000000044" errorMinus="0.04999999999999993"/> + <measurement value="0.143251" errorPlus="0.006994917083139728" errorMinus="0.006994917083139728"/> + </dataPoint> + <dataPoint> + <measurement value="0.75" errorPlus="0.050000000000000044" errorMinus="0.050000000000000044"/> + <measurement value="0.11425" errorPlus="0.00538272087331305" errorMinus="0.00538272087331305"/> + </dataPoint> + <dataPoint> + <measurement value="0.8500000000000001" errorPlus="0.04999999999999993" errorMinus="0.050000000000000044"/> + <measurement value="0.092947" errorPlus="0.004512415096154164" errorMinus="0.004512415096154164"/> + </dataPoint> + <dataPoint> + <measurement value="0.95" errorPlus="0.050000000000000044" errorMinus="0.04999999999999993"/> + <measurement value="0.073697" errorPlus="0.003596695427750312" errorMinus="0.003596695427750312"/> + </dataPoint> + <dataPoint> + <measurement value="1.05" errorPlus="0.050000000000000044" errorMinus="0.050000000000000044"/> + <measurement value="0.059547" errorPlus="0.0029873617122805865" errorMinus="0.0029873617122805865"/> + </dataPoint> + <dataPoint> + <measurement value="1.15" errorPlus="0.050000000000000044" errorMinus="0.04999999999999982"/> + <measurement value="0.046946" errorPlus="0.0025572708108450304" errorMinus="0.0025572708108450304"/> + </dataPoint> + <dataPoint> + <measurement value="1.25" errorPlus="0.050000000000000044" errorMinus="0.050000000000000044"/> + <measurement value="0.035939" errorPlus="0.001959005870333216" errorMinus="0.001959005870333216"/> + </dataPoint> + <dataPoint> + <measurement value="1.35" errorPlus="0.04999999999999982" errorMinus="0.050000000000000044"/> + <measurement value="0.029313" errorPlus="0.001802059100029741" errorMinus="0.001802059100029741"/> + </dataPoint> + <dataPoint> + <measurement value="1.5" errorPlus="0.10000000000000009" errorMinus="0.10000000000000009"/> + <measurement value="0.021234" errorPlus="0.001104692264841209" errorMinus="0.001104692264841209"/> + </dataPoint> + <dataPoint> + <measurement value="1.8" errorPlus="0.19999999999999996" errorMinus="0.19999999999999996"/> + <measurement value="0.011467" errorPlus="6.37122437212817E-4" errorMinus="6.37122437212817E-4"/> + </dataPoint> + <dataPoint> + <measurement value="2.2" errorPlus="0.19999999999999973" errorMinus="0.20000000000000018"/> + <measurement value="0.005727" errorPlus="3.430174922653362E-4" errorMinus="3.430174922653362E-4"/> + </dataPoint> + <dataPoint> + <measurement value="2.7" errorPlus="0.2999999999999998" errorMinus="0.30000000000000027"/> + <measurement value="0.002043" errorPlus="1.654841382127E-4" errorMinus="1.654841382127E-4"/> + </dataPoint> + </dataPointSet> + <dataPointSet name="d02-x01-y01" dimension="2" path="/REF/ALICE_2011_S8909580" title="(1/NEV)*S2(N)/DPT/DYRAP IN GEV**-1" > + <dataPoint> + <measurement value="0.7" errorPlus="0.10000000000000009" errorMinus="0.09999999999999998"/> + <measurement value="0.043503" errorPlus="0.004314563825000159" errorMinus="0.004314563825000159"/> + </dataPoint> + <dataPoint> + <measurement value="0.9" errorPlus="0.09999999999999998" errorMinus="0.09999999999999998"/> + <measurement value="0.029711" errorPlus="0.002543517249794072" errorMinus="0.002543517249794072"/> + </dataPoint> + <dataPoint> + <measurement value="1.1" errorPlus="0.09999999999999987" errorMinus="0.10000000000000009"/> + <measurement value="0.027528" errorPlus="0.002104130461734728" errorMinus="0.002104130461734728"/> + </dataPoint> + <dataPoint> + <measurement value="1.2999999999999998" errorPlus="0.10000000000000009" errorMinus="0.09999999999999987"/> + <measurement value="0.01824" errorPlus="0.0013797579497868459" errorMinus="0.0013797579497868459"/> + </dataPoint> + <dataPoint> + <measurement value="1.5" errorPlus="0.10000000000000009" errorMinus="0.10000000000000009"/> + <measurement value="0.010263" errorPlus="8.091853928488822E-4" errorMinus="8.091853928488822E-4"/> + </dataPoint> + <dataPoint> + <measurement value="1.8" errorPlus="0.19999999999999996" errorMinus="0.19999999999999996"/> + <measurement value="0.006567" errorPlus="4.506939094329987E-4" errorMinus="4.506939094329987E-4"/> + </dataPoint> + <dataPoint> + <measurement value="2.2" errorPlus="0.19999999999999973" errorMinus="0.20000000000000018"/> + <measurement value="0.002809" errorPlus="2.5492155656201384E-4" errorMinus="2.5492155656201384E-4"/> + </dataPoint> + <dataPoint> + <measurement value="2.7" errorPlus="0.2999999999999998" errorMinus="0.30000000000000027"/> + <measurement value="0.001157" errorPlus="1.4021768789992226E-4" errorMinus="1.4021768789992226E-4"/> + </dataPoint> + <dataPoint> + <measurement value="3.25" errorPlus="0.25" errorMinus="0.25"/> + <measurement value="3.2E-4" errorPlus="6.356099432828282E-5" errorMinus="6.356099432828282E-5"/> + </dataPoint> + </dataPointSet> + <dataPointSet name="d03-x01-y01" dimension="2" path="/REF/ALICE_2011_S8909580" title="(1/NEV)*S2(N)/DPT/DYRAP IN GEV**-1" > + <dataPoint> + <measurement value="0.7" errorPlus="0.10000000000000009" errorMinus="0.09999999999999998"/> + <measurement value="0.041393" errorPlus="0.0045236358164644505" errorMinus="0.0045236358164644505"/> + </dataPoint> + <dataPoint> + <measurement value="0.9" errorPlus="0.09999999999999998" errorMinus="0.09999999999999998"/> + <measurement value="0.032092" errorPlus="0.00307533949345434" errorMinus="0.00307533949345434"/> + </dataPoint> + <dataPoint> + <measurement value="1.1" errorPlus="0.09999999999999987" errorMinus="0.10000000000000009"/> + <measurement value="0.022341" errorPlus="0.0020096616630666964" errorMinus="0.0020096616630666964"/> + </dataPoint> + <dataPoint> + <measurement value="1.2999999999999998" errorPlus="0.10000000000000009" errorMinus="0.09999999999999987"/> + <measurement value="0.014057" errorPlus="0.0012297857536985863" errorMinus="0.0012297857536985863"/> + </dataPoint> + <dataPoint> + <measurement value="1.5" errorPlus="0.10000000000000009" errorMinus="0.10000000000000009"/> + <measurement value="0.011257" errorPlus="9.981232388838566E-4" errorMinus="9.981232388838566E-4"/> + </dataPoint> + <dataPoint> + <measurement value="1.8" errorPlus="0.19999999999999996" errorMinus="0.19999999999999996"/> + <measurement value="0.006042" errorPlus="4.974625614053785E-4" errorMinus="4.974625614053785E-4"/> + </dataPoint> + <dataPoint> + <measurement value="2.2" errorPlus="0.19999999999999973" errorMinus="0.20000000000000018"/> + <measurement value="0.002299" errorPlus="2.7771388153997634E-4" errorMinus="2.7771388153997634E-4"/> + </dataPoint> + <dataPoint> + <measurement value="2.7" errorPlus="0.2999999999999998" errorMinus="0.30000000000000027"/> + <measurement value="9.47E-4" errorPlus="1.2870508925446578E-4" errorMinus="1.2870508925446578E-4"/> + </dataPoint> + <dataPoint> + <measurement value="3.25" errorPlus="0.25" errorMinus="0.25"/> + <measurement value="3.32E-4" errorPlus="6.815423684555495E-5" errorMinus="6.815423684555495E-5"/> + </dataPoint> + </dataPointSet> + <dataPointSet name="d04-x01-y01" dimension="2" path="/REF/ALICE_2011_S8909580" title="(1/NEV)*S2(N)/DPT/DYRAP IN GEV**-1" > + <dataPoint> + <measurement value="1.0" errorPlus="0.3999999999999999" errorMinus="0.4"/> + <measurement value="0.006302" errorPlus="0.0010347429632522273" errorMinus="0.0010347429632522273"/> + </dataPoint> + <dataPoint> + <measurement value="1.7" errorPlus="0.30000000000000004" errorMinus="0.30000000000000004"/> + <measurement value="0.001574" errorPlus="3.1382957158304886E-4" errorMinus="3.1382957158304886E-4"/> + </dataPoint> + <dataPoint> + <measurement value="2.5" errorPlus="0.5" errorMinus="0.5"/> + <measurement value="5.66E-4" errorPlus="1.2310970717209913E-4" errorMinus="1.2310970717209913E-4"/> + </dataPoint> + </dataPointSet> + <dataPointSet name="d05-x01-y01" dimension="2" path="/REF/ALICE_2011_S8909580" title="(1/NEV)*S2(N)/DPT/DYRAP IN GEV**-1" > + <dataPoint> + <measurement value="0.85" errorPlus="0.15000000000000002" errorMinus="0.15000000000000002"/> + <measurement value="0.013661" errorPlus="0.001786188399917545" errorMinus="0.001786188399917545"/> + </dataPoint> + <dataPoint> + <measurement value="1.25" errorPlus="0.25" errorMinus="0.25"/> + <measurement value="0.006755" errorPlus="8.881717176312247E-4" errorMinus="8.881717176312247E-4"/> + </dataPoint> + <dataPoint> + <measurement value="1.75" errorPlus="0.25" errorMinus="0.25"/> + <measurement value="0.003642" errorPlus="8.472095372456568E-4" errorMinus="8.472095372456568E-4"/> + </dataPoint> + <dataPoint> + <measurement value="2.5" errorPlus="0.5" errorMinus="0.5"/> + <measurement value="0.001066" errorPlus="2.9602195864496266E-4" errorMinus="2.9602195864496266E-4"/> + </dataPoint> + </dataPointSet> + <dataPointSet name="d06-x01-y01" dimension="2" path="/REF/ALICE_2011_S8909580" title="SIG(Q=LAMBDA+LAMBDABAR)/2*SIG(Q=K0S)" > + <dataPoint> + <measurement value="0.7" errorPlus="0.10000000000000009" errorMinus="0.09999999999999998"/> + <measurement value="0.3297" errorPlus="0.029" errorMinus="0.029"/> + </dataPoint> + <dataPoint> + <measurement value="0.9" errorPlus="0.09999999999999998" errorMinus="0.09999999999999998"/> + <measurement value="0.3709" errorPlus="0.0299" errorMinus="0.0299"/> + </dataPoint> + <dataPoint> + <measurement value="1.1" errorPlus="0.09999999999999987" errorMinus="0.10000000000000009"/> + <measurement value="0.4683" errorPlus="0.0366" errorMinus="0.0366"/> + </dataPoint> + <dataPoint> + <measurement value="1.2999999999999998" errorPlus="0.10000000000000009" errorMinus="0.09999999999999987"/> + <measurement value="0.495" errorPlus="0.0402" errorMinus="0.0402"/> + </dataPoint> + <dataPoint> + <measurement value="1.5" errorPlus="0.10000000000000009" errorMinus="0.10000000000000009"/> + <measurement value="0.5068" errorPlus="0.0402" errorMinus="0.0402"/> + </dataPoint> + <dataPoint> + <measurement value="1.8" errorPlus="0.19999999999999996" errorMinus="0.19999999999999996"/> + <measurement value="0.5498" errorPlus="0.0423" errorMinus="0.0423"/> + </dataPoint> + <dataPoint> + <measurement value="2.2" errorPlus="0.19999999999999973" errorMinus="0.20000000000000018"/> + <measurement value="0.446" errorPlus="0.0423" errorMinus="0.0423"/> + </dataPoint> + <dataPoint> + <measurement value="2.7" errorPlus="0.2999999999999998" errorMinus="0.30000000000000027"/> + <measurement value="0.5149" errorPlus="0.0625" errorMinus="0.0625"/> + </dataPoint> + </dataPointSet> +</aida> Modified: branches/2011-07-aida2yoda/data/refdata/Makefile.am ============================================================================== --- branches/2011-07-aida2yoda/data/refdata/Makefile.am Thu Oct 6 18:31:33 2011 (r3416) +++ branches/2011-07-aida2yoda/data/refdata/Makefile.am Thu Oct 6 21:36:24 2011 (r3417) @@ -10,6 +10,7 @@ ALICE_2010_S8624100.aida \ ALICE_2010_S8625980.aida \ ALICE_2010_S8706239.aida \ + ALICE_2011_S8909580.aida \ ALICE_2011_S8945144.aida \ ATLAS_2010_S8591806.aida \ ATLAS_2010_S8817804.aida \ Copied and modified: branches/2011-07-aida2yoda/src/Analyses/ALICE_2011_S8909580.cc (from r3363, trunk/src/Analyses/ALICE_2011_S8909580.cc) ============================================================================== --- trunk/src/Analyses/ALICE_2011_S8909580.cc Sat Sep 17 12:56:43 2011 (r3363, copy source) +++ branches/2011-07-aida2yoda/src/Analyses/ALICE_2011_S8909580.cc Thu Oct 6 21:36:24 2011 (r3417) @@ -1,5 +1,5 @@ #include "Rivet/Analysis.hh" -#include "Rivet/RivetAIDA.hh" +#include "Rivet/RivetYODA.hh" #include "Rivet/Tools/Logging.hh" #include "Rivet/Projections/FinalState.hh" #include "Rivet/Projections/UnstableFinalState.hh" @@ -20,13 +20,13 @@ const UnstableFinalState ufs(-15, 15); addProjection(ufs, "UFS"); - _histPtK0s = bookHistogram1D("d01-x01-y01"); - _histPtLambda = bookHistogram1D("d02-x01-y01"); - _histPtAntiLambda = bookHistogram1D("d03-x01-y01"); - _histPtXi = bookHistogram1D("d04-x01-y01"); - _histPtPhi = bookHistogram1D("d05-x01-y01"); - _temp_h_Lambdas = bookHistogram1D("temp_h_Lambdas", binEdges("d06-x01-y01")); - _temp_h_Kzeros = bookHistogram1D("temp_h_Kzeros", binEdges("d06-x01-y01")); + _histPtK0s = bookHisto1D("d01-x01-y01"); + _histPtLambda = bookHisto1D("d02-x01-y01"); + _histPtAntiLambda = bookHisto1D("d03-x01-y01"); + _histPtXi = bookHisto1D("d04-x01-y01"); + _histPtPhi = bookHisto1D("d05-x01-y01"); + _temp_h_Lambdas = bookHisto1D(6, 1, 1, "temp_h_Lambdas"); + _temp_h_Kzeros = bookHisto1D(6, 1, 1, "temp_h_Kzeros"); } void analyze(const Event& event) { @@ -84,21 +84,22 @@ scale(_histPtXi, 1./(1.6*sumOfWeights())); scale(_histPtPhi, 1./(1.2*sumOfWeights())); - histogramFactory().divide(histoPath("d06-x01-y01"), *_temp_h_Lambdas, *_temp_h_Kzeros); - histogramFactory().destroy(_temp_h_Lambdas); - histogramFactory().destroy(_temp_h_Kzeros); + // \todo YODA divide + //histogramFactory().divide(histoPath("d06-x01-y01"), *_temp_h_Lambdas, *_temp_h_Kzeros); + //histogramFactory().destroy(_temp_h_Lambdas); + //histogramFactory().destroy(_temp_h_Kzeros); } private: - AIDA::IHistogram1D *_histPtK0s; - AIDA::IHistogram1D *_histPtLambda; - AIDA::IHistogram1D *_histPtAntiLambda; - AIDA::IHistogram1D *_histPtXi; - AIDA::IHistogram1D *_histPtPhi; - AIDA::IHistogram1D *_temp_h_Lambdas; - AIDA::IHistogram1D *_temp_h_Kzeros; + Histo1DPtr _histPtK0s; + Histo1DPtr _histPtLambda; + Histo1DPtr _histPtAntiLambda; + Histo1DPtr _histPtXi; + Histo1DPtr _histPtPhi; + Histo1DPtr _temp_h_Lambdas; + Histo1DPtr _temp_h_Kzeros; }; Modified: branches/2011-07-aida2yoda/src/Analyses/ALICE_2011_S8945144.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ALICE_2011_S8945144.cc Thu Oct 6 18:31:33 2011 (r3416) +++ branches/2011-07-aida2yoda/src/Analyses/ALICE_2011_S8945144.cc Thu Oct 6 21:36:24 2011 (r3417) @@ -45,12 +45,22 @@ _histAveragePt->fill(p.mass()/GeV, p.momentum().pT()/GeV, weight); break; case 2212: - _histPtProtons->fill(p.momentum().pT()/GeV, weight); - _histAveragePt->fill(p.mass()/GeV, p.momentum().pT()/GeV, weight); + if ( !(p.hasAncestor(3322) || // Xi0 + p.hasAncestor(3122) || p.hasAncestor(-3122) || // Lambda + p.hasAncestor(3222) || p.hasAncestor(-3222) || // Sigma+/- + p.hasAncestor(3312) || p.hasAncestor(-3312) ) ) { // Xi-/+ + _histPtProtons->fill(p.momentum().pT()/GeV, weight); + _histAveragePt->fill(p.mass()/GeV, p.momentum().pT()/GeV, weight); + } break; case -2212: - _histPtAntiProtons->fill(p.momentum().pT()/GeV, weight); - _histAveragePt->fill(p.mass()/GeV, p.momentum().pT()/GeV, weight); + if ( !(p.hasAncestor(3322) || // Xi0 + p.hasAncestor(3122) || p.hasAncestor(-3122) || // Lambda + p.hasAncestor(3222) || p.hasAncestor(-3222) || // Sigma+/- + p.hasAncestor(3312) || p.hasAncestor(-3312) ) ) { // Xi-/+ + _histPtAntiProtons->fill(p.momentum().pT()/GeV, weight); + _histAveragePt->fill(p.mass()/GeV, p.momentum().pT()/GeV, weight); + } break; case 321: _histPtKaons->fill(p.momentum().pT()/GeV, weight); Modified: branches/2011-07-aida2yoda/src/Analyses/Makefile.am ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/Makefile.am Thu Oct 6 18:31:33 2011 (r3416) +++ branches/2011-07-aida2yoda/src/Analyses/Makefile.am Thu Oct 6 21:36:24 2011 (r3417) @@ -39,6 +39,7 @@ ALICE_2010_S8624100.cc \ ALICE_2010_S8625980.cc \ ALICE_2010_S8706239.cc \ + ALICE_2011_S8909580.cc \ ALICE_2011_S8945144.cc
More information about the Rivet-svn mailing list |