X-Git-Url: http://git.treefish.org/~alex/phys/heatbath.git/blobdiff_plain/05bb53b33c41a70cf1522def0d1892c8700d76a6..0b059f97536bd764b5093652c93b0d060565a90d:/heatbath.cpp?ds=sidebyside diff --git a/heatbath.cpp b/heatbath.cpp index 05c5291..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)); } }