gRPC: Changed behavior, so mask application during conversion is now default behavior

2023-06-30 13:34:45 +02:00
parent f9deb58d20
commit a66ac66d0b
4 changed files with 6 additions and 6 deletions
@@ -921,7 +921,7 @@ void DiffractionExperiment::LoadDatasetSettings(const JFJochProtoBuf::DatasetSet
        if (settings.has_scattering_vector())
            ScatteringVector({0,0,1});
        Compression(settings.compression());
-        ApplyPixelMaskInFPGA(settings.apply_pixel_mask());
+        ApplyPixelMaskInFPGA(!settings.debug_pixel_mask());
        Binning2x2(settings.binning2x2());
    } catch (...) {
        dataset = tmp;
@@ -1083,13 +1083,13 @@ void DiffractionExperiment::FillMessage(StartMessage &message) const {
 }

 DiffractionExperiment &DiffractionExperiment::ApplyPixelMaskInFPGA(bool input) {
-    dataset.set_apply_pixel_mask(input);
+    dataset.set_debug_pixel_mask(!input);
    return *this;
 }

 bool DiffractionExperiment::GetApplyPixelMaskInFPGA() const {
    if (GetDetectorMode() == DetectorMode::Conversion)
-        return dataset.apply_pixel_mask();
+        return !dataset.debug_pixel_mask();
    else
        return false;
 }