From 3c891495db312008207e1aceb6177b855c307fa9 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Mon, 20 Jan 2020 11:32:02 +0100
Subject: [PATCH 1/2] mythen3: bug fix detector type

---
 .../bin/mythen3DetectorServer_developer       | Bin 158944 -> 158944 bytes
 .../slsDetectorFunctionList.c                 |   2 +-
 slsSupportLib/include/versionAPI.h            |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
index bf2226b28ae8b6902a79de64ee3dadf85f952ff0..b389ffb2592527735066e8853dfcf9fd35360826 100755
GIT binary patch
delta 42
vcmaEGlk>q%&JB`sj2@Gv<jldO`sPZx=ekS*Cz_Ld+LL@3w<q~9)hPe~QW6f<

delta 42
vcmaEGlk>q%&JB`sjINWV<jldO`sPZx=ekT6n3|J(+LL@3w<q~9)hPe~P7n@?

diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
index e2f44656e..024418968 100644
--- a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
@@ -1067,7 +1067,7 @@ int checkDetectorType() {
         return -1;		
 	}
 	int type = atoi(buffer);
-	if (type > TYPE_TOLERANCE) {
+	if (type > TYPE_NO_MODULE_STARTING_VAL) {
         FILE_LOG(logERROR, ("No Module attached! Expected %d for Mythen, got %d\n", TYPE_MYTHEN3_MODULE_VAL, type));
         return -2;	
 	}
diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h
index cef067710..a6c4a679c 100644
--- a/slsSupportLib/include/versionAPI.h
+++ b/slsSupportLib/include/versionAPI.h
@@ -9,4 +9,4 @@
 #define APIJUNGFRAU 0x191127
 #define APICTB 0x191210
 #define APIEIGER 0x200110
-#define APIMYTHEN3 0x200114
+#define APIMYTHEN3 0x200120

From 65d95480bd57f5c5970e3d4867f959c9c7fce4d2 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Mon, 20 Jan 2020 13:50:50 +0100
Subject: [PATCH 2/2] mythen3 bug fix: rxr needs to update dr

---
 slsDetectorSoftware/src/slsDetector.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/slsDetectorSoftware/src/slsDetector.cpp b/slsDetectorSoftware/src/slsDetector.cpp
index 48638c401..4799c7d12 100755
--- a/slsDetectorSoftware/src/slsDetector.cpp
+++ b/slsDetectorSoftware/src/slsDetector.cpp
@@ -1793,6 +1793,7 @@ std::string slsDetector::setReceiverHostname(const std::string &receiverIP) {
 
         case MYTHEN3:
             sendNumberofCounterstoReceiver(getCounterMask());
+            setDynamicRange(shm()->dynamicRange);
             break;
 
         default: