v1.0.0-rc.35

common/DiffractionExperiment.cpp

@@ -642,6 +642,11 @@ void DiffractionExperiment::FillMessage(StartMessage &message) const {
     if (GetDetectorType() == DetectorType::JUNGFRAU)
         message.jungfrau_conversion_enabled = IsJungfrauConvPhotonCnt();
 
+    if (GetDetectorType() == DetectorType::EIGER) {
+        float threshold = GetEigerThreshold_keV().value_or(GetIncidentEnergy_keV() / 2.0f);
+        message.threshold_energy["default"] = threshold * 1000.0f; // threshold in CBOR is in eV
+    }
+
     if (IsJungfrauConvPhotonCnt())
         message.jungfrau_conversion_factor = GetPhotonEnergyForConversion_keV() * 1000;
 
@@ -982,7 +987,9 @@ const ROIMap &DiffractionExperiment::ROI() const {
 }
 
 std::vector<uint16_t> DiffractionExperiment::ExportROIMap() const {
-    return roi_mask.GetROIMap(detector, GetDiffractionGeometry());
+    return roi_mask.GetROIMap(GetDiffractionGeometry(),
+                              detector.GetGeometry().GetWidth(),
+                              detector.GetGeometry().GetHeight());
 }
 
 DiffractionExperiment &DiffractionExperiment::ImagesPerFile(int64_t input) {