X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/2c7e8d0d8fdb233087376cc62752fdc45646c8c8..a5f05e337d18c193ac57b4da0013d1cdc69f8faa:/obs.hpp

diff --git a/obs.hpp b/obs.hpp
deleted file mode 100644
index 4d20bd6..0000000
--- a/obs.hpp
+++ /dev/null
@@ -1,128 +0,0 @@
-#ifndef OBS_HPP
-#define OBS_HPP
-
-#include <vector>
-#include <string>
-#include <map>
-#include <math.h>
-
-using namespace std;
-
-template <typename obstype>
-class obs
-{ 
-public:
-  void addMeas(const obstype& val);
-  void addMeas(obstype val[], int valsize);
-
-  void computeEasy(const string& compid="one", const int& ival=0) { mean(compid, &measurements, ival); }
-
-  void computeJack(const string& compid, double (*func)(vector< vector <obstype> > *vals, void *para)=NULL, void *para=NULL);
-  void computeJack(double (*func)(vector< vector <obstype> > *vals, void *para)=NULL, void *para=NULL) { computeJack("one",func,para); }
-
-  double getMean(const string& compid="one") { return computations[compid].val; }
-  double getErr(const string& compid="one") { return computations[compid].err; }
-
-  void reset();
-
-private:
-  struct result{
-    double val;
-    double err;
-  };
-
-  vector< vector<obstype> > measurements;
-  map<string,result> computations;
-  
-  void mean(const string& compid, vector< vector <double> > *meas, const int& ival);
-  void mean(const string& compid, vector< vector <int> > *meas, const int& ival);
-};
-
-
-template <typename obstype> 
-void obs<obstype>::reset()
-{
-  computations.clear();
-  measurements.clear();
-}
-
-template <typename obstype> 
-void obs<obstype>::addMeas(const obstype& val)
-{
-  measurements.push_back( vector<obstype>(1,val) );
-}
-
-template <typename obstype>
-void obs<obstype>::addMeas(obstype val[], int valsize)
-{
-  vector<obstype> tmpvec;
-  for(int i=0; i<valsize; i++) tmpvec.push_back(val[i]);
-  measurements.push_back(tmpvec);
-}
-
-template <typename obstype>
-void obs<obstype>::mean(const string& compid, vector< vector<double> > *meas, const int& ival)
-{
-  computations[compid].val = 0;
-  computations[compid].err = 0;
-  
-  int nmeas = meas->size();
-
-  for(vector< vector<double> >::iterator measIt = meas->begin(); measIt != meas->end(); ++measIt)
-    computations[compid].val += (*measIt)[ival];
-  computations[compid].val /= nmeas;
-  
-  for(vector< vector<double> >::iterator measIt = meas->begin(); measIt != meas->end(); ++measIt)
-    computations[compid].err += pow( (*measIt)[ival] - computations[compid].val, 2 );
-  computations[compid].err = sqrt( computations[compid].err ) / nmeas;	 
-}
-
-template <typename obstype>
-void obs<obstype>::mean(const string& compid, vector< vector<int> > *meas, const int& ival)
-{
-  computations[compid].val = 0;
-  computations[compid].err = 0;
-  
-  int nmeas = meas->size();
-
-  for(vector< vector<int> >::iterator measIt = meas->begin(); measIt != meas->end(); ++measIt)
-    computations[compid].val += (*measIt)[ival];
-  computations[compid].val /= nmeas;
-  
-  for(vector< vector<int> >::iterator measIt = meas->begin(); measIt != meas->end(); ++measIt)
-    computations[compid].err += pow( (*measIt)[ival] - computations[compid].val, 2 );
-  computations[compid].err = sqrt( computations[compid].err ) / nmeas;
-}				 
-    
-template <typename obstype>
-void obs<obstype>::computeJack(const string& compid, double (*func)(vector< vector<obstype> > *vals, void *para), void *para)
-{
-  int nmeas=measurements.size();
-  double manymeans[nmeas];
-
-  computations[compid].val = 0;
-  computations[compid].err = 0;
-
-  int imeas=0;
-  for(typename vector< vector<obstype> >::iterator removedIt = measurements.begin(); removedIt != measurements.end(); ++removedIt, imeas++)
-    {
-      vector<obstype> removed = *removedIt;
-      
-      *removedIt = measurements.back();
-      measurements.pop_back();
-
-      manymeans[imeas] = func(&measurements, para);
-      computations[compid].val += manymeans[imeas];
-      
-      measurements.push_back( *removedIt );
-      *removedIt = removed;
-    }
-  computations[compid].val /= nmeas;
-
-  for(int imean=0; imean<nmeas; imean++)
-    computations[compid].err += pow( manymeans[imean] - computations[compid].val, 2 );
-  computations[compid].err *= (double)(nmeas-1)/nmeas;
-  computations[compid].err = sqrt(computations[compid].err);
-}
-
-#endif