|
|
[Rivet-svn] r3212 - branches/2011-07-aida2yoda/src/Analyses
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Tue Jul 19 16:46:35 BST 2011
Author: dgrell
Date: Tue Jul 19 16:46:34 2011
New Revision: 3212
Log:
more analyses converted
Modified:
branches/2011-07-aida2yoda/src/Analyses/JADE_OPAL_2000_S4300807.cc
branches/2011-07-aida2yoda/src/Analyses/MC_XS.cc
branches/2011-07-aida2yoda/src/Analyses/Makefile.am
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/src/Analyses/JADE_OPAL_2000_S4300807.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/JADE_OPAL_2000_S4300807.cc Tue Jul 19 16:33:02 2011 (r3211)
+++ branches/2011-07-aida2yoda/src/Analyses/JADE_OPAL_2000_S4300807.cc Tue Jul 19 16:46:34 2011 (r3212)
@@ -67,38 +67,38 @@
double y_45 = jadejet.clusterSeq()->exclusive_ymerge_max(4);
double y_56 = jadejet.clusterSeq()->exclusive_ymerge_max(5);
- for (int i = 0; i < _h_R_Jade[0]->size(); ++i) {
- IDataPoint* dp = _h_R_Jade[0]->point(i);
- if (y_23 < dp->coordinate(0)->value()) {
- dp->coordinate(1)->setValue(dp->coordinate(1)->value() + weight);
+ for (size_t i = 0; i < _h_R_Jade[0]->numPoints(); ++i) {
+ Point2D & dp = _h_R_Jade[0]->point(i);
+ if (y_23 < dp.x()) {
+ dp.setY(dp.y() + weight);
}
}
- for (int i = 0; i < _h_R_Jade[1]->size(); ++i) {
- IDataPoint* dp = _h_R_Jade[1]->point(i);
- double ycut = dp->coordinate(0)->value();
+ for (size_t i = 0; i < _h_R_Jade[1]->numPoints(); ++i) {
+ Point2D & dp = _h_R_Jade[1]->point(i);
+ double ycut = dp.x();
if (y_34 < ycut && y_23 > ycut) {
- dp->coordinate(1)->setValue(dp->coordinate(1)->value() + weight);
+ dp.setY(dp.y() + weight);
}
}
- for (int i = 0; i < _h_R_Jade[2]->size(); ++i) {
- IDataPoint* dp = _h_R_Jade[2]->point(i);
- double ycut = dp->coordinate(0)->value();
+ for (size_t i = 0; i < _h_R_Jade[2]->numPoints(); ++i) {
+ Point2D & dp = _h_R_Jade[2]->point(i);
+ double ycut = dp.x();
if (y_45 < ycut && y_34 > ycut) {
- dp->coordinate(1)->setValue(dp->coordinate(1)->value() + weight);
+ dp.setY(dp.y() + weight);
}
}
- for (int i = 0; i < _h_R_Jade[3]->size(); ++i) {
- IDataPoint* dp = _h_R_Jade[3]->point(i);
- double ycut = dp->coordinate(0)->value();
+ for (size_t i = 0; i < _h_R_Jade[3]->numPoints(); ++i) {
+ Point2D & dp = _h_R_Jade[3]->point(i);
+ double ycut = dp.x();
if (y_56 < ycut && y_45 > ycut) {
- dp->coordinate(1)->setValue(dp->coordinate(1)->value() + weight);
+ dp.setY(dp.y() + weight);
}
}
- for (int i = 0; i < _h_R_Jade[4]->size(); ++i) {
- IDataPoint* dp = _h_R_Jade[4]->point(i);
- double ycut = dp->coordinate(0)->value();
+ for (size_t i = 0; i < _h_R_Jade[4]->numPoints(); ++i) {
+ Point2D & dp = _h_R_Jade[4]->point(i);
+ double ycut = dp.x();
if (y_56 > ycut) {
- dp->coordinate(1)->setValue(dp->coordinate(1)->value() + weight);
+ dp.setY(dp.y() + weight);
}
}
}
@@ -116,38 +116,38 @@
_h_y_Durham[2]->fill(y_45, weight);
_h_y_Durham[3]->fill(y_56, weight);
- for (int i = 0; i < _h_R_Durham[0]->size(); ++i) {
- IDataPoint* dp = _h_R_Durham[0]->point(i);
- if (y_23 < dp->coordinate(0)->value()) {
- dp->coordinate(1)->setValue(dp->coordinate(1)->value() + weight);
+ for (size_t i = 0; i < _h_R_Durham[0]->numPoints(); ++i) {
+ Point2D & dp = _h_R_Durham[0]->point(i);
+ if (y_23 < dp.x()) {
+ dp.setY(dp.y() + weight);
}
}
- for (int i = 0; i < _h_R_Durham[1]->size(); ++i) {
- IDataPoint* dp = _h_R_Durham[1]->point(i);
- double ycut = dp->coordinate(0)->value();
+ for (size_t i = 0; i < _h_R_Durham[1]->numPoints(); ++i) {
+ Point2D & dp = _h_R_Durham[1]->point(i);
+ double ycut = dp.x();
if (y_34 < ycut && y_23 > ycut) {
- dp->coordinate(1)->setValue(dp->coordinate(1)->value() + weight);
+ dp.setY(dp.y() + weight);
}
}
- for (int i = 0; i < _h_R_Durham[2]->size(); ++i) {
- IDataPoint* dp = _h_R_Durham[2]->point(i);
- double ycut = dp->coordinate(0)->value();
+ for (size_t i = 0; i < _h_R_Durham[2]->numPoints(); ++i) {
+ Point2D & dp = _h_R_Durham[2]->point(i);
+ double ycut = dp.x();
if (y_45 < ycut && y_34 > ycut) {
- dp->coordinate(1)->setValue(dp->coordinate(1)->value() + weight);
+ dp.setY(dp.y() + weight);
}
}
- for (int i = 0; i < _h_R_Durham[3]->size(); ++i) {
- IDataPoint* dp = _h_R_Durham[3]->point(i);
- double ycut = dp->coordinate(0)->value();
+ for (size_t i = 0; i < _h_R_Durham[3]->numPoints(); ++i) {
+ Point2D & dp = _h_R_Durham[3]->point(i);
+ double ycut = dp.x();
if (y_56 < ycut && y_45 > ycut) {
- dp->coordinate(1)->setValue(dp->coordinate(1)->value() + weight);
+ dp.setY(dp.y() + weight);
}
}
- for (int i = 0; i < _h_R_Durham[4]->size(); ++i) {
- IDataPoint* dp = _h_R_Durham[4]->point(i);
- double ycut = dp->coordinate(0)->value();
+ for (size_t i = 0; i < _h_R_Durham[4]->numPoints(); ++i) {
+ Point2D & dp = _h_R_Durham[4]->point(i);
+ double ycut = dp.x();
if (y_56 > ycut) {
- dp->coordinate(1)->setValue(dp->coordinate(1)->value() + weight);
+ dp.setY(dp.y() + weight);
}
}
}
@@ -163,13 +163,13 @@
for (size_t n = 0; n < 5; ++n) {
// Scale integrated jet rates to 100%
- for (int i = 0; i < _h_R_Jade[n]->size(); ++i) {
- IDataPoint* dp = _h_R_Jade[n]->point(i);
- dp->coordinate(1)->setValue(dp->coordinate(1)->value()*100.0/sumOfWeights());
- }
- for (int i = 0; i < _h_R_Durham[n]->size(); ++i) {
- IDataPoint* dp = _h_R_Durham[n]->point(i);
- dp->coordinate(1)->setValue(dp->coordinate(1)->value()*100.0/sumOfWeights());
+ for (size_t i = 0; i < _h_R_Jade[n]->numPoints(); ++i) {
+ Point2D & dp = _h_R_Jade[n]->point(i);
+ dp.setY(dp.y()*100.0/sumOfWeights());
+ }
+ for (size_t i = 0; i < _h_R_Durham[n]->numPoints(); ++i) {
+ Point2D & dp = _h_R_Durham[n]->point(i);
+ dp.setY(dp.y()*100.0/sumOfWeights());
}
}
}
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_XS.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_XS.cc Tue Jul 19 16:33:02 2011 (r3211)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_XS.cc Tue Jul 19 16:46:34 2011 (r3212)
@@ -51,10 +51,8 @@
_mc_xs=crossSection();
_mc_error=0.0;
#endif
- std::vector<double> xs,err;
- xs.push_back(_mc_xs);
- err.push_back(_mc_error);
- _h_XS->setCoordinate(1,xs,err);
+ _h_XS->addPoint(0,_mc_xs,
+ 0,_mc_error);
}
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/Makefile.am
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/Makefile.am Tue Jul 19 16:33:02 2011 (r3211)
+++ branches/2011-07-aida2yoda/src/Analyses/Makefile.am Tue Jul 19 16:46:34 2011 (r3212)
@@ -213,17 +213,17 @@
# UA5_1989_S1926373.cc
-# lib_LTLIBRARIES += RivetMiscAnalyses.la
-# RivetMiscAnalyses_la_SOURCES = \
-# PDG_Hadron_Multiplicities.cc \
-# PDG_Hadron_Multiplicities_Ratios.cc \
-# JADE_OPAL_2000_S4300807.cc \
-# BELLE_2006_S6265367.cc
-# if ENABLE_UNVALIDATED
-# RivetMiscAnalyses_la_SOURCES += \
-# E735_1998_S3905616.cc \
-# SFM_1984_S1178091.cc
-# endif
+lib_LTLIBRARIES += RivetMiscAnalyses.la
+RivetMiscAnalyses_la_SOURCES = \
+ PDG_Hadron_Multiplicities.cc \
+ PDG_Hadron_Multiplicities_Ratios.cc \
+ JADE_OPAL_2000_S4300807.cc \
+ BELLE_2006_S6265367.cc
+if ENABLE_UNVALIDATED
+RivetMiscAnalyses_la_SOURCES += \
+ E735_1998_S3905616.cc \
+ SFM_1984_S1178091.cc
+endif
lib_LTLIBRARIES += RivetMCAnalyses.la
@@ -241,10 +241,10 @@
MC_LEADINGJETS.cc \
MC_DIPHOTON.cc \
MC_SUSY.cc
-# if ENABLE_UNVALIDATED
-# RivetMCAnalyses_la_SOURCES += \
-# MC_DIJET.cc \
-# MC_PHOTONJETUE.cc \
-# MC_TTBAR.cc \
-# MC_XS.cc
-# endif
+if ENABLE_UNVALIDATED
+RivetMCAnalyses_la_SOURCES += \
+ MC_DIJET.cc \
+ MC_PHOTONJETUE.cc \
+ MC_TTBAR.cc \
+ MC_XS.cc
+endif
Modified: branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities.cc Tue Jul 19 16:33:02 2011 (r3211)
+++ branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities.cc Tue Jul 19 16:46:34 2011 (r3212)
@@ -49,104 +49,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;
}
}
@@ -157,85 +157,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;
}
}
@@ -246,162 +246,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;
}
}
@@ -412,20 +412,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;
}
}
Modified: branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc Tue Jul 19 16:33:02 2011 (r3211)
+++ branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc Tue Jul 19 16:46:34 2011 (r3212)
@@ -53,101 +53,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;
}
}
@@ -161,82 +161,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;
}
}
@@ -250,159 +250,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;
}
}
@@ -416,17 +416,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;
}
}
More information about the Rivet-svn
mailing list
|