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

DiffractionExperiment: Fix error in pedestal G1/G2 count time

Browse Source
This commit is contained in:
leonarski_f
2025-02-13 21:11:51 +01:00
parent 1737f410d5
commit 2fec68d3b9
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/DiffractionExperiment.cpp
+4 -4
View File
@@ -223,7 +223,7 @@ std::chrono::microseconds DiffractionExperiment::GetFrameTime() const {
switch (GetDetectorMode()) {
case DetectorMode::PedestalG1:
case DetectorMode::PedestalG2:
return detector_settings.GetFrameTimePedestalG1G1();
return detector_settings.GetFrameTimePedestalG1G2();
default:
return detector_settings.GetFrameTime();
}
@@ -240,7 +240,7 @@ std::chrono::microseconds DiffractionExperiment::GetDetectorPeriod() const {
switch (GetDetectorMode()) {
case DetectorMode::PedestalG1:
case DetectorMode::PedestalG2:
return detector_settings.GetFrameTimePedestalG1G1();
return detector_settings.GetFrameTimePedestalG1G2();
default:
return std::chrono::microseconds(MIN_FRAME_TIME_JUNGFRAU_FULL_SPEED_IN_US) * GetStorageCellNumber();
}
@@ -250,7 +250,7 @@ std::chrono::microseconds DiffractionExperiment::GetImageTime() const {
switch (GetDetectorMode()) {
case DetectorMode::PedestalG1:
case DetectorMode::PedestalG2:
return detector_settings.GetFrameTimePedestalG1G1();
return detector_settings.GetFrameTimePedestalG1G2();
default:
return GetFrameTime() * GetSummation();
}
@@ -289,7 +289,7 @@ std::chrono::microseconds DiffractionExperiment::GetFrameCountTime() const {
return dataset.GetImageTime().value() - detector.GetReadOutTime();
return detector_settings.GetCountTime()
.value_or(GetFrameTime() - detector.GetReadOutTime());
.value_or(detector_settings.GetFrameTime() - detector.GetReadOutTime());
}
std::chrono::microseconds DiffractionExperiment::GetImageCountTime() const {