Improvements before MAX IV test

common/DiffractionExperiment.cpp

@@ -72,7 +72,7 @@ DiffractionExperiment::DiffractionExperiment(const DetectorSetup& det_setup)
 // setter functions
 DiffractionExperiment &DiffractionExperiment::Detector(const DetectorSetup &input) {
     detector = input;
-    roi_mask = ROIMask(input);
+    roi_mask = ROIMap(input);
     return *this;
 }
 
@@ -702,7 +702,7 @@ void DiffractionExperiment::FillMessage(StartMessage &message) const {
     message.pixel_signed = IsPixelSigned();
     message.sample_name = GetSampleName();
     message.max_spot_count = GetMaxSpotCount();
-    message.pixel_mask_enabled = GetApplyPixelMaskInFPGA();
+    message.pixel_mask_enabled = false;
     message.detector_description = GetDetectorDescription();
     message.space_group_number = GetSpaceGroupNumber();
     message.unit_cell = GetUnitCell();
@@ -739,18 +739,6 @@ void DiffractionExperiment::FillMessage(StartMessage &message) const {
         message.roi_names.emplace_back(x);
 }
 
-DiffractionExperiment &DiffractionExperiment::ApplyPixelMaskInFPGA(bool input) {
-    debug_pixel_mask = !input;
-    return *this;
-}
-
-bool DiffractionExperiment::GetApplyPixelMaskInFPGA() const {
-    if (GetDetectorMode() == DetectorMode::Conversion)
-        return !debug_pixel_mask;
-    else
-        return false;
-}
-
 float DiffractionExperiment::GetPixelSize_mm() const {
     return detector.GetPixelSize_mm();
 }
@@ -1141,20 +1129,20 @@ DatasetSettings DiffractionExperiment::GetDatasetSettings() const {
     return dataset;
 }
 
-ROIMask &DiffractionExperiment::ROI() {
+ROIMap &DiffractionExperiment::ROI() {
     return roi_mask;
 }
 
-const ROIMask &DiffractionExperiment::ROI() const {
+const ROIMap &DiffractionExperiment::ROI() const {
     return roi_mask;
 }
 
-void DiffractionExperiment::ExportROIMask(uint16_t *dest, size_t module_number) const {
+void DiffractionExperiment::ExportROIMap(uint16_t *v, size_t module_number) const {
     if (GetDetectorMode() == DetectorMode::Conversion)
-        ConvertedToRawGeometry(*this, module_number, dest, roi_mask.GetMask().data());
+        ConvertedToRawGeometry(*this, module_number, v, roi_mask.GetROIMap().data());
     else {
         for (int i = 0; i < RAW_MODULE_SIZE; i++)
-            dest[i] = UINT16_MAX;
+            v[i] = UINT16_MAX;
     }
 }
 
@@ -1178,4 +1166,9 @@ int64_t DiffractionExperiment::GetSendBufferLocationSize() const {
 
 float DiffractionExperiment::GetDataReductionFactorSerialMX() const {
     return dataset.GetDataReductionFactorSerialMX();
-}
+}
+
+DiffractionExperiment &DiffractionExperiment::DataReductionFactorSerialMX(float input) {
+    dataset.DataReductionFactorSerialMX(input);
+    return *this;
+}