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

formatting

Browse Source
This commit is contained in:
maliakal_d 2024-10-11 15:44:59 +02:00
parent c679135138
commit 270ee48148
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -1073,7 +1073,7 @@ int setNextFrameNumber(uint64_t value) {
LOG(logINFO, ("Setting next frame number: %lu\n", value));
#ifdef VIRTUAL
setU64BitReg(value, FRAME_NUMBER_LSB_REG, FRAME_NUMBER_MSB_REG);
#else
#else
// decrement by 1 for firmware
setU64BitReg(value - 1, FRAME_NUMBER_LSB_REG, FRAME_NUMBER_MSB_REG);
#endif

12
slsDetectorSoftware/tests/Caller/test-Caller.cpp
View File

@ -2433,8 +2433,8 @@ TEST_CASE("nextframenumber", "[.cmdcall]") {
det.getPeriod().tsquash("inconsistent period in test");
auto prev_burstmode =
det.getBurstMode().tsquash("inconsistent burst mode in test");
auto prev_bursts = det.getNumberOfBursts().tsquash(
"inconsistent #bursts in test");
auto prev_bursts =
det.getNumberOfBursts().tsquash("inconsistent #bursts in test");
auto prev_burstperiod = det.getBurstPeriod().tsquash(
"inconsistent burst period in test");
@ -2448,8 +2448,8 @@ TEST_CASE("nextframenumber", "[.cmdcall]") {
det.startDetector();
std::this_thread::sleep_for(std::chrono::seconds(2));
auto currentfnum =
det.getNextFrameNumber().tsquash("inconsistent frame nr in test");
auto currentfnum = det.getNextFrameNumber().tsquash(
"inconsistent frame nr in test");
REQUIRE(currentfnum == 2);
det.setTimingMode(prev_timing);
@ -2474,8 +2474,8 @@ TEST_CASE("nextframenumber", "[.cmdcall]") {
det.setPeriod(std::chrono::milliseconds(1));
det.startDetector();
std::this_thread::sleep_for(std::chrono::seconds(2));
auto currentfnum =
det.getNextFrameNumber().tsquash("inconsistent frame nr in test");
auto currentfnum = det.getNextFrameNumber().tsquash(
"inconsistent frame nr in test");
REQUIRE(currentfnum == 2);
if (det_type == defs::EIGER) {
auto prev_tengiga =