X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/36bc55ceb7b62569c7604f28b3e53bc2e42cf0ce..79dc42fe36820965127efc5755be1450521b0a26:/o815/o815.cpp

diff --git a/o815/o815.cpp b/o815/o815.cpp
index 878df0f..5271370 100644
--- a/o815/o815.cpp
+++ b/o815/o815.cpp
@@ -135,26 +135,26 @@ void o815::mainLoop() {
       *out->log << " " << (*obsit)->obsid;
     *out->log << endl << flush;
 
-    Sim->nequileft = comargs.nequi;
-
     for( int imeas=0; imeas<comargs.nmeas; imeas++ ) {
       bool nextAlready = false;
       for (vector<obs*>::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) {
 	bool readnewObs;
 	int nequileftNewObs;
 	
-	hypercache::readO( (*obsit)->ocid, readnewObs, nequileftNewObs );
+	hypercache::readO( (*obsit)->ocid, &readnewObs, &nequileftNewObs );
 
-	if( ! readnewObs ) {
+	if ( readnewObs && nequileftNewObs < 0 ) {
+	  (*obsit)->meas(true);
+	}
+	else {
 	  if (!nextAlready) {
 	    Sim->nextConfig();
 	    nextAlready = true;
 	  }
 	  (*obsit)->meas(false);
-	  hypercache::writeO( (*obsit)->ocid, comargs.nmeas );
+	  hypercache::writeO( (*obsit)->ocid );
 	}
-	else
-	  (*obsit)->meas(true);
+	  
       }
       while( measProg.madeStep(imeas) ) 
 	*out->log << "O815: " << measProg.done()*100 << "% of measurements done." << endl << flush;