X-Git-Url: http://git.treefish.org/~alex/phys/u1casc.git/blobdiff_plain/fb62bce00a991081189fc750d6acdd51bbc7c468..refs/heads/master:/u1casc-ordinary/u1casc-ordinary.cpp

diff --git a/u1casc-ordinary/u1casc-ordinary.cpp b/u1casc-ordinary/u1casc-ordinary.cpp
index 7aed52d..6cab505 100644
--- a/u1casc-ordinary/u1casc-ordinary.cpp
+++ b/u1casc-ordinary/u1casc-ordinary.cpp
@@ -12,9 +12,15 @@ sim *Sim;
 
 #include "obs_phi2.hpp"
 #include "obs_plaq.hpp"
-#include "obs_corr.hpp"
-#include "obs_corrphiphimass.hpp"
-#include "obs_corrphichimass.hpp"
+#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_diagcorr.hpp"
 
 o815::comoption specOps[] = {
   { "kappaone", required_argument, NULL, 'r', "set inverse mass kappa_1", "min:max:inc" },
@@ -73,17 +79,41 @@ 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, "corrphiphi") == 0 ) {
+      *O815->out->log << "MASTER: registered observable: corrphiphi" << endl << flush;
+      O815->observables.push_back(new obs_corrphiphi(O815));
     }
-    else if ( strcmp(*lonit, "corrphiphimass") == 0 ) {
-      *O815->out->log << "MASTER: registered observable: corr_phiphimass" << endl << flush;
-      O815->observables.push_back(new obs_corrphiphimass(O815));
+    else if ( strcmp(*lonit, "corrchichi") == 0 ) {
+      *O815->out->log << "MASTER: registered observable: corrchichi" << endl << flush;
+      O815->observables.push_back(new obs_corrchichi(O815));
     }
-    else if ( strcmp(*lonit, "corrphichimass") == 0 ) {
-      *O815->out->log << "MASTER: registered observable: corr_phichimass" << endl << flush;
-      O815->observables.push_back(new obs_corrphichimass(O815));
+    else if ( strcmp(*lonit, "corrphichi") == 0 ) {
+      *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, "diagcorr") == 0 ) {
+      *O815->out->log << "MASTER: registered observable: diagcorr" << endl << flush;
+      O815->observables.push_back(new obs_diagcorr(O815));
     }
   }
 }