X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/2c7e8d0d8fdb233087376cc62752fdc45646c8c8..46e492935d31a36641b8e8a5cd27bd86e7df96c4:/o815/o815.cpp?ds=inline

diff --git a/o815/o815.cpp b/o815/o815.cpp
index 8700f67..9afaa0c 100644
--- 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;
+
+    Sim->_newParas();
     
     progress measProg(comargs.nmeas);
 
@@ -133,18 +135,21 @@ void o815::mainLoop() {
       *out->log << " " << (*obsit)->obsid;
     *out->log << endl << flush;
 
-    Sim->toEquilibrate = true;
-
     for( int imeas=0; imeas<comargs.nmeas; imeas++ ) {
       bool nextAlready = false;
       for (vector<obs*>::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) {
-	if( hypercache::readO( (*obsit)->ocid ) != -1 ) {
+	bool readnewObs;
+	int nequileftNewObs;
+	
+	hypercache::readO( (*obsit)->ocid, readnewObs, nequileftNewObs );
+
+	if( ! readnewObs ) {
 	  if (!nextAlready) {
 	    Sim->nextConfig();
 	    nextAlready = true;
 	  }
 	  (*obsit)->meas(false);
-	  hypercache::writeO( (*obsit)->ocid );
+	  hypercache::writeO( (*obsit)->ocid, comargs.nmeas );
 	}
 	else
 	  (*obsit)->meas(true);