X-Git-Url: http://git.treefish.org/~alex/phys/u1casc.git/blobdiff_plain/3941a52da94bf52ab3feaccc5ea376895ac30f3e..fedf8397d50effe33a4dcc4eace946205fcf0a95:/u1casc-ordinary/u1casc-ordinary.cpp diff --git a/u1casc-ordinary/u1casc-ordinary.cpp b/u1casc-ordinary/u1casc-ordinary.cpp index f362654..8063806 100644 --- a/u1casc-ordinary/u1casc-ordinary.cpp +++ b/u1casc-ordinary/u1casc-ordinary.cpp @@ -15,6 +15,12 @@ sim *Sim; #include "obs_corrphiphi.hpp" #include "obs_corrchichi.hpp" #include "obs_corrphichi.hpp" +#include "obs_corrphi.hpp" +#include "obs_corrchi.hpp" +#include "obs_corriso10.hpp" +#include "obs_corriso00.hpp" +#include "obs_corrtetra.hpp" +#include "obs_corrtest.hpp" o815::comoption specOps[] = { { "kappaone", required_argument, NULL, 'r', "set inverse mass kappa_1", "min:max:inc" }, @@ -74,17 +80,41 @@ void parseLonelyArgs() O815->observables.push_back(new obs_plaq(O815)); } else if ( strcmp(*lonit, "corrphiphi") == 0 ) { - *O815->out->log << "MASTER: registered observable: corr_phiphi" << endl << flush; + *O815->out->log << "MASTER: registered observable: corrphiphi" << endl << flush; O815->observables.push_back(new obs_corrphiphi(O815)); } else if ( strcmp(*lonit, "corrchichi") == 0 ) { - *O815->out->log << "MASTER: registered observable: corr_chichi" << endl << flush; + *O815->out->log << "MASTER: registered observable: corrchichi" << endl << flush; O815->observables.push_back(new obs_corrchichi(O815)); } else if ( strcmp(*lonit, "corrphichi") == 0 ) { - *O815->out->log << "MASTER: registered observable: corr_phichi" << endl << flush; + *O815->out->log << "MASTER: registered observable: corrphichi" << endl << flush; O815->observables.push_back(new obs_corrphichi(O815)); } + else if ( strcmp(*lonit, "corrphi") == 0 ) { + *O815->out->log << "MASTER: registered observable: corrphi" << endl << flush; + O815->observables.push_back(new obs_corrphi(O815)); + } + else if ( strcmp(*lonit, "corrchi") == 0 ) { + *O815->out->log << "MASTER: registered observable: corrchi" << endl << flush; + O815->observables.push_back(new obs_corrchi(O815)); + } + else if ( strcmp(*lonit, "corriso10") == 0 ) { + *O815->out->log << "MASTER: registered observable: corriso10" << endl << flush; + O815->observables.push_back(new obs_corriso10(O815)); + } + else if ( strcmp(*lonit, "corriso00") == 0 ) { + *O815->out->log << "MASTER: registered observable: corriso00" << endl << flush; + O815->observables.push_back(new obs_corriso00(O815)); + } + else if ( strcmp(*lonit, "corrtetra") == 0 ) { + *O815->out->log << "MASTER: registered observable: corrtetra" << endl << flush; + O815->observables.push_back(new obs_corrtetra(O815)); + } + else if ( strcmp(*lonit, "corrtest") == 0 ) { + *O815->out->log << "MASTER: registered observable: corrtest" << endl << flush; + O815->observables.push_back(new obs_corrtest(O815)); + } } }