Added phi2_hist.

[phys/heatbath.git] / obs_phi2.hpp

diff --git a/obs_phi2.hpp b/obs_phi2.hpp
index 23a84e4ecee96f79a41456d81aaba0422172528f..b2140e1f955904624ff8f9c161d766cecc7bea91 100644 (file)
--- a/obs_phi2.hpp
+++ b/obs_phi2.hpp
@@ -21,7 +21,7 @@ public:
   
 private:
   void _start();
-  void _meas(bool loadedobs);
+  void _meas(bool loadedobs, const int& nthmeas);
   void _finish();
  
   obsmem* OM;
@@ -44,7 +44,7 @@ void obs_phi2::_start() {
   //*out << "OBS_test: start" << endl;
 };
 
-void obs_phi2::_meas(bool loadedobs) {
+void obs_phi2::_meas(bool loadedobs, const int& nthmeas) {
   if (!loadedobs)
     phi2Compute();
 
@@ -57,7 +57,7 @@ void obs_phi2::_finish() {
   int compid_phi2, compid_phi2sus;
 
   compid_phi2 = oPhi2.computeEasy();
-  compid_phi2sus = oPhi2.computeJack(obs_phi2::phi2Sus, &(Sim->LSIZE4));
+  compid_phi2sus = oPhi2.computeJack(obs_phi2::phi2Sus, &(Sim->LSIZE2));
 
   *out << "\t" << oPhi2.getMean(compid_phi2) << "\t" << oPhi2.getErr(compid_phi2);
   *out << "\t" << oPhi2.getMean(compid_phi2sus) << "\t" << oPhi2.getErr(compid_phi2sus);
@@ -71,10 +71,10 @@ void obs_phi2::phi2Compute()
 {
   OM->phi2 = 0;
 
-  for (int ix = 0; ix < Sim->LSIZE4; ix++)
+  for (int ix = 0; ix < Sim->LSIZE2; ix++)
     OM->phi2 += norm( Sim->conf[ix].phi );
 
-  OM->phi2 /= Sim->LSIZE4;
+  OM->phi2 /= Sim->LSIZE2;
 }
 
 double obs_phi2::phi2Sus(vector< vector<double> > *vals, void *para) {