Added phi and chi correlators.

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

diff --git a/u1casc-ordinary/u1casc-ordinary.cpp b/u1casc-ordinary/u1casc-ordinary.cpp
index f362654030aaff5e0d8c82a5cc5f3566be943319..4803fe11ef74834e6116abcffb071edf7da033d4 100644 (file)
--- a/u1casc-ordinary/u1casc-ordinary.cpp
+++ b/u1casc-ordinary/u1casc-ordinary.cpp
@@ -15,6 +15,8 @@ sim *Sim;
 #include "obs_corrphiphi.hpp"
 #include "obs_corrchichi.hpp"
 #include "obs_corrphichi.hpp"
 #include "obs_corrphiphi.hpp"
 #include "obs_corrchichi.hpp"
 #include "obs_corrphichi.hpp"

+#include "obs_corrphi.hpp"
+#include "obs_corrchi.hpp"

 
 o815::comoption specOps[] = {
   { "kappaone", required_argument, NULL, 'r', "set inverse mass kappa_1", "min:max:inc" },
 
 o815::comoption specOps[] = {
   { "kappaone", required_argument, NULL, 'r', "set inverse mass kappa_1", "min:max:inc" },


@@ -74,17 +76,25 @@ void parseLonelyArgs()
       O815->observables.push_back(new obs_plaq(O815));
     }
     else if ( strcmp(*lonit, "corrphiphi") == 0 ) {
       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->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->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));
     }
       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));
+    }

   }
 }
 
   }
 }