...

[phys/latlib.git] / o815 / o815.cpp

diff --git a/o815/o815.cpp b/o815/o815.cpp
index cf461ba12bc238749befb8e584e02a14e1701f27..9cd3f7b4a78d4c79155c1c3621e99fe828a1b976 100644 (file)
--- a/o815/o815.cpp
+++ b/o815/o815.cpp
@@ -53,12 +53,11 @@ o815::o815(int argc, char **argv, const string& _programid) {
 void o815::mainLoop() {
   *out->log << "OBS: Starting main loop." << endl;
 
-  for (vector<obs*>::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) {
+  for (vector<obs*>::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit)
     (*obsit)->start();
-  }
 
-  //while( nextParas() ) {
-  //}
+  while( nextParas() ) {
+  }
   
   /*
   for (int i=0; i<100; i++) {
@@ -68,9 +67,8 @@ void o815::mainLoop() {
   }
   */
 
-  for (vector<obs*>::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) {
+  for (vector<obs*>::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit)
     (*obsit)->finish();
-  }
 }
 
 void o815::parseArgs(int argc, char **argv) {
@@ -157,14 +155,8 @@ o815::~o815() {
 int o815::nextParas()
 {
   if( paraQ->nextParas() ) {
-    /*
-    setB( (*paraQ)["beta"] );
-    setK( (*paraQ)["kappa"] );
-    setL( (*paraQ)["lambda"] );
-    setM1( (*paraQ)["mu1"] );
-    setM2( (*paraQ)["mu2"] );
-    */
-
+    for (vector<string>::iterator parait = paraQ->allParaIds.begin(); parait != paraQ->allParaIds.end(); ++parait)
+      hypercache::setPara(*parait, (*paraQ)[*parait]);
     return 1;
   }
   else