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
@@ -421,12 +421,17 @@ void JFJochHDF5Reader::ReadFile(const std::string& filename) {
        detector.SaturationLimit(master_file->GetInt("/entry/instrument/detector/saturation_value"));
        detector.MinFrameTime(std::chrono::microseconds(0));
        detector.MinCountTime(std::chrono::microseconds(0));
-        detector.ReadOutTime(std::chrono::microseconds (0));
+        detector.ReadOutTime(std::chrono::nanoseconds (0));
        dataset->experiment.Detector(detector);

        dataset->experiment.FrameTime(
-                std::chrono::microseconds(std::lround(master_file->GetFloat("/entry/instrument/detector/frame_time") * 1e6)),
-                std::chrono::microseconds(std::lround(master_file->GetFloat("/entry/instrument/detector/count_time") * 1e6)));
+            std::chrono::duration_cast<std::chrono::microseconds>(
+                std::chrono::duration<float>(
+                    master_file->GetFloat("/entry/instrument/detector/frame_time"))),
+            std::chrono::duration_cast<std::chrono::microseconds>(
+                std::chrono::duration<float>(
+                    master_file->GetFloat("/entry/instrument/detector/count_time")))
+        );

        if (master_file->Exists("/entry/instrument/detector/calibration")) {
            dataset->calibration_data = master_file->FindLeafs("/entry/instrument/detector/calibration");