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

diff --git a/heatbath.cpp b/heatbath.cpp
index c95ecf5..6491da9 100644
--- a/heatbath.cpp
+++ b/heatbath.cpp
@@ -11,6 +11,18 @@
 #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
@@ -56,7 +68,7 @@ void parseLonelyArgs()
       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->out->log << "MASTER: registered observable: phip2_hist" << endl << flush;
       O815->observables.push_back(new obs_phip2_hist(O815));
     }
   }
@@ -75,8 +87,6 @@ int main (int argc, char *argv[])
   O815->Sim = new sim(O815);
 
   parseLonelyArgs();
-
-  cout << "here" << endl;
   
   O815->mainLoop();