Implemented startconfig.

[phys/latlib.git] / obstat.hpp

diff --git a/obstat.hpp b/obstat.hpp
index 2996043c7324ca2cee0e20b3cc55e46b6748cd3d..6a2cf6e3c4a99a80ea31c00d91c1502e303de283 100644 (file)
--- a/obstat.hpp
+++ b/obstat.hpp
@@ -17,7 +17,8 @@ public:
 
   int computeEasy(const int& ival=0) { return mean(&measurements, ival); }
 
 
   int computeEasy(const int& ival=0) { return mean(&measurements, ival); }
 

-  int computeJack(restype (*func)(vector< vector <meastype> > *vals, void *para)=NULL, void *para=NULL);
+  int computeJack(void (*preMeasFunc)(vector< vector <meastype> > *allVals, vector <meastype> *preCalculated, void *para), 
+                 restype (*measFunc)(vector <meastype> *preCalculated, vector <meastype> *excludedmeas, int nmeas, void *para), void *para=NULL);

 
   restype getMean(int compid) { return computations[compid].val; }
   restype getErr(int compid) { return computations[compid].err; }
 
   restype getMean(int compid) { return computations[compid].val; }
   restype getErr(int compid) { return computations[compid].err; }


@@ -82,31 +83,26 @@ int obstat<meastype,restype>::mean(vector< vector<meastype> > *meas, const int&
 }
 
 template <typename meastype, typename restype>
 }
 
 template <typename meastype, typename restype>

-int obstat<meastype,restype>::computeJack(restype (*func)(vector< vector<meastype> > *vals, void *para), void *para)
-{
+int obstat<meastype,restype>::computeJack(void (*preMeasFunc)(vector< vector <meastype> > *allVals, vector<meastype> *preCalculated, void *para), 
+                                         restype (*measFunc)(vector<meastype> *preCalculated, vector<meastype> *excludedmeas, int nmeas, void *para),
+                                         void *para) {

   int nmeas=measurements.size();
   int nmeas=measurements.size();

-  restype manymeans[nmeas];
+  restype *manymeans = new restype[nmeas];

   result jackres;
   result jackres;

+  vector<meastype> preCalculated;

 
   jackres.val = 0;
   jackres.err = 0;
 
 
   jackres.val = 0;
   jackres.err = 0;
 

+  preMeasFunc(&measurements, &preCalculated, para);
+

   int imeas=0;
   int imeas=0;

-  for(typename vector< vector<meastype> >::iterator removedIt = measurements.begin(); removedIt != measurements.end(); ++removedIt, imeas++)
-    {
-      vector<meastype> removed = *removedIt;
-      
-      *removedIt = measurements.back();
-      measurements.pop_back();
-
-      manymeans[imeas] = func(&measurements, para);
-      jackres.val += manymeans[imeas];
-      
-      measurements.push_back( *removedIt );
-      *removedIt = removed;
-    }
+  for(typename vector< vector<meastype> >::iterator removedIt = measurements.begin(); removedIt != measurements.end(); ++removedIt, imeas++) {
+    manymeans[imeas] = measFunc(&preCalculated, &(*removedIt), measurements.size(), para);
+    jackres.val += manymeans[imeas]; 
+  }

   jackres.val /= nmeas;
   jackres.val /= nmeas;

-
+  

   for(int imean=0; imean<nmeas; imean++)
     jackres.err += pow( manymeans[imean] - jackres.val, 2 );
   jackres.err *= (double)(nmeas-1)/nmeas;
   for(int imean=0; imean<nmeas; imean++)
     jackres.err += pow( manymeans[imean] - jackres.val, 2 );
   jackres.err *= (double)(nmeas-1)/nmeas;


@@ -114,6 +110,8 @@ int obstat<meastype,restype>::computeJack(restype (*func)(vector< vector<meastyp
 
   computations.push_back(jackres);
 
 
   computations.push_back(jackres);
 

+  delete [] manymeans;
+

   return computations.size()-1;
 }
 
   return computations.size()-1;
 }