fixed multiple parameter write closing bug.

[phys/latlib.git] / configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index 4c7963d310b63740e4a051163352cc749fb6f699..ef085d8cb25815d78d02ccbfc258ee4332b5f6d6 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -174,11 +174,9 @@ void * configcache::getHeader(const string& headerid) {
   return NULL;
 }
 
-/* returns number of equilibration-steps left with new read configuration 
-   or zero if no new configuration was read */
-void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigned long> *excludeFileHashes)
+void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigned long> *excludeFileHashes)
 {
-  readnewconfig = false;
+  *readnewconfig = false;
 
   if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return;
 
@@ -193,7 +191,8 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
       int iDidVirtualSkips;
 
       if( (!inFile.is_open()) && inFileIt == inFiles.end() ) {
-       nequileft = nequileft_internal;
+       if (*readnewconfig)
+         *nequileft = nequileft_internal;
        return;
       }
 
@@ -230,7 +229,7 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
              else if ( (NEQUI-openFileDesc.nequi) - (iDidVirtualSkips+1)*openFileDesc.nskip < nequileft_internal ) {
                memcpy(configMem, tmpConfig, configSize);
                nequileft_internal = NEQUI - openFileDesc.nequi - (iDidVirtualSkips+1)*openFileDesc.nskip;
-               readnewconfig = true;
+               *readnewconfig = true;
                firstUsedConfig = false;
              }
            }
@@ -239,7 +238,7 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
          if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
            {
              memcpy(configMem, tmpConfig, configSize);
-             readnewconfig = true;
+             *readnewconfig = true;
              if (firstUsedConfig) {
                firstUsedConfig = false;
                if (openFileDesc.nequi < NEQUI)
@@ -248,7 +247,7 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
                  nequileft_internal = NEQUI - openFileDesc.nequi;
              }
              nequileft_internal -= openFileDesc.nskip;
-             nequileft = nequileft_internal;
+             *nequileft = nequileft_internal;
              return;
            }
          else {
@@ -260,7 +259,7 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
 }
 
 void configcache::openOutFile(int actnequi)
-{
+{ 
   time_t secstamp = time(NULL);
 
   outFileName.str("");
@@ -316,6 +315,7 @@ int configcache::getParIndex(const string& parid){
 
 void configcache::setPara(const string& parid, const double& value){
   Paras[getParIndex(parid)].val = value;
+
   finishOutFile();
   if(inBuffer != NULL) { delete inBuffer; inBuffer=NULL; } 
   inFile.close();