Added observable phip2.

[phys/heatbath.git] / heatbath.cpp

diff --git a/heatbath.cpp b/heatbath.cpp
index 70e2140a27b83aab061383126a5548fe31aeee6a..c95ecf56b8a3da6ec84739cc916def552001dd26 100644 (file)
--- a/heatbath.cpp
+++ b/heatbath.cpp
@@ -1,10 +1,29 @@
+#include <complex>
+

 #include "latlib/o815/o815.h"
 
 #include "latlib/o815/o815.h"
 

-#include "sim.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"
+#else
+#error NO UPDATE-ALGORITHM DEFINED!
+#endif

 
 o815 *O815;
 sim *Sim;
 
 
 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, "", "" }


@@ -21,13 +40,31 @@ void parseSpecOps()
 }
 
 void helpHeader() 
 }
 
 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: phi2p_hist" << endl << flush;
+      O815->observables.push_back(new obs_phip2_hist(O815));
+    }
+  }

 }
 
 int main (int argc, char *argv[])
 {
 }
 
 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);
 
 
   O815->addPara("mass", 1);
 


@@ -37,8 +74,10 @@ int main (int argc, char *argv[])
 
   O815->Sim = new sim(O815);
 
 
   O815->Sim = new sim(O815);
 

-  //parseLonelyArgs();
+  parseLonelyArgs();

 
 

+  cout << "here" << endl;
+  

   O815->mainLoop();
 
   delete O815;
   O815->mainLoop();
 
   delete O815;