...

[phys/latlib.git] / configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index f642e9f26fc99e2e4f8a685d9673738a56c8e2ea..b6edc173fd26faea06606df901fd01b03754275f 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -72,8 +72,6 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
   string truncIn, truncOut;
 
   filedesc->filename = infile;
-  filedesc->doVirtualEquilibration = false;
-  filedesc->firstUsedConfig = true;
 
   if( infile.size() < 4 ) return false;
 
@@ -98,8 +96,6 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
            return false;
          break;
        case 2:
-         if (atoi(inParts) < NEQUI)
-           filedesc->doVirtualEquilibration = true;
          filedesc->nequi = atoi(inParts);
          break;
        case 3: 
@@ -205,6 +201,13 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
       while( (!inFile.is_open()) && inFiles.size() > 0 ) {
        openFileDesc = *inFileIt;
 
+       if (openFileDesc.nequi < NEQUI)
+         doVirtualEquilibration = true;
+       else
+         doVirtualEquilibration = false;
+
+       firstUsedConfig = true;
+
        if(log) *log << "CCACHE: Opening dat-file: " << inFileIt->filename << endl << flush;
        inFile.open( (DATADIR + "/" + inFileIt->filename).c_str(), std::ios::binary );
        
@@ -219,9 +222,11 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
 
       if( inFile.is_open() ) 
        {
-         if (openFileDesc.doVirtualEquilibration) {
+         if (doVirtualEquilibration) {
+           cout << nequileft_internal << endl;
+
            if(log) *log << "CCACHE: Trying virtual equilibration." << endl << flush;
-           openFileDesc.doVirtualEquilibration = false;
+           doVirtualEquilibration = false;
            for (iDidVirtualSkips=0; iDidVirtualSkips < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iDidVirtualSkips++) {
              if( readFullBlock(tmpConfig, configSize) != configSize || ! inFile.is_open() )
                break;
@@ -230,7 +235,7 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
                nequileft_internal = NEQUI - openFileDesc.nequi - (iDidVirtualSkips+1)*openFileDesc.nskip;
                cout << "blabla:" << nequileft_internal << endl;
                readnewconfig = true;
-               openFileDesc.firstUsedConfig = false;
+               firstUsedConfig = false;
              }
            }
          }
@@ -239,9 +244,9 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
            {
              memcpy(configMem, tmpConfig, configSize);
              readnewconfig = true;
-             if (openFileDesc.firstUsedConfig) {
-               openFileDesc.firstUsedConfig = false;
-               if (NEQUI < openFileDesc.nequi)
+             if (firstUsedConfig) {
+               firstUsedConfig = false;
+               if (openFileDesc.nequi < NEQUI)
                  nequileft_internal = NEQUI - openFileDesc.nequi - iDidVirtualSkips*openFileDesc.nskip;
                else
                  nequileft_internal = NEQUI - openFileDesc.nequi;
@@ -322,6 +327,7 @@ void configcache::setPara(const string& parid, const double& value){
   inFiles.clear();
 
   refetchDataFiles = true;
+  nequileft_internal = NEQUI;
 }
 
 configcache::~configcache()