|
[Rivet-svn] r2152 - in trunk: data/anainfo data/plotinfo include/Rivet/Projections src/Analyses src/Projectionsblackhole at projects.hepforge.org blackhole at projects.hepforge.orgTue Dec 8 23:37:58 GMT 2009
Author: buckley Date: Tue Dec 8 23:37:57 2009 New Revision: 2152 Log: Bug fixed in UA5 trigger projection, and factor of 2 identified as needed in UA5 1986: this analysis now matches the data except where it wouldn't be expected to, and I've marked it as VALIDATED. Modified: trunk/data/anainfo/UA5_1986_S1583476.info trunk/data/plotinfo/UA5_1986_S1583476.plot trunk/include/Rivet/Projections/TriggerUA5.hh trunk/src/Analyses/UA5_1986_S1583476.cc trunk/src/Projections/TriggerUA5.cc Modified: trunk/data/anainfo/UA5_1986_S1583476.info ============================================================================== --- trunk/data/anainfo/UA5_1986_S1583476.info Tue Dec 8 22:55:22 2009 (r2151) +++ trunk/data/anainfo/UA5_1986_S1583476.info Tue Dec 8 23:37:57 2009 (r2152) @@ -4,8 +4,9 @@ Experiment: UA5 Collider: CERN SPS SpiresID: 1583476 -Status: UNVALIDATED +Status: VALIDATED Authors: + - Andy Buckley <andy.buckley at cern.ch> - Holger Schulz <holger.schulz at physik.hu-berlin.de> - Christophe Vaillant <c.l.j.j.vaillant at durham.ac.uk> References: Modified: trunk/data/plotinfo/UA5_1986_S1583476.plot ============================================================================== --- trunk/data/plotinfo/UA5_1986_S1583476.plot Tue Dec 8 22:55:22 2009 (r2151) +++ trunk/data/plotinfo/UA5_1986_S1583476.plot Tue Dec 8 23:37:57 2009 (r2152) @@ -1,118 +1,116 @@ # BEGIN PLOT /UA5_1986_S1583476/d01-x01-y01 -Title=$|\eta|, $\sqrt{s}=200$ \unit{GeV}, NSD -XLabel=$|\eta|$ -#YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}|\eta|$ -YLabel=$\frac{1}{\sigma_\text{NSD}}\frac{\text{d}\sigma}{\text{d}\eta}$ +Title=Pseudorapidity $\eta$, $\sqrt{s}=200~\text{GeV}$, NSD +XLabel=$\eta$ +YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$ # END PLOT # BEGIN PLOT /UA5_1986_S1583476/d01-x01-y02 -Title=$|\eta|, $\sqrt{s}=200$ \unit{GeV}, NSD+SD -XLabel=$|\eta|$ -#YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}|\eta|$ -YLabel=$\frac{1}{\sigma_\text{inel}}\frac{\text{d}\sigma}{\text{d}\eta}$ +Title=Pseudorapidity $\eta$, $\sqrt{s}=200~\text{GeV}$, NSD+SD +XLabel=$\eta$ +YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$ # END PLOT # BEGIN PLOT /UA5_1986_S1583476/d01-x01-y03 -Title=$|\eta|, $\sqrt{s}=900$ \unit{GeV}, NSD -XLabel=$|\eta|$ -YLabel=$\frac{1}{\sigma_\text{NSD}}\frac{\text{d}\sigma}{\text{d}\eta}$ +Title=Pseudorapidity $\eta$, $\sqrt{s}=900~\text{GeV}$, NSD +XLabel=$\eta$ +YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$ # END PLOT # BEGIN PLOT /UA5_1986_S1583476/d01-x01-y04 -Title=$|\eta|, $\sqrt{s}=200$ \unit{GeV}, NSD+SD -XLabel=$|\eta|$ -YLabel=$\frac{1}{\sigma_\text{inel}}\frac{\text{d}\sigma}{\text{d}\eta}$ +Title=Pseudorapidity $\eta$, $\sqrt{s}=900~\text{GeV}$, NSD+SD +XLabel=$\eta$ +YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$ # END PLOT # BEGIN PLOT /UA5_1986_S1583476/d02-x01-y01 -Title=Pseudorapidity ($|\eta|<5.0$, $\sqrt{s}=200$ \unit{GeV}, NSD, $2<N_\text{ch}<10$) -XLabel=$|\eta|$ -YLabel=$\frac{1}{\sigma_\text{n}}\frac{\text{d}\sigma}{\text{d}\eta}$ +Title=Pseudorapidity $\eta$, $\sqrt{s}=200~\text{GeV}$, NSD, $2 \le N_\text{ch} < 12$ +XLabel=$\eta$ +YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$ # END PLOT # BEGIN PLOT /UA5_1986_S1583476/d02-x01-y02 -Title=Pseudorapidity ($|\eta|<5.0$, $\sqrt{s}=200$ \unit{GeV}, NSD, $12<N_\text{ch}<20$) -XLabel=$|\eta|$ -YLabel=$\frac{1}{\sigma_\text{n}}\frac{\text{d}\sigma}{\text{d}\eta}$ +Title=Pseudorapidity $\eta$, $\sqrt{s}=200~\text{GeV}$, NSD, $12 \le N_\text{ch} < 22$ +XLabel=$\eta$ +YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$ # END PLOT # BEGIN PLOT /UA5_1986_S1583476/d02-x01-y03 -Title=Pseudorapidity ($|\eta|<5.0$, $\sqrt{s}=200$ \unit{GeV}, NSD, $22<N_\text{ch}<30$) -XLabel=$|\eta|$ -YLabel=$\frac{1}{\sigma_\text{n}}\frac{\text{d}\sigma}{\text{d}\eta}$ +Title=Pseudorapidity $\eta$, $\sqrt{s}=200~\text{GeV}$, NSD, $22 \le N_\text{ch} < 32$ +XLabel=$\eta$ +YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$ # END PLOT # BEGIN PLOT /UA5_1986_S1583476/d02-x01-y04 -Title=Pseudorapidity ($|\eta|<5.0$, $\sqrt{s}=200$ \unit{GeV}, NSD, $32<N_\text{ch}<40$) -XLabel=$|\eta|$ -YLabel=$\frac{1}{\sigma_\text{n}}\frac{\text{d}\sigma}{\text{d}\eta}$ +Title=Pseudorapidity $\eta$, $\sqrt{s}=200~\text{GeV}$, NSD, $32 \le N_\text{ch} < 42$ +XLabel=$\eta$ +YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$ # END PLOT # BEGIN PLOT /UA5_1986_S1583476/d02-x01-y05 -Title=Pseudorapidity ($|\eta|<5.0$, $\sqrt{s}=200$ \unit{GeV}, NSD, $42<N_\text{ch}<50$) -XLabel=$|\eta|$ -YLabel=$\frac{1}{\sigma_\text{n}}\frac{\text{d}\sigma}{\text{d}\eta}$ +Title=Pseudorapidity $\eta$, $\sqrt{s}=200~\text{GeV}$, NSD, $42 \le N_\text{ch} < 52$ +XLabel=$\eta$ +YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$ # END PLOT # BEGIN PLOT /UA5_1986_S1583476/d02-x01-y06 -Title=Pseudorapidity ($|\eta|<5.0$, $\sqrt{s}=200$ \unit{GeV}, NSD, $N_\text{ch}>52$) -XLabel=$|\eta|$ -YLabel=$\frac{1}{\sigma_\text{n}}\frac{\text{d}\sigma}{\text{d}\eta}$ +Title=Pseudorapidity $\eta$, $\sqrt{s}=200~\text{GeV}$, NSD, $N_\text{ch} \ge 52$ +XLabel=$\eta$ +YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$ # END PLOT # BEGIN PLOT /UA5_1986_S1583476/d03-x01-y01 -Title=Pseudorapidity ($|\eta|<5.0$, $\sqrt{s}=900$ \unit{GeV}, NSD, $2<N_\text{ch}<10$) -XLabel=$|\eta|$ -YLabel=$\frac{1}{\sigma_\text{n}}\frac{\text{d}\sigma}{\text{d}\eta}$ +Title=Pseudorapidity $\eta$, $\sqrt{s}=900~\text{GeV}$, NSD, $2 \le N_\text{ch} < 12$ +XLabel=$\eta$ +YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$ # END PLOT # BEGIN PLOT /UA5_1986_S1583476/d03-x01-y02 -Title=Pseudorapidity ($|\eta|<5.0$, $\sqrt{s}=900$ \unit{GeV}, NSD, $12<N_\text{ch}<20$) -XLabel=$|\eta|$ -YLabel=$\frac{1}{\sigma_\text{n}}\frac{\text{d}\sigma}{\text{d}\eta}$ +Title=Pseudorapidity $\eta$, $\sqrt{s}=900~\text{GeV}$, NSD, $12 \le N_\text{ch} < 22$ +XLabel=$\eta$ +YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$ # END PLOT # BEGIN PLOT /UA5_1986_S1583476/d03-x01-y03 -Title=Pseudorapidity ($|\eta|<5.0$, $\sqrt{s}=900$ \unit{GeV}, NSD, $22<N_\text{ch}<30$) -XLabel=$|\eta|$ -YLabel=$\frac{1}{\sigma_\text{n}}\frac{\text{d}\sigma}{\text{d}\eta}$ +Title=Pseudorapidity $\eta$, $\sqrt{s}=900~\text{GeV}$, NSD, $22 \le N_\text{ch} < 32$ +XLabel=$\eta$ +YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$ # END PLOT # BEGIN PLOT /UA5_1986_S1583476/d03-x01-y04 -Title=Pseudorapidity ($|\eta|<5.0$, $\sqrt{s}=900$ \unit{GeV}, NSD, $32<N_\text{ch}<40$) -XLabel=$|\eta|$ -YLabel=$\frac{1}{\sigma_\text{n}}\frac{\text{d}\sigma}{\text{d}\eta}$ +Title=Pseudorapidity $\eta$, $\sqrt{s}=900~\text{GeV}$, NSD, $32 \le N_\text{ch} < 42$ +XLabel=$\eta$ +YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$ # END PLOT # BEGIN PLOT /UA5_1986_S1583476/d03-x01-y05 -Title=Pseudorapidity ($|\eta|<5.0$, $\sqrt{s}=900$ \unit{GeV}, NSD, $42<N_\text{ch}<50$) -XLabel=$|\eta|$ -YLabel=$\frac{1}{\sigma_\text{n}}\frac{\text{d}\sigma}{\text{d}\eta}$ +Title=Pseudorapidity $\eta$, $\sqrt{s}=900~\text{GeV}$, NSD, $42 \le N_\text{ch} < 52$ +XLabel=$\eta$ +YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$ # END PLOT # BEGIN PLOT /UA5_1986_S1583476/d03-x01-y06 -Title=Pseudorapidity ($|\eta|<5.0$, $\sqrt{s}=900$ \unit{GeV}, NSD, $52<N_\text{ch}<60$) -XLabel=$|\eta|$ -YLabel=$\frac{1}{\sigma_\text{n}}\frac{\text{d}\sigma}{\text{d}\eta}$ +Title=Pseudorapidity $\eta$, $\sqrt{s}=900~\text{GeV}$, NSD, $52 \le N_\text{ch} < 62$ +XLabel=$\eta$ +YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$ # END PLOT # BEGIN PLOT /UA5_1986_S1583476/d03-x01-y07 -Title=Pseudorapidity ($|\eta|<5.0$, $\sqrt{s}=900$ \unit{GeV}, NSD, $62<N_\text{ch}<70$) -XLabel=$|\eta|$ -YLabel=$\frac{1}{\sigma_\text{n}}\frac{\text{d}\sigma}{\text{d}\eta}$ +Title=Pseudorapidity $\eta$, $\sqrt{s}=900~\text{GeV}$, NSD, $62 \le N_\text{ch} < 72$ +XLabel=$\eta$ +YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$ # END PLOT # BEGIN PLOT /UA5_1986_S1583476/d03-x01-y08 -Title=Pseudorapidity ($|\eta|<5.0$, $\sqrt{s}=900$ \unit{GeV}, NSD, $72<N_\text{ch}<80$) -XLabel=$|\eta|$ -YLabel=$\frac{1}{\sigma_\text{n}}\frac{\text{d}\sigma}{\text{d}\eta}$ +Title=Pseudorapidity $\eta$, $\sqrt{s}=900~\text{GeV}$, NSD, $72 \le N_\text{ch} < 82$ +XLabel=$\eta$ +YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$ # END PLOT # BEGIN PLOT /UA5_1986_S1583476/d03-x01-y09 -Title=Pseudorapidity ($|\eta|<5.0$, $\sqrt{s}=900$ \unit{GeV}, NSD, $N_\text{ch}>82$) -XLabel=$|\eta|$ -YLabel=$\frac{1}{\sigma_\text{n}}\frac{\text{d}\sigma}{\text{d}\eta}$ +Title=Pseudorapidity $\eta$, $\sqrt{s}=900~\text{GeV}$, NSD, $N_\text{ch} \ge 82$ +XLabel=$\eta$ +YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\eta$ # END PLOT Modified: trunk/include/Rivet/Projections/TriggerUA5.hh ============================================================================== --- trunk/include/Rivet/Projections/TriggerUA5.hh Tue Dec 8 22:55:22 2009 (r2151) +++ trunk/include/Rivet/Projections/TriggerUA5.hh Tue Dec 8 23:37:57 2009 (r2152) @@ -15,15 +15,7 @@ public: /// Default constructor. - TriggerUA5() { - setName("TriggerUA5"); - - addProjection(Beam(), "Beam"); - addProjection(ChargedFinalState(-3.5, 3.5), "CFS"); - - _n_plus = 0; - _n_minus = 0; - } + TriggerUA5(); /// Clone on the heap. virtual const Projection* clone() const { Modified: trunk/src/Analyses/UA5_1986_S1583476.cc ============================================================================== --- trunk/src/Analyses/UA5_1986_S1583476.cc Tue Dec 8 22:55:22 2009 (r2151) +++ trunk/src/Analyses/UA5_1986_S1583476.cc Tue Dec 8 23:37:57 2009 (r2152) @@ -59,11 +59,7 @@ const int numP = cfs50.size(); const int ni = floor(static_cast<float>(numP-2)/10.0); const int num_idx = min(ni, (int)_sumWn.size()-1); - //cout << "***" << numP << " charged particles -> #" << ni << endl; getLog() << Log::TRACE << "Multiplicity index: " << numP << " charged particles -> #" << num_idx << endl; - // if (num_idx == _sumWn.size()-1) { - // cout << "Multiplicity index: " << numP << " charged particles -> #" << num_idx << endl; - // } // Update weights const double weight = event.weight(); @@ -88,12 +84,12 @@ /// Scale histos void finalize() { getLog() << Log::DEBUG << "sumW_NSD,inel = " << _sumWTrigNSD << ", " << _sumWTrig << endl; - scale(_hist_eta_nsd, 1/_sumWTrigNSD); - scale(_hist_eta_inelastic, 1/_sumWTrig); + scale(_hist_eta_nsd, 0.5/_sumWTrigNSD); + scale(_hist_eta_inelastic, 0.5/_sumWTrig); // getLog() << Log::DEBUG << "sumW[n] = " << _sumWn << endl; for (size_t i = 0; i < _hists_eta_nsd.size(); ++i) { - scale(_hists_eta_nsd[i], 1/_sumWn[i]); + scale(_hists_eta_nsd[i], 0.5/_sumWn[i]); } } Modified: trunk/src/Projections/TriggerUA5.cc ============================================================================== --- trunk/src/Projections/TriggerUA5.cc Tue Dec 8 22:55:22 2009 (r2151) +++ trunk/src/Projections/TriggerUA5.cc Tue Dec 8 23:37:57 2009 (r2152) @@ -8,7 +8,18 @@ namespace Rivet { + TriggerUA5::TriggerUA5() { + setName("TriggerUA5"); + + addProjection(Beam(), "Beam"); + addProjection(ChargedFinalState(-5.6, 5.6), "CFS"); + } + + void TriggerUA5::project(const Event& evt) { + _n_plus = 0; + _n_minus = 0; + // Start with the assumption that the trigger fails _decision_sd = false; _decision_nsd_1 = false;
More information about the Rivet-svn mailing list |