wip

slsReceiverSoftware/src/DataProcessor.cpp

@@ -54,6 +54,11 @@ void DataProcessor::SetPortROI(ROI roi) {
     isOutsideRoi = portRoi.noRoi();
 }
 
+void DataProcessor::setMultiROIMetadata(
+    const std::vector<slsDetectorDefs::ROI> &args) {
+    multiRoiMetadata = args;
+}
+
 void DataProcessor::SetDataStreamEnable(bool enable) {
     dataStreamEnable = enable;
 }
@@ -203,9 +208,9 @@ std::string DataProcessor::CreateVirtualFile(
     const int modulePos, const int numModX, const int numModY,
     std::mutex *hdf5LibMutex) {
 
-    if (isPartiallyInRoi) {
+    if (!multiRoiMetadata.empty() && generalData->dynamicRange == 4) {
-        throw std::runtime_error(
+        throw std::runtime_error("Skipping virtual hdf5 file since rx_roi is "
-            "Skipping virtual hdf5 file since rx_roi is enabled.");
+                                 "enabled in 4 bit mode.");
     }
 
     bool gotthard25um = ((generalData->detType == GOTTHARD ||
@@ -227,7 +232,7 @@ std::string DataProcessor::CreateVirtualFile(
         generalData->nPixelsX, generalData->nPixelsY, generalData->dynamicRange,
         numFramesCaught, numModX, numModY, dataFile->GetPDataType(),
         dataFile->GetParameterNames(), dataFile->GetParameterDataTypes(),
-        hdf5LibMutex, gotthard25um);
+        hdf5LibMutex, gotthard25um, multiRoiMetadata);
 }
 
 void DataProcessor::LinkFileInMaster(const std::string &masterFileName,
@@ -235,7 +240,7 @@ void DataProcessor::LinkFileInMaster(const std::string &masterFileName,
                                      const bool silentMode,
                                      std::mutex *hdf5LibMutex) {
 
-    if (isPartiallyInRoi) {
+    if (!multiRoiMetadata.empty()) {
         throw std::runtime_error(
             "Should not be here, roi with hdf5 virtual should throw.");
     }

slsReceiverSoftware/src/DataProcessor.h

@@ -40,6 +40,7 @@ class DataProcessor : private virtual slsDetectorDefs, public ThreadObject {
     void SetUdpPortNumber(const uint16_t portNumber);
     void SetActivate(bool enable);
     void SetPortROI(const ROI arg);
+    void setMultiROIMetadata(const std::vector<slsDetectorDefs::ROI> &args);
     void SetDataStreamEnable(bool enable);
     void SetStreamingFrequency(uint32_t value);
     void SetStreamingTimerInMs(uint32_t value);
@@ -162,6 +163,8 @@ class DataProcessor : private virtual slsDetectorDefs, public ThreadObject {
     ROI portRoi{};
     bool isPartiallyInRoi{false};
     bool isOutsideRoi{false};
+    std::vector<ROI> multiRoiMetadata{};
+
     std::unique_ptr<char[]> completeImageToStreamBeforeCropping;
     /** if 0, sending random images with a timer */
     uint32_t streamingFrequency;

slsReceiverSoftware/src/Implementation.cpp

@@ -200,6 +200,8 @@ void Implementation::SetupDataProcessor(int i) {
     } else {
         dataProcessor[i]->SetPortROI(portRois[i]);
     }
+    if (i == 0)
+        dataProcessor[0]->setMultiROIMetadata(multiRoiMetadata);
     dataProcessor[i]->SetDataStreamEnable(dataStreamEnable);
     dataProcessor[i]->SetStreamingFrequency(streamingFrequency);
     dataProcessor[i]->SetStreamingTimerInMs(streamingTimerInMs);
@@ -414,13 +416,16 @@ void Implementation::setPortROIs(const std::vector<defs::ROI> &args) {
 
     for (size_t i = 0; i != listener.size(); ++i)
         listener[i]->SetIsOutsideRoi(i >= portRois.size());
-    for (size_t i = 0; i != dataProcessor.size(); ++i)
+    for (size_t i = 0; i != dataProcessor.size(); ++i) {
         if (i >= portRois.size()) {
             ROI roi{0, 0, 0, 0};
             dataProcessor[i]->SetPortROI(roi);
         } else {
             dataProcessor[i]->SetPortROI(portRois[i]);
         }
+    }
+    if (dataProcessor.size() > 0)
+        dataProcessor[0]->setMultiROIMetadata(multiRoiMetadata);
     for (size_t i = 0; i != dataStreamer.size(); ++i) {
         if (i >= portRois.size()) {
             ROI roi{0, 0, 0, 0};
@@ -435,6 +440,8 @@ void Implementation::setPortROIs(const std::vector<defs::ROI> &args) {
 void Implementation::setMultiROIMetadata(
     const std::vector<slsDetectorDefs::ROI> &args) {
     multiRoiMetadata = args;
+    if (dataProcessor.size() > 0)
+        dataProcessor[0]->setMultiROIMetadata(multiRoiMetadata);
     LOG(logINFO) << "Multi ROI Metadata: " << ToString(multiRoiMetadata);
 }
 

slsReceiverSoftware/src/MasterFileUtility.cpp

@@ -160,6 +160,7 @@ std::string CreateMasterHDF5File(const std::string &filePath,
     return fileName;
 }
 
+/** Will not be called if dynamic range is 4 and roi enabled */
 std::string CreateVirtualHDF5File(
     const std::string &filePath, const std::string &fileNamePrefix,
     const uint64_t fileIndex, const bool overWriteEnable, const bool silentMode,
@@ -169,7 +170,8 @@ std::string CreateVirtualHDF5File(
     const uint64_t numImagesCaught, const int numModX, const int numModY,
     const H5::DataType dataType, const std::vector<std::string> parameterNames,
     const std::vector<H5::DataType> parameterDataTypes,
-    std::mutex *hdf5LibMutex, bool gotthard25um) {
+    std::mutex *hdf5LibMutex, bool gotthard25um,
+    std::vector<defs::ROI> &multiRoi) {
 
     // virtual file name
     std::ostringstream osfn;
@@ -205,6 +207,19 @@ std::string CreateVirtualHDF5File(
             "version", H5::PredType::NATIVE_DOUBLE, dataspace_attr);
         attribute.write(H5::PredType::NATIVE_DOUBLE, &dValue);
 
+        // complete detector in roi
+        if (multiRoi.empty()) {
+            int ny = nPixelsY * numModY;
+            int nx = nPixelsX * numModX;
+            if (nPixelsY == 1) {
+                multiRoi.push_back(defs::ROI{0, nx - 1});
+            } else {
+                multiRoi.push_back(defs::ROI{0, nx - 1, 0, ny - 1});
+            }
+        }
+
+        for (size_t iRoi = 0; iRoi != multiRoi.size(); ++iRoi) {
+
             // dataspace
             hsize_t vdsDims[DATA_RANK] = {numImagesCaught, numModY * nDimy,
                                           numModZ * nDimz};
@@ -258,9 +273,9 @@ std::string CreateVirtualHDF5File(
                         startLocation[2] = iReadout;
                     }
 
-                vdsDataSpace.selectHyperslab(H5S_SELECT_SET, numBlocks,
+                    vdsDataSpace.selectHyperslab(
-                                             startLocation, strideBetweenBlocks,
+                        H5S_SELECT_SET, numBlocks, startLocation,
-                                             blockSize);
+                        strideBetweenBlocks, blockSize);
 
                     vdsDataSpacePara.selectHyperslab(
                         H5S_SELECT_SET, numBlocksPara, startLocationPara,
@@ -285,7 +300,8 @@ std::string CreateVirtualHDF5File(
 
                     // source dataspace
                     hsize_t srcDims[DATA_RANK] = {nDimx, nDimy, nDimz};
-                hsize_t srcDimsMax[DATA_RANK] = {H5S_UNLIMITED, nDimy, nDimz};
+                    hsize_t srcDimsMax[DATA_RANK] = {H5S_UNLIMITED, nDimy,
+                                                     nDimz};
                     H5::DataSpace srcDataSpace(DATA_RANK, srcDims, srcDimsMax);
                     hsize_t srcDimsPara[PARA_RANK] = {nDimx};
                     hsize_t srcDimsMaxPara[PARA_RANK] = {H5S_UNLIMITED};
@@ -293,13 +309,14 @@ std::string CreateVirtualHDF5File(
                                                    srcDimsMaxPara);
                     // temporary fixfor corner case bug:
                     // (framescaught not multiple of framesperfile,
-                // virtual parameter datasets error loading (bad scalar value))
+                    // virtual parameter datasets error loading (bad scalar
+                    // value))
                     if (nDimx != maxFramesPerFile) {
                         hsize_t count[1] = {nDimx};
                         hsize_t start[1] = {0};
                         srcDataSpacePara.selectHyperslab(
-                        H5S_SELECT_SET, count, start, strideBetweenBlocksPara,
+                            H5S_SELECT_SET, count, start,
-                        blockSizePara);
+                            strideBetweenBlocksPara, blockSizePara);
                     }
 
                     // mapping of property list
@@ -334,6 +351,7 @@ std::string CreateVirtualHDF5File(
                     parameterNames[p].c_str(), parameterDataTypes[p],
                     vdsDataSpacePara, plistPara[p]));
             }
+        }
 
         fd->close();
     } catch (const H5::Exception &error) {

slsReceiverSoftware/src/MasterFileUtility.h

@@ -39,7 +39,8 @@ std::string CreateVirtualHDF5File(
     const uint64_t numImagesCaught, const int numModX, const int numModY,
     const H5::DataType dataType, const std::vector<std::string> parameterNames,
     const std::vector<H5::DataType> parameterDataTypes,
-    std::mutex *hdf5LibMutex, bool gotthard25um);
+    std::mutex *hdf5LibMutex, bool gotthard25um,
+    std::vector<defs::ROI> &multiRoi);
 #endif
 } // namespace masterFileUtility