Added 1mr+ algorithm.

[phys/heatbath.git] / heatbath.cpp

diff --git a/heatbath.cpp b/heatbath.cpp
index 13b6f5114ae42dcc6a2bd2d63a14b5e168a83b3b..a6f08595d7c0a5a4c22ed655ed19c699166c9f2f 100644 (file)
--- a/heatbath.cpp
+++ b/heatbath.cpp
@@ -11,18 +11,22 @@
 #elif ALGORITHM_1MR
 #define ALGORITHM "1mr"
 #include "sim-1mr.hpp"
+#elif ALGORITHM_1MRPLUS
+#define ALGORITHM "1mr+"
+#include "sim-1mr+.hpp"
 #else
 #error NO UPDATE-ALGORITHM DEFINED!
 #endif
 
-#include "obs_phi2.hpp"
-#include "obs_phi2_hist.hpp"
-
 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, "", "" }
@@ -54,6 +58,10 @@ void parseLonelyArgs()
       *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));
+    }
   }
 }