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

gotthard2: burst mode check for #frames

Browse Source
This commit is contained in:
maliakal_d 2020-02-04 15:27:18 +01:00
parent 37c3048c2a
commit 0ac28c0208
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

10
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -727,7 +727,7 @@ void setNumFrames(int64_t val) {
if (val > 0) { if (val > 0) {
FILE_LOG(logINFO, ("Setting number of frames %lld [local]\n", (long long int)val)); FILE_LOG(logINFO, ("Setting number of frames %lld [local]\n", (long long int)val));
// continuous mode // continuous mode
if (burstMode != BURST_OFF) { if (burstMode == BURST_OFF) {
setNumFramesCont(val); setNumFramesCont(val);
setNumFramesBurst(1); setNumFramesBurst(1);
} else { } else {
@ -738,7 +738,7 @@ void setNumFrames(int64_t val) {
} }
int64_t getNumFrames() { int64_t getNumFrames() {
if (burstMode != BURST_OFF) { if (burstMode == BURST_OFF) {
return getNumFramesCont(); return getNumFramesCont();
} else { } else {
return getNumFramesBurst(); return getNumFramesBurst();
@ -763,7 +763,7 @@ int setExpTime(int64_t val) {
} }
FILE_LOG(logINFO, ("Setting exptime %lld ns [local]\n", (long long int)val)); FILE_LOG(logINFO, ("Setting exptime %lld ns [local]\n", (long long int)val));
// continuous mode // continuous mode
if (burstMode != BURST_OFF) { if (burstMode == BURST_OFF) {
return setExptimeCont(val); return setExptimeCont(val);
} else { } else {
return setExptimeBurst(val); return setExptimeBurst(val);
@ -781,7 +781,7 @@ int setPeriod(int64_t val) {
} }
FILE_LOG(logINFO, ("Setting period %lld ns [local]\n", (long long int)val)); FILE_LOG(logINFO, ("Setting period %lld ns [local]\n", (long long int)val));
// continuous mode // continuous mode
if (burstMode != BURST_OFF) { if (burstMode == BURST_OFF) {
setPeriodBurst(0); setPeriodBurst(0);
return setPeriodCont(val); return setPeriodCont(val);
} else { } else {
@ -791,7 +791,7 @@ int setPeriod(int64_t val) {
} }
int64_t getPeriod() { int64_t getPeriod() {
if (burstMode != BURST_OFF) { if (burstMode == BURST_OFF) {
return getPeriodCont(); return getPeriodCont();
} else { } else {
return getPeriodBurst(); return getPeriodBurst();