|
|
[Rivet-svn] r2508 - in trunk: bin data/anainfo doc pyext
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Wed Jun 23 10:23:30 BST 2010
Author: buckley
Date: Wed Jun 23 10:23:39 2010
New Revision: 2508
Log:
Removing troublesome SWIG extension of Analysis interface, and doing a better job of generating nice-looking metadata tailored to the output formats, direct from the PIDs. Plus a metadata typo fix
Modified:
trunk/bin/rivet
trunk/data/anainfo/UA5_1988_S1867512.info
trunk/doc/analyses.tex
trunk/doc/mk-analysis-html
trunk/doc/mk-analysis-latex
trunk/doc/readplot.py
trunk/pyext/rivet.i
Modified: trunk/bin/rivet
==============================================================================
--- trunk/bin/rivet Tue Jun 22 22:22:31 2010 (r2507)
+++ trunk/bin/rivet Wed Jun 23 10:23:39 2010 (r2508)
@@ -315,7 +315,24 @@
twrap = textwrap.TextWrapper(width=75, initial_indent=2*" ", subsequent_indent=2*" ")
print twrap.fill(ana.description())
print ""
- print "Beams:", "; ".join(ana.requiredBeamsNames())
+ if ana.requiredBeams():
+ def pid_to_str(pid):
+ if pid == 11:
+ return "e-"
+ elif pid == -11:
+ return "e+"
+ elif pid == 2212:
+ return "p+"
+ elif pid == -2212:
+ return "p-"
+ elif pid == 10000:
+ return "*"
+ else:
+ return str(pid)
+ beamstrs = []
+ for bp in ana.requiredBeams():
+ beamstrs.append(pid_to_str(bp[0]) + " " + pid_to_str(bp[1]))
+ print "Beams:", ", ".join(beamstrs)
if ana.energies():
print "Beam energies:", "; ".join(["(%0.1f, %0.1f)" % (epair[0], epair[1]) for epair in ana.energies()]), "GeV"
else:
Modified: trunk/data/anainfo/UA5_1988_S1867512.info
==============================================================================
--- trunk/data/anainfo/UA5_1988_S1867512.info Tue Jun 22 22:22:31 2010 (r2507)
+++ trunk/data/anainfo/UA5_1988_S1867512.info Wed Jun 23 10:23:39 2010 (r2508)
@@ -20,7 +20,7 @@
PtCuts: [0]
Description:
"Data on two-particle pseudorapidity and multiplicity correlations
- of charged particles for non single-diffractive $\bar{p}p$ collisions at
+ of charged particles for non single-diffractive $\\bar{p}p$ collisions at
c.m. energies of 200, 546 and 900 GeV. Pseudorapidity correlations interpreted
in terms of a cluster model, which has been motivated by this and other
experiments, require on average about two charged particles per cluster.
Modified: trunk/doc/analyses.tex
==============================================================================
--- trunk/doc/analyses.tex Tue Jun 22 22:22:31 2010 (r2507)
+++ trunk/doc/analyses.tex Wed Jun 23 10:23:39 2010 (r2508)
@@ -10,7 +10,7 @@
\section{LEP analyses}\typeout{Handling analysis ALEPH_1991_S2435284}\subsection[ALEPH\_1991\_S2435284]{ALEPH\_1991\_S2435284\,\cite{Decamp:1991uz}}
\textbf{Hadronic Z decay charged multiplicity measurement}\newline
-\textbf{Beams:} [ELECTRON, POSITRON] \newline
+\textbf{Beams:} $e^-$\,$e^+$ \newline
\textbf{Energies:} (45.6, 45.6) GeV \newline
\textbf{Experiment:} ALEPH (LEP 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+2435284}{2435284}\newline
@@ -40,7 +40,7 @@
\typeout{Handling analysis ALEPH_1996_S3196992}\subsection[ALEPH\_1996\_S3196992]{ALEPH\_1996\_S3196992\,\cite{Buskulic:1995au}}
\textbf{Measurement of the quark to photon fragmentation function}\newline
-\textbf{Beams:} [ELECTRON, POSITRON] \newline
+\textbf{Beams:} $e^-$\,$e^+$ \newline
\textbf{Energies:} (45.6, 45.6) GeV \newline
\textbf{Experiment:} ALEPH (LEP Run 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+3196992}{3196992}\newline
@@ -71,7 +71,7 @@
\typeout{Handling analysis ALEPH_1996_S3486095}\subsection[ALEPH\_1996\_S3486095]{ALEPH\_1996\_S3486095\,\cite{Barate:1996fi}}
\textbf{Studies of QCD with the ALEPH detector.}\newline
-\textbf{Beams:} [ELECTRON, POSITRON] \newline
+\textbf{Beams:} $e^-$\,$e^+$ \newline
\textbf{Energies:} (45.6, 45.6) GeV \newline
\textbf{Experiment:} ALEPH (LEP 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+3486095}{3486095}\newline
@@ -101,8 +101,8 @@
\typeout{Handling analysis ALEPH_2004_S5765862}\subsection[ALEPH\_2004\_S5765862]{ALEPH\_2004\_S5765862\,\cite{Heister:2003aj}}
\textbf{Jet rates and event shapes at LEP I and II}\newline
-\textbf{Beams:} [ELECTRON, POSITRON] \newline
-\textbf{Energies:} (45.5, 45.5); (66.5, 66.5); (80.5, 80.5); (86.0, 86.0); (91.5, 91.5); (94.5, 94.5); (100.0, 100.0); (103.0, 103.0) GeV \newline
+\textbf{Beams:} $e^-$\,$e^+$ \newline
+\textbf{Energies:} (45.5, 45.5), (66.5, 66.5), (80.5, 80.5), (86.0, 86.0), (91.5, 91.5), (94.5, 94.5), (100.0, 100.0), (103.0, 103.0) GeV \newline
\textbf{Experiment:} ALEPH (LEP Run 1 and 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+5765862}{5765862}\newline
\textbf{Status:} VALIDATED\newline
@@ -133,7 +133,7 @@
\typeout{Handling analysis DELPHI_1995_S3137023}\subsection[DELPHI\_1995\_S3137023]{DELPHI\_1995\_S3137023\,\cite{Abreu:1995qx}}
\textbf{Strange baryon production in $Z$ hadronic decays at Delphi}\newline
-\textbf{Beams:} [ELECTRON, POSITRON] \newline
+\textbf{Beams:} $e^-$\,$e^+$ \newline
\textbf{Energies:} (45.6, 45.6) GeV \newline
\textbf{Experiment:} DELPHI (LEP 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+3137023}{3137023}\newline
@@ -163,7 +163,7 @@
\typeout{Handling analysis DELPHI_1996_S3430090}\subsection[DELPHI\_1996\_S3430090]{DELPHI\_1996\_S3430090\,\cite{Abreu:1996na}}
\textbf{Delphi MC tuning on event shapes and identified particles.}\newline
-\textbf{Beams:} [ELECTRON, POSITRON] \newline
+\textbf{Beams:} $e^-$\,$e^+$ \newline
\textbf{Energies:} (45.6, 45.6) GeV \newline
\textbf{Experiment:} DELPHI (LEP 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+3430090}{3430090}\newline
@@ -195,7 +195,7 @@
\typeout{Handling analysis DELPHI_2002_069_CONF_603}\subsection{DELPHI\_2002\_069\_CONF\_603}
\textbf{Study of the b-quark fragmentation function at LEP 1}\newline
-\textbf{Beams:} [ELECTRON, POSITRON] \newline
+\textbf{Beams:} $e^-$\,$e^+$ \newline
\textbf{Energies:} (45.6, 45.6) GeV \newline
\textbf{Experiment:} DELPHI (LEP 1) \newline
\textbf{Status:} VALIDATED\newline
@@ -224,7 +224,7 @@
\typeout{Handling analysis DELPHI_2003_WUD_03_11}\subsection{DELPHI\_2003\_WUD\_03\_11}
\textbf{4-jet angular distributions at LEP (note)}\newline
-\textbf{Beams:} [POSITRON, ELECTRON] \newline
+\textbf{Beams:} $e^+$\,$e^-$ \newline
\textbf{Energies:} (45.6, 45.6) GeV \newline
\textbf{Experiment:} DELPHI (LEP 1) \newline
\textbf{Status:} UNVALIDATED\newline
@@ -253,8 +253,8 @@
\typeout{Handling analysis JADE_OPAL_2000_S4300807}\subsection[JADE\_OPAL\_2000\_S4300807]{JADE\_OPAL\_2000\_S4300807\,\cite{Pfeifenschneider:1999rz}}
\textbf{Jet rates in $e^+e^-$ at JADE [35--44 GeV] and OPAL [91--189 GeV].}\newline
-\textbf{Beams:} [ELECTRON, POSITRON] \newline
-\textbf{Energies:} (17.5, 17.5); (22.0, 22.0); (45.5, 45.5); (66.5, 66.5); (80.5, 80.5); (86.0, 86.0); (91.5, 91.5); (94.5, 94.5) GeV \newline
+\textbf{Beams:} $e^-$\,$e^+$ \newline
+\textbf{Energies:} (17.5, 17.5), (22.0, 22.0), (45.5, 45.5), (66.5, 66.5), (80.5, 80.5), (86.0, 86.0), (91.5, 91.5), (94.5, 94.5) GeV \newline
\textbf{Experiment:} JADE_OPAL (PETRA and LEP) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+4300807}{4300807}\newline
\textbf{Status:} VALIDATED\newline
@@ -284,7 +284,7 @@
\typeout{Handling analysis OPAL_1998_S3780481}\subsection[OPAL\_1998\_S3780481]{OPAL\_1998\_S3780481\,\cite{Ackerstaff:1998hz}}
\textbf{Measurements of flavor dependent fragmentation functions in $Z^0 \ensuremath{\to} q \bar{q}$ events}\newline
-\textbf{Beams:} [ELECTRON, POSITRON] \newline
+\textbf{Beams:} $e^-$\,$e^+$ \newline
\textbf{Energies:} (45.6, 45.6) GeV \newline
\textbf{Experiment:} OPAL (LEP 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+3780481}{3780481}\newline
@@ -315,7 +315,7 @@
\typeout{Handling analysis OPAL_2001_S4553896}\subsection[OPAL\_2001\_S4553896]{OPAL\_2001\_S4553896\,\cite{Abbiendi:2001qn}}
\textbf{Four-jet angles using Durham algorithm}\newline
-\textbf{Beams:} [ELECTRON, POSITRON] \newline
+\textbf{Beams:} $e^-$\,$e^+$ \newline
\textbf{Energies:} (45.6, 45.6) GeV \newline
\textbf{Experiment:} OPAL (LEP Run 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+4553896}{4553896}\newline
@@ -347,8 +347,8 @@
\typeout{Handling analysis OPAL_2004_S6132243}\subsection[OPAL\_2004\_S6132243]{OPAL\_2004\_S6132243\,\cite{Abbiendi:2004qz}}
\textbf{Event shape distributions and moments in $e^+ e^-$ \ensuremath{\to} hadrons at 91--209 GeV}\newline
-\textbf{Beams:} [POSITRON, ELECTRON] \newline
-\textbf{Energies:} (45.5, 45.5); (66.5, 66.5); (88.5, 88.5); (98.5, 98.5) GeV \newline
+\textbf{Beams:} $e^+$\,$e^-$ \newline
+\textbf{Energies:} (45.5, 45.5), (66.5, 66.5), (88.5, 88.5), (98.5, 98.5) GeV \newline
\textbf{Experiment:} OPAL (LEP 1 \& 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+6132243}{6132243}\newline
\textbf{Status:} VALIDATED\newline
@@ -376,8 +376,8 @@
\section{Tevatron analyses}\typeout{Handling analysis CDF_1988_S1865951}\subsection[CDF\_1988\_S1865951]{CDF\_1988\_S1865951\,\cite{Abe:1988yu}}
\textbf{CDF transverse momentum distributions at 630 GeV and 1800 GeV.}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
-\textbf{Energies:} (315.0, 315.0); (900.0, 900.0) GeV \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
+\textbf{Energies:} (315.0, 315.0), (900.0, 900.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run I) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+1865951}{1865951}\newline
\textbf{Status:} VALIDATED\newline
@@ -408,8 +408,8 @@
\typeout{Handling analysis CDF_1990_S2089246}\subsection[CDF\_1990\_S2089246]{CDF\_1990\_S2089246\,\cite{Abe:1989td}}
\textbf{CDF pseudorapidity distributions at 630 and 1800 GeV}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
-\textbf{Energies:} (315.0, 315.0); (900.0, 900.0) GeV \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
+\textbf{Energies:} (315.0, 315.0), (900.0, 900.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 0) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+2089246}{2089246}\newline
\textbf{Status:} VALIDATED\newline
@@ -439,7 +439,7 @@
\typeout{Handling analysis CDF_1991_S2313472}\subsection[CDF\_1991\_S2313472]{CDF\_1991\_S2313472\,\cite{Abe:1991rk}}
\textbf{W-boson \pT measurement in $p\bar{p}$ collisions at $\sqrt{s}=1.8~\TeV$}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (900.0, 900.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+2313472}{2313472}\newline
@@ -469,7 +469,7 @@
\typeout{Handling analysis CDF_1993_S2742446}\subsection[CDF\_1993\_S2742446]{CDF\_1993\_S2742446\,\cite{Abe:1993cv}}
\textbf{Angular distribution of prompt photon}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (900.0, 900.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+2742446}{2742446}\newline
@@ -500,7 +500,7 @@
\typeout{Handling analysis CDF_1994_S2952106}\subsection[CDF\_1994\_S2952106]{CDF\_1994\_S2952106\,\cite{Abe:1994nj}}
\textbf{CDF Run I color coherence analysis.}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (900.0, 900.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+2952106}{2952106}\newline
@@ -531,7 +531,7 @@
\typeout{Handling analysis CDF_1996_S3108457}\subsection[CDF\_1996\_S3108457]{CDF\_1996\_S3108457\,\cite{Abe:1995rw}}
\textbf{Properties of High-Mass Multijet Events}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (900.0, 900.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+3108457}{3108457}\newline
@@ -562,7 +562,7 @@
\typeout{Handling analysis CDF_1996_S3349578}\subsection[CDF\_1996\_S3349578]{CDF\_1996\_S3349578\,\cite{Abe:1996nn}}
\textbf{Further properties of high-mass multijet events}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (900.0, 900.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+3349578}{3349578}\newline
@@ -594,7 +594,7 @@
\typeout{Handling analysis CDF_1996_S3418421}\subsection[CDF\_1996\_S3418421]{CDF\_1996\_S3418421\,\cite{Abe:1996mj}}
\textbf{Dijet angular distributions}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (900.0, 900.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+3418421}{3418421}\newline
@@ -626,7 +626,7 @@
\typeout{Handling analysis CDF_1997_S3541940}\subsection[CDF\_1997\_S3541940]{CDF\_1997\_S3541940\,\cite{Abe:1997yb}}
\textbf{Properties of six jet events with large six jet mass}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (900.0, 900.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+3541940}{3541940}\newline
@@ -658,7 +658,7 @@
\typeout{Handling analysis CDF_1998_S3618439}\subsection[CDF\_1998\_S3618439]{CDF\_1998\_S3618439\,\cite{Abe:1997eua}}
\textbf{Differential cross-section for events with large total transverse energy}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (900.0, 900.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+3618439}{3618439}\newline
@@ -689,7 +689,7 @@
\typeout{Handling analysis CDF_2000_S4155203}\subsection[CDF\_2000\_S4155203]{CDF\_2000\_S4155203\,\cite{Affolder:1999jh}}
\textbf{Z \pT measurement in CDF Z \ensuremath{\to} $e^+e^-$ events}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (900.0, 900.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+4155203}{4155203}\newline
@@ -722,7 +722,7 @@
\typeout{Handling analysis CDF_2000_S4266730}\subsection[CDF\_2000\_S4266730]{CDF\_2000\_S4266730\,\cite{Affolder:1999ua}}
\textbf{Differential Dijet Mass Cross Section}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (900.0, 900.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+4266730}{4266730}\newline
@@ -754,7 +754,7 @@
\typeout{Handling analysis CDF_2001_S4517016}\subsection[CDF\_2001\_S4517016]{CDF\_2001\_S4517016\,\cite{Affolder:2000ew}}
\textbf{Two jet triply-differential cross-section}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (900.0, 900.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+4517016}{4517016}\newline
@@ -786,7 +786,7 @@
\typeout{Handling analysis CDF_2001_S4563131}\subsection[CDF\_2001\_S4563131]{CDF\_2001\_S4563131\,\cite{Affolder:2001fa}}
\textbf{Inclusive jet cross section}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (900.0, 900.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+4563131}{4563131}\newline
@@ -818,7 +818,7 @@
\typeout{Handling analysis CDF_2001_S4751469}\subsection[CDF\_2001\_S4751469]{CDF\_2001\_S4751469\,\cite{Affolder:2001xt}}
\textbf{Field \& Stuart Run I underlying event analysis.}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (900.0, 900.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+4751469}{4751469}\newline
@@ -849,8 +849,8 @@
\typeout{Handling analysis CDF_2002_S4796047}\subsection[CDF\_2002\_S4796047]{CDF\_2002\_S4796047\,\cite{Acosta:2001rm}}
\textbf{CDF Run 1 charged multiplicity measurement}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
-\textbf{Energies:} (315.0, 315.0); (900.0, 900.0) GeV \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
+\textbf{Energies:} (315.0, 315.0), (900.0, 900.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+4796047}{4796047}\newline
\textbf{Status:} VALIDATED\newline
@@ -880,8 +880,8 @@
\typeout{Handling analysis CDF_2004_S5839831}\subsection[CDF\_2004\_S5839831]{CDF\_2004\_S5839831\,\cite{Acosta:2004wqa}}
\textbf{Transverse cone and `Swiss cheese' underlying event studies}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
-\textbf{Energies:} (315.0, 315.0); (900.0, 900.0) GeV \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
+\textbf{Energies:} (315.0, 315.0), (900.0, 900.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+5839831}{5839831}\newline
\textbf{Status:} VALIDATED\newline
@@ -913,7 +913,7 @@
\typeout{Handling analysis CDF_2005_S6080774}\subsection[CDF\_2005\_S6080774]{CDF\_2005\_S6080774\,\cite{Acosta:2004sn}}
\textbf{Differential cross sections for prompt diphoton production}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+6080774}{6080774}\newline
@@ -945,7 +945,7 @@
\typeout{Handling analysis CDF_2005_S6217184}\subsection[CDF\_2005\_S6217184]{CDF\_2005\_S6217184\,\cite{Acosta:2005ix}}
\textbf{CDF Run II jet shape analysis}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+6217184}{6217184}\newline
@@ -978,7 +978,7 @@
\typeout{Handling analysis CDF_2006_S6450792}\subsection[CDF\_2006\_S6450792]{CDF\_2006\_S6450792\,\cite{Abulencia:2005yg}}
\textbf{Inclusive jet cross section differential in \pT}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+6450792}{6450792}\newline
@@ -1010,7 +1010,7 @@
\typeout{Handling analysis CDF_2006_S6653332}\subsection[CDF\_2006\_S6653332]{CDF\_2006\_S6653332\,\cite{Abulencia:2006ce}}
\textbf{\pT and eta distributions of jets in Z + jet production}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+6653332}{6653332}\newline
@@ -1042,7 +1042,7 @@
\typeout{Handling analysis CDF_2007_S7057202}\subsection[CDF\_2007\_S7057202]{CDF\_2007\_S7057202\,\cite{Abulencia:2007ez}}
\textbf{CDF Run II inclusive jet cross-section using the kT algorithm}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+7057202}{7057202}\newline
@@ -1076,7 +1076,7 @@
\typeout{Handling analysis CDF_2008_LEADINGJETS}\subsection{CDF\_2008\_LEADINGJETS}
\textbf{CDF Run 2 underlying event in leading jet events}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+NONE}{NONE}\newline
@@ -1102,7 +1102,7 @@
\typeout{Handling analysis CDF_2008_NOTE_9351}\subsection{CDF\_2008\_NOTE\_9351}
\textbf{CDF Run 2 underlying event in Drell-Yan}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+NONE}{NONE}\newline
@@ -1135,7 +1135,7 @@
\typeout{Handling analysis CDF_2008_S7540469}\subsection[CDF\_2008\_S7540469]{CDF\_2008\_S7540469\,\cite{:2007cp}}
\textbf{Measurement of differential Z/$\gamma^*$ + jet + X cross sections}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+7540469}{7540469}\newline
@@ -1166,7 +1166,7 @@
\typeout{Handling analysis CDF_2008_S7541902}\subsection[CDF\_2008\_S7541902]{CDF\_2008\_S7541902\,\cite{Aaltonen:2007ip}}
\textbf{Jet \pT and multiplicity distributions in W + jets events}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+7541902}{7541902}\newline
@@ -1198,7 +1198,7 @@
\typeout{Handling analysis CDF_2008_S7782535}\subsection[CDF\_2008\_S7782535]{CDF\_2008\_S7782535\,\cite{Aaltonen:2008de}}
\textbf{CDF Run II b-jet shape paper}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+7782535}{7782535}\newline
@@ -1230,7 +1230,7 @@
\typeout{Handling analysis CDF_2008_S7828950}\subsection[CDF\_2008\_S7828950]{CDF\_2008\_S7828950\,\cite{Aaltonen:2008eq}}
\textbf{CDF Run II inclusive jet cross-section using the Midpoint algorithm}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+7828950}{7828950}\newline
@@ -1262,7 +1262,7 @@
\typeout{Handling analysis CDF_2008_S8093652}\subsection[CDF\_2008\_S8093652]{CDF\_2008\_S8093652\,\cite{Aaltonen:2008dn}}
\textbf{Dijet mass spectrum}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+8093652}{8093652}\newline
@@ -1292,7 +1292,7 @@
\typeout{Handling analysis CDF_2008_S8095620}\subsection[CDF\_2008\_S8095620]{CDF\_2008\_S8095620\,\cite{Aaltonen:2008mt}}
\textbf{CDF Run II Z+b-jet cross section paper, 2 fb-1}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+8095620}{8095620}\newline
@@ -1322,7 +1322,7 @@
\typeout{Handling analysis CDF_2009_NOTE_9936}\subsection{CDF\_2009\_NOTE\_9936}
\textbf{CDF Run 2 min bias charged multiplicity analysis}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+None}{None}\newline
@@ -1353,7 +1353,7 @@
\typeout{Handling analysis CDF_2009_S8233977}\subsection[CDF\_2009\_S8233977]{CDF\_2009\_S8233977\,\cite{Aaltonen:2009ne}}
\textbf{CDF Run 2 min bias cross-section analysis}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+8233977}{8233977}\newline
@@ -1386,7 +1386,7 @@
\typeout{Handling analysis CDF_2009_S8383952}\subsection[CDF\_2009\_S8383952]{CDF\_2009\_S8383952\,\cite{Aaltonen:2009pc}}
\textbf{Z rapidity measurement}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+8383952}{8383952}\newline
@@ -1416,7 +1416,7 @@
\typeout{Handling analysis CDF_2009_S8436959}\subsection[CDF\_2009\_S8436959]{CDF\_2009\_S8436959\,\cite{Aaltonen:2009ty}}
\textbf{Measurement of the inclusive isolated prompt photon cross-section}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+8436959}{8436959}\newline
@@ -1446,7 +1446,7 @@
\typeout{Handling analysis D0_1996_S3214044}\subsection[D0\_1996\_S3214044]{D0\_1996\_S3214044\,\cite{Abachi:1995zv}}
\textbf{Topological distributions of inclusive three- and four-jet events}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (900.0, 900.0) GeV \newline
\textbf{Experiment:} D0 (Tevatron Run 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+3214044}{3214044}\newline
@@ -1478,7 +1478,7 @@
\typeout{Handling analysis D0_1996_S3324664}\subsection[D0\_1996\_S3324664]{D0\_1996\_S3324664\,\cite{Abachi:1996et}}
\textbf{Azimuthal decorrelation of jets widely separated in rapidity}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (900.0, 900.0) GeV \newline
\textbf{Experiment:} D0 (Tevatron Run 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+3324664}{3324664}\newline
@@ -1510,7 +1510,7 @@
\typeout{Handling analysis D0_1998_S3711838}\subsection[D0\_1998\_S3711838]{D0\_1998\_S3711838\,\cite{Abbott:1998jy}}
\textbf{W-boson \pT measurement in $p\bar{p}$ collisions at $\sqrt{s}=1.8~\TeV$}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (900.0, 900.0) GeV \newline
\textbf{Experiment:} D0 (Tevatron) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+3711838}{3711838}\newline
@@ -1540,7 +1540,7 @@
\typeout{Handling analysis D0_2001_S4674421}\subsection[D0\_2001\_S4674421]{D0\_2001\_S4674421\,\cite{Abazov:2001nta}}
\textbf{Tevatron Run I differential W/Z boson cross-section analysis}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (900.0, 900.0) GeV \newline
\textbf{Experiment:} D0 (Tevatron Run 1) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+4674421}{4674421}\newline
@@ -1572,7 +1572,7 @@
\typeout{Handling analysis D0_2004_S5992206}\subsection[D0\_2004\_S5992206]{D0\_2004\_S5992206\,\cite{Abazov:2004hm}}
\textbf{Run II jet azimuthal decorrelation analysis}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} D0 (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+5992206}{5992206}\newline
@@ -1603,7 +1603,7 @@
\typeout{Handling analysis D0_2006_S6438750}\subsection[D0\_2006\_S6438750]{D0\_2006\_S6438750\,\cite{Abazov:2005wc}}
\textbf{Inclusive isolated photon cross-section, differential in \pT(gamma)}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} D0 (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+6438750}{6438750}\newline
@@ -1637,7 +1637,7 @@
\typeout{Handling analysis D0_2007_S7075677}\subsection[D0\_2007\_S7075677]{D0\_2007\_S7075677\,\cite{Abazov:2007jy}}
\textbf{$Z/\gamma^* + X$ cross-section shape, differential in $y(Z)$}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} D0 (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+7075677}{7075677}\newline
@@ -1670,7 +1670,7 @@
\typeout{Handling analysis D0_2008_S6879055}\subsection[D0\_2008\_S6879055]{D0\_2008\_S6879055\,\cite{Abazov:2006gs}}
\textbf{Measurement of the ratio sigma($Z/\gamma^*$ + $n$ jets)/sigma($Z/\gamma^*$)}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} D0 (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+6879055}{6879055}\newline
@@ -1701,7 +1701,7 @@
\typeout{Handling analysis D0_2008_S7554427}\subsection[D0\_2008\_S7554427]{D0\_2008\_S7554427\,\cite{:2007nt}}
\textbf{$Z/\gamma^* + X$ cross-section shape, differential in $\pT(Z)$}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} D0 (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+7554427}{7554427}\newline
@@ -1733,7 +1733,7 @@
\typeout{Handling analysis D0_2008_S7662670}\subsection[D0\_2008\_S7662670]{D0\_2008\_S7662670\,\cite{:2008hua}}
\textbf{Measurement of D0 Run II differential jet cross sections}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} D0 (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+7662670}{7662670}\newline
@@ -1766,7 +1766,7 @@
\typeout{Handling analysis D0_2008_S7719523}\subsection[D0\_2008\_S7719523]{D0\_2008\_S7719523\,\cite{Abazov:2008er}}
\textbf{Isolated $\gamma$ + jet cross-sections, differential in \pT($\gamma$) for various $y$ bins}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} D0 (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+7719523}{7719523}\newline
@@ -1800,7 +1800,7 @@
\typeout{Handling analysis D0_2008_S7837160}\subsection[D0\_2008\_S7837160]{D0\_2008\_S7837160\,\cite{Abazov:2008qv}}
\textbf{Measurement of W charge asymmetry from D0 Run II}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} D0 (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+7837160}{7837160}\newline
@@ -1835,7 +1835,7 @@
\typeout{Handling analysis D0_2008_S7863608}\subsection[D0\_2008\_S7863608]{D0\_2008\_S7863608\,\cite{Abazov:2008ez}}
\textbf{Measurement of differential $Z/\gamma^*$ + jet + $X$ cross sections}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} D0 (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+7863608}{7863608}\newline
@@ -1867,7 +1867,7 @@
\typeout{Handling analysis D0_2009_S8202443}\subsection[D0\_2009\_S8202443]{D0\_2009\_S8202443\,\cite{Abazov:2009av}}
\textbf{$Z/\gamma^*$ + jet + $X$ cross sections differential in \pT(jet 1,2,3)}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} D0 (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+8202443}{8202443}\newline
@@ -1897,7 +1897,7 @@
\typeout{Handling analysis D0_2009_S8320160}\subsection[D0\_2009\_S8320160]{D0\_2009\_S8320160\,\cite{:2009mh}}
\textbf{Dijet angular distributions}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} D0 (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+8320160}{8320160}\newline
@@ -1927,7 +1927,7 @@
\typeout{Handling analysis D0_2009_S8349509}\subsection[D0\_2009\_S8349509]{D0\_2009\_S8349509\,\cite{Abazov:2009pp}}
\textbf{Z+jets angular distributions}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} D0 (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+8349509}{8349509}\newline
@@ -1957,7 +1957,7 @@
\typeout{Handling analysis D0_2010_S8566488}\subsection[D0\_2010\_S8566488]{D0\_2010\_S8566488\,\cite{Abazov:2010fr}}
\textbf{Dijet invariant mass}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} D0 (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+8566488}{8566488}\newline
@@ -1987,7 +1987,7 @@
\typeout{Handling analysis D0_2010_S8570965}\subsection[D0\_2010\_S8570965]{D0\_2010\_S8570965\,\cite{Abazov:2010ah}}
\textbf{Direct photon pair production}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (980.0, 980.0) GeV \newline
\textbf{Experiment:} CDF (Tevatron Run 2) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+8570965}{8570965}\newline
@@ -2017,7 +2017,7 @@
\typeout{Handling analysis E735_1998_S3905616}\subsection[E735\_1998\_S3905616]{E735\_1998\_S3905616\,\cite{Alexopoulos:1998bi}}
\textbf{Charged particle multiplicity in ppbar collisions at \ensuremath{\sqrt{s}} = 1.8 TeV}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (900.0, 900.0) GeV \newline
\textbf{Experiment:} E735 (Tevatron) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+3905616}{3905616}\newline
@@ -2046,7 +2046,7 @@
\section{LHC analyses}\typeout{Handling analysis ATLAS_2010_S8591806}\subsection[ATLAS\_2010\_S8591806]{ATLAS\_2010\_S8591806\,\cite{Aad:2010rd}}
\textbf{Charged particles at 900 GeV in ATLAS}\newline
-\textbf{Beams:} [PROTON, PROTON] \newline
+\textbf{Beams:} $p$\,$p$ \newline
\textbf{Energies:} (450.0, 450.0) GeV \newline
\textbf{Experiment:} ATLAS (LHC 900GeV) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+8591806}{8591806}\newline
@@ -2074,8 +2074,8 @@
\section{SPS analyses}\typeout{Handling analysis UA1_1990_S2044935}\subsection[UA1\_1990\_S2044935]{UA1\_1990\_S2044935\,\cite{Albajar:1989an}}
\textbf{UA1 multiplicities, transverse momenta and transverse energy distributions.}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
-\textbf{Energies:} (31.5, 31.5); (100.0, 100.0); (250.0, 250.0); (450.0, 450.0) GeV \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
+\textbf{Energies:} (31.5, 31.5), (100.0, 100.0), (250.0, 250.0), (450.0, 450.0) GeV \newline
\textbf{Experiment:} UA1 (SPS) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+2044935}{2044935}\newline
\textbf{Status:} VALIDATED\newline
@@ -2105,7 +2105,7 @@
\typeout{Handling analysis UA5_1982_S875503}\subsection[UA5\_1982\_S875503]{UA5\_1982\_S875503\,\cite{Alpgard:1982zx}}
\textbf{UA5 multiplicity and pseudorapidity distributions for $pp$ and $p\bar{p}$.}\newline
-\textbf{Beams:} [ANTIPROTON, PROTON] \newline
+\textbf{Beams:} $\bar{p}$\,$p$ \newline
\textbf{Energies:} (26.5, 26.5) GeV \newline
\textbf{Experiment:} UA5 (SPS) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+875503}{875503}\newline
@@ -2136,8 +2136,8 @@
\typeout{Handling analysis UA5_1986_S1583476}\subsection[UA5\_1986\_S1583476]{UA5\_1986\_S1583476\,\cite{Alner:1986xu}}
\textbf{Pseudorapidity distributions in $p\bar{p}$ (NSD, NSD+SD) events at \ensuremath{\sqrt{s}} = 200 and 900 GeV}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
-\textbf{Energies:} (100.0, 100.0); (450.0, 450.0) GeV \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
+\textbf{Energies:} (100.0, 100.0), (450.0, 450.0) GeV \newline
\textbf{Experiment:} UA5 (CERN SPS) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+1583476}{1583476}\newline
\textbf{Status:} VALIDATED\newline
@@ -2170,7 +2170,7 @@
\typeout{Handling analysis UA5_1987_S1640666}\subsection[UA5\_1987\_S1640666]{UA5\_1987\_S1640666\,\cite{Alner:1987wb}}
\textbf{UA5 charged multiplicity measurements at 546 GeV}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
\textbf{Energies:} (273.0, 273.0) GeV \newline
\textbf{Experiment:} UA5 (CERN SPS) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+1640666}{1640666}\newline
@@ -2200,8 +2200,8 @@
\typeout{Handling analysis UA5_1988_S1867512}\subsection[UA5\_1988\_S1867512]{UA5\_1988\_S1867512\,\cite{Ansorge:1988fg}}
\textbf{Charged particle correlations in UA5 $p \\bar{p}$ NSD events at \ensuremath{\sqrt{s}} = 200, 546 and 900 GeV.}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
-\textbf{Energies:} (100.0, 100.0); (273.0, 273.0); (450.0, 450.0) GeV \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
+\textbf{Energies:} (100.0, 100.0), (273.0, 273.0), (450.0, 450.0) GeV \newline
\textbf{Experiment:} UA5 (CERN SPS) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+1867512}{1867512}\newline
\textbf{Status:} VALIDATED\newline
@@ -2221,7 +2221,7 @@
\item ppbar events. Non-single diffractive events need to be switched on. The trigger implementation is the same as in UA5_1989_S1926373. Important: Only the correlation strengths with symmetric eta bins should be used for tuning.\end{itemize}
-\noindent Data on two-particle pseudorapidity and multiplicity correlations of charged particles for non single-diffractive $ar{p}p$ collisions at c.m. energies of 200, 546 and 900 GeV. Pseudorapidity correlations interpreted in terms of a cluster model, which has been motivated by this and other experiments, require on average about two charged particles per cluster. The decay width of the clusters in pseudorapidity is approximately independent of multiplicity and of c.m. energy. The investigations of correlations in terms of pseudorapidity gaps confirm the picture of cluster production. The strength of forward-backward multiplicity correlations increases linearly with ins and depends strongly on position and size of the pseudorapidity gap separating the forward and backward interval. All our correlation studies can be understood in terms of a cluster model in which clusters contain on average about two charged particles, i.e. are of similar magnitude to earlier estimates
from the ISR.
+\noindent Data on two-particle pseudorapidity and multiplicity correlations of charged particles for non single-diffractive $\bar{p}p$ collisions at c.m. energies of 200, 546 and 900 GeV. Pseudorapidity correlations interpreted in terms of a cluster model, which has been motivated by this and other experiments, require on average about two charged particles per cluster. The decay width of the clusters in pseudorapidity is approximately independent of multiplicity and of c.m. energy. The investigations of correlations in terms of pseudorapidity gaps confirm the picture of cluster production. The strength of forward-backward multiplicity correlations increases linearly with ins and depends strongly on position and size of the pseudorapidity gap separating the forward and backward interval. All our correlation studies can be understood in terms of a cluster model in which clusters contain on average about two charged particles, i.e. are of similar magnitude to earlier estimates
from the ISR.
\clearpage
@@ -2230,8 +2230,8 @@
\typeout{Handling analysis UA5_1989_S1926373}\subsection[UA5\_1989\_S1926373]{UA5\_1989\_S1926373\,\cite{Ansorge:1988kn}}
\textbf{UA5 charged multiplicity measurements}\newline
-\textbf{Beams:} [PROTON, ANTIPROTON] \newline
-\textbf{Energies:} (100.0, 100.0); (450.0, 450.0) GeV \newline
+\textbf{Beams:} $p$\,$\bar{p}$ \newline
+\textbf{Energies:} (100.0, 100.0), (450.0, 450.0) GeV \newline
\textbf{Experiment:} UA5 (CERN SPS) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+1926373}{1926373}\newline
\textbf{Status:} VALIDATED\newline
@@ -2261,7 +2261,7 @@
\section{HERA analyses}\typeout{Handling analysis H1_1994_S2919893}\subsection[H1\_1994\_S2919893]{H1\_1994\_S2919893\,\cite{Abt:1994ye}}
\textbf{H1 energy flow and charged particle spectra in DIS}\newline
-\textbf{Beams:} [ELECTRON, PROTON] \newline
+\textbf{Beams:} $e^-$\,$p$ \newline
\textbf{Energies:} (820.0, 26.7) GeV \newline
\textbf{Experiment:} H1 (HERA) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+2919893}{2919893}\newline
@@ -2292,7 +2292,7 @@
\typeout{Handling analysis H1_1995_S3167097}\subsection[H1\_1995\_S3167097]{H1\_1995\_S3167097\,\cite{Aid:1995we}}
\textbf{Transverse energy and forward jet production in the low-$x$ regime at H1}\newline
-\textbf{Beams:} [ELECTRON, PROTON] \newline
+\textbf{Beams:} $e^-$\,$p$ \newline
\textbf{Energies:} (820.0, 26.7) GeV \newline
\textbf{Experiment:} H1 (HERA Run I) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+3167097}{3167097}\newline
@@ -2323,7 +2323,7 @@
\typeout{Handling analysis H1_2000_S4129130}\subsection[H1\_2000\_S4129130]{H1\_2000\_S4129130\,\cite{Adloff:1999ws}}
\textbf{H1 energy flow in DIS}\newline
-\textbf{Beams:} [POSITRON, PROTON] \newline
+\textbf{Beams:} $e^+$\,$p$ \newline
\textbf{Energies:} (820.0, 27.5) GeV \newline
\textbf{Experiment:} H1 (HERA) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+4129130}{4129130}\newline
@@ -2355,7 +2355,7 @@
\typeout{Handling analysis ZEUS_2001_S4815815}\subsection[ZEUS\_2001\_S4815815]{ZEUS\_2001\_S4815815\,\cite{Chekanov:2001bw}}
\textbf{Dijet photoproduction analysis}\newline
-\textbf{Beams:} [POSITRON, PROTON] \newline
+\textbf{Beams:} $e^+$\,$p$ \newline
\textbf{Energies:} (820.0, 27.5) GeV \newline
\textbf{Experiment:} ZEUS (HERA Run I) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+4815815}{4815815}\newline
@@ -2385,7 +2385,7 @@
\section{RHIC analyses}\typeout{Handling analysis STAR_2006_S6500200}\subsection[STAR\_2006\_S6500200]{STAR\_2006\_S6500200\,\cite{Adams:2006nd}}
\textbf{Identified hadron spectra in pp at 200 GeV}\newline
-\textbf{Beams:} [PROTON, PROTON] \newline
+\textbf{Beams:} $p$\,$p$ \newline
\textbf{Energies:} (100.0, 100.0) GeV \newline
\textbf{Experiment:} STAR (RHIC pp 200 GeV) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+6500200}{6500200}\newline
@@ -2417,7 +2417,7 @@
\typeout{Handling analysis STAR_2006_S6860818}\subsection[STAR\_2006\_S6860818]{STAR\_2006\_S6860818\,\cite{Abelev:2006cs}}
\textbf{Strange particle production in pp at 200 GeV}\newline
-\textbf{Beams:} [PROTON, PROTON] \newline
+\textbf{Beams:} $p$\,$p$ \newline
\textbf{Energies:} (100.0, 100.0) GeV \newline
\textbf{Experiment:} STAR (RHIC pp 200 GeV) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+6860818}{6860818}\newline
@@ -2448,7 +2448,7 @@
\typeout{Handling analysis STAR_2006_S6870392}\subsection[STAR\_2006\_S6870392]{STAR\_2006\_S6870392\,\cite{Abelev:2006uq}}
\textbf{Inclusive jet cross-section in pp at 200 GeV}\newline
-\textbf{Beams:} [PROTON, PROTON] \newline
+\textbf{Beams:} $p$\,$p$ \newline
\textbf{Energies:} (100.0, 100.0) GeV \newline
\textbf{Experiment:} STAR (RHIC pp 200 GeV) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+6870392}{6870392}\newline
@@ -2479,7 +2479,7 @@
\typeout{Handling analysis STAR_2008_S7993412}\subsection[STAR\_2008\_S7993412]{STAR\_2008\_S7993412\,\cite{Nattrass:2008tw}}
\textbf{Di-hadron correlations in d-Au at 200 GeV}\newline
-\textbf{Beams:} [PROTON, PROTON] \newline
+\textbf{Beams:} $p$\,$p$ \newline
\textbf{Energies:} (100.0, 100.0) GeV \newline
\textbf{Experiment:} STAR (RHIC d-Au 200 GeV) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+7993412}{7993412}\newline
@@ -2510,7 +2510,7 @@
\typeout{Handling analysis STAR_2009_UE_HELEN}\subsection{STAR\_2009\_UE\_HELEN}
\textbf{UE measurement in pp at 200 GeV}\newline
-\textbf{Beams:} [PROTON, PROTON] \newline
+\textbf{Beams:} $p$\,$p$ \newline
\textbf{Energies:} (100.0, 100.0) GeV \newline
\textbf{Experiment:} STAR (RHIC pp 200 GeV) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+None}{None}\newline
@@ -2541,7 +2541,7 @@
\section{Monte Carlo analyses}\typeout{Handling analysis MC_DIJET}\subsection{MC\_DIJET}
\textbf{Analysis of dijet events at the LHC.}\newline
-\textbf{Beams:} [*, *] \newline
+\textbf{Beams:} $*$\,$*$ \newline
\textbf{Status:} UNVALIDATED\newline
\textbf{No authors listed}\\
\textbf{No references listed}\\
@@ -2560,7 +2560,7 @@
\typeout{Handling analysis MC_DIPHOTON}\subsection{MC\_DIPHOTON}
\textbf{Monte Carlo validation observables for diphoton production at LHC}\newline
-\textbf{Beams:} [*, *] \newline
+\textbf{Beams:} $*$\,$*$ \newline
\textbf{Status:} VALIDATED\newline
\textbf{Authors:}
\penalty 100
@@ -2583,7 +2583,7 @@
\typeout{Handling analysis MC_JETS}\subsection{MC\_JETS}
\textbf{Monte Carlo validation observables for jet production}\newline
-\textbf{Beams:} [*, *] \newline
+\textbf{Beams:} $*$\,$*$ \newline
\textbf{Status:} VALIDATED\newline
\textbf{Authors:}
\penalty 100
@@ -2606,7 +2606,7 @@
\typeout{Handling analysis MC_LEADINGJETS}\subsection{MC\_LEADINGJETS}
\textbf{Underlying event in leading jet events, extended to LHC}\newline
-\textbf{Beams:} [*, *] \newline
+\textbf{Beams:} $*$\,$*$ \newline
\textbf{Status:} VALIDATED\newline
\textbf{Authors:}
\penalty 100
@@ -2629,7 +2629,7 @@
\typeout{Handling analysis MC_PHOTONJETS}\subsection{MC\_PHOTONJETS}
\textbf{Monte Carlo validation observables for photon + jets production}\newline
-\textbf{Beams:} [*, *] \newline
+\textbf{Beams:} $*$\,$*$ \newline
\textbf{Status:} VALIDATED\newline
\textbf{Authors:}
\penalty 100
@@ -2652,7 +2652,7 @@
\typeout{Handling analysis MC_PHOTONJETUE}\subsection{MC\_PHOTONJETUE}
\textbf{Study the usual underlying event observables in photon + jet events}\newline
-\textbf{Beams:} [PROTON, PROTON]; [ANTIPROTON, PROTON] \newline
+\textbf{Beams:} $p$\,$p$, $\bar{p}$\,$p$ \newline
\textbf{Status:} UNVALIDATED\newline
\textbf{Authors:}
\penalty 100
@@ -2675,7 +2675,7 @@
\typeout{Handling analysis MC_SUSY}\subsection{MC\_SUSY}
\textbf{Validate generic SUSY events, including various lepton invariant mass}\newline
-\textbf{Beams:} [*, *] \newline
+\textbf{Beams:} $*$\,$*$ \newline
\textbf{Status:} VALIDATED\newline
\textbf{Authors:}
\penalty 100
@@ -2698,7 +2698,7 @@
\typeout{Handling analysis MC_TTBAR}\subsection{MC\_TTBAR}
\textbf{MC analysis for ttbar studies}\newline
-\textbf{Beams:} [*, *] \newline
+\textbf{Beams:} $*$\,$*$ \newline
\textbf{Status:} UNVALIDATED\newline
\textbf{Authors:}
\penalty 100
@@ -2723,7 +2723,7 @@
\typeout{Handling analysis MC_WJETS}\subsection{MC\_WJETS}
\textbf{Monte Carlo validation observables for $W[e \, \nu]$ + jets production}\newline
-\textbf{Beams:} [*, *] \newline
+\textbf{Beams:} $*$\,$*$ \newline
\textbf{Status:} VALIDATED\newline
\textbf{Authors:}
\penalty 100
@@ -2746,7 +2746,7 @@
\typeout{Handling analysis MC_ZJETS}\subsection{MC\_ZJETS}
\textbf{Monte Carlo validation observables for $Z[e^+ \, e^-]$ + jets production}\newline
-\textbf{Beams:} [*, *] \newline
+\textbf{Beams:} $*$\,$*$ \newline
\textbf{Status:} VALIDATED\newline
\textbf{Authors:}
\penalty 100
@@ -2767,7 +2767,7 @@
\section{Example analyses}\typeout{Handling analysis EXAMPLE}\subsection{EXAMPLE}
\textbf{A demo to show aspects of writing a Rivet analysis}\newline
-\textbf{Beams:} [*, *] \newline
+\textbf{Beams:} $*$\,$*$ \newline
\textbf{Status:} EXAMPLE\newline
\textbf{Authors:}
\penalty 100
@@ -2788,7 +2788,7 @@
\section{Misc. analyses}\typeout{Handling analysis BELLE_2006_S6265367}\subsection{BELLE\_2006\_S6265367}
\textbf{Charm hadrons from fragmentation and B decays on the $\Upsilon(4S)$}\newline
-\textbf{Beams:} [ELECTRON, POSITRON] \newline
+\textbf{Beams:} $e^-$\,$e^+$ \newline
\textbf{Energies:} (3.5, 8.0) GeV \newline
\textbf{Status:} VALIDATED\newline
\textbf{Authors:}
@@ -2818,7 +2818,7 @@
\typeout{Handling analysis PDG_HADRON_MULTIPLICITIES}\subsection[PDG\_HADRON\_MULTIPLICITIES]{PDG\_HADRON\_MULTIPLICITIES\,\cite{Amsler:2008zzb}}
\textbf{Hadron multiplicities in hadronic $e^+e^-$ events}\newline
-\textbf{Beams:} [ELECTRON, POSITRON] \newline
+\textbf{Beams:} $e^-$\,$e^+$ \newline
\textbf{Energies:} (45.6, 45.6) GeV \newline
\textbf{Experiment:} PDG (Various) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+7857373}{7857373}\newline
@@ -2848,7 +2848,7 @@
\typeout{Handling analysis PDG_HADRON_MULTIPLICITIES_RATIOS}\subsection[PDG\_HADRON\_MULTIPLICITIES\_RATIOS]{PDG\_HADRON\_MULTIPLICITIES\_RATIOS\,\cite{Amsler:2008zzb}}
\textbf{Ratios (w.r.t. $\pi^+/\pi^-$) of hadron multiplicities in hadronic $e^+e^-$ events}\newline
-\textbf{Beams:} [ELECTRON, POSITRON] \newline
+\textbf{Beams:} $e^-$\,$e^+$ \newline
\textbf{Energies:} (45.6, 45.6) GeV \newline
\textbf{Experiment:} PDG (Various) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+7857373}{7857373}\newline
@@ -2878,8 +2878,8 @@
\typeout{Handling analysis SFM_1984_S1178091}\subsection[SFM\_1984\_S1178091]{SFM\_1984\_S1178091\,\cite{Breakstone:1983ns}}
\textbf{Charged multiplicity distribution in pp interactions at CERN ISR energies}\newline
-\textbf{Beams:} [PROTON, PROTON] \newline
-\textbf{Energies:} (15.2, 15.2); (22.2, 22.2); (26.1, 26.1); (31.1, 31.1) GeV \newline
+\textbf{Beams:} $p$\,$p$ \newline
+\textbf{Energies:} (15.2, 15.2), (22.2, 22.2), (26.1, 26.1), (31.1, 31.1) GeV \newline
\textbf{Experiment:} SFM (CERN ISR) \newline
\textbf{Spires ID:} \href{http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+1178091}{1178091}\newline
\textbf{Status:} UNVALIDATED\newline
Modified: trunk/doc/mk-analysis-html
==============================================================================
--- trunk/doc/mk-analysis-html Tue Jun 22 22:22:31 2010 (r2507)
+++ trunk/doc/mk-analysis-html Wed Jun 23 10:23:39 2010 (r2508)
@@ -1,16 +1,19 @@
#! /usr/bin/env python
-
## Get output filename
+OUTFILE = "analyses.html"
import sys
if len(sys.argv) < 2:
- print "You must supply the output file as an argument"
- exit(1)
-OUTFILE = sys.argv[1]
-
+ pass
+ #print "Using output name '%s'" % OUTNAME
+else:
+ OUTFILE = sys.argv[1]
## Make "set" a builtin type on Python < 2.4
-if not 'set' in dir(__builtins__):
+try:
+ tmp = set()
+ del tmp
+except:
from sets import Set as set
## Make "sorted" a builtin function on Python < 2.4
@@ -113,7 +116,26 @@
page += "<b>No references listed</b>\n"
- page += "<b>Beams:</b> %s<br/>\n" % "; ".join(ana.requiredBeamsNames())
+ if ana.requiredBeams():
+ def pid_to_str(pid):
+ if pid == 11:
+ return "e-"
+ elif pid == -11:
+ return "e+"
+ elif pid == 2212:
+ return "p+"
+ elif pid == -2212:
+ return "p-"
+ elif pid == 10000:
+ return "*"
+ else:
+ return str(pid)
+ beamstrs = []
+ for bp in ana.requiredBeams():
+ beamstrs.append(pid_to_str(bp[0]) + " " + pid_to_str(bp[1]))
+ page += "<b>Beams:</b> %s<br/>\n" % ", ".join(beamstrs)
+
+
page += "<b>Beam energies:</b> "
if ana.energies():
page += "; ".join(["(%0.1f, %0.1f)" % (epair[0], epair[1]) for epair in ana.energies()])
Modified: trunk/doc/mk-analysis-latex
==============================================================================
--- trunk/doc/mk-analysis-latex Tue Jun 22 22:22:31 2010 (r2507)
+++ trunk/doc/mk-analysis-latex Wed Jun 23 10:23:39 2010 (r2508)
@@ -4,13 +4,17 @@
OUTNAME = "analyses"
import sys
if len(sys.argv) < 2:
- print "Using output name '%s'" % OUTNAME
+ pass
+ #print "Using output name '%s'" % OUTNAME
else:
OUTNAME = sys.argv[1]
## Make "set" a builtin type on Python < 2.4
-if not 'set' in dir(__builtins__):
+try:
+ tmp = set()
+ del tmp
+except:
from sets import Set as set
## Make "sorted" a builtin function on Python < 2.4
@@ -84,11 +88,27 @@
subtitle = "\\subsection[%s]{%s}\n" % (safe_aname, safe_aname + "\," + citetex)
page += subtitle
page += "\\textbf{%s}\\newline\n" % ana.summary()
- if ana.requiredBeamsNames():
- page += "\\textbf{Beams:} %s \\newline\n" % "; ".join(ana.requiredBeamsNames())
+ if ana.requiredBeams():
+ def pid_to_str(pid):
+ if pid == 11:
+ return "$e^-$"
+ elif pid == -11:
+ return "$e^+$"
+ elif pid == 2212:
+ return "$p$"
+ elif pid == -2212:
+ return "$\\bar{p}$"
+ elif pid == 10000:
+ return "$*$"
+ else:
+ return str(pid)
+ beamstrs = []
+ for bp in ana.requiredBeams():
+ beamstrs.append(pid_to_str(bp[0]) + "\\," + pid_to_str(bp[1]))
+ page += "\\textbf{Beams:} %s \\newline\n" % ", ".join(beamstrs)
if ana.energies():
page += "\\textbf{Energies:} %s GeV \\newline\n" % \
- "; ".join(["(%0.1f, %0.1f)" % (epair[0], epair[1]) for epair in ana.energies()])
+ ", ".join(["(%0.1f, %0.1f)" % (epair[0], epair[1]) for epair in ana.energies()])
if ana.experiment():
page += "\\textbf{Experiment:} %s (%s) \\newline\n" % (ana.experiment(), ana.collider())
if ana.spiresId():
Modified: trunk/doc/readplot.py
==============================================================================
--- trunk/doc/readplot.py Tue Jun 22 22:22:31 2010 (r2507)
+++ trunk/doc/readplot.py Wed Jun 23 10:23:39 2010 (r2508)
@@ -4,7 +4,10 @@
## Make "set" a builtin type on Python < 2.4
-if 'set' not in dir(__builtins__):
+try:
+ tmp = set()
+ del tmp
+except:
from sets import Set as set
## Make "sorted" a builtin function on Python < 2.4
@@ -29,7 +32,7 @@
#print anadirs
os.environ["RIVET_ANALYSIS_PATH"] = ":".join(anadirs)
-
+
## Change dlopen status to GLOBAL for Rivet lib
try:
import ctypes
@@ -41,7 +44,7 @@
# all_analyses = rivet.AnalysisLoader.analysisNames()
-# for a in
+# for a in
#plotinfos = glob.glob(os.path.join(os.getcwd(), "..", "data", "plotinfo", "*"))
@@ -65,7 +68,7 @@
current_histo = None
for line in finfo:
- mbegin = pat_begin_block.match(line)
+ mbegin = pat_begin_block.match(line)
if mbegin:
current_histo = mbegin.group(2)
rtn.setdefault(current_histo, dict())
Modified: trunk/pyext/rivet.i
==============================================================================
--- trunk/pyext/rivet.i Tue Jun 22 22:22:31 2010 (r2507)
+++ trunk/pyext/rivet.i Wed Jun 23 10:23:39 2010 (r2508)
@@ -105,17 +105,6 @@
Analysis();
};
- %extend Analysis {
- std::vector<std::string> requiredBeamsNames() {
- std::vector<std::string> rtn;
- foreach (const Rivet::PdgIdPair& bp, self->info().beams()) {
- std::string bps = Rivet::toBeamsString(bp);
- rtn.push_back(bps);
- }
- return rtn;
- }
- }
-
class AnalysisHandler {
public:
More information about the Rivet-svn
mailing list
|