...

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

diff --git a/o815/o815.h b/o815/o815.h
index 2f12fc5162b209fe263d4e2f355e31acc24bacc9..33693b002aaceba341c488662d1666e10990788b 100644 (file)
--- a/o815/o815.h
+++ b/o815/o815.h
@@ -8,6 +8,7 @@
 
 #include "latlib/paraq.h"
 #include "latlib/writeout.h"
+#include "latlib/hypercache.h"
 
 using namespace std;
 

diff --git a/paraq.h b/paraq.h
index fbb6dabae92579b1caac01960331eac963a7c397..6aba45b9da3c524d2b186d429b03029296e7e141 100644 (file)
--- a/paraq.h
+++ b/paraq.h
@@ -18,7 +18,7 @@ class paraq {
   void setDefault(const string& paraid, double value) { defaultPara[paraid] = value; uniqueAllParaIdsAdd(paraid); }
   int getTotalJobs();
   string rangeString();
-  //map<string,double>* getAllParas() {};
+  vector<string> allParaIds;
 
  private:
   int nprocs, rank;
@@ -31,7 +31,6 @@ class paraq {
   bool inParas(vector<double>& paraVec, double& tofind);
   double masterdefault;
   bool jobListInitialized;
-  vector<string> allParaIds;
   void uniqueAllParaIdsAdd(const string& paraid);
 };