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

formatting

Browse Source
This commit is contained in:
maliakal_d 2024-10-02 16:45:10 +02:00
parent 5e024153bc
commit d2bfb91a16
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -1089,7 +1089,7 @@ int getNextFrameNumber(uint64_t *value) {
// no acquisition has occured // no acquisition has occured
if ((nextFrameNumber - acqStartFrameNumber) == 0) { if ((nextFrameNumber - acqStartFrameNumber) == 0) {
LOG(logDEBUG, ("No acquisition has occured nf:%lld, acqStart:%lld\n", LOG(logDEBUG, ("No acquisition has occured nf:%lld, acqStart:%lld\n",
nextFrameNumber, acqStartFrameNumber)); nextFrameNumber, acqStartFrameNumber));
*value = nextFrameNumber; *value = nextFrameNumber;
return OK; return OK;
} }
@ -1099,8 +1099,8 @@ int getNextFrameNumber(uint64_t *value) {
int64_t repeatsLeft = getNumTriggersLeft(); int64_t repeatsLeft = getNumTriggersLeft();
int64_t burstsLeft = getNumBurstsLeft(); int64_t burstsLeft = getNumBurstsLeft();
int64_t numFrames = getNumFrames(); int64_t numFrames = getNumFrames();
LOG(logDEBUG, ("fl:%lld rl:%lld bl:%lld nf:%ld\n", framesLeft, LOG(logDEBUG, ("fl:%lld rl:%lld bl:%lld nf:%ld\n", framesLeft, repeatsLeft,
repeatsLeft, burstsLeft, numFrames)); burstsLeft, numFrames));
// burst mode // burst mode
if (burstMode == BURST_INTERNAL || burstMode == BURST_EXTERNAL) { if (burstMode == BURST_INTERNAL || burstMode == BURST_EXTERNAL) {
@ -1127,7 +1127,7 @@ int getNextFrameNumber(uint64_t *value) {
} }
LOG(logDEBUG, ("update fl:%lld rl:%lld bl:%lld nf:%ld\n", framesLeft, LOG(logDEBUG, ("update fl:%lld rl:%lld bl:%lld nf:%ld\n", framesLeft,
repeatsLeft, burstsLeft, numFrames)); repeatsLeft, burstsLeft, numFrames));
*value = nextFrameNumber; *value = nextFrameNumber;
// if not last frame // if not last frame
if (framesLeft != 0 || repeatsLeft != 0) { if (framesLeft != 0 || repeatsLeft != 0) {
@ -1401,7 +1401,7 @@ int64_t getNumFramesLeft() {
burstMode == CONTINUOUS_EXTERNAL) && burstMode == CONTINUOUS_EXTERNAL) &&
getTiming() == AUTO_TIMING) { getTiming() == AUTO_TIMING) {
LOG(logDEBUG, ("getFramesLeft: %lld\n", LOG(logDEBUG, ("getFramesLeft: %lld\n",
get64BitReg(GET_FRAMES_LSB_REG, GET_FRAMES_MSB_REG))); get64BitReg(GET_FRAMES_LSB_REG, GET_FRAMES_MSB_REG)));
return (get64BitReg(GET_FRAMES_LSB_REG, GET_FRAMES_MSB_REG) + 1); return (get64BitReg(GET_FRAMES_LSB_REG, GET_FRAMES_MSB_REG) + 1);
} }
return -1; return -1;