From 0ac28c02081e6350952438747da9d5317d110622 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 4 Feb 2020 15:27:18 +0100 Subject: [PATCH] gotthard2: burst mode check for #frames --- .../bin/gotthard2DetectorServer_developer | Bin 174348 -> 174348 bytes .../slsDetectorFunctionList.c | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index b6256c360f4e0af6ae50e42cf21e3b5ec8c8fcf1..8068bc35f6f2e30dc23bc46bf622f21f8cb09f30 100755 GIT binary patch delta 49 zcmeCV#MN_&YeSA1quk_Nvt&lO%@@sPGlDo4-+^SRWjv!?^HIz8qn3=@k6JRh=K}!8 CP!Zq& delta 49 zcmeCV#MN_&YeSA1quS(Lvt&lK%@@sPGlDo4-+^SRWjv!=^HIz8qn3=@k6JRh=K}!C Ca1sar diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c index 791d2bcd5..5906b1672 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c @@ -727,7 +727,7 @@ void setNumFrames(int64_t val) { if (val > 0) { FILE_LOG(logINFO, ("Setting number of frames %lld [local]\n", (long long int)val)); // continuous mode - if (burstMode != BURST_OFF) { + if (burstMode == BURST_OFF) { setNumFramesCont(val); setNumFramesBurst(1); } else { @@ -738,7 +738,7 @@ void setNumFrames(int64_t val) { } int64_t getNumFrames() { - if (burstMode != BURST_OFF) { + if (burstMode == BURST_OFF) { return getNumFramesCont(); } else { return getNumFramesBurst(); @@ -763,7 +763,7 @@ int setExpTime(int64_t val) { } FILE_LOG(logINFO, ("Setting exptime %lld ns [local]\n", (long long int)val)); // continuous mode - if (burstMode != BURST_OFF) { + if (burstMode == BURST_OFF) { return setExptimeCont(val); } else { 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)); // continuous mode - if (burstMode != BURST_OFF) { + if (burstMode == BURST_OFF) { setPeriodBurst(0); return setPeriodCont(val); } else { @@ -791,7 +791,7 @@ int setPeriod(int64_t val) { } int64_t getPeriod() { - if (burstMode != BURST_OFF) { + if (burstMode == BURST_OFF) { return getPeriodCont(); } else { return getPeriodBurst();