working...

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

diff --git a/u1casc-ordinary/u1casc-ordinary.cpp b/u1casc-ordinary/u1casc-ordinary.cpp
index 4956ee1b304e1fd2d9366eb24a0557570f1a505b..6cab50579504077f8690350ccd3117b469be57a2 100644 (file)
--- a/u1casc-ordinary/u1casc-ordinary.cpp
+++ b/u1casc-ordinary/u1casc-ordinary.cpp
@@ -11,6 +11,16 @@ sim *Sim;
 //const complex<double> _i_ = complex<double>(0.0,1.0);
 
 #include "obs_phi2.hpp"
 //const complex<double> _i_ = complex<double>(0.0,1.0);
 
 #include "obs_phi2.hpp"

+#include "obs_plaq.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" },
 
 o815::comoption specOps[] = {
   { "kappaone", required_argument, NULL, 'r', "set inverse mass kappa_1", "min:max:inc" },


@@ -65,16 +75,46 @@ void parseLonelyArgs()
       *O815->out->log << "MASTER: registered observable: phi2" << endl << flush;
       O815->observables.push_back(new obs_phi2(O815));
     }
       *O815->out->log << "MASTER: registered observable: phi2" << endl << flush;
       O815->observables.push_back(new obs_phi2(O815));
     }

-    /*
-    else if ( strcmp(*lonit, "phi2_hist") == 0 ) {
-      *O815->out->log << "MASTER: registered observable: phi2_hist" << endl << flush;
-      O815->observables.push_back(new obs_phi2_hist(O815));
+    else if ( strcmp(*lonit, "plaq") == 0 ) {
+      *O815->out->log << "MASTER: registered observable: plaq" << endl << flush;
+      O815->observables.push_back(new obs_plaq(O815));

     }
     }

-    else if ( strcmp(*lonit, "phip2_hist") == 0 ) {
-      *O815->out->log << "MASTER: registered observable: phip2_hist" << endl << flush;
-      O815->observables.push_back(new obs_phip2_hist(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, "corrchichi") == 0 ) {
+      *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: 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));

     }
     }

-    */

   }
 }
 
   }
 }