|
[Rivet-svn] r1866 - trunk/src/Analysesblackhole at projects.hepforge.org blackhole at projects.hepforge.orgMon Oct 5 14:06:44 BST 2009
Author: buckley Date: Mon Oct 5 14:06:43 2009 New Revision: 1866 Log: Get pow args the right way around Modified: trunk/src/Analyses/OPAL_2004_S6132243.cc Modified: trunk/src/Analyses/OPAL_2004_S6132243.cc ============================================================================== --- trunk/src/Analyses/OPAL_2004_S6132243.cc Mon Oct 5 12:02:03 2009 (r1865) +++ trunk/src/Analyses/OPAL_2004_S6132243.cc Mon Oct 5 14:06:43 2009 (r1866) @@ -107,10 +107,10 @@ _histTMinor[ih]->fill(thrust.thrustMinor(), weight); _histOblateness[ih]->fill(thrust.oblateness(), weight); for (int n = 1; n <= 5; ++n) { - _hist1MinusTMom[ih]->fill(n, pow(n, 1-thrust.thrust())*weight); - _histTMajorMom[ih]->fill(n, pow(n, thrust.thrustMajor())*weight); - _histTMinorMom[ih]->fill(n, pow(n, thrust.thrustMinor())*weight); - _histOblatenessMom[ih]->fill(n, pow(n, thrust.oblateness())*weight); + _hist1MinusTMom[ih]->fill(n, pow(1-thrust.thrust(), n)*weight); + _histTMajorMom[ih]->fill(n, pow(thrust.thrustMajor(), n)*weight); + _histTMinorMom[ih]->fill(n, pow(thrust.thrustMinor(), n)*weight); + _histOblatenessMom[ih]->fill(n, pow(thrust.oblateness(), n)*weight); } // Jets @@ -120,7 +120,7 @@ const double y23 = durjet.clusterSeq()->exclusive_ymerge(3); _histY23Durham[ih]->fill(y23, weight); for (int n = 1; n <= 5; ++n) { - _histY23DurhamMom[ih]->fill(n, pow(n, y23)*weight); + _histY23DurhamMom[ih]->fill(n, pow(y23, n)*weight); } } @@ -131,7 +131,7 @@ _histSphericity[ih]->fill(sph, weight); _histAplanarity[ih]->fill(apl, weight); for (int n = 1; n <= 5; ++n) { - _histSphericityMom[ih]->fill(n, pow(n, sph)*weight); + _histSphericityMom[ih]->fill(n, pow(sph, n)*weight); } // C & D params @@ -141,7 +141,7 @@ _histCParam[ih]->fill(cparam, weight); _histDParam[ih]->fill(dparam, weight); for (int n = 1; n <= 5; ++n) { - _histCParamMom[ih]->fill(n, pow(n, cparam)*weight); + _histCParamMom[ih]->fill(n, pow(cparam, n)*weight); } // Hemispheres @@ -157,11 +157,11 @@ _histHemiBroadN[ih]->fill(hemi_bmin, weight); _histHemiBroadT[ih]->fill(hemi_bsum, weight); for (int n = 1; n <= 5; ++n) { - _histHemiMassHMom[ih]->fill(n, pow(n, hemi_mh)*weight); - _histHemiMassLMom[ih]->fill(n, pow(n, hemi_ml)*weight); - _histHemiBroadWMom[ih]->fill(n, pow(n, hemi_bmax)*weight); - _histHemiBroadNMom[ih]->fill(n, pow(n, hemi_bmin)*weight); - _histHemiBroadTMom[ih]->fill(n, pow(n, hemi_bsum)*weight); + _histHemiMassHMom[ih]->fill(n, pow(hemi_mh, n)*weight); + _histHemiMassLMom[ih]->fill(n, pow(hemi_ml, n)*weight); + _histHemiBroadWMom[ih]->fill(n, pow(hemi_bmax, n)*weight); + _histHemiBroadNMom[ih]->fill(n, pow(hemi_bmin, n)*weight); + _histHemiBroadTMom[ih]->fill(n, pow(hemi_bsum, n)*weight); } }
More information about the Rivet-svn mailing list |