|
|
[Rivet-svn] r1691 - in trunk: bin data/plotinfo include/Rivet include/Rivet/Analyses src src/Analyses
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Tue Jul 14 16:31:03 BST 2009
Author: fsiegert
Date: Tue Jul 14 16:30:58 2009
New Revision: 1691
Log:
Second part of moving the plotting metadata out of the source code and
into plain text files:
- Remove titles/xlabel/ylabel from all .cc files in all cases where they
have been moved to data/plotinfo
- Make compare-histos use the plain plotting info
It is still possible to specify the titles in the source code like
before, and they will get used, unless a .plot file exists which
overwrites it.
The biggest benefit: Now you can store arbitrary plot settings within
the Rivet distribution, not only title/xlabel/ylabel. I hope that
whenever one of us realises that a plot needs some custom settings, e.g.
logarithmic x-axis, different legend position, ..., (s)he adds that
information to data/plotinfo.
Modified:
trunk/bin/compare-histos
trunk/data/plotinfo/MC_LHC_LEADINGJETS.plot
trunk/include/Rivet/Analyses/ALEPH_1996_S3486095.hh
trunk/include/Rivet/Analyses/DELPHI_1996_S3430090.hh
trunk/include/Rivet/Analysis.hh
trunk/src/Analyses/ALEPH_1996_S3486095.cc
trunk/src/Analyses/CDF_1990_S2089246.cc
trunk/src/Analyses/CDF_1994_S2952106.cc
trunk/src/Analyses/CDF_2000_S4155203.cc
trunk/src/Analyses/CDF_2001_S4751469.cc
trunk/src/Analyses/CDF_2002_S4796047.cc
trunk/src/Analyses/CDF_2004_S5839831.cc
trunk/src/Analyses/CDF_2005_S6217184.cc
trunk/src/Analyses/CDF_2006_S6653332.cc
trunk/src/Analyses/CDF_2007_S7057202.cc
trunk/src/Analyses/CDF_2008_LEADINGJETS.cc
trunk/src/Analyses/CDF_2008_NOTE_9351.cc
trunk/src/Analyses/CDF_2008_S7541902.cc
trunk/src/Analyses/CDF_2008_S7782535.cc
trunk/src/Analyses/CDF_2008_S7828950.cc
trunk/src/Analyses/CDF_2008_S8093652.cc
trunk/src/Analyses/CDF_2008_S8095620.cc
trunk/src/Analyses/CDF_2009_S8233977.cc
trunk/src/Analyses/D0_2001_S4674421.cc
trunk/src/Analyses/D0_2004_S5992206.cc
trunk/src/Analyses/D0_2006_S6438750.cc
trunk/src/Analyses/D0_2007_S7075677.cc
trunk/src/Analyses/D0_2008_S7554427.cc
trunk/src/Analyses/D0_2008_S7662670.cc
trunk/src/Analyses/D0_2008_S7719523.cc
trunk/src/Analyses/D0_2008_S7837160.cc
trunk/src/Analyses/D0_2008_S7863608.cc
trunk/src/Analyses/D0_2009_S8202443.cc
trunk/src/Analyses/D0_2009_S8320160.cc
trunk/src/Analyses/DELPHI_1995_S3137023.cc
trunk/src/Analyses/DELPHI_1996_S3430090.cc
trunk/src/Analyses/DELPHI_2002_069_CONF_603.cc
trunk/src/Analyses/DELPHI_2003_WUD_03_11.cc
trunk/src/Analyses/ExampleAnalysis.cc
trunk/src/Analyses/H1_1994_S2919893.cc
trunk/src/Analyses/H1_1995_S3167097.cc
trunk/src/Analyses/H1_2000_S4129130.cc
trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc
trunk/src/Analyses/MC_LHC_LEADINGJETS.cc
trunk/src/Analyses/MC_TVT1960_ZJETS.cc
trunk/src/Analyses/OPAL_1998_S3780481.cc
trunk/src/Analyses/PDG_Hadron_Multiplicities.cc
trunk/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc
trunk/src/Analyses/STAR_2006_S6870392.cc
trunk/src/Analyses/STAR_2008_S7993412.cc
trunk/src/Analyses/STAR_2009_UE_HELEN.cc
trunk/src/Analyses/ZEUS_2001_S4815815.cc
trunk/src/Analysis.cc
Modified: trunk/bin/compare-histos
==============================================================================
--- trunk/bin/compare-histos Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/bin/compare-histos Tue Jul 14 16:30:58 2009 (r1691)
@@ -214,12 +214,29 @@
return myhist
+## regex patterns ##
+import re
+pat_begin_block = re.compile('^# BEGIN ([A-Z0-9_]+) ?(\S+)?')
+# temporarily allow several hashes before END for YODA
+pat_end_block = re.compile('^#+ END ([A-Z0-9_]+)')
+pat_comment = re.compile('^#|^\s*$')
+pat_property = re.compile('^(\w+?)=(.*)$')
+pat_path_property = re.compile('^(\S+?)::(\w+?)=(.*)$')
+
+def is_end_marker(line, blockname):
+ m = pat_end_block.match(line)
+ return m and m.group(1) == blockname
+
+def is_comment(line):
+ return pat_comment.match(line) is not None
+
## END HISTO HACKS
##############################################################
if __name__ == "__main__":
import os, sys, re, logging
+ from subprocess import Popen, PIPE
usage = """%prog - generate comparison plots
@@ -238,6 +255,10 @@
except ImportError:
pass
+ try:
+ rivet_data_dir=Popen(["rivet-config", "--datadir"], stdout=PIPE).communicate()[0].split()[0]
+ except:
+ rivet_data_dir=""
## Parse command line options
from optparse import OptionParser
@@ -262,6 +283,8 @@
default=True, help="make plot file even if there is only one dataset to be plotted")
parser.add_option("--refid", dest="REF_ID",
default="REF", help="ID of reference data set (file path for non-REF data)")
+ parser.add_option("--plot-info-dir", dest="PLOTINFODIR",
+ default=rivet_data_dir, help="directory which may contain plot header information")
parser.add_option("-Q", "--quiet", help="Suppress normal messages", dest="LOGLEVEL",
action="store_const", default=logging.INFO, const=logging.WARNING)
parser.add_option("-V", "--verbose", help="Add extra debug messages", dest="LOGLEVEL",
@@ -442,26 +465,57 @@
## Header
+ plotfile = os.path.join(opts.PLOTINFODIR, name.split("/")[1]+".plot")
+ headers = {}
+ if os.access(plotfile, os.R_OK):
+ f = open(plotfile)
+ startreading=False
+ for line in f:
+ m = pat_begin_block.match(line)
+ if m:
+ tag, pathpat = m.group(1,2)
+ if tag == 'PLOT' and (re.match(pathpat, name) is not None):
+ startreading=True
+ continue
+ if not startreading:
+ continue
+ if is_end_marker(line, 'PLOT'):
+ break
+ elif is_comment(line):
+ continue
+ vm = pat_property.match(line)
+ if vm:
+ prop, value = vm.group(1,2)
+ headers[prop] = value
+
+ drawonlystr = ""
+ for hfile in activefiles:
+ drawonlystr += hfile + HISTOS[hfile][name].fullPath()+" "
+ paramdefaults = {"Title" : title,
+ "XLabel" : xlabel,
+ "YLabel" : ylabel,
+ "Legend" : "1",
+ "LogY" : "%d" % int((len(HISTOS[ref][name].getBins()) > 1) and not opts.LINEAR),
+ "DrawOnly" : drawonlystr,
+ "RatioPlot" : "%d" % int(not opts.NORATIO),
+ "RatioPlotReference" : "%s%s" % (ref, HISTOS[ref][name].fullPath()),
+ "RatioPlotYMin" : "0.5",
+ "RatioPlotYMax" : "1.5",
+ "RatioPlotYLabel" : "MC/data"}
+
headstr = "# BEGIN PLOT\n"
- headstr += "Title=%s\n" % title
- headstr += "XLabel=%s\n" % xlabel
- headstr += "YLabel=%s\n" % ylabel
- headstr += "Legend=1\n"
- if len(HISTOS[ref][name].getBins()) > 1:
- headstr += "LogY=%d\n" % int(not opts.LINEAR)
- headstr += "DrawOnly=%s\n" % " ".join(activefiles)
- headstr += "RatioPlot=%d\n" % int(not opts.NORATIO)
- headstr += "RatioPlotReference=%s\n" % ref
- headstr += "RatioPlotYMin=0.5\n"
- headstr += "RatioPlotYMax=1.5\n"
- headstr += "RatioPlotYLabel=MC/data\n"
+ for param, default in paramdefaults.iteritems():
+ if param not in headers:
+ headers[param] = default
+ for key, val in headers.iteritems():
+ headstr += "%s=%s\n" % (key, val)
headstr += "# END PLOT\n"
## Write histos
histstrs = []
i = 0
for hfile in activefiles:
- histstr = '# BEGIN HISTOGRAM %s\n' % hfile
+ histstr = '# BEGIN HISTOGRAM %s%s\n' % (hfile, HISTOS[hfile][name].fullPath())
if HISTOS[hfile][name].isdata:
histstr += "ErrorBars=1\n"
histstr += "PolyMarker=*\n"
Modified: trunk/data/plotinfo/MC_LHC_LEADINGJETS.plot
==============================================================================
--- trunk/data/plotinfo/MC_LHC_LEADINGJETS.plot Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/data/plotinfo/MC_LHC_LEADINGJETS.plot Tue Jul 14 16:30:58 2009 (r1691)
@@ -0,0 +1,41 @@
+# BEGIN PLOT /MC_LHC_LEADINGJETS/trans-nchg
+Title=Transverse region charged particle density
+XLabel=Leading jet $p_\perp$ / GeV
+YLabel=$\mathrm{d}{N_\text{ch}}/\mathrm{d}{\phi}$
+# END PLOT
+
+# BEGIN PLOT /MC_LHC_LEADINGJETS/trans-maxnchg
+Title=TransMAX region charged particle density
+XLabel=Leading jet $p_\perp$ / GeV
+YLabel=$\mathrm{d}{N_\text{ch}}/\mathrm{d}{\phi}$
+# END PLOT
+
+# BEGIN PLOT /MC_LHC_LEADINGJETS/trans-minnchg
+Title=TransMIN region charged particle density
+XLabel=Leading jet $p_\perp$ / GeV
+YLabel=$\mathrm{d}{N_\text{ch}}/\mathrm{d}{\phi}$
+# END PLOT
+
+# BEGIN PLOT /MC_LHC_LEADINGJETS/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}$
+# END PLOT
+
+# BEGIN PLOT /MC_LHC_LEADINGJETS/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}$
+# END PLOT
+
+# BEGIN PLOT /MC_LHC_LEADINGJETS/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}$
+# END PLOT
+
+# BEGIN PLOT /MC_LHC_LEADINGJETS/trans-ptavg
+Title=Transverse region charged pT average
+XLabel=Leading jet $p_\perp$ / GeV
+YLabel=$\langle p_\perp \rangle$
+# END PLOT
Modified: trunk/include/Rivet/Analyses/ALEPH_1996_S3486095.hh
==============================================================================
--- trunk/include/Rivet/Analyses/ALEPH_1996_S3486095.hh Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/include/Rivet/Analyses/ALEPH_1996_S3486095.hh Tue Jul 14 16:30:58 2009 (r1691)
@@ -36,11 +36,6 @@
private:
- /// Little helper functions for the axis labels
- string unitdsigbyd(const string&);
- string unitdNbyd(const string&);
- string texmath(const string&);
-
/// Store the weighted sums of numbers of charged / charged+neutral
/// particles - used to calculate average number of particles for the
/// inclusive single particle distributions' normalisations.
Modified: trunk/include/Rivet/Analyses/DELPHI_1996_S3430090.hh
==============================================================================
--- trunk/include/Rivet/Analyses/DELPHI_1996_S3430090.hh Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/include/Rivet/Analyses/DELPHI_1996_S3430090.hh Tue Jul 14 16:30:58 2009 (r1691)
@@ -52,12 +52,6 @@
private:
- /// Little helper functions for the axis labels
- string dsigbyd(const string&);
- string Ndsigbyd(const string&);
- string unitdsigbyd(const string&);
- string texmath(const string&);
-
/// Store the weighted sums of numbers of charged / charged+neutral
/// particles - used to calculate average number of particles for the
/// inclusive single particle distributions' normalisations.
Modified: trunk/include/Rivet/Analysis.hh
==============================================================================
--- trunk/include/Rivet/Analysis.hh Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/include/Rivet/Analysis.hh Tue Jul 14 16:30:58 2009 (r1691)
@@ -288,37 +288,31 @@
/// (NB. this returns a pointer rather than a reference since it will
/// have to be stored in the analysis class - there's no point in forcing users to explicitly
/// get the pointer from a reference before they can use it!)
- AIDA::IHistogram1D* bookHistogram1D(const std::string& name, const std::string& title,
- const std::string& xtitle, const std::string& ytitle,
- const size_t nbins, const double lower, const double upper);
- AIDA::IHistogram1D* bookHistogram1D(const std::string& name, const std::string& title,
- const size_t nbins, const double lower, const double upper);
+ AIDA::IHistogram1D* bookHistogram1D(const std::string& name,
+ const size_t nbins, const double lower, const double upper,
+ const std::string& title="",
+ const std::string& xtitle="", const std::string& ytitle="");
/// Book a 1D histogram with non-uniform bins defined by the vector of bin edges @a binedges .
/// (NB. this returns a pointer rather than a reference since it will
/// have to be stored in the analysis class - there's no point in forcing users to explicitly
/// get the pointer from a reference before they can use it!)
- AIDA::IHistogram1D* bookHistogram1D(const std::string& name, const std::string& title,
- const std::string& xtitle, const std::string& ytitle,
- const std::vector<double>& binedges);
- AIDA::IHistogram1D* bookHistogram1D(const std::string& name, const std::string& title,
- const std::vector<double>& binedges);
+ AIDA::IHistogram1D* bookHistogram1D(const std::string& name,
+ const std::vector<double>& binedges, const std::string& title="",
+ const std::string& xtitle="", const std::string& ytitle="");
/// Book a 1D histogram based on the name in the corresponding AIDA
/// file. The binnings will be obtained by reading the bundled AIDA data
/// record file with the same filename as the analysis' name() property.
- AIDA::IHistogram1D* bookHistogram1D(const std::string& name, const std::string& title,
- const std::string& xtitle, const std::string& ytitle);
- AIDA::IHistogram1D* bookHistogram1D(const std::string& name, const std::string& title);
+ AIDA::IHistogram1D* bookHistogram1D(const std::string& name, const std::string& title="",
+ const std::string& xtitle="", const std::string& ytitle="");
/// Book a 1D histogram based on the paper, dataset and x/y-axis IDs in the corresponding
/// HepData record. The binnings will be obtained by reading the bundled AIDA data record file
/// of the same filename as the analysis' name() property.
AIDA::IHistogram1D* bookHistogram1D(const size_t datasetId, const size_t xAxisId,
- const size_t yAxisId, const std::string& title,
- const std::string& xtitle, const std::string& ytitle);
- AIDA::IHistogram1D* bookHistogram1D(const size_t datasetId, const size_t xAxisId,
- const size_t yAxisId, const std::string& title);
+ const size_t yAxisId, const std::string& title="",
+ const std::string& xtitle="", const std::string& ytitle="");
//@}
@@ -330,37 +324,32 @@
/// (NB. this returns a pointer rather than a reference since it will
/// have to be stored in the analysis class - there's no point in forcing users to explicitly
/// get the pointer from a reference before they can use it!)
- AIDA::IProfile1D* bookProfile1D(const std::string& name, const std::string& title,
- const std::string& xtitle, const std::string& ytitle,
- const size_t nbins, const double lower, const double upper);
- AIDA::IProfile1D* bookProfile1D(const std::string& name, const std::string& title,
- const size_t nbins, const double lower, const double upper);
+ AIDA::IProfile1D* bookProfile1D(const std::string& name,
+ const size_t nbins, const double lower, const double upper,
+ const std::string& title="",
+ const std::string& xtitle="", const std::string& ytitle="");
/// Book a 1D profile histogram with non-uniform bins defined by the vector of bin edges @a binedges .
/// (NB. this returns a pointer rather than a reference since it will
/// have to be stored in the analysis class - there's no point in forcing users to explicitly
/// get the pointer from a reference before they can use it!)
- AIDA::IProfile1D* bookProfile1D(const std::string& name, const std::string& title,
- const std::string& xtitle, const std::string& ytitle,
- const std::vector<double>& binedges);
- AIDA::IProfile1D* bookProfile1D(const std::string& name, const std::string& title,
- const std::vector<double>& binedges);
+ AIDA::IProfile1D* bookProfile1D(const std::string& name,
+ const std::vector<double>& binedges,
+ const std::string& title="",
+ const std::string& xtitle="", const std::string& ytitle="");
/// Book a 1D profile histogram based on the name in the corresponding AIDA
/// file. The binnings will be obtained by reading the bundled AIDA data
/// record file with the same filename as the analysis' name() property.
- AIDA::IProfile1D* bookProfile1D(const std::string& name, const std::string& title,
- const std::string& xtitle, const std::string& ytitle);
- AIDA::IProfile1D* bookProfile1D(const std::string& name, const std::string& title);
+ AIDA::IProfile1D* bookProfile1D(const std::string& name, const std::string& title="",
+ const std::string& xtitle="", const std::string& ytitle="");
/// Book a 1D profile histogram based on the paper, dataset and x/y-axis IDs in the corresponding
/// HepData record. The binnings will be obtained by reading the bundled AIDA data record file
/// of the same filename as the analysis' name() property.
AIDA::IProfile1D* bookProfile1D(const size_t datasetId, const size_t xAxisId,
- const size_t yAxisId, const std::string& title,
- const std::string& xtitle, const std::string& ytitle);
- AIDA::IProfile1D* bookProfile1D(const size_t datasetId, const size_t xAxisId,
- const size_t yAxisId, const std::string& title);
+ const size_t yAxisId, const std::string& title="",
+ const std::string& xtitle="", const std::string& ytitle="");
//@}
@@ -371,20 +360,18 @@
/// (NB. this returns a pointer rather than a reference since it will
/// have to be stored in the analysis class - there's no point in forcing users to explicitly
/// get the pointer from a reference before they can use it!)
- AIDA::IDataPointSet* bookDataPointSet(const std::string& name, const std::string& title,
- const std::string& xtitle, const std::string& ytitle);
- AIDA::IDataPointSet* bookDataPointSet(const std::string& name, const std::string& title);
+ AIDA::IDataPointSet* bookDataPointSet(const std::string& name, const std::string& title="",
+ const std::string& xtitle="", const std::string& ytitle="");
/// Book a 2-dimensional data point set with equally spaced points in a range.
/// (NB. this returns a pointer rather than a reference since it will
/// have to be stored in the analysis class - there's no point in forcing users to explicitly
/// get the pointer from a reference before they can use it!)
- AIDA::IDataPointSet* bookDataPointSet(const std::string& name, const std::string& title,
- const std::string& xtitle, const std::string& ytitle,
- const size_t npts, const double lower, const double upper);
- AIDA::IDataPointSet* bookDataPointSet(const std::string& name, const std::string& title,
- const size_t npts, const double lower, const double upper);
+ AIDA::IDataPointSet* bookDataPointSet(const std::string& name,
+ const size_t npts, const double lower, const double upper,
+ const std::string& title="",
+ const std::string& xtitle="", const std::string& ytitle="");
/// Book a 2-dimensional data point set based on the corresponding AIDA data
/// file. The binnings (x-errors) will be obtained by reading the bundled
@@ -396,10 +383,8 @@
/// HepData record. The binnings (x-errors) will be obtained by reading the bundled AIDA data record file
/// of the same filename as the analysis' name() property.
AIDA::IDataPointSet* bookDataPointSet(const size_t datasetId, const size_t xAxisId,
- const size_t yAxisId, const std::string& title,
- const std::string& xtitle, const std::string& ytitle);
- AIDA::IDataPointSet* bookDataPointSet(const size_t datasetId, const size_t xAxisId,
- const size_t yAxisId, const std::string& title);
+ const size_t yAxisId, const std::string& title="",
+ const std::string& xtitle="", const std::string& ytitle="");
//@}
Modified: trunk/src/Analyses/ALEPH_1996_S3486095.cc
==============================================================================
--- trunk/src/Analyses/ALEPH_1996_S3486095.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/ALEPH_1996_S3486095.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -275,112 +275,71 @@
}
- string ALEPH_1996_S3486095::unitdsigbyd(const string& x) {
- return "1/\\sigma \\, \\text{d}{\\sigma}/\\text{d}{" + x + "}";
- }
- string ALEPH_1996_S3486095::unitdNbyd(const string& x) {
- return "1/N \\, \\text{d}{N}/\\text{d}{" + x + "}";
- }
- string ALEPH_1996_S3486095::texmath(const string& foo) {
- return "$" + foo + "$";
- }
-
void ALEPH_1996_S3486095::init() {
- _histSphericity = bookHistogram1D(1, 1, 1, "Sphericity, $S$ (charged)",
- "$S$", texmath(unitdNbyd("S")));
- _histAplanarity = bookHistogram1D(2, 1, 1, "Aplanarity, $A$ (charged)",
- "$A$", texmath(unitdNbyd("A")));
+ _histSphericity = bookHistogram1D(1, 1, 1);
+ _histAplanarity = bookHistogram1D(2, 1, 1);
- _hist1MinusT = bookHistogram1D(3, 1, 1, "1-Thrust, $1-T$ (charged)",
- "$1-T$", texmath(unitdNbyd("(1-T)")));
- _histTMinor = bookHistogram1D(4, 1, 1, "Thrust minor, $m$ (charged)",
- "$m$", texmath(unitdNbyd("m")));
-
- _histY3 = bookHistogram1D(5, 1, 1, "Two-jet resolution variable, $Y_3$ (charged)",
- "$Y_3$", texmath(unitdNbyd("Y_3")));
- _histHeavyJetMass = bookHistogram1D(6, 1, 1, "Heavy jet mass (charged)",
- "$M_h^2/s$", texmath(unitdNbyd("(M_h^2/s)")));
- _histCParam = bookHistogram1D(7, 1, 1, "$C$ parameter (charged)",
- "$C$", texmath(unitdNbyd("C")));
- _histOblateness = bookHistogram1D(8, 1, 1, "Oblateness, $M - m$ (charged)",
- "$O$", texmath(unitdNbyd("O")));
-
- _histScaledMom = bookHistogram1D(9, 1, 1, "Scaled momentum, $x_p = |p|/|p_\\text{beam}|$ (charged)",
- "$x_p$", texmath(unitdsigbyd("x_p")));
- _histRapidityT = bookHistogram1D(10, 1, 1, "Rapidity w.r.t. thrust axes, $y_T$ (charged)",
- "$y_T$", texmath(unitdsigbyd("y_T")));
-
- _histPtSIn = bookHistogram1D(11, 1, 1, "In-plane $p_T$ in GeV w.r.t. sphericity axes (charged)",
- "$p_\\perp^\\text{in}$ / GeV", texmath(unitdsigbyd("p_\\perp^\\text{in}")));
- _histPtSOut = bookHistogram1D(12, 1, 1, "Out-of-plane $p_T$ in GeV w.r.t. sphericity axes (charged)",
- "$p_\\perp^\\text{out}$ / GeV", texmath(unitdsigbyd("p_\\perp^\\text{out}")));
-
- _histLogScaledMom = bookHistogram1D(17, 1, 1, "Log of scaled momentum, $\\log(1/x_p)$ (charged)",
- "$\\xi_p$", texmath(unitdsigbyd("\\xi_p")));
-
- _histChMult = bookHistogram1D(18, 1, 1, "Charged multiplicity distribution",
- "$N_\\text{ch}$", texmath(unitdNbyd("N_\\text{ch}")));
- _histMeanChMult = bookHistogram1D(19, 1, 1, "Mean charged multiplicity", "", "Multiplicity");
-
- _histMeanChMultRapt05= bookHistogram1D(20, 1, 1, "Mean charged multiplicity for rapidity $|Y| < 0.5$", "", "Multiplicity");
- _histMeanChMultRapt10= bookHistogram1D(21, 1, 1, "Mean charged multiplicity for rapidity $|Y| < 1.0$", "", "Multiplicity");
- _histMeanChMultRapt15= bookHistogram1D(22, 1, 1, "Mean charged multiplicity for rapidity $|Y| < 1.5$", "", "Multiplicity");
- _histMeanChMultRapt20= bookHistogram1D(23, 1, 1, "Mean charged multiplicity for rapidity $|Y| < 2.0$", "", "Multiplicity");
+ _hist1MinusT = bookHistogram1D(3, 1, 1);
+ _histTMinor = bookHistogram1D(4, 1, 1);
+
+ _histY3 = bookHistogram1D(5, 1, 1);
+ _histHeavyJetMass = bookHistogram1D(6, 1, 1);
+ _histCParam = bookHistogram1D(7, 1, 1);
+ _histOblateness = bookHistogram1D(8, 1, 1);
+
+ _histScaledMom = bookHistogram1D(9, 1, 1);
+ _histRapidityT = bookHistogram1D(10, 1, 1);
+
+ _histPtSIn = bookHistogram1D(11, 1, 1);
+ _histPtSOut = bookHistogram1D(12, 1, 1);
+
+ _histLogScaledMom = bookHistogram1D(17, 1, 1);
+
+ _histChMult = bookHistogram1D(18, 1, 1);
+ _histMeanChMult = bookHistogram1D(19, 1, 1);
+
+ _histMeanChMultRapt05= bookHistogram1D(20, 1, 1);
+ _histMeanChMultRapt10= bookHistogram1D(21, 1, 1);
+ _histMeanChMultRapt15= bookHistogram1D(22, 1, 1);
+ _histMeanChMultRapt20= bookHistogram1D(23, 1, 1);
// Particle spectra
- _histMultiPiPlus = bookHistogram1D(25, 1, 1, "$\\pi^\\pm$ spectrum",
- "$x_p$", texmath(unitdsigbyd("x_p")));
- _histMultiKPlus = bookHistogram1D(26, 1, 1, "$K^\\pm$ spectrum",
- "$x_p$", texmath(unitdsigbyd("x_p")));
- _histMultiP = bookHistogram1D(27, 1, 1, "$p$ spectrum",
- "$x_p$", texmath(unitdsigbyd("x_p")));
- _histMultiPhoton = bookHistogram1D(28, 1, 1, "$\\gamma$ spectrum",
- "$\\xi_p$", texmath(unitdsigbyd("\\xi_p")));
- _histMultiPi0 = bookHistogram1D(29, 1, 1, "$\\pi^0$ spectrum",
- "$x_p$", texmath(unitdsigbyd("x_p")));
- _histMultiEta = bookHistogram1D(30, 1, 1, "$\\eta$ spectrum",
- "$x_E$", texmath(unitdsigbyd("x_E")));
- _histMultiEtaPrime = bookHistogram1D(31, 1, 1, "$\\eta'$ spectrum",
- "$x_E$", texmath(unitdsigbyd("x_E")));
- _histMultiK0 = bookHistogram1D(32, 1, 1, "$K^0$ spectrum",
- "$x_p$", texmath(unitdsigbyd("x_p")));
- _histMultiLambda0 = bookHistogram1D(33, 1, 1, "$\\Lambda^0$ spectrum",
- "$x_p$", texmath(unitdsigbyd("x_p")));
- _histMultiXiMinus = bookHistogram1D(34, 1, 1, "$\\Xi^-$ spectrum",
- "$x_E$", texmath(unitdsigbyd("x_E")));
- _histMultiSigma1385Plus = bookHistogram1D(35, 1, 1, "$\\Sigma^\\pm(1385)$ spectrum",
- "$x_E$", texmath(unitdsigbyd("x_E")));
- _histMultiXi1530_0 = bookHistogram1D(36, 1, 1, "$\\Xi^0(1530)$ spectrum",
- "$x_E$", texmath(unitdsigbyd("x_E")));
- _histMultiRho = bookHistogram1D(37, 1, 1, "$\\rho$ spectrum",
- "$x_p$", texmath(unitdsigbyd("x_p")));
- _histMultiOmega782 = bookHistogram1D(38, 1, 1, "$\\omega(782)$ spectrum",
- "$x_p$", texmath(unitdsigbyd("x_p")));
- _histMultiKStar892_0 = bookHistogram1D(39, 1, 1, "$K^{*0}(892)$ spectrum",
- "$x_p$", texmath(unitdsigbyd("x_p")));
- _histMultiPhi = bookHistogram1D(40, 1, 1, "$\\phi$ spectrum",
- "$x_p$", texmath(unitdsigbyd("x_p")));
+ _histMultiPiPlus = bookHistogram1D(25, 1, 1);
+ _histMultiKPlus = bookHistogram1D(26, 1, 1);
+ _histMultiP = bookHistogram1D(27, 1, 1);
+ _histMultiPhoton = bookHistogram1D(28, 1, 1);
+ _histMultiPi0 = bookHistogram1D(29, 1, 1);
+ _histMultiEta = bookHistogram1D(30, 1, 1);
+ _histMultiEtaPrime = bookHistogram1D(31, 1, 1);
+ _histMultiK0 = bookHistogram1D(32, 1, 1);
+ _histMultiLambda0 = bookHistogram1D(33, 1, 1);
+ _histMultiXiMinus = bookHistogram1D(34, 1, 1);
+ _histMultiSigma1385Plus = bookHistogram1D(35, 1, 1);
+ _histMultiXi1530_0 = bookHistogram1D(36, 1, 1);
+ _histMultiRho = bookHistogram1D(37, 1, 1);
+ _histMultiOmega782 = bookHistogram1D(38, 1, 1);
+ _histMultiKStar892_0 = bookHistogram1D(39, 1, 1);
+ _histMultiPhi = bookHistogram1D(40, 1, 1);
- _histMultiKStar892Plus = bookHistogram1D(43, 1, 1, "$K^{*\\pm}(892)$ spectrum",
- "$x_E$", texmath(unitdsigbyd("x_E")));
+ _histMultiKStar892Plus = bookHistogram1D(43, 1, 1);
// Mean multiplicities
- _histMeanMultiPi0 = bookHistogram1D(44, 1, 2, "Mean $\\pi^0$ multiplicity", "", "Multiplicity");
- _histMeanMultiEta = bookHistogram1D(44, 1, 3, "Mean $\\eta$ multiplicity", "", "Multiplicity");
- _histMeanMultiEtaPrime = bookHistogram1D(44, 1, 4, "Mean $\\eta'$ multiplicity", "", "Multiplicity");
- _histMeanMultiK0 = bookHistogram1D(44, 1, 5, "Mean $K_S + K_L$ multiplicity", "", "Multiplicity");
- _histMeanMultiRho = bookHistogram1D(44, 1, 6, "Mean $\\rho^0$ multiplicity", "", "Multiplicity");
- _histMeanMultiOmega782 = bookHistogram1D(44, 1, 7, "Mean $\\omega(782)$ multiplicity", "", "Multiplicity");
- _histMeanMultiPhi = bookHistogram1D(44, 1, 8, "Mean $\\phi$ multiplicity", "", "Multiplicity");
- _histMeanMultiKStar892Plus = bookHistogram1D(44, 1, 9, "Mean $K^{*\\pm}$ multiplicity", "", "Multiplicity");
- _histMeanMultiKStar892_0 = bookHistogram1D(44, 1, 10, "Mean $K^{*0}$ multiplicity", "", "Multiplicity");
- _histMeanMultiLambda0 = bookHistogram1D(44, 1, 11, "Mean $\\Lambda$ multiplicity", "", "Multiplicity");
- _histMeanMultiSigma0 = bookHistogram1D(44, 1, 12, "Mean $\\Sigma$ multiplicity", "", "Multiplicity");
- _histMeanMultiXiMinus = bookHistogram1D(44, 1, 13, "Mean $\\Xi$ multiplicity", "", "Multiplicity");
- _histMeanMultiSigma1385Plus = bookHistogram1D(44, 1, 14, "Mean $\\Sigma(1385)$ multiplicity", "", "Multiplicity");
- _histMeanMultiXi1530_0 = bookHistogram1D(44, 1, 15, "Mean $\\Xi(1530)$ multiplicity", "", "Multiplicity");
- _histMeanMultiOmegaOmegaBar = bookHistogram1D(44, 1, 16, "Mean $\\Omega^\\mp$ multiplicity", "", "Multiplicity");
+ _histMeanMultiPi0 = bookHistogram1D(44, 1, 2);
+ _histMeanMultiEta = bookHistogram1D(44, 1, 3);
+ _histMeanMultiEtaPrime = bookHistogram1D(44, 1, 4);
+ _histMeanMultiK0 = bookHistogram1D(44, 1, 5);
+ _histMeanMultiRho = bookHistogram1D(44, 1, 6);
+ _histMeanMultiOmega782 = bookHistogram1D(44, 1, 7);
+ _histMeanMultiPhi = bookHistogram1D(44, 1, 8);
+ _histMeanMultiKStar892Plus = bookHistogram1D(44, 1, 9);
+ _histMeanMultiKStar892_0 = bookHistogram1D(44, 1, 10);
+ _histMeanMultiLambda0 = bookHistogram1D(44, 1, 11);
+ _histMeanMultiSigma0 = bookHistogram1D(44, 1, 12);
+ _histMeanMultiXiMinus = bookHistogram1D(44, 1, 13);
+ _histMeanMultiSigma1385Plus = bookHistogram1D(44, 1, 14);
+ _histMeanMultiXi1530_0 = bookHistogram1D(44, 1, 15);
+ _histMeanMultiOmegaOmegaBar = bookHistogram1D(44, 1, 16);
}
Modified: trunk/src/Analyses/CDF_1990_S2089246.cc
==============================================================================
--- trunk/src/Analyses/CDF_1990_S2089246.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/CDF_1990_S2089246.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -22,20 +22,10 @@
void CDF_1990_S2089246::init() {
- const string dNdEtaTeX = "$\\mathrm{d}{N_\\text{ch}}/\\mathrm{d}{\\eta}$";
- const string etaTeX = "$\\eta$";
-
/// @todo Get 630 GeV data in HepData
- // _hist_eta630 = bookHistogram1D(3, 1, 0,
- // "Pseudorapidity distribution at $\\sqrt{s} = \\unit{630}{\\GeV}$", dNdEtaTeX, etaTeX);
- _hist_eta630 =
- bookHistogram1D("d03-x01-y00",
- "Pseudorapidity distribution at $\\sqrt{s} = \\unit{630}{\\GeV}$",
- dNdEtaTeX, etaTeX, 10, 0, 3.5);
- _hist_eta1800 =
- bookHistogram1D(3, 1, 1,
- "Pseudorapidity distribution at $\\sqrt{s} = \\unit{1800}{\\GeV}$",
- dNdEtaTeX, etaTeX);
+ // _hist_eta630 = bookHistogram1D(3, 1, 0);
+ _hist_eta630 = bookHistogram1D("d03-x01-y00", 10, 0, 3.5);
+ _hist_eta1800 = bookHistogram1D(3, 1, 1);
}
Modified: trunk/src/Analyses/CDF_1994_S2952106.cc
==============================================================================
--- trunk/src/Analyses/CDF_1994_S2952106.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/CDF_1994_S2952106.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -48,73 +48,35 @@
//const string htitle2 = "R vs alpha";
//_histRvsAlpha = bookHistogram2D(hname2, htitle2, 50, 0., 5., 32, -1.6, 1.6);
- const string ylabel = "Fraction of events";
+ _histJet1Et = bookHistogram1D("Jet1Et", 40, 0., 500.);
+ _histJet2Et = bookHistogram1D("Jet2Et", 40, 0., 500.);
+ _histR23 = bookHistogram1D("R23", 50, 0., 5.);
+ _histJet3eta = bookHistogram1D("Jet3eta", 42, -4., 4.);
- const string hname3 = "Jet1Et";
- const string htitle3 = "$E_\\perp$ of leading jet";
- _histJet1Et =
- bookHistogram1D(hname3, htitle3, "$E_\\perp^1$ [GeV]", ylabel, 40, 0., 500.);
-
- const string hname4 = "Jet2Et";
- const string htitle4 = "$E_\\perp$ of 2nd leading jet";
- _histJet2Et =
- bookHistogram1D(hname4, htitle4, "$E_\\perp^2$ [GeV]", ylabel, 40, 0., 500.);
-
- const string hname5 = "R23";
- const string htitle5 = "$R$ distance between 2nd and 3rd jet";
- _histR23 =
- bookHistogram1D(hname5, htitle5, "$R_{23}$", ylabel, 50, 0., 5.);
-
- const string hname6 = "Jet3eta";
- const string htitle6 = "Pseudorapidity, $\\eta$, of 3rd jet";
- _histJet3eta =
- bookHistogram1D(hname6, htitle6, "$\\eta_3$", ylabel, 42, -4., 4.);
-
- /// @todo Need better title
- const string hname7 = "alpha";
- const string htitle7 = "$\\alpha$";
- _histAlpha =
- bookHistogram1D(hname7, htitle7, "$\\alpha$", ylabel, 42, -PI/2., PI/2.);
+ /// @todo Need better title
+ _histAlpha = bookHistogram1D("alpha", 42, -PI/2., PI/2.);
//const string hname8 = "alphaMCvsDat";
//const string htitle8 = "alpha MC vs. Data ";
//_histAlphaMCvsDat = bookHistogram1D(hname8, htitle8, 42, -PI/2., PI/2.);
/// @todo Need better title
- const string hname9 = "alphaIdeal";
- const string htitle9 = "$\\alpha_\\text{ideal}$";
- _histAlpaIdeal =
- bookHistogram1D(hname9, htitle9, "$\\alpha$", ylabel, 42, -PI/2., PI/2.);
+ _histAlpaIdeal = bookHistogram1D("alphaIdeal", 42, -PI/2., PI/2.);
/// @todo Need better title
- const string hname10 = "alphaCDF";
- const string htitle10 = "$\\alpha_\\text{CDF}$";
- _histAlpaCDF =
- bookHistogram1D(hname10, htitle10, "$\\alpha$", ylabel, 42, -PI/2., PI/2.);
+ _histAlpaCDF = bookHistogram1D("alphaCDF", 42, -PI/2., PI/2.);
/// @todo Need better title
- const string hname11 = "R23Ideal";
- const string htitle11 = "$R_{23}^\\text{ideal}$";
- _histR23Ideal =
- bookHistogram1D(hname11, htitle11, "$R_{23}$", ylabel, 50, 0., 5.);
+ _histR23Ideal = bookHistogram1D("R23Ideal", 50, 0., 5.);
/// @todo Need better title
- const string hname12 = "R23CDF";
- const string htitle12 = "$R_{23}^\\text{CDF}$";
- _histR23CDF =
- bookHistogram1D(hname12, htitle12, "$R_{23}$", ylabel, 50, 0., 5.);
+ _histR23CDF = bookHistogram1D("R23CDF", 50, 0., 5.);
/// @todo Need better title
- const string hname13 = "Jet3etaIdeal";
- const string htitle13 = "Jet #3 $\\eta_\\text{ideal}$";
- _histJet3etaIdeal =
- bookHistogram1D(hname13, htitle13, "$\\eta_3$", ylabel, 42, -4., 4.);
+ _histJet3etaIdeal = bookHistogram1D("Jet3etaIdeal", 42, -4., 4.);
/// @todo Need better title
- const string hname14 = "Jet3etaCDF";
- const string htitle14 = "Jet #3 $\\eta_\\text{CDF}$";
- _histJet3etaCDF =
- bookHistogram1D(hname14, htitle14, "$\\eta_3$", ylabel, 42, -4., 4.);
+ _histJet3etaCDF = bookHistogram1D("Jet3etaCDF", 42, -4., 4.);
}
Modified: trunk/src/Analyses/CDF_2000_S4155203.cc
==============================================================================
--- trunk/src/Analyses/CDF_2000_S4155203.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/CDF_2000_S4155203.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -22,9 +22,7 @@
// Book histograms
void CDF_2000_S4155203::init() {
/// @todo Cross-section units in label
- _hist_zpt =
- bookHistogram1D(1, 1, 1, "$p_\\perp$ of Z boson in $\\Pelectron \\Ppositron$ decays",
- "$p_\\perp(\\PZ)$ / GeV", "$\\mathrm{d}{\\sigma}/\\mathrm{d}{p_\\perp(\\PZ)}$");
+ _hist_zpt = bookHistogram1D(1, 1, 1);
}
Modified: trunk/src/Analyses/CDF_2001_S4751469.cc
==============================================================================
--- trunk/src/Analyses/CDF_2001_S4751469.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/CDF_2001_S4751469.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -32,38 +32,23 @@
// Book histograms
void CDF_2001_S4751469::init() {
- const string pT1 = "$p_\\perp^\\text{lead}$";
- const string Nch = "$N_\\text{ch}$";
- string xlabel = pT1 + " / GeV";
- string ylabel = Nch;
- _numTowardMB = bookProfile1D(3, 1, 1, Nch + " (toward) for min-bias", xlabel, ylabel);
- _numTransMB = bookProfile1D(3, 1, 2, Nch + " (transverse) for min-bias", xlabel, ylabel);
- _numAwayMB = bookProfile1D(3, 1, 3, Nch + " (away) for min-bias", xlabel, ylabel);
- _numTowardJ20 = bookProfile1D(4, 1, 1, Nch + " (toward) for JET20", xlabel, ylabel);
- _numTransJ20 = bookProfile1D(4, 1, 2, Nch + " (transverse) for JET20", xlabel, ylabel);
- _numAwayJ20 = bookProfile1D(4, 1, 3, Nch + " (away) for JET20", xlabel, ylabel);
-
- const string pTsum = "$p_\\perp^\\text{sum}$";
- ylabel = pTsum + " / GeV";
- _ptsumTowardMB = bookProfile1D(5, 1, 1, pTsum + " (toward) for min-bias", xlabel, ylabel);
- _ptsumTransMB = bookProfile1D(5, 1, 2, pTsum + " (transverse) for min-bias", xlabel, ylabel);
- _ptsumAwayMB = bookProfile1D(5, 1, 3, pTsum + " (away) for min-bias", xlabel, ylabel);
- _ptsumTowardJ20 = bookProfile1D(6, 1, 1, pTsum + " (toward) for JET20", xlabel, ylabel);
- _ptsumTransJ20 = bookProfile1D(6, 1, 2, pTsum + " (transverse) for JET20", xlabel, ylabel);
- _ptsumAwayJ20 = bookProfile1D(6, 1, 3, pTsum + " (away) for JET20", xlabel, ylabel);
-
- const string pT = "$p_\\perp$";
- xlabel = pT + " / GeV";
- ylabel = "$1/\\sigma \\, \\mathrm{d}{\\sigma}/\\mathrm{d}{p_\\perp}$";
- _ptTrans2 = bookHistogram1D(7, 1, 1, "$p_\\perp$ distribution "
- "(transverse, $p_\\perp^\\text{lead} > 2\\text{ GeV}$)",
- xlabel, ylabel);
- _ptTrans5 = bookHistogram1D(7, 1, 2, "$p_\\perp$ distribution "
- "(transverse, $p_\\perp^\\text{lead} > 5\\text{ GeV}$)",
- xlabel, ylabel);
- _ptTrans30 = bookHistogram1D(7, 1, 3, "$p_\\perp$ distribution "
- "(transverse, $p_\\perp^\\text{lead} > 30 \\text{GeV}$)",
- xlabel, ylabel);
+ _numTowardMB = bookProfile1D(3, 1, 1);
+ _numTransMB = bookProfile1D(3, 1, 2);
+ _numAwayMB = bookProfile1D(3, 1, 3);
+ _numTowardJ20 = bookProfile1D(4, 1, 1);
+ _numTransJ20 = bookProfile1D(4, 1, 2);
+ _numAwayJ20 = bookProfile1D(4, 1, 3);
+
+ _ptsumTowardMB = bookProfile1D(5, 1, 1);
+ _ptsumTransMB = bookProfile1D(5, 1, 2);
+ _ptsumAwayMB = bookProfile1D(5, 1, 3);
+ _ptsumTowardJ20 = bookProfile1D(6, 1, 1);
+ _ptsumTransJ20 = bookProfile1D(6, 1, 2);
+ _ptsumAwayJ20 = bookProfile1D(6, 1, 3);
+
+ _ptTrans2 = bookHistogram1D(7, 1, 1);
+ _ptTrans5 = bookHistogram1D(7, 1, 2);
+ _ptTrans30 = bookHistogram1D(7, 1, 3);
}
Modified: trunk/src/Analyses/CDF_2002_S4796047.cc
==============================================================================
--- trunk/src/Analyses/CDF_2002_S4796047.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/CDF_2002_S4796047.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -22,13 +22,9 @@
// Book histograms
void CDF_2002_S4796047::init() {
/// @todo Cross-section units
- _hist_multiplicity_630 = bookHistogram1D(1, 1, 1,
- "Charged multiplicity at $\\sqrt{s} = 630~\\text{GeV}$, $|\\eta| < 1$, $p_T > 0.4~\\text{GeV}$",
- "$n_\\text{ch}$", "\\mathrm{d}{\\sigma}/\\mathrm{d}{n_\\text{ch}}$");
+ _hist_multiplicity_630 = bookHistogram1D(1, 1, 1);
/// @todo Cross-section units
- _hist_multiplicity_1800 = bookHistogram1D(2, 1, 1,
- "Charged multiplicity at $\\sqrt{s} = 1800~\\text{GeV}$, $|\\eta| < 1$, $p_T > 0.4~\\text{GeV}$",
- "$n_\\text{ch}$", "\\mathrm{d}{\\sigma}/\\mathrm{d}{n_\\text{ch}}$");
+ _hist_multiplicity_1800 = bookHistogram1D(2, 1, 1);
}
Modified: trunk/src/Analyses/CDF_2004_S5839831.cc
==============================================================================
--- trunk/src/Analyses/CDF_2004_S5839831.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/CDF_2004_S5839831.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -44,130 +44,42 @@
<< "***************************************************"
<< endl;
- const string ptmax = "$p_\\perp^\\text{max} \\rangle$";
- const string ptmin = "$p_\\perp^\\text{min}$";
- const string ptdiff = "$p_\\perp^\\text{diff}$";
- const string ptsum = "$p_\\perp^\\text{sum}$";
- const string ptmaxmean = "$\\langle p_\\perp^\\text{max} \\rangle$";
- const string ptminmean = "$\\langle p_\\perp^\\text{min} \\rangle$";
- const string et1 = "$E_\\perp^\\text{lead}$";
- string xlabel = et1 + " / GeV";
- string ylabel = "";
-
- _pt90MaxAvg1800 =
- bookProfile1D(1, 1, 1,
- ptmaxmean + " vs. " + et1 + " at $\\sqrt{s}$ = 1800 GeV",
- xlabel, ptmaxmean + " / GeV");
- _pt90MinAvg1800 =
- bookProfile1D(1, 1, 2,
- ptminmean + " vs. " + et1 + " at $\\sqrt{s}$ = 1800 GeV",
- xlabel, ptminmean + " / GeV");
- _pt90Max1800 =
- bookProfile1D(2, 1, 1,
- ptmax + " vs. " + et1 + " at $\\sqrt{s}$ = 1800 GeV",
- xlabel, ptmax + " / GeV");
- _pt90Min1800 =
- bookProfile1D(2, 1, 2,
- ptmin + " vs. " + et1 + " at $\\sqrt{s}$ = 1800 GeV",
- xlabel, ptmin + " / GeV");
- _pt90Diff1800 =
- bookProfile1D(2, 1, 3,
- ptdiff + " vs. " + et1 + " at $\\sqrt{s}$ = 1800 GeV",
- xlabel, ptdiff + " / GeV");
- _num90Max1800 =
- bookProfile1D(4, 1, 1,
- "$N_\\text{max}$ vs. " + et1 + " at $\\sqrt{s}$ = 1800 GeV",
- xlabel, "$N_\\text{max}$");
- _num90Min1800 =
- bookProfile1D(4, 1, 2,
- "$N_\\text{min}$ vs. " + et1 + " at $\\sqrt{s}$ = 1800 GeV",
- xlabel, "$N_\\text{min}$");
- _pTSum1800_2Jet =
- bookProfile1D(7, 1, 1,
- "Swiss Cheese " + ptsum + " vs. " + et1 +
- " (for removal of 2 jets) at $\\sqrt{s}$ = 1800 GeV",
- xlabel, ptsum + " / GeV (2 jets removed)");
- _pTSum1800_3Jet =
- bookProfile1D(7, 1, 2,
- "Swiss Cheese " + ptsum + " vs. " + et1 +
- " (for removal of 3 jets) at $\\sqrt{s}$ = 1800 GeV",
- xlabel, ptsum + " / GeV (3 jets removed)");
- _pt90Max630 =
- bookProfile1D(8, 1, 1,
- ptmax + " vs. " + et1 + " at $\\sqrt{s}$ = 630 GeV",
- xlabel, ptmax + " / GeV");
- _pt90Min630 =
- bookProfile1D(8, 1, 2,
- ptmin + " vs. " + et1 + " at $\\sqrt{s}$ = 630 GeV",
- xlabel, ptmin + " / GeV");
- _pt90Diff630 =
- bookProfile1D(8, 1, 3,
- ptdiff + " vs. " + et1 + " at $\\sqrt{s}$ = 630 GeV",
- xlabel, ptdiff + " / GeV");
- _pTSum630_2Jet =
- bookProfile1D(9, 1, 1,
- "Swiss Cheese " + ptsum + " vs. " + et1 +
- " (for removal of 2 jets) at $\\sqrt{s}$ = 630 GeV",
- xlabel, ptsum + " / GeV (2 jets removed)");
- _pTSum630_3Jet =
- bookProfile1D(9, 1, 2,
- "Swiss Cheese " + ptsum + " vs. " + et1 +
- " (for removal of 3 jets) at $\\sqrt{s}$ = 630 GeV",
- xlabel, ptsum + " / GeV (3 jets removed)");
+ _pt90MaxAvg1800 = bookProfile1D(1, 1, 1);
+ _pt90MinAvg1800 = bookProfile1D(1, 1, 2);
+ _pt90Max1800 = bookProfile1D(2, 1, 1);
+ _pt90Min1800 = bookProfile1D(2, 1, 2);
+ _pt90Diff1800 = bookProfile1D(2, 1, 3);
+ _num90Max1800 = bookProfile1D(4, 1, 1);
+ _num90Min1800 = bookProfile1D(4, 1, 2);
+ _pTSum1800_2Jet = bookProfile1D(7, 1, 1);
+ _pTSum1800_3Jet = bookProfile1D(7, 1, 2);
+ _pt90Max630 = bookProfile1D(8, 1, 1);
+ _pt90Min630 = bookProfile1D(8, 1, 2);
+ _pt90Diff630 = bookProfile1D(8, 1, 3);
+ _pTSum630_2Jet = bookProfile1D(9, 1, 1);
+ _pTSum630_3Jet = bookProfile1D(9, 1, 2);
- string basetitle = "$p_\\perp$ distribution in MAX+MIN transverse cones for ";
- xlabel = "$p_\\perp / GeV";
- ylabel = "$\\mathrm{d}{\\sigma}/\\mathrm{d}{p_\\perp}$";
/// @todo Check this normalisation defn (num-tracks x xsec?.)
- _pt90Dbn1800Et40 =
- bookHistogram1D(3, 1, 1,
- basetitle + "$40 < E_\\perp^\\text{lead} < 80$ GeV at $\\sqrt{s}$ = 1800 GeV",
- xlabel, ylabel);
+ _pt90Dbn1800Et40 = bookHistogram1D(3, 1, 1);
/// @todo Check this normalisation defn (num-tracks x xsec?.)
- _pt90Dbn1800Et80 =
- bookHistogram1D(3, 1, 2,
- basetitle + "$80 < E_\\perp^\\text{lead} < 120$ GeV at $\\sqrt{s}$ = 1800 GeV",
- xlabel, ylabel);
+ _pt90Dbn1800Et80 = bookHistogram1D(3, 1, 2);
/// @todo Check this normalisation defn (num-tracks x xsec?.)
- _pt90Dbn1800Et120 =
- bookHistogram1D(3, 1, 3,
- basetitle + "$120 < E_\\perp^\\text{lead} < 160$ GeV at $\\sqrt{s}$ = 1800 GeV",
- xlabel, ylabel);
+ _pt90Dbn1800Et120 = bookHistogram1D(3, 1, 3);
/// @todo Check this normalisation defn (num-tracks x xsec?.)
- _pt90Dbn1800Et160 =
- bookHistogram1D(3, 1, 4,
- basetitle + "$160 < E_\\perp^\\text{lead} < 200$ GeV at $\\sqrt{s}$ = 1800 GeV",
- xlabel, ylabel);
+ _pt90Dbn1800Et160 = bookHistogram1D(3, 1, 4);
/// @todo Check this normalisation defn (num-tracks x xsec?.)
- _pt90Dbn1800Et200 =
- bookHistogram1D(3, 1, 5,
- basetitle + "$200 < E_\\perp^\\text{lead} < 270$ GeV at $\\sqrt{s}$ = 1800 GeV",
- xlabel, ylabel);
+ _pt90Dbn1800Et200 = bookHistogram1D(3, 1, 5);
/// @todo Check this normalisation defn (num-tracks x xsec?.)
- _ptDbn1800MB =
- bookHistogram1D(6, 1, 1,
- "Min bias $p_\\perp$ distribution at $\\sqrt{s}$ = 1800 GeV",
- xlabel, ylabel);
-
-
- xlabel = "$N_\\text{ch}$";
- ylabel = "$\\mathrm{d}{\\sigma}/\\mathrm{d}{N_\\text{ch}}$";
- /// @todo Check this normalisation defn.
- _numTracksDbn1800MB =
- bookHistogram1D(5, 1, 1,
- "Min bias track multiplicity distribution at $\\sqrt{s}$ = 1800 GeV",
- xlabel, ylabel);
- /// @todo Check this normalisation defn.
- _numTracksDbn630MB =
- bookHistogram1D(10, 1, 1,
- "Min bias track multiplicity distribution at $\\sqrt{s}$ = 630 GeV",
- xlabel, ylabel);
- /// @todo Check this normalisation defn.
- _ptDbn630MB =
- bookHistogram1D(11, 1, 1,
- "Min bias $p_\\perp$ distribution at $\\sqrt{s}$ = 630 GeV",
- xlabel, ylabel);
+ _ptDbn1800MB = bookHistogram1D(6, 1, 1);
+
+
+ /// @todo Check this normalisation defn.
+ _numTracksDbn1800MB = bookHistogram1D(5, 1, 1);
+ /// @todo Check this normalisation defn.
+ _numTracksDbn630MB = bookHistogram1D(10, 1, 1);
+ /// @todo Check this normalisation defn.
+ _ptDbn630MB = bookHistogram1D(11, 1, 1);
}
Modified: trunk/src/Analyses/CDF_2005_S6217184.cc
==============================================================================
--- trunk/src/Analyses/CDF_2005_S6217184.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/CDF_2005_S6217184.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -45,25 +45,12 @@
for (size_t i = 0; i < 6; ++i) {
for (size_t j = 0; j < 3; ++j) {
size_t k = i*3 + j;
- stringstream ptrange;
- ptrange << "$" << _pTbins[k] << "\\,\\text{GeV}/c < p_\\perp^\\text{jet} < "
- << _pTbins[k+1] << "\\,\\text{GeV}/c$";
-
- stringstream difftitle;
- difftitle << "Differential jet shape $\\rho$, " << ptrange.str();
- _profhistRho_pT[k] =
- bookProfile1D(i+1, 1, j+1, difftitle.str(), "$r/R$", "$\\rho(r/R)$");
-
- stringstream inttitle;
- inttitle << "Integral jet shape $\\Psi$, " << ptrange.str();
- _profhistPsi_pT[k] =
- bookProfile1D(6+i+1, 1, j+1, inttitle.str(), "$r/R$", "$\\Psi(r/R)$");
+ _profhistRho_pT[k] = bookProfile1D(i+1, 1, j+1);
+ _profhistPsi_pT[k] = bookProfile1D(6+i+1, 1, j+1);
}
}
- _profhistPsi =
- bookProfile1D(13, 1, 1, "Integral jet shape, $\\Psi$(0.3/$R$), vs. $p_\\perp^\\text{jet}$",
- "$p_\\perp^\\text{jet}$ / GeV/$c$", "$\\Psi(0.3/R)$");
+ _profhistPsi = bookProfile1D(13, 1, 1);
}
Modified: trunk/src/Analyses/CDF_2006_S6653332.cc
==============================================================================
--- trunk/src/Analyses/CDF_2006_S6653332.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/CDF_2006_S6653332.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -42,15 +42,9 @@
void CDF_2006_S6653332::init() {
// Book histograms
- _sigmaBJet =
- bookHistogram1D(1, 1, 1, "$\\sigma(\\text{Z + b jet})$",
- "$E$ / GeV", "$\\sigma(Z+b)$ / pb");
- _ratioBJetToZ =
- bookHistogram1D(2, 1, 1, "$\\sigma(\\text{Z + b jet}) / \\sigma(\\text{Z})$",
- "$E$ / GeV", "$\\sigma(Z+b) / \\sigma(Z)$ / pb");
- _ratioBJetToJet =
- bookHistogram1D(3, 1, 1, "$\\sigma(Z + b jet) / \\sigma(Z + jet)$",
- "$E$ / GeV", "$\\sigma(\\text{Z+b}) / \\sigma(\\text{Z+j})$ /pb");
+ _sigmaBJet = bookHistogram1D(1, 1, 1);
+ _ratioBJetToZ = bookHistogram1D(2, 1, 1);
+ _ratioBJetToJet = bookHistogram1D(3, 1, 1);
}
Modified: trunk/src/Analyses/CDF_2007_S7057202.cc
==============================================================================
--- trunk/src/Analyses/CDF_2007_S7057202.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/CDF_2007_S7057202.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -27,13 +27,13 @@
// Book histos and set counters for number of events passed in each one
void CDF_2007_S7057202::init() {
/// @todo What is actually described by these histos? Use comprehensive titles!
- _histoD05 = bookHistogram1D(6, 1, 1, "Inclusive jet cross-section vs $p_T$ for $0.1 < |\\eta| < 0.7, D=0.5$","Jet $p_T$ [GeV]","$d\\sigma/dp_T$ [$nb^-1 GeV^-1$]");
- _histoD10 = bookHistogram1D(7, 1, 1, "Inclusive jet cross-section vs $p_T$ for $0.1 < |\\eta| < 0.7, D=1.0$", "Jet $p_T$ [GeV]","$d\\sigma/dp_T$ [$nb^-1 GeV^-1$]");
- _binnedHistosD07.addHistogram( 0, 0.1, bookHistogram1D(1, 1, 1, "Inclusive jet cross-section vs $p_T$ for $|\\eta| < 0.1, D=0.7$", "Jet $p_T$ [GeV]","$d\\sigma/dp_T$ [$nb^-1 GeV^-1$]"));
- _binnedHistosD07.addHistogram(0.1, 0.7, bookHistogram1D(2, 1, 1, "Inclusive jet cross-section vs $p_T$ for $0.1 < |\\eta| < 0.7, D=0.7$", "Jet $p_T$ [GeV]","$d\\sigma/dp_T$ [$nb^-1 GeV^-1$]"));
- _binnedHistosD07.addHistogram(0.7, 1.1, bookHistogram1D(3, 1, 1, "Inclusive jet cross-section vs $p_T$ for $0.7 < |\\eta| < 1.1, D=0.7$", "Jet $p_T$ [GeV]","$d\\sigma/dp_T$ [$nb^-1 GeV^-1$]"));
- _binnedHistosD07.addHistogram(1.1, 1.6, bookHistogram1D(4, 1, 1, "Inclusive jet cross-section vs $p_T$ for $1.1 < |\\eta| < 1.6, D=0.7$", "Jet $p_T$ [GeV]","$d\\sigma/dp_T$ [$nb^-1 GeV^-1$]"));
- _binnedHistosD07.addHistogram(1.6, 2.1, bookHistogram1D(5, 1, 1, "Inclusive jet cross-section vs $p_T$ for $1.6 < |\\eta| < 2.1, D=0.7$", "Jet $p_T$ [GeV]","$d\\sigma/dp_T$ [$nb^-1 GeV^-1$]"));
+ _histoD05 = bookHistogram1D(6, 1, 1);
+ _histoD10 = bookHistogram1D(7, 1, 1);
+ _binnedHistosD07.addHistogram( 0, 0.1, bookHistogram1D(1, 1, 1));
+ _binnedHistosD07.addHistogram(0.1, 0.7, bookHistogram1D(2, 1, 1));
+ _binnedHistosD07.addHistogram(0.7, 1.1, bookHistogram1D(3, 1, 1));
+ _binnedHistosD07.addHistogram(1.1, 1.6, bookHistogram1D(4, 1, 1));
+ _binnedHistosD07.addHistogram(1.6, 2.1, bookHistogram1D(5, 1, 1));
size_t yind = 0;
for (vector<AIDA::IHistogram1D*>::const_iterator histIt = _binnedHistosD07.getHistograms().begin();
Modified: trunk/src/Analyses/CDF_2008_LEADINGJETS.cc
==============================================================================
--- trunk/src/Analyses/CDF_2008_LEADINGJETS.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/CDF_2008_LEADINGJETS.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -32,24 +32,15 @@
// Book histograms
void CDF_2008_LEADINGJETS::init() {
- _hist_pnchg = bookProfile1D( 1, 1, 1, "Transverse region charged particle density",
- "$p_T(\\text{leading jet})$ / GeV", "$\\langle N_\\text{ch} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$");
- _hist_pmaxnchg = bookProfile1D( 2, 1, 1, "TransMAX region charged particle density",
- "$p_T(\\text{leading jet})$ / GeV", "$\\langle N_\\text{ch} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$");
- _hist_pminnchg = bookProfile1D( 3, 1, 1, "TransMIN region charged particle density",
- "$p_T(\\text{leading jet})$ / GeV", "$\\langle N_\\text{ch} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$");
- _hist_pdifnchg = bookProfile1D( 4, 1, 1, "TransDIF region charged particle density",
- "$p_T(\\text{leading jet})$ / GeV", "$\\langle N_\\text{ch} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$");
- _hist_pcptsum = bookProfile1D( 5, 1, 1, "Transverse region charged pT sum density",
- "$p_T(\\text{leading jet})$ / GeV", "$\\langle \\sum p_T^\\text{track} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$ / GeV");
- _hist_pmaxcptsum = bookProfile1D( 6, 1, 1, "TransMAX region charged pT sum density",
- "$p_T(\\text{leading jet})$ / GeV", "$\\langle \\sum p_T^\\text{track} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$ / GeV");
- _hist_pmincptsum = bookProfile1D( 7, 1, 1, "TransMIN region charged pT sum density",
- "$p_T(\\text{leading jet})$ / GeV", "$\\langle \\sum p_T^\\text{track} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$ / GeV");
- _hist_pdifcptsum = bookProfile1D( 8, 1, 1, "TransDIF region charged pT sum density",
- "$p_T(\\text{leading jet})$ / GeV", "$\\langle \\sum p_T^\\text{track} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$ / GeV");
- _hist_pcptave = bookProfile1D( 9, 1, 1, "Transverse region charged pT average",
- "$p_T(\\text{leading jet})$ / GeV", "$\\langle p_T^\\text{track} \\rangle$ / GeV");
+ _hist_pnchg = bookProfile1D( 1, 1, 1);
+ _hist_pmaxnchg = bookProfile1D( 2, 1, 1);
+ _hist_pminnchg = bookProfile1D( 3, 1, 1);
+ _hist_pdifnchg = bookProfile1D( 4, 1, 1);
+ _hist_pcptsum = bookProfile1D( 5, 1, 1);
+ _hist_pmaxcptsum = bookProfile1D( 6, 1, 1);
+ _hist_pmincptsum = bookProfile1D( 7, 1, 1);
+ _hist_pdifcptsum = bookProfile1D( 8, 1, 1);
+ _hist_pcptave = bookProfile1D( 9, 1, 1);
//_hist_onchg = bookProfile1D( 1, 1, 1, "Overall number of charged particles");
//_hist_ocptsum = bookProfile1D( 2, 1, 1, "Overall charged $p_\\perp$ sum");
//_hist_oetsum = bookProfile1D( 3, 1, 1, "Overall $E_\\perp$ sum");
Modified: trunk/src/Analyses/CDF_2008_NOTE_9351.cc
==============================================================================
--- trunk/src/Analyses/CDF_2008_NOTE_9351.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/CDF_2008_NOTE_9351.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -22,52 +22,31 @@
// Book histograms
void CDF_2008_NOTE_9351::init() {
- _hist_tnchg = bookProfile1D( 1, 1, 1, "Toward region charged particle density",
- "$p_T(Z)$ / GeV", "$\\langle N_\\text{ch} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$");
- _hist_pnchg = bookProfile1D( 2, 1, 1, "Transverse region charged particle density",
- "$p_T(Z)$ / GeV", "$\\langle N_\\text{ch} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$");
- _hist_pmaxnchg = bookProfile1D( 3, 1, 1, "TransMAX region charged particle density",
- "$p_T(Z)$ / GeV", "$\\langle N_\\text{ch} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$");
- _hist_pminnchg = bookProfile1D( 4, 1, 1, "TransMIN region charged particle density",
- "$p_T(Z)$ / GeV", "$\\langle N_\\text{ch} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$");
- _hist_pdifnchg = bookProfile1D( 5, 1, 1, "TransDIF region charged particle density",
- "$p_T(Z)$ / GeV", "$\\langle N_\\text{ch} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$");
- _hist_anchg = bookProfile1D( 6, 1, 1, "Away region charged particle density",
- "$p_T(Z)$ / GeV", "$\\langle N_\\text{ch} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$");
-
- _hist_tcptsum = bookProfile1D( 7, 1, 1, "Toward region charged $p_\\perp^\\text{sum}$ density",
- "$p_T(Z)$ / GeV", "$\\langle \\sum p_T^\\text{track} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$ / GeV");
- _hist_pcptsum = bookProfile1D( 8, 1, 1, "Transverse region charged $p_\\perp^\\text{sum}$ density",
- "$p_T(Z)$ / GeV", "$\\langle \\sum p_T^\\text{track} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$ / GeV");
- _hist_pmaxcptsum = bookProfile1D( 9, 1, 1, "TransMAX region charged $p_\\perp^\\text{sum}$ density",
- "$p_T(Z)$ / GeV", "$\\langle \\sum p_T^\\text{track} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$ / GeV");
- _hist_pmincptsum = bookProfile1D(10, 1, 1, "TransMIN region charged $p_\\perp^\\text{sum}$ density",
- "$p_T(Z)$ / GeV", "$\\langle \\sum p_T^\\text{track} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$ / GeV");
- _hist_pdifcptsum = bookProfile1D(11, 1, 1, "TransDIF region charged $p_\\perp^\\text{sum}$ density",
- "$p_T(Z)$ / GeV", "$\\langle \\sum p_T^\\text{track} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$ / GeV");
- _hist_acptsum = bookProfile1D(12, 1, 1, "Away region charged $p_\\perp^\\text{sum}$ density",
- "$p_T(Z)$ / GeV", "$\\langle \\sum p_T^\\text{track} \\rangle / \\text{d}\\eta\\,\\text{d}\\phi$ / GeV");
-
- _hist_tcptave = bookProfile1D(13, 1, 1, "Toward region charged $p_\\perp$ average",
- "$p_T(Z)$ / GeV", "$\\langle p_T^\\text{track} \\rangle$ / GeV");
- _hist_pcptave = bookProfile1D(14, 1, 1, "Transverse region charged $p_\\perp$ average",
- "$p_T(Z)$ / GeV", "$\\langle p_T^\\text{track} \\rangle$ / GeV");
- _hist_acptave = bookProfile1D(15, 1, 1, "Away region charged $p_\\perp$ average",
- "$p_T(Z)$ / GeV", "$\\langle p_T^\\text{track} \\rangle$ / GeV");
-
- _hist_tcptmax = bookProfile1D(16, 1, 1, "Toward region charged $p_\\perp$ maximum",
- "$p_T(Z)$ / GeV", "max $p_T^\\text{track}$ / GeV");
- _hist_pcptmax = bookProfile1D(17, 1, 1, "Transverse region charged $p_\\perp$ maximum",
- "$p_T(Z)$ / GeV", "max $p_T^\\text{track}$ / GeV");
- _hist_acptmax = bookProfile1D(18, 1, 1, "Away region charged $p_\\perp$ maximum",
- "$p_T(Z)$ / GeV", "max $p_T^\\text{track}$ / GeV");
-
- _hist_zptvsnchg = bookProfile1D(19, 1, 1, "Average lepton-pair $p_\\perp$ versus charged multiplicity",
- "$N_\\text{ch}$", "$\\langle p_T(Z) \\rangle$ / GeV");
- _hist_cptavevsnchg = bookProfile1D(20, 1, 1, "Average charged $p_\\perp$ vs charged multiplicity",
- "$N_\\text{ch}$", "$\\langle p_T \\rangle$ / GeV");
- _hist_cptavevsnchgsmallzpt = bookProfile1D(21, 1, 1, "Average charged $p_\\perp$ vs charged multiplicity, $p_\\perp(Z)$ less than 10 GeV",
- "$N_\\text{ch}$", "$\\langle p_T \\rangle$ / GeV");
+ _hist_tnchg = bookProfile1D( 1, 1, 1);
+ _hist_pnchg = bookProfile1D( 2, 1, 1);
+ _hist_pmaxnchg = bookProfile1D( 3, 1, 1);
+ _hist_pminnchg = bookProfile1D( 4, 1, 1);
+ _hist_pdifnchg = bookProfile1D( 5, 1, 1);
+ _hist_anchg = bookProfile1D( 6, 1, 1);
+
+ _hist_tcptsum = bookProfile1D( 7, 1, 1);
+ _hist_pcptsum = bookProfile1D( 8, 1, 1);
+ _hist_pmaxcptsum = bookProfile1D( 9, 1, 1);
+ _hist_pmincptsum = bookProfile1D(10, 1, 1);
+ _hist_pdifcptsum = bookProfile1D(11, 1, 1);
+ _hist_acptsum = bookProfile1D(12, 1, 1);
+
+ _hist_tcptave = bookProfile1D(13, 1, 1);
+ _hist_pcptave = bookProfile1D(14, 1, 1);
+ _hist_acptave = bookProfile1D(15, 1, 1);
+
+ _hist_tcptmax = bookProfile1D(16, 1, 1);
+ _hist_pcptmax = bookProfile1D(17, 1, 1);
+ _hist_acptmax = bookProfile1D(18, 1, 1);
+
+ _hist_zptvsnchg = bookProfile1D(19, 1, 1);
+ _hist_cptavevsnchg = bookProfile1D(20, 1, 1);
+ _hist_cptavevsnchgsmallzpt = bookProfile1D(21, 1, 1);
}
Modified: trunk/src/Analyses/CDF_2008_S7541902.cc
==============================================================================
--- trunk/src/Analyses/CDF_2008_S7541902.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/CDF_2008_S7541902.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -51,17 +51,11 @@
void CDF_2008_S7541902::init() {
for (int i = 0 ; i < 4 ; ++i) {
- stringstream title;
- title << "$E_\\perp$ of jet #" << i+1;
- _histJetEt[i] = bookHistogram1D(i+1, 1, 1, title.str(),"$E_\\perp$ [GeV]","$d\\sigma/dE_{T} [pb/GeV]$");
- stringstream title2;
- title2 << "$\\sigma(" << i+1 << " \\text{ jets})/\\sigma(" << i <<" \\text{ jets})$" ;
- _histJetMultRatio[i] = bookDataPointSet(5 , 1, i+1, title2.str(),"$\\sqrt(s)$ [GeV]",title2.str());
- stringstream title3;
- title3 << "$\\sigma(" << i+1 << " \\text{ jets})$" ;
- _histJetMult[i] = bookHistogram1D(i+6, 1, 1, title3.str(),"$\\sqrt(s)$ [GeV]",title3.str());
+ _histJetEt[i] = bookHistogram1D(i+1, 1, 1);
+ _histJetMultRatio[i] = bookDataPointSet(5 , 1, i+1);
+ _histJetMult[i] = bookHistogram1D(i+6, 1, 1);
}
- _histJetMultNorm = bookHistogram1D("norm", "$\\sigma(0 \\text{ jets})$", "$\\sqrt(s)$ [GeV]", "No. of events", 1, _xpoint, _xpoint+1.);
+ _histJetMultNorm = bookHistogram1D("norm", 1, _xpoint, _xpoint+1.);
}
Modified: trunk/src/Analyses/CDF_2008_S7782535.cc
==============================================================================
--- trunk/src/Analyses/CDF_2008_S7782535.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/CDF_2008_S7782535.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -41,15 +41,9 @@
_pTbins += 52, 80, 104, 142, 300;
// Book histograms
for (int i = 0; i < _NpTbins; ++i) {
- stringstream title;
- title << "Integral jet shape $\\Psi$ for $" << _pTbins[i]
- << " < p_\\perp < " << _pTbins[i+1] << "$";
- _h_Psi_pT[i] = bookProfile1D(i+1, 2, 1, title.str(),
- "r/R", "$\\Psi$(r/R)");
+ _h_Psi_pT[i] = bookProfile1D(i+1, 2, 1);
}
- _h_OneMinusPsi_vs_pT =
- bookDataPointSet(5, 1, 1, "$1 - \\Psi$ vs jet $p_\\perp$",
- "$p_\\perp$ [GeV]", "1-$\\Psi$(0.2/R)");
+ _h_OneMinusPsi_vs_pT = bookDataPointSet(5, 1, 1);
}
Modified: trunk/src/Analyses/CDF_2008_S7828950.cc
==============================================================================
--- trunk/src/Analyses/CDF_2008_S7828950.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/CDF_2008_S7828950.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -26,16 +26,11 @@
// Book histos and set counters for number of events passed in each one
void CDF_2008_S7828950::init() {
/// @todo What actually are these histos showing?
- _binnedHistosR07.addHistogram( 0, 0.1, bookHistogram1D(1, 1, 1, "$\\eta < 0.1, R=0.7$",
- "$E_{T}$ [GeV]","$d^{2}\\sigma/dYdp_{T}$ [nb/GeV]"));
- _binnedHistosR07.addHistogram(0.1, 0.7, bookHistogram1D(2, 1, 1, "$0.1 < \\eta < 0.7, R=0.7$",
- "$E_{T}$ [GeV]","$d^{2}\\sigma/dYdp_{T}$ [nb/GeV]"));
- _binnedHistosR07.addHistogram(0.7, 1.1, bookHistogram1D(3, 1, 1, "$0.7 < \\eta < 1.1, R=0.7$",
- "$E_{T}$ [GeV]","$d^{2}\\sigma/dYdp_{T}$ [nb/GeV]"));
- _binnedHistosR07.addHistogram(1.1, 1.6, bookHistogram1D(4, 1, 1, "$1.1 < \\eta < 1.6, R=0.7$",
- "$E_{T}$ [GeV]","$d^{2}\\sigma/dYdp_{T}$ [nb/GeV]"));
- _binnedHistosR07.addHistogram(1.6, 2.1, bookHistogram1D(5, 1, 1, "$1.6 < \\eta < 2.1, R=0.7$",
- "$E_{T}$ [GeV]","$d^{2}\\sigma/dYdp_{T}$ [nb/GeV]"));
+ _binnedHistosR07.addHistogram( 0, 0.1, bookHistogram1D(1, 1, 1));
+ _binnedHistosR07.addHistogram(0.1, 0.7, bookHistogram1D(2, 1, 1));
+ _binnedHistosR07.addHistogram(0.7, 1.1, bookHistogram1D(3, 1, 1));
+ _binnedHistosR07.addHistogram(1.1, 1.6, bookHistogram1D(4, 1, 1));
+ _binnedHistosR07.addHistogram(1.6, 2.1, bookHistogram1D(5, 1, 1));
size_t yind = 0;
for (vector<AIDA::IHistogram1D*>::const_iterator histIt = _binnedHistosR07.getHistograms().begin();
Modified: trunk/src/Analyses/CDF_2008_S8093652.cc
==============================================================================
--- trunk/src/Analyses/CDF_2008_S8093652.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/CDF_2008_S8093652.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -23,10 +23,7 @@
// Book histograms
void CDF_2008_S8093652::init() {
- _h_m_dijet = bookHistogram1D(
- 1, 1, 1, "Dijet mass spectrum",
- "$m_{\\text{jj}} [GeV/c^2]$",
- "$d\\sigma/dm_{\\text{jj}} [pb/(GeV/c^2)]$");
+ _h_m_dijet = bookHistogram1D(1, 1, 1);
}
Modified: trunk/src/Analyses/CDF_2008_S8095620.cc
==============================================================================
--- trunk/src/Analyses/CDF_2008_S8095620.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/CDF_2008_S8095620.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -39,16 +39,11 @@
void CDF_2008_S8095620::init() {
// Book histograms
- _dSdET = bookHistogram1D(1, 1, 1, "1/\\sigma(Z) \\times d\\sigma(Z + b jet)/dE_{T}^{jet}",
- "$E_{T}^{jet}$ [GeV]","1/\\sigma(Z) \\times d\\sigma(Z + b jet)/dE_{T}^{jet}");
- _dSdETA = bookHistogram1D(2, 1, 1, "1/\\sigma(Z) \\times d\\sigma(Z + b jet)/d\\eta^{jet}",
- "$\\eta^{jet}$","1/\\sigma(Z) \\times d\\sigma(Z + b jet)/\\eta^{jet}");
- _dSdNJet = bookHistogram1D(3, 1, 1, "1/\\sigma(Z) \\times d\\sigma(Z + b jet)/dN^{jet}",
- "Number of jets","1/\\sigma(Z) \\times d\\sigma(Z + b jet)/dN^{jet}");
- _dSdNbJet = bookHistogram1D(4, 1, 1, "1/\\sigma(Z) \\times d\\sigma(Z + b jet)/dN^{b jet} ",
- "Number of b jets","1/\\sigma(Z) \\times d\\sigma(Z + b jet)/dN^{b jet}");
- _dSdZpT = bookHistogram1D(5, 1, 1, "1/\\sigma(Z) \\times d\\sigma(Z + b jet)/dp_T{}^{Z}",
- "Z $p_{T}$ [GeV]","1/\\sigma(Z) \\times d\\sigma(Z + b jet)/dp_{T}^{Z}");
+ _dSdET = bookHistogram1D(1, 1, 1);
+ _dSdETA = bookHistogram1D(2, 1, 1);
+ _dSdNJet = bookHistogram1D(3, 1, 1);
+ _dSdNbJet = bookHistogram1D(4, 1, 1);
+ _dSdZpT = bookHistogram1D(5, 1, 1);
}
Modified: trunk/src/Analyses/CDF_2009_S8233977.cc
==============================================================================
--- trunk/src/Analyses/CDF_2009_S8233977.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/CDF_2009_S8233977.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -23,12 +23,9 @@
// Book histograms
void CDF_2009_S8233977::init() {
- _hist_pt_vs_multiplicity = bookProfile1D(1, 1, 1, "Mean track $p_T$ vs multiplicity",
- "$N_\\text{ch}$", "$\\langle p_T \\rangle$ / GeV");
- _hist_pt = bookHistogram1D(2, 1, 1, "track $p_T$",
- "$p_T$ / GeV", "$\\text{d}^3 \\sigma / p_T \\text{d}p_T \\text{d}y \\text{d}\\phi$");
- _hist_sumEt = bookHistogram1D(3, 1, 1, "$\\sum E_T$",
- "$\\sum E_T$ / GeV", "$\\text{d}^3 \\sigma / \\text{d}E_T \\text{d}\\eta \\text{d}\\phi$");
+ _hist_pt_vs_multiplicity = bookProfile1D(1, 1, 1);
+ _hist_pt = bookHistogram1D(2, 1, 1);
+ _hist_sumEt = bookHistogram1D(3, 1, 1);
}
Modified: trunk/src/Analyses/D0_2001_S4674421.cc
==============================================================================
--- trunk/src/Analyses/D0_2001_S4674421.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/D0_2001_S4674421.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -55,18 +55,12 @@
void D0_2001_S4674421::init() {
_eventsFilledW = 0.0;
_eventsFilledZ = 0.0;
- _h_dsigdpt_w =
- bookHistogram1D(1, 1, 1, "$\\mathrm{d}{\\sigma} / \\mathrm{d}{p_\\perp(W)}$",
- "$p_\\perp$ / GeV/$c$", "$\\mathrm{d}{\\sigma}/\\mathrm{d}{p_\\perp(W)}$");
- _h_dsigdpt_z =
- bookHistogram1D(1, 1, 2, "$\\mathrm{d}{\\sigma} / \\mathrm{d}{p_\\perp(Z)}$",
- "$p_\\perp$ / GeV/$c$", "$\\mathrm{d}{\\sigma}/\\mathrm{d}{p_\\perp(Z)}$");
+ _h_dsigdpt_w = bookHistogram1D(1, 1, 1);
+ _h_dsigdpt_z = bookHistogram1D(1, 1, 2);
vector<double> bins(23);
bins += 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 25, 30, 35, 40, 50, 60, 70, 80, 100, 120, 160, 200;
- _h_dsigdpt_scaled_z =
- bookHistogram1D("d01-x01-y03", "$\\mathrm{d}{\\sigma} / \\mathrm{d}{(p_\\perp(Z) \\cdot M_W/M_Z)}$",
- "$p_\\perp(W)/M_W$", "$R_p_\\perp$", bins);
+ _h_dsigdpt_scaled_z = bookHistogram1D("d01-x01-y03", bins);
}
Modified: trunk/src/Analyses/D0_2004_S5992206.cc
==============================================================================
--- trunk/src/Analyses/D0_2004_S5992206.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/D0_2004_S5992206.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -33,22 +33,10 @@
// Book histograms
void D0_2004_S5992206::init() {
- _histJetAzimuth_pTmax75_100 =
- bookHistogram1D(1, 2, 1, "Jet--jet azimuthal angle, $p_\\perp^\\text{max} \\in [75,100]\\text{ GeV}$",
- "$\\Delta \\phi_\\text{dijet}$ / rad",
- "$1/\\sigma_\\text{dijet} \\, \\text{d}\\sigma_\\text{dijet}/\\text{d}\\Delta\\phi_\\text{dijet}$");
- _histJetAzimuth_pTmax100_130 =
- bookHistogram1D(2, 2, 1, "Jet--jet azimuthal angle, $p_\\perp^\\text{max} \\in [100..130]\\text{ GeV}$",
- "$\\Delta \\phi_\\text{dijet}$ / rad",
- "$1/\\sigma_\\text{dijet} \\, \\text{d}\\sigma_\\text{dijet}/\\text{d}\\Delta\\phi_\\text{dijet}$");
- _histJetAzimuth_pTmax130_180 =
- bookHistogram1D(3, 2, 1, "Jet--jet azimuthal angle, $p_\\perp^\\text{max} \\in [130..180]\\text{ GeV}$",
- "$\\Delta \\phi_\\text{dijet}$ / rad",
- "$1/\\sigma_\\text{dijet} \\, \\text{d}\\sigma_\\text{dijet}/\\text{d}\\Delta\\phi_\\text{dijet}$");
- _histJetAzimuth_pTmax180_ =
- bookHistogram1D(4, 2, 1, "Jet--jet azimuthal angle, $p_\\perp^\\text{max} > 180\\text{ GeV}$",
- "$\\Delta \\phi_\\text{dijet}$ / rad",
- "$1/\\sigma_\\text{dijet} \\, \\text{d}\\sigma_\\text{dijet}/\\text{d}\\Delta\\phi_\\text{dijet}$");
+ _histJetAzimuth_pTmax75_100 = bookHistogram1D(1, 2, 1);
+ _histJetAzimuth_pTmax100_130 = bookHistogram1D(2, 2, 1);
+ _histJetAzimuth_pTmax130_180 = bookHistogram1D(3, 2, 1);
+ _histJetAzimuth_pTmax180_ = bookHistogram1D(4, 2, 1);
}
Modified: trunk/src/Analyses/D0_2006_S6438750.cc
==============================================================================
--- trunk/src/Analyses/D0_2006_S6438750.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/D0_2006_S6438750.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -31,10 +31,7 @@
// Book histograms
void D0_2006_S6438750::init() {
- _h_pTgamma =
- bookHistogram1D(1, 1, 1, "$p_\\perp$ spectrum for leading photon",
- "$p_\\perp(\\gamma_\\text{lead})$ / GeV",
- "$\\mathrm{d}{\\sigma}/\\mathrm{d}{p_\\perp(\\gamma_\\text{lead})}$");
+ _h_pTgamma = bookHistogram1D(1, 1, 1);
}
Modified: trunk/src/Analyses/D0_2007_S7075677.cc
==============================================================================
--- trunk/src/Analyses/D0_2007_S7075677.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/D0_2007_S7075677.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -29,8 +29,7 @@
// Book histograms
void D0_2007_S7075677::init() {
- _h_yZ = bookHistogram1D(1, 1, 1, "Inclusive Z boson rapidity",
- "$|y|$(Z)", "$1/\\sigma \\; \\text{d}\\sigma/\\text{d}|y|(Z)$");
+ _h_yZ = bookHistogram1D(1, 1, 1);
}
Modified: trunk/src/Analyses/D0_2008_S7554427.cc
==============================================================================
--- trunk/src/Analyses/D0_2008_S7554427.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/D0_2008_S7554427.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -23,12 +23,8 @@
// Book histograms
void D0_2008_S7554427::init() {
- _h_ZpT = bookHistogram1D(1, 1, 1, "Z boson pT",
- "$p_{\\perp}$(Z) [GeV]",
- "$1/\\sigma \\; \\text{d}\\sigma/\\text{d}p_\\perp(Z)$");
- _h_forward_ZpT = bookHistogram1D(3, 1, 1, "Z boson pT (forward region only)",
- "$p_{\\perp}$(Z) [GeV]",
- "$1/\\sigma \\; \\text{d}\\sigma/\\text{d}p_\\perp(Z)$");
+ _h_ZpT = bookHistogram1D(1, 1, 1);
+ _h_forward_ZpT = bookHistogram1D(3, 1, 1);
}
Modified: trunk/src/Analyses/D0_2008_S7662670.cc
==============================================================================
--- trunk/src/Analyses/D0_2008_S7662670.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/D0_2008_S7662670.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -29,22 +29,12 @@
// Book histograms
void D0_2008_S7662670::init()
{
- const string basetitle = "Inclusive jet $p_\\perp$, ";
- const string xlabel = "Jet $p_\\perp$ / GeV";
- const string ylabel = "$\\mathrm{d}{\\sigma}/\\mathrm{d}{p_\\perp}$";
-
- _h_dsigdptdy_y00_04 =
- bookHistogram1D(1, 1, 1, basetitle + "$0.0 < |y| < 0.4$", xlabel, ylabel);
- _h_dsigdptdy_y04_08 =
- bookHistogram1D(2, 1, 1, basetitle + "$0.4 < |y| < 0.8$", xlabel, ylabel);
- _h_dsigdptdy_y08_12 =
- bookHistogram1D(3, 1, 1, basetitle + "$0.8 < |y| < 1.2$", xlabel, ylabel);
- _h_dsigdptdy_y12_16 =
- bookHistogram1D(4, 1, 1, basetitle + "$1.2 < |y| < 1.6$", xlabel, ylabel);
- _h_dsigdptdy_y16_20 =
- bookHistogram1D(5, 1, 1, basetitle + "$1.6 < |y| < 2.0$", xlabel, ylabel);
- _h_dsigdptdy_y20_24 =
- bookHistogram1D(6, 1, 1, basetitle + "$2.0 < |y| < 2.4$", xlabel, ylabel);
+ _h_dsigdptdy_y00_04 = bookHistogram1D(1, 1, 1);
+ _h_dsigdptdy_y04_08 = bookHistogram1D(2, 1, 1);
+ _h_dsigdptdy_y08_12 = bookHistogram1D(3, 1, 1);
+ _h_dsigdptdy_y12_16 = bookHistogram1D(4, 1, 1);
+ _h_dsigdptdy_y16_20 = bookHistogram1D(5, 1, 1);
+ _h_dsigdptdy_y20_24 = bookHistogram1D(6, 1, 1);
}
Modified: trunk/src/Analyses/D0_2008_S7719523.cc
==============================================================================
--- trunk/src/Analyses/D0_2008_S7719523.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/D0_2008_S7719523.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -37,19 +37,12 @@
// Book histograms
void D0_2008_S7719523::init() {
- const string xlabel = "$p_\\perp(\\gamma_\\text{lead})$ / GeV";
/// @todo Cross-section units in label
- const string ylabel = "$\\mathrm{d}{\\sigma}/\\mathrm{d}{p_\\perp(\\gamma_\\text{lead})}$";
- const string basetitle = "Leading photon $p_\\perp$ ";
- _h_central_same_cross_section =
- bookHistogram1D("d01-x01-y01", basetitle + "(central jets, same-sign rapidity)", xlabel, ylabel);
- _h_central_opp_cross_section =
- bookHistogram1D("d02-x01-y01", basetitle + "(central jets, opp-sign rapidity)", xlabel, ylabel);
- _h_forward_same_cross_section =
- bookHistogram1D("d03-x01-y01", basetitle + "(forward jets, same-sign rapidity)", xlabel, ylabel);
- _h_forward_opp_cross_section =
- bookHistogram1D("d04-x01-y01", basetitle + "(forward jets, opp-sign rapidity)", xlabel, ylabel);
+ _h_central_same_cross_section = bookHistogram1D(1, 1, 1);
+ _h_central_opp_cross_section = bookHistogram1D(2, 1, 1);
+ _h_forward_same_cross_section = bookHistogram1D(3, 1, 1);
+ _h_forward_opp_cross_section = bookHistogram1D(4, 1, 1);
}
Modified: trunk/src/Analyses/D0_2008_S7837160.cc
==============================================================================
--- trunk/src/Analyses/D0_2008_S7837160.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/D0_2008_S7837160.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -40,12 +40,12 @@
// Book histograms
void D0_2008_S7837160::init() {
- _h_dsigplus_deta_25_35 = bookHistogram1D("dsigplus_deta_25_35", "Temp1", 10, 0.0, 3.2);
- _h_dsigminus_deta_25_35 = bookHistogram1D("dsigminus_deta_25_35", "Temp2", 10, 0.0, 3.2);
- _h_dsigplus_deta_35 = bookHistogram1D("dsigplus_deta_35", "Temp3", 10, 0.0, 3.2);
- _h_dsigminus_deta_35 = bookHistogram1D("dsigminus_deta_35", "Temp4", 10, 0.0, 3.2);
- _h_dsigplus_deta_25 = bookHistogram1D("dsigplus_deta_25", "Temp5", 10, 0.0, 3.2);
- _h_dsigminus_deta_25 = bookHistogram1D("dsigminus_deta_25", "Temp6", 10, 0.0, 3.2);
+ _h_dsigplus_deta_25_35 = bookHistogram1D("dsigplus_deta_25_35", 10, 0.0, 3.2);
+ _h_dsigminus_deta_25_35 = bookHistogram1D("dsigminus_deta_25_35", 10, 0.0, 3.2);
+ _h_dsigplus_deta_35 = bookHistogram1D("dsigplus_deta_35", 10, 0.0, 3.2);
+ _h_dsigminus_deta_35 = bookHistogram1D("dsigminus_deta_35", 10, 0.0, 3.2);
+ _h_dsigplus_deta_25 = bookHistogram1D("dsigplus_deta_25", 10, 0.0, 3.2);
+ _h_dsigminus_deta_25 = bookHistogram1D("dsigminus_deta_25", 10, 0.0, 3.2);
}
Modified: trunk/src/Analyses/D0_2008_S7863608.cc
==============================================================================
--- trunk/src/Analyses/D0_2008_S7863608.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/D0_2008_S7863608.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -29,15 +29,11 @@
void D0_2008_S7863608::init() {
/// @todo Dividing through by measured Z cross-section would be nice...
- _h_jet_pT_cross_section = bookHistogram1D(1, 1, 1, "Differential cross section in leading jet $p_\\perp$",
- "$p_{\\perp}$(1st jet) [GeV]", "$\\text{d}\\sigma/\\text{d}p_{\\perp}$(1st jet)");
- _h_jet_y_cross_section = bookHistogram1D(2, 1, 1, "Differential cross section in leading jet rapidity",
- "$|y|$(1st jet)", "$\\text{d}\\sigma/\\text{d}|y|$(1st jet)");
- _h_Z_pT_cross_section = bookHistogram1D(3, 1, 1, "Differential cross section in Z/$\\gamma*$ $p_\\perp$",
- "$p_{\\perp}$(Z) [GeV]", "$\\text{d}\\sigma/\\text{d}p_{\\perp}$(Z)");
- _h_Z_y_cross_section = bookHistogram1D(4, 1, 1, "Differential cross section in Z/$\\gamma*$ rapidity",
- "$|y|$(Z)", "$\\text{d}\\sigma/\\text{d}|y|$(Z)");
- _h_total_cross_section = bookHistogram1D(5, 1, 1, "Total Z + jet cross section", "$\\sqrt{s}$", "$\\sigma$");
+ _h_jet_pT_cross_section = bookHistogram1D(1, 1, 1);
+ _h_jet_y_cross_section = bookHistogram1D(2, 1, 1);
+ _h_Z_pT_cross_section = bookHistogram1D(3, 1, 1);
+ _h_Z_y_cross_section = bookHistogram1D(4, 1, 1);
+ _h_total_cross_section = bookHistogram1D(5, 1, 1);
}
Modified: trunk/src/Analyses/D0_2009_S8202443.cc
==============================================================================
--- trunk/src/Analyses/D0_2009_S8202443.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/D0_2009_S8202443.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -40,24 +40,12 @@
// Book histograms
void D0_2009_S8202443::init() {
- _h_jet1_pT_constrained = bookHistogram1D(
- 1, 1, 1, "pT of 1st jet (constrained electrons)", "$p_{\\perp}^{\\text{1st jet}}$ [GeV]",
- "$1/\\sigma \\; \\text{d}\\sigma/\\text{d}p_{\\perp}^{\\text{1st jet}}$");
- _h_jet2_pT_constrained = bookHistogram1D(
- 3, 1, 1, "pT of 2nd jet (constrained electrons)", "$p_{\\perp}^{\\text{2nd jet}}$ [GeV]",
- "$1/\\sigma \\; \\text{d}\\sigma/\\text{d}p_{\\perp}^{\\text{2nd jet}}$");
- _h_jet3_pT_constrained = bookHistogram1D(
- 5, 1, 1, "pT of 3rd jet (constrained electrons)", "$p_{\\perp}^{\\text{3rd jet}}$ [GeV]",
- "$1/\\sigma \\; \\text{d}\\sigma/\\text{d}p_{\\perp}^{\\text{3rd jet}}$");
- _h_jet1_pT = bookHistogram1D(
- 2, 1, 1, "pT of 1st jet", "$p_{\\perp}^{\\text{1st jet}}$ [GeV]",
- "$1/\\sigma \\; \\text{d}\\sigma/\\text{d}p_{\\perp}^{\\text{1st jet}}$");
- _h_jet2_pT = bookHistogram1D(
- 4, 1, 1, "pT of 2nd jet", "$p_{\\perp}^{\\text{2nd jet}}$ [GeV]",
- "$1/\\sigma \\; \\text{d}\\sigma/\\text{d}p_{\\perp}^{\\text{2nd jet}}$");
- _h_jet3_pT = bookHistogram1D(
- 6, 1, 1, "pT of 3rd jet", "$p_{\\perp}^{\\text{3rd jet}}$ [GeV]",
- "$1/\\sigma \\; \\text{d}\\sigma/\\text{d}p_{\\perp}^{\\text{3rd jet}}$");
+ _h_jet1_pT_constrained = bookHistogram1D(1, 1, 1);
+ _h_jet2_pT_constrained = bookHistogram1D(3, 1, 1);
+ _h_jet3_pT_constrained = bookHistogram1D(5, 1, 1);
+ _h_jet1_pT = bookHistogram1D(2, 1, 1);
+ _h_jet2_pT = bookHistogram1D(4, 1, 1);
+ _h_jet3_pT = bookHistogram1D(6, 1, 1);
}
Modified: trunk/src/Analyses/D0_2009_S8320160.cc
==============================================================================
--- trunk/src/Analyses/D0_2009_S8320160.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/D0_2009_S8320160.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -22,46 +22,16 @@
// Book histograms
void D0_2009_S8320160::init() {
- _h_chi_dijet.addHistogram(0.25, 0.3, bookHistogram1D(
- 1, 1, 1, "$0.25 \\leq M_{jj}/\\text{TeV} \\leq 0.3$",
- "$\\chi_{\\text{dijet}}=\\exp(|y_1 - y_2|)$",
- "$1/\\sigma_{\\text{dijet}} d\\sigma/d\\chi_{\\text{dijet}}$"));
- _h_chi_dijet.addHistogram(0.3, 0.4, bookHistogram1D(
- 2, 1, 1, "$0.3 \\leq M_{jj}/\\text{TeV} \\leq 0.4$",
- "$\\chi_{\\text{dijet}}=\\exp(|y_1 - y_2|)$",
- "$1/\\sigma_{\\text{dijet}} d\\sigma/d\\chi_{\\text{dijet}}$"));
- _h_chi_dijet.addHistogram(0.4, 0.5, bookHistogram1D(
- 3, 1, 1, "$0.4 \\leq M_{jj}/\\text{TeV} \\leq 0.5$",
- "$\\chi_{\\text{dijet}}=\\exp(|y_1 - y_2|)$",
- "$1/\\sigma_{\\text{dijet}} d\\sigma/d\\chi_{\\text{dijet}}$"));
- _h_chi_dijet.addHistogram(0.5, 0.6, bookHistogram1D(
- 4, 1, 1, "$0.5 \\leq M_{jj}/\\text{TeV} \\leq 0.6$",
- "$\\chi_{\\text{dijet}}=\\exp(|y_1 - y_2|)$",
- "$1/\\sigma_{\\text{dijet}} d\\sigma/d\\chi_{\\text{dijet}}$"));
- _h_chi_dijet.addHistogram(0.6, 0.7, bookHistogram1D(
- 5, 1, 1, "$0.6 \\leq M_{jj}/\\text{TeV} \\leq 0.7$",
- "$\\chi_{\\text{dijet}}=\\exp(|y_1 - y_2|)$",
- "$1/\\sigma_{\\text{dijet}} d\\sigma/d\\chi_{\\text{dijet}}$"));
- _h_chi_dijet.addHistogram(0.7, 0.8, bookHistogram1D(
- 6, 1, 1, "$0.7 \\leq M_{jj}/\\text{TeV} \\leq 0.8$",
- "$\\chi_{\\text{dijet}}=\\exp(|y_1 - y_2|)$",
- "$1/\\sigma_{\\text{dijet}} d\\sigma/d\\chi_{\\text{dijet}}$"));
- _h_chi_dijet.addHistogram(0.8, 0.9, bookHistogram1D(
- 7, 1, 1, "$0.8 \\leq M_{jj}/\\text{TeV} \\leq 0.9$",
- "$\\chi_{\\text{dijet}}=\\exp(|y_1 - y_2|)$",
- "$1/\\sigma_{\\text{dijet}} d\\sigma/d\\chi_{\\text{dijet}}$"));
- _h_chi_dijet.addHistogram(0.9, 1.0, bookHistogram1D(
- 8, 1, 1, "$0.9 \\leq M_{jj}/\\text{TeV} \\leq 1.0$",
- "$\\chi_{\\text{dijet}}=\\exp(|y_1 - y_2|)$",
- "$1/\\sigma_{\\text{dijet}} d\\sigma/d\\chi_{\\text{dijet}}$"));
- _h_chi_dijet.addHistogram(1.0, 1.1, bookHistogram1D(
- 9, 1, 1, "$1.0 \\leq M_{jj}/\\text{TeV} \\leq 1.1$",
- "$\\chi_{\\text{dijet}}=\\exp(|y_1 - y_2|)$",
- "$1/\\sigma_{\\text{dijet}} d\\sigma/d\\chi_{\\text{dijet}}$"));
- _h_chi_dijet.addHistogram(1.1, 1.960, bookHistogram1D(
- 10, 1, 1, "$1.1 \\leq M_{jj}/\\text{TeV}$",
- "$\\chi_{\\text{dijet}}=\\exp(|y_1 - y_2|)$",
- "$1/\\sigma_{\\text{dijet}} d\\sigma/d\\chi_{\\text{dijet}}$"));
+ _h_chi_dijet.addHistogram(0.25, 0.3, bookHistogram1D(1, 1, 1));
+ _h_chi_dijet.addHistogram(0.3, 0.4, bookHistogram1D(2, 1, 1));
+ _h_chi_dijet.addHistogram(0.4, 0.5, bookHistogram1D(3, 1, 1));
+ _h_chi_dijet.addHistogram(0.5, 0.6, bookHistogram1D(4, 1, 1));
+ _h_chi_dijet.addHistogram(0.6, 0.7, bookHistogram1D(5, 1, 1));
+ _h_chi_dijet.addHistogram(0.7, 0.8, bookHistogram1D(6, 1, 1));
+ _h_chi_dijet.addHistogram(0.8, 0.9, bookHistogram1D(7, 1, 1));
+ _h_chi_dijet.addHistogram(0.9, 1.0, bookHistogram1D(8, 1, 1));
+ _h_chi_dijet.addHistogram(1.0, 1.1, bookHistogram1D(9, 1, 1));
+ _h_chi_dijet.addHistogram(1.1, 1.960, bookHistogram1D(10, 1, 1));
}
Modified: trunk/src/Analyses/DELPHI_1995_S3137023.cc
==============================================================================
--- trunk/src/Analyses/DELPHI_1995_S3137023.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/DELPHI_1995_S3137023.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -67,10 +67,8 @@
void DELPHI_1995_S3137023::init() {
- _histXpXiMinus = bookHistogram1D(2, 1, 1, "$\\Xi^-$ scaled momentum",
- "$x_p$", "$1/\\sigma \\, \\text{d}\\sigma/\\text{d}x_p$");
- _histXpSigma1385Plus = bookHistogram1D(3, 1, 1, "$\\Sigma^\\pm(1385)$ scaled momentum",
- "$x_p$", "$1/\\sigma \\, \\text{d}\\sigma/\\text{d}x_p$");
+ _histXpXiMinus = bookHistogram1D(2, 1, 1);
+ _histXpSigma1385Plus = bookHistogram1D(3, 1, 1);
}
// Finalize
Modified: trunk/src/Analyses/DELPHI_1996_S3430090.cc
==============================================================================
--- trunk/src/Analyses/DELPHI_1996_S3430090.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/DELPHI_1996_S3430090.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -252,204 +252,84 @@
}
- string DELPHI_1996_S3430090::dsigbyd(const string& x) {
- return "\\text{d}{\\sigma}/\\text{d}{" + x + "}";
- }
- string DELPHI_1996_S3430090::Ndsigbyd(const string& x) {
- return "N \\, " + dsigbyd(x);
- }
- string DELPHI_1996_S3430090::unitdsigbyd(const string& x) {
- return "N \\, " + dsigbyd(x);
- }
- string DELPHI_1996_S3430090::texmath(const string& foo) {
- return "$" + foo + "$";
- }
-
-
void DELPHI_1996_S3430090::init() {
- _histPtTIn =
- bookHistogram1D(1, 1, 1, "In-plane $p_\\perp$ in GeV w.r.t. thrust axes",
- "$p_\\perp^\\text{in}$ / GeV", texmath(Ndsigbyd("p_\\perp^\\text{in}")));
- _histPtTOut =
- bookHistogram1D(2, 1, 1, "Out-of-plane $p_\\perp$ in GeV w.r.t. thrust axes",
- "$p_\\perp^\\text{out}$ / GeV", texmath(Ndsigbyd("p_\\perp^\\text{out}")));
- _histPtSIn =
- bookHistogram1D(3, 1, 1, "In-plane $p_\\perp$ in GeV w.r.t. sphericity axes",
- "$p_\\perp^\\text{in}$ / GeV", texmath(Ndsigbyd("p_\\perp^\\text{in}")));
- _histPtSOut =
- bookHistogram1D(4, 1, 1, "Out-of-plane $p_\\perp$ in GeV w.r.t. sphericity axes",
- "$p_\\perp^\\text{out}$ / GeV", texmath(Ndsigbyd("p_\\perp^\\text{out}")));
-
- _histRapidityT =
- bookHistogram1D(5, 1, 1, "Rapidity w.r.t. thrust axes, $y_T$",
- "$y_T$", texmath(Ndsigbyd("y_T")));
- _histRapidityS =
- bookHistogram1D(6, 1, 1, "Rapidity w.r.t. sphericity axes, $y_S$",
- "$y_S$", texmath(Ndsigbyd("y_S")));
- _histScaledMom =
- bookHistogram1D(7, 1, 1, "Scaled momentum, $x_p = |p|/|p_\\text{beam}|$",
- "$x_p$", texmath(Ndsigbyd("x_p")));
- _histLogScaledMom =
- bookHistogram1D(8, 1, 1, "Log of scaled momentum, $\\log(1/x_p)$",
- "$\\log(1/x_p)$", texmath(Ndsigbyd("\\log(1/x_p)")));
-
- _histPtTOutVsXp =
- bookProfile1D(9, 1, 1, "Mean out-of-plane $p_\\perp$ in GeV w.r.t. thrust axes vs. $x_p$",
- "$x_p$", "$p_\\perp^\\text{out}$");
- _histPtVsXp =
- bookProfile1D(10, 1, 1, "Mean $p_\\perp$ in GeV vs. $x_p$",
- "$x_p$", "$p_\\perp$");
-
- _hist1MinusT =
- bookHistogram1D(11, 1, 1, "$1-\\text{Thrust}$",
- "$1-T$", texmath(unitdsigbyd("(1-T)")));
- _histTMajor =
- bookHistogram1D(12, 1, 1, "Thrust major, $M$",
- "$M$", texmath(unitdsigbyd("M")));
- _histTMinor =
- bookHistogram1D(13, 1, 1, "Thrust minor, $m$",
- "$m$", texmath(unitdsigbyd("m")));
- _histOblateness =
- bookHistogram1D(14, 1, 1, "Oblateness = $M - m$",
- "$O$", texmath(unitdsigbyd("O")));
-
- _histSphericity =
- bookHistogram1D(15, 1, 1, "Sphericity, $S$",
- "$S$", texmath(unitdsigbyd("S")));
- _histAplanarity =
- bookHistogram1D(16, 1, 1, "Aplanarity, $A$",
- "$A$", texmath(unitdsigbyd("A")));
- _histPlanarity =
- bookHistogram1D(17, 1, 1, "Planarity, $P$",
- "$P$", texmath(unitdsigbyd("P")));
-
- _histCParam =
- bookHistogram1D(18, 1, 1, "$C$ parameter",
- "$C$", texmath(unitdsigbyd("C")));
- _histDParam =
- bookHistogram1D(19, 1, 1, "$D$ parameter",
- "$D$", texmath(unitdsigbyd("D")));
-
- string y = "M_h^2/E_\\text{vis}^2";
- _histHemiMassH =
- bookHistogram1D(20, 1, 1, "Heavy hemisphere masses, $" + y + "$",
- texmath(y), texmath(unitdsigbyd(y)));
- y = "M_l^2/E_\\text{vis}^2";
- _histHemiMassL =
- bookHistogram1D(21, 1, 1, "Light hemisphere masses, $" + y + "$",
- texmath(y), texmath(unitdsigbyd(y)));
- y = "M_d^2/E_\\text{vis}^2";
- _histHemiMassD =
- bookHistogram1D(22, 1, 1, "Difference in hemisphere masses, $" + y + "$",
- texmath(y), texmath(unitdsigbyd(y)));
-
- y = "B_\\text{max}";
- _histHemiBroadW =
- bookHistogram1D(23, 1, 1, "Wide hemisphere broadening, $" + y + "$",
- texmath(y), texmath(unitdsigbyd(y)));
- y = "B_\\text{min}";
- _histHemiBroadN =
- bookHistogram1D(24, 1, 1, "Narrow hemisphere broadening, $B_\\text{min}$",
- texmath(y), texmath(unitdsigbyd(y)));
- y = "B_\\text{sum}";
- _histHemiBroadT =
- bookHistogram1D(25, 1, 1, "Total hemisphere broadening, $B_\\text{sum}$",
- texmath(y), texmath(unitdsigbyd(y)));
- y = "B_\\text{diff}";
- _histHemiBroadD =
- bookHistogram1D(26, 1, 1, "Difference in hemisphere broadening, $B_\\text{diff}$",
- texmath(y), texmath(unitdsigbyd(y)));
+ _histPtTIn = bookHistogram1D(1, 1, 1);
+ _histPtTOut = bookHistogram1D(2, 1, 1);
+ _histPtSIn = bookHistogram1D(3, 1, 1);
+ _histPtSOut = bookHistogram1D(4, 1, 1);
+
+ _histRapidityT = bookHistogram1D(5, 1, 1);
+ _histRapidityS = bookHistogram1D(6, 1, 1);
+ _histScaledMom = bookHistogram1D(7, 1, 1);
+ _histLogScaledMom = bookHistogram1D(8, 1, 1);
+
+ _histPtTOutVsXp = bookProfile1D(9, 1, 1);
+ _histPtVsXp = bookProfile1D(10, 1, 1);
+
+ _hist1MinusT = bookHistogram1D(11, 1, 1);
+ _histTMajor = bookHistogram1D(12, 1, 1);
+ _histTMinor = bookHistogram1D(13, 1, 1);
+ _histOblateness = bookHistogram1D(14, 1, 1);
+
+ _histSphericity = bookHistogram1D(15, 1, 1);
+ _histAplanarity = bookHistogram1D(16, 1, 1);
+ _histPlanarity = bookHistogram1D(17, 1, 1);
+
+ _histCParam = bookHistogram1D(18, 1, 1);
+ _histDParam = bookHistogram1D(19, 1, 1);
+
+ _histHemiMassH = bookHistogram1D(20, 1, 1);
+ _histHemiMassL = bookHistogram1D(21, 1, 1);
+ _histHemiMassD = bookHistogram1D(22, 1, 1);
+
+ _histHemiBroadW = bookHistogram1D(23, 1, 1);
+ _histHemiBroadN = bookHistogram1D(24, 1, 1);
+ _histHemiBroadT = bookHistogram1D(25, 1, 1);
+ _histHemiBroadD = bookHistogram1D(26, 1, 1);
// Binned in y_cut
- y = "D_2^\\text{Durham}";
- _histDiffRate2Durham =
- bookHistogram1D(27, 1, 1, "Differential 3-jet rate with Durham algorithm, $" + y + "$",
- texmath(y), texmath(unitdsigbyd(y)));
- y = "D_2^\\text{Jade}";
- _histDiffRate2Jade =
- bookHistogram1D(28, 1, 1, "Differential 3-jet rate with Jade algorithm, $D_2^\\text{Jade}$",
- texmath(y), texmath(unitdsigbyd(y)));
- y = "D_3^\\text{Durham}";
- _histDiffRate3Durham =
- bookHistogram1D(29, 1, 1, "Differential 4-jet rate with Durham algorithm, $D_3^\\text{Durham}$",
- texmath(y), texmath(unitdsigbyd(y)));
- y = "D_3^\\text{Jade}";
- _histDiffRate3Jade =
- bookHistogram1D(30, 1, 1, "Differential 4-jet rate with Jade algorithm, $D_3^\\text{Jade}$",
- texmath(y), texmath(unitdsigbyd(y)));
- y = "D_4^\\text{Durham}";
- _histDiffRate4Durham =
- bookHistogram1D(31, 1, 1, "Differential 5-jet rate with Durham algorithm, $D_4^\\text{Durham}$",
- texmath(y), texmath(unitdsigbyd(y)));
- y = "D_4^\\text{Jade}";
- _histDiffRate4Jade =
- bookHistogram1D(32, 1, 1, "Differential 5-jet rate with Jade algorithm, $D_4^\\text{Jade}$",
- texmath(y), texmath(unitdsigbyd(y)));
+ _histDiffRate2Durham = bookHistogram1D(27, 1, 1);
+ _histDiffRate2Jade = bookHistogram1D(28, 1, 1);
+ _histDiffRate3Durham = bookHistogram1D(29, 1, 1);
+ _histDiffRate3Jade = bookHistogram1D(30, 1, 1);
+ _histDiffRate4Durham = bookHistogram1D(31, 1, 1);
+ _histDiffRate4Jade = bookHistogram1D(32, 1, 1);
// Binned in cos(chi)
- string coschi = "$\\cos{\\chi}$";
- _histEEC =
- bookHistogram1D(33, 1, 1, "Energy-energy correlation, EEC", coschi, "EEC");
- _histAEEC =
- bookHistogram1D(34, 1, 1, "Asymmetry of the energy-energy correlation, AEEC", coschi, "AEEC");
+ _histEEC = bookHistogram1D(33, 1, 1);
+ _histAEEC = bookHistogram1D(34, 1, 1);
- _histMultiCharged =
- bookHistogram1D(35, 1, 1, "Mean charged multiplicity", "", "Multiplicity");
-
- _histMultiPiPlus =
- bookHistogram1D(36, 1, 1, "Mean $\\pi^+/\\pi^-$ multiplicity", "", "Multiplicity");
- _histMultiPi0 =
- bookHistogram1D(36, 1, 2, "Mean $\\pi^0$ multiplicity", "", "Multiplicity");
- _histMultiKPlus =
- bookHistogram1D(36, 1, 3, "Mean $K^+/K^-$ multiplicity", "", "Multiplicity");
- _histMultiK0 =
- bookHistogram1D(36, 1, 4, "Mean $K^0$ multiplicity", "", "Multiplicity");
- _histMultiEta =
- bookHistogram1D(36, 1, 5, "Mean $\\eta$ multiplicity", "", "Multiplicity");
- _histMultiEtaPrime =
- bookHistogram1D(36, 1, 6, "Mean $\\eta'$ multiplicity", "", "Multiplicity");
- _histMultiDPlus =
- bookHistogram1D(36, 1, 7, "Mean $D^+$ multiplicity", "", "Multiplicity");
- _histMultiD0 =
- bookHistogram1D(36, 1, 8, "Mean $D^0$ multiplicity", "", "Multiplicity");
- _histMultiBPlus0 =
- bookHistogram1D(36, 1, 9, "Mean $B^+/B^-/B^0$ multiplicity", "", "Multiplicity");
-
- _histMultiF0 =
- bookHistogram1D(37, 1, 1, "Mean $f_0(980)$ multiplicity", "", "Multiplicity");
-
- _histMultiRho =
- bookHistogram1D(38, 1, 1, "Mean $\\rho$ multiplicity", "", "Multiplicity");
- _histMultiKStar892Plus =
- bookHistogram1D(38, 1, 2, "Mean $K^*(892)^+/K^*(892)^-$ multiplicity", "", "Multiplicity");
- _histMultiKStar892_0 =
- bookHistogram1D(38, 1, 3, "Mean $K^*(892)^0$ multiplicity", "", "Multiplicity");
- _histMultiPhi =
- bookHistogram1D(38, 1, 4, "Mean $\\phi$ multiplicity", "", "Multiplicity");
- _histMultiDStar2010Plus =
- bookHistogram1D(38, 1, 5, "Mean $D^*(2010)^+/D^*(2010)^-$ multiplicity", "", "Multiplicity");
-
- _histMultiF2 =
- bookHistogram1D(39, 1, 1, "Mean $f_2(1270)$ multiplicity", "", "Multiplicity");
- _histMultiK2Star1430_0 =
- bookHistogram1D(39, 1, 2, "Mean $K_2^*(1430)^0$ multiplicity", "", "Multiplicity");
+ _histMultiCharged = bookHistogram1D(35, 1, 1);
- _histMultiP =
- bookHistogram1D(40, 1, 1, "Mean p multiplicity", "", "Multiplicity");
- _histMultiLambda0 =
- bookHistogram1D(40, 1, 2, "Mean $\\Lambda^0$ multiplicity", "", "Multiplicity");
- _histMultiXiMinus =
- bookHistogram1D(40, 1, 3, "Mean $\\Xi^-$ multiplicity", "", "Multiplicity");
- _histMultiOmegaMinus =
- bookHistogram1D(40, 1, 4, "Mean $\\Omega^-$ multiplicity", "", "Multiplicity");
- _histMultiDeltaPlusPlus =
- bookHistogram1D(40, 1, 5, "Mean $\\Delta(1232)^{++}$ multiplicity", "", "Multiplicity");
- _histMultiSigma1385Plus =
- bookHistogram1D(40, 1, 6, "Mean $\\Sigma(1385)^+/\\Sigma(1385)^-$ multiplicity", "", "Multiplicity");
- _histMultiXi1530_0 =
- bookHistogram1D(40, 1, 7, "Mean $\\Xi(1530)^0$ multiplicity", "", "Multiplicity");
- _histMultiLambdaB0 =
- bookHistogram1D(40, 1, 8, "Mean $\\Lambda_b^0$ multiplicity", "", "Multiplicity");
+ _histMultiPiPlus = bookHistogram1D(36, 1, 1);
+ _histMultiPi0 = bookHistogram1D(36, 1, 2);
+ _histMultiKPlus = bookHistogram1D(36, 1, 3);
+ _histMultiK0 = bookHistogram1D(36, 1, 4);
+ _histMultiEta = bookHistogram1D(36, 1, 5);
+ _histMultiEtaPrime = bookHistogram1D(36, 1, 6);
+ _histMultiDPlus = bookHistogram1D(36, 1, 7);
+ _histMultiD0 = bookHistogram1D(36, 1, 8);
+ _histMultiBPlus0 = bookHistogram1D(36, 1, 9);
+
+ _histMultiF0 = bookHistogram1D(37, 1, 1);
+
+ _histMultiRho = bookHistogram1D(38, 1, 1);
+ _histMultiKStar892Plus = bookHistogram1D(38, 1, 2);
+ _histMultiKStar892_0 = bookHistogram1D(38, 1, 3);
+ _histMultiPhi = bookHistogram1D(38, 1, 4);
+ _histMultiDStar2010Plus = bookHistogram1D(38, 1, 5);
+
+ _histMultiF2 = bookHistogram1D(39, 1, 1);
+ _histMultiK2Star1430_0 = bookHistogram1D(39, 1, 2);
+
+ _histMultiP = bookHistogram1D(40, 1, 1);
+ _histMultiLambda0 = bookHistogram1D(40, 1, 2);
+ _histMultiXiMinus = bookHistogram1D(40, 1, 3);
+ _histMultiOmegaMinus = bookHistogram1D(40, 1, 4);
+ _histMultiDeltaPlusPlus = bookHistogram1D(40, 1, 5);
+ _histMultiSigma1385Plus = bookHistogram1D(40, 1, 6);
+ _histMultiXi1530_0 = bookHistogram1D(40, 1, 7);
+ _histMultiLambdaB0 = bookHistogram1D(40, 1, 8);
}
Modified: trunk/src/Analyses/DELPHI_2002_069_CONF_603.cc
==============================================================================
--- trunk/src/Analyses/DELPHI_2002_069_CONF_603.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/DELPHI_2002_069_CONF_603.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -92,10 +92,10 @@
void DELPHI_2002_069_CONF_603::init() {
- _histXbprim = bookHistogram1D(1, 1, 1, "$b$ quark fragmentation function $f(x_B^\\text{prim})$", "$x_B$", "$1/N \\, \\text{d}{N}/\\text{d}x_B$");
- _histXbweak = bookHistogram1D(2, 1, 1, "$b$ quark fragmentation function $f(x_B^\\text{weak})$", "$x_B$", "$1/N \\, \\text{d}{N}/\\text{d}x_B$");
- _histMeanXbprim = bookProfile1D(4, 1, 1, "Mean of $b$ quark fragmentation function $f(x_B^\\text{prim})$", "", "$\\langle x_B \\rangle$");
- _histMeanXbweak = bookProfile1D(5, 1, 1, "Mean of $b$ quark fragmentation function $f(x_B^\\text{weak})$", "", "$\\langle x_B \\rangle$");
+ _histXbprim = bookHistogram1D(1, 1, 1);
+ _histXbweak = bookHistogram1D(2, 1, 1);
+ _histMeanXbprim = bookProfile1D(4, 1, 1);
+ _histMeanXbweak = bookProfile1D(5, 1, 1);
}
// Finalize
Modified: trunk/src/Analyses/DELPHI_2003_WUD_03_11.cc
==============================================================================
--- trunk/src/Analyses/DELPHI_2003_WUD_03_11.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/DELPHI_2003_WUD_03_11.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -103,22 +103,14 @@
void DELPHI_2003_WUD_03_11::init() {
- _histDurhamBZ = bookHistogram1D(1, 1, 1, "Bengtsson-Zerwas $|\\cos(\\chi_\\text{BZ})|$, Durham $y_\\text{cut}=0.008$",
- "$|\\cos(\\chi_\\text{BZ})|$", "$1/\\sigma \\, \\text{d}{\\sigma}/\\text{d}|\\cos(\\chi_\\text{BZ})|$");
- _histDurhamKSW = bookHistogram1D(2, 1, 1, "K\\\"orner-Schierholz-Willrodt $\\cos(\\phi_\\text{KSW})$, Durham $y_\\text{cut}=0.008$",
- "$\\cos(\\phi_\\text{KSW})$", "$1/\\sigma \\, \\text{d}{\\sigma}/\\text{d}\\,\\cos(\\phi_\\text{KSW})$");
- _histDurhamNR = bookHistogram1D(3, 1, 1, "Nachtmann-Reiter (mod.) $|\\cos(\\theta^*_\\text{NR})|$, Durham $y_\\text{cut}=0.008$",
- "$|\\cos(\\theta^*_\\text{NR})|$", "$1/\\sigma \\, \\text{d}{\\sigma}/\\text{d}|\\cos(\\theta^*_\\text{NR})|$");
- _histDurhamALPHA34 = bookHistogram1D(4, 1, 1, "$\\cos(\\alpha_{34})$, Durham $y_\\text{cut}=0.008$",
- "$\\cos(\\alpha_{34})$", "$1/\\sigma \\, \\text{d}{\\sigma}/\\text{d}\\,\\cos(\\alpha_{34})$");
- _histJadeBZ = bookHistogram1D(1, 2, 1, "Bengtsson-Zerwas $|\\cos(\\chi_\\text{BZ})|$, Jade $y_\\text{cut}=0.015$",
- "$|\\cos(\\chi_\\text{BZ})|$", "$1/\\sigma \\, \\text{d}{\\sigma}/\\text{d}|\\cos(\\chi_\\text{BZ})|$");
- _histJadeKSW = bookHistogram1D(2, 2, 1, "K\\\"orner-Schierholz-Willrodt $\\cos(\\phi_\\text{KSW})$, Jade $y_\\text{cut}=0.015$",
- "$\\cos(\\phi_\\text{KSW})$", "$1/\\sigma \\, \\text{d}{\\sigma}/\\text{d}\\,\\cos(\\phi_\\text{KSW})$");
- _histJadeNR = bookHistogram1D(3, 2, 1, "Nachtmann-Reiter (mod.) $|\\cos(\\theta^*_\\text{NR})|$, Jade $y_\\text{cut}=0.015$",
- "$|\\cos(\\theta^*_\\text{NR})|$", "$1/\\sigma \\, \\text{d}{\\sigma}/\\text{d}|\\cos(\\theta^*_\\text{NR})|$");
- _histJadeALPHA34 = bookHistogram1D(4, 2, 1, "$\\cos(\\alpha_{34})$, Jade $y_\\text{cut}=0.015$",
- "$\\cos(\\alpha_{34})$", "$1/\\sigma \\, \\text{d}{\\sigma}/\\text{d}\\,\\cos(\\alpha_{34})$");
+ _histDurhamBZ = bookHistogram1D(1, 1, 1);
+ _histDurhamKSW = bookHistogram1D(2, 1, 1);
+ _histDurhamNR = bookHistogram1D(3, 1, 1);
+ _histDurhamALPHA34 = bookHistogram1D(4, 1, 1);
+ _histJadeBZ = bookHistogram1D(1, 2, 1);
+ _histJadeKSW = bookHistogram1D(2, 2, 1);
+ _histJadeNR = bookHistogram1D(3, 2, 1);
+ _histJadeALPHA34 = bookHistogram1D(4, 2, 1);
}
Modified: trunk/src/Analyses/ExampleAnalysis.cc
==============================================================================
--- trunk/src/Analyses/ExampleAnalysis.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/ExampleAnalysis.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -33,29 +33,17 @@
// Using histogram auto-booking is preferable if there are comparison datasets in HepData.
// Since this is just a demo analysis, there is no associated paper!
- _histTot = bookHistogram1D("TotalMult", "Total multiplicity",
- "$N_\\text{tot}$", "$1/\\sigma \\, \\mathrm{d}{\\sigma}/\\mathrm{d}{N_\\text{tot}}$",
- 100, -0.5, 99.5);
- _histChTot = bookHistogram1D("TotalChMult", "Total charged multiplicity",
- "$N_\\text{ch}$", "$1/\\sigma \\, \\mathrm{d}{\\sigma}/\\mathrm{d}{N_\\text{ch}}$",
- 50, -1.0, 99.0);
- _histHadrTot = bookHistogram1D("HadrTotalMult", "Total hadronic multiplicity",
- "$N_\\text{H}$", "$1/\\sigma \\, \\mathrm{d}{\\sigma}/\\mathrm{d}{N_\\text{H}}$",
- 100, -0.5, 99.5);
- _histHadrChTot = bookHistogram1D("HadrTotalChMult", "Total hadronic charged multiplicity",
- "$N_\\text{Hch}$", "$1/\\sigma \\, \\mathrm{d}{\\sigma}/\\mathrm{d}{N_\\text{Hch}}$",
- 50, -1.0, 99.0);
+ _histTot = bookHistogram1D("TotalMult", 100, -0.5, 99.5);
+ _histChTot = bookHistogram1D("TotalChMult", 50, -1.0, 99.0);
+ _histHadrTot = bookHistogram1D("HadrTotalMult", 100, -0.5, 99.5);
+ _histHadrChTot = bookHistogram1D("HadrTotalChMult", 50, -1.0, 99.0);
double edges[11] = { 0.5, 0.6, 0.7, 0.80, 0.85, 0.9, 0.92, 0.94, 0.96, 0.98, 1.0 };
vector<double> vedges(edges, edges+11);
- _histThrust = bookHistogram1D("Thrust", "Thrust",
- "$T$", "$1/\\sigma \\, \\mathrm{d}{\\sigma}/\\mathrm{d}{T}$", vedges);
- _histMajor = bookHistogram1D("Major", "Thrust major",
- "$M$", "$1/\\sigma \\, \\mathrm{d}{\\sigma}/\\mathrm{d}{M}$", 10, 0.0, 0.6);
- _histSphericity = bookHistogram1D("Sphericity", "Sphericity",
- "$S$", "$1/\\sigma \\, \\mathrm{d}{\\sigma}/\\mathrm{d}{S}$", 10, 0.0, 0.8);
- _histAplanarity = bookHistogram1D("Aplanarity", "Aplanarity",
- "$A$", "$1/\\sigma \\, \\mathrm{d}{\\sigma}/\\mathrm{d}{A}$", 10, 0.0, 0.3);
+ _histThrust = bookHistogram1D("Thrust", vedges);
+ _histMajor = bookHistogram1D("Major", 10, 0.0, 0.6);
+ _histSphericity = bookHistogram1D("Sphericity", 10, 0.0, 0.8);
+ _histAplanarity = bookHistogram1D("Aplanarity", 10, 0.0, 0.3);
}
Modified: trunk/src/Analyses/H1_1994_S2919893.cc
==============================================================================
--- trunk/src/Analyses/H1_1994_S2919893.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/H1_1994_S2919893.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -167,39 +167,20 @@
_w117 = make_pair(0.0, 0.0);
_wEnergy = make_pair(0.0, 0.0);
- string xlabel = "$\\eta$";
/// @todo What is "N"?
- string ylabel = "$1/N \\, \\mathrm{d}{E_\\perp}/\\mathrm{d}{\\eta}$ / GeV";
- string basetitle = "Transverse energy flow as a function of rapidity, ";
- _histEnergyFlowLowX =
- bookHistogram1D(1, 1, 1, basetitle + "$x < 10^{-3}$", xlabel, ylabel);
- _histEnergyFlowHighX =
- bookHistogram1D(1, 1, 2, basetitle + "$x > 10^{-3}$", xlabel, ylabel);
-
- xlabel = "$\\omega$";
- ylabel = "$\\mathrm{d}{\\text{EEC}_\\perp}/\\mathrm{d}{\\omega}$";
- basetitle = "Transverse energy--energy correlation for ";
- _histEECLowX =
- bookHistogram1D(2, 1, 1, basetitle + "$x < 10^{-3}$", xlabel, ylabel);
- _histEECHighX =
- bookHistogram1D(2, 1, 2, basetitle + "$x > 10^{-3}$", xlabel, ylabel);
+ _histEnergyFlowLowX = bookHistogram1D(1, 1, 1);
+ _histEnergyFlowHighX = bookHistogram1D(1, 1, 2);
+
+ _histEECLowX = bookHistogram1D(2, 1, 1);
+ _histEECHighX = bookHistogram1D(2, 1, 2);
- xlabel = "$x_L$";
/// @todo Add cross-section units to label
- ylabel = "$1/\\sigma \\, \\mathrm{d}{\\sigma}/\\mathrm{d}{x_L}$";
- basetitle = "Charged particle spectra for ";
- _histSpectraW77 =
- bookHistogram1D(3, 1, 1, "$50 < W < 100$", xlabel, ylabel);
- _histSpectraW122 =
- bookHistogram1D(3, 1, 2, "$100 < W < 150$", xlabel, ylabel);
- _histSpectraW169 =
- bookHistogram1D(3, 1, 3, "$150 < W < 200$", xlabel, ylabel);
- _histSpectraW117 =
- bookHistogram1D(3, 1, 4, "all $W$", xlabel, ylabel);
-
- _histPT2 =
- bookProfile1D (4, 1, 1, "$\\langle p_\\perp^2 \\rangle$ as a function of $x_L$",
- "$x_L$", "$\\langle p_\\perp^2 \\rangle$");
+ _histSpectraW77 = bookHistogram1D(3, 1, 1);
+ _histSpectraW122 = bookHistogram1D(3, 1, 2);
+ _histSpectraW169 = bookHistogram1D(3, 1, 3);
+ _histSpectraW117 = bookHistogram1D(3, 1, 4);
+
+ _histPT2 = bookProfile1D(4, 1, 1);
}
Modified: trunk/src/Analyses/H1_1995_S3167097.cc
==============================================================================
--- trunk/src/Analyses/H1_1995_S3167097.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/H1_1995_S3167097.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -31,25 +31,13 @@
/// @todo Automate this sort of thing so that the analysis code is more readable.
for (size_t i = 0; i < _nbin; ++i) {
string istr(1, char('1' + i));
- _hEtFlow[i] = bookHistogram1D(istr, "$\\mathrm{d}E_\\perp/\\mathrm{d}[c]$ CMS bin = " + istr,
- "$\\eta$", "$1/\\mathrm{N} \\mathrm{d}E_{\\perp}/d\\eta [GeV]$",
- _nb, _xmin, _xmax);
- _hEtFlowStat[i] = bookHistogram1D(istr, "Stat $\\mathrm{d}E_\\perp/\\mathrm{d}[c]$ CMS bin = 1" + istr,
- "$\\eta$", "$1/\\mathrm{N} \\mathrm{d}E_{\\perp}/d\\eta [GeV]$",
- _nb, _xmin, _xmax);
- }
- _hAvEt = bookHistogram1D("21tmp", "$\\langle E_\\perp \\rangle$ vs kin. bin",
- "Kinematic bin", "$\\langle \\mathrm{E}_{\\perp}\\rangle$",
- _nbin, 1.0, 10.0);
- _hAvX = bookHistogram1D("22tmp", "$\\langle x \\rangle$ vs kin. bin",
- "Kinematic bin", "$\\langle x \\rangle$",
- _nbin, 1.0, 10.0);
- _hAvQ2 = bookHistogram1D("23tmp", "$\\langle Q^2 \\rangle$ vs kin. bin",
- "Kinematic bin", "$\\langle Q^{2}\\rangle$",
- _nbin, 1.0, 10.0);
- _hN = bookHistogram1D("24", "Num events vs kin. bin",
- "Kinematic bin", "N",
- _nbin, 1.0, 10.0);
+ _hEtFlow[i] = bookHistogram1D(istr, _nb, _xmin, _xmax);
+ _hEtFlowStat[i] = bookHistogram1D(istr, _nb, _xmin, _xmax);
+ }
+ _hAvEt = bookHistogram1D("21tmp", _nbin, 1.0, 10.0);
+ _hAvX = bookHistogram1D("22tmp", _nbin, 1.0, 10.0);
+ _hAvQ2 = bookHistogram1D("23tmp", _nbin, 1.0, 10.0);
+ _hN = bookHistogram1D("24", _nbin, 1.0, 10.0);
}
Modified: trunk/src/Analyses/H1_2000_S4129130.cc
==============================================================================
--- trunk/src/Analyses/H1_2000_S4129130.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/H1_2000_S4129130.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -192,9 +192,7 @@
string t = "Transverse energy flow for ";
IHistogram1D* h = 0;
- string xlabel = "$\\eta$";
/// @todo What is "N"?
- string ylabel = "$1/N \\, \\mathrm{d}{E_\\perp}/\\mathrm{d}{\\eta}$ / GeV";
const string xt = "\\langle x \\rangle";
const string Q2t = "\\langle Q^2 \\rangle";
@@ -203,26 +201,7 @@
_histETLowQa.reserve(17);
_weightETLowQa.reserve(17);
for (size_t ix = 0; ix < 17; ++ix) {
- string title = t + "$" + xt;
- if (ix == 0) title += " = 0.08\\cdot 10^{-3}, " + Q2t + " = 3.2";
- else if (ix == 1) title += " = 0.14\\cdot 10^{-3}, " + Q2t + " = 3.8";
- else if (ix == 2) title += " = 0.26\\cdot 10^{-3}, " + Q2t + " = 3.9";
- else if (ix == 3) title += " = 0.57\\cdot 10^{-3}, " + Q2t + " = 4.2";
- else if (ix == 4) title += " = 0.16\\cdot 10^{-3}, " + Q2t + " = 6.3";
- else if (ix == 5) title += " = 0.27\\cdot 10^{-3}, " + Q2t + " = 7.0";
- else if (ix == 6) title += " = 0.50\\cdot 10^{-3}, " + Q2t + " = 7.0";
- else if (ix == 7) title += " = 1.10\\cdot 10^{-3}, " + Q2t + " = 7.3";
- else if (ix == 8) title += " = 0.36\\cdot 10^{-3}, " + Q2t + " = 13.1";
- else if (ix == 9) title += " = 0.63\\cdot 10^{-3}, " + Q2t + " = 14.1";
- else if (ix == 10) title += " = 1.10\\cdot 10^{-3}, " + Q2t + " = 14.1";
- else if (ix == 11) title += " = 2.30\\cdot 10^{-3}, " + Q2t + " = 14.9";
- else if (ix == 12) title += " = 0.93\\cdot 10^{-3}, " + Q2t + " = 28.8";
- else if (ix == 13) title += " = 2.10\\cdot 10^{-3}, " + Q2t + " = 31.2";
- else if (ix == 14) title += " = 4.70\\cdot 10^{-3}, " + Q2t + " = 33.2";
- else if (ix == 15) title += " = 2.00\\cdot 10^{-3}, " + Q2t + " = 59.4";
- else if (ix == 16) title += " = 7.00\\cdot 10^{-3}, " + Q2t + " = 70.2";
- title += " \\text{ GeV}^2$";
- h = bookHistogram1D(ix+1, 1, 1, title, xlabel, ylabel);
+ h = bookHistogram1D(ix+1, 1, 1);
_histETLowQa.push_back(h);
_weightETLowQa.push_back(0.);
}
@@ -231,16 +210,7 @@
_histETHighQa.reserve(7);
_weightETHighQa.reserve(7);
for (size_t ix = 0; ix < 7; ++ix) {
- string title = t + "$" + xt;
- if (ix == 0) title += " = 0.0043, " + Q2t + " = 175";
- else if (ix == 1) title += " = 0.01, " + Q2t + " = 253";
- else if (ix == 2) title += " = 0.026, " + Q2t + " = 283";
- else if (ix == 3) title += " = 0.012, " + Q2t + " = 511";
- else if (ix == 4) title += " = 0.026, " + Q2t + " = 617";
- else if (ix == 5) title += " = 0.076, " + Q2t + " = 682";
- else if (ix == 6) title += " = 0.11, " + Q2t + " = 2200";
- title += " \\text{ GeV}^2$";
- h = bookHistogram1D(ix+18, 1, 1, title, xlabel, ylabel);
+ h = bookHistogram1D(ix+18, 1, 1);
_histETHighQa.push_back(h);
_weightETHighQa.push_back(0.);
}
@@ -249,14 +219,7 @@
_histETLowQb.reserve(5);
_weightETLowQb.reserve(5);
for (size_t ix = 0; ix < 5; ++ix) {
- string title = t + "$" + Q2t;
- if (ix == 0) title += " = 2.5-5";
- else if (ix == 1) title += " = 5-10";
- else if (ix == 2) title += " = 10-20";
- else if (ix == 3) title += " = 20-50";
- else if (ix == 4) title += " = 50-100";
- title += " \\text{ GeV}^2$";
- h = bookHistogram1D(ix+25, 1, 1, title, xlabel, ylabel);
+ h = bookHistogram1D(ix+25, 1, 1);
_histETLowQb.push_back(h);
_weightETLowQb.push_back(0.);
}
@@ -265,25 +228,14 @@
_histETHighQb.reserve(3);
_weightETHighQb.reserve(3);
for (size_t ix = 0; ix < 3; ++ix) {
- string title = t + "$" + Q2t;
- if (ix == 0) title += " = 100-220";
- else if (ix == 1) title += " = 220-400";
- else if (ix == 1) title += " > 400";
- title += " \\text{ GeV}^2$";
- h = bookHistogram1D(30+ix, 1, 1, title, xlabel, ylabel);
+ h = bookHistogram1D(30+ix, 1, 1);
_histETHighQb.push_back(h);
_weightETHighQb.push_back(0.0);
}
// Histograms for the averages
- xlabel = "$Q^2$ / $\\text{GeV}^2$";
- ylabel = "$\\langle E_\\perp \\rangle$ / GeV";
- _histAverETCentral =
- bookProfile1D(33, 1, 1,
- "Average $E_\\perp$ in the central region", xlabel, ylabel);
- _histAverETFrag =
- bookProfile1D(34, 1, 1,
- "Average $E_\\perp$ in the forward region", xlabel, ylabel);
+ _histAverETCentral = bookProfile1D(33, 1, 1);
+ _histAverETFrag = bookProfile1D(34, 1, 1);
}
Modified: trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc
==============================================================================
--- trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -136,38 +136,11 @@
void JADE_OPAL_2000_S4300807::init() {
- stringstream ss;
- ss << _sqrts;
- _h_R_Jade[0]=bookDataPointSet(_nr_R_Jade, 1, 1, "Integrated 2-jet rate with Jade algorithm ("+ss.str()+" GeV)",
- "$y_{\\text{cut}}^\\text{Jade}$", "$R_2$");
- _h_R_Jade[1]=bookDataPointSet(_nr_R_Jade, 1, 2, "Integrated 3-jet rate with Jade algorithm ("+ss.str()+" GeV)",
- "$y_{\\text{cut}}^\\text{Jade}$", "$R_3$");
- _h_R_Jade[2]=bookDataPointSet(_nr_R_Jade, 1, 3, "Integrated 4-jet rate with Jade algorithm ("+ss.str()+" GeV)",
- "$y_{\\text{cut}}^\\text{Jade}$", "$R_4$");
- _h_R_Jade[3]=bookDataPointSet(_nr_R_Jade, 1, 4, "Integrated 5-jet rate with Jade algorithm ("+ss.str()+" GeV)",
- "$y_{\\text{cut}}^\\text{Jade}$", "$R_5$");
- _h_R_Jade[4]=bookDataPointSet(_nr_R_Jade, 1, 5, "Integrated $\\geq$6-jet rate with Jade algorithm ("+ss.str()+" GeV)",
- "$y_{\\text{cut}}^\\text{Jade}$", "$R_{\\geq 6}$");
-
- _h_R_Durham[0]=bookDataPointSet(_nr_R_Durham, 1, 1, "Integrated 2-jet rate with Durham algorithm ("+ss.str()+" GeV)",
- "$y_{\\text{cut}}^\\text{Durham}$", "$R_2$");
- _h_R_Durham[1]=bookDataPointSet(_nr_R_Durham, 1, 2, "Integrated 3-jet rate with Durham algorithm ("+ss.str()+" GeV)",
- "$y_{\\text{cut}}^\\text{Durham}$", "$R_3$");
- _h_R_Durham[2]=bookDataPointSet(_nr_R_Durham, 1, 3, "Integrated 4-jet rate with Durham algorithm ("+ss.str()+" GeV)",
- "$y_{\\text{cut}}^\\text{Durham}$", "$R_4$");
- _h_R_Durham[3]=bookDataPointSet(_nr_R_Durham, 1, 4, "Integrated 5-jet rate with Durham algorithm ("+ss.str()+" GeV)",
- "$y_{\\text{cut}}^\\text{Durham}$", "$R_5$");
- _h_R_Durham[4]=bookDataPointSet(_nr_R_Durham, 1, 5, "Integrated $\\geq$6-jet rate with Durham algorithm ("+ss.str()+" GeV)",
- "$y_{\\text{cut}}^\\text{Durham}$", "$R_{\\geq 6}$");
-
- _h_y_Durham[0]=bookHistogram1D(_nr_y_Durham, 1, 1, "Differential 2-jet rate with Durham algorithm ("+ss.str()+" GeV)",
- "$y_{23}^\\text{Durham}$", "$\\text{d}\\sigma/\\text{d}y_{23}$");
- _h_y_Durham[1]=bookHistogram1D(_nr_y_Durham, 1, 2, "Differential 3-jet rate with Durham algorithm ("+ss.str()+" GeV)",
- "$y_{34}^\\text{Durham}$", "$\\text{d}\\sigma/\\text{d}y_{34}$");
- _h_y_Durham[2]=bookHistogram1D(_nr_y_Durham, 1, 3, "Differential 4-jet rate with Durham algorithm ("+ss.str()+" GeV)",
- "$y_{45}^\\text{Durham}$", "$\\text{d}\\sigma/\\text{d}y_{45}$");
- _h_y_Durham[3]=bookHistogram1D(_nr_y_Durham, 1, 4, "Differential 5-jet rate with Durham algorithm ("+ss.str()+" GeV)",
- "$y_{56}^\\text{Durham}$", "$\\text{d}\\sigma/\\text{d}y_{56}$");
+ for (size_t i=0; i<5; ++i) {
+ _h_R_Jade[i]=bookDataPointSet(_nr_R_Jade, 1, i+1);
+ _h_R_Durham[i]=bookDataPointSet(_nr_R_Durham, 1, i+1);
+ if (i<4)_h_y_Durham[i]=bookHistogram1D(_nr_y_Durham, 1, i+1);
+ }
}
Modified: trunk/src/Analyses/MC_LHC_LEADINGJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_LHC_LEADINGJETS.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/MC_LHC_LEADINGJETS.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -30,32 +30,14 @@
// Book histograms
void MC_LHC_LEADINGJETS::init() {
- const string xlabel = "Leading jet $p_\\perp$ / GeV";
- const string pdensityTeX = "$\\mathrm{d}{N_\\text{ch}}/\\mathrm{d}{\\phi}$";
- const string ptsumdensityTeX = "$\\mathrm{d}{\\sum p_\\perp^\\text{sum}}/\\mathrm{d}{\\phi}$";
- const string ptavgTeX = "$\\langle p_\\perp \\rangle$";
const double maxpt1 = 500.0/GeV;
- _hist_pnchg = bookProfile1D(histoPath("trans-nchg"),
- "Transverse region charged particle density",
- xlabel, pdensityTeX, 50, 0.0, maxpt1);
- _hist_pmaxnchg = bookProfile1D(histoPath("trans-maxnchg"),
- "TransMAX region charged particle density",
- xlabel, pdensityTeX, 50, 0.0, maxpt1);
- _hist_pminnchg = bookProfile1D(histoPath("trans-minnchg"),
- "TransMIN region charged particle density",
- xlabel, pdensityTeX, 50, 0.0, maxpt1);
- _hist_pcptsum = bookProfile1D(histoPath("trans-ptsum"),
- "Transverse region charged pT sum density",
- xlabel, ptsumdensityTeX, 50, 0.0, maxpt1);
- _hist_pmaxcptsum = bookProfile1D(histoPath("trans-maxptsum"),
- "TransMAX region charged pT sum density",
- xlabel, ptsumdensityTeX, 50, 0.0, maxpt1);
- _hist_pmincptsum = bookProfile1D(histoPath("trans-minptsum"),
- "TransMIN region charged pT sum density",
- xlabel, ptsumdensityTeX, 50, 0.0, maxpt1);
- _hist_pcptave = bookProfile1D(histoPath("trans-ptavg"),
- "Transverse region charged pT average",
- xlabel, ptavgTeX, 50, 0.0, maxpt1);
+ _hist_pnchg = bookProfile1D("trans-nchg", 50, 0.0, maxpt1);
+ _hist_pmaxnchg = bookProfile1D("trans-maxnchg", 50, 0.0, maxpt1);
+ _hist_pminnchg = bookProfile1D("trans-minnchg", 50, 0.0, maxpt1);
+ _hist_pcptsum = bookProfile1D("trans-ptsum", 50, 0.0, maxpt1);
+ _hist_pmaxcptsum = bookProfile1D("trans-maxptsum", 50, 0.0, maxpt1);
+ _hist_pmincptsum = bookProfile1D("trans-minptsum", 50, 0.0, maxpt1);
+ _hist_pcptave = bookProfile1D("trans-ptavg", 50, 0.0, maxpt1);
}
Modified: trunk/src/Analyses/MC_TVT1960_ZJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_TVT1960_ZJETS.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/MC_TVT1960_ZJETS.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -23,61 +23,28 @@
// Book histograms
void MC_TVT1960_ZJETS::init() {
- _h_Z_mass = bookHistogram1D
- ("Z_mass", "Z mass", "$m_{\\text{Z}}$ [GeV]",
- "$1/\\sigma \\text{d}\\sigma/\\text{d}m_{\\text{Z}}$", 50, 66.0, 116.0);
- _h_jet1_pT = bookHistogram1D
- ("jet1_pT", "pT of 1st jet", "$p_{\\perp}^{\\text{1st jet}}$ [GeV]",
- "$1/\\sigma \\text{d}\\sigma/\\text{d}p_{\\perp}^{\\text{1st jet}}$", 50, 0.0, 500.0);
- _h_jet2_pT = bookHistogram1D
- ("jet2_pT", "pT of 2nd jet", "$p_{\\perp}^{\\text{2nd jet}}$ [GeV]",
- "$1/\\sigma \\text{d}\\sigma/\\text{d}p_{\\perp}^{\\text{2nd jet}}$", 30, 0.0, 300.0);
- _h_jet3_pT = bookHistogram1D
- ("jet3_pT", "pT of 3rd jet", "$p_{\\perp}^{\\text{3rd jet}}$ [GeV]",
- "$1/\\sigma \\text{d}\\sigma/\\text{d}p_{\\perp}^{\\text{3rd jet}}$", 20, 0.0, 200.0);
- _h_jet4_pT = bookHistogram1D
- ("jet4_pT", "pT of 4th jet", "$p_{\\perp}^{\\text{4th jet}}$ [GeV]",
- "$1/\\sigma \\text{d}\\sigma/\\text{d}p_{\\perp}^{\\text{4th jet}}$", 10, 0.0, 100.0);
- _h_jet20_multi_exclusive = bookHistogram1D
- ("jet20_multi_exclusive", "Exclusive jet multiplicity", "$N_{\\text{jet(}\\geq 20 \\text{GeV)}}$",
- "$\\sigma(N_{\\text{jet}})/\\sigma(N_{\\text{jet}}=0)$", 10, -0.5, 9.5);
- _h_jet20_multi_inclusive = bookHistogram1D
- ("jet20_multi_inclusive", "Inclusive jet multiplicity", "$N_{\\text{jet(}\\geq 20 \\text{GeV)}}$",
- "$\\sigma(\\geq N_{\\text{jet}})/\\sigma(\\text{inclusive})$", 10, -0.5, 9.5);
- _h_jet20_multi_ratio = bookDataPointSet
- ("jet20_multi_ratio", "Ratio of jet multiplicity", "$N_{\\text{jet(}\\geq 20 \\text{GeV)}}$",
- "$\\sigma(\\geq N_{\\text{jet}})/\\sigma(\\geq N_{\\text{jet}}-1)$", 9, 0.5, 9.5);
- _h_jet10_multi_exclusive = bookHistogram1D
- ("jet10_multi_exclusive", "Exclusive jet multiplicity", "$N_{\\text{jet(}\\geq 10 \\text{GeV)}}$",
- "$\\sigma(N_{\\text{jet}})/\\sigma(N_{\\text{jet}}=0)$", 10, -0.5, 9.5);
- _h_jet10_multi_inclusive = bookHistogram1D
- ("jet10_multi_inclusive", "Inclusive jet multiplicity", "$N_{\\text{jet(}\\geq 10 \\text{GeV)}}$",
- "$\\sigma(\\geq N_{\\text{jet}})/\\sigma(\\text{inclusive})$", 10, -0.5, 9.5);
- _h_jet10_multi_ratio = bookDataPointSet
- ("jet10_multi_ratio", "Ratio of jet multiplicity", "$N_{\\text{jet(}\\geq 10 \\text{GeV)}}$",
- "$\\sigma(\\geq N_{\\text{jet}})/\\sigma(\\geq N_{\\text{jet}}-1)$", 9, 0.5, 9.5);
- _h_deta_Z_jet1 = bookHistogram1D
- ("deta_Z_jet2", "", "$|\\Delta{\\eta}(\\text{Z, 1st jet})|$",
- "$1/\\sigma \\text{d}\\sigma/\\text{d}|\\Delta{\\eta}(\\text{Z, 1st jet})|$", 20, 0.0, 5.0);
- _h_dR_jet2_jet3 = bookHistogram1D
- ("dR_jet2_jet3", "", "$|\\Delta{R}(\\text{2nd jet, 3rd jet})|$",
- "$1/\\sigma \\text{d}\\sigma/\\text{d}|\\Delta{R}(\\text{2nd jet, 3rd jet})|$", 20, 0.0, 5.0);
+ _h_Z_mass = bookHistogram1D("Z_mass", 50, 66.0, 116.0);
+ _h_jet1_pT = bookHistogram1D("jet1_pT", 50, 0.0, 500.0);
+ _h_jet2_pT = bookHistogram1D("jet2_pT", 30, 0.0, 300.0);
+ _h_jet3_pT = bookHistogram1D("jet3_pT", 20, 0.0, 200.0);
+ _h_jet4_pT = bookHistogram1D("jet4_pT", 10, 0.0, 100.0);
+ _h_jet20_multi_exclusive = bookHistogram1D("jet20_multi_exclusive", 10, -0.5, 9.5);
+ _h_jet20_multi_inclusive = bookHistogram1D("jet20_multi_inclusive", 10, -0.5, 9.5);
+ _h_jet20_multi_ratio = bookDataPointSet("jet20_multi_ratio", 9, 0.5, 9.5);
+ _h_jet10_multi_exclusive = bookHistogram1D("jet10_multi_exclusive", 10, -0.5, 9.5);
+ _h_jet10_multi_inclusive = bookHistogram1D("jet10_multi_inclusive", 10, -0.5, 9.5);
+ _h_jet10_multi_ratio = bookDataPointSet("jet10_multi_ratio", 9, 0.5, 9.5);
+ _h_deta_Z_jet1 = bookHistogram1D("deta_Z_jet2", 20, 0.0, 5.0);
+ _h_dR_jet2_jet3 = bookHistogram1D("dR_jet2_jet3", 20, 0.0, 5.0);
for (size_t i=0; i<4; ++i) {
- stringstream name, title, xtitle, ytitle;
+ stringstream name;
name<<"log10_d_"<<i<<i+1;
- title<<"$\\log_{10}$($k_\\perp$ jet resolution $"<<i<<" \\to "<<i+1<<"$ [GeV])";
- xtitle<<"$\\log_{10}(d_{"<<i<<i+1<<"}/\\text{GeV})$";
- ytitle<<"$\\text{d}\\sigma/\\text{d}\\log_{10}(d_{"<<i<<i+1<<"})$";
- _h_log10_d[i] = bookHistogram1D(name.str(), title.str(), xtitle.str(), ytitle.str(), 50, 0.2, 2.6);
+ _h_log10_d[i] = bookHistogram1D(name.str(), 50, 0.2, 2.6);
}
for (size_t i=0; i<5; ++i) {
- stringstream name, title, xtitle, ytitle;
+ stringstream name;
name<<"log10_R_"<<i;
- title<<"$\\log_{10}$(Integrated $"<<i<<"$ jet rate in $k_\\perp$ [GeV])";
- xtitle<<"$\\log_{10}(d_{\\text{cut}}/\\text{GeV})$";
- if (i==4) ytitle<<"$R_{\\geq"<<i<<"}$";
- else ytitle<<"$R_{"<<i<<"}$";
- _h_log10_R[i] = bookDataPointSet(name.str(), title.str(), xtitle.str(), ytitle.str(), 50, 0.2, 2.6);
+ _h_log10_R[i] = bookDataPointSet(name.str(), 50, 0.2, 2.6);
}
}
Modified: trunk/src/Analyses/OPAL_1998_S3780481.cc
==============================================================================
--- trunk/src/Analyses/OPAL_1998_S3780481.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/OPAL_1998_S3780481.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -117,18 +117,18 @@
void OPAL_1998_S3780481::init() {
- _histXpuds = bookHistogram1D(1, 1, 1, "$uds$ events scaled momentum", "$x_p$", "$1/\\sigma \\, \\text{d}\\sigma/\\text{d}x_p$");
- _histXpc = bookHistogram1D(2, 1, 1, "$c$ events scaled momentum", "$x_p$", "$1/\\sigma \\, \\text{d}\\sigma/\\text{d}x_p$");
- _histXpb = bookHistogram1D(3, 1, 1, "$b$ events scaled momentum", "$x_p$", "$1/\\sigma \\, \\text{d}\\sigma/\\text{d}x_p$");
- _histXpall = bookHistogram1D(4, 1, 1, "All events scaled momentum", "$x_p$", "$1/\\sigma \\, \\text{d}\\sigma/\\text{d}x_p$");
- _histLogXpuds = bookHistogram1D(5, 1, 1, "$uds$ events $\\ln(1/x_p)$", "$\\xi_p$", "$1/\\sigma \\, \\text{d}\\sigma/\\text{d}\\xi_p$");
- _histLogXpc = bookHistogram1D(6, 1, 1, "$c$ events $\\ln(1/x_p)$", "$\\xi_p$", "$1/\\sigma \\, \\text{d}\\sigma/\\text{d}\\xi_p$");
- _histLogXpb = bookHistogram1D(7, 1, 1, "$b$ events $\\ln(1/x_p)$", "$\\xi_p$", "$1/\\sigma \\, \\text{d}\\sigma/\\text{d}\\xi_p$");
- _histLogXpall = bookHistogram1D(8, 1, 1, "All events $\\ln(1/x_p)$", "$\\xi_p$", "$1/\\sigma \\, \\text{d}\\sigma/\\text{d}\\xi_p$");
- _histMultiChargeduds = bookHistogram1D(9, 1, 1, "$uds$ events mean charged multiplicity", "", "Multiplicity");
- _histMultiChargedc = bookHistogram1D(9, 1, 2, "$c$ events mean charged multiplicity", "", "Multiplicity");
- _histMultiChargedb = bookHistogram1D(9, 1, 3, "$b$ events mean charged multiplicity", "", "Multiplicity");
- _histMultiChargedall = bookHistogram1D(9, 1, 4, "All events mean charged multiplicity", "", "Multiplicity");
+ _histXpuds = bookHistogram1D(1, 1, 1);
+ _histXpc = bookHistogram1D(2, 1, 1);
+ _histXpb = bookHistogram1D(3, 1, 1);
+ _histXpall = bookHistogram1D(4, 1, 1);
+ _histLogXpuds = bookHistogram1D(5, 1, 1);
+ _histLogXpc = bookHistogram1D(6, 1, 1);
+ _histLogXpb = bookHistogram1D(7, 1, 1);
+ _histLogXpall = bookHistogram1D(8, 1, 1);
+ _histMultiChargeduds = bookHistogram1D(9, 1, 1);
+ _histMultiChargedc = bookHistogram1D(9, 1, 2);
+ _histMultiChargedb = bookHistogram1D(9, 1, 3);
+ _histMultiChargedall = bookHistogram1D(9, 1, 4);
}
Modified: trunk/src/Analyses/PDG_Hadron_Multiplicities.cc
==============================================================================
--- trunk/src/Analyses/PDG_Hadron_Multiplicities.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/PDG_Hadron_Multiplicities.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -444,125 +444,125 @@
void PDG_HADRON_MULTIPLICITIES::init() {
- _hist10MeanMultiPiPlus = bookHistogram1D( 1, 1, 1, "Mean $\\pi^+$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiPi0 = bookHistogram1D( 2, 1, 1, "Mean $\\pi^0$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiKPlus = bookHistogram1D( 3, 1, 1, "Mean $K^+$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiK0 = bookHistogram1D( 4, 1, 1, "Mean $K^0$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiEta = bookHistogram1D( 5, 1, 1, "Mean $\\eta$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiEtaPrime = bookHistogram1D( 6, 1, 1, "Mean $\\eta'(958)$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiDPlus = bookHistogram1D( 7, 1, 1, "Mean $D^+$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiD0 = bookHistogram1D( 8, 1, 1, "Mean $D^0$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiDPlus_s = bookHistogram1D( 9, 1, 1, "Mean $D^+_s$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiF0_980 = bookHistogram1D(13, 1, 1, "Mean $f_0(980)$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiRho770_0 = bookHistogram1D(15, 1, 1, "Mean $\\rho^0(770)$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiOmega782 = bookHistogram1D(17, 1, 1, "Mean $\\omega(782)$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiKStar892Plus = bookHistogram1D(18, 1, 1, "Mean $K^{*+}(892)$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiKStar892_0 = bookHistogram1D(19, 1, 1, "Mean $K^{*0}(892)$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiPhi1020 = bookHistogram1D(20, 1, 1, "Mean $\\phi(1020)$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiDStar2010Plus = bookHistogram1D(21, 1, 1, "Mean $D^{*+}(2010)$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiDStar2007_0 = bookHistogram1D(22, 1, 1, "Mean $D^{*0}(2007)$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiDStar_s2112Plus = bookHistogram1D(23, 1, 1, "Mean $D^{*+}_s(2112)$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiJPsi1S = bookHistogram1D(25, 1, 1, "Mean $J/\\psi(1S)$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiF2_1270 = bookHistogram1D(31, 1, 1, "Mean $f_2(1270)$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiP = bookHistogram1D(38, 1, 1, "Mean $p$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiLambda = bookHistogram1D(39, 1, 1, "Mean $\\Lambda$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiSigma0 = bookHistogram1D(40, 1, 1, "Mean $\\Sigma^0$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiXiMinus = bookHistogram1D(44, 1, 1, "Mean $\\Xi^-$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiDelta1232PlusPlus = bookHistogram1D(45, 1, 1, "Mean $\\Delta^{++}(1232)$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiSigma1385Minus = bookHistogram1D(46, 1, 1, "Mean $\\Sigma^-(1385)$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiSigma1385Plus = bookHistogram1D(47, 1, 1, "Mean $\\Sigma^+(1385)$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiSigma1385PlusMinus = bookHistogram1D(48, 1, 1, "Mean $\\Sigma^\\pm(1385)$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiXi1530_0 = bookHistogram1D(49, 1, 1, "Mean $\\Xi^0(1530)$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiOmegaMinus = bookHistogram1D(50, 1, 1, "Mean $\\Omega^-$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiLambda_c_Plus = bookHistogram1D(51, 1, 1, "Mean $\\Lambda_c^+$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiSigma_c_PlusPlus_0 = bookHistogram1D(53, 1, 1, "Mean $\\Sigma_c^{++}, \\Sigma_c^0$ multiplicity", "", "Multiplicity");
- _hist10MeanMultiLambda1520 = bookHistogram1D(54, 1, 1, "Mean $\\Lambda(1520)$ multiplicity", "", "Multiplicity");
-
- _hist32MeanMultiPiPlus = bookHistogram1D( 1, 1, 2, "Mean $\\pi^+$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiPi0 = bookHistogram1D( 2, 1, 2, "Mean $\\pi^0$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiKPlus = bookHistogram1D( 3, 1, 2, "Mean $K^+$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiK0 = bookHistogram1D( 4, 1, 2, "Mean $K^0$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiEta = bookHistogram1D( 5, 1, 2, "Mean $\\eta$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiEtaPrime = bookHistogram1D( 6, 1, 2, "Mean $\\eta'(958)$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiDPlus = bookHistogram1D( 7, 1, 2, "Mean $D^+$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiD0 = bookHistogram1D( 8, 1, 2, "Mean $D^0$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiDPlus_s = bookHistogram1D( 9, 1, 2, "Mean $D^+_s$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiF0_980 = bookHistogram1D(13, 1, 2, "Mean $f_0(980)$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiRho770_0 = bookHistogram1D(15, 1, 2, "Mean $\\rho^0(770)$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiKStar892Plus = bookHistogram1D(18, 1, 2, "Mean $K^{*+}(892)$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiKStar892_0 = bookHistogram1D(19, 1, 2, "Mean $K^{*0}(892)$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiPhi1020 = bookHistogram1D(20, 1, 2, "Mean $\\phi(1020)$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiDStar2010Plus = bookHistogram1D(21, 1, 2, "Mean $D^{*+}(2010)$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiDStar2007_0 = bookHistogram1D(22, 1, 2, "Mean $D^{*0}(2007)$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiF2_1270 = bookHistogram1D(31, 1, 2, "Mean $f_2(1270)$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiK2Star1430Plus = bookHistogram1D(33, 1, 1, "Mean $K_2^{*+}(1430)$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiK2Star1430_0 = bookHistogram1D(34, 1, 1, "Mean $K_2^{*0}(1430)$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiP = bookHistogram1D(38, 1, 2, "Mean $p$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiLambda = bookHistogram1D(39, 1, 2, "Mean $\\Lambda$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiXiMinus = bookHistogram1D(44, 1, 2, "Mean $\\Xi^-$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiSigma1385Minus = bookHistogram1D(46, 1, 2, "Mean $\\Sigma^-(1385)$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiSigma1385Plus = bookHistogram1D(47, 1, 2, "Mean $\\Sigma^+(1385)$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiSigma1385PlusMinus = bookHistogram1D(48, 1, 2, "Mean $\\Sigma^\\pm(1385)$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiOmegaMinus = bookHistogram1D(50, 1, 2, "Mean $\\Omega^-$ multiplicity", "", "Multiplicity");
- _hist32MeanMultiLambda_c_Plus = bookHistogram1D(51, 1, 2, "Mean $\\Lambda_c^+$ multiplicity", "", "Multiplicity");
-
- _hist91MeanMultiPiPlus = bookHistogram1D( 1, 1, 3, "Mean $\\pi^+$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiPi0 = bookHistogram1D( 2, 1, 3, "Mean $\\pi^0$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiKPlus = bookHistogram1D( 3, 1, 3, "Mean $K^+$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiK0 = bookHistogram1D( 4, 1, 3, "Mean $K^0$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiEta = bookHistogram1D( 5, 1, 3, "Mean $\\eta$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiEtaPrime = bookHistogram1D( 6, 1, 3, "Mean $\\eta'(958)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiDPlus = bookHistogram1D( 7, 1, 3, "Mean $D^+$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiD0 = bookHistogram1D( 8, 1, 3, "Mean $D^0$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiDPlus_s = bookHistogram1D( 9, 1, 3, "Mean $D^+s$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiBPlus_B0_d = bookHistogram1D(10, 1, 1, "Mean $B^+, B^0_d$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiBPlus_u = bookHistogram1D(11, 1, 1, "Mean $B^+_u$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiB0_s = bookHistogram1D(12, 1, 1, "Mean $B^0_s$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiF0_980 = bookHistogram1D(13, 1, 3, "Mean $f_0(980)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiA0_980Plus = bookHistogram1D(14, 1, 1, "Mean $a_0^+(980)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiRho770_0 = bookHistogram1D(15, 1, 3, "Mean $\\rho^0(770)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiRho770Plus = bookHistogram1D(16, 1, 1, "Mean $\\rho^+(770)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiOmega782 = bookHistogram1D(17, 1, 2, "Mean $\\omega(782)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiKStar892Plus = bookHistogram1D(18, 1, 3, "Mean $K^{*+}(892)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiKStar892_0 = bookHistogram1D(19, 1, 3, "Mean $K^{*0}(892)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiPhi1020 = bookHistogram1D(20, 1, 3, "Mean $\\phi(1020)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiDStar2010Plus = bookHistogram1D(21, 1, 3, "Mean $D^{*+}(2010)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiDStar_s2112Plus = bookHistogram1D(23, 1, 2, "Mean $D^{*+}_s(2112)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiBStar = bookHistogram1D(24, 1, 1, "Mean $B^*$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiJPsi1S = bookHistogram1D(25, 1, 2, "Mean $J/\\psi(1S)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiPsi2S = bookHistogram1D(26, 1, 1, "Mean $\\psi(2S)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiUpsilon1S = bookHistogram1D(27, 1, 1, "Mean $\\Upsilon(1S)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiF1_1285 = bookHistogram1D(28, 1, 1, "Mean $f_1(1285)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiF1_1420 = bookHistogram1D(29, 1, 1, "Mean $f_1(1420)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiChi_c1_3510 = bookHistogram1D(30, 1, 1, "Mean $\\chi_{c1}(3510)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiF2_1270 = bookHistogram1D(31, 1, 3, "Mean $f_2(1270)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiF2Prime1525 = bookHistogram1D(32, 1, 1, "Mean $f_2'(1525)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiK2Star1430_0 = bookHistogram1D(34, 1, 2, "Mean $K_2^{*0}(1430)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiBStarStar = bookHistogram1D(35, 1, 1, "Mean $B^**$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiDs1Plus = bookHistogram1D(36, 1, 1, "Mean $D_{s1}^+$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiDs2Plus = bookHistogram1D(37, 1, 1, "Mean $D_{s2}^+$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiP = bookHistogram1D(38, 1, 3, "Mean $p$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiLambda = bookHistogram1D(39, 1, 3, "Mean $\\Lambda$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiSigma0 = bookHistogram1D(40, 1, 2, "Mean $\\Sigma^0$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiSigmaMinus = bookHistogram1D(41, 1, 1, "Mean $\\Sigma^-$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiSigmaPlus = bookHistogram1D(42, 1, 1, "Mean $\\Sigma^+$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiSigmaPlusMinus = bookHistogram1D(43, 1, 1, "Mean $\\Sigma^\\pm$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiXiMinus = bookHistogram1D(44, 1, 3, "Mean $\\Xi^-$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiDelta1232PlusPlus = bookHistogram1D(45, 1, 2, "Mean $\\Delta^{++}(1232)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiSigma1385Minus = bookHistogram1D(46, 1, 3, "Mean $\\Sigma^-(1385)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiSigma1385Plus = bookHistogram1D(47, 1, 3, "Mean $\\Sigma^+(1385)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiSigma1385PlusMinus = bookHistogram1D(48, 1, 3, "Mean $\\Sigma^\\pm(1385)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiXi1530_0 = bookHistogram1D(49, 1, 2, "Mean $\\Xi^0(1530)$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiOmegaMinus = bookHistogram1D(50, 1, 3, "Mean $\\Omega^-$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiLambda_c_Plus = bookHistogram1D(51, 1, 3, "Mean $\\Lambda_c^+$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiLambda_b_0 = bookHistogram1D(52, 1, 1, "Mean $\\Lambda_b^0$ multiplicity", "", "Multiplicity");
- _hist91MeanMultiLambda1520 = bookHistogram1D(54, 1, 2, "Mean $\\Lambda(1520)$ multiplicity", "", "Multiplicity");
-
- _hist165MeanMultiPiPlus = bookHistogram1D( 1, 1, 4, "Mean $\\pi^+$ multiplicity", "", "Multiplicity");
- _hist165MeanMultiKPlus = bookHistogram1D( 3, 1, 4, "Mean $K^+$ multiplicity", "", "Multiplicity");
- _hist165MeanMultiK0 = bookHistogram1D( 4, 1, 4, "Mean $K^0$ multiplicity", "", "Multiplicity");
- _hist165MeanMultiP = bookHistogram1D(38, 1, 4, "Mean $p$ multiplicity", "", "Multiplicity");
- _hist165MeanMultiLambda = bookHistogram1D(39, 1, 4, "Mean $\\Lambda$ multiplicity", "", "Multiplicity");
+ _hist10MeanMultiPiPlus = bookHistogram1D( 1, 1, 1);
+ _hist10MeanMultiPi0 = bookHistogram1D( 2, 1, 1);
+ _hist10MeanMultiKPlus = bookHistogram1D( 3, 1, 1);
+ _hist10MeanMultiK0 = bookHistogram1D( 4, 1, 1);
+ _hist10MeanMultiEta = bookHistogram1D( 5, 1, 1);
+ _hist10MeanMultiEtaPrime = bookHistogram1D( 6, 1, 1);
+ _hist10MeanMultiDPlus = bookHistogram1D( 7, 1, 1);
+ _hist10MeanMultiD0 = bookHistogram1D( 8, 1, 1);
+ _hist10MeanMultiDPlus_s = bookHistogram1D( 9, 1, 1);
+ _hist10MeanMultiF0_980 = bookHistogram1D(13, 1, 1);
+ _hist10MeanMultiRho770_0 = bookHistogram1D(15, 1, 1);
+ _hist10MeanMultiOmega782 = bookHistogram1D(17, 1, 1);
+ _hist10MeanMultiKStar892Plus = bookHistogram1D(18, 1, 1);
+ _hist10MeanMultiKStar892_0 = bookHistogram1D(19, 1, 1);
+ _hist10MeanMultiPhi1020 = bookHistogram1D(20, 1, 1);
+ _hist10MeanMultiDStar2010Plus = bookHistogram1D(21, 1, 1);
+ _hist10MeanMultiDStar2007_0 = bookHistogram1D(22, 1, 1);
+ _hist10MeanMultiDStar_s2112Plus = bookHistogram1D(23, 1, 1);
+ _hist10MeanMultiJPsi1S = bookHistogram1D(25, 1, 1);
+ _hist10MeanMultiF2_1270 = bookHistogram1D(31, 1, 1);
+ _hist10MeanMultiP = bookHistogram1D(38, 1, 1);
+ _hist10MeanMultiLambda = bookHistogram1D(39, 1, 1);
+ _hist10MeanMultiSigma0 = bookHistogram1D(40, 1, 1);
+ _hist10MeanMultiXiMinus = bookHistogram1D(44, 1, 1);
+ _hist10MeanMultiDelta1232PlusPlus = bookHistogram1D(45, 1, 1);
+ _hist10MeanMultiSigma1385Minus = bookHistogram1D(46, 1, 1);
+ _hist10MeanMultiSigma1385Plus = bookHistogram1D(47, 1, 1);
+ _hist10MeanMultiSigma1385PlusMinus = bookHistogram1D(48, 1, 1);
+ _hist10MeanMultiXi1530_0 = bookHistogram1D(49, 1, 1);
+ _hist10MeanMultiOmegaMinus = bookHistogram1D(50, 1, 1);
+ _hist10MeanMultiLambda_c_Plus = bookHistogram1D(51, 1, 1);
+ _hist10MeanMultiSigma_c_PlusPlus_0 = bookHistogram1D(53, 1, 1);
+ _hist10MeanMultiLambda1520 = bookHistogram1D(54, 1, 1);
+
+ _hist32MeanMultiPiPlus = bookHistogram1D( 1, 1, 2);
+ _hist32MeanMultiPi0 = bookHistogram1D( 2, 1, 2);
+ _hist32MeanMultiKPlus = bookHistogram1D( 3, 1, 2);
+ _hist32MeanMultiK0 = bookHistogram1D( 4, 1, 2);
+ _hist32MeanMultiEta = bookHistogram1D( 5, 1, 2);
+ _hist32MeanMultiEtaPrime = bookHistogram1D( 6, 1, 2);
+ _hist32MeanMultiDPlus = bookHistogram1D( 7, 1, 2);
+ _hist32MeanMultiD0 = bookHistogram1D( 8, 1, 2);
+ _hist32MeanMultiDPlus_s = bookHistogram1D( 9, 1, 2);
+ _hist32MeanMultiF0_980 = bookHistogram1D(13, 1, 2);
+ _hist32MeanMultiRho770_0 = bookHistogram1D(15, 1, 2);
+ _hist32MeanMultiKStar892Plus = bookHistogram1D(18, 1, 2);
+ _hist32MeanMultiKStar892_0 = bookHistogram1D(19, 1, 2);
+ _hist32MeanMultiPhi1020 = bookHistogram1D(20, 1, 2);
+ _hist32MeanMultiDStar2010Plus = bookHistogram1D(21, 1, 2);
+ _hist32MeanMultiDStar2007_0 = bookHistogram1D(22, 1, 2);
+ _hist32MeanMultiF2_1270 = bookHistogram1D(31, 1, 2);
+ _hist32MeanMultiK2Star1430Plus = bookHistogram1D(33, 1, 1);
+ _hist32MeanMultiK2Star1430_0 = bookHistogram1D(34, 1, 1);
+ _hist32MeanMultiP = bookHistogram1D(38, 1, 2);
+ _hist32MeanMultiLambda = bookHistogram1D(39, 1, 2);
+ _hist32MeanMultiXiMinus = bookHistogram1D(44, 1, 2);
+ _hist32MeanMultiSigma1385Minus = bookHistogram1D(46, 1, 2);
+ _hist32MeanMultiSigma1385Plus = bookHistogram1D(47, 1, 2);
+ _hist32MeanMultiSigma1385PlusMinus = bookHistogram1D(48, 1, 2);
+ _hist32MeanMultiOmegaMinus = bookHistogram1D(50, 1, 2);
+ _hist32MeanMultiLambda_c_Plus = bookHistogram1D(51, 1, 2);
+
+ _hist91MeanMultiPiPlus = bookHistogram1D( 1, 1, 3);
+ _hist91MeanMultiPi0 = bookHistogram1D( 2, 1, 3);
+ _hist91MeanMultiKPlus = bookHistogram1D( 3, 1, 3);
+ _hist91MeanMultiK0 = bookHistogram1D( 4, 1, 3);
+ _hist91MeanMultiEta = bookHistogram1D( 5, 1, 3);
+ _hist91MeanMultiEtaPrime = bookHistogram1D( 6, 1, 3);
+ _hist91MeanMultiDPlus = bookHistogram1D( 7, 1, 3);
+ _hist91MeanMultiD0 = bookHistogram1D( 8, 1, 3);
+ _hist91MeanMultiDPlus_s = bookHistogram1D( 9, 1, 3);
+ _hist91MeanMultiBPlus_B0_d = bookHistogram1D(10, 1, 1);
+ _hist91MeanMultiBPlus_u = bookHistogram1D(11, 1, 1);
+ _hist91MeanMultiB0_s = bookHistogram1D(12, 1, 1);
+ _hist91MeanMultiF0_980 = bookHistogram1D(13, 1, 3);
+ _hist91MeanMultiA0_980Plus = bookHistogram1D(14, 1, 1);
+ _hist91MeanMultiRho770_0 = bookHistogram1D(15, 1, 3);
+ _hist91MeanMultiRho770Plus = bookHistogram1D(16, 1, 1);
+ _hist91MeanMultiOmega782 = bookHistogram1D(17, 1, 2);
+ _hist91MeanMultiKStar892Plus = bookHistogram1D(18, 1, 3);
+ _hist91MeanMultiKStar892_0 = bookHistogram1D(19, 1, 3);
+ _hist91MeanMultiPhi1020 = bookHistogram1D(20, 1, 3);
+ _hist91MeanMultiDStar2010Plus = bookHistogram1D(21, 1, 3);
+ _hist91MeanMultiDStar_s2112Plus = bookHistogram1D(23, 1, 2);
+ _hist91MeanMultiBStar = bookHistogram1D(24, 1, 1);
+ _hist91MeanMultiJPsi1S = bookHistogram1D(25, 1, 2);
+ _hist91MeanMultiPsi2S = bookHistogram1D(26, 1, 1);
+ _hist91MeanMultiUpsilon1S = bookHistogram1D(27, 1, 1);
+ _hist91MeanMultiF1_1285 = bookHistogram1D(28, 1, 1);
+ _hist91MeanMultiF1_1420 = bookHistogram1D(29, 1, 1);
+ _hist91MeanMultiChi_c1_3510 = bookHistogram1D(30, 1, 1);
+ _hist91MeanMultiF2_1270 = bookHistogram1D(31, 1, 3);
+ _hist91MeanMultiF2Prime1525 = bookHistogram1D(32, 1, 1);
+ _hist91MeanMultiK2Star1430_0 = bookHistogram1D(34, 1, 2);
+ _hist91MeanMultiBStarStar = bookHistogram1D(35, 1, 1);
+ _hist91MeanMultiDs1Plus = bookHistogram1D(36, 1, 1);
+ _hist91MeanMultiDs2Plus = bookHistogram1D(37, 1, 1);
+ _hist91MeanMultiP = bookHistogram1D(38, 1, 3);
+ _hist91MeanMultiLambda = bookHistogram1D(39, 1, 3);
+ _hist91MeanMultiSigma0 = bookHistogram1D(40, 1, 2);
+ _hist91MeanMultiSigmaMinus = bookHistogram1D(41, 1, 1);
+ _hist91MeanMultiSigmaPlus = bookHistogram1D(42, 1, 1);
+ _hist91MeanMultiSigmaPlusMinus = bookHistogram1D(43, 1, 1);
+ _hist91MeanMultiXiMinus = bookHistogram1D(44, 1, 3);
+ _hist91MeanMultiDelta1232PlusPlus = bookHistogram1D(45, 1, 2);
+ _hist91MeanMultiSigma1385Minus = bookHistogram1D(46, 1, 3);
+ _hist91MeanMultiSigma1385Plus = bookHistogram1D(47, 1, 3);
+ _hist91MeanMultiSigma1385PlusMinus = bookHistogram1D(48, 1, 3);
+ _hist91MeanMultiXi1530_0 = bookHistogram1D(49, 1, 2);
+ _hist91MeanMultiOmegaMinus = bookHistogram1D(50, 1, 3);
+ _hist91MeanMultiLambda_c_Plus = bookHistogram1D(51, 1, 3);
+ _hist91MeanMultiLambda_b_0 = bookHistogram1D(52, 1, 1);
+ _hist91MeanMultiLambda1520 = bookHistogram1D(54, 1, 2);
+
+ _hist165MeanMultiPiPlus = bookHistogram1D( 1, 1, 4);
+ _hist165MeanMultiKPlus = bookHistogram1D( 3, 1, 4);
+ _hist165MeanMultiK0 = bookHistogram1D( 4, 1, 4);
+ _hist165MeanMultiP = bookHistogram1D(38, 1, 4);
+ _hist165MeanMultiLambda = bookHistogram1D(39, 1, 4);
}
// Finalize
Modified: trunk/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc
==============================================================================
--- trunk/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -448,121 +448,121 @@
void PDG_HADRON_MULTIPLICITIES_RATIOS::init() {
- _hist10MeanMultiPi0 = bookHistogram1D( 2, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\pi^0$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiKPlus = bookHistogram1D( 3, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $K^+$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiK0 = bookHistogram1D( 4, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $K^0$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiEta = bookHistogram1D( 5, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\eta$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiEtaPrime = bookHistogram1D( 6, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\eta'(958)$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiDPlus = bookHistogram1D( 7, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $D^+$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiD0 = bookHistogram1D( 8, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $D^0$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiDPlus_s = bookHistogram1D( 9, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $D^+_s$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiF0_980 = bookHistogram1D(13, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $f_0(980)$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiRho770_0 = bookHistogram1D(15, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\rho^0(770)$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiOmega782 = bookHistogram1D(17, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\omega(782)$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiKStar892Plus = bookHistogram1D(18, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $K^{*+}(892)$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiKStar892_0 = bookHistogram1D(19, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $K^{*0}(892)$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiPhi1020 = bookHistogram1D(20, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\phi(1020)$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiDStar2010Plus = bookHistogram1D(21, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $D^{*+}(2010)$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiDStar2007_0 = bookHistogram1D(22, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $D^{*0}(2007)$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiDStar_s2112Plus = bookHistogram1D(23, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $D^{*+}_s(2112)$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiJPsi1S = bookHistogram1D(25, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $J/\\psi(1S)$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiF2_1270 = bookHistogram1D(31, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $f_2(1270)$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiP = bookHistogram1D(38, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $p$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiLambda = bookHistogram1D(39, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Lambda$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiSigma0 = bookHistogram1D(40, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Sigma^0$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiXiMinus = bookHistogram1D(44, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Xi^-$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiDelta1232PlusPlus = bookHistogram1D(45, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Delta^{++}(1232)$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiSigma1385Minus = bookHistogram1D(46, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Sigma^-(1385)$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiSigma1385Plus = bookHistogram1D(47, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Sigma^+(1385)$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiSigma1385PlusMinus = bookHistogram1D(48, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Sigma^\\pm(1385)$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiXi1530_0 = bookHistogram1D(49, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Xi^0(1530)$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiOmegaMinus = bookHistogram1D(50, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Omega^-$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiLambda_c_Plus = bookHistogram1D(51, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Lambda_c^+$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiSigma_c_PlusPlus_0 = bookHistogram1D(53, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Sigma_c^{++}, Sigma\\_c0$ multiplicity", "", "Relative multiplicity");
- _hist10MeanMultiLambda1520 = bookHistogram1D(54, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Lambda(1520)$ multiplicity", "", "Relative multiplicity");
-
- _hist32MeanMultiPi0 = bookHistogram1D( 2, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\pi^0$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiKPlus = bookHistogram1D( 3, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $K^+$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiK0 = bookHistogram1D( 4, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $K^0$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiEta = bookHistogram1D( 5, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\eta$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiEtaPrime = bookHistogram1D( 6, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\eta'(958)$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiDPlus = bookHistogram1D( 7, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $D^+$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiD0 = bookHistogram1D( 8, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $D^0$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiDPlus_s = bookHistogram1D( 9, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $D^+_s$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiF0_980 = bookHistogram1D(13, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $f_0(980)$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiRho770_0 = bookHistogram1D(15, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\rho^0(770)$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiKStar892Plus = bookHistogram1D(18, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $K^{*+}(892)$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiKStar892_0 = bookHistogram1D(19, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $K^{*0}(892)$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiPhi1020 = bookHistogram1D(20, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\phi(1020)$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiDStar2010Plus = bookHistogram1D(21, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $D^{*+}(2010)$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiDStar2007_0 = bookHistogram1D(22, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $D^{*0}(2007)$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiF2_1270 = bookHistogram1D(31, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $f_2(1270)$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiK2Star1430Plus = bookHistogram1D(33, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $K_2^{*+}(1430)$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiK2Star1430_0 = bookHistogram1D(34, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $K_2^{*0}(1430)$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiP = bookHistogram1D(38, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $p$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiLambda = bookHistogram1D(39, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Lambda$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiXiMinus = bookHistogram1D(44, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Xi^-$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiSigma1385Minus = bookHistogram1D(46, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Sigma^-(1385)$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiSigma1385Plus = bookHistogram1D(47, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Sigma^+(1385)$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiSigma1385PlusMinus = bookHistogram1D(48, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Sigma^\\pm(1385)$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiOmegaMinus = bookHistogram1D(50, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Omega^-$ multiplicity", "", "Relative multiplicity");
- _hist32MeanMultiLambda_c_Plus = bookHistogram1D(51, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Lambda_c^+$ multiplicity", "", "Relative multiplicity");
-
- _hist91MeanMultiPi0 = bookHistogram1D( 2, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\pi^0$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiKPlus = bookHistogram1D( 3, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $K^+$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiK0 = bookHistogram1D( 4, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $K^0$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiEta = bookHistogram1D( 5, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\eta$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiEtaPrime = bookHistogram1D( 6, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\eta'(958)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiDPlus = bookHistogram1D( 7, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $D^+$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiD0 = bookHistogram1D( 8, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $D^0$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiDPlus_s = bookHistogram1D( 9, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $D^+_s$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiBPlus_B0_d = bookHistogram1D(10, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $B^+, B^0_d$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiBPlus_u = bookHistogram1D(11, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $B^+_u$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiB0_s = bookHistogram1D(12, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $B^0_s$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiF0_980 = bookHistogram1D(13, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $f_0(980)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiA0_980Plus = bookHistogram1D(14, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $a_0^+(980)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiRho770_0 = bookHistogram1D(15, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\rho^0(770)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiRho770Plus = bookHistogram1D(16, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\rho^+(770)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiOmega782 = bookHistogram1D(17, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\omega(782)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiKStar892Plus = bookHistogram1D(18, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $K^{*+}(892)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiKStar892_0 = bookHistogram1D(19, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $K^{*0}(892)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiPhi1020 = bookHistogram1D(20, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\phi(1020)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiDStar2010Plus = bookHistogram1D(21, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $D^{*+}(2010)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiDStar_s2112Plus = bookHistogram1D(23, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $D^{*+}_s(2112)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiBStar = bookHistogram1D(24, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $B^*$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiJPsi1S = bookHistogram1D(25, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $J/\\psi(1S)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiPsi2S = bookHistogram1D(26, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\psi(2S)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiUpsilon1S = bookHistogram1D(27, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Upsilon(1S)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiF1_1285 = bookHistogram1D(28, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $f_1(1285)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiF1_1420 = bookHistogram1D(29, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $f_1(1420)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiChi_c1_3510 = bookHistogram1D(30, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\chi_{c1}(3510)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiF2_1270 = bookHistogram1D(31, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $f_2(1270)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiF2Prime1525 = bookHistogram1D(32, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $f_2'(1525)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiK2Star1430_0 = bookHistogram1D(34, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $K_2^{*0}(1430)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiBStarStar = bookHistogram1D(35, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $B^{**}$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiDs1Plus = bookHistogram1D(36, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $D_{s1}^+$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiDs2Plus = bookHistogram1D(37, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $D_{s2}^+$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiP = bookHistogram1D(38, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $p$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiLambda = bookHistogram1D(39, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Lambda$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiSigma0 = bookHistogram1D(40, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Sigma^0$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiSigmaMinus = bookHistogram1D(41, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Sigma^-$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiSigmaPlus = bookHistogram1D(42, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Sigma^+$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiSigmaPlusMinus = bookHistogram1D(43, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Sigma^\\pm$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiXiMinus = bookHistogram1D(44, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Xi^-$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiDelta1232PlusPlus = bookHistogram1D(45, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Delta^{++}(1232)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiSigma1385Minus = bookHistogram1D(46, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Sigma^-(1385)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiSigma1385Plus = bookHistogram1D(47, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Sigma^+(1385)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiSigma1385PlusMinus = bookHistogram1D(48, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Sigma^\\pm(1385)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiXi1530_0 = bookHistogram1D(49, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Xi^0(1530)$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiOmegaMinus = bookHistogram1D(50, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Omega^-$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiLambda_c_Plus = bookHistogram1D(51, 1, 3, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Lambda_c^+$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiLambda_b_0 = bookHistogram1D(52, 1, 1, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Lambda_b^0$ multiplicity", "", "Relative multiplicity");
- _hist91MeanMultiLambda1520 = bookHistogram1D(54, 1, 2, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Lambda(1520)$ multiplicity", "", "Relative multiplicity");
-
- _hist165MeanMultiKPlus = bookHistogram1D( 3, 1, 4, "Ratio (w.r.t. $\\pi^\\pm$) of mean $K^+$ multiplicity", "", "Relative multiplicity");
- _hist165MeanMultiK0 = bookHistogram1D( 4, 1, 4, "Ratio (w.r.t. $\\pi^\\pm$) of mean $K^0$ multiplicity", "", "Relative multiplicity");
- _hist165MeanMultiP = bookHistogram1D(38, 1, 4, "Ratio (w.r.t. $\\pi^\\pm$) of mean $p$ multiplicity", "", "Relative multiplicity");
- _hist165MeanMultiLambda = bookHistogram1D(39, 1, 4, "Ratio (w.r.t. $\\pi^\\pm$) of mean $\\Lambda$ multiplicity", "", "Relative multiplicity");
+ _hist10MeanMultiPi0 = bookHistogram1D( 2, 1, 1);
+ _hist10MeanMultiKPlus = bookHistogram1D( 3, 1, 1);
+ _hist10MeanMultiK0 = bookHistogram1D( 4, 1, 1);
+ _hist10MeanMultiEta = bookHistogram1D( 5, 1, 1);
+ _hist10MeanMultiEtaPrime = bookHistogram1D( 6, 1, 1);
+ _hist10MeanMultiDPlus = bookHistogram1D( 7, 1, 1);
+ _hist10MeanMultiD0 = bookHistogram1D( 8, 1, 1);
+ _hist10MeanMultiDPlus_s = bookHistogram1D( 9, 1, 1);
+ _hist10MeanMultiF0_980 = bookHistogram1D(13, 1, 1);
+ _hist10MeanMultiRho770_0 = bookHistogram1D(15, 1, 1);
+ _hist10MeanMultiOmega782 = bookHistogram1D(17, 1, 1);
+ _hist10MeanMultiKStar892Plus = bookHistogram1D(18, 1, 1);
+ _hist10MeanMultiKStar892_0 = bookHistogram1D(19, 1, 1);
+ _hist10MeanMultiPhi1020 = bookHistogram1D(20, 1, 1);
+ _hist10MeanMultiDStar2010Plus = bookHistogram1D(21, 1, 1);
+ _hist10MeanMultiDStar2007_0 = bookHistogram1D(22, 1, 1);
+ _hist10MeanMultiDStar_s2112Plus = bookHistogram1D(23, 1, 1);
+ _hist10MeanMultiJPsi1S = bookHistogram1D(25, 1, 1);
+ _hist10MeanMultiF2_1270 = bookHistogram1D(31, 1, 1);
+ _hist10MeanMultiP = bookHistogram1D(38, 1, 1);
+ _hist10MeanMultiLambda = bookHistogram1D(39, 1, 1);
+ _hist10MeanMultiSigma0 = bookHistogram1D(40, 1, 1);
+ _hist10MeanMultiXiMinus = bookHistogram1D(44, 1, 1);
+ _hist10MeanMultiDelta1232PlusPlus = bookHistogram1D(45, 1, 1);
+ _hist10MeanMultiSigma1385Minus = bookHistogram1D(46, 1, 1);
+ _hist10MeanMultiSigma1385Plus = bookHistogram1D(47, 1, 1);
+ _hist10MeanMultiSigma1385PlusMinus = bookHistogram1D(48, 1, 1);
+ _hist10MeanMultiXi1530_0 = bookHistogram1D(49, 1, 1);
+ _hist10MeanMultiOmegaMinus = bookHistogram1D(50, 1, 1);
+ _hist10MeanMultiLambda_c_Plus = bookHistogram1D(51, 1, 1);
+ _hist10MeanMultiSigma_c_PlusPlus_0 = bookHistogram1D(53, 1, 1);
+ _hist10MeanMultiLambda1520 = bookHistogram1D(54, 1, 1);
+
+ _hist32MeanMultiPi0 = bookHistogram1D( 2, 1, 2);
+ _hist32MeanMultiKPlus = bookHistogram1D( 3, 1, 2);
+ _hist32MeanMultiK0 = bookHistogram1D( 4, 1, 2);
+ _hist32MeanMultiEta = bookHistogram1D( 5, 1, 2);
+ _hist32MeanMultiEtaPrime = bookHistogram1D( 6, 1, 2);
+ _hist32MeanMultiDPlus = bookHistogram1D( 7, 1, 2);
+ _hist32MeanMultiD0 = bookHistogram1D( 8, 1, 2);
+ _hist32MeanMultiDPlus_s = bookHistogram1D( 9, 1, 2);
+ _hist32MeanMultiF0_980 = bookHistogram1D(13, 1, 2);
+ _hist32MeanMultiRho770_0 = bookHistogram1D(15, 1, 2);
+ _hist32MeanMultiKStar892Plus = bookHistogram1D(18, 1, 2);
+ _hist32MeanMultiKStar892_0 = bookHistogram1D(19, 1, 2);
+ _hist32MeanMultiPhi1020 = bookHistogram1D(20, 1, 2);
+ _hist32MeanMultiDStar2010Plus = bookHistogram1D(21, 1, 2);
+ _hist32MeanMultiDStar2007_0 = bookHistogram1D(22, 1, 2);
+ _hist32MeanMultiF2_1270 = bookHistogram1D(31, 1, 2);
+ _hist32MeanMultiK2Star1430Plus = bookHistogram1D(33, 1, 1);
+ _hist32MeanMultiK2Star1430_0 = bookHistogram1D(34, 1, 1);
+ _hist32MeanMultiP = bookHistogram1D(38, 1, 2);
+ _hist32MeanMultiLambda = bookHistogram1D(39, 1, 2);
+ _hist32MeanMultiXiMinus = bookHistogram1D(44, 1, 2);
+ _hist32MeanMultiSigma1385Minus = bookHistogram1D(46, 1, 2);
+ _hist32MeanMultiSigma1385Plus = bookHistogram1D(47, 1, 2);
+ _hist32MeanMultiSigma1385PlusMinus = bookHistogram1D(48, 1, 2);
+ _hist32MeanMultiOmegaMinus = bookHistogram1D(50, 1, 2);
+ _hist32MeanMultiLambda_c_Plus = bookHistogram1D(51, 1, 2);
+
+ _hist91MeanMultiPi0 = bookHistogram1D( 2, 1, 3);
+ _hist91MeanMultiKPlus = bookHistogram1D( 3, 1, 3);
+ _hist91MeanMultiK0 = bookHistogram1D( 4, 1, 3);
+ _hist91MeanMultiEta = bookHistogram1D( 5, 1, 3);
+ _hist91MeanMultiEtaPrime = bookHistogram1D( 6, 1, 3);
+ _hist91MeanMultiDPlus = bookHistogram1D( 7, 1, 3);
+ _hist91MeanMultiD0 = bookHistogram1D( 8, 1, 3);
+ _hist91MeanMultiDPlus_s = bookHistogram1D( 9, 1, 3);
+ _hist91MeanMultiBPlus_B0_d = bookHistogram1D(10, 1, 1);
+ _hist91MeanMultiBPlus_u = bookHistogram1D(11, 1, 1);
+ _hist91MeanMultiB0_s = bookHistogram1D(12, 1, 1);
+ _hist91MeanMultiF0_980 = bookHistogram1D(13, 1, 3);
+ _hist91MeanMultiA0_980Plus = bookHistogram1D(14, 1, 1);
+ _hist91MeanMultiRho770_0 = bookHistogram1D(15, 1, 3);
+ _hist91MeanMultiRho770Plus = bookHistogram1D(16, 1, 1);
+ _hist91MeanMultiOmega782 = bookHistogram1D(17, 1, 2);
+ _hist91MeanMultiKStar892Plus = bookHistogram1D(18, 1, 3);
+ _hist91MeanMultiKStar892_0 = bookHistogram1D(19, 1, 3);
+ _hist91MeanMultiPhi1020 = bookHistogram1D(20, 1, 3);
+ _hist91MeanMultiDStar2010Plus = bookHistogram1D(21, 1, 3);
+ _hist91MeanMultiDStar_s2112Plus = bookHistogram1D(23, 1, 2);
+ _hist91MeanMultiBStar = bookHistogram1D(24, 1, 1);
+ _hist91MeanMultiJPsi1S = bookHistogram1D(25, 1, 2);
+ _hist91MeanMultiPsi2S = bookHistogram1D(26, 1, 1);
+ _hist91MeanMultiUpsilon1S = bookHistogram1D(27, 1, 1);
+ _hist91MeanMultiF1_1285 = bookHistogram1D(28, 1, 1);
+ _hist91MeanMultiF1_1420 = bookHistogram1D(29, 1, 1);
+ _hist91MeanMultiChi_c1_3510 = bookHistogram1D(30, 1, 1);
+ _hist91MeanMultiF2_1270 = bookHistogram1D(31, 1, 3);
+ _hist91MeanMultiF2Prime1525 = bookHistogram1D(32, 1, 1);
+ _hist91MeanMultiK2Star1430_0 = bookHistogram1D(34, 1, 2);
+ _hist91MeanMultiBStarStar = bookHistogram1D(35, 1, 1);
+ _hist91MeanMultiDs1Plus = bookHistogram1D(36, 1, 1);
+ _hist91MeanMultiDs2Plus = bookHistogram1D(37, 1, 1);
+ _hist91MeanMultiP = bookHistogram1D(38, 1, 3);
+ _hist91MeanMultiLambda = bookHistogram1D(39, 1, 3);
+ _hist91MeanMultiSigma0 = bookHistogram1D(40, 1, 2);
+ _hist91MeanMultiSigmaMinus = bookHistogram1D(41, 1, 1);
+ _hist91MeanMultiSigmaPlus = bookHistogram1D(42, 1, 1);
+ _hist91MeanMultiSigmaPlusMinus = bookHistogram1D(43, 1, 1);
+ _hist91MeanMultiXiMinus = bookHistogram1D(44, 1, 3);
+ _hist91MeanMultiDelta1232PlusPlus = bookHistogram1D(45, 1, 2);
+ _hist91MeanMultiSigma1385Minus = bookHistogram1D(46, 1, 3);
+ _hist91MeanMultiSigma1385Plus = bookHistogram1D(47, 1, 3);
+ _hist91MeanMultiSigma1385PlusMinus = bookHistogram1D(48, 1, 3);
+ _hist91MeanMultiXi1530_0 = bookHistogram1D(49, 1, 2);
+ _hist91MeanMultiOmegaMinus = bookHistogram1D(50, 1, 3);
+ _hist91MeanMultiLambda_c_Plus = bookHistogram1D(51, 1, 3);
+ _hist91MeanMultiLambda_b_0 = bookHistogram1D(52, 1, 1);
+ _hist91MeanMultiLambda1520 = bookHistogram1D(54, 1, 2);
+
+ _hist165MeanMultiKPlus = bookHistogram1D( 3, 1, 4);
+ _hist165MeanMultiK0 = bookHistogram1D( 4, 1, 4);
+ _hist165MeanMultiP = bookHistogram1D(38, 1, 4);
+ _hist165MeanMultiLambda = bookHistogram1D(39, 1, 4);
}
// Finalize
Modified: trunk/src/Analyses/STAR_2006_S6870392.cc
==============================================================================
--- trunk/src/Analyses/STAR_2006_S6870392.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/STAR_2006_S6870392.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -26,12 +26,8 @@
// Book histograms
void STAR_2006_S6870392::init() {
- _h_jet_pT_MB =
- bookHistogram1D(1, 1, 1, "Inclusive jet cross-section, minbias trigger",
- "jet $p_\\perp$/GeV","$1/(2\\pi) \\, d^2\\sigma/(d\\eta dp_\\perp)$ [pb/GeV]");
- _h_jet_pT_HT =
- bookHistogram1D(2, 1, 1, "Inclusive jet cross-section, high tower trigger",
- "jet $p_\\perp$/GeV","$1/(2\\pi) \\, d^2\\sigma/(d\\eta dp_\\perp)$ [pb/GeV]");
+ _h_jet_pT_MB = bookHistogram1D(1, 1, 1);
+ _h_jet_pT_HT = bookHistogram1D(2, 1, 1);
}
Modified: trunk/src/Analyses/STAR_2008_S7993412.cc
==============================================================================
--- trunk/src/Analyses/STAR_2008_S7993412.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/STAR_2008_S7993412.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -20,8 +20,8 @@
// Book histograms
void STAR_2008_S7993412::init() {
- _h_Y_jet_trigger = bookProfile1D(1, 1, 1, "Jet yield vs $p_T^\\text{trigger}$","$p_T^\\text{trigger}$/GeV","$Y_\\text{jet}$");
- _h_Y_jet_associated = bookProfile1D(2, 1, 1, "Jet yield vs $p_T^\\text{associated}$","$p_T^\\text{associated}$/GeV","$1/p_T \\, dY_\\text{jet}/dp_T$");
+ _h_Y_jet_trigger = bookProfile1D(1, 1, 1);
+ _h_Y_jet_associated = bookProfile1D(2, 1, 1);
}
Modified: trunk/src/Analyses/STAR_2009_UE_HELEN.cc
==============================================================================
--- trunk/src/Analyses/STAR_2009_UE_HELEN.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/STAR_2009_UE_HELEN.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -33,15 +33,15 @@
// Book histograms
void STAR_2009_UE_HELEN::init() {
- _hist_pnchg = bookProfile1D( 1, 1, 1, "Transverse region charged particle density");
- _hist_pmaxnchg = bookProfile1D( 2, 1, 1, "TransMAX region charged particle density");
- _hist_pminnchg = bookProfile1D( 3, 1, 1, "TransMIN region charged particle density");
- _hist_pdifnchg = bookProfile1D( 4, 1, 1, "TransDIF region charged particle density");
- _hist_pcptsum = bookProfile1D( 5, 1, 1, "Transverse region charged pT sum density");
- _hist_pmaxcptsum = bookProfile1D( 6, 1, 1, "TransMAX region charged pT sum density");
- _hist_pmincptsum = bookProfile1D( 7, 1, 1, "TransMIN region charged pT sum density");
- _hist_pdifcptsum = bookProfile1D( 8, 1, 1, "TransDIF region charged pT sum density");
- _hist_pcptave = bookProfile1D( 9, 1, 1, "Transverse region charged pT average");
+ _hist_pnchg = bookProfile1D( 1, 1, 1);
+ _hist_pmaxnchg = bookProfile1D( 2, 1, 1);
+ _hist_pminnchg = bookProfile1D( 3, 1, 1);
+ _hist_pdifnchg = bookProfile1D( 4, 1, 1);
+ _hist_pcptsum = bookProfile1D( 5, 1, 1);
+ _hist_pmaxcptsum = bookProfile1D( 6, 1, 1);
+ _hist_pmincptsum = bookProfile1D( 7, 1, 1);
+ _hist_pdifcptsum = bookProfile1D( 8, 1, 1);
+ _hist_pcptave = bookProfile1D( 9, 1, 1);
//_hist_onchg = bookProfile1D( 1, 1, 1, "Overall number of charged particles");
//_hist_ocptsum = bookProfile1D( 2, 1, 1, "Overall charged $p_\\perp$ sum");
//_hist_oetsum = bookProfile1D( 3, 1, 1, "Overall $E_\\perp$ sum");
Modified: trunk/src/Analyses/ZEUS_2001_S4815815.cc
==============================================================================
--- trunk/src/Analyses/ZEUS_2001_S4815815.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analyses/ZEUS_2001_S4815815.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -25,8 +25,7 @@
// Book histograms
void ZEUS_2001_S4815815::init() {
/// @todo This doesn't seem to correspond to the plots in the paper (SPIRES 4730372)
- _histJetEt1 = bookHistogram1D("JetET1", "Jet transverse energy",
- "$E_{\\perp}$", "Events", 11, 14.0, 75.0);
+ _histJetEt1 = bookHistogram1D("JetET1", 11, 14.0, 75.0);
}
Modified: trunk/src/Analysis.cc
==============================================================================
--- trunk/src/Analysis.cc Tue Jul 14 15:56:53 2009 (r1690)
+++ trunk/src/Analysis.cc Tue Jul 14 16:30:58 2009 (r1691)
@@ -113,15 +113,6 @@
}
- /// @deprecated Use the version with axis labels; this version will complain verbosely at runtime!
- IHistogram1D* Analysis::bookHistogram1D(const size_t datasetId, const size_t xAxisId,
- const size_t yAxisId, const string& title) {
- const string hname = histoPath(_makeAxisCode(datasetId, xAxisId, yAxisId));
- getLog() << Log::INFO << "Please add axis labels for histo " << hname << "!" << endl;
- return bookHistogram1D(datasetId, xAxisId, yAxisId, title, "", "");
- }
-
-
IHistogram1D* Analysis::bookHistogram1D(const string& hname, const string& title,
const string& xtitle, const string& ytitle)
{
@@ -139,16 +130,10 @@
}
- /// @deprecated Use the version with axis labels; this version will complain verbosely at runtime!
- IHistogram1D* Analysis::bookHistogram1D(const string& hname, const string& title) {
- getLog() << Log::INFO << "Please add axis labels for histo " << hname << "!" << endl;
- return bookHistogram1D(hname, title, "", "");
- }
-
-
- IHistogram1D* Analysis::bookHistogram1D(const string& hname, const string& title,
- const string& xtitle, const string& ytitle,
- const size_t nbins, const double lower, const double upper) {
+ IHistogram1D* Analysis::bookHistogram1D(const string& hname,
+ const size_t nbins, const double lower, const double upper,
+ const string& title,
+ const string& xtitle, const string& ytitle) {
_makeHistoDir();
const string path = histoPath(hname);
IHistogram1D* hist = histogramFactory().createHistogram1D(path, title, nbins, lower, upper);
@@ -159,17 +144,10 @@
}
- /// @deprecated Use the version with axis labels; this version will complain verbosely at runtime!
- IHistogram1D* Analysis::bookHistogram1D(const string& hname, const string& title,
- const size_t nbins, const double lower, const double upper) {
- getLog() << Log::INFO << "Please add axis labels for histo " << hname << "!" << endl;
- return bookHistogram1D(hname, title, "", "", nbins, lower, upper);
- }
-
-
- IHistogram1D* Analysis::bookHistogram1D(const string& hname, const string& title,
- const string& xtitle, const string& ytitle,
- const vector<double>& binedges) {
+ IHistogram1D* Analysis::bookHistogram1D(const string& hname,
+ const vector<double>& binedges,
+ const string& title,
+ const string& xtitle, const string& ytitle) {
_makeHistoDir();
const string path = histoPath(hname);
IHistogram1D* hist = histogramFactory().createHistogram1D(path, title, binedges);
@@ -180,14 +158,6 @@
}
- /// @deprecated Use the version with axis labels; this version will complain verbosely at runtime!
- IHistogram1D* Analysis::bookHistogram1D(const string& hname, const string& title,
- const vector<double>& binedges) {
- getLog() << Log::INFO << "Please add axis labels for histo " << hname << "!" << endl;
- return bookHistogram1D(hname, title, "", "", binedges);
- }
-
-
/////////////////
@@ -199,15 +169,6 @@
}
- /// @deprecated Use the version with axis labels; this version will complain verbosely at runtime!
- IProfile1D* Analysis::bookProfile1D(const size_t datasetId, const size_t xAxisId,
- const size_t yAxisId, const string& title) {
- const string hname = histoPath(_makeAxisCode(datasetId, xAxisId, yAxisId));
- getLog() << Log::INFO << "Please add axis labels for profile histo " << hname << "!" << endl;
- return bookProfile1D(datasetId, xAxisId, yAxisId, title, "", "");
- }
-
-
IProfile1D* Analysis::bookProfile1D(const std::string& hname, const std::string& title,
const string& xtitle, const string& ytitle)
{
@@ -232,16 +193,10 @@
}
- /// @deprecated Use the version with axis labels; this version will complain verbosely at runtime!
- IProfile1D* Analysis::bookProfile1D(const std::string& hname, const std::string& title) {
- getLog() << Log::INFO << "Please add axis labels for profile histo " << hname << "!" << endl;
- return bookProfile1D(hname, title, "", "");
- }
-
-
- IProfile1D* Analysis::bookProfile1D(const string& hname, const string& title,
- const string& xtitle, const string& ytitle,
- const size_t nbins, const double lower, const double upper) {
+ IProfile1D* Analysis::bookProfile1D(const string& hname,
+ const size_t nbins, const double lower, const double upper,
+ const string& title,
+ const string& xtitle, const string& ytitle) {
_makeHistoDir();
const string path = histoPath(hname);
IProfile1D* prof = histogramFactory().createProfile1D(path, title, nbins, lower, upper);
@@ -252,17 +207,10 @@
}
- /// @deprecated Use the version with axis labels; this version will complain verbosely at runtime!
- IProfile1D* Analysis::bookProfile1D(const string& hname, const string& title,
- const size_t nbins, const double lower, const double upper) {
- getLog() << Log::INFO << "Please add axis labels for profile histo " << hname << "!" << endl;
- return bookProfile1D(hname, title, "", "", nbins, lower, upper);
- }
-
-
- IProfile1D* Analysis::bookProfile1D(const string& hname, const string& title,
- const string& xtitle, const string& ytitle,
- const vector<double>& binedges) {
+ IProfile1D* Analysis::bookProfile1D(const string& hname,
+ const vector<double>& binedges,
+ const string& title,
+ const string& xtitle, const string& ytitle) {
_makeHistoDir();
const string path = histoPath(hname);
IProfile1D* prof = histogramFactory().createProfile1D(path, title, binedges);
@@ -273,15 +221,6 @@
}
- /// @deprecated Use the version with axis labels; this version will complain verbosely at runtime!
- IProfile1D* Analysis::bookProfile1D(const string& hname, const string& title,
- const vector<double>& binedges) {
- getLog() << Log::INFO << "Please add axis labels for profile histo " << hname << "!" << endl;
- return bookProfile1D(hname, title, "", "", binedges);
- }
-
-
-
///////////////////
@@ -298,16 +237,10 @@
}
- /// @deprecated Use the version with axis labels; this version will complain verbosely at runtime!
- IDataPointSet* Analysis::bookDataPointSet(const string& hname, const string& title) {
- getLog() << Log::INFO << "Please add axis labels for data point set " << hname << "!" << endl;
- return bookDataPointSet(hname, title, "", "");
- }
-
-
- IDataPointSet* Analysis::bookDataPointSet(const string& hname, const string& title,
- const string& xtitle, const string& ytitle,
- const size_t npts, const double lower, const double upper) {
+ IDataPointSet* Analysis::bookDataPointSet(const string& hname,
+ const size_t npts, const double lower, const double upper,
+ const string& title,
+ const string& xtitle, const string& ytitle) {
IDataPointSet* dps = bookDataPointSet(hname, title, xtitle, ytitle);
for (size_t pt = 0; pt < npts; ++pt) {
const double binwidth = (upper-lower)/npts;
@@ -322,14 +255,6 @@
}
- /// @deprecated Use the version with axis labels; this version will complain verbosely at runtime!
- IDataPointSet* Analysis::bookDataPointSet(const string& hname, const string& title,
- const size_t npts, const double lower, const double upper) {
- getLog() << Log::INFO << "Please add axis labels for data point set " << hname << "!" << endl;
- return bookDataPointSet(hname, title, "", "", npts, lower, upper);
- }
-
-
IDataPointSet* Analysis::bookDataPointSet(const size_t datasetId, const size_t xAxisId,
const size_t yAxisId, const string& title,
const string& xtitle, const string& ytitle) {
@@ -353,16 +278,6 @@
}
- /// @deprecated Use the version with axis labels; this version will complain verbosely at runtime!
- IDataPointSet* Analysis::bookDataPointSet(const size_t datasetId, const size_t xAxisId,
- const size_t yAxisId, const string& title) {
- const string hname = histoPath(_makeAxisCode(datasetId, xAxisId, yAxisId));
- getLog() << Log::INFO << "Please add axis labels for data point set " << hname << "!" << endl;
- return bookDataPointSet(datasetId, xAxisId, yAxisId, title, "", "");
- }
-
-
-
////////////////////
More information about the Rivet-svn
mailing list
|