|
|
[Rivet-svn] r1849 - trunk/src/Analyses
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Sun Oct 4 16:39:07 BST 2009
Author: buckley
Date: Sun Oct 4 16:39:06 2009
New Revision: 1849
Log:
Moving projection registration into init for DELPHI analyses
Modified:
trunk/src/Analyses/DELPHI_1995_S3137023.cc
trunk/src/Analyses/DELPHI_1996_S3430090.cc
trunk/src/Analyses/DELPHI_2002_069_CONF_603.cc
trunk/src/Analyses/DELPHI_2003_WUD_03_11.cc
Modified: trunk/src/Analyses/DELPHI_1995_S3137023.cc
==============================================================================
--- trunk/src/Analyses/DELPHI_1995_S3137023.cc Sun Oct 4 16:36:17 2009 (r1848)
+++ trunk/src/Analyses/DELPHI_1995_S3137023.cc Sun Oct 4 16:39:06 2009 (r1849)
@@ -20,9 +20,6 @@
: Analysis("DELPHI_1995_S3137023")
{
setBeams(ELECTRON, POSITRON);
- addProjection(Beam(), "Beams");
- addProjection(ChargedFinalState(), "FS");
- addProjection(UnstableFinalState(), "UFS");
_weightedTotalNumXiMinus = 0;
_weightedTotalNumSigma1385Plus = 0;
}
@@ -32,6 +29,10 @@
//@{
void init() {
+ addProjection(Beam(), "Beams");
+ addProjection(ChargedFinalState(), "FS");
+ addProjection(UnstableFinalState(), "UFS");
+
_histXpXiMinus = bookHistogram1D(2, 1, 1);
_histXpSigma1385Plus = bookHistogram1D(3, 1, 1);
}
Modified: trunk/src/Analyses/DELPHI_1996_S3430090.cc
==============================================================================
--- trunk/src/Analyses/DELPHI_1996_S3430090.cc Sun Oct 4 16:36:17 2009 (r1848)
+++ trunk/src/Analyses/DELPHI_1996_S3430090.cc Sun Oct 4 16:39:06 2009 (r1849)
@@ -40,6 +40,15 @@
: Analysis("DELPHI_1996_S3430090")
{
setBeams(ELECTRON, POSITRON);
+ _weightedTotalPartNum = 0;
+ _passedCutWeightSum = 0;
+ }
+
+
+ /// @name Analysis methods
+ //@{
+
+ void init() {
addProjection(Beam(), "Beams");
const ChargedFinalState cfs;
addProjection(cfs, "FS");
@@ -51,13 +60,87 @@
const Thrust thrust(cfs);
addProjection(thrust, "Thrust");
addProjection(Hemispheres(thrust), "Hemispheres");
- _weightedTotalPartNum = 0;
- _passedCutWeightSum = 0;
+
+ _histPtTIn = bookHistogram1D(1, 1, 1);
+ _histPtTOut = bookHistogram1D(2, 1, 1);
+ _histPtSIn = bookHistogram1D(3, 1, 1);
+ _histPtSOut = bookHistogram1D(4, 1, 1);
+
+ _histRapidityT = bookHistogram1D(5, 1, 1);
+ _histRapidityS = bookHistogram1D(6, 1, 1);
+ _histScaledMom = bookHistogram1D(7, 1, 1);
+ _histLogScaledMom = bookHistogram1D(8, 1, 1);
+
+ _histPtTOutVsXp = bookProfile1D(9, 1, 1);
+ _histPtVsXp = bookProfile1D(10, 1, 1);
+
+ _hist1MinusT = bookHistogram1D(11, 1, 1);
+ _histTMajor = bookHistogram1D(12, 1, 1);
+ _histTMinor = bookHistogram1D(13, 1, 1);
+ _histOblateness = bookHistogram1D(14, 1, 1);
+
+ _histSphericity = bookHistogram1D(15, 1, 1);
+ _histAplanarity = bookHistogram1D(16, 1, 1);
+ _histPlanarity = bookHistogram1D(17, 1, 1);
+
+ _histCParam = bookHistogram1D(18, 1, 1);
+ _histDParam = bookHistogram1D(19, 1, 1);
+
+ _histHemiMassH = bookHistogram1D(20, 1, 1);
+ _histHemiMassL = bookHistogram1D(21, 1, 1);
+ _histHemiMassD = bookHistogram1D(22, 1, 1);
+
+ _histHemiBroadW = bookHistogram1D(23, 1, 1);
+ _histHemiBroadN = bookHistogram1D(24, 1, 1);
+ _histHemiBroadT = bookHistogram1D(25, 1, 1);
+ _histHemiBroadD = bookHistogram1D(26, 1, 1);
+
+ // Binned in y_cut
+ _histDiffRate2Durham = bookHistogram1D(27, 1, 1);
+ _histDiffRate2Jade = bookHistogram1D(28, 1, 1);
+ _histDiffRate3Durham = bookHistogram1D(29, 1, 1);
+ _histDiffRate3Jade = bookHistogram1D(30, 1, 1);
+ _histDiffRate4Durham = bookHistogram1D(31, 1, 1);
+ _histDiffRate4Jade = bookHistogram1D(32, 1, 1);
+
+ // Binned in cos(chi)
+ _histEEC = bookHistogram1D(33, 1, 1);
+ _histAEEC = bookHistogram1D(34, 1, 1);
+
+ _histMultiCharged = bookHistogram1D(35, 1, 1);
+
+ _histMultiPiPlus = bookHistogram1D(36, 1, 1);
+ _histMultiPi0 = bookHistogram1D(36, 1, 2);
+ _histMultiKPlus = bookHistogram1D(36, 1, 3);
+ _histMultiK0 = bookHistogram1D(36, 1, 4);
+ _histMultiEta = bookHistogram1D(36, 1, 5);
+ _histMultiEtaPrime = bookHistogram1D(36, 1, 6);
+ _histMultiDPlus = bookHistogram1D(36, 1, 7);
+ _histMultiD0 = bookHistogram1D(36, 1, 8);
+ _histMultiBPlus0 = bookHistogram1D(36, 1, 9);
+
+ _histMultiF0 = bookHistogram1D(37, 1, 1);
+
+ _histMultiRho = bookHistogram1D(38, 1, 1);
+ _histMultiKStar892Plus = bookHistogram1D(38, 1, 2);
+ _histMultiKStar892_0 = bookHistogram1D(38, 1, 3);
+ _histMultiPhi = bookHistogram1D(38, 1, 4);
+ _histMultiDStar2010Plus = bookHistogram1D(38, 1, 5);
+
+ _histMultiF2 = bookHistogram1D(39, 1, 1);
+ _histMultiK2Star1430_0 = bookHistogram1D(39, 1, 2);
+
+ _histMultiP = bookHistogram1D(40, 1, 1);
+ _histMultiLambda0 = bookHistogram1D(40, 1, 2);
+ _histMultiXiMinus = bookHistogram1D(40, 1, 3);
+ _histMultiOmegaMinus = bookHistogram1D(40, 1, 4);
+ _histMultiDeltaPlusPlus = bookHistogram1D(40, 1, 5);
+ _histMultiSigma1385Plus = bookHistogram1D(40, 1, 6);
+ _histMultiXi1530_0 = bookHistogram1D(40, 1, 7);
+ _histMultiLambdaB0 = bookHistogram1D(40, 1, 8);
}
-
-
- /// @name Analysis methods
- //@{
+
+
void analyze(const Event& e) {
// First, veto on leptonic events by requiring at least 4 charged FS particles
@@ -273,87 +356,6 @@
}
- void init() {
- _histPtTIn = bookHistogram1D(1, 1, 1);
- _histPtTOut = bookHistogram1D(2, 1, 1);
- _histPtSIn = bookHistogram1D(3, 1, 1);
- _histPtSOut = bookHistogram1D(4, 1, 1);
-
- _histRapidityT = bookHistogram1D(5, 1, 1);
- _histRapidityS = bookHistogram1D(6, 1, 1);
- _histScaledMom = bookHistogram1D(7, 1, 1);
- _histLogScaledMom = bookHistogram1D(8, 1, 1);
-
- _histPtTOutVsXp = bookProfile1D(9, 1, 1);
- _histPtVsXp = bookProfile1D(10, 1, 1);
-
- _hist1MinusT = bookHistogram1D(11, 1, 1);
- _histTMajor = bookHistogram1D(12, 1, 1);
- _histTMinor = bookHistogram1D(13, 1, 1);
- _histOblateness = bookHistogram1D(14, 1, 1);
-
- _histSphericity = bookHistogram1D(15, 1, 1);
- _histAplanarity = bookHistogram1D(16, 1, 1);
- _histPlanarity = bookHistogram1D(17, 1, 1);
-
- _histCParam = bookHistogram1D(18, 1, 1);
- _histDParam = bookHistogram1D(19, 1, 1);
-
- _histHemiMassH = bookHistogram1D(20, 1, 1);
- _histHemiMassL = bookHistogram1D(21, 1, 1);
- _histHemiMassD = bookHistogram1D(22, 1, 1);
-
- _histHemiBroadW = bookHistogram1D(23, 1, 1);
- _histHemiBroadN = bookHistogram1D(24, 1, 1);
- _histHemiBroadT = bookHistogram1D(25, 1, 1);
- _histHemiBroadD = bookHistogram1D(26, 1, 1);
-
- // Binned in y_cut
- _histDiffRate2Durham = bookHistogram1D(27, 1, 1);
- _histDiffRate2Jade = bookHistogram1D(28, 1, 1);
- _histDiffRate3Durham = bookHistogram1D(29, 1, 1);
- _histDiffRate3Jade = bookHistogram1D(30, 1, 1);
- _histDiffRate4Durham = bookHistogram1D(31, 1, 1);
- _histDiffRate4Jade = bookHistogram1D(32, 1, 1);
-
- // Binned in cos(chi)
- _histEEC = bookHistogram1D(33, 1, 1);
- _histAEEC = bookHistogram1D(34, 1, 1);
-
- _histMultiCharged = bookHistogram1D(35, 1, 1);
-
- _histMultiPiPlus = bookHistogram1D(36, 1, 1);
- _histMultiPi0 = bookHistogram1D(36, 1, 2);
- _histMultiKPlus = bookHistogram1D(36, 1, 3);
- _histMultiK0 = bookHistogram1D(36, 1, 4);
- _histMultiEta = bookHistogram1D(36, 1, 5);
- _histMultiEtaPrime = bookHistogram1D(36, 1, 6);
- _histMultiDPlus = bookHistogram1D(36, 1, 7);
- _histMultiD0 = bookHistogram1D(36, 1, 8);
- _histMultiBPlus0 = bookHistogram1D(36, 1, 9);
-
- _histMultiF0 = bookHistogram1D(37, 1, 1);
-
- _histMultiRho = bookHistogram1D(38, 1, 1);
- _histMultiKStar892Plus = bookHistogram1D(38, 1, 2);
- _histMultiKStar892_0 = bookHistogram1D(38, 1, 3);
- _histMultiPhi = bookHistogram1D(38, 1, 4);
- _histMultiDStar2010Plus = bookHistogram1D(38, 1, 5);
-
- _histMultiF2 = bookHistogram1D(39, 1, 1);
- _histMultiK2Star1430_0 = bookHistogram1D(39, 1, 2);
-
- _histMultiP = bookHistogram1D(40, 1, 1);
- _histMultiLambda0 = bookHistogram1D(40, 1, 2);
- _histMultiXiMinus = bookHistogram1D(40, 1, 3);
- _histMultiOmegaMinus = bookHistogram1D(40, 1, 4);
- _histMultiDeltaPlusPlus = bookHistogram1D(40, 1, 5);
- _histMultiSigma1385Plus = bookHistogram1D(40, 1, 6);
- _histMultiXi1530_0 = bookHistogram1D(40, 1, 7);
- _histMultiLambdaB0 = bookHistogram1D(40, 1, 8);
- }
-
-
// Finalize
void finalize() {
Modified: trunk/src/Analyses/DELPHI_2002_069_CONF_603.cc
==============================================================================
--- trunk/src/Analyses/DELPHI_2002_069_CONF_603.cc Sun Oct 4 16:36:17 2009 (r1848)
+++ trunk/src/Analyses/DELPHI_2002_069_CONF_603.cc Sun Oct 4 16:39:06 2009 (r1849)
@@ -25,15 +25,25 @@
: Analysis("DELPHI_2002_069_CONF_603")
{
setBeams(ELECTRON, POSITRON);
- addProjection(Beam(), "Beams");
- addProjection(ChargedFinalState(), "FS");
- addProjection(InitialQuarks(), "IQF");
}
/// @name Analysis methods
//@{
+ /// Book projections and histograms
+ void init() {
+ addProjection(Beam(), "Beams");
+ addProjection(ChargedFinalState(), "FS");
+ addProjection(InitialQuarks(), "IQF");
+
+ _histXbprim = bookHistogram1D(1, 1, 1);
+ _histXbweak = bookHistogram1D(2, 1, 1);
+ _histMeanXbprim = bookProfile1D(4, 1, 1);
+ _histMeanXbweak = bookProfile1D(5, 1, 1);
+ }
+
+
void analyze(const Event& e) {
// First, veto on leptonic events by requiring at least 4 charged FS particles
const FinalState& fs = applyProjection<FinalState>(e, "FS");
@@ -92,15 +102,6 @@
}
}
}
-
-
- /// Book histograms
- void init() {
- _histXbprim = bookHistogram1D(1, 1, 1);
- _histXbweak = bookHistogram1D(2, 1, 1);
- _histMeanXbprim = bookProfile1D(4, 1, 1);
- _histMeanXbweak = bookProfile1D(5, 1, 1);
- }
// Finalize
Modified: trunk/src/Analyses/DELPHI_2003_WUD_03_11.cc
==============================================================================
--- trunk/src/Analyses/DELPHI_2003_WUD_03_11.cc Sun Oct 4 16:36:17 2009 (r1848)
+++ trunk/src/Analyses/DELPHI_2003_WUD_03_11.cc Sun Oct 4 16:39:06 2009 (r1849)
@@ -30,10 +30,6 @@
DELPHI_2003_WUD_03_11()
: Analysis("DELPHI_2003_WUD_03_11")
{
- const ChargedFinalState cfs;
- addProjection(cfs, "FS");
- addProjection(FastJets(cfs, FastJets::JADE, 0.7), "JadeJets");
- addProjection(FastJets(cfs, FastJets::DURHAM, 0.7), "DurhamJets");
_numdurjets = 0;
_numjadejets = 0;
}
@@ -92,6 +88,23 @@
/// @name Analysis methods
//@{
+ void init() {
+ const ChargedFinalState cfs;
+ addProjection(cfs, "FS");
+ addProjection(FastJets(cfs, FastJets::JADE, 0.7), "JadeJets");
+ addProjection(FastJets(cfs, FastJets::DURHAM, 0.7), "DurhamJets");
+
+ _histDurhamBZ = bookHistogram1D(1, 1, 1);
+ _histDurhamKSW = bookHistogram1D(2, 1, 1);
+ _histDurhamNR = bookHistogram1D(3, 1, 1);
+ _histDurhamALPHA34 = bookHistogram1D(4, 1, 1);
+ _histJadeBZ = bookHistogram1D(1, 2, 1);
+ _histJadeKSW = bookHistogram1D(2, 2, 1);
+ _histJadeNR = bookHistogram1D(3, 2, 1);
+ _histJadeALPHA34 = bookHistogram1D(4, 2, 1);
+ }
+
+
void analyze(const Event& e) {
// First, veto on leptonic events by requiring at least 4 charged FS particles
const FinalState& fs = applyProjection<FinalState>(e, "FS");
@@ -140,21 +153,7 @@
}
}
- }
-
-
-
- void init() {
- _histDurhamBZ = bookHistogram1D(1, 1, 1);
- _histDurhamKSW = bookHistogram1D(2, 1, 1);
- _histDurhamNR = bookHistogram1D(3, 1, 1);
- _histDurhamALPHA34 = bookHistogram1D(4, 1, 1);
- _histJadeBZ = bookHistogram1D(1, 2, 1);
- _histJadeKSW = bookHistogram1D(2, 2, 1);
- _histJadeNR = bookHistogram1D(3, 2, 1);
- _histJadeALPHA34 = bookHistogram1D(4, 2, 1);
- }
-
+ }
// Finalize
More information about the Rivet-svn
mailing list
|