From: Alex Schmidt Date: Thu, 27 Jun 2013 14:46:49 +0000 (+0200) Subject: ... X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/commitdiff_plain/681f1e885b0f95d7278ad2e7e0f2d157c0048390?ds=sidebyside;hp=3675da388f7ca12cdc6d93f4a8b94ef4bdd96b19 ... --- diff --git a/obstat.hpp b/obstat.hpp index 6818792..2824e69 100644 --- a/obstat.hpp +++ b/obstat.hpp @@ -19,7 +19,7 @@ public: int computeJack(restype (*func)(vector< vector > *vals, void *para), void *para=NULL); int computeJack(void (*preMeasFunc)(vector< vector > *allVals, vector *preCalculated, void *para), - restype (*measFunc)(vector *preCalculated, vector *excludedmeas, void *para), void *para=NULL); + restype (*measFunc)(vector *preCalculated, vector *excludedmeas, int nmeas, void *para), void *para=NULL); restype getMean(int compid) { return computations[compid].val; } restype getErr(int compid) { return computations[compid].err; } @@ -121,7 +121,7 @@ int obstat::computeJack(restype (*func)(vector< vector int obstat::computeJack(void (*preMeasFunc)(vector< vector > *allVals, vector *preCalculated, void *para), - restype (*measFunc)(vector *preCalculated, vector *excludedmeas, void *para), + restype (*measFunc)(vector *preCalculated, vector *excludedmeas, int nmeas, void *para), void *para) { int nmeas=measurements.size(); restype manymeans[nmeas]; @@ -135,7 +135,7 @@ int obstat::computeJack(void (*preMeasFunc)(vector< vector >::iterator removedIt = measurements.begin(); removedIt != measurements.end(); ++removedIt, imeas++) { - manymeans[imeas] = measFunc(&preCalculated, &(*removedIt), para); + manymeans[imeas] = measFunc(&preCalculated, &(*removedIt), measurements.size(), para); jackres.val += manymeans[imeas]; } jackres.val /= nmeas;