mx/Jungfraujoch
2
1
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 67 Wiki Activity

Use constexpr based definitions instead of macros

Browse Source
This commit is contained in:
leonarski_f
2026-04-28 14:20:58 +02:00
parent e3447b13e6
commit beb4f316e5
10 changed files with 49 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/DetectorSetup.cpp
+4 -4
View File
@@ -47,7 +47,7 @@ DetectorSetup::DetectorSetup(std::shared_ptr<DetectorGeometry> in_geometry,
detector_type(in_detector_type),
read_out_time(0),
min_frame_time(std::chrono::milliseconds(1)),
min_count_time(std::chrono::microseconds(MIN_COUNT_TIME_IN_US)) {
min_count_time(std::chrono::duration_cast<std::chrono::microseconds>(MIN_COUNT_TIME)) {
if (description.empty())
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
@@ -279,11 +279,11 @@ std::chrono::nanoseconds DetectorSetup::GetReadOutTime() const {
std::chrono::microseconds DetectorSetup::GetMinFrameTime() const {
switch (GetDetectorType()) {
case DetectorType::EIGER:
return std::chrono::microseconds(MIN_FRAME_TIME_EIGER_IN_US);
return std::chrono::duration_cast<std::chrono::microseconds>(MIN_FRAME_TIME_EIGER);
case DetectorType::JUNGFRAU:
if (GetUDPInterfaceCount() == 1)
return std::chrono::microseconds(MIN_FRAME_TIME_JUNGFRAU_HALF_SPEED_IN_US);
return std::chrono::microseconds(MIN_FRAME_TIME_JUNGFRAU_FULL_SPEED_IN_US);
return std::chrono::duration_cast<std::chrono::microseconds>(MIN_FRAME_TIME_JUNGFRAU_HALF_SPEED);
return std::chrono::duration_cast<std::chrono::microseconds>(MIN_FRAME_TIME_JUNGFRAU_FULL_SPEED);
case DetectorType::DECTRIS:
return min_frame_time;
default: