X-Git-Url: http://git.treefish.org/~alex/phys/u1casc.git/blobdiff_plain/85cb7253b975501063e89285d46824d0988b82ee..ea278d0dfaf581ddaf7b1b16af83dc1b9b62b754:/u1casc-ordinary/obs_phi2.hpp?ds=sidebyside diff --git a/u1casc-ordinary/obs_phi2.hpp b/u1casc-ordinary/obs_phi2.hpp index 3e4fe48..0cad20e 100644 --- a/u1casc-ordinary/obs_phi2.hpp +++ b/u1casc-ordinary/obs_phi2.hpp @@ -97,10 +97,9 @@ void obs_phi2::prePhi2Sus(vector< vector > *allVals, vector *p } double obs_phi2::phi2Sus(vector *preCalculated, vector *excludedMeas, int nmeas, void *para) { - return (( (*preCalculated)[1] - pow((*excludedMeas)[0], 2) ) - - pow( (*preCalculated)[0] - (*excludedMeas)[0], 2 )) - * *(int*)para - / (nmeas-1); + return (( (*preCalculated)[1] - pow((*excludedMeas)[0], 2) ) / (nmeas-1) + - pow( ( (*preCalculated)[0] - (*excludedMeas)[0] ) / (nmeas-1), 2 )) + * *(int*)para; } #endif