From 9e8a874e395020b88e94619e375b7dd6c04fc98c Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 27 Nov 2019 11:12:31 +0100 Subject: [PATCH 1/2] rxr bug fix: update shm when updating rxr --- slsDetectorSoftware/src/slsDetector.cpp | 3 +++ slsSupportLib/include/versionAPI.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/slsDetectorSoftware/src/slsDetector.cpp b/slsDetectorSoftware/src/slsDetector.cpp index 41cdbd032..3b1a971e3 100755 --- a/slsDetectorSoftware/src/slsDetector.cpp +++ b/slsDetectorSoftware/src/slsDetector.cpp @@ -2112,6 +2112,7 @@ void slsDetector::setReceiverStreamingIP(const sls::IpAddr ip) { FILE_LOG(logDEBUG1) << "Sending receiver streaming IP to receiver: " << ip; sendToReceiver(F_RECEIVER_STREAMING_SRC_IP, ip, nullptr); + shm()->rxZmqip = ip; } else { shm()->rxZmqip = ip; } @@ -2671,6 +2672,7 @@ void slsDetector::setReceiverDbitList(std::vector list) { sls::FixedCapacityContainer arg = list; if (shm()->useReceiverFlag) { sendToReceiver(F_SET_RECEIVER_DBIT_LIST, arg, nullptr); + shm()->rxDbitList = list; } else { shm()->rxDbitList = list; } @@ -2693,6 +2695,7 @@ int slsDetector::setReceiverDbitOffset(int value) { if (shm()->useReceiverFlag) { sendToReceiver(F_RECEIVER_DBIT_OFFSET, value, retval); FILE_LOG(logDEBUG1) << "Receiver digital bit offset: " << retval; + shm()->rxDbitOffset = value; } else { shm()->rxDbitOffset = value; } diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 59987f1b2..d204efc10 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -7,6 +7,6 @@ #define APIGOTTHARD 0x191111 #define APIJUNGFRAU 0x191111 #define APIEIGER 0x191111 -#define APICTB 0x191121 +#define APICTB 0x191126 #define APIMYTHEN3 0x191125 #define APIGOTTHARD2 0x191125 From f299a34e59365f87a7a12e86c18480e344f25091 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 27 Nov 2019 11:31:30 +0100 Subject: [PATCH 2/2] ctb server binary update --- .../bin/ctbDetectorServer_developer | Bin 187088 -> 187088 bytes slsSupportLib/include/versionAPI.h | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 0a67d1f5e218522abb3e8c3c44045d08be18370b..cce5174905d2457eb0a0b27ffc4fcd0da8170c8b 100755 GIT binary patch delta 52 zcmV-40L%Z-wF}U-3y>)T-cWUy5laFXu|%K=1Sb&zV3W`Z6ago*{Rx{u0Vji*N{5+B K0k@e-0ymKM=n`N6 delta 52 zcmV-40L%Z-wF}U-3y>)T)|wcX5laFXu|%K=1R)UtV3W`Z6agW#{Rx{u0U?8#N{5+B K0k@e-0ymKHNfI*v diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index d204efc10..142af1c0d 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -7,6 +7,6 @@ #define APIGOTTHARD 0x191111 #define APIJUNGFRAU 0x191111 #define APIEIGER 0x191111 -#define APICTB 0x191126 #define APIMYTHEN3 0x191125 #define APIGOTTHARD2 0x191125 +#define APICTB 0x191127