detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-21 00:58:01 +02:00
Code Issues Actions Packages Releases Activity

fixed ctb tests, need to fix in develoepr (if digital modfe not enabled, should not take into accoutn dbitlist or dbitoffset or dbitreorder

Browse Source
This commit is contained in:
maliakal_d
2025-05-01 15:45:14 +02:00
parent 5073769403
commit 62a5fda33f
10 changed files with 188 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
slsDetectorSoftware/tests/Caller/test-Caller-global.cpp
View File

@ -137,22 +137,11 @@ void test_acquire_with_receiver(Caller &caller, std::chrono::seconds timeout) {
}
testCommonDetAcquireInfo get_common_acquire_config_state(const Detector &det) {
testCommonDetAcquireInfo det_config_info{
return testCommonDetAcquireInfo{
det.getTimingMode().tsquash("Inconsistent timing mode"),
det.getNumberOfFrames().tsquash("Inconsistent number of frames"),
det.getNumberOfTriggers().tsquash("Inconsistent number of triggers"),
det.getPeriod().tsquash("Inconsistent period"),
{}};
auto det_type =
det.getDetectorType().tsquash("Inconsistent detector types to test");
if (det_type != defs::MYTHEN3) {
det_config_info.exptime[0] =
det.getExptime().tsquash("inconsistent exptime to test");
} else {
det_config_info.exptime =
det.getExptimeForAllGates().tsquash("inconsistent exptime to test");
}
return det_config_info;
det.getPeriod().tsquash("Inconsistent period")};
}
void set_common_acquire_config_state(
@ -161,15 +150,6 @@ void set_common_acquire_config_state(
det.setNumberOfFrames(det_config_info.num_frames_to_acquire);
det.setNumberOfTriggers(det_config_info.num_triggers);
det.setPeriod(det_config_info.period);
auto det_type =
det.getDetectorType().tsquash("Inconsistent detector types to test");
if (det_type != defs::MYTHEN3) {
det.setExptime(det_config_info.exptime[0]);
} else {
for (int iGate = 0; iGate < 3; ++iGate) {
det.setExptime(iGate, det_config_info.exptime[iGate]);
}
}
}
} // namespace sls