X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/71e93c2cca7c6f967c3c77c3e26c037ad4f4f555..598fe7b7a358769fc1b6c48772f35cf7b719e8b4:/hypercache.cpp?ds=inline

diff --git a/hypercache.cpp b/hypercache.cpp
index 81b7b3c..fd2bbcb 100644
--- a/hypercache.cpp
+++ b/hypercache.cpp
@@ -72,18 +72,11 @@ string hypercache::fileOfPath(const string& dressedfile) {
 }
 
 bool hypercache::readC() {
-  bool readnewconfig_nonex;
-  int nequileftReadConfig_nonex;
-  bool readAtLeastOneConfig = false;
+  bool readAtLeastOneConfig;
 
-  C->readConfig(readnewconfig_nonex, nequileftReadConfig_nonex, &parentConfigs);
+  C->readConfig(&readAtLeastOneConfig, &nequileft, &parentConfigs);
 
-  if (readnewconfig_nonex) {
-    nequileft = nequileftReadConfig_nonex;
-    readAtLeastOneConfig = true;
-  }
-
-  if ( nequileft < 0 && readnewconfig_nonex )
+  if ( nequileft < 0 && readAtLeastOneConfig )
     activeCFile = fileOfPath(C->getInFileName());
   else
     activeCFile = "";
@@ -100,7 +93,7 @@ bool hypercache::readC() {
       int nequileftReadConfig_ex;
 
       memcpy (tmpconfig, C->getConfigMem(), C->getConfigSize());
-      C->readConfig(readnewconfig_ex, nequileftReadConfig_ex, NULL);
+      C->readConfig(&readnewconfig_ex, &nequileftReadConfig_ex, NULL);
 
       if (! readnewconfig_ex) {
 	*log << "HYPERCACHE: No more excluded config-files for possible equilibration available." << endl << flush;
@@ -125,7 +118,6 @@ bool hypercache::readC() {
 
   /* storing most equilibrated config */
   if ( nequileft < mostEquilibratedConfig.first && readAtLeastOneConfig ) {
-    //*log << "HYPERCACHE: Storing a copy of so far most equilibrated config with nequileft = " << nequileft << endl << flush;
     mostEquilibratedConfig.first = nequileft;
     memcpy(mostEquilibratedConfig.second, C->getConfigMem(), C->getConfigSize());
   }
@@ -135,7 +127,6 @@ bool hypercache::readC() {
     *log << "HYPERCACHE: Injecting back most equilibrated stored config with nequileft = " << mostEquilibratedConfig.first << endl << flush;
     nequileft = mostEquilibratedConfig.first;
     memcpy(C->getConfigMem(), mostEquilibratedConfig.second, C->getConfigSize());
-    //readAtLeastOneConfig = false;
   }
 
   return readAtLeastOneConfig;
@@ -164,10 +155,10 @@ void hypercache::writeO(int obsid) {
   lastWrittenObsEquis = NEQUI-nequileft-NSKIP;
 }
 
-void hypercache::readO(int obsid, bool& readnewconfig, int& nequileft) {
-  Os[obsid]->readConfig(readnewconfig, nequileft);
+void hypercache::readO(int obsid, bool *readNewObsConfig, int *nequiObsLeft) {
+  Os[obsid]->readConfig(readNewObsConfig, nequiObsLeft);
 
-  if ( nequileft < 0 ) {
+  if ( *readNewObsConfig && *nequiObsLeft < 0 ) {
     unsigned long *parentconfig = (unsigned long*)Os[obsid]->getHeader("concurrent_cfile");
     if ( parentconfig != NULL )
       addParentConfig(parentconfig);