Fixed wrong 1mr+ update.

[phys/heatbath.git] / heatbath.cpp

diff --git a/heatbath.cpp b/heatbath.cpp
index e6a7803c3c93ab828170f99df2e12fbc160d9ef9..0c1348dbefc1b082b0d19209cfd17cb3ee06b38c 100644 (file)
--- a/heatbath.cpp
+++ b/heatbath.cpp
@@ -2,26 +2,37 @@
 
 #include "latlib/o815/o815.h"
 
 
 #include "latlib/o815/o815.h"
 

-#ifdef HEATLESS_ALGORITHM
-#define ALGORITHM "heatless"
-#include "sim-heatless.hpp"
-#elif USUALHEAT_ALGORITHM
-#define ALGORITHM "usualheat"
-#include "sim-usualheat.hpp"
-#elif RELAXEDHEAT_ALGORITHM
-#define ALGORITHM "relaxedheat"
-#include "sim-relaxedheat.hpp"
+#ifdef ALGORITHM_NOR
+#define ALGORITHM "nor"
+#include "sim-nor.hpp"
+#elif ALGORITHM_R
+#define ALGORITHM "r"
+#include "sim-r.hpp"
+#elif ALGORITHM_1MR
+#define ALGORITHM "1mr"
+#include "sim-1mr.hpp"
+#elif ALGORITHM_1MRPLUS
+#define ALGORITHM "1mr+"
+#include "sim-1mr+.hpp"
+#elif ALGORITHM_1MRMINUS
+#define ALGORITHM "1mr-"
+#include "sim-1mr-.hpp"
+#elif ALGORITHM_RMINUS
+#define ALGORITHM "r-"
+#include "sim-r-.hpp"

 #else
 #error NO UPDATE-ALGORITHM DEFINED!
 #endif
 
 #else
 #error NO UPDATE-ALGORITHM DEFINED!
 #endif
 

-#include "obs_phi2.hpp"
-

 o815 *O815;
 sim *Sim;
 
 const complex<double> _i_ = complex<double>(0.0,1.0);
 
 o815 *O815;
 sim *Sim;
 
 const complex<double> _i_ = complex<double>(0.0,1.0);
 

+#include "obs_phi2.hpp"
+#include "obs_phi2_hist.hpp"
+#include "obs_phip2_hist.hpp"
+

 o815::comoption specOps[] = {
   { "mass", required_argument, NULL, 'm', "set mass", "min:max:inc" },
   { "", 0, NULL, 0, "", "" }
 o815::comoption specOps[] = {
   { "mass", required_argument, NULL, 'm', "set mass", "min:max:inc" },
   { "", 0, NULL, 0, "", "" }


@@ -48,7 +59,15 @@ void parseLonelyArgs()
     if ( strcmp(*lonit, "phi2") == 0 ) {
       *O815->out->log << "MASTER: registered observable: phi2" << endl << flush;
       O815->observables.push_back(new obs_phi2(O815));
     if ( strcmp(*lonit, "phi2") == 0 ) {
       *O815->out->log << "MASTER: registered observable: phi2" << endl << flush;
       O815->observables.push_back(new obs_phi2(O815));

-    } 
+    }
+    else if ( strcmp(*lonit, "phi2_hist") == 0 ) {
+      *O815->out->log << "MASTER: registered observable: phi2_hist" << endl << flush;
+      O815->observables.push_back(new obs_phi2_hist(O815));
+    }
+    else if ( strcmp(*lonit, "phip2_hist") == 0 ) {
+      *O815->out->log << "MASTER: registered observable: phip2_hist" << endl << flush;
+      O815->observables.push_back(new obs_phip2_hist(O815));
+    }

   }
 }
 
   }
 }