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

version 1.0.0-rc.24

Browse Source
This commit is contained in:
leonarski_f
2024-11-17 14:55:09 +01:00
parent aeeae33ad9
commit adc13ff33e
361 changed files with 12510 additions and 3311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
detector_control/DetectorWrapper.cpp
+4 -4
View File
@@ -108,7 +108,7 @@ void DetectorWrapper::Initialize(const DiffractionExperiment& experiment,
throw JFJochException(JFJochExceptionCategory::Detector,
"Discrepancy in module number between DAQ and detector");
}
det.setDynamicRange(16);
det.setDynamicRange(experiment.GetEigerBitDepth());
det.setTenGiga(true);
auto trim_files = experiment.GetDetectorSetup().GetTrimFileNames();
@@ -151,8 +151,8 @@ void DetectorWrapper::Start(const DiffractionExperiment& experiment) {
throw JFJochException(JFJochExceptionCategory::Detector,
"Discrepancy in module number between DAQ and detector");
auto energy_threshold = experiment.GetEIGERThreshold_keV();
if (!experiment.GetEIGERThreshold_keV().has_value()) {
auto energy_threshold = experiment.GetEigerThreshold_keV();
if (!experiment.GetEigerThreshold_keV().has_value()) {
int expected_threshold = std::lround(experiment.GetPhotonEnergy_keV() * 1000.0 / 2.0);
if (det.getThresholdEnergy().squash(0) != expected_threshold)
det.setThresholdEnergy(expected_threshold);
@@ -391,7 +391,7 @@ void DetectorWrapper::Configure(const DiffractionExperiment &experiment) {
}
det.setDelayAfterTrigger(experiment.GetDetectorDelay());
} else if (det_type == DetectorType::EIGER) {
auto energy_threshold = experiment.GetEIGERThreshold_keV();
auto energy_threshold = experiment.GetEigerThreshold_keV();
if (energy_threshold.has_value())
det.setThresholdEnergy(std::lround(energy_threshold.value() * 1000.0));
}