Renamed and redefined algorithms.

[phys/heatbath.git] / obs_phip2_hist.hpp

diff --git a/obs_phip2_hist.hpp b/obs_phip2_hist.hpp
index 64b82e8435032e6ec7ff70b259ce4aafe786e9ff..60c86b8e41e40bb18cfbf3152fe7acfdd5c99822 100644 (file)
--- a/obs_phip2_hist.hpp
+++ b/obs_phip2_hist.hpp
@@ -15,7 +15,7 @@ class obs_phip2_hist : public o815::obs {
 
 public:
   struct obsmem {
 
 public:
   struct obsmem {

-    double *phip2;
+    double phip2[4];

   };
   obs_phip2_hist(o815 *_O815);
   
   };
   obs_phip2_hist(o815 *_O815);
   


@@ -23,49 +23,44 @@ private:
   void _start() {}
   void _meas(bool loadedobs, const int& nthmeas);
   void _finish() {}
   void _start() {}
   void _meas(bool loadedobs, const int& nthmeas);
   void _finish() {}

-  obsmem OM;
+  obsmem *OM;

   sim *Sim;
 };
 
 obs_phip2_hist::obs_phip2_hist(o815 *_O815) : o815::obs("phip2", 
   sim *Sim;
 };
 
 obs_phip2_hist::obs_phip2_hist(o815 *_O815) : o815::obs("phip2", 

-                                                       _O815->paraQ->getParaNames() + "nthstep:kpt:kpx:phip2", _O815, 
-                                                       sizeof(double)*(_O815->comargs.lsize[0]+1)*(_O815->comargs.lsize[1]+1), 
+                                                       _O815->paraQ->getParaNames() + "nthstep:imode:kt:kx:phip2absdiffequi", _O815, 
+                                                       sizeof(obsmem), 

                                                        "_hist") {
                                                        "_hist") {

-  OM.phip2 = (double*)obsMem;
+  OM = (obsmem*)obsMem;

   Sim = (sim*)O815->Sim;
 }
 
 void obs_phip2_hist::_meas(bool loadedobs, const int& nthmeas) {
   Sim = (sim*)O815->Sim;
 }
 
 void obs_phip2_hist::_meas(bool loadedobs, const int& nthmeas) {

-  if (!loadedobs) {
-    for (int kpt = 0; kpt <= O815->comargs.lsize[0]; kpt++)
-      for (int kpx = 0; kpx <= O815->comargs.lsize[1]; kpx++) {
-       double ppt = 2.*M_PI/O815->comargs.lsize[0] * kpt;
-       double ppx = 2.*M_PI/O815->comargs.lsize[1] * kpx;
+  for (int kpimode=0; kpimode<4; kpimode++) {
+    const double ppt = 2.*M_PI/O815->comargs.lsize[0] * ( 0 + int( kpimode/4. * O815->comargs.lsize[0] ) ) ;
+    const double ppx = 2.*M_PI/O815->comargs.lsize[1] * ( 0 + int( kpimode/4. * O815->comargs.lsize[1] ) );

 
 

-       OM.phip2[ kpt * ( O815->comargs.lsize[1] + 1 ) + kpx ] = 0;
+    if (!loadedobs) {
+      OM->phip2[ kpimode ] = 0;

        
        

-       for (int ixt = 0; ixt < O815->comargs.lsize[0]; ixt++)
-         for (int ixx = 0; ixx < O815->comargs.lsize[1]; ixx++)
-           for (int ixpt = 0; ixpt < O815->comargs.lsize[0]; ixpt++)
-             for (int ixpx = 0; ixpx < O815->comargs.lsize[1]; ixpx++)
-               OM.phip2[ kpt * ( O815->comargs.lsize[1] + 1 ) + kpx ] += real( conj( Sim->conf[ ixt*O815->comargs.lsize[1] + ixx ].phi )
-                                                                               * Sim->conf[ ixpt*O815->comargs.lsize[1] + ixpx ].phi
-                                                                               * exp ( _i_*(double)ppx*(double)(ixx-ixpx) + _i_*(double)ppt*(double)(ixt-ixpt) ) );
+      for (int ixt = 0; ixt < O815->comargs.lsize[0]; ixt++)
+       for (int ixx = 0; ixx < O815->comargs.lsize[1]; ixx++)
+         for (int ixpt = 0; ixpt < O815->comargs.lsize[0]; ixpt++)
+           for (int ixpx = 0; ixpx < O815->comargs.lsize[1]; ixpx++)
+             OM->phip2[ kpimode ] += real( conj( Sim->conf[ ixt*O815->comargs.lsize[1] + ixx ].phi )
+                                           * Sim->conf[ ixpt*O815->comargs.lsize[1] + ixpx ].phi
+                                           * exp ( _i_*(double)ppx*(double)(ixx-ixpx) + _i_*(double)ppt*(double)(ixt-ixpt) ) );

        
        

-       OM.phip2[ kpt * ( O815->comargs.lsize[1] + 1 ) + kpx ] /= Sim->LSIZE2;
-      }
-  }
-  
-  for (int kpt = 0; kpt <= O815->comargs.lsize[0]; kpt++)
-    for (int kpx = 0; kpx <= O815->comargs.lsize[1]; kpx++) {
-      double ppt = 2.*M_PI/O815->comargs.lsize[0] * kpt;
-      double ppx = 2.*M_PI/O815->comargs.lsize[1] * kpx;
-
-      *out << O815->paraQ->getParaVals();
-      *out << "\t" << ( Sim->nequi + (nthmeas+1)*Sim->nskip );
-      *out << "\t" << kpt << "\t" << kpx;
-      *out << "\t" << OM.phip2[ kpt * ( O815->comargs.lsize[1] + 1 ) + kpx ] - 1./(ppt*ppt + ppx*ppx + Sim->m*Sim->m) << endl;
+      OM->phip2[ kpimode ] /= Sim->LSIZE2;

     }
     }

+    
+    *out << O815->paraQ->getParaVals();
+    *out << "\t" << ( Sim->nequi + (nthmeas+1)*Sim->nskip );
+    *out << "\t" << kpimode;
+    *out << "\t" << 0 + int( kpimode/4. * O815->comargs.lsize[0] );
+    *out << "\t" << 0 + int( kpimode/4. * O815->comargs.lsize[1] );
+    *out << "\t" << abs( OM->phip2[ kpimode ] - 1./(ppt*ppt + ppx*ppx + Sim->m*Sim->m) ) << endl;
+  }

 };
 
 #endif
 };
 
 #endif