eiger server

* new strategy for finding zmq based on cppzmq

CMakeLists.txt

@@ -157,20 +157,10 @@ set(CMAKE_INSTALL_RPATH $ORIGIN)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 
 
-set(ZeroMQ_HINT "" CACHE STRING "Hint where ZeroMQ could be found")
-#Adapted from: https://github.com/zeromq/cppzmq/
-if (NOT TARGET libzmq)
-    if(ZeroMQ_HINT)
-        message(STATUS "Looking for ZeroMQ in: ${ZeroMQ_HINT}")
-        find_package(ZeroMQ 4 
-            NO_DEFAULT_PATH
-            HINTS ${ZeroMQ_DIR}
-        )
-    else()
-        find_package(ZeroMQ 4)
-    endif()
-    
 
+#From: https://github.com/zeromq/cppzmq/
+if (NOT TARGET libzmq)
+  find_package(ZeroMQ 4 QUIET)
 
   # libzmq autotools install: fallback to pkg-config
   if(NOT ZeroMQ_FOUND)

RELEASE.txt

@@ -1,13 +1,14 @@
-SLS Detector Package 5.1.0 released on 22.03.2020 (Minor Release)
+SLS Detector Package 5.1.0 released on xx.xx.2020 (Minor Release)
 ===================================================================
 
-This document describes the differences between 5.1.0 and 5.0.1 releases.   
+This document describes the differences between 5.1.0 and 5.x.x releases.   
 
 
 
     CONTENTS
     --------
-    1.  New Features
+    1.  Topics Concerning
+    2.  New Features
     2.  Resolved Issues
     3.  Known Issues
     4.  Firmware Requirements
@@ -15,14 +16,22 @@ This document describes the differences between 5.1.0 and 5.0.1 releases.
 
 
 
+1. Topics Concerning
+====================
 
-1. New Features
+    - potentital memory leak in receiver
+    - scanParameters in Python
+    - cmk.sh refactored
+    - m3 settings and threshold
+
+
+2. New Features
 ===============
 
     Client
     ------
 
-    1. Added settings and threshold features for Mythen3.
+    1. Aded settings and threshold features for Mythen3.
     2. Internal modification of acquire for Mythen3.
     3. Added getMaster for Mythen3
     4. Mythen3, API function to set pattern from memory
@@ -34,7 +43,7 @@ This document describes the differences between 5.1.0 and 5.0.1 releases.
     1. Setting timing to auto, sets timing to trigger for slaves
     
 
-2. Resolved Issues
+3. Resolved Issues
 ==================
 
 
@@ -52,8 +61,6 @@ This document describes the differences between 5.1.0 and 5.0.1 releases.
 
     2.  cmk.sh refactored to have better option handling
 
-    3.  Fixed hardcoded path accidentally ending up in the exported CMake package
-
     Server
     --------
 
@@ -63,7 +70,7 @@ This document describes the differences between 5.1.0 and 5.0.1 releases.
 
 
 
-3. Firmware Requirements
+4. Firmware Requirements
 ========================
         
     Mythen3: 0x210201
@@ -74,14 +81,14 @@ This document describes the differences between 5.1.0 and 5.0.1 releases.
 
 
 
-4. Known Issues
+5. Known Issues
 ===============
 
     No updates from 5.0.0
 
 
 
-5. Download, Documentation & Support
+6. Download, Documentation & Support
 ====================================
 
     Download

python/scripts/compile_servers.py

@@ -50,12 +50,12 @@ args = parser.parse_args()
 
 servers = [
      "eigerDetectorServer",
-     "jungfrauDetectorServer",
+#     "jungfrauDetectorServer",
-      "mythen3DetectorServer",
+#      "mythen3DetectorServer",
-     "gotthard2DetectorServer",
+#     "gotthard2DetectorServer",
-     "gotthardDetectorServer",
+#     "gotthardDetectorServer",
-     "ctbDetectorServer",
+#     "ctbDetectorServer",
-     "moenchDetectorServer",
+#     "moenchDetectorServer",
 ]
 
 

slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h

@@ -47,7 +47,7 @@
 #define DEFAULT_HIGHGAIN_VRPREAMP (1300)
 #define DEFAULT_STANDARD_VRSHAPER (1280)
 #define DEFAULT_FAST_VRSHAPER     (1500)
-#define DEFAULT_HIGHGAIN_VRSHAPER (1100)
+#define DEFAULT_HIGHGAIN_VRSHAPER (900)
 
 #define DEFAULT_READOUT_C0 (10) //(100000000) // rdo_clk, 100 MHz
 #define DEFAULT_READOUT_C1 (10) //(100000000) // smp sample clk (x2), 100 MHz

slsSupportLib/include/sls/versionAPI.h

@@ -1,5 +1,5 @@
 /** API versions */
-#define GITBRANCH    "5.1.0"
+#define GITBRANCH    "5.1.0.rc2"
 #define APICTB 0x210225
 #define APIGOTTHARD 0x210225
 #define APIGOTTHARD2 0x210225