|
|
[Rivet-svn] r3509 - in branches/2011-07-aida2yoda: . src/Analyses
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Tue Dec 6 14:00:19 GMT 2011
Author: hoeth
Date: Tue Dec 6 14:00:18 2011
New Revision: 3509
Log:
merge r3478 from trunk
Added:
branches/2011-07-aida2yoda/src/Analyses/EXAMPLE.cc
- copied, changed from r3478, trunk/src/Analyses/EXAMPLE.cc
branches/2011-07-aida2yoda/src/Analyses/PDG_HADRON_MULTIPLICITIES.cc
- copied, changed from r3478, trunk/src/Analyses/PDG_HADRON_MULTIPLICITIES.cc
branches/2011-07-aida2yoda/src/Analyses/PDG_HADRON_MULTIPLICITIES_RATIOS.cc
- copied, changed from r3478, trunk/src/Analyses/PDG_HADRON_MULTIPLICITIES_RATIOS.cc
Deleted:
branches/2011-07-aida2yoda/src/Analyses/ExampleAnalysis.cc
branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities.cc
branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc
Modified:
branches/2011-07-aida2yoda/ChangeLog
branches/2011-07-aida2yoda/src/Analyses/Makefile.am
Modified: branches/2011-07-aida2yoda/ChangeLog
==============================================================================
--- branches/2011-07-aida2yoda/ChangeLog Tue Dec 6 13:50:03 2011 (r3508)
+++ branches/2011-07-aida2yoda/ChangeLog Tue Dec 6 14:00:18 2011 (r3509)
@@ -1,5 +1,9 @@
2011-11-09 Andy Buckley <andy at insectnation.org>
+ * Renaming source files for EXAMPLE and
+ PDG_HADRON_MULTIPLICITIES(_RATIOS) analyses to match the analysis
+ names.
+
* Cosmetic fixes in ATLAS_2011_S9212183 SUSY analysis.
* Adding new ATLAS W pT analysis from Elena Yatsenko (slightly adapted).
Copied and modified: branches/2011-07-aida2yoda/src/Analyses/EXAMPLE.cc (from r3478, trunk/src/Analyses/EXAMPLE.cc)
==============================================================================
--- trunk/src/Analyses/EXAMPLE.cc Wed Nov 9 18:01:58 2011 (r3478, copy source)
+++ branches/2011-07-aida2yoda/src/Analyses/EXAMPLE.cc Tue Dec 6 14:00:18 2011 (r3509)
@@ -1,7 +1,7 @@
// -*- C++ -*-
#include "Rivet/Analysis.hh"
#include "Rivet/Tools/Logging.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
#include "Rivet/Projections/FinalState.hh"
#include "Rivet/Projections/ChargedFinalState.hh"
#include "Rivet/Projections/FastJets.hh"
@@ -41,18 +41,18 @@
addProjection(Sphericity(cfs), "Sphericity");
// Histograms
- _histTot = bookHistogram1D("TotalMult", 100, -0.5, 99.5);
- _histChTot = bookHistogram1D("TotalChMult", 50, -1.0, 99.0);
- _histHadrTot = bookHistogram1D("HadrTotalMult", 100, -0.5, 99.5);
- _histHadrChTot = bookHistogram1D("HadrTotalChMult", 50, -1.0, 99.0);
- _histMajor = bookHistogram1D("Major", 10, 0.0, 0.6);
- _histSphericity = bookHistogram1D("Sphericity", 10, 0.0, 0.8);
- _histAplanarity = bookHistogram1D("Aplanarity", 10, 0.0, 0.3);
+ _histTot = bookHisto1D("TotalMult", 100, -0.5, 99.5);
+ _histChTot = bookHisto1D("TotalChMult", 50, -1.0, 99.0);
+ _histHadrTot = bookHisto1D("HadrTotalMult", 100, -0.5, 99.5);
+ _histHadrChTot = bookHisto1D("HadrTotalChMult", 50, -1.0, 99.0);
+ _histMajor = bookHisto1D("Major", 10, 0.0, 0.6);
+ _histSphericity = bookHisto1D("Sphericity", 10, 0.0, 0.8);
+ _histAplanarity = bookHisto1D("Aplanarity", 10, 0.0, 0.3);
// Non-uniform binning example:
double edges[11] = { 0.5, 0.6, 0.7, 0.80, 0.85, 0.9, 0.92, 0.94, 0.96, 0.98, 1.0 };
vector<double> vedges(edges, edges+11);
- _histThrust = bookHistogram1D("Thrust", vedges);
+ _histThrust = bookHisto1D("Thrust", vedges);
}
@@ -112,14 +112,14 @@
//@{
/// Histograms
- AIDA::IHistogram1D* _histTot;
- AIDA::IHistogram1D* _histChTot;
- AIDA::IHistogram1D* _histHadrTot;
- AIDA::IHistogram1D* _histHadrChTot;
- AIDA::IHistogram1D* _histThrust;
- AIDA::IHistogram1D* _histMajor;
- AIDA::IHistogram1D* _histSphericity;
- AIDA::IHistogram1D* _histAplanarity;
+ Histo1DPtr _histTot;
+ Histo1DPtr _histChTot;
+ Histo1DPtr _histHadrTot;
+ Histo1DPtr _histHadrChTot;
+ Histo1DPtr _histThrust;
+ Histo1DPtr _histMajor;
+ Histo1DPtr _histSphericity;
+ Histo1DPtr _histAplanarity;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/Makefile.am
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/Makefile.am Tue Dec 6 13:50:03 2011 (r3508)
+++ branches/2011-07-aida2yoda/src/Analyses/Makefile.am Tue Dec 6 14:00:18 2011 (r3509)
@@ -237,8 +237,8 @@
lib_LTLIBRARIES += RivetMiscAnalyses.la
RivetMiscAnalyses_la_SOURCES = \
- PDG_Hadron_Multiplicities.cc \
- PDG_Hadron_Multiplicities_Ratios.cc \
+ PDG_HADRON_MULTIPLICITIES.cc \
+ PDG_HADRON_MULTIPLICITIES_RATIOS.cc \
JADE_OPAL_2000_S4300807.cc \
BELLE_2006_S6265367.cc
if ENABLE_UNVALIDATED
@@ -250,7 +250,7 @@
lib_LTLIBRARIES += RivetMCAnalyses.la
RivetMCAnalyses_la_SOURCES = \
- ExampleAnalysis.cc \
+ EXAMPLE.cc \
MC_GENERIC.cc \
MC_JETS.cc \
MC_PHOTONJETS.cc \
Copied and modified: branches/2011-07-aida2yoda/src/Analyses/PDG_HADRON_MULTIPLICITIES.cc (from r3478, trunk/src/Analyses/PDG_HADRON_MULTIPLICITIES.cc)
==============================================================================
--- trunk/src/Analyses/PDG_HADRON_MULTIPLICITIES.cc Wed Nov 9 18:01:58 2011 (r3478, copy source)
+++ branches/2011-07-aida2yoda/src/Analyses/PDG_HADRON_MULTIPLICITIES.cc Tue Dec 6 14:00:18 2011 (r3509)
@@ -1,6 +1,6 @@
// -*- C++ -*-
#include "Rivet/Analysis.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
#include "Rivet/Tools/ParticleIdUtils.hh"
#include "Rivet/Projections/FinalState.hh"
#include "Rivet/Projections/ChargedFinalState.hh"
@@ -48,104 +48,104 @@
const PdgId id = abs(p.pdgId());
switch (id) {
case 211:
- _histMeanMultiPiPlus->fill(_histMeanMultiPiPlus->binMean(0), weight);
+ _histMeanMultiPiPlus->fill(_histMeanMultiPiPlus->bin(0).xMean(), weight);
break;
case 111:
- _histMeanMultiPi0->fill(_histMeanMultiPi0->binMean(0), weight);
+ _histMeanMultiPi0->fill(_histMeanMultiPi0->bin(0).xMean(), weight);
break;
case 321:
- _histMeanMultiKPlus->fill(_histMeanMultiKPlus->binMean(0), weight);
+ _histMeanMultiKPlus->fill(_histMeanMultiKPlus->bin(0).xMean(), weight);
break;
case 130:
case 310:
- _histMeanMultiK0->fill(_histMeanMultiK0->binMean(0), weight);
+ _histMeanMultiK0->fill(_histMeanMultiK0->bin(0).xMean(), weight);
break;
case 221:
- _histMeanMultiEta->fill(_histMeanMultiEta->binMean(0), weight);
+ _histMeanMultiEta->fill(_histMeanMultiEta->bin(0).xMean(), weight);
break;
case 331:
- _histMeanMultiEtaPrime->fill(_histMeanMultiEtaPrime->binMean(0), weight);
+ _histMeanMultiEtaPrime->fill(_histMeanMultiEtaPrime->bin(0).xMean(), weight);
break;
case 411:
- _histMeanMultiDPlus->fill(_histMeanMultiDPlus->binMean(0), weight);
+ _histMeanMultiDPlus->fill(_histMeanMultiDPlus->bin(0).xMean(), weight);
break;
case 421:
- _histMeanMultiD0->fill(_histMeanMultiD0->binMean(0), weight);
+ _histMeanMultiD0->fill(_histMeanMultiD0->bin(0).xMean(), weight);
break;
case 431:
- _histMeanMultiDPlus_s->fill(_histMeanMultiDPlus_s->binMean(0), weight);
+ _histMeanMultiDPlus_s->fill(_histMeanMultiDPlus_s->bin(0).xMean(), weight);
break;
case 9010221:
- _histMeanMultiF0_980->fill(_histMeanMultiF0_980->binMean(0), weight);
+ _histMeanMultiF0_980->fill(_histMeanMultiF0_980->bin(0).xMean(), weight);
break;
case 113:
- _histMeanMultiRho770_0->fill(_histMeanMultiRho770_0->binMean(0), weight);
+ _histMeanMultiRho770_0->fill(_histMeanMultiRho770_0->bin(0).xMean(), weight);
break;
case 223:
- _histMeanMultiOmega782->fill(_histMeanMultiOmega782->binMean(0), weight);
+ _histMeanMultiOmega782->fill(_histMeanMultiOmega782->bin(0).xMean(), weight);
break;
case 323:
- _histMeanMultiKStar892Plus->fill(_histMeanMultiKStar892Plus->binMean(0), weight);
+ _histMeanMultiKStar892Plus->fill(_histMeanMultiKStar892Plus->bin(0).xMean(), weight);
break;
case 313:
- _histMeanMultiKStar892_0->fill(_histMeanMultiKStar892_0->binMean(0), weight);
+ _histMeanMultiKStar892_0->fill(_histMeanMultiKStar892_0->bin(0).xMean(), weight);
break;
case 333:
- _histMeanMultiPhi1020->fill(_histMeanMultiPhi1020->binMean(0), weight);
+ _histMeanMultiPhi1020->fill(_histMeanMultiPhi1020->bin(0).xMean(), weight);
break;
case 413:
- _histMeanMultiDStar2010Plus->fill(_histMeanMultiDStar2010Plus->binMean(0), weight);
+ _histMeanMultiDStar2010Plus->fill(_histMeanMultiDStar2010Plus->bin(0).xMean(), weight);
break;
case 423:
- _histMeanMultiDStar2007_0->fill(_histMeanMultiDStar2007_0->binMean(0), weight);
+ _histMeanMultiDStar2007_0->fill(_histMeanMultiDStar2007_0->bin(0).xMean(), weight);
break;
case 433:
- _histMeanMultiDStar_s2112Plus->fill(_histMeanMultiDStar_s2112Plus->binMean(0), weight);
+ _histMeanMultiDStar_s2112Plus->fill(_histMeanMultiDStar_s2112Plus->bin(0).xMean(), weight);
break;
case 443:
- _histMeanMultiJPsi1S->fill(_histMeanMultiJPsi1S->binMean(0), weight);
+ _histMeanMultiJPsi1S->fill(_histMeanMultiJPsi1S->bin(0).xMean(), weight);
break;
case 225:
- _histMeanMultiF2_1270->fill(_histMeanMultiF2_1270->binMean(0), weight);
+ _histMeanMultiF2_1270->fill(_histMeanMultiF2_1270->bin(0).xMean(), weight);
break;
case 2212:
- _histMeanMultiP->fill(_histMeanMultiP->binMean(0), weight);
+ _histMeanMultiP->fill(_histMeanMultiP->bin(0).xMean(), weight);
break;
case 3122:
- _histMeanMultiLambda->fill(_histMeanMultiLambda->binMean(0), weight);
+ _histMeanMultiLambda->fill(_histMeanMultiLambda->bin(0).xMean(), weight);
break;
case 3212:
- _histMeanMultiSigma0->fill(_histMeanMultiSigma0->binMean(0), weight);
+ _histMeanMultiSigma0->fill(_histMeanMultiSigma0->bin(0).xMean(), weight);
break;
case 3312:
- _histMeanMultiXiMinus->fill(_histMeanMultiXiMinus->binMean(0), weight);
+ _histMeanMultiXiMinus->fill(_histMeanMultiXiMinus->bin(0).xMean(), weight);
break;
case 2224:
- _histMeanMultiDelta1232PlusPlus->fill(_histMeanMultiDelta1232PlusPlus->binMean(0), weight);
+ _histMeanMultiDelta1232PlusPlus->fill(_histMeanMultiDelta1232PlusPlus->bin(0).xMean(), weight);
break;
case 3114:
- _histMeanMultiSigma1385Minus->fill(_histMeanMultiSigma1385Minus->binMean(0), weight);
- _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->binMean(0), weight);
+ _histMeanMultiSigma1385Minus->fill(_histMeanMultiSigma1385Minus->bin(0).xMean(), weight);
+ _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->bin(0).xMean(), weight);
break;
case 3224:
- _histMeanMultiSigma1385Plus->fill(_histMeanMultiSigma1385Plus->binMean(0), weight);
- _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->binMean(0), weight);
+ _histMeanMultiSigma1385Plus->fill(_histMeanMultiSigma1385Plus->bin(0).xMean(), weight);
+ _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->bin(0).xMean(), weight);
break;
case 3324:
- _histMeanMultiXi1530_0->fill(_histMeanMultiXi1530_0->binMean(0), weight);
+ _histMeanMultiXi1530_0->fill(_histMeanMultiXi1530_0->bin(0).xMean(), weight);
break;
case 3334:
- _histMeanMultiOmegaMinus->fill(_histMeanMultiOmegaMinus->binMean(0), weight);
+ _histMeanMultiOmegaMinus->fill(_histMeanMultiOmegaMinus->bin(0).xMean(), weight);
break;
case 4122:
- _histMeanMultiLambda_c_Plus->fill(_histMeanMultiLambda_c_Plus->binMean(0), weight);
+ _histMeanMultiLambda_c_Plus->fill(_histMeanMultiLambda_c_Plus->bin(0).xMean(), weight);
break;
case 4222:
case 4112:
- _histMeanMultiSigma_c_PlusPlus_0->fill(_histMeanMultiSigma_c_PlusPlus_0->binMean(0), weight);
+ _histMeanMultiSigma_c_PlusPlus_0->fill(_histMeanMultiSigma_c_PlusPlus_0->bin(0).xMean(), weight);
break;
case 3124:
- _histMeanMultiLambda1520->fill(_histMeanMultiLambda1520->binMean(0), weight);
+ _histMeanMultiLambda1520->fill(_histMeanMultiLambda1520->bin(0).xMean(), weight);
break;
}
}
@@ -156,85 +156,85 @@
const PdgId id = abs(p.pdgId());
switch (id) {
case 211:
- _histMeanMultiPiPlus->fill(_histMeanMultiPiPlus->binMean(0), weight);
+ _histMeanMultiPiPlus->fill(_histMeanMultiPiPlus->bin(0).xMean(), weight);
break;
case 111:
- _histMeanMultiPi0->fill(_histMeanMultiPi0->binMean(0), weight);
+ _histMeanMultiPi0->fill(_histMeanMultiPi0->bin(0).xMean(), weight);
break;
case 321:
- _histMeanMultiKPlus->fill(_histMeanMultiKPlus->binMean(0), weight);
+ _histMeanMultiKPlus->fill(_histMeanMultiKPlus->bin(0).xMean(), weight);
break;
case 130:
case 310:
- _histMeanMultiK0->fill(_histMeanMultiK0->binMean(0), weight);
+ _histMeanMultiK0->fill(_histMeanMultiK0->bin(0).xMean(), weight);
break;
case 221:
- _histMeanMultiEta->fill(_histMeanMultiEta->binMean(0), weight);
+ _histMeanMultiEta->fill(_histMeanMultiEta->bin(0).xMean(), weight);
break;
case 331:
- _histMeanMultiEtaPrime->fill(_histMeanMultiEtaPrime->binMean(0), weight);
+ _histMeanMultiEtaPrime->fill(_histMeanMultiEtaPrime->bin(0).xMean(), weight);
break;
case 411:
- _histMeanMultiDPlus->fill(_histMeanMultiDPlus->binMean(0), weight);
+ _histMeanMultiDPlus->fill(_histMeanMultiDPlus->bin(0).xMean(), weight);
break;
case 421:
- _histMeanMultiD0->fill(_histMeanMultiD0->binMean(0), weight);
+ _histMeanMultiD0->fill(_histMeanMultiD0->bin(0).xMean(), weight);
break;
case 431:
- _histMeanMultiDPlus_s->fill(_histMeanMultiDPlus_s->binMean(0), weight);
+ _histMeanMultiDPlus_s->fill(_histMeanMultiDPlus_s->bin(0).xMean(), weight);
break;
case 9010221:
- _histMeanMultiF0_980->fill(_histMeanMultiF0_980->binMean(0), weight);
+ _histMeanMultiF0_980->fill(_histMeanMultiF0_980->bin(0).xMean(), weight);
break;
case 113:
- _histMeanMultiRho770_0->fill(_histMeanMultiRho770_0->binMean(0), weight);
+ _histMeanMultiRho770_0->fill(_histMeanMultiRho770_0->bin(0).xMean(), weight);
break;
case 323:
- _histMeanMultiKStar892Plus->fill(_histMeanMultiKStar892Plus->binMean(0), weight);
+ _histMeanMultiKStar892Plus->fill(_histMeanMultiKStar892Plus->bin(0).xMean(), weight);
break;
case 313:
- _histMeanMultiKStar892_0->fill(_histMeanMultiKStar892_0->binMean(0), weight);
+ _histMeanMultiKStar892_0->fill(_histMeanMultiKStar892_0->bin(0).xMean(), weight);
break;
case 333:
- _histMeanMultiPhi1020->fill(_histMeanMultiPhi1020->binMean(0), weight);
+ _histMeanMultiPhi1020->fill(_histMeanMultiPhi1020->bin(0).xMean(), weight);
break;
case 413:
- _histMeanMultiDStar2010Plus->fill(_histMeanMultiDStar2010Plus->binMean(0), weight);
+ _histMeanMultiDStar2010Plus->fill(_histMeanMultiDStar2010Plus->bin(0).xMean(), weight);
break;
case 423:
- _histMeanMultiDStar2007_0->fill(_histMeanMultiDStar2007_0->binMean(0), weight);
+ _histMeanMultiDStar2007_0->fill(_histMeanMultiDStar2007_0->bin(0).xMean(), weight);
break;
case 225:
- _histMeanMultiF2_1270->fill(_histMeanMultiF2_1270->binMean(0), weight);
+ _histMeanMultiF2_1270->fill(_histMeanMultiF2_1270->bin(0).xMean(), weight);
break;
case 325:
- _histMeanMultiK2Star1430Plus->fill(_histMeanMultiK2Star1430Plus->binMean(0), weight);
+ _histMeanMultiK2Star1430Plus->fill(_histMeanMultiK2Star1430Plus->bin(0).xMean(), weight);
break;
case 315:
- _histMeanMultiK2Star1430_0->fill(_histMeanMultiK2Star1430_0->binMean(0), weight);
+ _histMeanMultiK2Star1430_0->fill(_histMeanMultiK2Star1430_0->bin(0).xMean(), weight);
break;
case 2212:
- _histMeanMultiP->fill(_histMeanMultiP->binMean(0), weight);
+ _histMeanMultiP->fill(_histMeanMultiP->bin(0).xMean(), weight);
break;
case 3122:
- _histMeanMultiLambda->fill(_histMeanMultiLambda->binMean(0), weight);
+ _histMeanMultiLambda->fill(_histMeanMultiLambda->bin(0).xMean(), weight);
break;
case 3312:
- _histMeanMultiXiMinus->fill(_histMeanMultiXiMinus->binMean(0), weight);
+ _histMeanMultiXiMinus->fill(_histMeanMultiXiMinus->bin(0).xMean(), weight);
break;
case 3114:
- _histMeanMultiSigma1385Minus->fill(_histMeanMultiSigma1385Minus->binMean(0), weight);
- _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->binMean(0), weight);
+ _histMeanMultiSigma1385Minus->fill(_histMeanMultiSigma1385Minus->bin(0).xMean(), weight);
+ _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->bin(0).xMean(), weight);
break;
case 3224:
- _histMeanMultiSigma1385Plus->fill(_histMeanMultiSigma1385Plus->binMean(0), weight);
- _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->binMean(0), weight);
+ _histMeanMultiSigma1385Plus->fill(_histMeanMultiSigma1385Plus->bin(0).xMean(), weight);
+ _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->bin(0).xMean(), weight);
break;
case 3334:
- _histMeanMultiOmegaMinus->fill(_histMeanMultiOmegaMinus->binMean(0), weight);
+ _histMeanMultiOmegaMinus->fill(_histMeanMultiOmegaMinus->bin(0).xMean(), weight);
break;
case 4122:
- _histMeanMultiLambda_c_Plus->fill(_histMeanMultiLambda_c_Plus->binMean(0), weight);
+ _histMeanMultiLambda_c_Plus->fill(_histMeanMultiLambda_c_Plus->bin(0).xMean(), weight);
break;
}
}
@@ -245,162 +245,162 @@
const PdgId id = abs(p.pdgId());
switch (id) {
case 211:
- _histMeanMultiPiPlus->fill(_histMeanMultiPiPlus->binMean(0), weight);
+ _histMeanMultiPiPlus->fill(_histMeanMultiPiPlus->bin(0).xMean(), weight);
break;
case 111:
- _histMeanMultiPi0->fill(_histMeanMultiPi0->binMean(0), weight);
+ _histMeanMultiPi0->fill(_histMeanMultiPi0->bin(0).xMean(), weight);
break;
case 321:
- _histMeanMultiKPlus->fill(_histMeanMultiKPlus->binMean(0), weight);
+ _histMeanMultiKPlus->fill(_histMeanMultiKPlus->bin(0).xMean(), weight);
break;
case 130:
case 310:
- _histMeanMultiK0->fill(_histMeanMultiK0->binMean(0), weight);
+ _histMeanMultiK0->fill(_histMeanMultiK0->bin(0).xMean(), weight);
break;
case 221:
- _histMeanMultiEta->fill(_histMeanMultiEta->binMean(0), weight);
+ _histMeanMultiEta->fill(_histMeanMultiEta->bin(0).xMean(), weight);
break;
case 331:
- _histMeanMultiEtaPrime->fill(_histMeanMultiEtaPrime->binMean(0), weight);
+ _histMeanMultiEtaPrime->fill(_histMeanMultiEtaPrime->bin(0).xMean(), weight);
break;
case 411:
- _histMeanMultiDPlus->fill(_histMeanMultiDPlus->binMean(0), weight);
+ _histMeanMultiDPlus->fill(_histMeanMultiDPlus->bin(0).xMean(), weight);
break;
case 421:
- _histMeanMultiD0->fill(_histMeanMultiD0->binMean(0), weight);
+ _histMeanMultiD0->fill(_histMeanMultiD0->bin(0).xMean(), weight);
break;
case 431:
- _histMeanMultiDPlus_s->fill(_histMeanMultiDPlus_s->binMean(0), weight);
+ _histMeanMultiDPlus_s->fill(_histMeanMultiDPlus_s->bin(0).xMean(), weight);
break;
case 511:
- _histMeanMultiBPlus_B0_d->fill(_histMeanMultiBPlus_B0_d->binMean(0), weight);
+ _histMeanMultiBPlus_B0_d->fill(_histMeanMultiBPlus_B0_d->bin(0).xMean(), weight);
break;
case 521:
- _histMeanMultiBPlus_B0_d->fill(_histMeanMultiBPlus_B0_d->binMean(0), weight);
- _histMeanMultiBPlus_u->fill(_histMeanMultiBPlus_u->binMean(0), weight);
+ _histMeanMultiBPlus_B0_d->fill(_histMeanMultiBPlus_B0_d->bin(0).xMean(), weight);
+ _histMeanMultiBPlus_u->fill(_histMeanMultiBPlus_u->bin(0).xMean(), weight);
break;
case 531:
- _histMeanMultiB0_s->fill(_histMeanMultiB0_s->binMean(0), weight);
+ _histMeanMultiB0_s->fill(_histMeanMultiB0_s->bin(0).xMean(), weight);
break;
case 9010221:
- _histMeanMultiF0_980->fill(_histMeanMultiF0_980->binMean(0), weight);
+ _histMeanMultiF0_980->fill(_histMeanMultiF0_980->bin(0).xMean(), weight);
break;
case 9000211:
- _histMeanMultiA0_980Plus->fill(_histMeanMultiA0_980Plus->binMean(0), weight);
+ _histMeanMultiA0_980Plus->fill(_histMeanMultiA0_980Plus->bin(0).xMean(), weight);
break;
case 113:
- _histMeanMultiRho770_0->fill(_histMeanMultiRho770_0->binMean(0), weight);
+ _histMeanMultiRho770_0->fill(_histMeanMultiRho770_0->bin(0).xMean(), weight);
break;
case 213:
- _histMeanMultiRho770Plus->fill(_histMeanMultiRho770Plus->binMean(0), weight);
+ _histMeanMultiRho770Plus->fill(_histMeanMultiRho770Plus->bin(0).xMean(), weight);
break;
case 223:
- _histMeanMultiOmega782->fill(_histMeanMultiOmega782->binMean(0), weight);
+ _histMeanMultiOmega782->fill(_histMeanMultiOmega782->bin(0).xMean(), weight);
break;
case 323:
- _histMeanMultiKStar892Plus->fill(_histMeanMultiKStar892Plus->binMean(0), weight);
+ _histMeanMultiKStar892Plus->fill(_histMeanMultiKStar892Plus->bin(0).xMean(), weight);
break;
case 313:
- _histMeanMultiKStar892_0->fill(_histMeanMultiKStar892_0->binMean(0), weight);
+ _histMeanMultiKStar892_0->fill(_histMeanMultiKStar892_0->bin(0).xMean(), weight);
break;
case 333:
- _histMeanMultiPhi1020->fill(_histMeanMultiPhi1020->binMean(0), weight);
+ _histMeanMultiPhi1020->fill(_histMeanMultiPhi1020->bin(0).xMean(), weight);
break;
case 413:
- _histMeanMultiDStar2010Plus->fill(_histMeanMultiDStar2010Plus->binMean(0), weight);
+ _histMeanMultiDStar2010Plus->fill(_histMeanMultiDStar2010Plus->bin(0).xMean(), weight);
break;
case 433:
- _histMeanMultiDStar_s2112Plus->fill(_histMeanMultiDStar_s2112Plus->binMean(0), weight);
+ _histMeanMultiDStar_s2112Plus->fill(_histMeanMultiDStar_s2112Plus->bin(0).xMean(), weight);
break;
case 513:
case 523:
case 533:
- _histMeanMultiBStar->fill(_histMeanMultiBStar->binMean(0), weight);
+ _histMeanMultiBStar->fill(_histMeanMultiBStar->bin(0).xMean(), weight);
break;
case 443:
- _histMeanMultiJPsi1S->fill(_histMeanMultiJPsi1S->binMean(0), weight);
+ _histMeanMultiJPsi1S->fill(_histMeanMultiJPsi1S->bin(0).xMean(), weight);
break;
case 100443:
- _histMeanMultiPsi2S->fill(_histMeanMultiPsi2S->binMean(0), weight);
+ _histMeanMultiPsi2S->fill(_histMeanMultiPsi2S->bin(0).xMean(), weight);
break;
case 553:
- _histMeanMultiUpsilon1S->fill(_histMeanMultiUpsilon1S->binMean(0), weight);
+ _histMeanMultiUpsilon1S->fill(_histMeanMultiUpsilon1S->bin(0).xMean(), weight);
break;
case 20223:
- _histMeanMultiF1_1285->fill(_histMeanMultiF1_1285->binMean(0), weight);
+ _histMeanMultiF1_1285->fill(_histMeanMultiF1_1285->bin(0).xMean(), weight);
break;
case 20333:
- _histMeanMultiF1_1420->fill(_histMeanMultiF1_1420->binMean(0), weight);
+ _histMeanMultiF1_1420->fill(_histMeanMultiF1_1420->bin(0).xMean(), weight);
break;
case 445:
- _histMeanMultiChi_c1_3510->fill(_histMeanMultiChi_c1_3510->binMean(0), weight);
+ _histMeanMultiChi_c1_3510->fill(_histMeanMultiChi_c1_3510->bin(0).xMean(), weight);
break;
case 225:
- _histMeanMultiF2_1270->fill(_histMeanMultiF2_1270->binMean(0), weight);
+ _histMeanMultiF2_1270->fill(_histMeanMultiF2_1270->bin(0).xMean(), weight);
break;
case 335:
- _histMeanMultiF2Prime1525->fill(_histMeanMultiF2Prime1525->binMean(0), weight);
+ _histMeanMultiF2Prime1525->fill(_histMeanMultiF2Prime1525->bin(0).xMean(), weight);
break;
case 315:
- _histMeanMultiK2Star1430_0->fill(_histMeanMultiK2Star1430_0->binMean(0), weight);
+ _histMeanMultiK2Star1430_0->fill(_histMeanMultiK2Star1430_0->bin(0).xMean(), weight);
break;
case 515:
case 525:
case 535:
- _histMeanMultiBStarStar->fill(_histMeanMultiBStarStar->binMean(0), weight);
+ _histMeanMultiBStarStar->fill(_histMeanMultiBStarStar->bin(0).xMean(), weight);
break;
case 10433:
case 20433:
- _histMeanMultiDs1Plus->fill(_histMeanMultiDs1Plus->binMean(0), weight);
+ _histMeanMultiDs1Plus->fill(_histMeanMultiDs1Plus->bin(0).xMean(), weight);
break;
case 435:
- _histMeanMultiDs2Plus->fill(_histMeanMultiDs2Plus->binMean(0), weight);
+ _histMeanMultiDs2Plus->fill(_histMeanMultiDs2Plus->bin(0).xMean(), weight);
break;
case 2212:
- _histMeanMultiP->fill(_histMeanMultiP->binMean(0), weight);
+ _histMeanMultiP->fill(_histMeanMultiP->bin(0).xMean(), weight);
break;
case 3122:
- _histMeanMultiLambda->fill(_histMeanMultiLambda->binMean(0), weight);
+ _histMeanMultiLambda->fill(_histMeanMultiLambda->bin(0).xMean(), weight);
break;
case 3212:
- _histMeanMultiSigma0->fill(_histMeanMultiSigma0->binMean(0), weight);
+ _histMeanMultiSigma0->fill(_histMeanMultiSigma0->bin(0).xMean(), weight);
break;
case 3112:
- _histMeanMultiSigmaMinus->fill(_histMeanMultiSigmaMinus->binMean(0), weight);
- _histMeanMultiSigmaPlusMinus->fill(_histMeanMultiSigmaPlusMinus->binMean(0), weight);
+ _histMeanMultiSigmaMinus->fill(_histMeanMultiSigmaMinus->bin(0).xMean(), weight);
+ _histMeanMultiSigmaPlusMinus->fill(_histMeanMultiSigmaPlusMinus->bin(0).xMean(), weight);
break;
case 3222:
- _histMeanMultiSigmaPlus->fill(_histMeanMultiSigmaPlus->binMean(0), weight);
- _histMeanMultiSigmaPlusMinus->fill(_histMeanMultiSigmaPlusMinus->binMean(0), weight);
+ _histMeanMultiSigmaPlus->fill(_histMeanMultiSigmaPlus->bin(0).xMean(), weight);
+ _histMeanMultiSigmaPlusMinus->fill(_histMeanMultiSigmaPlusMinus->bin(0).xMean(), weight);
break;
case 3312:
- _histMeanMultiXiMinus->fill(_histMeanMultiXiMinus->binMean(0), weight);
+ _histMeanMultiXiMinus->fill(_histMeanMultiXiMinus->bin(0).xMean(), weight);
break;
case 2224:
- _histMeanMultiDelta1232PlusPlus->fill(_histMeanMultiDelta1232PlusPlus->binMean(0), weight);
+ _histMeanMultiDelta1232PlusPlus->fill(_histMeanMultiDelta1232PlusPlus->bin(0).xMean(), weight);
break;
case 3114:
- _histMeanMultiSigma1385Minus->fill(_histMeanMultiSigma1385Minus->binMean(0), weight);
- _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->binMean(0), weight);
+ _histMeanMultiSigma1385Minus->fill(_histMeanMultiSigma1385Minus->bin(0).xMean(), weight);
+ _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->bin(0).xMean(), weight);
break;
case 3224:
- _histMeanMultiSigma1385Plus->fill(_histMeanMultiSigma1385Plus->binMean(0), weight);
- _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->binMean(0), weight);
+ _histMeanMultiSigma1385Plus->fill(_histMeanMultiSigma1385Plus->bin(0).xMean(), weight);
+ _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->bin(0).xMean(), weight);
break;
case 3324:
- _histMeanMultiXi1530_0->fill(_histMeanMultiXi1530_0->binMean(0), weight);
+ _histMeanMultiXi1530_0->fill(_histMeanMultiXi1530_0->bin(0).xMean(), weight);
break;
case 3334:
- _histMeanMultiOmegaMinus->fill(_histMeanMultiOmegaMinus->binMean(0), weight);
+ _histMeanMultiOmegaMinus->fill(_histMeanMultiOmegaMinus->bin(0).xMean(), weight);
break;
case 4122:
- _histMeanMultiLambda_c_Plus->fill(_histMeanMultiLambda_c_Plus->binMean(0), weight);
+ _histMeanMultiLambda_c_Plus->fill(_histMeanMultiLambda_c_Plus->bin(0).xMean(), weight);
break;
case 5122:
- _histMeanMultiLambda_b_0->fill(_histMeanMultiLambda_b_0->binMean(0), weight);
+ _histMeanMultiLambda_b_0->fill(_histMeanMultiLambda_b_0->bin(0).xMean(), weight);
break;
case 3124:
- _histMeanMultiLambda1520->fill(_histMeanMultiLambda1520->binMean(0), weight);
+ _histMeanMultiLambda1520->fill(_histMeanMultiLambda1520->bin(0).xMean(), weight);
break;
}
}
@@ -411,20 +411,20 @@
const PdgId id = abs(p.pdgId());
switch (id) {
case 211:
- _histMeanMultiPiPlus->fill(_histMeanMultiPiPlus->binMean(0), weight);
+ _histMeanMultiPiPlus->fill(_histMeanMultiPiPlus->bin(0).xMean(), weight);
break;
case 321:
- _histMeanMultiKPlus->fill(_histMeanMultiKPlus->binMean(0), weight);
+ _histMeanMultiKPlus->fill(_histMeanMultiKPlus->bin(0).xMean(), weight);
break;
case 130:
case 310:
- _histMeanMultiK0->fill(_histMeanMultiK0->binMean(0), weight);
+ _histMeanMultiK0->fill(_histMeanMultiK0->bin(0).xMean(), weight);
break;
case 2212:
- _histMeanMultiP->fill(_histMeanMultiP->binMean(0), weight);
+ _histMeanMultiP->fill(_histMeanMultiP->bin(0).xMean(), weight);
break;
case 3122:
- _histMeanMultiLambda->fill(_histMeanMultiLambda->binMean(0), weight);
+ _histMeanMultiLambda->fill(_histMeanMultiLambda->bin(0).xMean(), weight);
break;
}
}
@@ -439,131 +439,131 @@
addProjection(UnstableFinalState(), "UFS");
if (sqrtS()/GeV >= 9.5 && sqrtS()/GeV <= 10.5) {
- _histMeanMultiPiPlus = bookHistogram1D( 1, 1, 1);
- _histMeanMultiPi0 = bookHistogram1D( 2, 1, 1);
- _histMeanMultiKPlus = bookHistogram1D( 3, 1, 1);
- _histMeanMultiK0 = bookHistogram1D( 4, 1, 1);
- _histMeanMultiEta = bookHistogram1D( 5, 1, 1);
- _histMeanMultiEtaPrime = bookHistogram1D( 6, 1, 1);
- _histMeanMultiDPlus = bookHistogram1D( 7, 1, 1);
- _histMeanMultiD0 = bookHistogram1D( 8, 1, 1);
- _histMeanMultiDPlus_s = bookHistogram1D( 9, 1, 1);
- _histMeanMultiF0_980 = bookHistogram1D(13, 1, 1);
- _histMeanMultiRho770_0 = bookHistogram1D(15, 1, 1);
- _histMeanMultiOmega782 = bookHistogram1D(17, 1, 1);
- _histMeanMultiKStar892Plus = bookHistogram1D(18, 1, 1);
- _histMeanMultiKStar892_0 = bookHistogram1D(19, 1, 1);
- _histMeanMultiPhi1020 = bookHistogram1D(20, 1, 1);
- _histMeanMultiDStar2010Plus = bookHistogram1D(21, 1, 1);
- _histMeanMultiDStar2007_0 = bookHistogram1D(22, 1, 1);
- _histMeanMultiDStar_s2112Plus = bookHistogram1D(23, 1, 1);
- _histMeanMultiJPsi1S = bookHistogram1D(25, 1, 1);
- _histMeanMultiF2_1270 = bookHistogram1D(31, 1, 1);
- _histMeanMultiP = bookHistogram1D(38, 1, 1);
- _histMeanMultiLambda = bookHistogram1D(39, 1, 1);
- _histMeanMultiSigma0 = bookHistogram1D(40, 1, 1);
- _histMeanMultiXiMinus = bookHistogram1D(44, 1, 1);
- _histMeanMultiDelta1232PlusPlus = bookHistogram1D(45, 1, 1);
- _histMeanMultiSigma1385Minus = bookHistogram1D(46, 1, 1);
- _histMeanMultiSigma1385Plus = bookHistogram1D(47, 1, 1);
- _histMeanMultiSigma1385PlusMinus = bookHistogram1D(48, 1, 1);
- _histMeanMultiXi1530_0 = bookHistogram1D(49, 1, 1);
- _histMeanMultiOmegaMinus = bookHistogram1D(50, 1, 1);
- _histMeanMultiLambda_c_Plus = bookHistogram1D(51, 1, 1);
- _histMeanMultiSigma_c_PlusPlus_0 = bookHistogram1D(53, 1, 1);
- _histMeanMultiLambda1520 = bookHistogram1D(54, 1, 1);
+ _histMeanMultiPiPlus = bookHisto1D( 1, 1, 1);
+ _histMeanMultiPi0 = bookHisto1D( 2, 1, 1);
+ _histMeanMultiKPlus = bookHisto1D( 3, 1, 1);
+ _histMeanMultiK0 = bookHisto1D( 4, 1, 1);
+ _histMeanMultiEta = bookHisto1D( 5, 1, 1);
+ _histMeanMultiEtaPrime = bookHisto1D( 6, 1, 1);
+ _histMeanMultiDPlus = bookHisto1D( 7, 1, 1);
+ _histMeanMultiD0 = bookHisto1D( 8, 1, 1);
+ _histMeanMultiDPlus_s = bookHisto1D( 9, 1, 1);
+ _histMeanMultiF0_980 = bookHisto1D(13, 1, 1);
+ _histMeanMultiRho770_0 = bookHisto1D(15, 1, 1);
+ _histMeanMultiOmega782 = bookHisto1D(17, 1, 1);
+ _histMeanMultiKStar892Plus = bookHisto1D(18, 1, 1);
+ _histMeanMultiKStar892_0 = bookHisto1D(19, 1, 1);
+ _histMeanMultiPhi1020 = bookHisto1D(20, 1, 1);
+ _histMeanMultiDStar2010Plus = bookHisto1D(21, 1, 1);
+ _histMeanMultiDStar2007_0 = bookHisto1D(22, 1, 1);
+ _histMeanMultiDStar_s2112Plus = bookHisto1D(23, 1, 1);
+ _histMeanMultiJPsi1S = bookHisto1D(25, 1, 1);
+ _histMeanMultiF2_1270 = bookHisto1D(31, 1, 1);
+ _histMeanMultiP = bookHisto1D(38, 1, 1);
+ _histMeanMultiLambda = bookHisto1D(39, 1, 1);
+ _histMeanMultiSigma0 = bookHisto1D(40, 1, 1);
+ _histMeanMultiXiMinus = bookHisto1D(44, 1, 1);
+ _histMeanMultiDelta1232PlusPlus = bookHisto1D(45, 1, 1);
+ _histMeanMultiSigma1385Minus = bookHisto1D(46, 1, 1);
+ _histMeanMultiSigma1385Plus = bookHisto1D(47, 1, 1);
+ _histMeanMultiSigma1385PlusMinus = bookHisto1D(48, 1, 1);
+ _histMeanMultiXi1530_0 = bookHisto1D(49, 1, 1);
+ _histMeanMultiOmegaMinus = bookHisto1D(50, 1, 1);
+ _histMeanMultiLambda_c_Plus = bookHisto1D(51, 1, 1);
+ _histMeanMultiSigma_c_PlusPlus_0 = bookHisto1D(53, 1, 1);
+ _histMeanMultiLambda1520 = bookHisto1D(54, 1, 1);
}
if (sqrtS()/GeV >= 29 && sqrtS()/GeV <= 35) {
- _histMeanMultiPiPlus = bookHistogram1D( 1, 1, 2);
- _histMeanMultiPi0 = bookHistogram1D( 2, 1, 2);
- _histMeanMultiKPlus = bookHistogram1D( 3, 1, 2);
- _histMeanMultiK0 = bookHistogram1D( 4, 1, 2);
- _histMeanMultiEta = bookHistogram1D( 5, 1, 2);
- _histMeanMultiEtaPrime = bookHistogram1D( 6, 1, 2);
- _histMeanMultiDPlus = bookHistogram1D( 7, 1, 2);
- _histMeanMultiD0 = bookHistogram1D( 8, 1, 2);
- _histMeanMultiDPlus_s = bookHistogram1D( 9, 1, 2);
- _histMeanMultiF0_980 = bookHistogram1D(13, 1, 2);
- _histMeanMultiRho770_0 = bookHistogram1D(15, 1, 2);
- _histMeanMultiKStar892Plus = bookHistogram1D(18, 1, 2);
- _histMeanMultiKStar892_0 = bookHistogram1D(19, 1, 2);
- _histMeanMultiPhi1020 = bookHistogram1D(20, 1, 2);
- _histMeanMultiDStar2010Plus = bookHistogram1D(21, 1, 2);
- _histMeanMultiDStar2007_0 = bookHistogram1D(22, 1, 2);
- _histMeanMultiF2_1270 = bookHistogram1D(31, 1, 2);
- _histMeanMultiK2Star1430Plus = bookHistogram1D(33, 1, 1);
- _histMeanMultiK2Star1430_0 = bookHistogram1D(34, 1, 1);
- _histMeanMultiP = bookHistogram1D(38, 1, 2);
- _histMeanMultiLambda = bookHistogram1D(39, 1, 2);
- _histMeanMultiXiMinus = bookHistogram1D(44, 1, 2);
- _histMeanMultiSigma1385Minus = bookHistogram1D(46, 1, 2);
- _histMeanMultiSigma1385Plus = bookHistogram1D(47, 1, 2);
- _histMeanMultiSigma1385PlusMinus = bookHistogram1D(48, 1, 2);
- _histMeanMultiOmegaMinus = bookHistogram1D(50, 1, 2);
- _histMeanMultiLambda_c_Plus = bookHistogram1D(51, 1, 2);
+ _histMeanMultiPiPlus = bookHisto1D( 1, 1, 2);
+ _histMeanMultiPi0 = bookHisto1D( 2, 1, 2);
+ _histMeanMultiKPlus = bookHisto1D( 3, 1, 2);
+ _histMeanMultiK0 = bookHisto1D( 4, 1, 2);
+ _histMeanMultiEta = bookHisto1D( 5, 1, 2);
+ _histMeanMultiEtaPrime = bookHisto1D( 6, 1, 2);
+ _histMeanMultiDPlus = bookHisto1D( 7, 1, 2);
+ _histMeanMultiD0 = bookHisto1D( 8, 1, 2);
+ _histMeanMultiDPlus_s = bookHisto1D( 9, 1, 2);
+ _histMeanMultiF0_980 = bookHisto1D(13, 1, 2);
+ _histMeanMultiRho770_0 = bookHisto1D(15, 1, 2);
+ _histMeanMultiKStar892Plus = bookHisto1D(18, 1, 2);
+ _histMeanMultiKStar892_0 = bookHisto1D(19, 1, 2);
+ _histMeanMultiPhi1020 = bookHisto1D(20, 1, 2);
+ _histMeanMultiDStar2010Plus = bookHisto1D(21, 1, 2);
+ _histMeanMultiDStar2007_0 = bookHisto1D(22, 1, 2);
+ _histMeanMultiF2_1270 = bookHisto1D(31, 1, 2);
+ _histMeanMultiK2Star1430Plus = bookHisto1D(33, 1, 1);
+ _histMeanMultiK2Star1430_0 = bookHisto1D(34, 1, 1);
+ _histMeanMultiP = bookHisto1D(38, 1, 2);
+ _histMeanMultiLambda = bookHisto1D(39, 1, 2);
+ _histMeanMultiXiMinus = bookHisto1D(44, 1, 2);
+ _histMeanMultiSigma1385Minus = bookHisto1D(46, 1, 2);
+ _histMeanMultiSigma1385Plus = bookHisto1D(47, 1, 2);
+ _histMeanMultiSigma1385PlusMinus = bookHisto1D(48, 1, 2);
+ _histMeanMultiOmegaMinus = bookHisto1D(50, 1, 2);
+ _histMeanMultiLambda_c_Plus = bookHisto1D(51, 1, 2);
}
if (sqrtS()/GeV >= 89.5 && sqrtS()/GeV <= 91.8) {
- _histMeanMultiPiPlus = bookHistogram1D( 1, 1, 3);
- _histMeanMultiPi0 = bookHistogram1D( 2, 1, 3);
- _histMeanMultiKPlus = bookHistogram1D( 3, 1, 3);
- _histMeanMultiK0 = bookHistogram1D( 4, 1, 3);
- _histMeanMultiEta = bookHistogram1D( 5, 1, 3);
- _histMeanMultiEtaPrime = bookHistogram1D( 6, 1, 3);
- _histMeanMultiDPlus = bookHistogram1D( 7, 1, 3);
- _histMeanMultiD0 = bookHistogram1D( 8, 1, 3);
- _histMeanMultiDPlus_s = bookHistogram1D( 9, 1, 3);
- _histMeanMultiBPlus_B0_d = bookHistogram1D(10, 1, 1);
- _histMeanMultiBPlus_u = bookHistogram1D(11, 1, 1);
- _histMeanMultiB0_s = bookHistogram1D(12, 1, 1);
- _histMeanMultiF0_980 = bookHistogram1D(13, 1, 3);
- _histMeanMultiA0_980Plus = bookHistogram1D(14, 1, 1);
- _histMeanMultiRho770_0 = bookHistogram1D(15, 1, 3);
- _histMeanMultiRho770Plus = bookHistogram1D(16, 1, 1);
- _histMeanMultiOmega782 = bookHistogram1D(17, 1, 2);
- _histMeanMultiKStar892Plus = bookHistogram1D(18, 1, 3);
- _histMeanMultiKStar892_0 = bookHistogram1D(19, 1, 3);
- _histMeanMultiPhi1020 = bookHistogram1D(20, 1, 3);
- _histMeanMultiDStar2010Plus = bookHistogram1D(21, 1, 3);
- _histMeanMultiDStar_s2112Plus = bookHistogram1D(23, 1, 2);
- _histMeanMultiBStar = bookHistogram1D(24, 1, 1);
- _histMeanMultiJPsi1S = bookHistogram1D(25, 1, 2);
- _histMeanMultiPsi2S = bookHistogram1D(26, 1, 1);
- _histMeanMultiUpsilon1S = bookHistogram1D(27, 1, 1);
- _histMeanMultiF1_1285 = bookHistogram1D(28, 1, 1);
- _histMeanMultiF1_1420 = bookHistogram1D(29, 1, 1);
- _histMeanMultiChi_c1_3510 = bookHistogram1D(30, 1, 1);
- _histMeanMultiF2_1270 = bookHistogram1D(31, 1, 3);
- _histMeanMultiF2Prime1525 = bookHistogram1D(32, 1, 1);
- _histMeanMultiK2Star1430_0 = bookHistogram1D(34, 1, 2);
- _histMeanMultiBStarStar = bookHistogram1D(35, 1, 1);
- _histMeanMultiDs1Plus = bookHistogram1D(36, 1, 1);
- _histMeanMultiDs2Plus = bookHistogram1D(37, 1, 1);
- _histMeanMultiP = bookHistogram1D(38, 1, 3);
- _histMeanMultiLambda = bookHistogram1D(39, 1, 3);
- _histMeanMultiSigma0 = bookHistogram1D(40, 1, 2);
- _histMeanMultiSigmaMinus = bookHistogram1D(41, 1, 1);
- _histMeanMultiSigmaPlus = bookHistogram1D(42, 1, 1);
- _histMeanMultiSigmaPlusMinus = bookHistogram1D(43, 1, 1);
- _histMeanMultiXiMinus = bookHistogram1D(44, 1, 3);
- _histMeanMultiDelta1232PlusPlus = bookHistogram1D(45, 1, 2);
- _histMeanMultiSigma1385Minus = bookHistogram1D(46, 1, 3);
- _histMeanMultiSigma1385Plus = bookHistogram1D(47, 1, 3);
- _histMeanMultiSigma1385PlusMinus = bookHistogram1D(48, 1, 3);
- _histMeanMultiXi1530_0 = bookHistogram1D(49, 1, 2);
- _histMeanMultiOmegaMinus = bookHistogram1D(50, 1, 3);
- _histMeanMultiLambda_c_Plus = bookHistogram1D(51, 1, 3);
- _histMeanMultiLambda_b_0 = bookHistogram1D(52, 1, 1);
- _histMeanMultiLambda1520 = bookHistogram1D(54, 1, 2);
+ _histMeanMultiPiPlus = bookHisto1D( 1, 1, 3);
+ _histMeanMultiPi0 = bookHisto1D( 2, 1, 3);
+ _histMeanMultiKPlus = bookHisto1D( 3, 1, 3);
+ _histMeanMultiK0 = bookHisto1D( 4, 1, 3);
+ _histMeanMultiEta = bookHisto1D( 5, 1, 3);
+ _histMeanMultiEtaPrime = bookHisto1D( 6, 1, 3);
+ _histMeanMultiDPlus = bookHisto1D( 7, 1, 3);
+ _histMeanMultiD0 = bookHisto1D( 8, 1, 3);
+ _histMeanMultiDPlus_s = bookHisto1D( 9, 1, 3);
+ _histMeanMultiBPlus_B0_d = bookHisto1D(10, 1, 1);
+ _histMeanMultiBPlus_u = bookHisto1D(11, 1, 1);
+ _histMeanMultiB0_s = bookHisto1D(12, 1, 1);
+ _histMeanMultiF0_980 = bookHisto1D(13, 1, 3);
+ _histMeanMultiA0_980Plus = bookHisto1D(14, 1, 1);
+ _histMeanMultiRho770_0 = bookHisto1D(15, 1, 3);
+ _histMeanMultiRho770Plus = bookHisto1D(16, 1, 1);
+ _histMeanMultiOmega782 = bookHisto1D(17, 1, 2);
+ _histMeanMultiKStar892Plus = bookHisto1D(18, 1, 3);
+ _histMeanMultiKStar892_0 = bookHisto1D(19, 1, 3);
+ _histMeanMultiPhi1020 = bookHisto1D(20, 1, 3);
+ _histMeanMultiDStar2010Plus = bookHisto1D(21, 1, 3);
+ _histMeanMultiDStar_s2112Plus = bookHisto1D(23, 1, 2);
+ _histMeanMultiBStar = bookHisto1D(24, 1, 1);
+ _histMeanMultiJPsi1S = bookHisto1D(25, 1, 2);
+ _histMeanMultiPsi2S = bookHisto1D(26, 1, 1);
+ _histMeanMultiUpsilon1S = bookHisto1D(27, 1, 1);
+ _histMeanMultiF1_1285 = bookHisto1D(28, 1, 1);
+ _histMeanMultiF1_1420 = bookHisto1D(29, 1, 1);
+ _histMeanMultiChi_c1_3510 = bookHisto1D(30, 1, 1);
+ _histMeanMultiF2_1270 = bookHisto1D(31, 1, 3);
+ _histMeanMultiF2Prime1525 = bookHisto1D(32, 1, 1);
+ _histMeanMultiK2Star1430_0 = bookHisto1D(34, 1, 2);
+ _histMeanMultiBStarStar = bookHisto1D(35, 1, 1);
+ _histMeanMultiDs1Plus = bookHisto1D(36, 1, 1);
+ _histMeanMultiDs2Plus = bookHisto1D(37, 1, 1);
+ _histMeanMultiP = bookHisto1D(38, 1, 3);
+ _histMeanMultiLambda = bookHisto1D(39, 1, 3);
+ _histMeanMultiSigma0 = bookHisto1D(40, 1, 2);
+ _histMeanMultiSigmaMinus = bookHisto1D(41, 1, 1);
+ _histMeanMultiSigmaPlus = bookHisto1D(42, 1, 1);
+ _histMeanMultiSigmaPlusMinus = bookHisto1D(43, 1, 1);
+ _histMeanMultiXiMinus = bookHisto1D(44, 1, 3);
+ _histMeanMultiDelta1232PlusPlus = bookHisto1D(45, 1, 2);
+ _histMeanMultiSigma1385Minus = bookHisto1D(46, 1, 3);
+ _histMeanMultiSigma1385Plus = bookHisto1D(47, 1, 3);
+ _histMeanMultiSigma1385PlusMinus = bookHisto1D(48, 1, 3);
+ _histMeanMultiXi1530_0 = bookHisto1D(49, 1, 2);
+ _histMeanMultiOmegaMinus = bookHisto1D(50, 1, 3);
+ _histMeanMultiLambda_c_Plus = bookHisto1D(51, 1, 3);
+ _histMeanMultiLambda_b_0 = bookHisto1D(52, 1, 1);
+ _histMeanMultiLambda1520 = bookHisto1D(54, 1, 2);
}
if (sqrtS()/GeV >= 130 && sqrtS()/GeV <= 200) {
- _histMeanMultiPiPlus = bookHistogram1D( 1, 1, 4);
- _histMeanMultiKPlus = bookHistogram1D( 3, 1, 4);
- _histMeanMultiK0 = bookHistogram1D( 4, 1, 4);
- _histMeanMultiP = bookHistogram1D(38, 1, 4);
- _histMeanMultiLambda = bookHistogram1D(39, 1, 4);
+ _histMeanMultiPiPlus = bookHisto1D( 1, 1, 4);
+ _histMeanMultiKPlus = bookHisto1D( 3, 1, 4);
+ _histMeanMultiK0 = bookHisto1D( 4, 1, 4);
+ _histMeanMultiP = bookHisto1D(38, 1, 4);
+ _histMeanMultiLambda = bookHisto1D(39, 1, 4);
}
}
@@ -705,60 +705,60 @@
private:
- AIDA::IHistogram1D *_histMeanMultiPiPlus;
- AIDA::IHistogram1D *_histMeanMultiPi0;
- AIDA::IHistogram1D *_histMeanMultiKPlus;
- AIDA::IHistogram1D *_histMeanMultiK0;
- AIDA::IHistogram1D *_histMeanMultiEta;
- AIDA::IHistogram1D *_histMeanMultiEtaPrime;
- AIDA::IHistogram1D *_histMeanMultiDPlus;
- AIDA::IHistogram1D *_histMeanMultiD0;
- AIDA::IHistogram1D *_histMeanMultiDPlus_s;
- AIDA::IHistogram1D *_histMeanMultiBPlus_B0_d;
- AIDA::IHistogram1D *_histMeanMultiBPlus_u;
- AIDA::IHistogram1D *_histMeanMultiB0_s;
- AIDA::IHistogram1D *_histMeanMultiF0_980;
- AIDA::IHistogram1D *_histMeanMultiA0_980Plus;
- AIDA::IHistogram1D *_histMeanMultiRho770_0;
- AIDA::IHistogram1D *_histMeanMultiRho770Plus;
- AIDA::IHistogram1D *_histMeanMultiOmega782;
- AIDA::IHistogram1D *_histMeanMultiKStar892Plus;
- AIDA::IHistogram1D *_histMeanMultiKStar892_0;
- AIDA::IHistogram1D *_histMeanMultiPhi1020;
- AIDA::IHistogram1D *_histMeanMultiDStar2010Plus;
- AIDA::IHistogram1D *_histMeanMultiDStar2007_0;
- AIDA::IHistogram1D *_histMeanMultiDStar_s2112Plus;
- AIDA::IHistogram1D *_histMeanMultiBStar;
- AIDA::IHistogram1D *_histMeanMultiJPsi1S;
- AIDA::IHistogram1D *_histMeanMultiPsi2S;
- AIDA::IHistogram1D *_histMeanMultiUpsilon1S;
- AIDA::IHistogram1D *_histMeanMultiF1_1285;
- AIDA::IHistogram1D *_histMeanMultiF1_1420;
- AIDA::IHistogram1D *_histMeanMultiChi_c1_3510;
- AIDA::IHistogram1D *_histMeanMultiF2_1270;
- AIDA::IHistogram1D *_histMeanMultiF2Prime1525;
- AIDA::IHistogram1D *_histMeanMultiK2Star1430Plus;
- AIDA::IHistogram1D *_histMeanMultiK2Star1430_0;
- AIDA::IHistogram1D *_histMeanMultiBStarStar;
- AIDA::IHistogram1D *_histMeanMultiDs1Plus;
- AIDA::IHistogram1D *_histMeanMultiDs2Plus;
- AIDA::IHistogram1D *_histMeanMultiP;
- AIDA::IHistogram1D *_histMeanMultiLambda;
- AIDA::IHistogram1D *_histMeanMultiSigma0;
- AIDA::IHistogram1D *_histMeanMultiSigmaMinus;
- AIDA::IHistogram1D *_histMeanMultiSigmaPlus;
- AIDA::IHistogram1D *_histMeanMultiSigmaPlusMinus;
- AIDA::IHistogram1D *_histMeanMultiXiMinus;
- AIDA::IHistogram1D *_histMeanMultiDelta1232PlusPlus;
- AIDA::IHistogram1D *_histMeanMultiSigma1385Minus;
- AIDA::IHistogram1D *_histMeanMultiSigma1385Plus;
- AIDA::IHistogram1D *_histMeanMultiSigma1385PlusMinus;
- AIDA::IHistogram1D *_histMeanMultiXi1530_0;
- AIDA::IHistogram1D *_histMeanMultiOmegaMinus;
- AIDA::IHistogram1D *_histMeanMultiLambda_c_Plus;
- AIDA::IHistogram1D *_histMeanMultiLambda_b_0;
- AIDA::IHistogram1D *_histMeanMultiSigma_c_PlusPlus_0;
- AIDA::IHistogram1D *_histMeanMultiLambda1520;
+ Histo1DPtr _histMeanMultiPiPlus;
+ Histo1DPtr _histMeanMultiPi0;
+ Histo1DPtr _histMeanMultiKPlus;
+ Histo1DPtr _histMeanMultiK0;
+ Histo1DPtr _histMeanMultiEta;
+ Histo1DPtr _histMeanMultiEtaPrime;
+ Histo1DPtr _histMeanMultiDPlus;
+ Histo1DPtr _histMeanMultiD0;
+ Histo1DPtr _histMeanMultiDPlus_s;
+ Histo1DPtr _histMeanMultiBPlus_B0_d;
+ Histo1DPtr _histMeanMultiBPlus_u;
+ Histo1DPtr _histMeanMultiB0_s;
+ Histo1DPtr _histMeanMultiF0_980;
+ Histo1DPtr _histMeanMultiA0_980Plus;
+ Histo1DPtr _histMeanMultiRho770_0;
+ Histo1DPtr _histMeanMultiRho770Plus;
+ Histo1DPtr _histMeanMultiOmega782;
+ Histo1DPtr _histMeanMultiKStar892Plus;
+ Histo1DPtr _histMeanMultiKStar892_0;
+ Histo1DPtr _histMeanMultiPhi1020;
+ Histo1DPtr _histMeanMultiDStar2010Plus;
+ Histo1DPtr _histMeanMultiDStar2007_0;
+ Histo1DPtr _histMeanMultiDStar_s2112Plus;
+ Histo1DPtr _histMeanMultiBStar;
+ Histo1DPtr _histMeanMultiJPsi1S;
+ Histo1DPtr _histMeanMultiPsi2S;
+ Histo1DPtr _histMeanMultiUpsilon1S;
+ Histo1DPtr _histMeanMultiF1_1285;
+ Histo1DPtr _histMeanMultiF1_1420;
+ Histo1DPtr _histMeanMultiChi_c1_3510;
+ Histo1DPtr _histMeanMultiF2_1270;
+ Histo1DPtr _histMeanMultiF2Prime1525;
+ Histo1DPtr _histMeanMultiK2Star1430Plus;
+ Histo1DPtr _histMeanMultiK2Star1430_0;
+ Histo1DPtr _histMeanMultiBStarStar;
+ Histo1DPtr _histMeanMultiDs1Plus;
+ Histo1DPtr _histMeanMultiDs2Plus;
+ Histo1DPtr _histMeanMultiP;
+ Histo1DPtr _histMeanMultiLambda;
+ Histo1DPtr _histMeanMultiSigma0;
+ Histo1DPtr _histMeanMultiSigmaMinus;
+ Histo1DPtr _histMeanMultiSigmaPlus;
+ Histo1DPtr _histMeanMultiSigmaPlusMinus;
+ Histo1DPtr _histMeanMultiXiMinus;
+ Histo1DPtr _histMeanMultiDelta1232PlusPlus;
+ Histo1DPtr _histMeanMultiSigma1385Minus;
+ Histo1DPtr _histMeanMultiSigma1385Plus;
+ Histo1DPtr _histMeanMultiSigma1385PlusMinus;
+ Histo1DPtr _histMeanMultiXi1530_0;
+ Histo1DPtr _histMeanMultiOmegaMinus;
+ Histo1DPtr _histMeanMultiLambda_c_Plus;
+ Histo1DPtr _histMeanMultiLambda_b_0;
+ Histo1DPtr _histMeanMultiSigma_c_PlusPlus_0;
+ Histo1DPtr _histMeanMultiLambda1520;
//@}
Copied and modified: branches/2011-07-aida2yoda/src/Analyses/PDG_HADRON_MULTIPLICITIES_RATIOS.cc (from r3478, trunk/src/Analyses/PDG_HADRON_MULTIPLICITIES_RATIOS.cc)
==============================================================================
--- trunk/src/Analyses/PDG_HADRON_MULTIPLICITIES_RATIOS.cc Wed Nov 9 18:01:58 2011 (r3478, copy source)
+++ branches/2011-07-aida2yoda/src/Analyses/PDG_HADRON_MULTIPLICITIES_RATIOS.cc Tue Dec 6 14:00:18 2011 (r3509)
@@ -1,6 +1,6 @@
// -*- C++ -*-
#include "Rivet/Analysis.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
#include "Rivet/Tools/ParticleIdUtils.hh"
#include "Rivet/Projections/FinalState.hh"
#include "Rivet/Projections/ChargedFinalState.hh"
@@ -52,101 +52,101 @@
_weightedTotalNumPiPlus += weight;
break;
case 111:
- _histMeanMultiPi0->fill(_histMeanMultiPi0->binMean(0), weight);
+ _histMeanMultiPi0->fill(_histMeanMultiPi0->bin(0).xMean(), weight);
break;
case 321:
- _histMeanMultiKPlus->fill(_histMeanMultiKPlus->binMean(0), weight);
+ _histMeanMultiKPlus->fill(_histMeanMultiKPlus->bin(0).xMean(), weight);
break;
case 130:
case 310:
- _histMeanMultiK0->fill(_histMeanMultiK0->binMean(0), weight);
+ _histMeanMultiK0->fill(_histMeanMultiK0->bin(0).xMean(), weight);
break;
case 221:
- _histMeanMultiEta->fill(_histMeanMultiEta->binMean(0), weight);
+ _histMeanMultiEta->fill(_histMeanMultiEta->bin(0).xMean(), weight);
break;
case 331:
- _histMeanMultiEtaPrime->fill(_histMeanMultiEtaPrime->binMean(0), weight);
+ _histMeanMultiEtaPrime->fill(_histMeanMultiEtaPrime->bin(0).xMean(), weight);
break;
case 411:
- _histMeanMultiDPlus->fill(_histMeanMultiDPlus->binMean(0), weight);
+ _histMeanMultiDPlus->fill(_histMeanMultiDPlus->bin(0).xMean(), weight);
break;
case 421:
- _histMeanMultiD0->fill(_histMeanMultiD0->binMean(0), weight);
+ _histMeanMultiD0->fill(_histMeanMultiD0->bin(0).xMean(), weight);
break;
case 431:
- _histMeanMultiDPlus_s->fill(_histMeanMultiDPlus_s->binMean(0), weight);
+ _histMeanMultiDPlus_s->fill(_histMeanMultiDPlus_s->bin(0).xMean(), weight);
break;
case 9010221:
- _histMeanMultiF0_980->fill(_histMeanMultiF0_980->binMean(0), weight);
+ _histMeanMultiF0_980->fill(_histMeanMultiF0_980->bin(0).xMean(), weight);
break;
case 113:
- _histMeanMultiRho770_0->fill(_histMeanMultiRho770_0->binMean(0), weight);
+ _histMeanMultiRho770_0->fill(_histMeanMultiRho770_0->bin(0).xMean(), weight);
break;
case 223:
- _histMeanMultiOmega782->fill(_histMeanMultiOmega782->binMean(0), weight);
+ _histMeanMultiOmega782->fill(_histMeanMultiOmega782->bin(0).xMean(), weight);
break;
case 323:
- _histMeanMultiKStar892Plus->fill(_histMeanMultiKStar892Plus->binMean(0), weight);
+ _histMeanMultiKStar892Plus->fill(_histMeanMultiKStar892Plus->bin(0).xMean(), weight);
break;
case 313:
- _histMeanMultiKStar892_0->fill(_histMeanMultiKStar892_0->binMean(0), weight);
+ _histMeanMultiKStar892_0->fill(_histMeanMultiKStar892_0->bin(0).xMean(), weight);
break;
case 333:
- _histMeanMultiPhi1020->fill(_histMeanMultiPhi1020->binMean(0), weight);
+ _histMeanMultiPhi1020->fill(_histMeanMultiPhi1020->bin(0).xMean(), weight);
break;
case 413:
- _histMeanMultiDStar2010Plus->fill(_histMeanMultiDStar2010Plus->binMean(0), weight);
+ _histMeanMultiDStar2010Plus->fill(_histMeanMultiDStar2010Plus->bin(0).xMean(), weight);
break;
case 423:
- _histMeanMultiDStar2007_0->fill(_histMeanMultiDStar2007_0->binMean(0), weight);
+ _histMeanMultiDStar2007_0->fill(_histMeanMultiDStar2007_0->bin(0).xMean(), weight);
break;
case 433:
- _histMeanMultiDStar_s2112Plus->fill(_histMeanMultiDStar_s2112Plus->binMean(0), weight);
+ _histMeanMultiDStar_s2112Plus->fill(_histMeanMultiDStar_s2112Plus->bin(0).xMean(), weight);
break;
case 443:
- _histMeanMultiJPsi1S->fill(_histMeanMultiJPsi1S->binMean(0), weight);
+ _histMeanMultiJPsi1S->fill(_histMeanMultiJPsi1S->bin(0).xMean(), weight);
break;
case 225:
- _histMeanMultiF2_1270->fill(_histMeanMultiF2_1270->binMean(0), weight);
+ _histMeanMultiF2_1270->fill(_histMeanMultiF2_1270->bin(0).xMean(), weight);
break;
case 2212:
- _histMeanMultiP->fill(_histMeanMultiP->binMean(0), weight);
+ _histMeanMultiP->fill(_histMeanMultiP->bin(0).xMean(), weight);
break;
case 3122:
- _histMeanMultiLambda->fill(_histMeanMultiLambda->binMean(0), weight);
+ _histMeanMultiLambda->fill(_histMeanMultiLambda->bin(0).xMean(), weight);
break;
case 3212:
- _histMeanMultiSigma0->fill(_histMeanMultiSigma0->binMean(0), weight);
+ _histMeanMultiSigma0->fill(_histMeanMultiSigma0->bin(0).xMean(), weight);
break;
case 3312:
- _histMeanMultiXiMinus->fill(_histMeanMultiXiMinus->binMean(0), weight);
+ _histMeanMultiXiMinus->fill(_histMeanMultiXiMinus->bin(0).xMean(), weight);
break;
case 2224:
- _histMeanMultiDelta1232PlusPlus->fill(_histMeanMultiDelta1232PlusPlus->binMean(0), weight);
+ _histMeanMultiDelta1232PlusPlus->fill(_histMeanMultiDelta1232PlusPlus->bin(0).xMean(), weight);
break;
case 3114:
- _histMeanMultiSigma1385Minus->fill(_histMeanMultiSigma1385Minus->binMean(0), weight);
- _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->binMean(0), weight);
+ _histMeanMultiSigma1385Minus->fill(_histMeanMultiSigma1385Minus->bin(0).xMean(), weight);
+ _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->bin(0).xMean(), weight);
break;
case 3224:
- _histMeanMultiSigma1385Plus->fill(_histMeanMultiSigma1385Plus->binMean(0), weight);
- _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->binMean(0), weight);
+ _histMeanMultiSigma1385Plus->fill(_histMeanMultiSigma1385Plus->bin(0).xMean(), weight);
+ _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->bin(0).xMean(), weight);
break;
case 3324:
- _histMeanMultiXi1530_0->fill(_histMeanMultiXi1530_0->binMean(0), weight);
+ _histMeanMultiXi1530_0->fill(_histMeanMultiXi1530_0->bin(0).xMean(), weight);
break;
case 3334:
- _histMeanMultiOmegaMinus->fill(_histMeanMultiOmegaMinus->binMean(0), weight);
+ _histMeanMultiOmegaMinus->fill(_histMeanMultiOmegaMinus->bin(0).xMean(), weight);
break;
case 4122:
- _histMeanMultiLambda_c_Plus->fill(_histMeanMultiLambda_c_Plus->binMean(0), weight);
+ _histMeanMultiLambda_c_Plus->fill(_histMeanMultiLambda_c_Plus->bin(0).xMean(), weight);
break;
case 4222:
case 4112:
- _histMeanMultiSigma_c_PlusPlus_0->fill(_histMeanMultiSigma_c_PlusPlus_0->binMean(0), weight);
+ _histMeanMultiSigma_c_PlusPlus_0->fill(_histMeanMultiSigma_c_PlusPlus_0->bin(0).xMean(), weight);
break;
case 3124:
- _histMeanMultiLambda1520->fill(_histMeanMultiLambda1520->binMean(0), weight);
+ _histMeanMultiLambda1520->fill(_histMeanMultiLambda1520->bin(0).xMean(), weight);
break;
}
}
@@ -160,82 +160,82 @@
_weightedTotalNumPiPlus += weight;
break;
case 111:
- _histMeanMultiPi0->fill(_histMeanMultiPi0->binMean(0), weight);
+ _histMeanMultiPi0->fill(_histMeanMultiPi0->bin(0).xMean(), weight);
break;
case 321:
- _histMeanMultiKPlus->fill(_histMeanMultiKPlus->binMean(0), weight);
+ _histMeanMultiKPlus->fill(_histMeanMultiKPlus->bin(0).xMean(), weight);
break;
case 130:
case 310:
- _histMeanMultiK0->fill(_histMeanMultiK0->binMean(0), weight);
+ _histMeanMultiK0->fill(_histMeanMultiK0->bin(0).xMean(), weight);
break;
case 221:
- _histMeanMultiEta->fill(_histMeanMultiEta->binMean(0), weight);
+ _histMeanMultiEta->fill(_histMeanMultiEta->bin(0).xMean(), weight);
break;
case 331:
- _histMeanMultiEtaPrime->fill(_histMeanMultiEtaPrime->binMean(0), weight);
+ _histMeanMultiEtaPrime->fill(_histMeanMultiEtaPrime->bin(0).xMean(), weight);
break;
case 411:
- _histMeanMultiDPlus->fill(_histMeanMultiDPlus->binMean(0), weight);
+ _histMeanMultiDPlus->fill(_histMeanMultiDPlus->bin(0).xMean(), weight);
break;
case 421:
- _histMeanMultiD0->fill(_histMeanMultiD0->binMean(0), weight);
+ _histMeanMultiD0->fill(_histMeanMultiD0->bin(0).xMean(), weight);
break;
case 431:
- _histMeanMultiDPlus_s->fill(_histMeanMultiDPlus_s->binMean(0), weight);
+ _histMeanMultiDPlus_s->fill(_histMeanMultiDPlus_s->bin(0).xMean(), weight);
break;
case 9010221:
- _histMeanMultiF0_980->fill(_histMeanMultiF0_980->binMean(0), weight);
+ _histMeanMultiF0_980->fill(_histMeanMultiF0_980->bin(0).xMean(), weight);
break;
case 113:
- _histMeanMultiRho770_0->fill(_histMeanMultiRho770_0->binMean(0), weight);
+ _histMeanMultiRho770_0->fill(_histMeanMultiRho770_0->bin(0).xMean(), weight);
break;
case 323:
- _histMeanMultiKStar892Plus->fill(_histMeanMultiKStar892Plus->binMean(0), weight);
+ _histMeanMultiKStar892Plus->fill(_histMeanMultiKStar892Plus->bin(0).xMean(), weight);
break;
case 313:
- _histMeanMultiKStar892_0->fill(_histMeanMultiKStar892_0->binMean(0), weight);
+ _histMeanMultiKStar892_0->fill(_histMeanMultiKStar892_0->bin(0).xMean(), weight);
break;
case 333:
- _histMeanMultiPhi1020->fill(_histMeanMultiPhi1020->binMean(0), weight);
+ _histMeanMultiPhi1020->fill(_histMeanMultiPhi1020->bin(0).xMean(), weight);
break;
case 413:
- _histMeanMultiDStar2010Plus->fill(_histMeanMultiDStar2010Plus->binMean(0), weight);
+ _histMeanMultiDStar2010Plus->fill(_histMeanMultiDStar2010Plus->bin(0).xMean(), weight);
break;
case 423:
- _histMeanMultiDStar2007_0->fill(_histMeanMultiDStar2007_0->binMean(0), weight);
+ _histMeanMultiDStar2007_0->fill(_histMeanMultiDStar2007_0->bin(0).xMean(), weight);
break;
case 225:
- _histMeanMultiF2_1270->fill(_histMeanMultiF2_1270->binMean(0), weight);
+ _histMeanMultiF2_1270->fill(_histMeanMultiF2_1270->bin(0).xMean(), weight);
break;
case 325:
- _histMeanMultiK2Star1430Plus->fill(_histMeanMultiK2Star1430Plus->binMean(0), weight);
+ _histMeanMultiK2Star1430Plus->fill(_histMeanMultiK2Star1430Plus->bin(0).xMean(), weight);
break;
case 315:
- _histMeanMultiK2Star1430_0->fill(_histMeanMultiK2Star1430_0->binMean(0), weight);
+ _histMeanMultiK2Star1430_0->fill(_histMeanMultiK2Star1430_0->bin(0).xMean(), weight);
break;
case 2212:
- _histMeanMultiP->fill(_histMeanMultiP->binMean(0), weight);
+ _histMeanMultiP->fill(_histMeanMultiP->bin(0).xMean(), weight);
break;
case 3122:
- _histMeanMultiLambda->fill(_histMeanMultiLambda->binMean(0), weight);
+ _histMeanMultiLambda->fill(_histMeanMultiLambda->bin(0).xMean(), weight);
break;
case 3312:
- _histMeanMultiXiMinus->fill(_histMeanMultiXiMinus->binMean(0), weight);
+ _histMeanMultiXiMinus->fill(_histMeanMultiXiMinus->bin(0).xMean(), weight);
break;
case 3114:
- _histMeanMultiSigma1385Minus->fill(_histMeanMultiSigma1385Minus->binMean(0), weight);
- _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->binMean(0), weight);
+ _histMeanMultiSigma1385Minus->fill(_histMeanMultiSigma1385Minus->bin(0).xMean(), weight);
+ _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->bin(0).xMean(), weight);
break;
case 3224:
- _histMeanMultiSigma1385Plus->fill(_histMeanMultiSigma1385Plus->binMean(0), weight);
- _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->binMean(0), weight);
+ _histMeanMultiSigma1385Plus->fill(_histMeanMultiSigma1385Plus->bin(0).xMean(), weight);
+ _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->bin(0).xMean(), weight);
break;
case 3334:
- _histMeanMultiOmegaMinus->fill(_histMeanMultiOmegaMinus->binMean(0), weight);
+ _histMeanMultiOmegaMinus->fill(_histMeanMultiOmegaMinus->bin(0).xMean(), weight);
break;
case 4122:
- _histMeanMultiLambda_c_Plus->fill(_histMeanMultiLambda_c_Plus->binMean(0), weight);
+ _histMeanMultiLambda_c_Plus->fill(_histMeanMultiLambda_c_Plus->bin(0).xMean(), weight);
break;
}
}
@@ -249,159 +249,159 @@
_weightedTotalNumPiPlus += weight;
break;
case 111:
- _histMeanMultiPi0->fill(_histMeanMultiPi0->binMean(0), weight);
+ _histMeanMultiPi0->fill(_histMeanMultiPi0->bin(0).xMean(), weight);
break;
case 321:
- _histMeanMultiKPlus->fill(_histMeanMultiKPlus->binMean(0), weight);
+ _histMeanMultiKPlus->fill(_histMeanMultiKPlus->bin(0).xMean(), weight);
break;
case 130:
case 310:
- _histMeanMultiK0->fill(_histMeanMultiK0->binMean(0), weight);
+ _histMeanMultiK0->fill(_histMeanMultiK0->bin(0).xMean(), weight);
break;
case 221:
- _histMeanMultiEta->fill(_histMeanMultiEta->binMean(0), weight);
+ _histMeanMultiEta->fill(_histMeanMultiEta->bin(0).xMean(), weight);
break;
case 331:
- _histMeanMultiEtaPrime->fill(_histMeanMultiEtaPrime->binMean(0), weight);
+ _histMeanMultiEtaPrime->fill(_histMeanMultiEtaPrime->bin(0).xMean(), weight);
break;
case 411:
- _histMeanMultiDPlus->fill(_histMeanMultiDPlus->binMean(0), weight);
+ _histMeanMultiDPlus->fill(_histMeanMultiDPlus->bin(0).xMean(), weight);
break;
case 421:
- _histMeanMultiD0->fill(_histMeanMultiD0->binMean(0), weight);
+ _histMeanMultiD0->fill(_histMeanMultiD0->bin(0).xMean(), weight);
break;
case 431:
- _histMeanMultiDPlus_s->fill(_histMeanMultiDPlus_s->binMean(0), weight);
+ _histMeanMultiDPlus_s->fill(_histMeanMultiDPlus_s->bin(0).xMean(), weight);
break;
case 511:
- _histMeanMultiBPlus_B0_d->fill(_histMeanMultiBPlus_B0_d->binMean(0), weight);
+ _histMeanMultiBPlus_B0_d->fill(_histMeanMultiBPlus_B0_d->bin(0).xMean(), weight);
break;
case 521:
- _histMeanMultiBPlus_B0_d->fill(_histMeanMultiBPlus_B0_d->binMean(0), weight);
- _histMeanMultiBPlus_u->fill(_histMeanMultiBPlus_u->binMean(0), weight);
+ _histMeanMultiBPlus_B0_d->fill(_histMeanMultiBPlus_B0_d->bin(0).xMean(), weight);
+ _histMeanMultiBPlus_u->fill(_histMeanMultiBPlus_u->bin(0).xMean(), weight);
break;
case 531:
- _histMeanMultiB0_s->fill(_histMeanMultiB0_s->binMean(0), weight);
+ _histMeanMultiB0_s->fill(_histMeanMultiB0_s->bin(0).xMean(), weight);
break;
case 9010221:
- _histMeanMultiF0_980->fill(_histMeanMultiF0_980->binMean(0), weight);
+ _histMeanMultiF0_980->fill(_histMeanMultiF0_980->bin(0).xMean(), weight);
break;
case 9000211:
- _histMeanMultiA0_980Plus->fill(_histMeanMultiA0_980Plus->binMean(0), weight);
+ _histMeanMultiA0_980Plus->fill(_histMeanMultiA0_980Plus->bin(0).xMean(), weight);
break;
case 113:
- _histMeanMultiRho770_0->fill(_histMeanMultiRho770_0->binMean(0), weight);
+ _histMeanMultiRho770_0->fill(_histMeanMultiRho770_0->bin(0).xMean(), weight);
break;
case 213:
- _histMeanMultiRho770Plus->fill(_histMeanMultiRho770Plus->binMean(0), weight);
+ _histMeanMultiRho770Plus->fill(_histMeanMultiRho770Plus->bin(0).xMean(), weight);
break;
case 223:
- _histMeanMultiOmega782->fill(_histMeanMultiOmega782->binMean(0), weight);
+ _histMeanMultiOmega782->fill(_histMeanMultiOmega782->bin(0).xMean(), weight);
break;
case 323:
- _histMeanMultiKStar892Plus->fill(_histMeanMultiKStar892Plus->binMean(0), weight);
+ _histMeanMultiKStar892Plus->fill(_histMeanMultiKStar892Plus->bin(0).xMean(), weight);
break;
case 313:
- _histMeanMultiKStar892_0->fill(_histMeanMultiKStar892_0->binMean(0), weight);
+ _histMeanMultiKStar892_0->fill(_histMeanMultiKStar892_0->bin(0).xMean(), weight);
break;
case 333:
- _histMeanMultiPhi1020->fill(_histMeanMultiPhi1020->binMean(0), weight);
+ _histMeanMultiPhi1020->fill(_histMeanMultiPhi1020->bin(0).xMean(), weight);
break;
case 413:
- _histMeanMultiDStar2010Plus->fill(_histMeanMultiDStar2010Plus->binMean(0), weight);
+ _histMeanMultiDStar2010Plus->fill(_histMeanMultiDStar2010Plus->bin(0).xMean(), weight);
break;
case 433:
- _histMeanMultiDStar_s2112Plus->fill(_histMeanMultiDStar_s2112Plus->binMean(0), weight);
+ _histMeanMultiDStar_s2112Plus->fill(_histMeanMultiDStar_s2112Plus->bin(0).xMean(), weight);
break;
case 513:
case 523:
case 533:
- _histMeanMultiBStar->fill(_histMeanMultiBStar->binMean(0), weight);
+ _histMeanMultiBStar->fill(_histMeanMultiBStar->bin(0).xMean(), weight);
break;
case 443:
- _histMeanMultiJPsi1S->fill(_histMeanMultiJPsi1S->binMean(0), weight);
+ _histMeanMultiJPsi1S->fill(_histMeanMultiJPsi1S->bin(0).xMean(), weight);
break;
case 100443:
- _histMeanMultiPsi2S->fill(_histMeanMultiPsi2S->binMean(0), weight);
+ _histMeanMultiPsi2S->fill(_histMeanMultiPsi2S->bin(0).xMean(), weight);
break;
case 553:
- _histMeanMultiUpsilon1S->fill(_histMeanMultiUpsilon1S->binMean(0), weight);
+ _histMeanMultiUpsilon1S->fill(_histMeanMultiUpsilon1S->bin(0).xMean(), weight);
break;
case 20223:
- _histMeanMultiF1_1285->fill(_histMeanMultiF1_1285->binMean(0), weight);
+ _histMeanMultiF1_1285->fill(_histMeanMultiF1_1285->bin(0).xMean(), weight);
break;
case 20333:
- _histMeanMultiF1_1420->fill(_histMeanMultiF1_1420->binMean(0), weight);
+ _histMeanMultiF1_1420->fill(_histMeanMultiF1_1420->bin(0).xMean(), weight);
break;
case 445:
- _histMeanMultiChi_c1_3510->fill(_histMeanMultiChi_c1_3510->binMean(0), weight);
+ _histMeanMultiChi_c1_3510->fill(_histMeanMultiChi_c1_3510->bin(0).xMean(), weight);
break;
case 225:
- _histMeanMultiF2_1270->fill(_histMeanMultiF2_1270->binMean(0), weight);
+ _histMeanMultiF2_1270->fill(_histMeanMultiF2_1270->bin(0).xMean(), weight);
break;
case 335:
- _histMeanMultiF2Prime1525->fill(_histMeanMultiF2Prime1525->binMean(0), weight);
+ _histMeanMultiF2Prime1525->fill(_histMeanMultiF2Prime1525->bin(0).xMean(), weight);
break;
case 315:
- _histMeanMultiK2Star1430_0->fill(_histMeanMultiK2Star1430_0->binMean(0), weight);
+ _histMeanMultiK2Star1430_0->fill(_histMeanMultiK2Star1430_0->bin(0).xMean(), weight);
break;
case 515:
case 525:
case 535:
- _histMeanMultiBStarStar->fill(_histMeanMultiBStarStar->binMean(0), weight);
+ _histMeanMultiBStarStar->fill(_histMeanMultiBStarStar->bin(0).xMean(), weight);
break;
case 10433:
case 20433:
- _histMeanMultiDs1Plus->fill(_histMeanMultiDs1Plus->binMean(0), weight);
+ _histMeanMultiDs1Plus->fill(_histMeanMultiDs1Plus->bin(0).xMean(), weight);
break;
case 435:
- _histMeanMultiDs2Plus->fill(_histMeanMultiDs2Plus->binMean(0), weight);
+ _histMeanMultiDs2Plus->fill(_histMeanMultiDs2Plus->bin(0).xMean(), weight);
break;
case 2212:
- _histMeanMultiP->fill(_histMeanMultiP->binMean(0), weight);
+ _histMeanMultiP->fill(_histMeanMultiP->bin(0).xMean(), weight);
break;
case 3122:
- _histMeanMultiLambda->fill(_histMeanMultiLambda->binMean(0), weight);
+ _histMeanMultiLambda->fill(_histMeanMultiLambda->bin(0).xMean(), weight);
break;
case 3212:
- _histMeanMultiSigma0->fill(_histMeanMultiSigma0->binMean(0), weight);
+ _histMeanMultiSigma0->fill(_histMeanMultiSigma0->bin(0).xMean(), weight);
break;
case 3112:
- _histMeanMultiSigmaMinus->fill(_histMeanMultiSigmaMinus->binMean(0), weight);
- _histMeanMultiSigmaPlusMinus->fill(_histMeanMultiSigmaPlusMinus->binMean(0), weight);
+ _histMeanMultiSigmaMinus->fill(_histMeanMultiSigmaMinus->bin(0).xMean(), weight);
+ _histMeanMultiSigmaPlusMinus->fill(_histMeanMultiSigmaPlusMinus->bin(0).xMean(), weight);
break;
case 3222:
- _histMeanMultiSigmaPlus->fill(_histMeanMultiSigmaPlus->binMean(0), weight);
- _histMeanMultiSigmaPlusMinus->fill(_histMeanMultiSigmaPlusMinus->binMean(0), weight);
+ _histMeanMultiSigmaPlus->fill(_histMeanMultiSigmaPlus->bin(0).xMean(), weight);
+ _histMeanMultiSigmaPlusMinus->fill(_histMeanMultiSigmaPlusMinus->bin(0).xMean(), weight);
break;
case 3312:
- _histMeanMultiXiMinus->fill(_histMeanMultiXiMinus->binMean(0), weight);
+ _histMeanMultiXiMinus->fill(_histMeanMultiXiMinus->bin(0).xMean(), weight);
break;
case 2224:
- _histMeanMultiDelta1232PlusPlus->fill(_histMeanMultiDelta1232PlusPlus->binMean(0), weight);
+ _histMeanMultiDelta1232PlusPlus->fill(_histMeanMultiDelta1232PlusPlus->bin(0).xMean(), weight);
break;
case 3114:
- _histMeanMultiSigma1385Minus->fill(_histMeanMultiSigma1385Minus->binMean(0), weight);
- _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->binMean(0), weight);
+ _histMeanMultiSigma1385Minus->fill(_histMeanMultiSigma1385Minus->bin(0).xMean(), weight);
+ _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->bin(0).xMean(), weight);
break;
case 3224:
- _histMeanMultiSigma1385Plus->fill(_histMeanMultiSigma1385Plus->binMean(0), weight);
- _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->binMean(0), weight);
+ _histMeanMultiSigma1385Plus->fill(_histMeanMultiSigma1385Plus->bin(0).xMean(), weight);
+ _histMeanMultiSigma1385PlusMinus->fill(_histMeanMultiSigma1385PlusMinus->bin(0).xMean(), weight);
break;
case 3324:
- _histMeanMultiXi1530_0->fill(_histMeanMultiXi1530_0->binMean(0), weight);
+ _histMeanMultiXi1530_0->fill(_histMeanMultiXi1530_0->bin(0).xMean(), weight);
break;
case 3334:
- _histMeanMultiOmegaMinus->fill(_histMeanMultiOmegaMinus->binMean(0), weight);
+ _histMeanMultiOmegaMinus->fill(_histMeanMultiOmegaMinus->bin(0).xMean(), weight);
break;
case 4122:
- _histMeanMultiLambda_c_Plus->fill(_histMeanMultiLambda_c_Plus->binMean(0), weight);
+ _histMeanMultiLambda_c_Plus->fill(_histMeanMultiLambda_c_Plus->bin(0).xMean(), weight);
break;
case 5122:
- _histMeanMultiLambda_b_0->fill(_histMeanMultiLambda_b_0->binMean(0), weight);
+ _histMeanMultiLambda_b_0->fill(_histMeanMultiLambda_b_0->bin(0).xMean(), weight);
break;
case 3124:
- _histMeanMultiLambda1520->fill(_histMeanMultiLambda1520->binMean(0), weight);
+ _histMeanMultiLambda1520->fill(_histMeanMultiLambda1520->bin(0).xMean(), weight);
break;
}
}
@@ -415,17 +415,17 @@
_weightedTotalNumPiPlus += weight;
break;
case 321:
- _histMeanMultiKPlus->fill(_histMeanMultiKPlus->binMean(0), weight);
+ _histMeanMultiKPlus->fill(_histMeanMultiKPlus->bin(0).xMean(), weight);
break;
case 130:
case 310:
- _histMeanMultiK0->fill(_histMeanMultiK0->binMean(0), weight);
+ _histMeanMultiK0->fill(_histMeanMultiK0->bin(0).xMean(), weight);
break;
case 2212:
- _histMeanMultiP->fill(_histMeanMultiP->binMean(0), weight);
+ _histMeanMultiP->fill(_histMeanMultiP->bin(0).xMean(), weight);
break;
case 3122:
- _histMeanMultiLambda->fill(_histMeanMultiLambda->binMean(0), weight);
+ _histMeanMultiLambda->fill(_histMeanMultiLambda->bin(0).xMean(), weight);
break;
}
}
@@ -440,127 +440,127 @@
addProjection(UnstableFinalState(), "UFS");
if (sqrtS()/GeV >= 9.5 && sqrtS()/GeV <= 10.5) {
- _histMeanMultiPi0 = bookHistogram1D( 2, 1, 1);
- _histMeanMultiKPlus = bookHistogram1D( 3, 1, 1);
- _histMeanMultiK0 = bookHistogram1D( 4, 1, 1);
- _histMeanMultiEta = bookHistogram1D( 5, 1, 1);
- _histMeanMultiEtaPrime = bookHistogram1D( 6, 1, 1);
- _histMeanMultiDPlus = bookHistogram1D( 7, 1, 1);
- _histMeanMultiD0 = bookHistogram1D( 8, 1, 1);
- _histMeanMultiDPlus_s = bookHistogram1D( 9, 1, 1);
- _histMeanMultiF0_980 = bookHistogram1D(13, 1, 1);
- _histMeanMultiRho770_0 = bookHistogram1D(15, 1, 1);
- _histMeanMultiOmega782 = bookHistogram1D(17, 1, 1);
- _histMeanMultiKStar892Plus = bookHistogram1D(18, 1, 1);
- _histMeanMultiKStar892_0 = bookHistogram1D(19, 1, 1);
- _histMeanMultiPhi1020 = bookHistogram1D(20, 1, 1);
- _histMeanMultiDStar2010Plus = bookHistogram1D(21, 1, 1);
- _histMeanMultiDStar2007_0 = bookHistogram1D(22, 1, 1);
- _histMeanMultiDStar_s2112Plus = bookHistogram1D(23, 1, 1);
- _histMeanMultiJPsi1S = bookHistogram1D(25, 1, 1);
- _histMeanMultiF2_1270 = bookHistogram1D(31, 1, 1);
- _histMeanMultiP = bookHistogram1D(38, 1, 1);
- _histMeanMultiLambda = bookHistogram1D(39, 1, 1);
- _histMeanMultiSigma0 = bookHistogram1D(40, 1, 1);
- _histMeanMultiXiMinus = bookHistogram1D(44, 1, 1);
- _histMeanMultiDelta1232PlusPlus = bookHistogram1D(45, 1, 1);
- _histMeanMultiSigma1385Minus = bookHistogram1D(46, 1, 1);
- _histMeanMultiSigma1385Plus = bookHistogram1D(47, 1, 1);
- _histMeanMultiSigma1385PlusMinus = bookHistogram1D(48, 1, 1);
- _histMeanMultiXi1530_0 = bookHistogram1D(49, 1, 1);
- _histMeanMultiOmegaMinus = bookHistogram1D(50, 1, 1);
- _histMeanMultiLambda_c_Plus = bookHistogram1D(51, 1, 1);
- _histMeanMultiSigma_c_PlusPlus_0 = bookHistogram1D(53, 1, 1);
- _histMeanMultiLambda1520 = bookHistogram1D(54, 1, 1);
+ _histMeanMultiPi0 = bookHisto1D( 2, 1, 1);
+ _histMeanMultiKPlus = bookHisto1D( 3, 1, 1);
+ _histMeanMultiK0 = bookHisto1D( 4, 1, 1);
+ _histMeanMultiEta = bookHisto1D( 5, 1, 1);
+ _histMeanMultiEtaPrime = bookHisto1D( 6, 1, 1);
+ _histMeanMultiDPlus = bookHisto1D( 7, 1, 1);
+ _histMeanMultiD0 = bookHisto1D( 8, 1, 1);
+ _histMeanMultiDPlus_s = bookHisto1D( 9, 1, 1);
+ _histMeanMultiF0_980 = bookHisto1D(13, 1, 1);
+ _histMeanMultiRho770_0 = bookHisto1D(15, 1, 1);
+ _histMeanMultiOmega782 = bookHisto1D(17, 1, 1);
+ _histMeanMultiKStar892Plus = bookHisto1D(18, 1, 1);
+ _histMeanMultiKStar892_0 = bookHisto1D(19, 1, 1);
+ _histMeanMultiPhi1020 = bookHisto1D(20, 1, 1);
+ _histMeanMultiDStar2010Plus = bookHisto1D(21, 1, 1);
+ _histMeanMultiDStar2007_0 = bookHisto1D(22, 1, 1);
+ _histMeanMultiDStar_s2112Plus = bookHisto1D(23, 1, 1);
+ _histMeanMultiJPsi1S = bookHisto1D(25, 1, 1);
+ _histMeanMultiF2_1270 = bookHisto1D(31, 1, 1);
+ _histMeanMultiP = bookHisto1D(38, 1, 1);
+ _histMeanMultiLambda = bookHisto1D(39, 1, 1);
+ _histMeanMultiSigma0 = bookHisto1D(40, 1, 1);
+ _histMeanMultiXiMinus = bookHisto1D(44, 1, 1);
+ _histMeanMultiDelta1232PlusPlus = bookHisto1D(45, 1, 1);
+ _histMeanMultiSigma1385Minus = bookHisto1D(46, 1, 1);
+ _histMeanMultiSigma1385Plus = bookHisto1D(47, 1, 1);
+ _histMeanMultiSigma1385PlusMinus = bookHisto1D(48, 1, 1);
+ _histMeanMultiXi1530_0 = bookHisto1D(49, 1, 1);
+ _histMeanMultiOmegaMinus = bookHisto1D(50, 1, 1);
+ _histMeanMultiLambda_c_Plus = bookHisto1D(51, 1, 1);
+ _histMeanMultiSigma_c_PlusPlus_0 = bookHisto1D(53, 1, 1);
+ _histMeanMultiLambda1520 = bookHisto1D(54, 1, 1);
}
if (sqrtS()/GeV >= 29 && sqrtS()/GeV <= 35) {
- _histMeanMultiPi0 = bookHistogram1D( 2, 1, 2);
- _histMeanMultiKPlus = bookHistogram1D( 3, 1, 2);
- _histMeanMultiK0 = bookHistogram1D( 4, 1, 2);
- _histMeanMultiEta = bookHistogram1D( 5, 1, 2);
- _histMeanMultiEtaPrime = bookHistogram1D( 6, 1, 2);
- _histMeanMultiDPlus = bookHistogram1D( 7, 1, 2);
- _histMeanMultiD0 = bookHistogram1D( 8, 1, 2);
- _histMeanMultiDPlus_s = bookHistogram1D( 9, 1, 2);
- _histMeanMultiF0_980 = bookHistogram1D(13, 1, 2);
- _histMeanMultiRho770_0 = bookHistogram1D(15, 1, 2);
- _histMeanMultiKStar892Plus = bookHistogram1D(18, 1, 2);
- _histMeanMultiKStar892_0 = bookHistogram1D(19, 1, 2);
- _histMeanMultiPhi1020 = bookHistogram1D(20, 1, 2);
- _histMeanMultiDStar2010Plus = bookHistogram1D(21, 1, 2);
- _histMeanMultiDStar2007_0 = bookHistogram1D(22, 1, 2);
- _histMeanMultiF2_1270 = bookHistogram1D(31, 1, 2);
- _histMeanMultiK2Star1430Plus = bookHistogram1D(33, 1, 1);
- _histMeanMultiK2Star1430_0 = bookHistogram1D(34, 1, 1);
- _histMeanMultiP = bookHistogram1D(38, 1, 2);
- _histMeanMultiLambda = bookHistogram1D(39, 1, 2);
- _histMeanMultiXiMinus = bookHistogram1D(44, 1, 2);
- _histMeanMultiSigma1385Minus = bookHistogram1D(46, 1, 2);
- _histMeanMultiSigma1385Plus = bookHistogram1D(47, 1, 2);
- _histMeanMultiSigma1385PlusMinus = bookHistogram1D(48, 1, 2);
- _histMeanMultiOmegaMinus = bookHistogram1D(50, 1, 2);
- _histMeanMultiLambda_c_Plus = bookHistogram1D(51, 1, 2);
+ _histMeanMultiPi0 = bookHisto1D( 2, 1, 2);
+ _histMeanMultiKPlus = bookHisto1D( 3, 1, 2);
+ _histMeanMultiK0 = bookHisto1D( 4, 1, 2);
+ _histMeanMultiEta = bookHisto1D( 5, 1, 2);
+ _histMeanMultiEtaPrime = bookHisto1D( 6, 1, 2);
+ _histMeanMultiDPlus = bookHisto1D( 7, 1, 2);
+ _histMeanMultiD0 = bookHisto1D( 8, 1, 2);
+ _histMeanMultiDPlus_s = bookHisto1D( 9, 1, 2);
+ _histMeanMultiF0_980 = bookHisto1D(13, 1, 2);
+ _histMeanMultiRho770_0 = bookHisto1D(15, 1, 2);
+ _histMeanMultiKStar892Plus = bookHisto1D(18, 1, 2);
+ _histMeanMultiKStar892_0 = bookHisto1D(19, 1, 2);
+ _histMeanMultiPhi1020 = bookHisto1D(20, 1, 2);
+ _histMeanMultiDStar2010Plus = bookHisto1D(21, 1, 2);
+ _histMeanMultiDStar2007_0 = bookHisto1D(22, 1, 2);
+ _histMeanMultiF2_1270 = bookHisto1D(31, 1, 2);
+ _histMeanMultiK2Star1430Plus = bookHisto1D(33, 1, 1);
+ _histMeanMultiK2Star1430_0 = bookHisto1D(34, 1, 1);
+ _histMeanMultiP = bookHisto1D(38, 1, 2);
+ _histMeanMultiLambda = bookHisto1D(39, 1, 2);
+ _histMeanMultiXiMinus = bookHisto1D(44, 1, 2);
+ _histMeanMultiSigma1385Minus = bookHisto1D(46, 1, 2);
+ _histMeanMultiSigma1385Plus = bookHisto1D(47, 1, 2);
+ _histMeanMultiSigma1385PlusMinus = bookHisto1D(48, 1, 2);
+ _histMeanMultiOmegaMinus = bookHisto1D(50, 1, 2);
+ _histMeanMultiLambda_c_Plus = bookHisto1D(51, 1, 2);
}
if (sqrtS()/GeV >= 89.5 && sqrtS()/GeV <= 91.8) {
- _histMeanMultiPi0 = bookHistogram1D( 2, 1, 3);
- _histMeanMultiKPlus = bookHistogram1D( 3, 1, 3);
- _histMeanMultiK0 = bookHistogram1D( 4, 1, 3);
- _histMeanMultiEta = bookHistogram1D( 5, 1, 3);
- _histMeanMultiEtaPrime = bookHistogram1D( 6, 1, 3);
- _histMeanMultiDPlus = bookHistogram1D( 7, 1, 3);
- _histMeanMultiD0 = bookHistogram1D( 8, 1, 3);
- _histMeanMultiDPlus_s = bookHistogram1D( 9, 1, 3);
- _histMeanMultiBPlus_B0_d = bookHistogram1D(10, 1, 1);
- _histMeanMultiBPlus_u = bookHistogram1D(11, 1, 1);
- _histMeanMultiB0_s = bookHistogram1D(12, 1, 1);
- _histMeanMultiF0_980 = bookHistogram1D(13, 1, 3);
- _histMeanMultiA0_980Plus = bookHistogram1D(14, 1, 1);
- _histMeanMultiRho770_0 = bookHistogram1D(15, 1, 3);
- _histMeanMultiRho770Plus = bookHistogram1D(16, 1, 1);
- _histMeanMultiOmega782 = bookHistogram1D(17, 1, 2);
- _histMeanMultiKStar892Plus = bookHistogram1D(18, 1, 3);
- _histMeanMultiKStar892_0 = bookHistogram1D(19, 1, 3);
- _histMeanMultiPhi1020 = bookHistogram1D(20, 1, 3);
- _histMeanMultiDStar2010Plus = bookHistogram1D(21, 1, 3);
- _histMeanMultiDStar_s2112Plus = bookHistogram1D(23, 1, 2);
- _histMeanMultiBStar = bookHistogram1D(24, 1, 1);
- _histMeanMultiJPsi1S = bookHistogram1D(25, 1, 2);
- _histMeanMultiPsi2S = bookHistogram1D(26, 1, 1);
- _histMeanMultiUpsilon1S = bookHistogram1D(27, 1, 1);
- _histMeanMultiF1_1285 = bookHistogram1D(28, 1, 1);
- _histMeanMultiF1_1420 = bookHistogram1D(29, 1, 1);
- _histMeanMultiChi_c1_3510 = bookHistogram1D(30, 1, 1);
- _histMeanMultiF2_1270 = bookHistogram1D(31, 1, 3);
- _histMeanMultiF2Prime1525 = bookHistogram1D(32, 1, 1);
- _histMeanMultiK2Star1430_0 = bookHistogram1D(34, 1, 2);
- _histMeanMultiBStarStar = bookHistogram1D(35, 1, 1);
- _histMeanMultiDs1Plus = bookHistogram1D(36, 1, 1);
- _histMeanMultiDs2Plus = bookHistogram1D(37, 1, 1);
- _histMeanMultiP = bookHistogram1D(38, 1, 3);
- _histMeanMultiLambda = bookHistogram1D(39, 1, 3);
- _histMeanMultiSigma0 = bookHistogram1D(40, 1, 2);
- _histMeanMultiSigmaMinus = bookHistogram1D(41, 1, 1);
- _histMeanMultiSigmaPlus = bookHistogram1D(42, 1, 1);
- _histMeanMultiSigmaPlusMinus = bookHistogram1D(43, 1, 1);
- _histMeanMultiXiMinus = bookHistogram1D(44, 1, 3);
- _histMeanMultiDelta1232PlusPlus = bookHistogram1D(45, 1, 2);
- _histMeanMultiSigma1385Minus = bookHistogram1D(46, 1, 3);
- _histMeanMultiSigma1385Plus = bookHistogram1D(47, 1, 3);
- _histMeanMultiSigma1385PlusMinus = bookHistogram1D(48, 1, 3);
- _histMeanMultiXi1530_0 = bookHistogram1D(49, 1, 2);
- _histMeanMultiOmegaMinus = bookHistogram1D(50, 1, 3);
- _histMeanMultiLambda_c_Plus = bookHistogram1D(51, 1, 3);
- _histMeanMultiLambda_b_0 = bookHistogram1D(52, 1, 1);
- _histMeanMultiLambda1520 = bookHistogram1D(54, 1, 2);
+ _histMeanMultiPi0 = bookHisto1D( 2, 1, 3);
+ _histMeanMultiKPlus = bookHisto1D( 3, 1, 3);
+ _histMeanMultiK0 = bookHisto1D( 4, 1, 3);
+ _histMeanMultiEta = bookHisto1D( 5, 1, 3);
+ _histMeanMultiEtaPrime = bookHisto1D( 6, 1, 3);
+ _histMeanMultiDPlus = bookHisto1D( 7, 1, 3);
+ _histMeanMultiD0 = bookHisto1D( 8, 1, 3);
+ _histMeanMultiDPlus_s = bookHisto1D( 9, 1, 3);
+ _histMeanMultiBPlus_B0_d = bookHisto1D(10, 1, 1);
+ _histMeanMultiBPlus_u = bookHisto1D(11, 1, 1);
+ _histMeanMultiB0_s = bookHisto1D(12, 1, 1);
+ _histMeanMultiF0_980 = bookHisto1D(13, 1, 3);
+ _histMeanMultiA0_980Plus = bookHisto1D(14, 1, 1);
+ _histMeanMultiRho770_0 = bookHisto1D(15, 1, 3);
+ _histMeanMultiRho770Plus = bookHisto1D(16, 1, 1);
+ _histMeanMultiOmega782 = bookHisto1D(17, 1, 2);
+ _histMeanMultiKStar892Plus = bookHisto1D(18, 1, 3);
+ _histMeanMultiKStar892_0 = bookHisto1D(19, 1, 3);
+ _histMeanMultiPhi1020 = bookHisto1D(20, 1, 3);
+ _histMeanMultiDStar2010Plus = bookHisto1D(21, 1, 3);
+ _histMeanMultiDStar_s2112Plus = bookHisto1D(23, 1, 2);
+ _histMeanMultiBStar = bookHisto1D(24, 1, 1);
+ _histMeanMultiJPsi1S = bookHisto1D(25, 1, 2);
+ _histMeanMultiPsi2S = bookHisto1D(26, 1, 1);
+ _histMeanMultiUpsilon1S = bookHisto1D(27, 1, 1);
+ _histMeanMultiF1_1285 = bookHisto1D(28, 1, 1);
+ _histMeanMultiF1_1420 = bookHisto1D(29, 1, 1);
+ _histMeanMultiChi_c1_3510 = bookHisto1D(30, 1, 1);
+ _histMeanMultiF2_1270 = bookHisto1D(31, 1, 3);
+ _histMeanMultiF2Prime1525 = bookHisto1D(32, 1, 1);
+ _histMeanMultiK2Star1430_0 = bookHisto1D(34, 1, 2);
+ _histMeanMultiBStarStar = bookHisto1D(35, 1, 1);
+ _histMeanMultiDs1Plus = bookHisto1D(36, 1, 1);
+ _histMeanMultiDs2Plus = bookHisto1D(37, 1, 1);
+ _histMeanMultiP = bookHisto1D(38, 1, 3);
+ _histMeanMultiLambda = bookHisto1D(39, 1, 3);
+ _histMeanMultiSigma0 = bookHisto1D(40, 1, 2);
+ _histMeanMultiSigmaMinus = bookHisto1D(41, 1, 1);
+ _histMeanMultiSigmaPlus = bookHisto1D(42, 1, 1);
+ _histMeanMultiSigmaPlusMinus = bookHisto1D(43, 1, 1);
+ _histMeanMultiXiMinus = bookHisto1D(44, 1, 3);
+ _histMeanMultiDelta1232PlusPlus = bookHisto1D(45, 1, 2);
+ _histMeanMultiSigma1385Minus = bookHisto1D(46, 1, 3);
+ _histMeanMultiSigma1385Plus = bookHisto1D(47, 1, 3);
+ _histMeanMultiSigma1385PlusMinus = bookHisto1D(48, 1, 3);
+ _histMeanMultiXi1530_0 = bookHisto1D(49, 1, 2);
+ _histMeanMultiOmegaMinus = bookHisto1D(50, 1, 3);
+ _histMeanMultiLambda_c_Plus = bookHisto1D(51, 1, 3);
+ _histMeanMultiLambda_b_0 = bookHisto1D(52, 1, 1);
+ _histMeanMultiLambda1520 = bookHisto1D(54, 1, 2);
}
if (sqrtS()/GeV >= 130 && sqrtS()/GeV <= 200) {
- _histMeanMultiKPlus = bookHistogram1D( 3, 1, 4);
- _histMeanMultiK0 = bookHistogram1D( 4, 1, 4);
- _histMeanMultiP = bookHistogram1D(38, 1, 4);
- _histMeanMultiLambda = bookHistogram1D(39, 1, 4);
+ _histMeanMultiKPlus = bookHisto1D( 3, 1, 4);
+ _histMeanMultiK0 = bookHisto1D( 4, 1, 4);
+ _histMeanMultiP = bookHisto1D(38, 1, 4);
+ _histMeanMultiLambda = bookHisto1D(39, 1, 4);
}
}
@@ -700,59 +700,59 @@
double _weightedTotalNumPiPlus;
- AIDA::IHistogram1D *_histMeanMultiPi0;
- AIDA::IHistogram1D *_histMeanMultiKPlus;
- AIDA::IHistogram1D *_histMeanMultiK0;
- AIDA::IHistogram1D *_histMeanMultiEta;
- AIDA::IHistogram1D *_histMeanMultiEtaPrime;
- AIDA::IHistogram1D *_histMeanMultiDPlus;
- AIDA::IHistogram1D *_histMeanMultiD0;
- AIDA::IHistogram1D *_histMeanMultiDPlus_s;
- AIDA::IHistogram1D *_histMeanMultiBPlus_B0_d;
- AIDA::IHistogram1D *_histMeanMultiBPlus_u;
- AIDA::IHistogram1D *_histMeanMultiB0_s;
- AIDA::IHistogram1D *_histMeanMultiF0_980;
- AIDA::IHistogram1D *_histMeanMultiA0_980Plus;
- AIDA::IHistogram1D *_histMeanMultiRho770_0;
- AIDA::IHistogram1D *_histMeanMultiRho770Plus;
- AIDA::IHistogram1D *_histMeanMultiOmega782;
- AIDA::IHistogram1D *_histMeanMultiKStar892Plus;
- AIDA::IHistogram1D *_histMeanMultiKStar892_0;
- AIDA::IHistogram1D *_histMeanMultiPhi1020;
- AIDA::IHistogram1D *_histMeanMultiDStar2010Plus;
- AIDA::IHistogram1D *_histMeanMultiDStar2007_0;
- AIDA::IHistogram1D *_histMeanMultiDStar_s2112Plus;
- AIDA::IHistogram1D *_histMeanMultiBStar;
- AIDA::IHistogram1D *_histMeanMultiJPsi1S;
- AIDA::IHistogram1D *_histMeanMultiPsi2S;
- AIDA::IHistogram1D *_histMeanMultiUpsilon1S;
- AIDA::IHistogram1D *_histMeanMultiF1_1285;
- AIDA::IHistogram1D *_histMeanMultiF1_1420;
- AIDA::IHistogram1D *_histMeanMultiChi_c1_3510;
- AIDA::IHistogram1D *_histMeanMultiF2_1270;
- AIDA::IHistogram1D *_histMeanMultiF2Prime1525;
- AIDA::IHistogram1D *_histMeanMultiK2Star1430Plus;
- AIDA::IHistogram1D *_histMeanMultiK2Star1430_0;
- AIDA::IHistogram1D *_histMeanMultiBStarStar;
- AIDA::IHistogram1D *_histMeanMultiDs1Plus;
- AIDA::IHistogram1D *_histMeanMultiDs2Plus;
- AIDA::IHistogram1D *_histMeanMultiP;
- AIDA::IHistogram1D *_histMeanMultiLambda;
- AIDA::IHistogram1D *_histMeanMultiSigma0;
- AIDA::IHistogram1D *_histMeanMultiSigmaMinus;
- AIDA::IHistogram1D *_histMeanMultiSigmaPlus;
- AIDA::IHistogram1D *_histMeanMultiSigmaPlusMinus;
- AIDA::IHistogram1D *_histMeanMultiXiMinus;
- AIDA::IHistogram1D *_histMeanMultiDelta1232PlusPlus;
- AIDA::IHistogram1D *_histMeanMultiSigma1385Minus;
- AIDA::IHistogram1D *_histMeanMultiSigma1385Plus;
- AIDA::IHistogram1D *_histMeanMultiSigma1385PlusMinus;
- AIDA::IHistogram1D *_histMeanMultiXi1530_0;
- AIDA::IHistogram1D *_histMeanMultiOmegaMinus;
- AIDA::IHistogram1D *_histMeanMultiLambda_c_Plus;
- AIDA::IHistogram1D *_histMeanMultiLambda_b_0;
- AIDA::IHistogram1D *_histMeanMultiSigma_c_PlusPlus_0;
- AIDA::IHistogram1D *_histMeanMultiLambda1520;
+ Histo1DPtr _histMeanMultiPi0;
+ Histo1DPtr _histMeanMultiKPlus;
+ Histo1DPtr _histMeanMultiK0;
+ Histo1DPtr _histMeanMultiEta;
+ Histo1DPtr _histMeanMultiEtaPrime;
+ Histo1DPtr _histMeanMultiDPlus;
+ Histo1DPtr _histMeanMultiD0;
+ Histo1DPtr _histMeanMultiDPlus_s;
+ Histo1DPtr _histMeanMultiBPlus_B0_d;
+ Histo1DPtr _histMeanMultiBPlus_u;
+ Histo1DPtr _histMeanMultiB0_s;
+ Histo1DPtr _histMeanMultiF0_980;
+ Histo1DPtr _histMeanMultiA0_980Plus;
+ Histo1DPtr _histMeanMultiRho770_0;
+ Histo1DPtr _histMeanMultiRho770Plus;
+ Histo1DPtr _histMeanMultiOmega782;
+ Histo1DPtr _histMeanMultiKStar892Plus;
+ Histo1DPtr _histMeanMultiKStar892_0;
+ Histo1DPtr _histMeanMultiPhi1020;
+ Histo1DPtr _histMeanMultiDStar2010Plus;
+ Histo1DPtr _histMeanMultiDStar2007_0;
+ Histo1DPtr _histMeanMultiDStar_s2112Plus;
+ Histo1DPtr _histMeanMultiBStar;
+ Histo1DPtr _histMeanMultiJPsi1S;
+ Histo1DPtr _histMeanMultiPsi2S;
+ Histo1DPtr _histMeanMultiUpsilon1S;
+ Histo1DPtr _histMeanMultiF1_1285;
+ Histo1DPtr _histMeanMultiF1_1420;
+ Histo1DPtr _histMeanMultiChi_c1_3510;
+ Histo1DPtr _histMeanMultiF2_1270;
+ Histo1DPtr _histMeanMultiF2Prime1525;
+ Histo1DPtr _histMeanMultiK2Star1430Plus;
+ Histo1DPtr _histMeanMultiK2Star1430_0;
+ Histo1DPtr _histMeanMultiBStarStar;
+ Histo1DPtr _histMeanMultiDs1Plus;
+ Histo1DPtr _histMeanMultiDs2Plus;
+ Histo1DPtr _histMeanMultiP;
+ Histo1DPtr _histMeanMultiLambda;
+ Histo1DPtr _histMeanMultiSigma0;
+ Histo1DPtr _histMeanMultiSigmaMinus;
+ Histo1DPtr _histMeanMultiSigmaPlus;
+ Histo1DPtr _histMeanMultiSigmaPlusMinus;
+ Histo1DPtr _histMeanMultiXiMinus;
+ Histo1DPtr _histMeanMultiDelta1232PlusPlus;
+ Histo1DPtr _histMeanMultiSigma1385Minus;
+ Histo1DPtr _histMeanMultiSigma1385Plus;
+ Histo1DPtr _histMeanMultiSigma1385PlusMinus;
+ Histo1DPtr _histMeanMultiXi1530_0;
+ Histo1DPtr _histMeanMultiOmegaMinus;
+ Histo1DPtr _histMeanMultiLambda_c_Plus;
+ Histo1DPtr _histMeanMultiLambda_b_0;
+ Histo1DPtr _histMeanMultiSigma_c_PlusPlus_0;
+ Histo1DPtr _histMeanMultiLambda1520;
//@}
More information about the Rivet-svn
mailing list
|