Release of 5.1.0 (#237)

* Setting pattern from memory (#218)

* ToString accepts c-style arrays

* fixed patwait time bug in validation

* Introduced pattern class

* compile for servers too

* Python binding for Pattern

* added scanParameters in Python

* slsReceiver: avoid potential memory leak around Implementation::generalData

* additional constructors for scanPrameters in python

* bugfix: avoid potentital memory leak in receiver if called outside constructor context

* added scanParameters in Python

* additional constructors for scanPrameters in python

* M3defaultpattern (#227)

* default pattern for m3 and moench including Python bindings

* M3settings (#228)

* some changes to compile on RH7 and in the server to load the default chip status register at startup

* Updated mythen3DeectorServer_developer executable with correct initialization at startup

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
Co-authored-by: Anna Bergamaschi <anna.bergamaschi@psi.ch>

* Pattern.h as a public header files (#229)

* fixed buffer overflow but caused by using global instead of local enum

* replacing out of range trimbits with edge values

* replacing dac values that are out of range after interpolation

* updated pybind11 to 2.6.2

* Mythen3 improved synchronization (#231)

Disabling scans for multi module Mythen3, since there is no feedback of the detectors being ready
startDetector first starts the slaves then the master
acquire firs calls startDetector for the slaves then acquire on the master
getMaster to read back from hardware which one is master

* New server for JF to go with the new FW (#232)

* Modified Jungfrau speed settings for HW1.0 - FW fix version 1.1.1, compilation date 210218

* Corrected bug. DBIT clk phase is implemented in both HW version 1.0 and 2.0. Previous version did not update the DBIT phase shift on the configuration of a speed.

* fix for m3 scan with single module

* m3 fw version

* m3 server

* bugfix for bottom when setting quad

* new strategy for finding zmq based on cppzmq



Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
Co-authored-by: Dhanya Thattil <33750417+thattil@users.noreply.github.com>
Co-authored-by: Alejandro Homs Puron <ahoms@esrf.fr>
Co-authored-by: Anna Bergamaschi <anna.bergamaschi@psi.ch>
Co-authored-by: Xiaoqiang Wang <xiaoqiangwang@gmail.com>
Co-authored-by: lopez_c <carlos.lopez-cuenca@psi.ch>

CMakeLists.txt

@@ -157,10 +157,20 @@ set(CMAKE_INSTALL_RPATH $ORIGIN)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 
 
-
+set(ZeroMQ_HINT "" CACHE STRING "Hint where ZeroMQ could be found")
-#From: https://github.com/zeromq/cppzmq/
+#Adapted from: https://github.com/zeromq/cppzmq/
 if (NOT TARGET libzmq)
-  find_package(ZeroMQ 4 QUIET)
+    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()
+    
+
 
   # libzmq autotools install: fallback to pkg-config
   if(NOT ZeroMQ_FOUND)

RELEASE.txt

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