Seperated correlator observables.

[phys/u1casc.git] / u1casc-ordinary / u1casc-ordinary.cpp

diff --git a/u1casc-ordinary/u1casc-ordinary.cpp b/u1casc-ordinary/u1casc-ordinary.cpp
index 7aed52dcd042453eb87f33dde91697974513beff..f362654030aaff5e0d8c82a5cc5f3566be943319 100644 (file)
--- a/u1casc-ordinary/u1casc-ordinary.cpp
+++ b/u1casc-ordinary/u1casc-ordinary.cpp
@@ -12,9 +12,9 @@ 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"
 
 o815::comoption specOps[] = {
   { "kappaone", required_argument, NULL, 'r', "set inverse mass kappa_1", "min:max:inc" },
@@ -73,17 +73,17 @@ 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: corr_phiphi" << 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: corr_chichi" << 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: corr_phichi" << endl << flush;
+      O815->observables.push_back(new obs_corrphichi(O815));
     }
   }
 }