...

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

diff --git a/o815/o815.cpp b/o815/o815.cpp
index 878df0f6297556bb66e3986d2858da20ca9327e1..49b3ed884fea17b51da1f289473b4fd66a1e5e7e 100644 (file)
--- a/o815/o815.cpp
+++ b/o815/o815.cpp
@@ -10,8 +10,6 @@ using namespace std;
 extern int opterr;
 
 o815::o815(int argc, char **argv, const string& _programid, comoption specOps[], void (*helpHeader)()) {
-  long timestamp;
-
   programid = _programid;
 
   comargs.nmeas = 100;
@@ -29,8 +27,6 @@ o815::o815(int argc, char **argv, const string& _programid, comoption specOps[],
   MPI_Comm_size(MPI_COMM_WORLD, &numprocs);
   MPI_Comm_rank(MPI_COMM_WORLD, &rank);
 
-  paraQ = new paraq(numprocs, rank);
-
   addComOption("lsize",  required_argument, NULL,                'L', "define lattice size",                   "xsize:tsize");
   addComOption("nmeas",  required_argument, NULL,                'N', "set number of measurements",            "nmeas");
   addComOption("skip",   required_argument, NULL,                'S', "set number of skips between configs",   "nskip");
@@ -90,6 +86,12 @@ o815::o815(int argc, char **argv, const string& _programid, comoption specOps[],
     exit(0);
   }
 
+  paraQ = new paraq(numprocs, rank);
+}
+
+void o815::postParaInit() {
+  long timestamp;
+
   if(comargs.idonly) {
     cout << programid << headMaster() << endl << flush;
     exit(0);
@@ -135,26 +137,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;