|
[Rivet-svn] r3588 - in trunk: data/anainfo src/Analysesblackhole at projects.hepforge.org blackhole at projects.hepforge.orgWed Feb 29 13:47:12 GMT 2012
Author: richardn Date: Wed Feb 29 13:47:11 2012 New Revision: 3588 Log: fixes for running PDG analyses at different energies Modified: trunk/data/anainfo/PDG_HADRON_MULTIPLICITIES.info trunk/data/anainfo/PDG_HADRON_MULTIPLICITIES_RATIOS.info trunk/src/Analyses/PDG_HADRON_MULTIPLICITIES.cc trunk/src/Analyses/PDG_HADRON_MULTIPLICITIES_RATIOS.cc Modified: trunk/data/anainfo/PDG_HADRON_MULTIPLICITIES.info ============================================================================== --- trunk/data/anainfo/PDG_HADRON_MULTIPLICITIES.info Tue Feb 28 14:07:15 2012 (r3587) +++ trunk/data/anainfo/PDG_HADRON_MULTIPLICITIES.info Wed Feb 29 13:47:11 2012 (r3588) @@ -13,7 +13,7 @@ Hadronic events in $e^+ e^-$ collisions NumEvents: 1000000 Beams: [e+, e-] -Energies: [91.2] +Energies: [10, 35, 91.2, 177] PtCuts: [0] Description: Hadron multiplicities in hadronic $e^+e^-$ events, taken from Review of Modified: trunk/data/anainfo/PDG_HADRON_MULTIPLICITIES_RATIOS.info ============================================================================== --- trunk/data/anainfo/PDG_HADRON_MULTIPLICITIES_RATIOS.info Tue Feb 28 14:07:15 2012 (r3587) +++ trunk/data/anainfo/PDG_HADRON_MULTIPLICITIES_RATIOS.info Wed Feb 29 13:47:11 2012 (r3588) @@ -13,7 +13,7 @@ Hadronic events in $e^+ e^-$ collisions NumEvents: 1000000 Beams: [e+, e-] -Energies: [91.2] +Energies: [10, 35, 91.2, 177] PtCuts: [0] Description: Ratios (w.r.t. $\pi^+/\pi^-$) of hadron multiplicities in hadronic $e^+ e^-$ Modified: trunk/src/Analyses/PDG_HADRON_MULTIPLICITIES.cc ============================================================================== --- trunk/src/Analyses/PDG_HADRON_MULTIPLICITIES.cc Tue Feb 28 14:07:15 2012 (r3587) +++ trunk/src/Analyses/PDG_HADRON_MULTIPLICITIES.cc Wed Feb 29 13:47:11 2012 (r3588) @@ -608,33 +608,33 @@ } if (sqrtS()/GeV >= 29 && sqrtS()/GeV <= 35) { - scale(_histMeanMultiPiPlus , 1.0/sumOfWeights()); - scale(_histMeanMultiPi0 , 1.0/sumOfWeights()); - scale(_histMeanMultiKPlus , 1.0/sumOfWeights()); - scale(_histMeanMultiK0 , 1.0/sumOfWeights()); - scale(_histMeanMultiEta , 1.0/sumOfWeights()); - scale(_histMeanMultiEtaPrime , 1.0/sumOfWeights()); - scale(_histMeanMultiDPlus , 1.0/sumOfWeights()); - scale(_histMeanMultiD0 , 1.0/sumOfWeights()); - scale(_histMeanMultiDPlus_s , 1.0/sumOfWeights()); - scale(_histMeanMultiF0_980 , 1.0/sumOfWeights()); - scale(_histMeanMultiRho770_0 , 1.0/sumOfWeights()); - scale(_histMeanMultiKStar892Plus , 1.0/sumOfWeights()); - scale(_histMeanMultiKStar892_0 , 1.0/sumOfWeights()); - scale(_histMeanMultiPhi1020 , 1.0/sumOfWeights()); - scale(_histMeanMultiDStar2010Plus , 1.0/sumOfWeights()); - scale(_histMeanMultiDStar2007_0 , 1.0/sumOfWeights()); - scale(_histMeanMultiF2_1270 , 1.0/sumOfWeights()); - scale(_histMeanMultiK2Star1430Plus , 1.0/sumOfWeights()); - scale(_histMeanMultiK2Star1430_0 , 1.0/sumOfWeights()); - scale(_histMeanMultiP , 1.0/sumOfWeights()); - scale(_histMeanMultiLambda , 1.0/sumOfWeights()); - scale(_histMeanMultiXiMinus , 1.0/sumOfWeights()); - scale(_histMeanMultiSigma1385Minus , 1.0/sumOfWeights()); - scale(_histMeanMultiSigma1385Plus , 1.0/sumOfWeights()); - scale(_histMeanMultiSigma1385PlusMinus, 1.0/sumOfWeights()); - scale(_histMeanMultiOmegaMinus , 1.0/sumOfWeights()); - scale(_histMeanMultiLambda_c_Plus , 1.0/sumOfWeights()); + scale(_histMeanMultiPiPlus , 5.0/sumOfWeights()); + scale(_histMeanMultiPi0 , 5.0/sumOfWeights()); + scale(_histMeanMultiKPlus , 5.0/sumOfWeights()); + scale(_histMeanMultiK0 , 5.0/sumOfWeights()); + scale(_histMeanMultiEta , 5.0/sumOfWeights()); + scale(_histMeanMultiEtaPrime , 5.0/sumOfWeights()); + scale(_histMeanMultiDPlus , 5.0/sumOfWeights()); + scale(_histMeanMultiD0 , 5.0/sumOfWeights()); + scale(_histMeanMultiDPlus_s , 5.0/sumOfWeights()); + scale(_histMeanMultiF0_980 , 5.0/sumOfWeights()); + scale(_histMeanMultiRho770_0 , 5.0/sumOfWeights()); + scale(_histMeanMultiKStar892Plus , 5.0/sumOfWeights()); + scale(_histMeanMultiKStar892_0 , 5.0/sumOfWeights()); + scale(_histMeanMultiPhi1020 , 5.0/sumOfWeights()); + scale(_histMeanMultiDStar2010Plus , 5.0/sumOfWeights()); + scale(_histMeanMultiDStar2007_0 , 5.0/sumOfWeights()); + scale(_histMeanMultiF2_1270 , 5.0/sumOfWeights()); + scale(_histMeanMultiK2Star1430Plus , 5.0/sumOfWeights()); + scale(_histMeanMultiK2Star1430_0 , 5.0/sumOfWeights()); + scale(_histMeanMultiP , 5.0/sumOfWeights()); + scale(_histMeanMultiLambda , 5.0/sumOfWeights()); + scale(_histMeanMultiXiMinus , 5.0/sumOfWeights()); + scale(_histMeanMultiSigma1385Minus , 5.0/sumOfWeights()); + scale(_histMeanMultiSigma1385Plus , 5.0/sumOfWeights()); + scale(_histMeanMultiSigma1385PlusMinus, 5.0/sumOfWeights()); + scale(_histMeanMultiOmegaMinus , 5.0/sumOfWeights()); + scale(_histMeanMultiLambda_c_Plus , 5.0/sumOfWeights()); } if (sqrtS()/GeV >= 89.5 && sqrtS()/GeV <= 91.8) { @@ -692,11 +692,11 @@ } if (sqrtS()/GeV >= 130 && sqrtS()/GeV <= 200) { - scale(_histMeanMultiPiPlus , 1.0/sumOfWeights()); - scale(_histMeanMultiKPlus , 1.0/sumOfWeights()); - scale(_histMeanMultiK0 , 1.0/sumOfWeights()); - scale(_histMeanMultiP , 1.0/sumOfWeights()); - scale(_histMeanMultiLambda , 1.0/sumOfWeights()); + scale(_histMeanMultiPiPlus , 70.0/sumOfWeights()); + scale(_histMeanMultiKPlus , 70.0/sumOfWeights()); + scale(_histMeanMultiK0 , 70.0/sumOfWeights()); + scale(_histMeanMultiP , 70.0/sumOfWeights()); + scale(_histMeanMultiLambda , 70.0/sumOfWeights()); } } Modified: trunk/src/Analyses/PDG_HADRON_MULTIPLICITIES_RATIOS.cc ============================================================================== --- trunk/src/Analyses/PDG_HADRON_MULTIPLICITIES_RATIOS.cc Tue Feb 28 14:07:15 2012 (r3587) +++ trunk/src/Analyses/PDG_HADRON_MULTIPLICITIES_RATIOS.cc Wed Feb 29 13:47:11 2012 (r3588) @@ -604,32 +604,32 @@ } if (sqrtS()/GeV >= 29 && sqrtS()/GeV <= 35) { - scale(_histMeanMultiPi0 , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiKPlus , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiK0 , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiEta , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiEtaPrime , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiDPlus , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiD0 , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiDPlus_s , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiF0_980 , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiRho770_0 , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiKStar892Plus , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiKStar892_0 , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiPhi1020 , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiDStar2010Plus , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiDStar2007_0 , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiF2_1270 , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiK2Star1430Plus , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiK2Star1430_0 , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiP , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiLambda , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiXiMinus , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiSigma1385Minus , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiSigma1385Plus , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiSigma1385PlusMinus, 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiOmegaMinus , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiLambda_c_Plus , 1.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiPi0 , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiKPlus , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiK0 , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiEta , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiEtaPrime , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiDPlus , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiD0 , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiDPlus_s , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiF0_980 , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiRho770_0 , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiKStar892Plus , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiKStar892_0 , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiPhi1020 , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiDStar2010Plus , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiDStar2007_0 , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiF2_1270 , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiK2Star1430Plus , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiK2Star1430_0 , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiP , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiLambda , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiXiMinus , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiSigma1385Minus , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiSigma1385Plus , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiSigma1385PlusMinus, 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiOmegaMinus , 5.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiLambda_c_Plus , 5.0/_weightedTotalNumPiPlus); } if (sqrtS()/GeV >= 89.5 && sqrtS()/GeV <= 91.8) { @@ -686,10 +686,10 @@ } if (sqrtS()/GeV >= 130 && sqrtS()/GeV <= 200) { - scale(_histMeanMultiKPlus , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiK0 , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiP , 1.0/_weightedTotalNumPiPlus); - scale(_histMeanMultiLambda , 1.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiKPlus , 70.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiK0 , 70.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiP , 70.0/_weightedTotalNumPiPlus); + scale(_histMeanMultiLambda , 70.0/_weightedTotalNumPiPlus); } }
More information about the Rivet-svn mailing list |