#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
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));
}
}