X-Git-Url: http://git.treefish.org/~alex/phys/heatbath.git/blobdiff_plain/c721fd42d0e3b23e8aa84d998bc8d97e5d8dfc2d..b29c28bcd466d938ffd95887abef67dc1491bd50:/heatbath.cpp?ds=inline

diff --git a/heatbath.cpp b/heatbath.cpp
index 70e2140..9744b33 100644
--- a/heatbath.cpp
+++ b/heatbath.cpp
@@ -1,10 +1,39 @@
+#include <complex>
+
 #include "latlib/o815/o815.h"
 
-#include "sim.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"
+#else
+#error NO UPDATE-ALGORITHM DEFINED!
+#endif
+
+#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, "", "" }
@@ -21,13 +50,31 @@ void parseSpecOps()
 }
 
 void helpHeader() 
+{ 
+  cout << "Usage: ./heatbath-"ALGORITHM" [OPTIONS] [obs1] ... [obsN]" << endl << endl;
+}
+
+void parseLonelyArgs()
 {
-  cout << "Usage: ./heatbath [OPTIONS] [obs1] ... [obsN]" << endl << endl;
+  for (vector<char*>::iterator lonit = O815->lonelyArgs.begin(); lonit != O815->lonelyArgs.end(); ++lonit) {
+    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);
 
@@ -37,8 +84,8 @@ int main (int argc, char *argv[])
 
   O815->Sim = new sim(O815);
 
-  //parseLonelyArgs();
-
+  parseLonelyArgs();
+  
   O815->mainLoop();
 
   delete O815;