Merge pull request #1257 from slsdetectorgroup/dev/fix_more_tests
All checks were successful
Build on RHEL9 / build (push) Successful in 3m32s
Build on RHEL8 / build (push) Successful in 4m53s

fix tests
This commit is contained in:
2025-08-06 16:24:30 +02:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@@ -421,7 +421,7 @@ void Implementation::setPortROIs(const std::vector<defs::ROI> &args) {
continue; // valid continue; // valid
} }
if (it.xmin < 0 || it.xmax < 0 || it.xmin >= nx || it.xmax >= nx) { if (it.xmin < 0 || it.xmax < 0 || it.xmin >= nx || it.xmax >= nx) {
throw RuntimeError("Invalid ROIvx coordinates: " + ToString(it)); throw RuntimeError("Invalid ROI x coordinates: " + ToString(it));
} }
if (ny > 1 && if (ny > 1 &&
(it.ymin < 0 || it.ymax < 0 || it.ymin >= ny || it.ymax >= ny)) { (it.ymin < 0 || it.ymax < 0 || it.ymin >= ny || it.ymax >= ny)) {

View File

@@ -245,7 +245,7 @@ def loadBasicSettings(name, d, fp):
elif name == "mythen3": elif name == "mythen3":
d.setExptime(-1, timedelta(microseconds = 200)) d.setExptime(-1, timedelta(microseconds = 200))
d.dr = 16 d.dr = 16
d.counters = [0, 1] d.counters = [0, 1, 2]
elif name == "gotthard2": elif name == "gotthard2":
d.exptime = timedelta(microseconds = 200) d.exptime = timedelta(microseconds = 200)
d.burstmode = burstMode.CONTINUOUS_EXTERNAL d.burstmode = burstMode.CONTINUOUS_EXTERNAL