From: Alex Schmidt Date: Fri, 24 May 2013 13:42:19 +0000 (+0200) Subject: ... X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/commitdiff_plain/e46233799c25067188549528947ae980579a5e8c?ds=sidebyside;hp=a5f05e337d18c193ac57b4da0013d1cdc69f8faa ... --- diff --git a/o815/o815.cpp b/o815/o815.cpp index 8700f67..ff0b1ae 100644 --- a/o815/o815.cpp +++ b/o815/o815.cpp @@ -125,6 +125,8 @@ void o815::mainLoop() { for (vector::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); diff --git a/o815/o815.h b/o815/o815.h index 91fc747..1b94170 100644 --- a/o815/o815.h +++ b/o815/o815.h @@ -45,6 +45,7 @@ class o815 { void nextConfig(); bool toEquilibrate; char *confMem; + virtual void _newParas() {}; private: virtual void _reset()=0; virtual void _makeSweep(int nsweep)=0; diff --git a/paraq.cpp b/paraq.cpp index ac8fc14..87ec773 100644 --- a/paraq.cpp +++ b/paraq.cpp @@ -114,7 +114,8 @@ double& paraq::operator[] (string paraid) { return defaultPara[paraid]; } - return masterdefault; + cerr << "PARAQ: Parameter " << paraid << " does not exist!" << endl << flush; + exit(1); } int paraq::getTotalJobs() {