|
[Rivet-svn] r3703 - in trunk: . data/anainfo data/plotinfo data/refdata src/Analysesblackhole at projects.hepforge.org blackhole at projects.hepforge.orgTue Apr 24 14:00:19 BST 2012
Author: hoeth Date: Tue Apr 24 14:00:18 2012 New Revision: 3703 Log: Added new TOTEM dN/deta analysis. Numbers are from the table in their preprint. Added: trunk/data/anainfo/TOTEM_2012_DNDETA.info trunk/data/plotinfo/TOTEM_2012_DNDETA.plot trunk/data/refdata/TOTEM_2012_DNDETA.aida trunk/data/refdata/TOTEM_2012_DNDETA.dat trunk/src/Analyses/TOTEM_2012_DNDETA.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 Apr 23 16:41:42 2012 (r3702) +++ trunk/ChangeLog Tue Apr 24 14:00:18 2012 (r3703) @@ -1,3 +1,9 @@ +2012-04-24 Hendrik Hoeth <hendrik.hoeth at cern.ch> + + * fixed a few bugs in rivet-rmgaps + + * Added new TOTEM dN/deta analysis + 2012-03-19 Andy Buckley <andy.buckley at cern.ch> * Version 1.8.0! @@ -35,10 +41,14 @@ * Make ATLAS_2012_I1084540 less verbose, and general code cleanup of that analysis. + * New-style plugin hook in ATLAS_2011_I926145, ATLAS_2011_I944826 and ATLAS_2012_I1084540 + * Fix compiler warnings in ATLAS_2011_I944826 and CMS_2011_S8973270 + * CMS_2011_S8941262: Weights are double, not int. + * disable inRange() tests in test/testMath.cc until we have a proper fix for the compiler warnings we see on SL5. Modified: trunk/data/anainfo/Makefile.am ============================================================================== --- trunk/data/anainfo/Makefile.am Mon Apr 23 16:41:42 2012 (r3702) +++ trunk/data/anainfo/Makefile.am Tue Apr 24 14:00:18 2012 (r3703) @@ -188,6 +188,7 @@ STAR_2008_S7993412.info \ STAR_2009_UE_HELEN.info \ TASSO_1990_S2148048.info \ + TOTEM_2012_DNDETA.info \ ZEUS_2001_S4815815.info \ UA1_1990_S2044935.info \ UA5_1982_S875503.info \ Added: trunk/data/anainfo/TOTEM_2012_DNDETA.info ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/data/anainfo/TOTEM_2012_DNDETA.info Tue Apr 24 14:00:18 2012 (r3703) @@ -0,0 +1,26 @@ +Name: TOTEM_2012_DNDETA +Year: 2012 +Summary: Forward dN/deta at 7 TeV +Experiment: TOTEM +Collider: LHC +#InspireID: +Status: VALIDATED +Authors: + - Hendrik Hoeth <hendrik.hoeth at cern.ch> +References: + - CERN-PH-EP-2012-106 + - TOTEM 2012-01 +RunInfo: + pp QCD interactions at 900 GeV and 7 TeV. +NumEvents: 1000000 +NeedCrossSection: no +Beams: [p+, p+] +Energies: [7000] +PtCuts: [0] +Description: + 'The TOTEM experiment has measured the charged particle pseudorapidity + density $dN_\text{ch}/d\eta$ in pp collisions at $\sqrt{s} = 7$\,TeV + for $5.3 < |\eta| < 6.4$ in events with at least one charged particle + with transverse momentum above 40 MeV/c in this pseudorapidity range.' +BibKey: +BibTeX: '' Modified: trunk/data/plotinfo/Makefile.am ============================================================================== --- trunk/data/plotinfo/Makefile.am Mon Apr 23 16:41:42 2012 (r3702) +++ trunk/data/plotinfo/Makefile.am Tue Apr 24 14:00:18 2012 (r3703) @@ -185,6 +185,7 @@ STAR_2008_S7993412.plot \ STAR_2009_UE_HELEN.plot \ TASSO_1990_S2148048.plot \ + TOTEM_2012_DNDETA.plot \ ZEUS_2001_S4815815.plot \ UA1_1990_S2044935.plot \ UA5_1982_S875503.plot \ Added: trunk/data/plotinfo/TOTEM_2012_DNDETA.plot ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/data/plotinfo/TOTEM_2012_DNDETA.plot Tue Apr 24 14:00:18 2012 (r3703) @@ -0,0 +1,6 @@ +# BEGIN PLOT /TOTEM_2012_DNDETA/d01-x01-y01 +Title=Charged particle $|\eta|$ at 7\,TeV, track $p_\perp>40$\,MeV, for $N_\text{ch}\ge1$ +XLabel=$|\eta|$ +YLabel=$dN/d\eta$ +LogY=0 +# END PLOT Modified: trunk/data/refdata/Makefile.am ============================================================================== --- trunk/data/refdata/Makefile.am Mon Apr 23 16:41:42 2012 (r3702) +++ trunk/data/refdata/Makefile.am Tue Apr 24 14:00:18 2012 (r3703) @@ -171,5 +171,6 @@ SLD_2002_S4869273.aida \ SLD_2004_S5693039.aida \ STAR_2008_S7869363.aida \ + TOTEM_2012_DNDETA.aida \ PDG_HADRON_MULTIPLICITIES.aida \ PDG_HADRON_MULTIPLICITIES_RATIOS.aida Added: trunk/data/refdata/TOTEM_2012_DNDETA.aida ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/data/refdata/TOTEM_2012_DNDETA.aida Tue Apr 24 14:00:18 2012 (r3703) @@ -0,0 +1,84 @@ +<?xml version="1.0" ?> +<!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd"> +<aida version="3.3"> + <implementation version="1.1" package="Rivet"/> + <dataPointSet name="d01-x01-y01" dimension="2" + path="/REF/TOTEM_2012_DNDETA" title=""> + <annotation> + <item key="Title" value="" sticky="true"/> + <item key="AidaPath" value="/REF/TOTEM_2012_DNDETA/d01-x01-y01" sticky="true"/> + </annotation> + <dataPoint> + <measurement value="5.375000e+00" errorPlus="2.500000e-02" errorMinus="2.500000e-02"/> + <measurement value="3.840000e+00" errorPlus="3.700000e-01" errorMinus="3.700000e-01"/> + </dataPoint> + <dataPoint> + <measurement value="5.425000e+00" errorPlus="2.500000e-02" errorMinus="2.500000e-02"/> + <measurement value="3.640000e+00" errorPlus="3.800000e-01" errorMinus="3.800000e-01"/> + </dataPoint> + <dataPoint> + <measurement value="5.625000e+00" errorPlus="2.500000e-02" errorMinus="2.500000e-02"/> + <measurement value="3.540000e+00" errorPlus="3.300000e-01" errorMinus="3.300000e-01"/> + </dataPoint> + <dataPoint> + <measurement value="5.675000e+00" errorPlus="2.500000e-02" errorMinus="2.500000e-02"/> + <measurement value="3.500000e+00" errorPlus="3.200000e-01" errorMinus="3.200000e-01"/> + </dataPoint> + <dataPoint> + <measurement value="5.725000e+00" errorPlus="2.500000e-02" errorMinus="2.500000e-02"/> + <measurement value="3.400000e+00" errorPlus="3.000000e-01" errorMinus="3.000000e-01"/> + </dataPoint> + <dataPoint> + <measurement value="5.775000e+00" errorPlus="2.500000e-02" errorMinus="2.500000e-02"/> + <measurement value="3.420000e+00" errorPlus="3.100000e-01" errorMinus="3.100000e-01"/> + </dataPoint> + <dataPoint> + <measurement value="5.825000e+00" errorPlus="2.500000e-02" errorMinus="2.500000e-02"/> + <measurement value="3.320000e+00" errorPlus="2.900000e-01" errorMinus="2.900000e-01"/> + </dataPoint> + <dataPoint> + <measurement value="5.875000e+00" errorPlus="2.500000e-02" errorMinus="2.500000e-02"/> + <measurement value="3.270000e+00" errorPlus="2.900000e-01" errorMinus="2.900000e-01"/> + </dataPoint> + <dataPoint> + <measurement value="5.925000e+00" errorPlus="2.500000e-02" errorMinus="2.500000e-02"/> + <measurement value="3.200000e+00" errorPlus="2.800000e-01" errorMinus="2.800000e-01"/> + </dataPoint> + <dataPoint> + <measurement value="5.975000e+00" errorPlus="2.500000e-02" errorMinus="2.500000e-02"/> + <measurement value="3.070000e+00" errorPlus="2.700000e-01" errorMinus="2.700000e-01"/> + </dataPoint> + <dataPoint> + <measurement value="6.025000e+00" errorPlus="2.500000e-02" errorMinus="2.500000e-02"/> + <measurement value="3.040000e+00" errorPlus="2.600000e-01" errorMinus="2.600000e-01"/> + </dataPoint> + <dataPoint> + <measurement value="6.075000e+00" errorPlus="2.500000e-02" errorMinus="2.500000e-02"/> + <measurement value="2.940000e+00" errorPlus="2.600000e-01" errorMinus="2.600000e-01"/> + </dataPoint> + <dataPoint> + <measurement value="6.125000e+00" errorPlus="2.500000e-02" errorMinus="2.500000e-02"/> + <measurement value="2.800000e+00" errorPlus="2.500000e-01" errorMinus="2.500000e-01"/> + </dataPoint> + <dataPoint> + <measurement value="6.175000e+00" errorPlus="2.500000e-02" errorMinus="2.500000e-02"/> + <measurement value="2.740000e+00" errorPlus="2.600000e-01" errorMinus="2.600000e-01"/> + </dataPoint> + <dataPoint> + <measurement value="6.225000e+00" errorPlus="2.500000e-02" errorMinus="2.500000e-02"/> + <measurement value="2.650000e+00" errorPlus="2.400000e-01" errorMinus="2.400000e-01"/> + </dataPoint> + <dataPoint> + <measurement value="6.275000e+00" errorPlus="2.500000e-02" errorMinus="2.500000e-02"/> + <measurement value="2.580000e+00" errorPlus="2.300000e-01" errorMinus="2.300000e-01"/> + </dataPoint> + <dataPoint> + <measurement value="6.325000e+00" errorPlus="2.500000e-02" errorMinus="2.500000e-02"/> + <measurement value="2.530000e+00" errorPlus="2.100000e-01" errorMinus="2.100000e-01"/> + </dataPoint> + <dataPoint> + <measurement value="6.375000e+00" errorPlus="2.500000e-02" errorMinus="2.500000e-02"/> + <measurement value="2.380000e+00" errorPlus="2.100000e-01" errorMinus="2.100000e-01"/> + </dataPoint> + </dataPointSet> +</aida> Added: trunk/data/refdata/TOTEM_2012_DNDETA.dat ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/data/refdata/TOTEM_2012_DNDETA.dat Tue Apr 24 14:00:18 2012 (r3703) @@ -0,0 +1,20 @@ +# BEGIN HISTOGRAM /REF/TOTEM_2012_DNDETA/d01-x01-y01 +5.35 5.40 3.84 0.37 +5.40 5.45 3.64 0.38 +5.60 5.65 3.54 0.33 +5.65 5.70 3.50 0.32 +5.70 5.75 3.40 0.30 +5.75 5.80 3.42 0.31 +5.80 5.85 3.32 0.29 +5.85 5.90 3.27 0.29 +5.90 5.95 3.20 0.28 +5.95 6.00 3.07 0.27 +6.00 6.05 3.04 0.26 +6.05 6.10 2.94 0.26 +6.10 6.15 2.80 0.25 +6.15 6.20 2.74 0.26 +6.20 6.25 2.65 0.24 +6.25 6.30 2.58 0.23 +6.30 6.35 2.53 0.21 +6.35 6.40 2.38 0.21 +# END HISTOGRAM Modified: trunk/src/Analyses/Makefile.am ============================================================================== --- trunk/src/Analyses/Makefile.am Mon Apr 23 16:41:42 2012 (r3702) +++ trunk/src/Analyses/Makefile.am Tue Apr 24 14:00:18 2012 (r3703) @@ -107,6 +107,7 @@ CMS_QCD_10_024.cc endif + lib_LTLIBRARIES += RivetLHCbAnalyses.la RivetLHCbAnalyses_la_SOURCES = if ENABLE_UNVALIDATED @@ -117,6 +118,11 @@ endif +lib_LTLIBRARIES += RivetTOTEMAnalyses.la +RivetTOTEMAnalyses_la_SOURCES = \ + TOTEM_2012_DNDETA.cc + + lib_LTLIBRARIES += RivetCDFAnalyses.la RivetCDFAnalyses_la_SOURCES = \ CDF_1988_S1865951.cc \ Added: trunk/src/Analyses/TOTEM_2012_DNDETA.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/Analyses/TOTEM_2012_DNDETA.cc Tue Apr 24 14:00:18 2012 (r3703) @@ -0,0 +1,66 @@ +// -*- C++ -*- +#include "Rivet/Analysis.hh" +#include "Rivet/RivetAIDA.hh" +#include "Rivet/Tools/Logging.hh" +#include "Rivet/Projections/ChargedFinalState.hh" + +namespace Rivet { + + + class TOTEM_2012_DNDETA : public Analysis { + public: + + TOTEM_2012_DNDETA() + : Analysis("TOTEM_2012_DNDETA") + { } + + + public: + + void init() { + ChargedFinalState cfsm(-6.50, -5.35, 40.*MeV); + ChargedFinalState cfsp( 5.35, 6.50, 40.*MeV); + addProjection(cfsm, "CFSM"); + addProjection(cfsp, "CFSP"); + + _h_eta = bookHistogram1D(1, 1, 1); + _sumofweights = 0.; + } + + + void analyze(const Event& event) { + const double weight = event.weight(); + + const ChargedFinalState cfsm = applyProjection<ChargedFinalState>(event, "CFSM"); + const ChargedFinalState cfsp = applyProjection<ChargedFinalState>(event, "CFSP"); + + if (cfsm.size() == 0 && cfsp.size() == 0) vetoEvent; + + _sumofweights += weight; + + foreach (const Particle& p, cfsm.particles() + cfsp.particles()) { + _h_eta->fill(fabs(p.momentum().eta()), weight); + } + + } + + + void finalize() { + scale(_h_eta, 1./(2*_sumofweights)); + } + + + private: + + double _sumofweights; + AIDA::IHistogram1D *_h_eta; + + + }; + + + + // The hook for the plugin system + DECLARE_RIVET_PLUGIN(TOTEM_2012_DNDETA); + +}
More information about the Rivet-svn mailing list |