|
|
[Rivet-svn] r2381 - in trunk: bin data/anainfo include/Rivet src/Core
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Mon Apr 5 13:08:38 BST 2010
Author: buckley
Date: Mon Apr 5 13:08:36 2010
New Revision: 2381
Log:
Adding ToDo, NeedsCrossSection, and better treatment of Beams and Energies entries in metadata files and in AnalysisInfo and Analysis interfaces. Updating metadata files and rivet-mkanalysis to add Energies, Beams and PtCuts entries to all of them.
Modified:
trunk/bin/rivet-mkanalysis
trunk/data/anainfo/ALEPH_1991_S2435284.info
trunk/data/anainfo/ALEPH_1996_S3196992.info
trunk/data/anainfo/ALEPH_1996_S3486095.info
trunk/data/anainfo/ALEPH_2004_S5765862.info
trunk/data/anainfo/ATLAS_2010_S8591806.info
trunk/data/anainfo/BELLE_2006_S6265367.info
trunk/data/anainfo/CDF_1988_S1865951.info
trunk/data/anainfo/CDF_1990_S2089246.info
trunk/data/anainfo/CDF_1991_S2313472.info
trunk/data/anainfo/CDF_1994_S2952106.info
trunk/data/anainfo/CDF_1996_S3108457.info
trunk/data/anainfo/CDF_1996_S3349578.info
trunk/data/anainfo/CDF_1996_S3418421.info
trunk/data/anainfo/CDF_1997_S3541940.info
trunk/data/anainfo/CDF_1998_S3618439.info
trunk/data/anainfo/CDF_2000_S4155203.info
trunk/data/anainfo/CDF_2000_S4266730.info
trunk/data/anainfo/CDF_2001_S4517016.info
trunk/data/anainfo/CDF_2001_S4563131.info
trunk/data/anainfo/CDF_2001_S4751469.info
trunk/data/anainfo/CDF_2002_S4796047.info
trunk/data/anainfo/CDF_2004_S5839831.info
trunk/data/anainfo/CDF_2005_S6080774.info
trunk/data/anainfo/CDF_2005_S6217184.info
trunk/data/anainfo/CDF_2006_S6450792.info
trunk/data/anainfo/CDF_2006_S6653332.info
trunk/data/anainfo/CDF_2007_S7057202.info
trunk/data/anainfo/CDF_2008_LEADINGJETS.info
trunk/data/anainfo/CDF_2008_NOTE_9351.info
trunk/data/anainfo/CDF_2008_S7540469.info
trunk/data/anainfo/CDF_2008_S7541902.info
trunk/data/anainfo/CDF_2008_S7782535.info
trunk/data/anainfo/CDF_2008_S7828950.info
trunk/data/anainfo/CDF_2008_S8093652.info
trunk/data/anainfo/CDF_2008_S8095620.info
trunk/data/anainfo/CDF_2009_S8233977.info
trunk/data/anainfo/CDF_2009_S8383952.info
trunk/data/anainfo/CDF_2009_S8436959.info
trunk/data/anainfo/D0_1996_S3214044.info
trunk/data/anainfo/D0_1996_S3324664.info
trunk/data/anainfo/D0_1998_S3711838.info
trunk/data/anainfo/D0_2001_S4674421.info
trunk/data/anainfo/D0_2004_S5992206.info
trunk/data/anainfo/D0_2006_S6438750.info
trunk/data/anainfo/D0_2007_S7075677.info
trunk/data/anainfo/D0_2008_S6879055.info
trunk/data/anainfo/D0_2008_S7554427.info
trunk/data/anainfo/D0_2008_S7662670.info
trunk/data/anainfo/D0_2008_S7719523.info
trunk/data/anainfo/D0_2008_S7837160.info
trunk/data/anainfo/D0_2008_S7863608.info
trunk/data/anainfo/D0_2009_S8202443.info
trunk/data/anainfo/D0_2009_S8320160.info
trunk/data/anainfo/D0_2009_S8349509.info
trunk/data/anainfo/D0_2010_S8566488.info
trunk/data/anainfo/D0_2010_S8570965.info
trunk/data/anainfo/DELPHI_1995_S3137023.info
trunk/data/anainfo/DELPHI_1996_S3430090.info
trunk/data/anainfo/DELPHI_2002_069_CONF_603.info
trunk/data/anainfo/DELPHI_2003_WUD_03_11.info
trunk/data/anainfo/E735_1998_S3905616.info
trunk/data/anainfo/EXAMPLETREE.info
trunk/data/anainfo/H1_1994_S2919893.info
trunk/data/anainfo/H1_1995_S3167097.info
trunk/data/anainfo/H1_2000_S4129130.info
trunk/data/anainfo/JADE_OPAL_2000_S4300807.info
trunk/data/anainfo/MC_DIJET.info
trunk/data/anainfo/MC_PHOTONJETUE.info
trunk/data/anainfo/MC_SUSY.info
trunk/data/anainfo/OPAL_1998_S3780481.info
trunk/data/anainfo/OPAL_2004_S6132243.info
trunk/data/anainfo/PDG_HADRON_MULTIPLICITIES.info
trunk/data/anainfo/PDG_HADRON_MULTIPLICITIES_RATIOS.info
trunk/data/anainfo/SFM_1984_S1178091.info
trunk/data/anainfo/STAR_2006_S6500200.info
trunk/data/anainfo/STAR_2006_S6860818.info
trunk/data/anainfo/STAR_2006_S6870392.info
trunk/data/anainfo/STAR_2008_S7993412.info
trunk/data/anainfo/STAR_2009_UE_HELEN.info
trunk/data/anainfo/UA1_1990_S2044935.info
trunk/data/anainfo/UA5_1982_S875503.info
trunk/data/anainfo/UA5_1986_S1583476.info
trunk/data/anainfo/UA5_1988_S1867512.info
trunk/data/anainfo/UA5_1989_S1926373.info
trunk/data/anainfo/ZEUS_2001_S4815815.info
trunk/include/Rivet/Analysis.hh
trunk/include/Rivet/AnalysisInfo.hh
trunk/include/Rivet/ParticleName.hh
trunk/include/Rivet/ProjectionHandler.hh
trunk/src/Core/Analysis.cc
trunk/src/Core/AnalysisInfo.cc
trunk/src/Core/ProjectionHandler.cc
Modified: trunk/bin/rivet-mkanalysis
==============================================================================
--- trunk/bin/rivet-mkanalysis Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/bin/rivet-mkanalysis Mon Apr 5 13:08:36 2010 (r2381)
@@ -190,27 +190,35 @@
src = """\
Name: %(ANANAME)s
Year: %(ANAYEAR)s
-Summary: [Insert short %(ANANAME)s description]
+Summary: <Insert short %(ANANAME)s description>
Experiment: %(ANAEXPT)s
-Collider: [Insert %(ANANAME)s collider]
+Collider: <Insert %(ANANAME)s collider>
SpiresID: %(ANASPIRESID)s
Status: UNVALIDATED
Authors:
- Your Name <your at email.address>
References:
- - [Example: Phys.Lett.B639:151-158,2006, Erratum-ibid.B658:285-289,2008]
- - [Example: doi:10.1016/j.physletb.2006.04.048]
- - [Example: arXiv:hep-ex/0511054 (plus erratum)]
+ - <Example: Phys.Lett.B639:151-158,2006, Erratum-ibid.B658:285-289,2008>
+ - <Example: doi:10.1016/j.physletb.2006.04.048>
+ - <Example: arXiv:hep-ex/0511054 (plus erratum)>
RunInfo:
- [Insert event types (not gen-specific), energy, any kinematic
+ <Insert event types (not gen-specific), energy, any kinematic
efficiency cut(s) that may be needed, essentially any details needed to set
- up a generator to reproduce the data.]
-NumEvents: [Insert typical number of events needed for good statistics.]
-PtCuts: [Insert list of kinematic pT cuts in GeV, e.g. [0, 20]]
+ up a generator to reproduce the data.>
+NumEvents: <Insert typical number of events needed for good statistics.>
+Beams: <Insert beam pair(s), e.g. [p-, p+] or [[p-, e-], [p-, e+]]>
+Energies: <Insert list of run energies or beam energy pairs in GeV,
+ e.g. [1960] or [8.0, 3.5] or [[630], [1800]]. Order to match "Beams">
+PtCuts: <Insert list of kinematic pT cuts in GeV, e.g. [0, 20]>
Description:
- [Insert a fairly long description, including what is measured
+ <Insert a fairly long description, including what is measured
and if possible what it's useful for in terms of MC validation
- and tuning. Use \LaTeX for maths like $\pT > \unit{50}{\GeV}$.]
+ and tuning. Use \LaTeX for maths like $\pT > \unit{50}{\GeV}$.
+ Use single quotes around the block if required (see YAML manual)>
+ToDo:
+ - <Example: Use correct jet algorithm>
+ - <Example: Add simplified trigger definition>
+
""" % KEYWORDS
f.write(src)
f.close()
Modified: trunk/data/anainfo/ALEPH_1991_S2435284.info
==============================================================================
--- trunk/data/anainfo/ALEPH_1991_S2435284.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/ALEPH_1991_S2435284.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -12,6 +12,8 @@
RunInfo:
Hadronic Z decay events generated on the Z pole (sqrt(s) = 91.2 GeV)
NumEvents: 1000000
+Beams: [e+, e-]
+Energies: [91.2]
PtCuts: [0]
Description:
The charged particle multiplicity distribution of hadronic Z decays,
Modified: trunk/data/anainfo/ALEPH_1996_S3196992.info
==============================================================================
--- trunk/data/anainfo/ALEPH_1996_S3196992.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/ALEPH_1996_S3196992.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -13,6 +13,8 @@
RunInfo:
$e^+e^-\to$ jets with $\pi$ and $\eta$ decays turned off.
NumEvents: 1000000
+Beams: [e+, e-]
+Energies: [91.2]
PtCuts: [0]
Description:
Earlier measurements at LEP of isolated hard photons in hadronic Z decays,
Modified: trunk/data/anainfo/ALEPH_1996_S3486095.info
==============================================================================
--- trunk/data/anainfo/ALEPH_1996_S3486095.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/ALEPH_1996_S3486095.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -12,6 +12,8 @@
RunInfo:
Hadronic Z decay events generated on the Z pole (sqrt(s) = 91.2 GeV)
NumEvents: 1000000
+Beams: [e+, e-]
+Energies: [91.2]
PtCuts: [0]
Description:
Summary paper of QCD results as measured by ALEPH at LEP 1. The
Modified: trunk/data/anainfo/ALEPH_2004_S5765862.info
==============================================================================
--- trunk/data/anainfo/ALEPH_2004_S5765862.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/ALEPH_2004_S5765862.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -14,6 +14,7 @@
RunInfo:
$e^+ e^- \to$ jet jet (+ jets)
NumEvents: 1000000
+Beams: [e+, e-]
Energies: [91, 133, 161, 172, 183, 189, 200, 206]
PtCuts: [0]
Description:
Modified: trunk/data/anainfo/ATLAS_2010_S8591806.info
==============================================================================
--- trunk/data/anainfo/ATLAS_2010_S8591806.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/ATLAS_2010_S8591806.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -12,6 +12,8 @@
RunInfo:
pp QCD interactions at 900 GeV including diffractive events.
NumEvents: 10000000
+Beams: [p-, p-]
+Energies: [900]
PtCuts: [0]
Description:
The first measurements with the ATLAS detector at the LHC.
Modified: trunk/data/anainfo/BELLE_2006_S6265367.info
==============================================================================
--- trunk/data/anainfo/BELLE_2006_S6265367.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/BELLE_2006_S6265367.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -10,6 +10,8 @@
RunInfo:
$e^+ e^-$ analysis on the $\Upsilon(4S)$ resonance, with CoM boost -- 8.0~GeV~($e^−$) and 3.5~GeV~($e^+$)
NumEvents: 1000000
+Beams: [e+, e-]
+Energies: [[3.5, 8.0]]
PtCuts: [0]
Description:
Analysis of charm quark fragmentation at 10.6 GeV, based on a data
Modified: trunk/data/anainfo/CDF_1988_S1865951.info
==============================================================================
--- trunk/data/anainfo/CDF_1988_S1865951.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_1988_S1865951.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -15,4 +15,6 @@
- Phys.Rev.Lett.61:1819,1988
- doi:10.1103/PhysRevLett.61.1819
RunInfo: QCD min bias events at sqrt(s) = 630 GeV and 1800 GeV, $|\eta| < 1.0$.
-Energies: [630,1800]
+Beams: [p-, p+]
+Energies: [630, 1800]
+PtCuts: [0]
Modified: trunk/data/anainfo/CDF_1990_S2089246.info
==============================================================================
--- trunk/data/anainfo/CDF_1990_S2089246.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_1990_S2089246.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -14,8 +14,9 @@
QCD min bias events at sqrt(s) = 630 and 1800 GeV.
Particles with $c \tau > 10$mm should be set stable.
NumEvents: 1000000
-PtCuts: [0]
+Beams: [p-, p+]
Energies: [630, 1800]
+PtCuts: [0]
Description:
Pseudorapidity distributions based on the CDF 630 and 1800 GeV runs
from 1987. All data is detector corrected. The data confirms the UA5
Modified: trunk/data/anainfo/CDF_1991_S2313472.info
==============================================================================
--- trunk/data/anainfo/CDF_1991_S2313472.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_1991_S2313472.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -12,6 +12,8 @@
RunInfo:
QCD events with W+- production and electronic decays
NumEvents: The measurement had 2500 events. Maybe 100k MC events are enough.
+Beams: [p-, p+]
+Energies: [1800]
PtCuts:
Description:
This is a CDF analysis from run 1, where the distribution of the transverse
Modified: trunk/data/anainfo/CDF_1994_S2952106.info
==============================================================================
--- trunk/data/anainfo/CDF_1994_S2952106.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_1994_S2952106.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -13,6 +13,8 @@
RunInfo:
QCD events at sqrt(s) = 1800 GeV. Leading jet pTmin = 100 GeV.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1800]
PtCuts: [80]
Description:
CDF Run I color coherence analysis. Events with $\ge 3$ jets are
Modified: trunk/data/anainfo/CDF_1996_S3108457.info
==============================================================================
--- trunk/data/anainfo/CDF_1996_S3108457.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_1996_S3108457.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -13,7 +13,11 @@
RunInfo:
Pure QCD events without underlying event.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1800]
PtCuts: [20]
Description:
Properties of two-, three-, four-, five-, and six-jet events...
Multijet-mass, leading jet angle, jet pT.
+ToDo:
+ - This is at 1800 GeV only, or also 630 GeV?
Modified: trunk/data/anainfo/CDF_1996_S3349578.info
==============================================================================
--- trunk/data/anainfo/CDF_1996_S3349578.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_1996_S3349578.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -14,7 +14,9 @@
RunInfo:
Pure QCD events without underlying event.
NumEvents: 10000000
+Beams: [p-, p+]
+Energies: [1800]
PtCuts: [20]
Description:
- Multijet distributions corresponding to (4N-4) variables that span the N-body
- parameter space in inclusive N=3, 4, 5 jet events.
+ Multijet distributions corresponding to ($4N-4$) variables that span
+ the $N$-body parameter space in inclusive $N = 3$-, 4-, and 5-jet events.
Modified: trunk/data/anainfo/CDF_1996_S3418421.info
==============================================================================
--- trunk/data/anainfo/CDF_1996_S3418421.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_1996_S3418421.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -14,6 +14,8 @@
RunInfo:
QCD dijet events at Tevatron $\sqrt{s}=1.8$ TeV without MPI.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1800]
PtCuts: [0]
Description:
Measurement of jet angular distributions in events with two jets in the final
Modified: trunk/data/anainfo/CDF_1997_S3541940.info
==============================================================================
--- trunk/data/anainfo/CDF_1997_S3541940.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_1997_S3541940.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -14,6 +14,8 @@
RunInfo:
Pure QCD events without underlying event.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1800]
PtCuts: [0]
Description:
Multijet distributions corresponding to 20 variables that span the 6-body
Modified: trunk/data/anainfo/CDF_1998_S3618439.info
==============================================================================
--- trunk/data/anainfo/CDF_1998_S3618439.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_1998_S3618439.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -13,6 +13,8 @@
RunInfo:
QCD events at Tevatron with $\sqrt{s}=1.8$ TeV without MPI.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1800]
PtCuts: [0]
Description:
Measurement of the differential cross section
Modified: trunk/data/anainfo/CDF_2000_S4155203.info
==============================================================================
--- trunk/data/anainfo/CDF_2000_S4155203.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2000_S4155203.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -15,6 +15,8 @@
$p\bar{p}$ collisions at 1800 GeV.
$Z/\gamma^*$ Drell-Yan events with $e^+e^-$ decay mode only.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1800]
PtCuts: [0]
Description:
Measurement of transverse momentum and total cross section of $e^+e^-$
Modified: trunk/data/anainfo/CDF_2000_S4266730.info
==============================================================================
--- trunk/data/anainfo/CDF_2000_S4266730.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2000_S4266730.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -14,6 +14,8 @@
RunInfo:
Dijet events at Tevatron with $\sqrt{s}=1.8$ TeV
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1800]
PtCuts: [0]
Description:
Measurement of the cross section for production of two or more jets as a
Modified: trunk/data/anainfo/CDF_2001_S4517016.info
==============================================================================
--- trunk/data/anainfo/CDF_2001_S4517016.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2001_S4517016.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -14,6 +14,8 @@
RunInfo:
Dijet events at Tevatron with $\sqrt{s}=1.8$ TeV
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1800]
PtCuts: [0]
Description:
A measurement of the two-jet differential cross section,
Modified: trunk/data/anainfo/CDF_2001_S4563131.info
==============================================================================
--- trunk/data/anainfo/CDF_2001_S4563131.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2001_S4563131.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -14,6 +14,8 @@
RunInfo:
Dijet events at Tevatron with $\sqrt{s}=1.8$ TeV
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1800]
PtCuts: [0]
Description:
Measurement of the inclusive jet cross section for jet transverse energies
Modified: trunk/data/anainfo/CDF_2001_S4751469.info
==============================================================================
--- trunk/data/anainfo/CDF_2001_S4751469.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2001_S4751469.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -15,6 +15,8 @@
0--49 GeV, and histos can usually can be filled with a single generator
run without kinematic sub-samples.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1800]
PtCuts: [0]
Description:
The original CDF underlying event analysis, based on decomposing each
Modified: trunk/data/anainfo/CDF_2002_S4796047.info
==============================================================================
--- trunk/data/anainfo/CDF_2002_S4796047.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2002_S4796047.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -13,8 +13,9 @@
RunInfo:
QCD events at sqrt(s) = 630 and 1800 GeV.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [630, 1800]
PtCuts: [0]
-Energies: [630,1800]
Description:
A study of $p\bar{p}$ collisions at sqrt(s) = 1800 and 630 GeV collected
using a minimum bias trigger in which the data set is divided into two
Modified: trunk/data/anainfo/CDF_2004_S5839831.info
==============================================================================
--- trunk/data/anainfo/CDF_2004_S5839831.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2004_S5839831.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -16,6 +16,7 @@
e.g. 0 (min bias), 30, 90, 150 GeV at 1800 GeV, and 0 (min bias), 20, 90,
150 GeV at 630 GeV.
NumEvents: 1000000
+Beams: [p-, p+]
Energies: [630, 1800]
PtCuts: [0, 30, 90, 150] # for 1800, [0, 20, 90, 150] for 630
Description:
Modified: trunk/data/anainfo/CDF_2005_S6080774.info
==============================================================================
--- trunk/data/anainfo/CDF_2005_S6080774.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2005_S6080774.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -16,6 +16,8 @@
with pT larger then 13 GeV. To allow for shifts in the shower, the ME
cut on the transverse photon momentum shouldn't be too hard, e.g. 5 GeV.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [5]
Description:
Measurement of the cross section of prompt diphoton production in $p\bar{p}$
Modified: trunk/data/anainfo/CDF_2005_S6217184.info
==============================================================================
--- trunk/data/anainfo/CDF_2005_S6217184.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2005_S6217184.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -17,6 +17,8 @@
Jet pTmin in plots is 37 GeV/c --- choose generator min pT somewhere
well below this.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [30]
Description:
Measurement of jet shapes in inclusive jet production in p pbar
Modified: trunk/data/anainfo/CDF_2006_S6450792.info
==============================================================================
--- trunk/data/anainfo/CDF_2006_S6450792.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2006_S6450792.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -14,6 +14,8 @@
RunInfo:
$p\bar{p}$ -> jets at 1960 GeV
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [61]
Description:
Measurement of the inclusive jet cross section in ppbar interactions at
Modified: trunk/data/anainfo/CDF_2006_S6653332.info
==============================================================================
--- trunk/data/anainfo/CDF_2006_S6653332.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2006_S6653332.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -15,7 +15,9 @@
Z + jets events at sqrt(s) = 1960 GeV.
Jets min pT cut = 20~GeV, leptons min pT cut = 10~GeV
NumEvents: 1000000
+Beams: [p-, p+]
PtCuts: [10]
+Energies: [1960]
Description:
Measurement of the b jet cross section in events with Z boson in p
pbar collisions at center-of-mass energy sqrt(s) = 1.96 TeV. The data
Modified: trunk/data/anainfo/CDF_2007_S7057202.info
==============================================================================
--- trunk/data/anainfo/CDF_2007_S7057202.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2007_S7057202.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -17,6 +17,8 @@
p-pbar collisions at 1960~GeV. Jet pT bins from 54~GeV to 700~GeV.
Jet rapidity $< |2.1|$.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0]
Description:
CDF Run II measurement of inclusive jet cross sections at a p-pbar
Modified: trunk/data/anainfo/CDF_2008_LEADINGJETS.info
==============================================================================
--- trunk/data/anainfo/CDF_2008_LEADINGJETS.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2008_LEADINGJETS.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -15,6 +15,8 @@
The corresponding merging points are at $p_T = $ 0, 30, 50, 80,
130, 180 GeV
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0, 10, 20, 50, 100, 150]
Description:
Rick Field's measurement of the underlying event in leading jet
Modified: trunk/data/anainfo/CDF_2008_NOTE_9351.info
==============================================================================
--- trunk/data/anainfo/CDF_2008_NOTE_9351.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2008_NOTE_9351.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -15,6 +15,8 @@
* A mass cut $m_{ll} > 70~\\text{GeV}$ can be applied on generator level.
* Particles with $c \\tau > 10~\\text{mm}$ should be set stable."
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0]
Description:
Deepak Kar and Rick Field's measurement of the underlying event in
Modified: trunk/data/anainfo/CDF_2008_S7540469.info
==============================================================================
--- trunk/data/anainfo/CDF_2008_S7540469.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2008_S7540469.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -14,6 +14,8 @@
$p \bar{p} \to e^+ e^-$ + jets at 1960 GeV. Needs mass cut on lepton pair to
avoid photon singularity, looser than $66 < m_{ee} < 116$
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0]
Description:
Cross sections as a function of jet transverse momentum in 1 and 2 jet
Modified: trunk/data/anainfo/CDF_2008_S7541902.info
==============================================================================
--- trunk/data/anainfo/CDF_2008_S7541902.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2008_S7541902.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -1,6 +1,6 @@
Name: CDF_2008_S7541902
Year: 2008
-Summary: Jet pT distributions for 4 jet multiplicity bins as well as the jet multiplicity distribution in W + jets events.
+Summary: Jet pT and multiplicity distributions in W + jets events
Experiment: CDF
Collider: Tevatron Run 2
SpiresID: 7541902
@@ -12,10 +12,12 @@
- arXiv:0711.4044 [hep-ex]
- Phys.Rev.D77:011108,2008
RunInfo:
- Requires the process $p\bar{p} \rightarrow {W} \rightarrow{e}\nu$,
- additional hard jets will also have to be included to get a good
+ Requires the process $p\bar{p} \rightarrow {W} \rightarrow {e}\nu$.
+ Additional hard jets will also have to be included to get a good
description. The LO process in Herwig is set with IPROC=1451.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0]
Description:
Measurement of the cross section for W boson production in association
Modified: trunk/data/anainfo/CDF_2008_S7782535.info
==============================================================================
--- trunk/data/anainfo/CDF_2008_S7782535.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2008_S7782535.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -14,6 +14,8 @@
RunInfo:
Requires $2\rightarrow{2}$ QCD scattering processes. The minimum jet Et is 52 GeV, so a cut on kinematic pTmin may be required for good statistics.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0]
Description:
A measurement of the shapes of b-jets using 300 pb$^{-1}$ of data
Modified: trunk/data/anainfo/CDF_2008_S7828950.info
==============================================================================
--- trunk/data/anainfo/CDF_2008_S7828950.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2008_S7828950.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -16,6 +16,8 @@
$E_\perp$ is 62 GeV, so a cut on kinematic pTmin may be required for
good statistics.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [62]
Description:
Measurement of the inclusive jet cross section in $p\bar{p}$
Modified: trunk/data/anainfo/CDF_2008_S8093652.info
==============================================================================
--- trunk/data/anainfo/CDF_2008_S8093652.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2008_S8093652.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -12,6 +12,8 @@
RunInfo:
$p \bar{p} \to$ jets at 1960 GeV
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0]
Description:
Dijet mass spectrum from 0.2 TeV to 1.4 TeV in $p \bar{p}$ collisions at
Modified: trunk/data/anainfo/CDF_2008_S8095620.info
==============================================================================
--- trunk/data/anainfo/CDF_2008_S8095620.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2008_S8095620.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -12,6 +12,8 @@
RunInfo:
Requires the process $p\bar{p} \rightarrow {Z} \rightarrow{\ell}\ell$, where $\ell$ is $e$ or $\mu$. Additional hard jets will also have to be included to get a good description.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0]
Description:
Measurement of the b-jet production cross section for events
Modified: trunk/data/anainfo/CDF_2009_S8233977.info
==============================================================================
--- trunk/data/anainfo/CDF_2009_S8233977.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2009_S8233977.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -16,6 +16,8 @@
$p\bar{p}$ QCD interactions at 1960~GeV. Particles with $c \\tau > {}$10 mm
should be set stable.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0]
Description:
Niccolo Moggi's min bias analysis. Minimum bias events are used to
Modified: trunk/data/anainfo/CDF_2009_S8383952.info
==============================================================================
--- trunk/data/anainfo/CDF_2009_S8383952.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2009_S8383952.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -13,6 +13,8 @@
$p \bar{p} \to e^+ e^-$ + jets at 1960 GeV. Needs mass cut on lepton pair to
avoid photon singularity, looser than $66 < m_{ee} < 116$ GeV
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0]
Description:
CDF measurement of the total cross section and rapidity distribution,
Modified: trunk/data/anainfo/CDF_2009_S8436959.info
==============================================================================
--- trunk/data/anainfo/CDF_2009_S8436959.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/CDF_2009_S8436959.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -13,6 +13,8 @@
$\gamma$ + jet processes in ppbar collisions at $\sqrt{s} = 1960$~GeV.
Minimum pT cut on the photon in the analysis is 30~GeV.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [30]
Description:
A measurement of the cross section for the inclusive production of isolated
Modified: trunk/data/anainfo/D0_1996_S3214044.info
==============================================================================
--- trunk/data/anainfo/D0_1996_S3214044.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/D0_1996_S3214044.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -14,6 +14,8 @@
RunInfo:
$p \bar{p} \to$ jets at 1800 GeV with minimum jet pT in analysis = 20 GeV
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1800]
PtCuts: [10]
Description:
The global topologies of inclusive three- and four-jet events produced in
Modified: trunk/data/anainfo/D0_1996_S3324664.info
==============================================================================
--- trunk/data/anainfo/D0_1996_S3324664.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/D0_1996_S3324664.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -14,10 +14,13 @@
RunInfo:
$p \bar{p} \to jets$ at 1800 GeV
NumEvents: 10000000
+Beams: [p-, p+]
+Energies: [1800]
PtCuts: [10]
Description:
First measurement of the azimuthal decorrelation between jets with
pseudorapidity separation up to five units. The data were accumulated using
the D0 detector during Tevatron Run 1 at $\sqrt{s}=1.8$ TeV.
- So far, this analysis is using the wrong jet algorithm, namely the D0 Run II
- Improved Legacy cone.
+ToDo:
+ - So far, this analysis is using the wrong jet algorithm, namely the D0 Run
+ II Improved Legacy cone.
Modified: trunk/data/anainfo/D0_1998_S3711838.info
==============================================================================
--- trunk/data/anainfo/D0_1998_S3711838.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/D0_1998_S3711838.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -12,11 +12,15 @@
RunInfo:
QCD events with W+- production and electronic decays
NumEvents: The measurement had 7132 events. Maybe 100k MC events are enough.
-PtCuts:
+Beams: [p-, p+]
+Energies: [1800]
+PtCuts: [0]
Description:
- This is a D0 analysis from run 1, where the distribution of the transverse
+ This is a D0 analysis from Run 1, where the distribution of the transverse
momentum of W candidates that decay electronically, is measured. The electron
is required to be within $\left|\eta\right| < 1.1$ and to have a transverse
energy of $E_\perp > 25~\GeV$. The neutrino is required to produce a missing
energy of $E_{\perp, \text{ miss}}>25~\GeV$. The analysed data sample is three
times as large as the similar measurement performed at CDF in 1991.
+ToDo:
+ - This is at 1800 GeV, right?
Modified: trunk/data/anainfo/D0_2001_S4674421.info
==============================================================================
--- trunk/data/anainfo/D0_2001_S4674421.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/D0_2001_S4674421.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -15,6 +15,8 @@
W/Z events with decays to first generation leptons, in ppbar
collisions at sqrt(s) = 1800~GeV
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1800]
PtCuts: [0]
Description:
Measurement of differential W/Z boson cross section and ratio in $p
Modified: trunk/data/anainfo/D0_2004_S5992206.info
==============================================================================
--- trunk/data/anainfo/D0_2004_S5992206.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/D0_2004_S5992206.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -13,10 +13,12 @@
RunInfo:
QCD events in ppbar interactions at sqrt(s) = 1960 GeV.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0]
Description:
Correlations in the azimuthal angle between the two largest pT jets
- have been measured using the D0 detector in ppbar collisions at 1960
- GeV. The analysis is based on an inclusive dijet event sample in the
- central rapidity region. The correlations are determined for four
+ have been measured using the D0 detector in ppbar collisions at
+ 1960~GeV. The analysis is based on an inclusive dijet event sample in
+ the central rapidity region. The correlations are determined for four
different pT intervals.
Modified: trunk/data/anainfo/D0_2006_S6438750.info
==============================================================================
--- trunk/data/anainfo/D0_2006_S6438750.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/D0_2006_S6438750.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -17,6 +17,8 @@
hard processes, which for Pythia 6 means MSEL=10 for with MSUB indices
14, 18, 29, 114, 115 enabled.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [15]
Description:
Measurement of differential cross section for inclusive production of
Modified: trunk/data/anainfo/D0_2007_S7075677.info
==============================================================================
--- trunk/data/anainfo/D0_2007_S7075677.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/D0_2007_S7075677.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -16,6 +16,8 @@
Drell-Yan $p \bar{p} \to Z/\gamma^*$ + jets events at $\sqrt{s}$ = 1960 GeV.
Needs mass cut on lepton pair to avoid photon singularity, looser than $71 < m_{ee} < 111$ GeV
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0]
Description:
Cross sections as a function of boson rapidity in $p \bar{p}$
Modified: trunk/data/anainfo/D0_2008_S6879055.info
==============================================================================
--- trunk/data/anainfo/D0_2008_S6879055.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/D0_2008_S6879055.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -15,6 +15,8 @@
Needs mass cut on lepton pair to avoid photon singularity,
looser than $75 < m_{ee} < 105$ GeV.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0]
Description:
Cross sections as a function of pT of the three leading jets and $n$-jet
Modified: trunk/data/anainfo/D0_2008_S7554427.info
==============================================================================
--- trunk/data/anainfo/D0_2008_S7554427.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/D0_2008_S7554427.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -15,6 +15,8 @@
* Needs mass cut on lepton pair to avoid photon singularity,
looser than $40 < m_{ee} < 200$ GeV."
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0]
Description:
Cross sections as a function of pT of the vector boson inclusive and
Modified: trunk/data/anainfo/D0_2008_S7662670.info
==============================================================================
--- trunk/data/anainfo/D0_2008_S7662670.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/D0_2008_S7662670.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -16,6 +16,8 @@
QCD events at sqrt(s) = 1960 GeV. A pTmin cut is probably necessary since
the lowest jet pT bin is at 50 GeV
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [40]
Description:
Measurement of the inclusive jet cross section in $p \bar{p}$ collisions at
Modified: trunk/data/anainfo/D0_2008_S7719523.info
==============================================================================
--- trunk/data/anainfo/D0_2008_S7719523.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/D0_2008_S7719523.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -17,6 +17,8 @@
and MSUB indices 14, 29 & 115 enabled). The lowest bin edge is at 30 GeV, so a kinematic
pTmin cut is probably required to fill the histograms."
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [20]
Description:
The process $p \bar{p}$ -> photon + jet + X as studied by the D0 detector
Modified: trunk/data/anainfo/D0_2008_S7837160.info
==============================================================================
--- trunk/data/anainfo/D0_2008_S7837160.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/D0_2008_S7837160.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -17,6 +17,8 @@
* for Pythia 6: MSEL = 12, MDME(206,1) = 1
* Energy: 1.96 TeV"
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0]
Description:
Measurement of the electron charge asymmetry in $p \bar p \to W + X \to
Modified: trunk/data/anainfo/D0_2008_S7863608.info
==============================================================================
--- trunk/data/anainfo/D0_2008_S7863608.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/D0_2008_S7863608.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -16,6 +16,8 @@
Needs mass cut on lepton pair to avoid photon singularity,
looser than $65 < m_{ee} < 115$ GeV.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0]
Description:
Cross sections as a function of pT and rapidity of the boson and pT
Modified: trunk/data/anainfo/D0_2009_S8202443.info
==============================================================================
--- trunk/data/anainfo/D0_2009_S8202443.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/D0_2009_S8202443.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -14,6 +14,8 @@
Needs mass cut on lepton pair to avoid photon singularity,
looser than $65 < m_{ee} < 115$ GeV.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0]
Description:
Cross sections as a function of pT of the three leading jets in
Modified: trunk/data/anainfo/D0_2009_S8320160.info
==============================================================================
--- trunk/data/anainfo/D0_2009_S8320160.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/D0_2009_S8320160.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -12,6 +12,8 @@
RunInfo:
$p \bar{p} \to$ jets at 1960 GeV
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0]
Description:
Dijet angular distributions in different bins of dijet mass from 0.25
Modified: trunk/data/anainfo/D0_2009_S8349509.info
==============================================================================
--- trunk/data/anainfo/D0_2009_S8349509.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/D0_2009_S8349509.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -14,6 +14,8 @@
Needs mass cut on lepton pair to avoid photon singularity,
looser than $65 < m_{ee} < 115$ GeV.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0]
Description:
First measurements at a hadron collider of differential cross
Modified: trunk/data/anainfo/D0_2010_S8566488.info
==============================================================================
--- trunk/data/anainfo/D0_2010_S8566488.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/D0_2010_S8566488.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -12,6 +12,8 @@
RunInfo:
$p \bar{p} \to$ jets at 1960 GeV. Analysis needs two hard jets above 40 GeV.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [30]
Description:
The inclusive dijet production double differential cross section as a
Modified: trunk/data/anainfo/D0_2010_S8570965.info
==============================================================================
--- trunk/data/anainfo/D0_2010_S8570965.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/D0_2010_S8570965.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -15,6 +15,8 @@
Non-prompt photons from hadron decays like $\pi$ and $\eta$ have been
corrected for.
NumEvents: 10000000
+Beams: [p-, p+]
+Energies: [1960]
PtCuts: [0]
Description:
Direct photon pair production cross sections are measured using 4.2 fb$^{-1}$
Modified: trunk/data/anainfo/DELPHI_1995_S3137023.info
==============================================================================
--- trunk/data/anainfo/DELPHI_1995_S3137023.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/DELPHI_1995_S3137023.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -1,6 +1,6 @@
Name: DELPHI_1995_S3137023
Year: 1995
-Summary: Strange baryon production in Z hadronic decays at Delphi
+Summary: Strange baryon production in $Z$ hadronic decays at Delphi
Experiment: DELPHI
Collider: LEP 1
SpiresID: 3137023
@@ -12,6 +12,8 @@
RunInfo:
Hadronic Z decay events generated on the Z pole (sqrt(s) = 91.2 GeV)
NumEvents: 1000000
+Beams: [e+, e-]
+Energies: [91.2]
PtCuts: [0]
Description:
Measurement of the $\Xi^-$ and $\Sigma^+(1385)/\Sigma^-(1385)$ scaled
Modified: trunk/data/anainfo/DELPHI_1996_S3430090.info
==============================================================================
--- trunk/data/anainfo/DELPHI_1996_S3430090.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/DELPHI_1996_S3430090.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -14,6 +14,8 @@
RunInfo:
sqrt(s) = 91.2 GeV, $e^+ e^- -> Z^0$ production with hadronic decays only
NumEvents: 1000000
+Beams: [e+, e-]
+Energies: [91.2]
PtCuts: [0]
Description:
Event shape and charged particle inclusive distributions measured
Modified: trunk/data/anainfo/DELPHI_2002_069_CONF_603.info
==============================================================================
--- trunk/data/anainfo/DELPHI_2002_069_CONF_603.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/DELPHI_2002_069_CONF_603.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -11,10 +11,12 @@
RunInfo:
Hadronic Z decay events generated on the Z pole (sqrt(s) = 91.2 GeV)
NumEvents: 1000000
+Beams: [e+, e-]
+Energies: [91.2]
PtCuts: [0]
Description:
- Measurement of the b-quark fragmentation function by DELPHI using 1994
+ Measurement of the $b$-quark fragmentation function by DELPHI using 1994
LEP 1 data. The fragmentation function for both weakly decaying and
- primary b-quarks has been determined in a model independent way.
+ primary $b$-quarks has been determined in a model independent way.
Nevertheless the authors trust $f(x_B^\text{weak})$ more than
$f(x_B^\text{prim})$.
Modified: trunk/data/anainfo/DELPHI_2003_WUD_03_11.info
==============================================================================
--- trunk/data/anainfo/DELPHI_2003_WUD_03_11.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/DELPHI_2003_WUD_03_11.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -11,6 +11,8 @@
RunInfo:
Hadronic Z decay events generated on the Z pole (sqrt(s) = 91.2 GeV)
NumEvents: 1000000
+Beams: [e+, e-]
+Energies: [91.2]
PtCuts: [0]
Description:
The 4-jet angular distributions (Bengtsson-Zerwas, K\"orner-Schierholz-
Modified: trunk/data/anainfo/E735_1998_S3905616.info
==============================================================================
--- trunk/data/anainfo/E735_1998_S3905616.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/E735_1998_S3905616.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -15,7 +15,8 @@
$\left|\eta\right| ~< ~3.25$ and was extrapolated to full phase space. However, the method of
extrapolation remains unclear.
NumEvents: 1000000
-PtCuts: [0]
+Beams: [p-, p+]
Energies: [1800]
+PtCuts: [0]
Description:
A measurement of the charged multiplicity distribution at sqrt(s) = 1.8 TeV.
Modified: trunk/data/anainfo/EXAMPLETREE.info
==============================================================================
--- trunk/data/anainfo/EXAMPLETREE.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/EXAMPLETREE.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -6,7 +6,6 @@
RunInfo:
All event types will be accepted.
NumEvents: 10000
-PtCuts: [0]
Description:
This analysis is a demonstration of how Rivet can be used to produce
ROOT data trees rather than Rivet's own histograms. We don't recommend
@@ -18,3 +17,4 @@
information, which are unphysical and also may be generator dependent.
You should not use this method in your own analyses if you expect the
results to be meaningfully comparable to data!
+PtCuts: [0]
Modified: trunk/data/anainfo/H1_1994_S2919893.info
==============================================================================
--- trunk/data/anainfo/H1_1994_S2919893.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/H1_1994_S2919893.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -14,6 +14,8 @@
$e^- p$ / $e^+ p$ deep inelastic scattering,
820~GeV protons colliding with 26.7~GeV electrons
NumEvents: 1000000
+Beams: [[p-, e-], [p-, e+]]
+Energies: [[820, 26.7]]
PtCuts: [0]
Description:
Global properties of the hadronic final state in deep inelastic
Modified: trunk/data/anainfo/H1_1995_S3167097.info
==============================================================================
--- trunk/data/anainfo/H1_1995_S3167097.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/H1_1995_S3167097.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -1,6 +1,6 @@
Name: H1_1995_S3167097
Year: 1995
-Summary: Transverse energy and forward jet production in the low x regime at H1
+Summary: Transverse energy and forward jet production in the low-$x$ regime at H1
Experiment: H1
Collider: HERA Run I
SpiresID: 3167097
@@ -15,11 +15,13 @@
DIS events with an outgoing electron energy $> 12~\text{GeV}$.
$5~\text{GeV}^2 < Q^2 < 100~\text{GeV}^2$, $10^{-4} < x < 10^{-2}$.
NumEvents: 1000000
+Beams: [p-, e-]
+Energies: [[820, 26.7]]
PtCuts: [0]
Description:
- DIS events at low x may be sensitive to new QCD dynamics such as BFKL
+ DIS events at low $x$ may be sensitive to new QCD dynamics such as BFKL
or CCFM radiation. In particular, BFKL is expected to produce more
radiation at high transverse energy in the rapidity span between the
proton remnant and the struck quark jet. Performing a transverse
- energy sum in bins of x and $\eta$ may distinguish between DGLAP and
+ energy sum in bins of $x$ and $\eta$ may distinguish between DGLAP and
BFKL evolution.
Modified: trunk/data/anainfo/H1_2000_S4129130.info
==============================================================================
--- trunk/data/anainfo/H1_2000_S4129130.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/H1_2000_S4129130.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -12,9 +12,11 @@
- doi:10.1007/s100520000287
- arXiv:hep-ex/9907027v1
RunInfo:
- $e^+ p$ deep inelastic scattering with
- $p$ at 820 GeV, $e^+$ at 27.5 GeV -> sqrt(s) = 300 GeV
+ $e^+ p$ deep inelastic scattering with $p$ at 820 GeV,
+ $e^+$ at 27.5 GeV -> sqrt(s) = 300 GeV
NumEvents: 1000000
+Beams: [p-, e+]
+Energies: [[820, 27.5]]
PtCuts: [0]
Description:
Measurements of transverse energy flow for neutral current deep-
Modified: trunk/data/anainfo/JADE_OPAL_2000_S4300807.info
==============================================================================
--- trunk/data/anainfo/JADE_OPAL_2000_S4300807.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/JADE_OPAL_2000_S4300807.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -13,6 +13,7 @@
RunInfo:
$e^+ e^- \to$ jet jet (+ jets)
NumEvents: 1000000
+Beams: [e+, e-]
Energies: [35, 44, 91, 133, 161, 172, 183, 189]
PtCuts: [0]
Description:
Modified: trunk/data/anainfo/MC_DIJET.info
==============================================================================
--- trunk/data/anainfo/MC_DIJET.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/MC_DIJET.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -9,3 +9,4 @@
Status: UNVALIDATED
Author:
- Christophe Vaillant <c.l.j.j.vaillant at durham.ac.uk>
+PtCuts: [0]
Modified: trunk/data/anainfo/MC_PHOTONJETUE.info
==============================================================================
--- trunk/data/anainfo/MC_PHOTONJETUE.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/MC_PHOTONJETUE.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -11,3 +11,5 @@
Status: UNVALIDATED
Authors:
- Andy Buckley <andy.buckley at cern.ch>
+Beams: [[p-, p-], [p-, p+]]
+PtCuts: [0]
Modified: trunk/data/anainfo/MC_SUSY.info
==============================================================================
--- trunk/data/anainfo/MC_SUSY.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/MC_SUSY.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -10,3 +10,4 @@
Status: VALIDATED
Authors:
- Andy Buckley <andy.buckley at cern.ch>
+PtCuts: [0]
Modified: trunk/data/anainfo/OPAL_1998_S3780481.info
==============================================================================
--- trunk/data/anainfo/OPAL_1998_S3780481.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/OPAL_1998_S3780481.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -13,6 +13,8 @@
RunInfo:
Hadronic Z decay events generated on the Z pole (sqrt(s) = 91.2 GeV)
NumEvents: 1000000
+Beams: [e+, e-]
+Energies: [91.2]
PtCuts: [0]
Description:
Measurement of scaled momentum distributions and total charged
Modified: trunk/data/anainfo/OPAL_2004_S6132243.info
==============================================================================
--- trunk/data/anainfo/OPAL_2004_S6132243.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/OPAL_2004_S6132243.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -15,7 +15,8 @@
Runs with sqrt(s) above the Z mass need to have ISR suppressed, since
the data has been corrected to remove radiative return to the Z.
NumEvents: 200000
-Energies: [91,133,177,197]
+Beams: [e+, e-]
+Energies: [91, 133, 177, 197]
PtCuts: [0]
Description:
Measurement of $e^+ e^-$ event shape variable distributions and their 1st
Modified: trunk/data/anainfo/PDG_HADRON_MULTIPLICITIES.info
==============================================================================
--- trunk/data/anainfo/PDG_HADRON_MULTIPLICITIES.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/PDG_HADRON_MULTIPLICITIES.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -10,8 +10,10 @@
References:
- Phys. Lett. B, 667, 1 (2008)
RunInfo:
- Hadronic events in $e+e-$ collisions
+ Hadronic events in $e^+ e^-$ collisions
NumEvents: 1000000
+Beams: [e+, e-]
+Energies: [91.2]
PtCuts: [0]
Description:
Hadron multiplicities in hadronic $e^+e^-$ events, taken from Review of
Modified: trunk/data/anainfo/PDG_HADRON_MULTIPLICITIES_RATIOS.info
==============================================================================
--- trunk/data/anainfo/PDG_HADRON_MULTIPLICITIES_RATIOS.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/PDG_HADRON_MULTIPLICITIES_RATIOS.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -12,6 +12,8 @@
RunInfo:
Hadronic events in $e^+ e^-$ collisions
NumEvents: 1000000
+Beams: [e+, e-]
+Energies: [91.2]
PtCuts: [0]
Description:
Ratios (w.r.t. $\pi^+/\pi^-$) of hadron multiplicities in hadronic $e^+ e^-$
Modified: trunk/data/anainfo/SFM_1984_S1178091.info
==============================================================================
--- trunk/data/anainfo/SFM_1984_S1178091.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/SFM_1984_S1178091.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -13,8 +13,9 @@
RunInfo:
QCD events, double-diffractive events should be turned on as well.
NumEvents: 1000000
-PtCuts: [0]
+Beams: [p-, p-]
Energies: [30.4, 44.5, 52.2, 62.2]
+PtCuts: [0]
Description:
Charged multiplicities are measured at sqrt(s) = 30.4, 44.5, 52.2
and 62.2 GeV using a minimum-bias trigger. The data is sub-divided
Modified: trunk/data/anainfo/STAR_2006_S6500200.info
==============================================================================
--- trunk/data/anainfo/STAR_2006_S6500200.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/STAR_2006_S6500200.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -14,6 +14,8 @@
RunInfo:
pp at 200 GeV
NumEvents: 2500000
+Beams: [p-, p-]
+Energies: [200]
PtCuts: [0]
Description:
pT distributions of charged pions and (anti)protons in pp collisions
Modified: trunk/data/anainfo/STAR_2006_S6860818.info
==============================================================================
--- trunk/data/anainfo/STAR_2006_S6860818.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/STAR_2006_S6860818.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -13,6 +13,8 @@
RunInfo:
pp at 200 GeV
NumEvents: 2500000
+Beams: [p-, p-]
+Energies: [200]
PtCuts: [0]
Description:
pT distributions of identified strange particles in pp collisions
Modified: trunk/data/anainfo/STAR_2006_S6870392.info
==============================================================================
--- trunk/data/anainfo/STAR_2006_S6870392.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/STAR_2006_S6870392.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -13,6 +13,8 @@
RunInfo:
pp at 200 GeV
NumEvents: 1000000
+Beams: [p-, p-]
+Energies: [200]
PtCuts: [0]
Description:
Inclusive jet cross section as a function of pT in pp collisions
Modified: trunk/data/anainfo/STAR_2008_S7993412.info
==============================================================================
--- trunk/data/anainfo/STAR_2008_S7993412.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/STAR_2008_S7993412.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -13,11 +13,13 @@
RunInfo:
d-Au at 200 GeV (use pp Monte Carlo! See description)
NumEvents: 1000000
+Beams: [p-, p-]
+Energies: [200]
PtCuts: [0]
Description:
Correlation in $\eta$ and $\phi$ between the charged hadron with the
highest pT (``trigger particle'') and the other charged hadrons in the
event (``associated particles''). The data was collected in d-Au
collisions at 200 GeV. Nevertheless, it is very proton-proton like and
- can therefore be compared to pp Monte Carlo (not for tuning, but for
+ can therefore be compared to $pp$ Monte Carlo (not for tuning, but for
qualitative studies.)
Modified: trunk/data/anainfo/STAR_2009_UE_HELEN.info
==============================================================================
--- trunk/data/anainfo/STAR_2009_UE_HELEN.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/STAR_2009_UE_HELEN.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -15,6 +15,8 @@
RunInfo:
pp at 200 GeV
NumEvents: 1000000
+Beams: [p-, p-]
+Energies: [200]
PtCuts: [2, 10]
Description:
UE analysis similar to Rick Field's leading jet analysis. SIScone with
Modified: trunk/data/anainfo/UA1_1990_S2044935.info
==============================================================================
--- trunk/data/anainfo/UA1_1990_S2044935.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/UA1_1990_S2044935.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -15,4 +15,6 @@
Particle multiplicities, transverse momenta and transverse energy
distributions at the UA1 experiment, at energies of 200, 500 and 900 GeV
(with one plot at 63 GeV for comparison).
+Beams: [p-, p+]
Energies: [63, 200, 500, 900]
+PtCuts: [0]
Modified: trunk/data/anainfo/UA5_1982_S875503.info
==============================================================================
--- trunk/data/anainfo/UA5_1982_S875503.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/UA5_1982_S875503.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -6,7 +6,9 @@
Collider: SPS
Year: 1982
RunInfo: Min bias QCD events at sqrt(s) = 53~GeV. Run with both $pp$ and $p\bar{p}$ beams.
+Beams: [p-, p+]
Energies: [53]
+PtCuts: [0]
Authors:
- Andy Buckley <andy.buckley at cern.ch>
- Christophe Vaillant <c.l.j.j.vaillant at durham.ac.uk>
Modified: trunk/data/anainfo/UA5_1986_S1583476.info
==============================================================================
--- trunk/data/anainfo/UA5_1986_S1583476.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/UA5_1986_S1583476.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -17,6 +17,8 @@
* The trigger implementation for NSD events is the same as in, e.g.,
the UA5_1989 analysis. No further cuts are needed."
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [200, 900]
PtCuts: [0]
Description:
This study comprises measurements of pseudorapidity distributions measured with the UA5
Modified: trunk/data/anainfo/UA5_1988_S1867512.info
==============================================================================
--- trunk/data/anainfo/UA5_1988_S1867512.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/UA5_1988_S1867512.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -13,8 +13,9 @@
ppbar events. Non-single diffractive events need to be switched on.
The trigger implementation is the same as in UA5_1989_S1926373.
NumEvents: 100000
-PtCuts: [0]
+Beams: [p-, p+]
Energies: [200, 546, 900]
+PtCuts: [0]
Description:
Data on two-particle pseudorapidity and multiplicity correlations
of charged particles for non single-diffractive $\bar{p}p$ collisions at
Modified: trunk/data/anainfo/UA5_1989_S1926373.info
==============================================================================
--- trunk/data/anainfo/UA5_1989_S1926373.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/UA5_1989_S1926373.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -13,10 +13,11 @@
- Z. Phys. C - Particles and Fields 43, 357-374 (1989)
- doi:10.1007/BF01506531
RunInfo:
- MinBias events at sqrt(s) = 200 and 900 GeV.
- Enable single and double diffractive events in addition
- to minimum bias and non-diffractive processes.
+ Minimum bias events at sqrt(s) = 200 and 900 GeV.
+ Enable single and double diffractive events in addition to non-diffractive processes.
NumEvents: 1000000
+Beams: [p-, p+]
+Energies: [200, 900]
PtCuts: [0]
Description:
Multiplicity distributions of charged particles produced in non-single-diffractive
Modified: trunk/data/anainfo/ZEUS_2001_S4815815.info
==============================================================================
--- trunk/data/anainfo/ZEUS_2001_S4815815.info Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/data/anainfo/ZEUS_2001_S4815815.info Mon Apr 5 13:08:36 2010 (r2381)
@@ -14,20 +14,22 @@
RunInfo:
820 GeV protons colliding with 27.5 GeV positrons;
Direct and resolved photoproduction of dijets;
- Leading jet pT $>$ 14 GeV, second jet pT $>$ 11 GeV;
- Jet pseudorapidity $-1 < \eta < 2.4$
+ Leading jet $pT > 14$ GeV, second jet $pT > 11$ GeV;
+ Jet pseudorapidity $-1 < |\eta| < 2.4$
NumEvents: 1000000
+Beams: [p-, e+]
+Energies: [[820, 27.5]]
PtCuts: [0]
Description:
- ZEUS photoproduction of jets from proton-positron collisions at beam
+ ZEUS photoproduction of jets from proton--positron collisions at beam
energies of 820~GeV on 27.5~GeV. Photoproduction can either be direct,
in which case the photon interacts directly with the parton, or
resolved, in which case the photon acts as a source of quarks and
gluons. A photon-proton centre of mass energy of between 134~GeV and
- 227~GeV is probed, with values of xP, the fractional momentum of the
+ 227~GeV is probed, with values of $x_P$, the fractional momentum of the
partons inside the proton, predominantly in the region between 0.01
and 0.1. The fractional momentum of the partons from the photon,
$x\gamma$, is in the region 0.1 to 1. Jets are reconstructed in the
- range $-1<|\eta|<2.4$ using the kT algorithm with an R parameter of
- 1.0. The minimum pT of the leading jet should be greater then 14~GeV,
- and at least one other jet must have pT$>$11~GeV.
+ range $-1 < |\eta| < 2.4$ using the $k_\perp$ algorithm with an $R$
+ parameter of 1.0. The minimum pT of the leading jet should be greater
+ than 14~GeV, and at least one other jet must have $pT > 11$~GeV.
Modified: trunk/include/Rivet/Analysis.hh
==============================================================================
--- trunk/include/Rivet/Analysis.hh Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/include/Rivet/Analysis.hh Mon Apr 5 13:08:36 2010 (r2381)
@@ -147,7 +147,7 @@
virtual std::string collider() const;
/// Return the pair of incoming beams required by this analysis.
- virtual const BeamPair requiredBeams() const;
+ virtual const std::vector<BeamPair> requiredBeams() const;
/// Sets of valid beam energy pairs, in GeV
virtual const std::vector<std::pair<double, double> >& energies() const;
@@ -161,9 +161,18 @@
/// Journal, and preprint references.
virtual std::vector<std::string> references() const;
+ /// BibTeX citation key for this article.
+ virtual std::string bibKey() const;
+
+ /// BibTeX citation entry for this article.
+ virtual std::string bibTeX() const;
+
/// Whether this analysis is trusted (in any way!)
virtual std::string status() const;
+ /// Any work to be done on this analysis.
+ virtual std::vector<std::string> todos() const;
+
//@}
Modified: trunk/include/Rivet/AnalysisInfo.hh
==============================================================================
--- trunk/include/Rivet/AnalysisInfo.hh Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/include/Rivet/AnalysisInfo.hh Mon Apr 5 13:08:36 2010 (r2381)
@@ -12,6 +12,7 @@
/// @todo Remove this when all metadata taken from YAML
friend class Analysis;
+
public:
/// Static factory method: returns null pointer if no metadata found
@@ -21,7 +22,7 @@
//@{
/// The default constructor.
- AnalysisInfo() { }
+ AnalysisInfo() { clear(); }
/// The destructor.
~AnalysisInfo() { }
@@ -75,7 +76,7 @@
const std::string& runInfo() const { return _runInfo; }
/// Beam particle types
- const std::pair<ParticleName,ParticleName>& beams() const { return _beams; }
+ const std::vector<std::pair<ParticleName,ParticleName> >& beams() const { return _beams; }
/// Sets of valid beam energy pairs
const std::vector<std::pair<double,double> >& energies() const { return _energies; }
@@ -86,9 +87,6 @@
/// Collider on which the experiment ran.
const std::string& collider() const { return _collider; }
- /// Incoming beams required by this analysis.
- // const BeamPair& beams() const { return _beams; }
-
/// @brief When the original experimental analysis was published.
/// When the refereed paper on which this is based was published,
/// according to SPIRES.
@@ -97,13 +95,26 @@
/// Journal, and preprint references.
const std::vector<std::string>& references() const { return _references; }
+ /// BibTeX citation key for this article.
+ const std::string& bibKey() const { return _bibKey;}
+
+ /// BibTeX citation entry for this article.
+ const std::string& bibTeX() const {
+ //return "@Article{" + bibKey() + ",\n" + _bibTeXBody + "\n}";
+ return _bibTeX;
+ }
+
/// Whether this analysis is trusted (in any way!)
const std::string& status() const { return _status; }
+
+ /// Any work to be done on this analysis.
+ const std::vector<std::string>& todos() const { return _todos; }
//@}
/// Return true if this analysis needs to know the process cross-section.
bool needsCrossSection() const { return _needsCrossSection; }
+
private:
std::string _name;
@@ -114,13 +125,38 @@
std::string _runInfo;
std::string _experiment;
std::string _collider;
- std::pair<ParticleName, ParticleName> _beams;
+ std::vector<std::pair<ParticleName, ParticleName> > _beams;
std::vector<std::pair<double, double> > _energies;
std::string _year;
std::vector<std::string> _references;
+ std::string _bibKey;
+ std::string _bibTeX;
+ //std::string _bibTeXBody; //< Was thinking of avoiding duplication of BibKey...
std::string _status;
+ std::vector<std::string> _todos;
bool _needsCrossSection;
+ void clear() {
+ _name = "";
+ _spiresId = "";
+ _authors.clear();
+ _summary = "";
+ _description = "";
+ _runInfo = "";
+ _experiment = "";
+ _collider = "";
+ _beams.clear();
+ _energies.clear();
+ _year = "";
+ _references.clear();
+ _bibKey = "";
+ _bibTeX = "";
+ //_bibTeXBody = "";
+ _status = "";
+ _todos.clear();
+ _needsCrossSection = false;
+ }
+
};
Modified: trunk/include/Rivet/ParticleName.hh
==============================================================================
--- trunk/include/Rivet/ParticleName.hh Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/include/Rivet/ParticleName.hh Mon Apr 5 13:08:36 2010 (r2381)
@@ -75,7 +75,7 @@
// }
/// Convenience maker of particle ID pairs.
- inline std::pair<PdgId,PdgId> make_pdgid_pair(std::pair<ParticleName,ParticleName> pnamepair) {
+ inline std::pair<PdgId,PdgId> make_pdgid_pair(const std::pair<ParticleName,ParticleName>& pnamepair) {
return make_pdgid_pair(pnamepair.first, pnamepair.second);
}
Modified: trunk/include/Rivet/ProjectionHandler.hh
==============================================================================
--- trunk/include/Rivet/ProjectionHandler.hh Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/include/Rivet/ProjectionHandler.hh Mon Apr 5 13:08:36 2010 (r2381)
@@ -101,6 +101,9 @@
/// Singleton creation function
static ProjectionHandler* create();
+ /// Singleton deletion function
+ static void destroy();
+
public:
Modified: trunk/src/Core/Analysis.cc
==============================================================================
--- trunk/src/Core/Analysis.cc Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/src/Core/Analysis.cc Mon Apr 5 13:08:36 2010 (r2381)
@@ -181,31 +181,58 @@
return _info->references();
}
+ string Analysis::bibKey() const {
+ if (!_info) return "";
+ return _info->bibKey();
+ }
+
+ string Analysis::bibTeX() const {
+ if (!_info) return "";
+ return _info->bibTeX();
+ }
+
string Analysis::status() const {
if (!_info) return "UNVALIDATED";
return _info->status();
}
- const BeamPair Analysis::requiredBeams() const {
- return make_pdgid_pair(info().beams());
+ vector<string> Analysis::todos() const {
+ if (!_info) return vector<string>();
+ return _info->todos();
+ }
+
+ const vector<BeamPair> Analysis::requiredBeams() const {
+ vector<BeamPair> reqbeams;
+ typedef std::pair<ParticleName,ParticleName> ParticleNamePair;
+ foreach (const ParticleNamePair& bp, info().beams()) {
+ reqbeams += bp;
+ }
+ return reqbeams;
}
+
+ /// @todo Deprecate?
Analysis& Analysis::setBeams(const ParticleName& beam1, const ParticleName& beam2) {
assert(_info.get() != 0);
- _info->_beams = make_pair(beam1, beam2);
+ _info->_beams.clear();
+ _info->_beams += make_pair(beam1, beam2);
return *this;
}
+ /// @todo Deprecate?
bool Analysis::isCompatible(const ParticleName& beam1, const ParticleName& beam2) const {
BeamPair beams(beam1, beam2);
- return compatible(beams, requiredBeams());
- /// @todo Need to also check internal consistency of the analysis'
- /// beam requirements with those of the projections it uses.
+ return isCompatible(beams);
}
+
+ /// @todo Deprecate?
bool Analysis::isCompatible(const BeamPair& beams) const {
- return compatible(beams, requiredBeams());
+ foreach (const BeamPair& bp, requiredBeams()) {
+ if (compatible(beams, bp)) return true;
+ }
+ return false;
/// @todo Need to also check internal consistency of the analysis'
/// beam requirements with those of the projections it uses.
}
@@ -217,10 +244,12 @@
return *this;
}
+ /// @todo Deprecate, eventually
bool Analysis::needsCrossSection() const {
return _needsCrossSection;
}
+ /// @todo Deprecate, eventually
Analysis& Analysis::setNeedsCrossSection(bool needed) {
_needsCrossSection = needed;
return *this;
Modified: trunk/src/Core/AnalysisInfo.cc
==============================================================================
--- trunk/src/Core/AnalysisInfo.cc Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/src/Core/AnalysisInfo.cc Mon Apr 5 13:08:36 2010 (r2381)
@@ -48,7 +48,7 @@
// Returned AI, in semi-null state
AnalysisInfo* ai = new AnalysisInfo();
- ai->_beams = make_pair(ANY,ANY);
+ ai->_beams += make_pair(ANY,ANY);
ai->_name = ananame;
/// If no ana data file found, return null AI
@@ -86,19 +86,37 @@
} else if (key == "Experiment") {
it.second() >> ai->_experiment;
} else if (key == "Beams") {
- const YAML::Node& beams = it.second();
- vector<ParticleName> beampair;
- for (YAML::Iterator b = beams.begin(); b != beams.end(); ++b) {
- string bstr;
- *b >> bstr;
- ParticleName beamname = getParticleNameEnum(bstr);
- beampair += beamname;
+ const YAML::Node& beampairs = it.second();
+ vector<pair<ParticleName,ParticleName> > beam_pairs;
+ if (beampairs.size() == 2 &&
+ beampairs[0].GetType() == YAML::CT_SCALAR &&
+ beampairs[1].GetType() == YAML::CT_SCALAR) {
+ string bstr0, bstr1;
+ beampairs[0] >> bstr0;
+ ParticleName b0 = getParticleNameEnum(bstr0);
+ beampairs[1] >> bstr1;
+ ParticleName b1 = getParticleNameEnum(bstr1);
+ beam_pairs += make_pair<ParticleName,ParticleName>(b0, b1);
+ } else {
+ for (YAML::Iterator bpi = beampairs.begin(); bpi != beampairs.end(); ++bpi) {
+ const YAML::Node& bp = *bpi;
+ if (bp.size() == 2 &&
+ bp[0].GetType() == YAML::CT_SCALAR &&
+ bp[1].GetType() == YAML::CT_SCALAR) {
+ string bstr0, bstr1;
+ bp[0] >> bstr0;
+ ParticleName b0 = getParticleNameEnum(bstr0);
+ bp[1] >> bstr1;
+ ParticleName b1 = getParticleNameEnum(bstr1);
+ beam_pairs += make_pair<ParticleName,ParticleName>(b0, b1);
+ } else {
+ assert(0 && "Beam ID pairs have to be either a 2-tuple or a list of 2-tuples of particle names");
+ }
+ }
}
- assert(beampair.size() == 2);
- ai->_beams = make_pair<ParticleName,ParticleName>(beampair[0], beampair[1]);
- // } else if (key == "NeedCrossSection") {
- // // it.second() >> ai->_needsCrossSection;
- } else if (key == "Energies") {
+ ai->_beams = beam_pairs;
+ }
+ else if (key == "Energies") {
const YAML::Node& energies = it.second();
vector<pair<double,double> > beam_energy_pairs;
for (YAML::Iterator be = energies.begin(); be != energies.end(); ++be) {
@@ -108,15 +126,21 @@
*be >> sqrts;
beam_energy_pairs += make_pair(sqrts/2.0, sqrts/2.0);
} else if (be->GetType() == YAML::CT_SEQUENCE) {
- const YAML::Node& beamenergy_strs = be.second();
- vector<double> beamenergies;
- for (YAML::Iterator e = beamenergy_strs.begin(); e != beamenergy_strs.end(); ++e) {
- double beamenergy;
- *e >> beamenergy;
- beamenergies += beamenergy;
+ const YAML::Node& beseq = *be;
+ // If the sub-sequence is of length 1, then it's another scalar sqrt(s)!
+ if (beseq.size() == 1) {
+ double sqrts;
+ (*be)[0] >> sqrts;
+ beam_energy_pairs += make_pair(sqrts/2.0, sqrts/2.0);
+ } else if (beseq.size() == 2) {
+ vector<double> beamenergies;
+ double beamenergy0, beamenergy1;
+ beseq[0] >> beamenergy0;
+ beseq[1] >> beamenergy1;
+ beam_energy_pairs += make_pair(beamenergy0, beamenergy1);
+ } else {
+ assert(0 && "Beam energies have to be a list of either numbers or pairs of numbers");
}
- assert(beamenergies.size() == 2);
- beam_energy_pairs += make_pair(beamenergies[0], beamenergies[1]);
} else {
assert(0 && "Beam energies have to be a list of either numbers or pairs of numbers");
}
@@ -126,8 +150,21 @@
it.second() >> ai->_collider;
} else if (key == "SpiresID") {
it.second() >> ai->_spiresId;
+ } else if (key == "BibKey") {
+ it.second() >> ai->_bibKey;
+ } else if (key == "BibTeX") {
+ it.second() >> ai->_bibTeX;//Body;
} else if (key == "Status") {
it.second() >> ai->_status;
+ } else if (key == "ToDo") {
+ const YAML::Node& todos = it.second();
+ for (YAML::Iterator todo = todos.begin(); todo != todos.end(); ++todo) {
+ string s;
+ *todo >> s;
+ ai->_todos += s;
+ }
+ } else if (key == "NeedCrossSection") {
+ it.second() >> ai->_needsCrossSection;
} else if (key == "RunInfo") {
it.second() >> ai->_runInfo;
} else if (key == "Description") {
Modified: trunk/src/Core/ProjectionHandler.cc
==============================================================================
--- trunk/src/Core/ProjectionHandler.cc Sun Apr 4 15:43:41 2010 (r2380)
+++ trunk/src/Core/ProjectionHandler.cc Mon Apr 5 13:08:36 2010 (r2381)
@@ -25,6 +25,10 @@
}
+ void ProjectionHandler::destroy() {
+ delete _instance;
+ }
+
// Get a logger.
Log& ProjectionHandler::getLog() const {
More information about the Rivet-svn
mailing list
|