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

Version 1.0.0-rc.23

Browse Source
This commit is contained in:
leonarski_f
2024-10-23 19:03:09 +02:00
parent c0fd38880c
commit 4e57c3cda4
153 changed files with 198 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/DiffractionExperiment.cpp
+4 -15
View File
@@ -25,8 +25,6 @@ DiffractionExperiment::DiffractionExperiment(const DetectorSetup& det_setup)
ndatastreams = 1;
frame_time_pedestalG1G2 = std::chrono::microseconds(FRAME_TIME_PEDE_G1G2_IN_US);
series_id = 0;
mode = DetectorMode::Conversion;
@@ -79,12 +77,6 @@ DiffractionExperiment &DiffractionExperiment::FrameTime(std::chrono::microsecond
return *this;
}
DiffractionExperiment &DiffractionExperiment::PedestalG1G2FrameTime(std::chrono::microseconds input) {
check_min("Pedestal G1G2 frame time (us) ", input.count(), MIN_FRAME_TIME_FULL_SPEED_IN_US);
frame_time_pedestalG1G2 = input;
return *this;
}
DiffractionExperiment &DiffractionExperiment::PedestalG0Frames(int64_t input) {
detector_settings.PedestalG0Frames(input);
return *this;
@@ -223,7 +215,7 @@ std::chrono::microseconds DiffractionExperiment::GetFrameTime() const {
switch (GetDetectorMode()) {
case DetectorMode::PedestalG1:
case DetectorMode::PedestalG2:
return frame_time_pedestalG1G2;
return detector_settings.GetFrameTimePedestalG1G1();
default:
return detector_settings.GetFrameTime();
}
@@ -240,7 +232,7 @@ std::chrono::microseconds DiffractionExperiment::GetDetectorPeriod() const {
switch (GetDetectorMode()) {
case DetectorMode::PedestalG1:
case DetectorMode::PedestalG2:
return frame_time_pedestalG1G2;
return detector_settings.GetFrameTimePedestalG1G1();
default:
return std::chrono::microseconds(MIN_FRAME_TIME_FULL_SPEED_IN_US) * GetStorageCellNumber();
}
@@ -250,7 +242,7 @@ std::chrono::microseconds DiffractionExperiment::GetImageTime() const {
switch (GetDetectorMode()) {
case DetectorMode::PedestalG1:
case DetectorMode::PedestalG2:
return frame_time_pedestalG1G2;
return detector_settings.GetFrameTimePedestalG1G1();
default:
return GetFrameTime() * GetSummation();
}
@@ -283,10 +275,7 @@ int64_t DiffractionExperiment::GetFrameNumPerTrigger() const {
}
std::chrono::microseconds DiffractionExperiment::GetFrameCountTime() const {
if (detector_settings.GetCountTime().has_value())
return detector_settings.GetCountTime().value();
else
return GetFrameTime() - std::chrono::microseconds(READOUT_TIME_IN_US);
return detector_settings.GetFrameCountTime();
}
std::chrono::microseconds DiffractionExperiment::GetImageCountTime() const {