X-Git-Url: http://git.treefish.org/~alex/phys/heatbath.git/blobdiff_plain/532d407e33ab23eb1430c7f42987b1711b00ac4e..2b9b5b0349d4bc4509d936b9f0de3a021fdcec40:/heatbath.cpp

diff --git a/heatbath.cpp b/heatbath.cpp
index de99650..6491da9 100644
--- a/heatbath.cpp
+++ b/heatbath.cpp
@@ -1,12 +1,41 @@
-#include "latlib/o815/o815.h"
+#include <complex>
 
-#include "sim.hpp"
+#include "latlib/o815/o815.h"
 
-#include "obs_phi2.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"
+#elif ALGORITHM_RPLUS
+#define ALGORITHM "r+"
+#include "sim-r+.hpp"
+#else
+#error NO UPDATE-ALGORITHM DEFINED!
+#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, "", "" }
@@ -23,8 +52,8 @@ void parseSpecOps()
 }
 
 void helpHeader() 
-{
-  cout << "Usage: ./heatbath [OPTIONS] [obs1] ... [obsN]" << endl << endl;
+{ 
+  cout << "Usage: ./heatbath-"ALGORITHM" [OPTIONS] [obs1] ... [obsN]" << endl << endl;
 }
 
 void parseLonelyArgs()
@@ -33,13 +62,21 @@ 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));
+    }
   }
 }
 
 int main (int argc, char *argv[])
 {
-  O815 = new o815(argc, argv, "heatbath", specOps, &helpHeader);
+  O815 = new o815(argc, argv, "heatbath-"ALGORITHM, specOps, &helpHeader);
 
   O815->addPara("mass", 1);
 
@@ -50,7 +87,7 @@ int main (int argc, char *argv[])
   O815->Sim = new sim(O815);
 
   parseLonelyArgs();
-
+  
   O815->mainLoop();
 
   delete O815;