Seperated correlator observables.

[phys/u1casc.git] / u1casc-flux / sim.hpp

diff --git a/u1casc-flux/sim.hpp b/u1casc-flux/sim.hpp
index 9eca3d7f9a0ef0e6efe3fc7720a83c565ec2ef7a..496a28db15a944f9c2c9c9192b7ab2be9eab3a9c 100644 (file)
--- a/u1casc-flux/sim.hpp
+++ b/u1casc-flux/sim.hpp
@@ -20,21 +20,22 @@ public:
   neigh *nb;
   int *l, *lp, *p;
   double kappa[2], lambda[2], Mu[2], beta;
   neigh *nb;
   int *l, *lp, *p;
   double kappa[2], lambda[2], Mu[2], beta;

-
+  int wArg(int x, int i);
+  double WF(int nom, int denom, int iflav);
+  int iPlaq(int i, int j);
+  double I(int p);
+  void _newParas();
+  

 private:
 private:

+  void _resetConfig();

   void _makeSweep();
   void _makeSweep();

-  void _newParas();

   gsl_rng* rangsl;
   int lineSweep();
   int lineUpdate(int x, int vardir);
   int cubeUpdate(int x, int orient);
   void getCube(int cube[3], int orient);
   int plaqUpdate(int x, int mu, int nu, int i);
   gsl_rng* rangsl;
   int lineSweep();
   int lineUpdate(int x, int vardir);
   int cubeUpdate(int x, int orient);
   void getCube(int cube[3], int orient);
   int plaqUpdate(int x, int mu, int nu, int i);

-  int iPlaq(int i, int j);

   int lpUpdate(int x, int mu, int i);
   int lpUpdate(int x, int mu, int i);

-  double I(int p);
-  int wArg(int x, int i);
-  double WF(int nom, int denom, int iflav);

   static double wkern(double t, void *params);
   double wGsl(int n, int iflav);
   struct bcache { 
   static double wkern(double t, void *params);
   double wGsl(int n, int iflav);
   struct bcache { 


@@ -92,7 +93,7 @@ sim::sim(o815 *_O815) : o815::sim( _O815,
 }
 
 void sim::_makeSweep() 
 }
 
 void sim::_makeSweep() 

-{  
+{ 

   lineSweep();
   
   for( int x=0; x<lsize4; x++) {
   lineSweep();
   
   for( int x=0; x<lsize4; x++) {


@@ -118,8 +119,10 @@ void sim::_newParas() {
   beta = (*O815->paraQ)["beta"];
   Mu[0] = (*O815->paraQ)["muone"];
   Mu[1] = (*O815->paraQ)["mutwo"];
   beta = (*O815->paraQ)["beta"];
   Mu[0] = (*O815->paraQ)["muone"];
   Mu[1] = (*O815->paraQ)["mutwo"];

+}

 
 

-  memset(confMem, 0, sizeof(int)*lsize4*(2*4+2*4+6));
+void sim::_resetConfig() {
+  memset(confMem, 0, confmemSize);

 }
 
 int sim::lineSweep()
 }
 
 int sim::lineSweep()