|
|
[Rivet-svn] r1891 - in trunk: data/plotinfo src/Analyses
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Thu Oct 8 15:35:22 BST 2009
Author: buckley
Date: Thu Oct 8 15:35:22 2009
New Revision: 1891
Log:
Updating W/Z plotting and plot metadata
Added:
trunk/data/plotinfo/MC_LHC_WANALYSIS.plot (contents, props changed)
- copied, changed from r1879, trunk/data/plotinfo/MC_LHC_ZANALYSIS.plot
Modified:
trunk/data/plotinfo/MC_LHC_ZANALYSIS.plot
trunk/data/plotinfo/Makefile.am
trunk/src/Analyses/MC_LHC_WANALYSIS.cc
trunk/src/Analyses/MC_LHC_ZANALYSIS.cc
Copied and modified: trunk/data/plotinfo/MC_LHC_WANALYSIS.plot (from r1879, trunk/data/plotinfo/MC_LHC_ZANALYSIS.plot)
==============================================================================
--- trunk/data/plotinfo/MC_LHC_ZANALYSIS.plot Tue Oct 6 16:39:28 2009 (r1879, copy source)
+++ trunk/data/plotinfo/MC_LHC_WANALYSIS.plot Thu Oct 8 15:35:22 2009 (r1891)
@@ -1,83 +1,83 @@
-# BEGIN PLOT /UA5_1989_S1926373/d01-x01-y01
-Title=Charged Multiplicity
-XLabel=$n_{ch}$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_WANALYSIS/n-ch
+Title=Charged multiplicity
+XLabel=$n_\text{ch}$
+YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}n_\text{ch}$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d02-x01-y01
-Title=Charged Transverse Momentum Distribution
-XLabel=$p_{T}$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_WANALYSIS/n-w
+Title=W candidate multiplicity
+XLabel=$n_\text{W}$
+YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}n_\text{W}$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d03-x01-y01
-Title=Average Charged Transverse Momentum Distribution
-XLabel=$p_{T}^{\\mathrm{mean}}$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_WANALYSIS/n-jet
+Title=Jet multiplicity
+XLabel=$n_\text{jet}$
+YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}n_\text{jet}$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d04-x01-y01
-Title=RMS Charged Transverse Momentum Distribution
-XLabel=$p_{T}^{\\mathrm{RMS}}$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_WANALYSIS/pt-ch
+Title=Charged track $p_\perp$
+XLabel=$p_\perp$ / GeV
+YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}p_\perp^\text{ch}$ / GeV$^-1$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d05-x01-y01
-Title=Z Count Distribution
-XLabel=$n_{z}$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_WANALYSIS/ptavg-ch
+Title=Average charged track $p_\perp$
+XLabel=$\langle p_\perp^\text{ch} \rangle$ / GeV
+YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\langle p_\perp^\text{ch} \langle$ / GeV$^-1$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d06-x01-y01
-Title=Z $p_{T}$ Distribution
-XLabel=$p_{T}^{\\mathrm{Z}}$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_WANALYSIS/ptrms-ch
+Title=Width of charged track $p_\perp$
+XLabel=$\hat{\sigma}_{p_\perp^\text{ch}}$ / GeV
+YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\hat{\sigma}_{p_\perp^\text{ch}}$ / GeV$^-1$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d07-x01-y01
-Title=Z $\\log{p_{T}}$ Distribution
-XLabel=$\\log{p_{T}^{\\mathrm{Z}}}$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_WANALYSIS/pt-w
+Title=W candidate $p_\perp$
+XLabel=$p_\perp(\text{W})$ / GeV
+YLabel=$\mathrm{d}N_\text{W}/\mathrm{d}p_\perp(\text{W})$ / GeV$^-1$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d08-x01-y01
-Title=Z Pseudorapidity Distribution
-XLabel=$\\eta$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_WANALYSIS/logpt-w
+Title=W candidate $\log(p_\perp/\text{GeV})$
+XLabel=$\log(p_\perp(\text{W})/\text{GeV})$
+YLabel=$\mathrm{d}N_\text{W}/\mathrm{d}\log(p_\perp(\text{W})/\text{GeV})$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d09-x01-y01
-Title=Z Azimuthal Angle Distribution
-XLabel=$\\phi$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_WANALYSIS/pt-jet
+Title=Jet $p_\perp$
+XLabel=$p_\perp(\text{jet})$ / GeV
+YLabel=$\mathrm{d}N_\text{jet}/\mathrm{d}p_\perp(\text{jet})$ / GeV$^-1$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d10-x01-y01
-Title=Z Mass Distribution
-XLabel=Mass
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_WANALYSIS/logpt-jet
+Title=Jet $\log(p_\perp/\text{GeV})$
+XLabel=$\log(p_\perp(\text{jet})/\text{GeV})$
+YLabel=$\mathrm{d}N_\text{jet}/\mathrm{d}\log(p_\perp(\text{jet})/\text{GeV})$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d11-x01-y01
-Title=Z log(Mass) Distribution
-XLabel=log(Mass)
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_WANALYSIS/eta-w
+Title=W candidate $\eta$
+XLabel=$\eta(\text{W})$
+YLabel=$\mathrm{d}N_\text{W}/\mathrm{d}\eta(\text{W})$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d12-x01-y01
-Title=Jet Counts
-XLabel=Jet count
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_WANALYSIS/phi-w
+Title=W candidate $\phi$
+XLabel=$\phi(\text{W})$
+YLabel=$\mathrm{d}N_\text{W}/\mathrm{d}\phi(\text{W})$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d13-x01-y01
-Title=Jet Transverse Momentum Distribution
-XLabel=$p_{T}^{\\mathrm{jet}}$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_WANALYSIS/m-w
+Title=W candidate mass
+XLabel=$m(\text{W})$ / GeV
+YLabel=$\mathrm{d}N_\text{W}/\mathrm{d}m(\text{W})$ / GeV$^-1$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d14-x01-y01
-Title=Jet log(Transverse Momentum) Distribution
-XLabel=$\\log{p_{T}^{\\mathrm{jet}}}$
-YLabel=Weight
-# END PLOT
\ No newline at end of file
+# BEGIN PLOT /MC_LHC_WANALYSIS/m-w
+Title=Log of W candidate mass
+XLabel=$\log(m(\text{W})/\text{GeV})$
+YLabel=$\mathrm{d}N_\text{W}/\mathrm{d}\log(m(\text{W})/\text{GeV})$
+# END PLOT
Modified: trunk/data/plotinfo/MC_LHC_ZANALYSIS.plot
==============================================================================
--- trunk/data/plotinfo/MC_LHC_ZANALYSIS.plot Thu Oct 8 15:35:11 2009 (r1890)
+++ trunk/data/plotinfo/MC_LHC_ZANALYSIS.plot Thu Oct 8 15:35:22 2009 (r1891)
@@ -1,83 +1,83 @@
-# BEGIN PLOT /UA5_1989_S1926373/d01-x01-y01
-Title=Charged Multiplicity
-XLabel=$n_{ch}$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_ZANALYSIS/n-ch
+Title=Charged multiplicity
+XLabel=$n_\text{ch}$
+YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}n_\text{ch}$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d02-x01-y01
-Title=Charged Transverse Momentum Distribution
-XLabel=$p_{T}$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_ZANALYSIS/n-z
+Title=Z candidate multiplicity
+XLabel=$n_\text{Z}$
+YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}n_\text{Z}$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d03-x01-y01
-Title=Average Charged Transverse Momentum Distribution
-XLabel=$p_{T}^{\\mathrm{mean}}$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_ZANALYSIS/n-jet
+Title=Jet multiplicity
+XLabel=$n_\text{jet}$
+YLabel=$\mathrm{d}N_\text{evt}/\mathrm{d}n_\text{jet}$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d04-x01-y01
-Title=RMS Charged Transverse Momentum Distribution
-XLabel=$p_{T}^{\\mathrm{RMS}}$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_ZANALYSIS/pt-ch
+Title=Charged track $p_\perp$
+XLabel=$p_\perp$ / GeV
+YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}p_\perp^\text{ch}$ / GeV$^-1$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d05-x01-y01
-Title=Z Count Distribution
-XLabel=$n_{z}$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_ZANALYSIS/ptavg-ch
+Title=Average charged track $p_\perp$
+XLabel=$\langle p_\perp^\text{ch} \rangle$ / GeV
+YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\langle p_\perp^\text{ch} \langle$ / GeV$^-1$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d06-x01-y01
-Title=Z $p_{T}$ Distribution
-XLabel=$p_{T}^{\\mathrm{Z}}$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_ZANALYSIS/ptrms-ch
+Title=Width of charged track $p_\perp$
+XLabel=$\hat{\sigma}_{p_\perp^\text{ch}}$ / GeV
+YLabel=$\mathrm{d}N_\text{ch}/\mathrm{d}\hat{\sigma}_{p_\perp^\text{ch}}$ / GeV$^-1$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d07-x01-y01
-Title=Z $\\log{p_{T}}$ Distribution
-XLabel=$\\log{p_{T}^{\\mathrm{Z}}}$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_ZANALYSIS/pt-z
+Title=Z candidate $p_\perp$
+XLabel=$p_\perp(\text{Z})$ / GeV
+YLabel=$\mathrm{d}N_\text{Z}/\mathrm{d}p_\perp(\text{Z})$ / GeV$^-1$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d08-x01-y01
-Title=Z Pseudorapidity Distribution
-XLabel=$\\eta$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_ZANALYSIS/logpt-z
+Title=Z candidate $\log(p_\perp/\text{GeV})$
+XLabel=$\log(p_\perp(\text{Z})/\text{GeV})$
+YLabel=$\mathrm{d}N_\text{Z}/\mathrm{d}\log(p_\perp(\text{Z})/\text{GeV})$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d09-x01-y01
-Title=Z Azimuthal Angle Distribution
-XLabel=$\\phi$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_ZANALYSIS/pt-jet
+Title=Jet $p_\perp$
+XLabel=$p_\perp(\text{jet})$ / GeV
+YLabel=$\mathrm{d}N_\text{jet}/\mathrm{d}p_\perp(\text{jet})$ / GeV$^-1$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d10-x01-y01
-Title=Z Mass Distribution
-XLabel=Mass
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_ZANALYSIS/logpt-jet
+Title=Jet $\log(p_\perp/\text{GeV})$
+XLabel=$\log(p_\perp(\text{jet})/\text{GeV})$
+YLabel=$\mathrm{d}N_\text{jet}/\mathrm{d}\log(p_\perp(\text{jet})/\text{GeV})$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d11-x01-y01
-Title=Z log(Mass) Distribution
-XLabel=log(Mass)
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_ZANALYSIS/eta-z
+Title=Z candidate $\eta$
+XLabel=$\eta(\text{Z})$
+YLabel=$\mathrm{d}N_\text{Z}/\mathrm{d}\eta(\text{Z})$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d12-x01-y01
-Title=Jet Counts
-XLabel=Jet count
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_ZANALYSIS/phi-z
+Title=Z candidate $\phi$
+XLabel=$\phi(\text{Z})$
+YLabel=$\mathrm{d}N_\text{Z}/\mathrm{d}\phi(\text{Z})$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d13-x01-y01
-Title=Jet Transverse Momentum Distribution
-XLabel=$p_{T}^{\\mathrm{jet}}$
-YLabel=Weight
+# BEGIN PLOT /MC_LHC_ZANALYSIS/m-z
+Title=Z candidate mass
+XLabel=$m(\text{Z})$ / GeV
+YLabel=$\mathrm{d}N_\text{Z}/\mathrm{d}m(\text{Z})$ / GeV$^-1$
# END PLOT
-# BEGIN PLOT /UA5_1989_S1926373/d14-x01-y01
-Title=Jet log(Transverse Momentum) Distribution
-XLabel=$\\log{p_{T}^{\\mathrm{jet}}}$
-YLabel=Weight
-# END PLOT
\ No newline at end of file
+# BEGIN PLOT /MC_LHC_ZANALYSIS/m-z
+Title=Log of Z candidate mass
+XLabel=$\log(m(\text{Z})/\text{GeV})$
+YLabel=$\mathrm{d}N_\text{Z}/\mathrm{d}\log(m(\text{Z})/\text{GeV})$
+# END PLOT
Modified: trunk/data/plotinfo/Makefile.am
==============================================================================
--- trunk/data/plotinfo/Makefile.am Thu Oct 8 15:35:11 2009 (r1890)
+++ trunk/data/plotinfo/Makefile.am Thu Oct 8 15:35:22 2009 (r1891)
@@ -52,6 +52,8 @@
MC_LHC_LEADINGJETS.plot \
MC_LHC_DIJET.plot \
MC_LHC_ZANALYSIS.plot \
+ MC_LHC_WANALYSIS.plot \
+ MC_LHC_SUSY.plot \
MC_TVT1960_PHOTONJETS.plot \
MC_TVT1960_ZJETS.plot \
OPAL_1998_S3780481.plot \
Modified: trunk/src/Analyses/MC_LHC_WANALYSIS.cc
==============================================================================
--- trunk/src/Analyses/MC_LHC_WANALYSIS.cc Thu Oct 8 15:35:11 2009 (r1890)
+++ trunk/src/Analyses/MC_LHC_WANALYSIS.cc Thu Oct 8 15:35:22 2009 (r1891)
@@ -13,9 +13,9 @@
public:
/// Default constructor
- MC_LHC_WANALYSIS()
- : Analysis("MC_LHC_WANALYSIS")
+ MC_LHC_WANALYSIS() : Analysis("MC_LHC_WANALYSIS")
{
+ //
}
@@ -32,20 +32,22 @@
FastJets fastjets(wf.remainingFinalState(), FastJets::KT, 0.7);
addProjection(fastjets, "Jets");
- _hist_chargemulti = bookHistogram1D("d01-x01-y01", 30, 0.5, 250.5);
- _hist_chargept = bookHistogram1D("d02-x01-y01", 32, 0., 25.);
- _hist_chargemeanpt = bookHistogram1D("d03-x01-y01", 25, 0., 10.);
- _hist_chargermspt = bookHistogram1D("d04-x01-y01", 32, 0., 10.);
- _hist_wcount = bookHistogram1D("d05-x01-y01", 30, 0., 15.);
- _hist_wpt = bookHistogram1D("d06-x01-y01", 32, 0., 25.);
- _hist_wlogpt = bookHistogram1D("d07-x01-y01", 32, 0., 6.);
- _hist_weta = bookHistogram1D("d08-x01-y01", 32, -6., 6.);
- _hist_wphi = bookHistogram1D("d09-x01-y01", 32, 0., 6.4);
- _hist_wmass = bookHistogram1D("d10-x01-y01", 40, 60., 100.);
- _hist_wlogmass = bookHistogram1D("d11-x01-y01", 32, 0., 10.);
- _hist_jetcount = bookHistogram1D("d12-x01-y01", 32, 0, 100);
- _hist_jetpt = bookHistogram1D("d13-x01-y01", 32, 20., 100.);
- _hist_jetlogpt = bookHistogram1D("d14-x01-y01", 32, 0., 20.);
+ _hist_chargemulti = bookHistogram1D("n-ch", 50, -0.5, 199.5);
+ _hist_chargept = bookHistogram1D("pt-ch", 25, 0, 25);
+ /// @todo Use profile plots instead:
+ _hist_chargemeanpt = bookHistogram1D("ptavg-ch", 25, 0, 10);
+ /// @todo Use profile plots instead (and this isn't really an "RMS")
+ _hist_chargermspt = bookHistogram1D("ptrms-ch", 25, 0, 10);
+ _hist_wcount = bookHistogram1D("n-w", 16, -0.5, 15.5);
+ _hist_wpt = bookHistogram1D("pt-w", 25, 0, 25);
+ _hist_wlogpt = bookHistogram1D("logpt-w", 30, 0, 6);
+ _hist_weta = bookHistogram1D("eta-w", 36, -6, 6);
+ _hist_wphi = bookHistogram1D("phi-w", 25, 0, TWOPI);
+ _hist_wmass = bookHistogram1D("m-w", 40, 60, 100);
+ _hist_logmass = bookHistogram1D("logm-w", 20, 0, 10);
+ _hist_jetcount = bookHistogram1D("n-jet", 16, -0.5, 15.5);
+ _hist_jetpt = bookHistogram1D("pt-jet", 50, 20, 100);
+ _hist_jetlogpt = bookHistogram1D("logpt-jet", 20, 0, 20);
}
@@ -110,8 +112,8 @@
AIDA::IHistogram1D* _hist_wcount;
AIDA::IHistogram1D* _hist_wpt;
AIDA::IHistogram1D* _hist_wlogpt;
- //AIDA::IHistogram1D* _hist_zpthigh;
- //AIDA::IHistogram1D* _hist_zlogpthigh;
+ //AIDA::IHistogram1D* _hist_wpthigh;
+ //AIDA::IHistogram1D* _hist_wlogpthigh;
AIDA::IHistogram1D* _hist_weta;
AIDA::IHistogram1D* _hist_wphi;
AIDA::IHistogram1D* _hist_wmass;
Modified: trunk/src/Analyses/MC_LHC_ZANALYSIS.cc
==============================================================================
--- trunk/src/Analyses/MC_LHC_ZANALYSIS.cc Thu Oct 8 15:35:11 2009 (r1890)
+++ trunk/src/Analyses/MC_LHC_ZANALYSIS.cc Thu Oct 8 15:35:22 2009 (r1891)
@@ -13,9 +13,9 @@
public:
/// Default constructor
- MC_LHC_ZANALYSIS()
- : Analysis("MC_LHC_ZANALYSIS")
+ MC_LHC_ZANALYSIS() : Analysis("MC_LHC_ZANALYSIS")
{
+ //
}
@@ -32,20 +32,22 @@
FastJets fastjets(zf.remainingFinalState(), FastJets::KT, 0.7);
addProjection(fastjets, "Jets");
- _hist_chargemulti = bookHistogram1D("d01-x01-y01", 30, 0.5, 250.5);
- _hist_chargept = bookHistogram1D("d02-x01-y01", 32, 0., 25.);
- _hist_chargemeanpt = bookHistogram1D("d03-x01-y01", 25, 0., 10.);
- _hist_chargermspt = bookHistogram1D("d04-x01-y01", 32, 0., 10.);
- _hist_zcount = bookHistogram1D("d05-x01-y01", 30, 0., 15.);
- _hist_zpt = bookHistogram1D("d06-x01-y01", 32, 0., 25.);
- _hist_zlogpt = bookHistogram1D("d07-x01-y01", 32, 0., 6.);
- _hist_zeta = bookHistogram1D("d08-x01-y01", 32, -6., 6.);
- _hist_zphi = bookHistogram1D("d09-x01-y01", 32, 0., 6.4);
- _hist_zmass = bookHistogram1D("d10-x01-y01", 40, 60., 100.);
- _hist_zlogmass = bookHistogram1D("d11-x01-y01", 32, 0., 10.);
- _hist_jetcount = bookHistogram1D("d12-x01-y01", 32, 0, 100);
- _hist_jetpt = bookHistogram1D("d13-x01-y01", 32, 20., 100.);
- _hist_jetlogpt = bookHistogram1D("d14-x01-y01", 32, 0., 20.);
+ _hist_chargemulti = bookHistogram1D("n-ch", 50, -0.5, 199.5);
+ _hist_chargept = bookHistogram1D("pt-ch", 25, 0, 25);
+ /// @todo Use profile plots instead:
+ _hist_chargemeanpt = bookHistogram1D("ptavg-ch", 25, 0, 10);
+ /// @todo Use profile plots instead (and this isn't really an "RMS")
+ _hist_chargermspt = bookHistogram1D("ptrms-ch", 25, 0, 10);
+ _hist_zcount = bookHistogram1D("n-z", 16, -0.5, 15.5);
+ _hist_zpt = bookHistogram1D("pt-z", 25, 0, 25);
+ _hist_zlogpt = bookHistogram1D("logpt-z", 30, 0, 6);
+ _hist_zeta = bookHistogram1D("eta-z", 36, -6, 6);
+ _hist_zphi = bookHistogram1D("phi-z", 25, 0, TWOPI);
+ _hist_zmass = bookHistogram1D("m-z", 40, 60, 100);
+ _hist_zlogmass = bookHistogram1D("logm-z", 20, 0, 10);
+ _hist_jetcount = bookHistogram1D("n-jet", 16, -0.5, 15.5);
+ _hist_jetpt = bookHistogram1D("pt-jet", 50, 20, 100);
+ _hist_jetlogpt = bookHistogram1D("logpt-jet", 20, 0, 20);
}
More information about the Rivet-svn
mailing list
|