X-Git-Url: http://git.treefish.org/~alex/phys/u1casc.git/blobdiff_plain/802a4416b46bb8f41830e0e85e1b4d658760742f..2a5f627da5468eb738f1b35aba77652729c1d7a1:/u1casc-ordinary/u1casc-ordinary.cpp?ds=inline

diff --git a/u1casc-ordinary/u1casc-ordinary.cpp b/u1casc-ordinary/u1casc-ordinary.cpp
index f6f05fd..63ef33b 100644
--- a/u1casc-ordinary/u1casc-ordinary.cpp
+++ b/u1casc-ordinary/u1casc-ordinary.cpp
@@ -10,14 +10,18 @@ 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"
 
 o815::comoption specOps[] = {
-  { "kappaone", required_argument, NULL, 'k', "set inverse mass kappa_1", "min:max:inc" },
-  { "kappatwo", required_argument, NULL, 'm', "set inverse mass kappa_2", "min:max:inc" },
+  { "kappaone", required_argument, NULL, 'r', "set inverse mass kappa_1", "min:max:inc" },
+  { "kappatwo", required_argument, NULL, 's', "set inverse mass kappa_2", "min:max:inc" },
   { "beta", required_argument, NULL, 'b', "set inverse gauge coupling beta", "min:max:inc" },
   { "lambdaone", required_argument, NULL, 'p', "set quartic coupling lambda_1", "min:max:inc" },
   { "lambdatwo", required_argument, NULL, 'q', "set quartic coupling lambda_2", "min:max:inc" },
+  { "kappa", required_argument, NULL, 'k', "set kappa_1 = kappa_2 = kappa", "min:max:inc" },
+  { "lambda", required_argument, NULL, 'l', "set lambda_1 = lambda_2 = lambda", "min:max:inc" },
   { "", 0, NULL, 0, "", "" }
 };
 
@@ -25,8 +29,28 @@ void parseSpecOps()
 {
   for (int isopt = 0; isopt < O815->parsedSpecOps.size(); isopt++)
     switch(O815->parsedSpecOps[isopt].first) {
-    case 'm':
-      O815->paraQ->addRange("mass", O815->parsedSpecOps[isopt].second);
+    case 'r':
+      O815->paraQ->addRange("kappaone", O815->parsedSpecOps[isopt].second);
+      break;
+    case 's':
+      O815->paraQ->addRange("kappatwo", O815->parsedSpecOps[isopt].second);
+      break;
+    case 'b':
+      O815->paraQ->addRange("beta", O815->parsedSpecOps[isopt].second);
+      break;
+    case 'p':
+      O815->paraQ->addRange("lambdaone", O815->parsedSpecOps[isopt].second);
+      break;
+    case 'q':
+      O815->paraQ->addRange("lambdatwo", O815->parsedSpecOps[isopt].second);
+      break;
+    case 'l':
+      O815->paraQ->addRange("lambdaone", O815->parsedSpecOps[isopt].second);
+      O815->paraQ->linkParas("lambdatwo", "lambdaone");
+      break;
+    case 'k':
+      O815->paraQ->addRange("kappaone", O815->parsedSpecOps[isopt].second);
+      O815->paraQ->linkParas("kappatwo", "kappaone");
       break;
     }
 }
@@ -39,20 +63,18 @@ void helpHeader()
 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));
     }
-    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, "corr") == 0 ) {
+      *O815->out->log << "MASTER: registered observable: corr" << endl << flush;
+      O815->observables.push_back(new obs_corr(O815));
     }
-    */
   }
 }
 
@@ -63,7 +85,7 @@ int main (int argc, char *argv[])
   O815->addPara("beta", 1);
   O815->addPara("lambdaone", 1);
   O815->addPara("lambdatwo", 1);
-  O815->addPara("kappaone", 1);
+  O815->addPara("kappaone", 1);  
   O815->addPara("kappatwo", 1);
 
   parseSpecOps();