diff --git a/slsReceiverSoftware/src/DataProcessor.cpp b/slsReceiverSoftware/src/DataProcessor.cpp index 700561924..b97da54df 100644 --- a/slsReceiverSoftware/src/DataProcessor.cpp +++ b/slsReceiverSoftware/src/DataProcessor.cpp @@ -213,7 +213,9 @@ void DataProcessor::CreateVirtualFile( if (virtualFile_) { delete virtualFile_; } - virtualFile_ = new HDF5VirtualFile(hdf5Lib); + gotthard25um = ((detectorType_ == GOTTHARD || detectorType_ == GOTTHARD2) && + (numModX * numModY) == 2); + virtualFile_ = new HDF5VirtualFile(hdf5Lib, gotthard25um); uint64_t numImagesProcessed = GetProcessedIndex() + 1; // maxframesperfile = 0 for infinite files diff --git a/slsReceiverSoftware/src/HDF5VirtualFile.cpp b/slsReceiverSoftware/src/HDF5VirtualFile.cpp index 71ef51099..8349291b9 100644 --- a/slsReceiverSoftware/src/HDF5VirtualFile.cpp +++ b/slsReceiverSoftware/src/HDF5VirtualFile.cpp @@ -5,8 +5,8 @@ #include -HDF5VirtualFile::HDF5VirtualFile(std::mutex *hdf5Lib) - : File(HDF5), hdf5Lib_(hdf5Lib) {} +HDF5VirtualFile::HDF5VirtualFile(std::mutex *hdf5Lib, bool g25) + : File(HDF5), hdf5Lib_(hdf5Lib), gotthard25um(g25) {} HDF5VirtualFile::~HDF5VirtualFile() { CloseFile(); } diff --git a/slsReceiverSoftware/src/HDF5VirtualFile.h b/slsReceiverSoftware/src/HDF5VirtualFile.h index a479bce2d..89b1c0b60 100644 --- a/slsReceiverSoftware/src/HDF5VirtualFile.h +++ b/slsReceiverSoftware/src/HDF5VirtualFile.h @@ -9,7 +9,7 @@ class HDF5VirtualFile : private virtual slsDetectorDefs, public File { public: - HDF5VirtualFile(std::mutex *hdf5Lib); + HDF5VirtualFile(std::mutex *hdf5Lib, bool g25); ~HDF5VirtualFile(); std::array GetFileAndDatasetName() const override; @@ -30,4 +30,5 @@ class HDF5VirtualFile : private virtual slsDetectorDefs, public File { H5File *fd_{nullptr}; std::string fileName_; std::string dataSetName_; + bool gotthard25um; }; \ No newline at end of file