|
|
[Rivet-svn] r1798 - in trunk: data/anainfo src/Analyses src/Analyses/Misc
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Tue Sep 1 11:40:02 BST 2009
Author: fsiegert
Date: Tue Sep 1 11:40:01 2009
New Revision: 1798
Log:
Fix JADE_OPAL_2000_S4300807_*.info files, which fixes a duplicate
analysis bug with the new analysis loader. Reenable installation of all
analyses.
Deleted:
trunk/data/anainfo/JADE_OPAL_2000_S4300807.info
Modified:
trunk/data/anainfo/JADE_OPAL_2000_S4300807_133GEV.info
trunk/data/anainfo/JADE_OPAL_2000_S4300807_161GEV.info
trunk/data/anainfo/JADE_OPAL_2000_S4300807_172GEV.info
trunk/data/anainfo/JADE_OPAL_2000_S4300807_183GEV.info
trunk/data/anainfo/JADE_OPAL_2000_S4300807_189GEV.info
trunk/data/anainfo/JADE_OPAL_2000_S4300807_35GEV.info
trunk/data/anainfo/JADE_OPAL_2000_S4300807_44GEV.info
trunk/data/anainfo/JADE_OPAL_2000_S4300807_91GEV.info
trunk/data/anainfo/Makefile.am
trunk/src/Analyses/Makefile.am
trunk/src/Analyses/Misc/JADE_OPAL_2000_S4300807.cc
Modified: trunk/data/anainfo/JADE_OPAL_2000_S4300807_133GEV.info
==============================================================================
--- trunk/data/anainfo/JADE_OPAL_2000_S4300807_133GEV.info Tue Sep 1 10:26:02 2009 (r1797)
+++ trunk/data/anainfo/JADE_OPAL_2000_S4300807_133GEV.info Tue Sep 1 11:40:01 2009 (r1798)
@@ -1,4 +1,4 @@
-Name:
+Name: JADE_OPAL_2000_S4300807_133GEV
Year: 2000
Summary: Jet rates in e+e- at OPAL [133 GeV].
Experiment: JADE_OPAL
@@ -11,9 +11,7 @@
- Eur.Phys.J.C17:19-51,2000
- arXiv:hep-ex/0001055
RunInfo:
- e+ e- collisions:
-
- * e+ e- -> jet jet (+ jets) at 133 GeV. * no cuts needed
+ e+ e- -> jet jet (+ jets) at 133 GeV
NumEvents: 1000000
PtCuts: [0]
Description:
Modified: trunk/data/anainfo/JADE_OPAL_2000_S4300807_161GEV.info
==============================================================================
--- trunk/data/anainfo/JADE_OPAL_2000_S4300807_161GEV.info Tue Sep 1 10:26:02 2009 (r1797)
+++ trunk/data/anainfo/JADE_OPAL_2000_S4300807_161GEV.info Tue Sep 1 11:40:01 2009 (r1798)
@@ -1,4 +1,4 @@
-Name:
+Name: JADE_OPAL_2000_S4300807_161GEV
Year: 2000
Summary: Jet rates in e+e- at OPAL [161 GeV].
Experiment: JADE_OPAL
@@ -11,9 +11,7 @@
- Eur.Phys.J.C17:19-51,2000
- arXiv:hep-ex/0001055
RunInfo:
- e+ e- collisions:
-
- * e+ e- -> jet jet (+ jets) at 161 GeV. * no cuts needed
+ e+ e- -> jet jet (+ jets) at 161 GeV
NumEvents: 1000000
PtCuts: [0]
Description:
Modified: trunk/data/anainfo/JADE_OPAL_2000_S4300807_172GEV.info
==============================================================================
--- trunk/data/anainfo/JADE_OPAL_2000_S4300807_172GEV.info Tue Sep 1 10:26:02 2009 (r1797)
+++ trunk/data/anainfo/JADE_OPAL_2000_S4300807_172GEV.info Tue Sep 1 11:40:01 2009 (r1798)
@@ -1,4 +1,4 @@
-Name:
+Name: JADE_OPAL_2000_S4300807_172GEV
Year: 2000
Summary: Jet rates in e+e- at OPAL [172 GeV].
Experiment: JADE_OPAL
@@ -11,9 +11,7 @@
- Eur.Phys.J.C17:19-51,2000
- arXiv:hep-ex/0001055
RunInfo:
- e+ e- collisions:
-
- * e+ e- -> jet jet (+ jets) at 172 GeV. * no cuts needed
+ e+ e- -> jet jet (+ jets) at 172 GeV
NumEvents: 1000000
PtCuts: [0]
Description:
Modified: trunk/data/anainfo/JADE_OPAL_2000_S4300807_183GEV.info
==============================================================================
--- trunk/data/anainfo/JADE_OPAL_2000_S4300807_183GEV.info Tue Sep 1 10:26:02 2009 (r1797)
+++ trunk/data/anainfo/JADE_OPAL_2000_S4300807_183GEV.info Tue Sep 1 11:40:01 2009 (r1798)
@@ -1,4 +1,4 @@
-Name:
+Name: JADE_OPAL_2000_S4300807_183GEV
Year: 2000
Summary: Jet rates in e+e- at OPAL [183 GeV].
Experiment: JADE_OPAL
@@ -11,9 +11,7 @@
- Eur.Phys.J.C17:19-51,2000
- arXiv:hep-ex/0001055
RunInfo:
- e+ e- collisions:
-
- * e+ e- -> jet jet (+ jets) at 183 GeV. * no cuts needed
+ e+ e- -> jet jet (+ jets) at 183 GeV
NumEvents: 1000000
PtCuts: [0]
Description:
Modified: trunk/data/anainfo/JADE_OPAL_2000_S4300807_189GEV.info
==============================================================================
--- trunk/data/anainfo/JADE_OPAL_2000_S4300807_189GEV.info Tue Sep 1 10:26:02 2009 (r1797)
+++ trunk/data/anainfo/JADE_OPAL_2000_S4300807_189GEV.info Tue Sep 1 11:40:01 2009 (r1798)
@@ -1,4 +1,4 @@
-Name:
+Name: JADE_OPAL_2000_S4300807_189GEV
Year: 2000
Summary: Jet rates in e+e- at OPAL [189 GeV].
Experiment: JADE_OPAL
@@ -11,9 +11,7 @@
- Eur.Phys.J.C17:19-51,2000
- arXiv:hep-ex/0001055
RunInfo:
- e+ e- collisions:
-
- * e+ e- -> jet jet (+ jets) at 189 GeV. * no cuts needed
+ e+ e- -> jet jet (+ jets) at 189 GeV
NumEvents: 1000000
PtCuts: [0]
Description:
Modified: trunk/data/anainfo/JADE_OPAL_2000_S4300807_35GEV.info
==============================================================================
--- trunk/data/anainfo/JADE_OPAL_2000_S4300807_35GEV.info Tue Sep 1 10:26:02 2009 (r1797)
+++ trunk/data/anainfo/JADE_OPAL_2000_S4300807_35GEV.info Tue Sep 1 11:40:01 2009 (r1798)
@@ -1,4 +1,4 @@
-Name:
+Name: JADE_OPAL_2000_S4300807_35GEV
Year: 2000
Summary: Jet rates in e+e- at JADE [35 GeV].
Experiment: JADE_OPAL
@@ -11,9 +11,7 @@
- Eur.Phys.J.C17:19-51,2000
- arXiv:hep-ex/0001055
RunInfo:
- e+ e- collisions:
-
- * e+ e- -> jet jet (+ jets) at 35 GeV. * no cuts needed
+ e+ e- -> jet jet (+ jets) at 35 GeV
NumEvents: 1000000
PtCuts: [0]
Description:
Modified: trunk/data/anainfo/JADE_OPAL_2000_S4300807_44GEV.info
==============================================================================
--- trunk/data/anainfo/JADE_OPAL_2000_S4300807_44GEV.info Tue Sep 1 10:26:02 2009 (r1797)
+++ trunk/data/anainfo/JADE_OPAL_2000_S4300807_44GEV.info Tue Sep 1 11:40:01 2009 (r1798)
@@ -1,4 +1,4 @@
-Name:
+Name: JADE_OPAL_2000_S4300807_44GEV
Year: 2000
Summary: Jet rates in e+e- at JADE [44 GeV].
Experiment: JADE_OPAL
@@ -11,9 +11,7 @@
- Eur.Phys.J.C17:19-51,2000
- arXiv:hep-ex/0001055
RunInfo:
- e+ e- collisions:
-
- * e+ e- -> jet jet (+ jets) at 44 GeV. * no cuts needed
+ e+ e- -> jet jet (+ jets) at 44 GeV
NumEvents: 1000000
PtCuts: [0]
Description:
Modified: trunk/data/anainfo/JADE_OPAL_2000_S4300807_91GEV.info
==============================================================================
--- trunk/data/anainfo/JADE_OPAL_2000_S4300807_91GEV.info Tue Sep 1 10:26:02 2009 (r1797)
+++ trunk/data/anainfo/JADE_OPAL_2000_S4300807_91GEV.info Tue Sep 1 11:40:01 2009 (r1798)
@@ -1,4 +1,4 @@
-Name:
+Name: JADE_OPAL_2000_S4300807_91GEV
Year: 2000
Summary: Jet rates in e+e- at OPAL [91 GeV].
Experiment: JADE_OPAL
@@ -11,9 +11,7 @@
- Eur.Phys.J.C17:19-51,2000
- arXiv:hep-ex/0001055
RunInfo:
- e+ e- collisions:
-
- * e+ e- -> jet jet (+ jets) at 91.2 GeV. * no cuts needed
+ e+ e- -> jet jet (+ jets) at 91.2 GeV
NumEvents: 1000000
PtCuts: [0]
Description:
Modified: trunk/data/anainfo/Makefile.am
==============================================================================
--- trunk/data/anainfo/Makefile.am Tue Sep 1 10:26:02 2009 (r1797)
+++ trunk/data/anainfo/Makefile.am Tue Sep 1 11:40:01 2009 (r1798)
@@ -47,7 +47,14 @@
H1_1994_S2919893.info \
H1_1995_S3167097.info \
H1_2000_S4129130.info \
- JADE_OPAL_2000_S4300807.info \
+ JADE_OPAL_2000_S4300807_133GEV.info \
+ JADE_OPAL_2000_S4300807_161GEV.info \
+ JADE_OPAL_2000_S4300807_172GEV.info \
+ JADE_OPAL_2000_S4300807_183GEV.info \
+ JADE_OPAL_2000_S4300807_189GEV.info \
+ JADE_OPAL_2000_S4300807_35GEV.info \
+ JADE_OPAL_2000_S4300807_44GEV.info \
+ JADE_OPAL_2000_S4300807_91GEV.info \
MC_LHC_LEADINGJETS.info \
MC_LHC_DIJET.info \
MC_LHC_ZANALYSIS.info \
Modified: trunk/src/Analyses/Makefile.am
==============================================================================
--- trunk/src/Analyses/Makefile.am Tue Sep 1 10:26:02 2009 (r1797)
+++ trunk/src/Analyses/Makefile.am Tue Sep 1 11:40:01 2009 (r1798)
@@ -1,5 +1,4 @@
-SUBDIRS = Example RHIC
-# CDF D0 SPS LEP HERA RHIC MC Misc
+SUBDIRS = Example RHIC CDF D0 SPS LEP HERA RHIC MC Misc
## Flags for building all plugins
AM_LDFLAGS = $(LDFLAGS) -module -L$(FASTJETLIBPATH)
Modified: trunk/src/Analyses/Misc/JADE_OPAL_2000_S4300807.cc
==============================================================================
--- trunk/src/Analyses/Misc/JADE_OPAL_2000_S4300807.cc Tue Sep 1 10:26:02 2009 (r1797)
+++ trunk/src/Analyses/Misc/JADE_OPAL_2000_S4300807.cc Tue Sep 1 11:40:01 2009 (r1798)
@@ -27,7 +27,6 @@
/// Constructor
JADE_OPAL_2000_S4300807(const string& sqrtsstr, double sqrts,
int nr_R_Jade, int nr_R_Durham, int nr_y_Durham)
- /// @todo This string passing doesn't work...
: Analysis("JADE_OPAL_2000_S4300807" + ("_" + sqrtsstr + "GEV")),
_sqrts(sqrts),
_nr_R_Jade(nr_R_Jade),
More information about the Rivet-svn
mailing list
|