Added observable phip2.

[phys/heatbath.git] / heatbath.cpp

diff --git a/heatbath.cpp b/heatbath.cpp
index 13b6f5114ae42dcc6a2bd2d63a14b5e168a83b3b..c95ecf56b8a3da6ec84739cc916def552001dd26 100644 (file)
--- a/heatbath.cpp
+++ b/heatbath.cpp
@@ -15,14 +15,15 @@
 #error NO UPDATE-ALGORITHM DEFINED!
 #endif
 
 #error NO UPDATE-ALGORITHM DEFINED!
 #endif
 

-#include "obs_phi2.hpp"
-#include "obs_phi2_hist.hpp"
-

 o815 *O815;
 sim *Sim;
 
 const complex<double> _i_ = complex<double>(0.0,1.0);
 
 o815 *O815;
 sim *Sim;
 
 const complex<double> _i_ = complex<double>(0.0,1.0);
 

+#include "obs_phi2.hpp"
+#include "obs_phi2_hist.hpp"
+#include "obs_phip2_hist.hpp"
+

 o815::comoption specOps[] = {
   { "mass", required_argument, NULL, 'm', "set mass", "min:max:inc" },
   { "", 0, NULL, 0, "", "" }
 o815::comoption specOps[] = {
   { "mass", required_argument, NULL, 'm', "set mass", "min:max:inc" },
   { "", 0, NULL, 0, "", "" }


@@ -54,6 +55,10 @@ void parseLonelyArgs()
       *O815->out->log << "MASTER: registered observable: phi2_hist" << endl << flush;
       O815->observables.push_back(new obs_phi2_hist(O815));
     }
       *O815->out->log << "MASTER: registered observable: phi2_hist" << endl << flush;
       O815->observables.push_back(new obs_phi2_hist(O815));
     }

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

   }
 }
 
   }
 }
 


@@ -70,6 +75,8 @@ int main (int argc, char *argv[])
   O815->Sim = new sim(O815);
 
   parseLonelyArgs();
   O815->Sim = new sim(O815);
 
   parseLonelyArgs();

+
+  cout << "here" << endl;

   
   O815->mainLoop();
 
   
   O815->mainLoop();