X-Git-Url: http://git.treefish.org/~alex/phys/heatbath.git/blobdiff_plain/7a2a209a8e67d342eb4faa2fa203a94fb68d5e6c..eb8194d0b056a8a616c23532966faafbc3f24be4:/heatbath.cpp?ds=sidebyside

diff --git a/heatbath.cpp b/heatbath.cpp
index dbfe63a..a6f0859 100644
--- a/heatbath.cpp
+++ b/heatbath.cpp
@@ -11,17 +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"
-
 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 +53,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));
+    }
   }
 }