X-Git-Url: http://git.treefish.org/~alex/phys/heatbath.git/blobdiff_plain/d017fdeec8363b3e871692219bb7eacb614a41f1..12768df08df597a1e6858b5d2e735bbea58fff61:/heatbath.cpp?ds=sidebyside

diff --git a/heatbath.cpp b/heatbath.cpp
index e6a7803..8df557b 100644
--- a/heatbath.cpp
+++ b/heatbath.cpp
@@ -1,27 +1,52 @@
 #include <complex>
+#include <cstring>
 
 #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_METRO
+#define ALGORITHM "metro"
+#include "sim-metro.hpp"
+#elif ALGORITHM_AHBMHB
+#include "sim-nonmetro.hpp"
+#define ALGORITHM "AhbMhb"
+#elif ALGORITHM_AHBMOR
+#include "sim-nonmetro.hpp"
+#define ALGORITHM "AhbMor"
+#elif ALGORITHM_AORMHB
+#include "sim-nonmetro.hpp"
+#define ALGORITHM "AorMhb"
+#elif ALGORITHM_AORMOR
+#include "sim-nonmetro.hpp"
+#define ALGORITHM "AorMor"
+#elif ALGORITHM_AORM0
+#include "sim-nonmetro.hpp"
+#define ALGORITHM "AorM0"
+#elif ALGORITHM_AHBM0
+#include "sim-nonmetro.hpp"
+#define ALGORITHM "AhbM0"
+#elif ALGORITHM_A0MOR
+#include "sim-nonmetro.hpp"
+#define ALGORITHM "A0Mor"
+#elif ALGORITHM_A0MHB
+#include "sim-nonmetro.hpp"
+#define ALGORITHM "A0Mhb"
 #else
 #error NO UPDATE-ALGORITHM DEFINED!
 #endif
 
-#include "obs_phi2.hpp"
+#ifdef NONMETRO_A_HB
+#error SADSADS
+#endif
 
 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, "", "" }
@@ -48,7 +73,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));
-    } 
+    }
+    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));
+    }
   }
 }