version 1.0.0-rc.16

common/DiffractionExperiment.cpp

@@ -149,7 +149,7 @@ DiffractionExperiment &DiffractionExperiment::MaskChipEdges(bool input) {
 }
 
 DiffractionExperiment& DiffractionExperiment::LowResForAzimInt_A(float input) {
-  radial_integration_settings.LowQ_recipA(2 * static_cast<float>(M_PI) / input);
+    radial_integration_settings.LowQ_recipA(2 * static_cast<float>(M_PI) / input);
     return *this;
 }
 
@@ -364,7 +364,7 @@ int64_t DiffractionExperiment::GetDataStreamsNum() const {
 }
 
 int64_t DiffractionExperiment::GetModulesNum(uint16_t data_stream) const {
-      if (data_stream >= GetDataStreamsNum())
+    if (data_stream >= GetDataStreamsNum())
         throw JFJochException(JFJochExceptionCategory::ArrayOutOfBounds, "Non existing data stream");
 
     return (detector.GetModulesNum() + (GetDataStreamsNum() - 1) - data_stream) / GetDataStreamsNum();
@@ -1012,7 +1012,7 @@ InstrumentMetadata DiffractionExperiment::GetInstrumentMetadata() const {
 }
 
 bool DiffractionExperiment::IsGeometryTransformed() const {
-   return image_format_settings.IsGeometryTransformed();
+    return image_format_settings.IsGeometryTransformed();
 }
 
 DiffractionExperiment &DiffractionExperiment::GeometryTransformation(bool input) {
@@ -1086,6 +1086,13 @@ void DiffractionExperiment::Raw() {
 }
 
 DiffractionExperiment &DiffractionExperiment::ImportDetectorSettings(const DetectorSettings &input) {
+    auto det_type = detector.GetDetectorType();
+    if (det_type == DetectorType::JUNGFRAU) {
+        if ((input.GetTiming() == DetectorTiming::Burst) ||
+            (input.GetTiming() == DetectorTiming::Gated))
+            throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
+                                  "Burst and gated timing modes not supported in JUNGFRAU");
+    }
     detector_settings = input;
     return *this;
 }
@@ -1133,3 +1140,11 @@ float DiffractionExperiment::GetPedestalG0RMSLimit() const {
 uint32_t DiffractionExperiment::GetPedestalMinImageCount() const {
     return detector_settings.GetPedestalMinImageCount();
 }
+
+std::optional<float> DiffractionExperiment::GetEIGERThreshold_keV() const {
+    return detector_settings.GetEIGERThreshold_keV();
+}
+
+DetectorTiming DiffractionExperiment::GetDetectorTiming() const {
+    return detector_settings.GetTiming();
+}