|
|
[Rivet-svn] r3615 - in branches/2011-07-aida2yoda: . data/anainfo data/plotinfo src/Analyses
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Fri Mar 16 15:39:17 GMT 2012
Author: hoeth
Date: Fri Mar 16 15:39:17 2012
New Revision: 3615
Log:
merge c3561 from trunk. Maybe we should wait with such refurbishments until YODA is in place ...
Added:
branches/2011-07-aida2yoda/data/anainfo/MC_IDENTIFIED.info
- copied unchanged from r3561, trunk/data/anainfo/MC_IDENTIFIED.info
branches/2011-07-aida2yoda/data/anainfo/MC_LEADJETUE.info
- copied unchanged from r3561, trunk/data/anainfo/MC_LEADJETUE.info
branches/2011-07-aida2yoda/data/anainfo/MC_PDFS.info
- copied unchanged from r3561, trunk/data/anainfo/MC_PDFS.info
branches/2011-07-aida2yoda/data/plotinfo/MC_IDENTIFIED.plot
- copied unchanged from r3561, trunk/data/plotinfo/MC_IDENTIFIED.plot
branches/2011-07-aida2yoda/data/plotinfo/MC_LEADJETUE.plot
- copied unchanged from r3561, trunk/data/plotinfo/MC_LEADJETUE.plot
branches/2011-07-aida2yoda/data/plotinfo/MC_PDFS.plot
- copied unchanged from r3561, trunk/data/plotinfo/MC_PDFS.plot
branches/2011-07-aida2yoda/src/Analyses/MC_IDENTIFIED.cc
- copied, changed from r3561, trunk/src/Analyses/MC_IDENTIFIED.cc
branches/2011-07-aida2yoda/src/Analyses/MC_LEADJETUE.cc
- copied, changed from r3561, trunk/src/Analyses/MC_LEADJETUE.cc
branches/2011-07-aida2yoda/src/Analyses/MC_PDFS.cc
- copied, changed from r3561, trunk/src/Analyses/MC_PDFS.cc
Deleted:
branches/2011-07-aida2yoda/data/anainfo/EXAMPLETREE.info
branches/2011-07-aida2yoda/data/anainfo/MC_LEADINGJETS.info
branches/2011-07-aida2yoda/data/plotinfo/MC_LEADINGJETS.plot
branches/2011-07-aida2yoda/src/Analyses/MC_LEADINGJETS.cc
Modified:
branches/2011-07-aida2yoda/ChangeLog
branches/2011-07-aida2yoda/data/anainfo/Makefile.am
branches/2011-07-aida2yoda/data/plotinfo/MC_GENERIC.plot
branches/2011-07-aida2yoda/data/plotinfo/Makefile.am
branches/2011-07-aida2yoda/src/Analyses/MC_GENERIC.cc
branches/2011-07-aida2yoda/src/Analyses/Makefile.am
Modified: branches/2011-07-aida2yoda/ChangeLog
==============================================================================
--- branches/2011-07-aida2yoda/ChangeLog Fri Mar 16 15:23:52 2012 (r3614)
+++ branches/2011-07-aida2yoda/ChangeLog Fri Mar 16 15:39:17 2012 (r3615)
@@ -1,3 +1,10 @@
+2012-02-14 Andy Buckley <andy.buckley at cern.ch>
+
+ * Splitting MC_GENERIC to put the PDF and PID plotting into
+ MC_PDFS and MC_IDENTIFIED respectively.
+
+ * Renaming MC_LEADINGJETS to MC_LEADJETUE.
+
2012-02-14 Hendrik Hoeth <hendrik.hoeth at cern.ch>
* DELPHI_1996_S3430090 and ALEPH_1996_S3486095:
Copied: branches/2011-07-aida2yoda/data/anainfo/MC_IDENTIFIED.info (from r3561, trunk/data/anainfo/MC_IDENTIFIED.info)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2011-07-aida2yoda/data/anainfo/MC_IDENTIFIED.info Fri Mar 16 15:39:17 2012 (r3615, copy of r3561, trunk/data/anainfo/MC_IDENTIFIED.info)
@@ -0,0 +1,10 @@
+Name: MC_IDENTIFIED
+Summary: MC testing analysis for identified particle distributions
+Status: VALIDATED
+Authors:
+ - Andy Buckley <andy.buckley at cern.ch>
+NumEvents: 50000
+RunInfo: Any!
+Description:
+ Plotting of distributions of PID codes (all/stable/unstable) and ID-specific
+ distributions such as the $|\eta|$ of $K$, $\pi$ and $\Lambda$ mesons.
Copied: branches/2011-07-aida2yoda/data/anainfo/MC_LEADJETUE.info (from r3561, trunk/data/anainfo/MC_LEADJETUE.info)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2011-07-aida2yoda/data/anainfo/MC_LEADJETUE.info Fri Mar 16 15:39:17 2012 (r3615, copy of r3561, trunk/data/anainfo/MC_LEADJETUE.info)
@@ -0,0 +1,18 @@
+Name: MC_LEADJETUE
+Summary: Underlying event in leading jet events, extended to LHC
+Status: VALIDATED
+Authors:
+ - Andy Buckley <andy.buckley at cern.ch>
+RunInfo:
+ LHC pp QCD interactions at 0.9, 10 or 14 TeV. Particles with
+ $c \tau > 10$ mm should be set stable. Several $p_\perp^\text{min}$
+ cutoffs are probably required to fill the profile histograms.
+NumEvents: 1000000
+PtCuts: [0]
+Description:
+ Rick Field's measurement of the underlying event in leading jet
+ events, extended to the LHC. As usual, the leading jet of the defines
+ an azimuthal toward/transverse/away decomposition, in this case the
+ event is accepted within $|\eta| < 2$, as in the CDF 2008 version of
+ the analysis. Since this isn't the Tevatron, I've chosen to use
+ $k_\perp$ rather than midpoint jets.
Copied: branches/2011-07-aida2yoda/data/anainfo/MC_PDFS.info (from r3561, trunk/data/anainfo/MC_PDFS.info)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2011-07-aida2yoda/data/anainfo/MC_PDFS.info Fri Mar 16 15:39:17 2012 (r3615, copy of r3561, trunk/data/anainfo/MC_PDFS.info)
@@ -0,0 +1,11 @@
+Name: MC_PDFS
+Summary: Analysis to study PDF sampling in any MC run
+Status: VALIDATED
+Authors:
+ - Andy Buckley <andy.buckley at cern.ch>
+NumEvents: 10000
+RunInfo: Any!
+Description:
+ Plotting of PDF sampling info, such as the $Q^2$ and both $x$ values of the
+ sampling (aggregated and distinguished as max/min, and some correlations with
+ event properties.
Modified: branches/2011-07-aida2yoda/data/anainfo/Makefile.am
==============================================================================
--- branches/2011-07-aida2yoda/data/anainfo/Makefile.am Fri Mar 16 15:23:52 2012 (r3614)
+++ branches/2011-07-aida2yoda/data/anainfo/Makefile.am Fri Mar 16 15:39:17 2012 (r3615)
@@ -110,7 +110,6 @@
DELPHI_2002_069_CONF_603.info \
DELPHI_2003_WUD_03_11.info \
EXAMPLE.info \
- EXAMPLETREE.info \
H1_1994_S2919893.info \
H1_1995_S3167097.info \
H1_2000_S4129130.info \
@@ -118,17 +117,19 @@
JADE_1998_S3612880.info \
LHCB_2010_S8758301.info \
LHCB_2011_I919315.info \
- MC_GENERIC.info \
- MC_LEADINGJETS.info \
MC_DIJET.info \
MC_DIPHOTON.info \
+ MC_GENERIC.info \
+ MC_HJETS.info \
+ MC_IDENTIFIED.info \
+ MC_JETS.info \
+ MC_LEADJETUE.info \
+ MC_PDFS.info \
+ MC_PHOTONJETS.info \
MC_PHOTONJETUE.info \
MC_SUSY.info \
MC_TTBAR.info \
- MC_JETS.info \
- MC_PHOTONJETS.info \
MC_VH2BB.info \
- MC_HJETS.info \
MC_WJETS.info \
MC_WPOL.info \
MC_WWJETS.info \
Modified: branches/2011-07-aida2yoda/data/plotinfo/MC_GENERIC.plot
==============================================================================
--- branches/2011-07-aida2yoda/data/plotinfo/MC_GENERIC.plot Fri Mar 16 15:23:52 2012 (r3614)
+++ branches/2011-07-aida2yoda/data/plotinfo/MC_GENERIC.plot Fri Mar 16 15:39:17 2012 (r3615)
@@ -40,24 +40,6 @@
Title=Pseudorapidity $+/-$ ratio of charged particles
# END PLOT
-# BEGIN PLOT /MC_GENERIC/EtaK
-Title=Pseudorapidity distribution of kaon multiplicity
-XLabel=$\eta$
-YLabel=$1/\sigma_K \; \mathrm{d}\sigma_K/\mathrm{d}\eta$
-LogY=0
-LegendXPos=0.3
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_GENERIC/EtaLambda
-Title=Pseudorapidity distribution of $\Lambda$ multiplicity
-XLabel=$\eta$
-YLabel=$1/\sigma_\Lambda \; \mathrm{d}\sigma_\Lambda/\mathrm{d}\eta$
-LogY=0
-LegendXPos=0.3
-LegendYPos=0.5
-# END PLOT
-
# BEGIN PLOT /MC_GENERIC/EtaSumEt
Title=Pseudorapidity distribution of $\langle \sum E_\perp \rangle$
XLabel=$\eta$
@@ -66,15 +48,6 @@
LegendYPos=0.5
# END PLOT
-# BEGIN PLOT /MC_GENERIC/EtaPi
-Title=Pseudorapidity distribution of pion multiplicity
-XLabel=$\eta$
-YLabel=$1/\sigma_\pi \; \mathrm{d}\sigma_\pi/\mathrm{d}\eta$
-LogY=0
-LegendXPos=0.3
-LegendYPos=0.5
-# END PLOT
-
# BEGIN PLOT /MC_GENERIC/MultCh
Title=Charged multiplicity of events
XLabel=$N_\text{ch}$
@@ -89,24 +62,6 @@
LogY=0
# END PLOT
-# BEGIN PLOT /MC_GENERIC/Mults.*PIDs
-XLabel=$|\text{PID}|$
-YLabel=$\langle N_\text{PID} \rangle$
-LogY=1
-# END PLOT
-
-# BEGIN PLOT /MC_GENERIC/MultsDecayedPIDs
-Title=Average per-event multiplicity of decayed particle IDs
-# END PLOT
-
-# BEGIN PLOT /MC_GENERIC/MultsStablePIDs
-Title=Average per-event multiplicity of stable particle IDs
-# END PLOT
-
-# BEGIN PLOT /MC_GENERIC/MultsAllPIDs
-Title=Average per-event multiplicity of \emph{all} (unphysical) particle IDs
-# END PLOT
-
# BEGIN PLOT /MC_GENERIC/Phi$
Title=Azimuthal distribution of all particles
XLabel=$\phi$
@@ -168,44 +123,3 @@
LogY=0
LegendYPos=0.5
# END PLOT
-
-# BEGIN PLOT /MC_GENERIC/PdfX
-Title=PDF sampling $x$ value distribution
-XLabel=$x$
-YLabel=$1/N_\text{evt} \ \mathrm{d}N_\text{evt}/\mathrm{d}x$
-LogX=1
-LogY=1
-FullRange=1
-LegendXPos=0.1
-LegendYPos=0.5
-# END PLOT
-
-# BEGIN PLOT /MC_GENERIC/PdfXmin
-Title=PDF sampling $x_\text{min}$ value distribution
-XLabel=$x_\text{min}$
-# END PLOT
-
-# BEGIN PLOT /MC_GENERIC/PdfXmax
-Title=PDF sampling $x_\text{max}$ value distribution
-XLabel=$x_\text{max}$
-LegendXPos=0.3
-XMin=0.00005
-# END PLOT
-
-# BEGIN PLOT /MC_GENERIC/PdfQ
-Title=PDF sampling $Q$ value distribution
-XLabel=$Q$
-YLabel=$1/N_\text{evt} \ \mathrm{d}N_\text{evt}/\mathrm{d}Q$
-LogX=0
-LogY=1
-FullRange=1
-LegendYPos=0.9
-# END PLOT
-
-# # BEGIN PLOT /MC_GENERIC/PdfXQ
-# Title=PDF sampling $x, Q$ value distribution
-# XLabel=$x$
-# YLabel=$Q$
-# LogX=0
-# LogY=0
-# # END PLOT
Copied: branches/2011-07-aida2yoda/data/plotinfo/MC_IDENTIFIED.plot (from r3561, trunk/data/plotinfo/MC_IDENTIFIED.plot)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2011-07-aida2yoda/data/plotinfo/MC_IDENTIFIED.plot Fri Mar 16 15:39:17 2012 (r3615, copy of r3561, trunk/data/plotinfo/MC_IDENTIFIED.plot)
@@ -0,0 +1,44 @@
+# BEGIN PLOT /MC_GENERIC/EtaK
+Title=Pseudorapidity distribution of kaon multiplicity
+XLabel=$\eta$
+YLabel=$1/\sigma_K \; \mathrm{d}\sigma_K/\mathrm{d}\eta$
+LogY=0
+LegendXPos=0.3
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_GENERIC/EtaLambda
+Title=Pseudorapidity distribution of $\Lambda$ multiplicity
+XLabel=$\eta$
+YLabel=$1/\sigma_\Lambda \; \mathrm{d}\sigma_\Lambda/\mathrm{d}\eta$
+LogY=0
+LegendXPos=0.3
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_GENERIC/EtaPi
+Title=Pseudorapidity distribution of pion multiplicity
+XLabel=$\eta$
+YLabel=$1/\sigma_\pi \; \mathrm{d}\sigma_\pi/\mathrm{d}\eta$
+LogY=0
+LegendXPos=0.3
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_GENERIC/Mults.*PIDs
+XLabel=$|\text{PID}|$
+YLabel=$\langle N_\text{PID} \rangle$
+LogY=1
+# END PLOT
+
+# BEGIN PLOT /MC_GENERIC/MultsDecayedPIDs
+Title=Average per-event multiplicity of decayed particle IDs
+# END PLOT
+
+# BEGIN PLOT /MC_GENERIC/MultsStablePIDs
+Title=Average per-event multiplicity of stable particle IDs
+# END PLOT
+
+# BEGIN PLOT /MC_GENERIC/MultsAllPIDs
+Title=Average per-event multiplicity of \emph{all} (unphysical) particle IDs
+# END PLOT
Copied: branches/2011-07-aida2yoda/data/plotinfo/MC_LEADJETUE.plot (from r3561, trunk/data/plotinfo/MC_LEADJETUE.plot)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2011-07-aida2yoda/data/plotinfo/MC_LEADJETUE.plot Fri Mar 16 15:39:17 2012 (r3615, copy of r3561, trunk/data/plotinfo/MC_LEADJETUE.plot)
@@ -0,0 +1,48 @@
+# BEGIN PLOT /MC_LEADJETUE/trans-nchg
+Title=Transverse region charged particle density
+XLabel=Leading jet $p_\perp$ / GeV
+YLabel=$\mathrm{d}{N_\text{ch}}/\mathrm{d}{\phi}$
+LogY=0
+# END PLOT
+
+# BEGIN PLOT /MC_LEADJETUE/trans-maxnchg
+Title=TransMAX region charged particle density
+XLabel=Leading jet $p_\perp$ / GeV
+YLabel=$\mathrm{d}{N_\text{ch}}/\mathrm{d}{\phi}$
+LogY=0
+# END PLOT
+
+# BEGIN PLOT /MC_LEADJETUE/trans-minnchg
+Title=TransMIN region charged particle density
+XLabel=Leading jet $p_\perp$ / GeV
+YLabel=$\mathrm{d}{N_\text{ch}}/\mathrm{d}{\phi}$
+LogY=0
+# END PLOT
+
+# BEGIN PLOT /MC_LEADJETUE/trans-ptsum
+Title=Transverse region charged pT sum density
+XLabel=Leading jet $p_\perp$ / GeV
+YLabel=$\mathrm{d}{\sum p_\perp^\text{sum}}/\mathrm{d}{\phi}$
+LogY=0
+# END PLOT
+
+# BEGIN PLOT /MC_LEADJETUE/trans-maxptsum
+Title=TransMAX region charged pT sum density
+XLabel=Leading jet $p_\perp$ / GeV
+YLabel=$\mathrm{d}{\sum p_\perp^\text{sum}}/\mathrm{d}{\phi}$
+LogY=0
+# END PLOT
+
+# BEGIN PLOT /MC_LEADJETUE/trans-minptsum
+Title=TransMIN region charged pT sum density
+XLabel=Leading jet $p_\perp$ / GeV
+YLabel=$\mathrm{d}{\sum p_\perp^\text{sum}}/\mathrm{d}{\phi}$
+LogY=0
+# END PLOT
+
+# BEGIN PLOT /MC_LEADJETUE/trans-ptavg
+Title=Transverse region charged pT average
+XLabel=Leading jet $p_\perp$ / GeV
+YLabel=$\langle p_\perp \rangle$
+LogY=0
+# END PLOT
Copied: branches/2011-07-aida2yoda/data/plotinfo/MC_PDFS.plot (from r3561, trunk/data/plotinfo/MC_PDFS.plot)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2011-07-aida2yoda/data/plotinfo/MC_PDFS.plot Fri Mar 16 15:39:17 2012 (r3615, copy of r3561, trunk/data/plotinfo/MC_PDFS.plot)
@@ -0,0 +1,40 @@
+# BEGIN PLOT /MC_PDFS/PdfX
+Title=PDF sampling $x$ value distribution
+XLabel=$x$
+YLabel=$1/N_\text{evt} \ \mathrm{d}N_\text{evt}/\mathrm{d}x$
+LogX=1
+LogY=1
+FullRange=1
+LegendXPos=0.1
+LegendYPos=0.5
+# END PLOT
+
+# BEGIN PLOT /MC_PDFS/PdfXmin
+Title=PDF sampling $x_\text{min}$ value distribution
+XLabel=$x_\text{min}$
+# END PLOT
+
+# BEGIN PLOT /MC_PDFS/PdfXmax
+Title=PDF sampling $x_\text{max}$ value distribution
+XLabel=$x_\text{max}$
+LegendXPos=0.3
+XMin=0.00005
+# END PLOT
+
+# BEGIN PLOT /MC_PDFS/PdfQ
+Title=PDF sampling $Q$ value distribution
+XLabel=$Q$
+YLabel=$1/N_\text{evt} \ \mathrm{d}N_\text{evt}/\mathrm{d}Q$
+LogX=0
+LogY=1
+FullRange=1
+LegendYPos=0.9
+# END PLOT
+
+# # BEGIN PLOT /MC_PDFS/PdfXQ
+# Title=PDF sampling $x, Q$ value distribution
+# XLabel=$x$
+# YLabel=$Q$
+# LogX=0
+# LogY=0
+# # END PLOT
Modified: branches/2011-07-aida2yoda/data/plotinfo/Makefile.am
==============================================================================
--- branches/2011-07-aida2yoda/data/plotinfo/Makefile.am Fri Mar 16 15:23:52 2012 (r3614)
+++ branches/2011-07-aida2yoda/data/plotinfo/Makefile.am Fri Mar 16 15:39:17 2012 (r3615)
@@ -110,7 +110,8 @@
LHCB_2010_S8758301.plot \
LHCB_2011_I919315.plot \
MC_GENERIC.plot \
- MC_LEADINGJETS.plot \
+ MC_IDENTIFIED.plot \
+ MC_LEADJETUE.plot \
MC_DIJET.plot \
MC_DIPHOTON.plot \
MC_PHOTONJETUE.plot \
@@ -120,6 +121,7 @@
MC_PHOTONJETS.plot \
MC_VH2BB.plot \
MC_HJETS.plot \
+ MC_PDFS.plot \
MC_WJETS.plot \
MC_WPOL.plot \
MC_WWJETS.plot \
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_GENERIC.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_GENERIC.cc Fri Mar 16 15:23:52 2012 (r3614)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_GENERIC.cc Fri Mar 16 15:39:17 2012 (r3615)
@@ -4,8 +4,7 @@
#include "Rivet/Tools/Logging.hh"
#include "Rivet/Projections/FinalState.hh"
#include "Rivet/Projections/ChargedFinalState.hh"
-#include "Rivet/Projections/UnstableFinalState.hh"
-#include "Rivet/Projections/MissingMomentum.hh"
+//#include "Rivet/Projections/MissingMomentum.hh"
namespace Rivet {
@@ -32,7 +31,6 @@
const FinalState cnfs(-5.0, 5.0, 500*MeV);
addProjection(cnfs, "FS");
addProjection(ChargedFinalState(-5.0, 5.0, 500*MeV), "CFS");
- addProjection(UnstableFinalState(-5.0, 5.0, 500*MeV), "UFS");
//addProjection(MissingMomentum(cnfs), "ETmiss");
// Histograms
@@ -40,10 +38,6 @@
_histMult = bookHisto1D("Mult", 100, -0.5, 199.5);
_histMultCh = bookHisto1D("MultCh", 100, -0.5, 199.5);
- _histStablePIDs = bookHisto1D("MultsStablePIDs", 3335, -0.5, 3334.5);
- _histDecayedPIDs = bookHisto1D("MultsDecayedPIDs", 3335, -0.5, 3334.5);
- _histAllPIDs = bookHisto1D("MultsAllPIDs", 3335, -0.5, 3334.5);
-
_histPt = bookHisto1D("Pt", 300, 0, 30);
_histPtCh = bookHisto1D("PtCh", 300, 0, 30);
@@ -57,9 +51,6 @@
_tmphistEtaChPlus.reset(new Histo1D(25, 0, 5));
_tmphistEtaChMinus.reset(new Histo1D(25, 0, 5));
- _histEtaPi = bookHisto1D("EtaPi", 25, 0, 5);
- _histEtaK = bookHisto1D("EtaK", 25, 0, 5);
- _histEtaLambda = bookHisto1D("EtaLambda", 25, 0, 5);
_histEtaSumEt = bookProfile1D("EtaSumEt", 25, 0, 5);
_histRapidity = bookHisto1D("Rapidity", 50, -5, 5);
@@ -71,14 +62,6 @@
_histPhi = bookHisto1D("Phi", 50, 0, TWOPI);
_histPhiCh = bookHisto1D("PhiCh", 50, 0, TWOPI);
-
- _histPdfX = bookHisto1D("PdfX", logspace(0.000001, 1.0, 50));
- _histPdfXmin = bookHisto1D("PdfXmin", logspace(0.000001, 1.0, 50));
- _histPdfXmax = bookHisto1D("PdfXmax", logspace(0.000001, 1.0, 50));
- _histPdfQ = bookHisto1D("PdfQ", 50, 0.0, 30.0);
- // _histPdfXQ = bookHisto2D("PdfXQ", logspace(0.000001, 1.0, 50), linspace(0.0, 30.0, 50));
- // _histPdfTrackptVsX = bookProfile1D("PdfTrackptVsX", logspace(0.000001, 1.0, 50));
- // _histPdfTrackptVsQ = bookProfile1D("PdfTrackptVsQ", 50, 0.0, 30.0);
}
@@ -87,30 +70,11 @@
void analyze(const Event& event) {
const double weight = event.weight();
- // Unphysical (debug) plotting of all PIDs in the event, physical or otherwise
- foreach (const GenParticle* gp, particles(event.genEvent())) {
- _histAllPIDs->fill(abs(gp->pdg_id()), weight);
- }
-
- // Print and plot PDF info
- if (event.genEvent().pdf_info() != 0) {
- HepMC::PdfInfo pdfi = *event.genEvent().pdf_info();
- MSG_DEBUG("PDF Q = " << pdfi.scalePDF() << " for (id, x) = "
- << "(" << pdfi.id1() << ", " << pdfi.x1() << ") "
- << "(" << pdfi.id2() << ", " << pdfi.x2() << ")");
- _histPdfX->fill(pdfi.x1(), weight);
- _histPdfX->fill(pdfi.x2(), weight);
- _histPdfXmin->fill(std::min(pdfi.x1(), pdfi.x2()), weight);
- _histPdfXmax->fill(std::max(pdfi.x1(), pdfi.x2()), weight);
- _histPdfQ->fill(pdfi.scalePDF(), weight); // always in GeV?
- }
-
// Charged + neutral final state
const FinalState& cnfs = applyProjection<FinalState>(event, "FS");
MSG_DEBUG("Total multiplicity = " << cnfs.size());
_histMult->fill(cnfs.size(), weight);
foreach (const Particle& p, cnfs.particles()) {
- _histStablePIDs->fill(abs(p.pdgId()), weight);
const double eta = p.momentum().eta();
_histEta->fill(eta, weight);
_histEtaSumEt->fill(fabs(eta), p.momentum().Et(), weight);
@@ -152,30 +116,9 @@
_histPtCh->fill(p.momentum().pT()/GeV, weight);
_histECh->fill(p.momentum().E()/GeV, weight);
_histPhiCh->fill(p.momentum().phi(), weight);
-
- // if (event.genEvent().pdf_info() != 0) {
- // if (fabs(eta) < 2.5 && p.momentum().pT() > 10*GeV) {
- // HepMC::PdfInfo pdfi = *event.genEvent().pdf_info();
- // _histPdfTrackptVsX->fill(pdfi.x1(), p.momentum().pT()/GeV, weight);
- // _histPdfTrackptVsX->fill(pdfi.x2(), p.momentum().pT()/GeV, weight);
- // _histPdfTrackptVsQ->fill(pdfi.scalePDF(), p.momentum().pT()/GeV, weight);
- // }
- // }
}
-
- // Histogram identified particle eta spectra
- const UnstableFinalState& ufs = applyProjection<UnstableFinalState>(event, "UFS");
- foreach (const Particle& p, ufs.particles()) {
- const double eta_abs = fabs(p.momentum().eta());
- _histDecayedPIDs->fill(p.pdgId(), weight);
- const PdgId pid = abs(p.pdgId());
- //if (PID::isMeson(pid) && PID::hasStrange()) {
- if (pid == 211 || pid == 111) _histEtaPi->fill(eta_abs, weight);
- else if (pid == 321 || pid == 130 || pid == 310) _histEtaK->fill(eta_abs, weight);
- else if (pid == 3122) _histEtaLambda->fill(eta_abs, weight);
- // const MissingMomentum& met = applyProjection<MissingMomentum>(event, "ETmiss");
- }
+ // const MissingMomentum& met = applyProjection<MissingMomentum>(event, "ETmiss");
}
@@ -186,17 +129,9 @@
scale(_histMult, 1/sumOfWeights());
scale(_histMultCh, 1/sumOfWeights());
- scale(_histStablePIDs, 1/sumOfWeights());
- scale(_histDecayedPIDs, 1/sumOfWeights());
- scale(_histAllPIDs, 1/sumOfWeights());
-
scale(_histEta, 1/sumOfWeights());
scale(_histEtaCh, 1/sumOfWeights());
- scale(_histEtaPi, 1/sumOfWeights());
- scale(_histEtaK, 1/sumOfWeights());
- scale(_histEtaLambda, 1/sumOfWeights());
-
scale(_histRapidity, 1/sumOfWeights());
scale(_histRapidityCh, 1/sumOfWeights());
@@ -209,11 +144,6 @@
scale(_histPhi, 1/sumOfWeights());
scale(_histPhiCh, 1/sumOfWeights());
- scale(_histPdfX, 1/sumOfWeights());
- scale(_histPdfXmin, 1/sumOfWeights());
- scale(_histPdfXmax, 1/sumOfWeights());
- scale(_histPdfQ, 1/sumOfWeights());
-
// \todo YODA divide
// histogramFactory().divide(histoPath("EtaPMRatio"), *_tmphistEtaPlus, *_tmphistEtaMinus);
// histogramFactory().divide(histoPath("EtaChPMRatio"), *_tmphistEtaChPlus, *_tmphistEtaChMinus);
@@ -235,16 +165,12 @@
/// @name Histograms
//@{
Histo1DPtr _histMult, _histMultCh;
- Histo1DPtr _histStablePIDs, _histDecayedPIDs, _histAllPIDs;
- Histo1DPtr _histEtaPi, _histEtaK, _histEtaLambda;
Profile1DPtr _histEtaSumEt;
Histo1DPtr _histEta, _histEtaCh;
Histo1DPtr _histRapidity, _histRapidityCh;
Histo1DPtr _histPt, _histPtCh;
Histo1DPtr _histE, _histECh;
Histo1DPtr _histPhi, _histPhiCh;
- Histo1DPtr _histPdfX, _histPdfXmin, _histPdfXmax, _histPdfQ;
- // Profile1DPtr _histPdfTrackptVsX, _histPdfTrackptVsQ;
//@}
};
Copied and modified: branches/2011-07-aida2yoda/src/Analyses/MC_IDENTIFIED.cc (from r3561, trunk/src/Analyses/MC_IDENTIFIED.cc)
==============================================================================
--- trunk/src/Analyses/MC_IDENTIFIED.cc Tue Feb 14 23:01:58 2012 (r3561, copy source)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_IDENTIFIED.cc Fri Mar 16 15:39:17 2012 (r3615)
@@ -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/FinalState.hh"
#include "Rivet/Projections/UnstableFinalState.hh"
@@ -34,13 +34,13 @@
// Histograms
// @todo Choose E/pT ranged based on input energies... can't do anything about kin. cuts, though
- _histStablePIDs = bookHistogram1D("MultsStablePIDs", 3335, -0.5, 3334.5);
- _histDecayedPIDs = bookHistogram1D("MultsDecayedPIDs", 3335, -0.5, 3334.5);
- _histAllPIDs = bookHistogram1D("MultsAllPIDs", 3335, -0.5, 3334.5);
-
- _histEtaPi = bookHistogram1D("EtaPi", 25, 0, 5);
- _histEtaK = bookHistogram1D("EtaK", 25, 0, 5);
- _histEtaLambda = bookHistogram1D("EtaLambda", 25, 0, 5);
+ _histStablePIDs = bookHisto1D("MultsStablePIDs", 3335, -0.5, 3334.5);
+ _histDecayedPIDs = bookHisto1D("MultsDecayedPIDs", 3335, -0.5, 3334.5);
+ _histAllPIDs = bookHisto1D("MultsAllPIDs", 3335, -0.5, 3334.5);
+
+ _histEtaPi = bookHisto1D("EtaPi", 25, 0, 5);
+ _histEtaK = bookHisto1D("EtaK", 25, 0, 5);
+ _histEtaLambda = bookHisto1D("EtaLambda", 25, 0, 5);
}
@@ -92,8 +92,8 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_histStablePIDs, *_histDecayedPIDs, *_histAllPIDs;
- AIDA::IHistogram1D *_histEtaPi, *_histEtaK, *_histEtaLambda;
+ Histo1DPtr _histStablePIDs, _histDecayedPIDs, _histAllPIDs;
+ Histo1DPtr _histEtaPi, _histEtaK, _histEtaLambda;
//@}
};
Copied and modified: branches/2011-07-aida2yoda/src/Analyses/MC_LEADJETUE.cc (from r3561, trunk/src/Analyses/MC_LEADJETUE.cc)
==============================================================================
--- trunk/src/Analyses/MC_LEADJETUE.cc Tue Feb 14 23:01:58 2012 (r3561, copy source)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_LEADJETUE.cc Fri Mar 16 15:39:17 2012 (r3615)
@@ -1,7 +1,7 @@
// -*- C++ -*-
#include "Rivet/Analysis.hh"
#include "Rivet/Tools/Logging.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
#include "Rivet/Projections/FinalState.hh"
#include "Rivet/Projections/ChargedFinalState.hh"
#include "Rivet/Projections/FastJets.hh"
@@ -152,13 +152,13 @@
private:
- AIDA::IProfile1D *_hist_pnchg;
- AIDA::IProfile1D *_hist_pmaxnchg;
- AIDA::IProfile1D *_hist_pminnchg;
- AIDA::IProfile1D *_hist_pcptsum;
- AIDA::IProfile1D *_hist_pmaxcptsum;
- AIDA::IProfile1D *_hist_pmincptsum;
- AIDA::IProfile1D *_hist_pcptave;
+ Profile1DPtr _hist_pnchg;
+ Profile1DPtr _hist_pmaxnchg;
+ Profile1DPtr _hist_pminnchg;
+ Profile1DPtr _hist_pcptsum;
+ Profile1DPtr _hist_pmaxcptsum;
+ Profile1DPtr _hist_pmincptsum;
+ Profile1DPtr _hist_pcptave;
};
Copied and modified: branches/2011-07-aida2yoda/src/Analyses/MC_PDFS.cc (from r3561, trunk/src/Analyses/MC_PDFS.cc)
==============================================================================
--- trunk/src/Analyses/MC_PDFS.cc Tue Feb 14 23:01:58 2012 (r3561, copy source)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_PDFS.cc Fri Mar 16 15:39:17 2012 (r3615)
@@ -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"
@@ -28,11 +28,11 @@
// addProjection(ChargedFinalState(-5.0, 5.0, 500*MeV), "CFS");
// Histograms
- _histPdfX = bookHistogram1D("PdfX", logspace(0.000001, 1.0, 50));
- _histPdfXmin = bookHistogram1D("PdfXmin", logspace(0.000001, 1.0, 50));
- _histPdfXmax = bookHistogram1D("PdfXmax", logspace(0.000001, 1.0, 50));
- _histPdfQ = bookHistogram1D("PdfQ", 50, 0.0, 30.0);
- // _histPdfXQ = bookHistogram2D("PdfXQ", logspace(0.000001, 1.0, 50), linspace(0.0, 30.0, 50));
+ _histPdfX = bookHisto1D("PdfX", logspace(0.000001, 1.0, 50));
+ _histPdfXmin = bookHisto1D("PdfXmin", logspace(0.000001, 1.0, 50));
+ _histPdfXmax = bookHisto1D("PdfXmax", logspace(0.000001, 1.0, 50));
+ _histPdfQ = bookHisto1D("PdfQ", 50, 0.0, 30.0);
+ // _histPdfXQ = bookHisto2D("PdfXQ", logspace(0.000001, 1.0, 50), linspace(0.0, 30.0, 50));
// _histPdfTrackptVsX = bookProfile1D("PdfTrackptVsX", logspace(0.000001, 1.0, 50));
// _histPdfTrackptVsQ = bookProfile1D("PdfTrackptVsQ", 50, 0.0, 30.0);
}
@@ -84,8 +84,8 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_histPdfX, *_histPdfXmin, *_histPdfXmax, *_histPdfQ;
- // AIDA::IProfile1D *_histPdfTrackptVsX, *_histPdfTrackptVsQ;
+ Histo1DPtr _histPdfX, _histPdfXmin, _histPdfXmax, _histPdfQ;
+ // Profile1DPtr _histPdfTrackptVsX, _histPdfTrackptVsQ;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/Makefile.am
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/Makefile.am Fri Mar 16 15:23:52 2012 (r3614)
+++ branches/2011-07-aida2yoda/src/Analyses/Makefile.am Fri Mar 16 15:39:17 2012 (r3615)
@@ -257,21 +257,25 @@
lib_LTLIBRARIES += RivetMCAnalyses.la
RivetMCAnalyses_la_SOURCES = \
EXAMPLE.cc \
+ MC_DIPHOTON.cc \
MC_GENERIC.cc \
+ MC_HJETS.cc \
+ MC_IDENTIFIED.cc \
MC_JETS.cc \
+ MC_LEADJETUE.cc \
+ MC_PDFS.cc \
MC_PHOTONJETS.cc \
+ MC_SUSY.cc \
+ MC_TTBAR.cc \
MC_VH2BB.cc \
- MC_HJETS.cc \
MC_WJETS.cc \
MC_WPOL.cc \
MC_WWJETS.cc \
+ MC_XS.cc \
MC_ZJETS.cc \
- MC_ZZJETS.cc \
- MC_LEADINGJETS.cc \
- MC_DIPHOTON.cc \
- MC_SUSY.cc \
- MC_TTBAR.cc \
- MC_XS.cc
+ MC_ZZJETS.cc
+
+
if ENABLE_UNVALIDATED
RivetMCAnalyses_la_SOURCES += \
MC_DIJET.cc \
More information about the Rivet-svn
mailing list
|