From d2d50a56dfff1871147a60b2091b0d5bcf51e189 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 1 Mar 2019 14:08:28 +0100 Subject: [PATCH] eiger server/client bug fix: readout flag of -1 --- slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c | 2 ++ slsDetectorSoftware/slsDetector/slsDetector.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c index 0c04298a2..50ae300e5 100755 --- a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c @@ -1187,6 +1187,7 @@ int set_module(int file_des) { case FORCESWITCHG1: case FORCESWITCHG2: #elif GOTTHARDD + case GET_SETTINGS: case DYNAMICGAIN: case HIGHGAIN: case LOWGAIN: @@ -1791,6 +1792,7 @@ int set_readout_flags(int file_des) { if ((arg == GET_READOUT_FLAGS) || (Server_VerifyLock() == OK)) { switch(arg) { + case GET_READOUT_FLAGS: case STORE_IN_RAM: case CONTINOUS_RO: case PARALLEL: diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index e5a5285cb..57f857330 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -2459,7 +2459,7 @@ std::string slsDetector::setReceiver(const std::string &receiverIP) { } if (thisDetector->myDetectorType == EIGER || thisDetector->myDetectorType == CHIPTESTBOARD || thisDetector->myDetectorType == MOENCH) { enableTenGigabitEthernet(thisDetector->tenGigaEnable); - setReadOutFlags(thisDetector->roFlags); + setReadOutFlags(GET_READOUT_FLAGS); } setReceiverSilentMode(thisDetector->receiver_silentMode); // data streaming