From 05c04008aec594bd42ff3bbeac9aef961405169e Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <33750417+thattil@users.noreply.github.com>
Date: Thu, 9 Sep 2021 12:12:17 +0200
Subject: [PATCH 1/2] Update slsDetectorServer_defs.h

added note about detid difference
---
 slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
index c0a27c897..125891d14 100644
--- a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
@@ -2,6 +2,8 @@
 #include "sls/sls_detector_defs.h"
 
 #define REQUIRED_FIRMWARE_VERSION (27)
+// virtual ones renamed for consistency
+// real ones keep previous name for compatibility (already in production)
 #ifdef VIRTUAL
 #define ID_FILE "detid_eiger.txt"
 #else

From cb42fdfe3d79b58a2770e7963d4a06943dce0868 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Thu, 9 Sep 2021 17:57:52 +0200
Subject: [PATCH 2/2] binaries in after merge

---
 .../bin/ctbDetectorServer_developer           | Bin 275960 -> 275960 bytes
 .../bin/gotthardDetectorServer_developer      | Bin 226876 -> 226876 bytes
 .../bin/jungfrauDetectorServer_developer      | Bin 260808 -> 260808 bytes
 .../bin/moenchDetectorServer_developer        | Bin 264480 -> 264480 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
index 6d1414d4ab20dc56598b37bfc8a98f3128df1da1..a46b628986e67a0e64c2eff92d33d4021695859b 100755
GIT binary patch
delta 33
pcmezITHwcPfeD(-R(c<%2WB!$G`h69Ft)ldwYo5Gbz#|J3IOt&408Yg

delta 33
pcmezITHwcPfeD(-mKQpw2WB!$G`h69Ft)ldwYo5Gbz#|J3IO;v46OhF

diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
index c17241c2fb00c149af717ff28acfaa9133f65f65..94c0a472118600f2f693e411a68aa57edda92396 100755
GIT binary patch
delta 30
mcmdn<hIh{!-U*t_R(c<&8y;tpXmn|HVQh6_+UmmmqZ9zf1`F%}

delta 30
mcmdn<hIh{!-U*t_mKVCF8y;tpXmn|HVQh6_+UmmmqZ9zj^b95d

diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
index 35efc0ad70b2d0bacbc17ab9b3d2e1308402f075..3b7140044cacb3a1394e64a17d5307d28ade2547 100755
GIT binary patch
delta 30
mcmX@{mH)(7{t24QR(fBjA2er{Xmn|HVQh6_+UmmG@(TdVlMFBb

delta 30
mcmX@{mH)(7{t24QmKS=aA2er{Xmn|HVQh6_+UmmG@(TdaTMTFb

diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
index 7429e145bb4472927bc228b97a4495e41e5c723a..6859be9912dcb6c9cfd4c0cccf059ea612a905a0 100755
GIT binary patch
delta 33
pcmZ25NnpVwfeD(-R(jv33pz7PG`h69Ft)ldwYo5Gbz!-~0RX_L3atPD

delta 33
pcmZ25NnpVwfeD(-mKXY_3pz7PG`h69Ft)ldwYo5Gbz!-~0RYAr3grL*