...

diff --git a/o815/o815.cpp b/o815/o815.cpp
index 8700f675e394ef4d7bd8b20ca7dc4ebd9c703bf6..ff0b1ae08d60be1e27aba4e5c5c5e83d9441ba9d 100644 (file)
--- a/o815/o815.cpp
+++ b/o815/o815.cpp
@@ -125,6 +125,8 @@ void o815::mainLoop() {
     for (vector<string>::iterator parait = paraQ->allParaIds.begin(); parait != paraQ->allParaIds.end(); ++parait)
       *out->log << *parait << "=" << (*paraQ)[*parait] << " ";
     *out->log << ">" << endl << flush;
     for (vector<string>::iterator parait = paraQ->allParaIds.begin(); parait != paraQ->allParaIds.end(); ++parait)
       *out->log << *parait << "=" << (*paraQ)[*parait] << " ";
     *out->log << ">" << endl << flush;

+
+    Sim->_newParas();

     
     progress measProg(comargs.nmeas);
 
     
     progress measProg(comargs.nmeas);
 

diff --git a/o815/o815.h b/o815/o815.h
index 91fc747685204a379f8a2b0951dec367b7726754..1b941700ef66a51f6a79b6bb734477bf0a32184e 100644 (file)
--- a/o815/o815.h
+++ b/o815/o815.h
@@ -45,6 +45,7 @@ class o815 {
     void nextConfig();
     bool toEquilibrate;
     char *confMem;
     void nextConfig();
     bool toEquilibrate;
     char *confMem;

+    virtual void _newParas() {};

   private:
     virtual void _reset()=0;
     virtual void _makeSweep(int nsweep)=0;
   private:
     virtual void _reset()=0;
     virtual void _makeSweep(int nsweep)=0;

diff --git a/paraq.cpp b/paraq.cpp
index ac8fc14ff77ac4897ba082e1b847ce1712f5120a..87ec7734018bc01a662a1f16ec45a0f36a3f1d63 100644 (file)
--- a/paraq.cpp
+++ b/paraq.cpp
@@ -114,7 +114,8 @@ double& paraq::operator[] (string paraid) {
     return defaultPara[paraid];
   }
 
     return defaultPara[paraid];
   }
 

-  return masterdefault;
+  cerr << "PARAQ: Parameter " << paraid << " does not exist!" << endl << flush;
+  exit(1);

 }
 
 int paraq::getTotalJobs() { 
 }
 
 int paraq::getTotalJobs() {