|
[Rivet-svn] r4149 - in trunk: . data/anainfo data/plotinfo data/refdata src/Analysesblackhole at projects.hepforge.org blackhole at projects.hepforge.orgThu Feb 14 13:13:43 GMT 2013
Author: hoeth Date: Thu Feb 14 13:13:41 2013 New Revision: 4149 Log: merge c4064 from branches/2012-06-aidarivet Added: trunk/data/anainfo/ALICE_2012_I1181770.info - copied unchanged from r4064, branches/2012-06-aidarivet/data/anainfo/ALICE_2012_I1181770.info trunk/data/plotinfo/ALICE_2012_I1181770.plot - copied unchanged from r4064, branches/2012-06-aidarivet/data/plotinfo/ALICE_2012_I1181770.plot trunk/data/refdata/ALICE_2012_I1181770.aida - copied unchanged from r4064, branches/2012-06-aidarivet/data/refdata/ALICE_2012_I1181770.aida trunk/src/Analyses/ALICE_2012_I1181770.cc - copied, changed from r4064, branches/2012-06-aidarivet/src/Analyses/ALICE_2012_I1181770.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 Thu Feb 14 13:06:51 2013 (r4148) +++ trunk/ChangeLog Thu Feb 14 13:13:41 2013 (r4149) @@ -20,6 +20,10 @@ * Fix TeX variable in the rivetenv scripts, especially for csh +2012-12-07 Hendrik Hoeth <hendrik.hoeth at cern.ch> + + * Added ALICE_2012_I1181770 analysis + 2012-12-06 Hendrik Hoeth <hendrik.hoeth at cern.ch> * Added ATLAS_2012_I1188891 analysis Copied: trunk/data/anainfo/ALICE_2012_I1181770.info (from r4064, branches/2012-06-aidarivet/data/anainfo/ALICE_2012_I1181770.info) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/data/anainfo/ALICE_2012_I1181770.info Thu Feb 14 13:13:41 2013 (r4149, copy of r4064, branches/2012-06-aidarivet/data/anainfo/ALICE_2012_I1181770.info) @@ -0,0 +1,39 @@ +Name: ALICE_2012_I1181770 +Year: 2012 +Summary: Measurement of inelastic, single- and double-diffraction cross sections in proton--proton collisions at the LHC with ALICE +Experiment: ALICE +Collider: LHC +SpireID: 9732586 +InspireID: 1181770 +Status: VALIDATED +Authors: + - Martin Poghosyan <Martin.Poghosyan at cern.ch> + - Sercan Sen <Sercan.Sen at cern.ch> + - Burak Bilki <bbilki at gmail.com> +References: + - arXiv:1208.4968 [hep-ex] +RunInfo: + Inelastic events (non-diffractive and inelastic diffractive). +NumEvents: 100K +Beams: [p+, p+] +Energies: [900, 2760, 7000] +Description: + 'Measurements of cross sections of inelastic and diffractive processes in proton-proton collisions at $\sqrt{s}$=900, 2760 and 7000 GeV. + The fractions of diffractive processes in inelastic collisions were determined from a study of gaps in charged particle pseudorapidity distributions. + Single-diffractive events are selected with $M_{X} < 200$ GeV $/c^{2}$ and double-diffractive events defined as NSD events with $\Delta\eta >3$. + To measure the inelastic cross section, beam properties were determined with van der Meer scans using a simulation of diffraction adjusted to data.' +BibKey: :2012sja +BibTeX: '@article{:2012sja, + author = "Abelev, Betty and others", + title = "{Measurement of inelastic, single- and double-diffraction + cross sections in proton--proton collisions at the LHC + with ALICE}", + collaboration = "ALICE Collaboration", + journal = "Eur. Phys. J. C", + year = "2012", + eprint = "1208.4968", + archivePrefix = "arXiv", + primaryClass = "hep-ex", + reportNumber = "CERN-PH-EP-2012-138", + SLACcitation = "%%CITATION = ARXIV:1208.4968;%%", +}' Modified: trunk/data/anainfo/Makefile.am ============================================================================== --- trunk/data/anainfo/Makefile.am Thu Feb 14 13:06:51 2013 (r4148) +++ trunk/data/anainfo/Makefile.am Thu Feb 14 13:13:41 2013 (r4149) @@ -11,6 +11,7 @@ ALICE_2010_S8706239.info \ ALICE_2011_S8909580.info \ ALICE_2011_S8945144.info \ + ALICE_2012_I1181770.info \ ARGUS_1993_S2653028.info \ ARGUS_1993_S2669951.info \ ARGUS_1993_S2789213.info \ Copied: trunk/data/plotinfo/ALICE_2012_I1181770.plot (from r4064, branches/2012-06-aidarivet/data/plotinfo/ALICE_2012_I1181770.plot) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/data/plotinfo/ALICE_2012_I1181770.plot Thu Feb 14 13:13:41 2013 (r4149, copy of r4064, branches/2012-06-aidarivet/data/plotinfo/ALICE_2012_I1181770.plot) @@ -0,0 +1,28 @@ +# BEGIN PLOT /ALICE_2012_I1181770/d +XLabel=$\sqrt{s}$ [GeV] +# END PLOT + +# BEGIN PLOT /ALICE_2012_I1181770/d01-x01-y0 +Title=Production ratios of SD with $M_{X} < 200$ GeV$/c^{2}$ to INEL +YLabel=$\sigma_\text{SD} / \sigma_\text{inel}$ +# END PLOT + +# BEGIN PLOT /ALICE_2012_I1181770/d02-x01-y0 +Title=Production ratios of DD with $\Delta\eta >3$ to INEL +YLabel=$\sigma_\text{DD} / \sigma_\text{inel}$ +# END PLOT + +# BEGIN PLOT /ALICE_2012_I1181770/d03-x01-y0 +Title=Single diffraction cross-section for $M_{X} < 200$ GeV$/c^{2}$ +YLabel=$\sigma_\text{SD}$ [mb] +# END PLOT + +# BEGIN PLOT /ALICE_2012_I1181770/d04-x01-y0 +Title=Double diffraction cross-section for $\Delta\eta >3$ +YLabel=$\sigma_\text{DD}$ [mb] +# END PLOT + +# BEGIN PLOT /ALICE_2012_I1181770/d05-x01-y0 +Title=Inleastic cross-section +YLabel=$\sigma_\text{inel}$ [mb] +# END PLOT Modified: trunk/data/plotinfo/Makefile.am ============================================================================== --- trunk/data/plotinfo/Makefile.am Thu Feb 14 13:06:51 2013 (r4148) +++ trunk/data/plotinfo/Makefile.am Thu Feb 14 13:13:41 2013 (r4149) @@ -11,6 +11,7 @@ ALICE_2010_S8706239.plot \ ALICE_2011_S8909580.plot \ ALICE_2011_S8945144.plot \ + ALICE_2012_I1181770.plot \ ARGUS_1993_S2653028.plot \ ARGUS_1993_S2669951.plot \ ARGUS_1993_S2789213.plot \ Copied: trunk/data/refdata/ALICE_2012_I1181770.aida (from r4064, branches/2012-06-aidarivet/data/refdata/ALICE_2012_I1181770.aida) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/data/refdata/ALICE_2012_I1181770.aida Thu Feb 14 13:13:41 2013 (r4149, copy of r4064, branches/2012-06-aidarivet/data/refdata/ALICE_2012_I1181770.aida) @@ -0,0 +1,140 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd"> +<aida version="3.3"> + <implementation version="1.0" package="LWH"/> + <dataPointSet name="d01-x01-y01" + title="" path="/REF/ALICE_2012_I1181770" dimension="2"> + <dimension dim="0" title="" /> + <dimension dim="1" title="" /> + <dataPoint> + <measurement value="900.0" errorPlus="0.5" errorMinus="0.5"/> + <measurement value="0.21" errorPlus="0.03" errorMinus="0.03"/> + </dataPoint> + </dataPointSet> + <dataPointSet name="d01-x01-y02" + title="" path="/REF/ALICE_2012_I1181770" dimension="2"> + <dimension dim="0" title="" /> + <dimension dim="1" title="" /> + <dataPoint> + <measurement value="2760.0" errorPlus="0.5" errorMinus="0.5"/> + <measurement value="0.20" errorPlus="0.07" errorMinus="0.08"/> + </dataPoint> + </dataPointSet> + <dataPointSet name="d01-x01-y03" + title="" path="/REF/ALICE_2012_I1181770" dimension="2"> + <dimension dim="0" title="" /> + <dimension dim="1" title="" /> + <dataPoint> + <measurement value="7000.0" errorPlus="0.5" errorMinus="0.5"/> + <measurement value="0.20" errorPlus="0.04" errorMinus="0.07"/> + </dataPoint> + </dataPointSet> + <dataPointSet name="d02-x01-y01" + title="" path="/REF/ALICE_2012_I1181770" dimension="2"> + <dimension dim="0" title="" /> + <dimension dim="1" title="" /> + <dataPoint> + <measurement value="900.0" errorPlus="0.5" errorMinus="0.5"/> + <measurement value="0.11" errorPlus="0.03" errorMinus="0.03"/> + </dataPoint> + </dataPointSet> + <dataPointSet name="d02-x01-y02" + title="" path="/REF/ALICE_2012_I1181770" dimension="2"> + <dimension dim="0" title="" /> + <dimension dim="1" title="" /> + <dataPoint> + <measurement value="2760.0" errorPlus="0.5" errorMinus="0.5"/> + <measurement value="0.12" errorPlus="0.05" errorMinus="0.05"/> + </dataPoint> + </dataPointSet> + <dataPointSet name="d02-x01-y03" + title="" path="/REF/ALICE_2012_I1181770" dimension="2"> + <dimension dim="0" title="" /> + <dimension dim="1" title="" /> + <dataPoint> + <measurement value="7000.0" errorPlus="0.5" errorMinus="0.5"/> + <measurement value="0.12" errorPlus="0.05" errorMinus="0.04"/> + </dataPoint> + </dataPointSet> + <dataPointSet name="d03-x01-y01" + title="" path="/REF/ALICE_2012_I1181770" dimension="2"> + <dimension dim="0" title="" /> + <dimension dim="1" title="" /> + <dataPoint> + <measurement value="900.0" errorPlus="0.5" errorMinus="0.5"/> + <measurement value="11.2" errorPlus="1.6" errorMinus="2.1"/> + </dataPoint> + </dataPointSet> + <dataPointSet name="d03-x01-y02" + title="" path="/REF/ALICE_2012_I1181770" dimension="2"> + <dimension dim="0" title="" /> + <dimension dim="1" title="" /> + <dataPoint> + <measurement value="2760.0" errorPlus="0.5" errorMinus="0.5"/> + <measurement value="12.2" errorPlus="3.9" errorMinus="5.3"/> + </dataPoint> + </dataPointSet> + <dataPointSet name="d03-x01-y03" + title="" path="/REF/ALICE_2012_I1181770" dimension="2"> + <dimension dim="0" title="" /> + <dimension dim="1" title="" /> + <dataPoint> + <measurement value="7000.0" errorPlus="0.5" errorMinus="0.5"/> + <measurement value="14.9" errorPlus="3.4" errorMinus="5.9"/> + </dataPoint> + </dataPointSet> + <dataPointSet name="d04-x01-y01" + title="" path="/REF/ALICE_2012_I1181770" dimension="2"> + <dimension dim="0" title="" /> + <dimension dim="1" title="" /> + <dataPoint> + <measurement value="900.0" errorPlus="0.5" errorMinus="0.5"/> + <measurement value="5.6" errorPlus="2.0" errorMinus="2.0"/> + </dataPoint> + </dataPointSet> + <dataPointSet name="d04-x01-y02" + title="" path="/REF/ALICE_2012_I1181770" dimension="2"> + <dimension dim="0" title="" /> + <dimension dim="1" title="" /> + <dataPoint> + <measurement value="2760.0" errorPlus="0.5" errorMinus="0.5"/> + <measurement value="7.8" errorPlus="3.2" errorMinus="3.2"/> + </dataPoint> + </dataPointSet> + <dataPointSet name="d04-x01-y03" + title="" path="/REF/ALICE_2012_I1181770" dimension="2"> + <dimension dim="0" title="" /> + <dimension dim="1" title="" /> + <dataPoint> + <measurement value="7000.0" errorPlus="0.5" errorMinus="0.5"/> + <measurement value="9.0" errorPlus="2.6" errorMinus="2.6"/> + </dataPoint> + </dataPointSet> + <dataPointSet name="d05-x01-y01" + title="" path="/REF/ALICE_2012_I1181770" dimension="2"> + <dimension dim="0" title="" /> + <dimension dim="1" title="" /> + <dataPoint> + <measurement value="900.0" errorPlus="0.5" errorMinus="0.5"/> + <measurement value="52.5" errorPlus="2.0" errorMinus="3.3"/> + </dataPoint> + </dataPointSet> + <dataPointSet name="d05-x01-y02" + title="" path="/REF/ALICE_2012_I1181770" dimension="2"> + <dimension dim="0" title="" /> + <dimension dim="1" title="" /> + <dataPoint> + <measurement value="2760.0" errorPlus="0.5" errorMinus="0.5"/> + <measurement value="62.8" errorPlus="2.6832815729997477" errorMinus="4.17612260356422"/> + </dataPoint> + </dataPointSet> + <dataPointSet name="d05-x01-y03" + title="" path="/REF/ALICE_2012_I1181770" dimension="2"> + <dimension dim="0" title="" /> + <dimension dim="1" title="" /> + <dataPoint> + <measurement value="7000.0" errorPlus="0.5" errorMinus="0.5"/> + <measurement value="73.2" errorPlus="3.2802438933713454" errorMinus="5.2839379254491625"/> + </dataPoint> + </dataPointSet> +</aida> Modified: trunk/data/refdata/Makefile.am ============================================================================== --- trunk/data/refdata/Makefile.am Thu Feb 14 13:06:51 2013 (r4148) +++ trunk/data/refdata/Makefile.am Thu Feb 14 13:13:41 2013 (r4149) @@ -19,6 +19,7 @@ ALICE_2010_S8706239.aida \ ALICE_2011_S8909580.aida \ ALICE_2011_S8945144.aida \ + ALICE_2012_I1181770.aida \ ARGUS_1993_S2653028.aida \ ARGUS_1993_S2669951.aida \ ARGUS_1993_S2789213.aida \ Copied and modified: trunk/src/Analyses/ALICE_2012_I1181770.cc (from r4064, branches/2012-06-aidarivet/src/Analyses/ALICE_2012_I1181770.cc) ============================================================================== --- branches/2012-06-aidarivet/src/Analyses/ALICE_2012_I1181770.cc Fri Dec 7 09:13:54 2012 (r4064, copy source) +++ trunk/src/Analyses/ALICE_2012_I1181770.cc Thu Feb 14 13:13:41 2013 (r4149) @@ -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/ChargedFinalState.hh" @@ -19,17 +19,23 @@ addProjection(ChargedFinalState(),"CFS"); if (fuzzyEquals(sqrtS()/GeV, 900, 1E-3)) { - _h_xsec_sd = bookHistogram1D(3, 1, 1); - _h_xsec_dd = bookHistogram1D(4, 1, 1); - _h_xsec_inel = bookHistogram1D(5, 1, 1); + _h_frac_sd_inel = bookScatter2D(1, 1, 1); + _h_frac_dd_inel = bookScatter2D(2, 1, 1); + _h_xsec_sd = bookHisto1D (3, 1, 1); + _h_xsec_dd = bookHisto1D (4, 1, 1); + _h_xsec_inel = bookHisto1D (5, 1, 1); } else if (fuzzyEquals(sqrtS()/GeV, 2760, 1E-3)) { - _h_xsec_sd = bookHistogram1D(3, 1, 2); - _h_xsec_dd = bookHistogram1D(4, 1, 2); - _h_xsec_inel = bookHistogram1D(5, 1, 2); + _h_frac_sd_inel = bookScatter2D(1, 1, 2); + _h_frac_dd_inel = bookScatter2D(2, 1, 2); + _h_xsec_sd = bookHisto1D (3, 1, 2); + _h_xsec_dd = bookHisto1D (4, 1, 2); + _h_xsec_inel = bookHisto1D (5, 1, 2); } else if (fuzzyEquals(sqrtS()/GeV, 7000, 1E-3)) { - _h_xsec_sd = bookHistogram1D(3, 1, 3); - _h_xsec_dd = bookHistogram1D(4, 1, 3); - _h_xsec_inel = bookHistogram1D(5, 1, 3); + _h_frac_sd_inel = bookScatter2D(1, 1, 3); + _h_frac_dd_inel = bookScatter2D(2, 1, 3); + _h_xsec_sd = bookHisto1D (3, 1, 3); + _h_xsec_dd = bookHisto1D (4, 1, 3); + _h_xsec_inel = bookHisto1D (5, 1, 3); } } @@ -149,18 +155,8 @@ void finalize() { // get the ratio plots: SD/inel, DD/inel - const string dir = histoDir(); - - if (fuzzyEquals(sqrtS()/GeV, 900, 1E-3)) { - histogramFactory().divide( dir + "/d01-x01-y01", *_h_xsec_sd , *_h_xsec_inel ); - histogramFactory().divide( dir + "/d02-x01-y01", *_h_xsec_dd , *_h_xsec_inel ); - } else if (fuzzyEquals(sqrtS()/GeV, 2760, 1E-3)) { - histogramFactory().divide( dir + "/d01-x01-y02", *_h_xsec_sd , *_h_xsec_inel ); - histogramFactory().divide( dir + "/d02-x01-y02", *_h_xsec_dd , *_h_xsec_inel ); - } else if (fuzzyEquals(sqrtS()/GeV, 7000, 1E-3)) { - histogramFactory().divide( dir + "/d01-x01-y03", *_h_xsec_sd , *_h_xsec_inel ); - histogramFactory().divide( dir + "/d02-x01-y03", *_h_xsec_dd , *_h_xsec_inel ); - } + divide(_h_xsec_sd , _h_xsec_inel, _h_frac_sd_inel); + divide(_h_xsec_sd , _h_xsec_inel, _h_frac_dd_inel); scale(_h_xsec_sd, crossSection()/millibarn/sumOfWeights()); scale(_h_xsec_dd, crossSection()/millibarn/sumOfWeights()); @@ -170,9 +166,11 @@ private: - AIDA::IHistogram1D *_h_xsec_sd; - AIDA::IHistogram1D *_h_xsec_dd; - AIDA::IHistogram1D *_h_xsec_inel; + Scatter2DPtr _h_frac_sd_inel; + Scatter2DPtr _h_frac_dd_inel; + Histo1DPtr _h_xsec_sd; + Histo1DPtr _h_xsec_dd; + Histo1DPtr _h_xsec_inel; }; Modified: trunk/src/Analyses/Makefile.am ============================================================================== --- trunk/src/Analyses/Makefile.am Thu Feb 14 13:06:51 2013 (r4148) +++ trunk/src/Analyses/Makefile.am Thu Feb 14 13:13:41 2013 (r4149) @@ -41,7 +41,8 @@ ALICE_2010_S8625980.cc \ ALICE_2010_S8706239.cc \ ALICE_2011_S8909580.cc \ - ALICE_2011_S8945144.cc + ALICE_2011_S8945144.cc \ + ALICE_2012_I1181770.cc lib_LTLIBRARIES += RivetATLASAnalyses.la
More information about the Rivet-svn mailing list |