diff --git a/RELEASE.txt b/RELEASE.txt index 7eff077d3..82453290b 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -57,6 +57,7 @@ This document describes the differences between v7.0.0 and v6.x.x - ctb: can set names for all the dacs - fpga/kernel programming, checks if drive is a special file and not a normal file - gotthard 25 um image reconstructed in gui and virtual hdf5 (firmware updated for slave to reverse channels) +- fixed bug introduced in 6.0.0: hdf5 files created 1 file per frame after the initial file which had maxframesperfile 2. Resolved Issues ================== diff --git a/slsReceiverSoftware/src/BinaryDataFile.cpp b/slsReceiverSoftware/src/BinaryDataFile.cpp index d93fbc46c..99bf2e42e 100644 --- a/slsReceiverSoftware/src/BinaryDataFile.cpp +++ b/slsReceiverSoftware/src/BinaryDataFile.cpp @@ -72,7 +72,7 @@ void BinaryDataFile::WriteToFile(char *buffer, const int buffersize, ++subFileIndex_; CreateFile(); } - numFramesInFile_++; + ++numFramesInFile_; // write to file int ret = 0; diff --git a/slsReceiverSoftware/src/HDF5DataFile.cpp b/slsReceiverSoftware/src/HDF5DataFile.cpp index 0ffe0d525..e9b2c9212 100644 --- a/slsReceiverSoftware/src/HDF5DataFile.cpp +++ b/slsReceiverSoftware/src/HDF5DataFile.cpp @@ -128,7 +128,7 @@ void HDF5DataFile::CreateFirstHDF5DataFile( } void HDF5DataFile::CreateFile() { - + numFramesInFile_ = 0; numFilesInAcquisition_++; std::ostringstream os; @@ -237,7 +237,7 @@ void HDF5DataFile::WriteToFile(char *buffer, const int buffersize, ++subFileIndex_; CreateFile(); } - numFramesInFile_++; + ++numFramesInFile_; // extend dataset (when receiver start followed by many status starts // (jungfrau)))