X-Git-Url: http://git.treefish.org/~alex/phys/heatbath.git/blobdiff_plain/50a3598744cc635ceada9ab6adc376f1e3fa10a5..a70bf950d14902f91ae0c0e4027537a7e23d3bc5:/sim-1mr.hpp?ds=sidebyside

diff --git a/sim-1mr.hpp b/sim-1mr.hpp
index 5565700..d03ef22 100644
--- a/sim-1mr.hpp
+++ b/sim-1mr.hpp
@@ -15,14 +15,15 @@ public:
   sim(o815 *_O815);
   siteconf* conf;
   unsigned int LSIZE2;
+  double M;
+  double m;
+  neigh *nb;
 
 private:
   void _makeSweep();
   void _newParas();
   gsl_rng* rangsl;
-  neigh *nb;
   void updatePhi (const int& x);
-  double M;
 };
 
 
@@ -53,7 +54,7 @@ void sim::updatePhi (const int& x)
 			+ 2 * real( conf[x].phi * conj(V) ) );
 
   conf[x].phi = sqrt(std::log( 1./(1-r) )) / sqrt(M)
-    * complex<double>( cos(theta), sin(theta) )
+    * polar(1.0, theta)
     + V / M;
 }
 
@@ -65,6 +66,7 @@ void sim::_makeSweep() {
 }
 
 void sim::_newParas() {
+  m = (*O815->paraQ)["mass"];
   M = pow( (*O815->paraQ)["mass"], 2 ) + 4;
   *log << "SIM: Resetting fields." << endl << flush;