From: Alexander Schmidt Date: Sun, 16 Feb 2014 08:47:35 +0000 (+0100) Subject: Implemented 0-observable-mode. X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/commitdiff_plain/ebc593f61243a8ead77dbe9128fdac77377d6734?ds=sidebyside Implemented 0-observable-mode. --- diff --git a/o815/o815.cpp b/o815/o815.cpp index 17581ec..df5d635 100644 --- a/o815/o815.cpp +++ b/o815/o815.cpp @@ -129,6 +129,9 @@ void o815::postParaInit() { void o815::mainLoop() { *out->log << "OBS: Starting main loop." << endl; + if ( observables.size() == 0 ) + *out->log << "O815: Running in 0-observable-mode." << endl; + for (vector::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) (*obsit)->start(); @@ -149,6 +152,7 @@ void o815::mainLoop() { for( int imeas=0; imeas::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) { bool readnewObs; int nequileftNewObs; @@ -165,9 +169,12 @@ void o815::mainLoop() { } (*obsit)->meas(false, imeas); hypercache::writeO( (*obsit)->ocid ); - } - + } } + + if ( observables.size() == 0 ) + Sim->nextConfig(); + while( measProg.madeStep(imeas) ) *out->log << "O815: " << measProg.done()*100 << "% of measurements done." << endl << flush; }