X-Git-Url: http://git.treefish.org/~alex/phys/u1casc.git/blobdiff_plain/7a5913c428ac75aa2de2330fa926e8deb3457112..868c33e6512844908fe6c906f33cf0af3be48525:/u1casc-flux/u1casc-flux.cpp diff --git a/u1casc-flux/u1casc-flux.cpp b/u1casc-flux/u1casc-flux.cpp index 0061116..639caa5 100644 --- a/u1casc-flux/u1casc-flux.cpp +++ b/u1casc-flux/u1casc-flux.cpp @@ -8,11 +8,9 @@ o815 *O815; sim *Sim; -//const complex _i_ = complex(0.0,1.0); - -//#include "obs_phi2.hpp" -//#include "obs_plaq.hpp" -//#include "obs_corr.hpp" +#include "obs_phi2.hpp" +#include "obs_plaq.hpp" +#include "obs_n.hpp" o815::comoption specOps[] = { { "kappaone", required_argument, NULL, 'r', "set inverse mass kappa_1", "min:max:inc" }, @@ -75,7 +73,6 @@ void helpHeader() void parseLonelyArgs() { - /* for (vector::iterator lonit = O815->lonelyArgs.begin(); lonit != O815->lonelyArgs.end(); ++lonit) { if ( strcmp(*lonit, "phi2") == 0 ) { *O815->out->log << "MASTER: registered observable: phi2" << endl << flush; @@ -85,12 +82,11 @@ void parseLonelyArgs() *O815->out->log << "MASTER: registered observable: plaq" << endl << flush; O815->observables.push_back(new obs_plaq(O815)); } - else if ( strcmp(*lonit, "corr") == 0 ) { - *O815->out->log << "MASTER: registered observable: corr" << endl << flush; - O815->observables.push_back(new obs_corr(O815)); + else if ( strcmp(*lonit, "n") == 0 ) { + *O815->out->log << "MASTER: registered observable: n" << endl << flush; + O815->observables.push_back(new obs_n(O815)); } } - */ } int main (int argc, char *argv[])