Migrated observable phi2.

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

diff --git a/u1casc-flux/u1casc-flux.cpp b/u1casc-flux/u1casc-flux.cpp
index 00611165530640db92b6f819c15ca99ef915584a..d0d63472a78f6122835c859feacfb2ef14ccecfc 100644 (file)
--- a/u1casc-flux/u1casc-flux.cpp
+++ b/u1casc-flux/u1casc-flux.cpp
@@ -8,9 +8,7 @@
 o815 *O815;
 sim *Sim;
 
 o815 *O815;
 sim *Sim;
 

-//const complex<double> _i_ = complex<double>(0.0,1.0);
-
-//#include "obs_phi2.hpp"
+#include "obs_phi2.hpp"

 //#include "obs_plaq.hpp"
 //#include "obs_corr.hpp"
 
 //#include "obs_plaq.hpp"
 //#include "obs_corr.hpp"
 


@@ -75,12 +73,11 @@ void helpHeader()
 
 void parseLonelyArgs()
 {
 
 void parseLonelyArgs()
 {

-  /*

   for (vector<char*>::iterator lonit = O815->lonelyArgs.begin(); lonit != O815->lonelyArgs.end(); ++lonit) {
     if ( strcmp(*lonit, "phi2") == 0 ) {
       *O815->out->log << "MASTER: registered observable: phi2" << endl << flush;
       O815->observables.push_back(new obs_phi2(O815));
   for (vector<char*>::iterator lonit = O815->lonelyArgs.begin(); lonit != O815->lonelyArgs.end(); ++lonit) {
     if ( strcmp(*lonit, "phi2") == 0 ) {
       *O815->out->log << "MASTER: registered observable: phi2" << endl << flush;
       O815->observables.push_back(new obs_phi2(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, "plaq") == 0 ) {
       *O815->out->log << "MASTER: registered observable: plaq" << endl << flush;
       O815->observables.push_back(new obs_plaq(O815));


@@ -88,9 +85,8 @@ void parseLonelyArgs()
     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, "corr") == 0 ) {
       *O815->out->log << "MASTER: registered observable: corr" << endl << flush;
       O815->observables.push_back(new obs_corr(O815));

-    }
+      } */

   }
   }

-  */

 }
 
 int main (int argc, char *argv[])
 }
 
 int main (int argc, char *argv[])