Detector read-out time can be in nanoseconds (this is work in progress, need to adapt count time and frame time to serious units)

2026-04-28 13:59:39 +02:00
parent f9433eee38
commit 9fe5fc7e4c
23 changed files with 100 additions and 90 deletions
@@ -300,21 +300,25 @@ int64_t DiffractionExperiment::GetFrameNumPerTrigger() const {
    }
 }

-std::chrono::microseconds DiffractionExperiment::GetFrameCountTime() const {
+std::chrono::nanoseconds DiffractionExperiment::GetFrameCountTime() const {
    if ((GetDetectorType() != DetectorType::JUNGFRAU)
        && dataset.GetImageTime().has_value()
        && !detector_settings.GetCountTime().has_value())
-        return dataset.GetImageTime().value() - detector.GetReadOutTime();
+        return std::chrono::duration_cast<std::chrono::nanoseconds>(dataset.GetImageTime().value())
+                - detector.GetReadOutTime();

-    return detector_settings.GetCountTime()
-            .value_or(detector_settings.GetFrameTime() - detector.GetReadOutTime());
+    if (detector_settings.GetCountTime().has_value())
+        return detector_settings.GetCountTime().value();
+
+    return std::chrono::duration_cast<std::chrono::nanoseconds>(detector_settings.GetFrameTime())
+            - detector.GetReadOutTime();
 }

 bool DiffractionExperiment::GetFrameCountTimeAuto() const {
    return !detector_settings.GetCountTime().has_value();
 }

-std::chrono::microseconds DiffractionExperiment::GetImageCountTime() const {
+std::chrono::nanoseconds DiffractionExperiment::GetImageCountTime() const {
    return GetFrameCountTime() * GetSummation();
 }

@@ -1252,7 +1256,7 @@ DiffractionExperiment &DiffractionExperiment::ImportDetectorSettings(const Detec
        if (!input.GetCountTime().has_value()) {
            // implicit count time
            check_max("Frame time [us]", input.GetFrameTime().count(),
-                MAX_COUNT_TIME_JUNGFRAU_IN_US + detector.GetReadOutTime().count());
+                MAX_COUNT_TIME_JUNGFRAU_IN_US + std::chrono::duration_cast<std::chrono::microseconds>(detector.GetReadOutTime()).count());
        } else {
            // explicit count time
            check_max("Count time [us]", input.GetCountTime().value().count(),