minor changes to test.

[phys/latlib.git] / o815 / o815.cpp

diff --git a/o815/o815.cpp b/o815/o815.cpp
index 9afaa0cb7344e66e398beffb51255bed5467985e..3511d80b163472ce8232e7fc032b9552b0d26719 100644 (file)
--- a/o815/o815.cpp
+++ b/o815/o815.cpp
@@ -143,16 +143,18 @@ void o815::mainLoop() {
        
        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;