Merge branch 'main' into 8.0.0.rc

* if blocking and handling sync, only master gets blocking acq, slaves get non blocking as they are first and so dont get status or error caught when slaves dont get trigger (due to not connected etc) and acq returns with slaves still in waiting status. so check status of all in blocking acq

* for all dets with sync, ensure atleast one master when starting acq

* docs updated about sync

CMakeLists.txt

@@ -2,7 +2,7 @@
 # Copyright (C) 2021 Contributors to the SLS Detector Package
 cmake_minimum_required(VERSION 3.14)
 project(slsDetectorPackage)
-set(PROJECT_VERSION 7.0.0)
+set(PROJECT_VERSION 8.0.0)
 
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
 

RELEASE.txt

@@ -1,36 +1,264 @@
-SLS Detector Package Major Release 7.x.x released on xx.xx.2023
+SLS Detector Package Major Release 8.0.0 released on 13.11.2023
 ===============================================================
 
-This document describes the differences between v7.x.x and v7.0.2   
+This document describes the differences between v8.0.0 and v7.0.3
 
 
 
     CONTENTS
     --------
-    1           New, Changed or Resolved Features
+    1           Compilation Changes
-        1.1     Compilation
+    2           New or Changed Features
-        1.2     Callback
+        2.1         Breaking API
-        1.3     Python
+        2.2         Resolved or Changed Features
-        1.4     Client
+        2.3         New Features
-        1.5     Detector Server
+    3           On-board Detector Server Compatibility
-        1.6     Simulator
+    4           Firmware Requirements
-        1.7     Receiver
+    5           Kernel Requirements
-        1.8     Gui
+    6           Download, Documentation & Support
-    2           On-board Detector Server Compatibility
-    3           Firmware Requirements
-    4           Kernel Requirements
-    5           Download, Documentation & Support
 
 
 
 
-1 New, Changed or Resolved Features
+2 Compilation Changes
+=====================
+
+
+    *   Minimum CMake version changed from 3.12 to 3.14
+
+
+    *   Internal zmq lib
+        Building zmq from tar file in repo (libs/libzmq/libzmq-4.3.4.tar.gz), 
+        but added option (SLS_FETCH_ZMQ_FROM_GITHUB) to pull zmq version (v4.3.4) 
+        from github (https://github.com/zeromq/libzmq.git)
+
+
+    *   Internal pybind11 lib
+        Building pybind11 from tar file in repo (libs/pybind11/v2.11.0.tar.gz), 
+        but added option (SLS_FETCH_PYBIND11_FROM_GITHUB) to pull pybind11 version 
+        (v2.11.0) from github (https://github.com/pybind/pybind11)        
+
+
+
+2 New, Changed or Resolved Features
 =====================================
 
 
-- moench being made compatible with jungfrau 2.0 boards (jungfrau structure, away from ctb)
+
-- eiger febl and feb in versions
+2.1 Breaking API
-- fix ctb slow adcs
+==================
+
+
+    Firmware
+    --------
+
+    *   [Jungfrau] Status register and Sync mode fix
+        The regiser bit definition changed and fixes for stable control in sync mode.
+        Effect: Master and slaves give same status (previously master is sometimes 'idle' when acquisition is stopped), same #frames left and #nextframenumber.
+        Also ERROR status connected, but never noticed to occur.
+
+        For user, everything is transparent unless one touches status register
+        using advanced commands. 
+
+
+    *   [Moench] Status: Development mode
+        Moench is now being made compatible with Jungfrau v2.0 readout boards. 
+        Hence, firmware and software is in development mode. 
+        7.x.x will continue to have fixes for Moench until this version is deployed.
+
+
+    *   [Ctb] Fixes and features described later on.
+
+
+    Client
+    ======
+
+
+    *   Datatype change of port numbers from int to uint16_t   
+        API: setVirtualDetectorServers, 
+        get/setRxPort, get/setControlPort, get/setStopPort,
+        get/setDestinationUDPPort(2), get/setRxZmqPort, get/setClientZmqPort
+
+
+    *   [Eiger] versions, hardware version, febl/r firmware version 
+        Versions command modified to give more info about hardware version ['fx30', 'fx70'] and Febl/r firmware versions.
+        Command line: versions (output modified), hardwareversion (added for Eiger)
+        API added for Eiger: getHardwareVersion, getFrontEndFirmwareVersion
+        Enums added: fpgaPosition {FRONT_LEFT, FRONT_RIGHT}
+    
+
+    *   [Ctb] Voltage->Power name change
+        Command line: voltagelist ->powerlist
+        API: get/setVoltage -> get/setPower, get/setVoltageList -> get/setPowerList,
+        getMeasuredVoltage -> getMeasuredPower
+
+
+
+2.2 Resolved or Changed Features
+================================
+
+
+    Detector Server
+    ---------------
+
+
+    *   Set bit and clear bit validation
+        Previously, validation expected all the other bits in the register to 
+        not change. Now, it only validates the selected bit.
+
+    
+    *   [Jungfrau] Electron collection mode (bit 14 of 0x5D register)
+        Affected Command line: setbit, clearbit, reg
+        Affected API: setBit, clearBit, writeRegister
+        Electron collection mode and requires chip reconfiguration. 
+        Temporary fix added that touching this bit will reconfigure chip if chip 
+        is v1.1 and powered on. Permanent fix by introducing a command for the 
+        same in future release.
+    
+
+    *   [Ctb] Fixes
+
+        -   Patioctrl, patsetbit, patbitmask
+            MSB (64 bit unsigned) could not be set as a value of -1 was interpreted 
+            as a 'get'. Fixed in server. 
+
+        -   Allow dac tristate when v_limit is set. Fixed.
+
+        -   Changing fw bit from disable analog to enable analog
+
+        -   Allow adc enable for 1 GbE and 10GbE to be 0.
+
+        -   Slow ADCs previously misread (a high 5k+ value). Firmware updated 
+            and software adjusted now.
+
+        -   Allow non blocking acquire for 1GbE. Added Transmitting status when it
+            might still be reading from fifo.
+
+        -   Clean memory before reading from fifo in 1GbE mode. Read fifo then
+            RD strobe (corresponding firmware fix) fixes number of reads, but 
+            increases all pipelines by 1.
+        
+        -   Fixed pattern viewer (auto legend buf without wait and loop), allow 
+            pyat files. (/patterngenerator)
+
+
+    Simulator
+    ---------
+
+
+    *   Unique TCP port for multiple simulators
+        Checks include unique TCP port-hostname combo.
+
+
+    Receiver
+    --------
+
+
+    *   Unique TCP port for multiple receivers
+        7.x.x already has automatically increasing TCP ports in shared memory 
+        for multiple receivers. Now, checks include unique TCP port-hostname 
+        combo.
+
+
+    *   [Ctb] Fixes
+
+        -   Readout mode updated
+            'rx_hostname' should configure the receiver with parameters from detector,
+            but readout mode in receiver always configured at start up to Analog only. 
+            Fixed.
+
+        -   Incorrect image size in zmq header, which happens when dbit list is 
+            less than 64 bits. Fixed.
+
+        -   Rearranging digital data when dbit list less than 64 bits fixed.
+
+
+    Client
+    ------
+
+
+    *   [Jungfrau][Mythen3][Gotthard2] Sync mode should have at least one master
+        Multi module synced detectors should have at least one master when 
+        starting acquisition, else it will throw. Once master is done acquiring
+        (blocking mode), status of all modules checked to ensure none of the 
+        slaves in waiting due to hardware issues such as cabling.
+
+
+
+2.3 New Features
+================
+
+
+    Client
+    ------
+    
+
+    *   [Jungfrau] Pedestal mode
+        Command line: pedestalmode
+        API: get/setPedestalMode
+        Example: 
+            pedestalmode 0 # turns off pedestal mode
+            pedestalmode 50 10 # turns on pedestal mode (50 pedestal frames, 10 loops)
+        
+        In pedestal mode, number of frames/triggers
+        is overwritten by '#pedestal_frames x #pedestal_loops x 2'.
+        In auto timing mode or trigger mode with #frames > 1, #frames is overwritten
+        with #triggers is 1. Otherwise, #triggers is overwritten with #frames is 1.
+        In pedestal mode, one cannot set #frames, #triggers or timing mode (exception).
+
+        Disabling pedestal mode will set back to normal mode with normal previous
+        values of #frames and #triggers.
+
+
+    *   Source UDP IP: Auto
+        Command line: udp_srcip, udp_srcip2
+        API: get/setSourceUDPIP(2)
+        Allow 'auto' for udp_srcip to pick up IP from detector hostname. Not allowed
+        for Gotthard1.
+
+
+    *   Custom row and column for detector UDP header
+        Command line: row, column
+        API: get/setRow, get/setColumn
+        By default, row and column of module is determined in a pre-determined 
+        manner or by custom detector size (Command line: detsize).
+        This is useful if user accesses row and column in multi- detector UDP header 
+        or for the GUI to rearrange for complete image.
+        Option now added to set custom row and column. 
+
+
+    *   [Ctb] Features
+
+        -   List for ADC, signal, power, slowadc 
+            Also allow their list to set names and to obtain their indices and values.
+
+            Command line: dacname, dacindex, 
+            adclist, adcname, adcindex, 
+            signallist, signalname,signalindex, 
+            powerlist, powername, powerindex, powervalues,
+            slowadclist, slowadcname, slowadcindex, slowadcvalues
+
+            API: get/setDacName, getDacIndex, 
+            get/setAdcNames, getAdcIndex, get/setAdcName,
+            get/setSignalNames, getSignalIndex, get/setSignalName,
+            get/setPowerNames, getPowerIndex, get/setPowerName, getPowerList,
+            get/setSlowADCNames, getSlowADCIndex, get/setSlowADCName, getSlowADCList
+
+        -   Added more modes for transceiver in read out mode.
+            Allow to set number of samples and enable mask for transceiver.
+
+            Command line: romode (more modes: 'transceiver', 'digital_transceiver'),
+            tsamples, transceiverenable
+            API: get/setTransceiverEnableMask, get/setNumberOfTransceiverSamples,
+            get/setReadoutMode (more enums: TRANSCEIVER_ONLY, DIGITAL_AND_TRANSCEIVER)
+
+
+        -   Command to get file name with path of last pattern uploaded.
+            Command line: patfname
+            API: getPatterFileName
+
+
+    *   Automatic test script for all virtual simulators added.
 
 
 
@@ -38,13 +266,13 @@ This document describes the differences between v7.x.x and v7.0.2
 ==========================================
 
 
-    Eiger       7.0.0
+    Eiger       8.0.0
-    Jungfrau    7.0.2
+    Jungfrau    8.0.0
-    Mythen3     7.0.0
+    Mythen3     8.0.0
-    Gotthard2   7.0.0
+    Gotthard2   8.0.0
-    Gotthard    7.0.0
+    Gotthard    8.0.0
-    Moench      7.0.0
+    Moench      8.0.0
-    Ctb         7.0.0
+    Ctb         8.0.0
     
 
     On-board Detector Server Upgrade
@@ -65,21 +293,21 @@ This document describes the differences between v7.x.x and v7.0.2
 ========================
 
 
-    Eiger       20.02.2023 (v31)
+    Eiger       02.10.2023 (v32)                    (updated in 7.0.3)
     
-    Jungfrau    04.11.2022 (v1.4, HW v1.0) 
+    Jungfrau    20.09.2023 (v1.5, HW v1.0)          (updated in 8.0.0)
-                03.11.2022 (v2.4, HW v2.0)
+                21.09.2023 (v2.5, HW v2.0)          (updated in 8.0.0)
 
-    Mythen3     24.01.2023 (v1.4)
+    Mythen3     24.01.2023 (v1.4)                   (updated in 7.0.0)
 
-    Gotthard2   23.11.2022 (v0.3)
+    Gotthard2   23.11.2022 (v0.3)                   (updated in 7.0.0)
 
     Gotthard    08.02.2018 (50um and 25um Master)
                 09.02.2018 (25 um Slave) 
 
-    Moench      05.12.2022 (v0.3)
+    Moench      10.07.2023 (v0.3.2)                 (updated in 8.0.0, under development)
 
-    Ctb         03.04.2023 (v1.2?)
+    Ctb         28.08.2023 (v1.2)                   (updated in 8.0.0)
 
 
     Detector Upgrade

cmk.sh

@@ -26,7 +26,7 @@ CMAKE_PRE=""
 CMAKE_POST=""
 
 usage() { echo -e "
-Usage: $0 [-b] [-c] [-d <HDF5 directory>] [e] [g] [-h] [i] [-j <Number of threads>] [-k <CMake command>] [-l <Install directory>] [m] [n] [-p] [r] [s] [t] [u] [z]  
+Usage: $0 [-b] [-c] [-d <HDF5 directory>] [-e] [-g] [-h] [-i] [-j <Number of threads>] [-k <CMake command>] [-l <Install directory>] [-m] [-n] [-p] [-r] [-s] [-t] [-u] [-z]  
  -[no option]: only make
  -b: Builds/Rebuilds CMake files normal mode
  -c: Clean

conda-recepie/conda_build_config.yaml

@@ -2,7 +2,6 @@ python:
     - 3.8
     - 3.9
     - 3.10
-    - 3.11
+    - 3.11 
+    - 3.12
     
-numpy: 
-    - 1.17

docs/src/consuming.rst

@@ -19,7 +19,7 @@ A minimal CMakeLists.txt could look like this:
 .. code-block:: cmake
 
     project(myDetectorIntegration)
-    cmake_minimum_required(VERSION 3.12)
+    cmake_minimum_required(VERSION 3.14)
     add_subdirectory(slsDetectorPackage)
 
     #Add your executable
@@ -43,7 +43,7 @@ should be needed, otherwise specify cmake prefix path.
 
 .. code-block:: cmake 
 
-    cmake_minimum_required(VERSION 3.12)
+    cmake_minimum_required(VERSION 3.14)
     project(myintegration)
 
     find_package(slsDetectorPackage 5.0 REQUIRED)

docs/src/dependencies.rst

@@ -13,24 +13,36 @@ To use the basic building blocks, meaning sls_detector_get/put and
 the shared libraries these are needed: 
 
  * Linux, preferably recent kernel (currently no cross platform support)
- * CMake > 3.12 
+ * CMake >= 3.14 
  * C++11 compatible compiler. (We test with gcc and clang)
- * ZeroMQ version 4
-
------------------------
-GUI
------------------------
-
- * Qt 5.9
- * Qwt 6.1.5 (packaged in libs/)
 
 -----------------------
 Python bindings
 -----------------------
 
  * Python > 3.6
- * pybind11 (packaged in libs/)
+ * pybind11 2.11.0 (packaged in libs)
 
+.. note ::  
+
+    Refer :ref:`pybind11 notes. <pybind for different slsDetectorPackage versions>`  
+
+-----------------------
+ZeroMQ
+-----------------------
+
+ * Zeromq 4.3.4 (packaged in libs)
+
+.. note ::   
+
+    Refer :ref:`zeromq notes. <zeromq for different slsDetectorPackage versions>` 
+
+-----------------------
+GUI
+-----------------------
+
+ * Qt 5.9
+ * Qwt 6.1.5 (packaged in libs)
 
 -----------------------
 Moench executables
@@ -54,4 +66,6 @@ Packaged in libs/
 
  * catch2 (unit testing)
  * rapidjson (streaming from receiver)
- * pybind11 (python bindings)  
+ * pybind11 (python bindings)  
+ * qwt (gui plotting)
+ * libzmq (streaming to/from receiver)

docs/src/detector.rst

@@ -1,16 +1,19 @@
 Detector
 ==============================================
 
-The sls::Detector is the new public API to control 
+The sls::Detector is the public API to control 
 detectors from C++. This API is also used internally
 for the Python bindings and the command line interface. 
-If a receiver has been configured this is also controlled
+If a receiver has been configured, this is also controlled
 through this class.
 
 Most, if not all, functions are called in parallel
 and the return value is a thin std::vector wrapper 
-containing results from all modules. (Result<T>)
+containing results from all modules. (:ref:`Result class<Result Class>`)
 
+Here are some :ref:`examples <Cplusplus Api Examples>` on how to use the API.
+
+.. _Cplusplus Api Examples:
 .. doxygenclass:: sls::Detector
    :members:
    :undoc-members:

docs/src/examples.rst

@@ -1,3 +1,4 @@
+.. _Cplusplus Api Examples:
 
 
 
@@ -53,8 +54,8 @@ then set up the detector.
 
     jungfrauDetectorServer_virtual
 
-This launches a virtual Jungfrau detector server. As default is uses port 1952 and 1953
+This launches a virtual Jungfrau detector server. As default it uses port 1952 and 1953
-for communication over TCP. Most commands go on 1952 and only stop and status on 1953. 
+for communication over TCP. Most commands go on 1952 and only a few such as stop and status on 1953. 
 
 **Run example to configure**
 
@@ -90,7 +91,10 @@ std::vector.
     sls::Result<int> res1{1, 1, 1};
     std::cout << "res1: " << res1 << '\n';
     res1.squash();
+    # return -1 if different
     res1.squash(-1);
+    # throw exception with custom message if different
+    res1.tsquash("Values are different);
 
 
 

docs/src/firmware.rst

@@ -120,7 +120,7 @@ Program from console
         # removes old server from respawn, sets up new lnked server to respawn
         # programs fpga, reboots
 
-        # v5.0.0 - 6.0.0 (copies server from tftp folder of the pc)
+        #  older versions: v5.0.0 - 6.0.0 using tftp from tftp folder of pc
         sls_detector_put update jungfrauDetectorServervxxx pcxxx xx.pof
 
         # v6.1.1 - present (copies server from the full path provided)
@@ -190,7 +190,7 @@ Program from console
         # removes old server from respawn, sets up new lnked server to respawn
         # programs fpga, reboots
 
-        # v5.0.0 - 6.0.0 (copies server from tftp folder of the pc)
+        #  older versions: v5.0.0 - 6.0.0 using tftp from tftp folder of pc
         sls_detector_put update mythen3DetectorServervxxx pcxxx xxx.rbf
 
         # v6.1.1 - present (copies server from the full path provided)
@@ -224,7 +224,7 @@ Program from console
         # removes old server from respawn, sets up new lnked server to respawn
         # programs fpga, reboots
 
-        # v5.0.0 - 6.0.0 (copies server from tftp folder of the pc)
+        #  older versions: v5.0.0 - 6.0.0 using tftp from tftp folder of pc
         sls_detector_put update gotthard2DetectorServervxxx pcxxx xxx.rbf
 
         # v6.1.1 - present (copies server from the full path provided)
@@ -275,7 +275,7 @@ Program from console
         # removes old server from respawn, sets up new lnked server to respawn
         # programs fpga, reboots
 
-        # v5.0.0 - 6.0.0 (copies server from tftp folder of the pc)
+        #  older versions: v5.0.0 - 6.0.0 using tftp from tftp folder of pc
         sls_detector_put update moenchDetectorServervxxx pcxxx xx.pof
 
         # v6.1.1 - present (copies server from the full path provided)
@@ -310,7 +310,7 @@ Program from console
         # removes old server from respawn, sets up new lnked server to respawn
         # programs fpga, reboots
 
-        # v5.0.0 - 6.0.0 (copies server from tftp folder of the pc)
+        #  older versions: v5.0.0 - 6.0.0 using tftp from tftp folder of pc
         sls_detector_put update ctbDetectorServervxxx pcxxx xx.pof
 
         # v6.1.1 - present (copies server from the full path provided)

docs/src/index.rst

@@ -8,8 +8,8 @@ Welcome to slsDetectorPackage's documentation!
 
 .. note :: 
 
-    This is the documentation for the latest development version of slsDetectorPackage
+    This is the documentation for the latest development version of slsDetectorPackage.
-    For documentation on current and previous releases visit the official page: https://www.psi.ch/en/detectors/documentation
+    For further documentation, visit the official page: https://www.psi.ch/en/detectors/documentation
 
 .. toctree::
     :maxdepth: 1

docs/src/installation.rst

@@ -57,7 +57,6 @@ We have three different packages available:
 Build from source
 -------------------
 
-
 1. Download Source Code from github
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -65,23 +64,9 @@ Build from source
 
     git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git --branch 6.1.1
 
+.. note ::   
 
-| **Pybind for Python**
+      For v6.x.x of slsDetectorPackage and older, refer :ref:`pybind11 notes on cloning. <pybind for different slsDetectorPackage versions>`  
-| v7.0.0+:
-|   pybind11 packaged into 'libs/pybind'. No longer a submodule. No need for "recursive" or "submodule update".
-| 
-| Older versions:
-|   pybind11 is a submodule. Must be cloned using "recursive" and updated when switching between versions using the following commands.
-
-.. code-block:: bash
-    
-    # clone using recursive to get pybind11 submodule
-    git clone --recursive https://github.com/slsdetectorgroup/slsDetectorPackage.git
-
-    # update submodule when switching between releases
-    cd slsDetectorPackage
-    git submodule update --init
-   
 
 .. _build from source using cmake:
 
@@ -118,20 +103,23 @@ Instead of the cmake command, one can use ccmake to get a list of options to con
     ccmake ..
  
     # choose the options
-    # first press [c] - configure
+    # first press [c] - configure (maybe multiple times till you see [g])
     # then press [g] - generate
 
 
-
+===============================     ===============================
-===============================     ===========================================
 Example cmake options               Comment
-===============================     ===========================================
+===============================     ===============================
 -DSLS_USE_PYTHON=ON                 Python
--DPython_FIND_VIRTUALENV=ONLY       Python from only the conda environment 
+-DPython_FIND_VIRTUALENV=ONLY       Python from the conda env 
--DZeroMQ_HINT=/usr/lib64            Use system zmq instead
 -DSLS_USE_GUI=ON                    GUI
-===============================     ===========================================
+-DSLS_USE_HDF5=ON                   HDF5
+-DSLS_USE_SIMULATOR=ON              Simulator
+===============================     ===============================
 
+.. note ::   
+
+    For v7.x.x of slsDetectorPackage and older, refer :ref:`zeromq notes for cmake option to hint library location. <zeromq for different slsDetectorPackage versions>` 
 
 
 Build using in-built cmk.sh script
@@ -142,9 +130,9 @@ Build using in-built cmk.sh script
 
     The binaries are generated in slsDetectorPackage/build/bin directory.
 
-    Usage: ./cmk.sh [-b] [-c] [-d <HDF5 directory>] [e] [g] [-h] [i] [-j <Number of threads>] 
+    Usage: $0 [-b] [-c] [-d <HDF5 directory>] [-e] [-g] [-h] [-i] 
-    [-k <CMake command>] [-l <Install directory>] [m] [n] [-p] [-q <Zmq hint directory>] 
+    [-j <Number of threads>] [-k <CMake command>] [-l <Install directory>] 
-    [r] [s] [t] [u] [z]  
+    [-m] [-n] [-p] [-r] [-s] [-t] [-u] [-z]  
     -[no option]: only make
     -b: Builds/Rebuilds CMake files normal mode
     -c: Clean
@@ -159,7 +147,6 @@ Build using in-built cmk.sh script
     -m: Manuals
     -n: Manuals without compiling doxygen (only rst)
     -p: Builds/Rebuilds Python API
-    -q: Zmq hint directory
     -r: Build/Rebuilds only receiver
     -s: Simulator
     -t: Build/Rebuilds only text client
@@ -176,9 +163,13 @@ Build using in-built cmk.sh script
     # new build, python and compile in parallel:
     ./cmk.sh -cbpj5
 
-    #To use the system zmq (/usr/lib64) instead
+    #For rebuilding only certain sections
-    ./cmk.sh -cbj5 -q /usr/lib64
+    ./cmk.sh -tg #only text client and gui
+    ./cmk.sh -r #only receiver
 
+.. note ::   
+
+    For v7.x.x of slsDetectorPackage and older, refer :ref:`zeromq notes for cmk script option to hint library location. <zeromq for different slsDetectorPackage versions>` 
 
 
 Build on old distributions
@@ -191,7 +182,7 @@ using this compiler
 .. code-block:: bash
 
     #Create an environment with the dependencies
-    conda create -n myenv gxx_linux-64 cmake zmq
+    conda create -n myenv gxx_linux-64 cmake
     conda activate myenv
 
     # outside slsDetecorPackage folder
@@ -200,6 +191,11 @@ using this compiler
     make -j12
 
 
+.. note ::   
+
+    For v7.x.x of slsDetectorPackage and older, refer :ref:`zeromq notes for dependencies for conda. <zeromq for different slsDetectorPackage versions>` 
+
+
 
 Build slsDetectorGui (Qt5)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -228,9 +224,9 @@ Build slsDetectorGui (Qt5)
 
         # create environment to compile
         # on rhel7
-        conda create -n slsgui zeromq gxx_linux-64 gxx_linux-64 mesa-libgl-devel-cos6-x86_64 qt
+        conda create -n slsgui gxx_linux-64 gxx_linux-64 mesa-libgl-devel-cos6-x86_64 qt
         # on fedora or newer systems
-        conda create -n slsgui zeromq qt
+        conda create -n slsgui qt
 
         # when using conda compilers, would also need libgl, but no need for it on fedora unless maybe using it with ROOT
 
@@ -246,6 +242,9 @@ Build slsDetectorGui (Qt5)
         cd slsDetectorPackage
         ./cmk.sh -cbgj9
 
+.. note ::   
+
+    For v7.x.x of slsDetectorPackage and older, refer :ref:`zeromq notes for dependencies for conda. <zeromq for different slsDetectorPackage versions>` 
 
 
 
@@ -258,7 +257,7 @@ is to use conda
 
 .. code-block:: bash
 
-    conda create -n myenv python sphinx_rtd_theme breathe
+    conda create -n myenv python=3.12 sphinx sphinx_rtd_theme breathe doxygen numpy
 
 
 .. code-block:: bash
@@ -270,3 +269,51 @@ is to use conda
 
     make docs # generate API docs and build Sphinx RST
     make rst # rst only, saves time in case the API did not change
+
+
+Pybind and Zeromq
+^^^^^^^^^^^^^^^^^^^
+
+.. _pybind for different slsDetectorPackage versions:
+
+
+| **Pybind for Python**
+| v8.0.0+:
+|   pybind11 (v2.11.0) is built 
+|   * by default from tar file in repo (libs/pybind/v2.11.0.tar.gz) 
+|   * or use advanced option SLS_FETCH_PYBIND11_FROM_GITHUB [`link <https://github.com/pybind/pybind11>`__].
+|
+| v7.x.x:
+|   pybind11 packaged into 'libs/pybind'. No longer a submodule. No need for "recursive" or "submodule update".
+| 
+| Older versions:
+|   pybind11 is a submodule. Must be cloned using "recursive" and updated when switching between versions using the following commands.
+
+.. code-block:: bash
+
+    # Note: Only for v6.x.x versions and older
+
+    # clone using recursive to get pybind11 submodule
+    git clone --recursive https://github.com/slsdetectorgroup/slsDetectorPackage.git
+
+    # update submodule when switching between releases
+    cd slsDetectorPackage
+    git submodule update --init
+
+
+.. _zeromq for different slsDetectorPackage versions:
+
+
+
+| **Zeromq**
+| v8.0.0+:
+|   zeromq (v4.3.4) is built 
+|   * by default from tar file in repo (libs/libzmq/libzmq-4.3.4.tar.gz) 
+|   * or use advanced option SLS_FETCH_ZMQ_FROM_GITHUB [`link <https://github.com/zeromq/libzmq.git>`__].
+|
+| v7.x.x and older:
+|   zeromq must be installed and one can hint its location using
+|   * cmake option:'-DZeroMQ_HINT=/usr/lib64' or 
+|   * option '-q' in cmk.sh script: : ./cmk.sh -cbj5 -q /usr/lib64
+|   * 'zeromq' dependency added when installing using conda
+

docs/src/quick_start_guide.rst

@@ -109,12 +109,14 @@ For Multiple Modules
         # connects to mulitple modules
         hostname bchipxxx+bchipyyy+
 
-        # connects to receivers at ports 2012 and 2014
+        # tcp port increases for each module (multi detector command)
-        rx_hostname mpc1922:2012+mpc1922:2013+
+        rx_tcpport 2012
 
-        # sets differernt destination udp ports
+        # connects to receivers at ports 2012 and 2014
-        0:udp_dstport 50012
+        rx_hostname mpc1922
-        1:udp_dstport 50014
+
+        # increasing udp ports (multi detector command)
+        udp_dstport 50012
 
         # source udp ips must be same subnet at destintaion udp ips
         0:udp_srcip 192.168.1.112

docs/src/result.rst

@@ -1,3 +1,5 @@
+.. _Result Class:
+
 Result
 ==============================================
 

docs/src/slsreceiver.rst

@@ -52,8 +52,13 @@ Client Commands
 
         # multi modules with custom ports
         rx_hostname xxx:1955+xxx:1956+
+        
+        
+        # multi modules using increasing tcp ports when using multi detector command
+        rx_tcpport 1955
+        rx_hostname xxx
 
-        # multi modules with custom ports on same rxr pc
+        # or specify multi modules with custom ports on same rxr pc
         0:rx_tcpport 1954
         1:rx_tcpport 1955
         2:rx_tcpport 1956

docs/src/troubleshooting.rst

@@ -92,6 +92,9 @@ Common
             sls_detector_put rx_arping 1
 
 
+#. Only the slaves get no data 
+    * Check trigger cabling and trigger configuration
+    * When you cannot stop Jungfrau slaves in sync mode, refer to :ref:`Cannot stop slaves<Jungfrau Troubleshooting Sync Slaves Cannot Stop>`.
 
 .. _Receiver PC Tuning:
 
@@ -421,3 +424,20 @@ Cannot get multi module data
     * Comment out this line in the config file: powerchip 1
     * Powering on the chip increases the power consumption by a considerable amount. If commenting out this line aids in getting data (strange data due to powered off chip), then it could be the power supply current limit. Fix it (possibly to 8A current limit) and uncomment the powerchip line back in config file.
 
+
+
+.. _Jungfrau Troubleshooting Sync Slaves Cannot Stop:
+
+Cannot stop slaves in sync mode
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. If cabling is accessible, ensure termination board and flatband cable between the masters and the slaves are connnected properly. Then try to stop.
+#. If cabling is inaccessible, unsync first so that the slaves can get the stop directly from the client using the command. Then, don't use sync mode until the cabling is fixed.
+
+    .. code-block:: bash
+        
+        # unsync, slaves command will fail as it is still in waiting state
+        sls_detector_put sync 0
+
+        # stop should now be successful as master does not determine the stop anymore
+        sls_detector_put stop

docs/src/virtualserver.rst

@@ -86,7 +86,8 @@ For a Single Module (With Options)
         udp_dstport 50012
 
         # source udp ips must be same subnet at destintaion udp ips
-        udp_srcip 192.168.1.112
+        # takes the same ip as hostname
+        udp_srcip auto
 
         # destination udp ip picked up from rx_hostname (if auto)
         udp_dstip auto
@@ -101,12 +102,14 @@ For Multiple Modules
         virtual 2 1912
         # or hostname localhost:1912+localhost:1914+
 
-        # connects to receivers at ports 2012 and 2014
+        # increasing receiver tcp ports (multi detector command)
-        rx_hostname mpc1922:2012+mpc1922:2013+
+        rx_tcpport 2012
 
-        # sets differernt destination udp ports
+        # connects to reciever at port 2012 and 2013
-        0:udp_dstport 50012
+        rx_hostname mpc1922
-        1:udp_dstport 50014
+
+        # sets increasing destination udp ports
+        udp_dstport 50012
 
         # source udp ips must be same subnet at destintaion udp ips
         0:udp_srcip 192.168.1.112

examples/eiger_10Gb.config

@@ -4,27 +4,33 @@ detsize 1024 512
 # detector hostname for controls
 hostname beb059+beb058+ 
 
-# 1Gb receiver pc hostname with tcp port to configure receiver
+# increasing receiver tcp port (multi detector command)
-rx_hostname x12sa-vcons:1991+x12sa-vcons:1992
+rx_tcpport 1991
+
+# 1Gb receiver pc hostname to configure receiver
+rx_hostname x12sa-vcons
+
+# or 1Gb receiver pc hostname with tcp port to configure receiver
+#rx_hostname x12sa-vcons:1991+x12sa-vcons:1992
+
+# increasing udp destination ports for all half modules
+udp_dstport 50011
 
 # udp port first quadrant, first halfmodule         
-0:udp_dstport 50011 
+#0:udp_dstport 50011 
-
 # udp port second quadrant, first halfmodule       
-0:udp_dstport2 50012 
+#0:udp_dstport2 50012 
-
+# udp port first quadrant, second halfmodule       
+#1:udp_dstport 50013 
+# udp port second quadrant, second halfmodule  
+#1:udp_dstport2 50014 
+    
 # udp IP of the receiver over 10Gb              
 0:udp_dstip 10.0.30.210 
 
 # first half module 10 Gb IP (same subnet as 0:udp_dstip)
 0:udp_srcip 10.0.30.100 
 
-# udp port first quadrant, second halfmodule       
-1:udp_dstport 50013 
-
-# udp port second quadrant, second halfmodule  
-1:udp_dstport2 50014 
-    
 # udp IP of the receiver over 10Gb, 
 1:udp_dstip 10.0.40.210  
 

examples/eiger_1Gb.config

@@ -4,18 +4,23 @@ detsize 1024 512
 # detector hostname for controls
 hostname beb059+beb058+ 
 
-# 1Gb receiver pc hostname with tcp port to configure receiver
+# increasing receiver tcp port (multi detector command)
-rx_hostname x12sa-vcons:1991+x12sa-vcons:1992
+rx_tcpport 1991
+
+# 1Gb receiver pc hostname to configure receiver
+rx_hostname x12sa-vcons
+
+# increasing udp destination ports for all half modules
+udp_dstport 50011
 
 # udp port first quadrant, first halfmodule         
-0:udp_dstport 50011 
+#0:udp_dstport 50011 
 #udp port second quadrant, first halfmodule       
-0:udp_dstport2 50012 
+#0:udp_dstport2 50012 
-
 # udp port first quadrant, second halfmodule       
-1:udp_dstport 50013 
+#1:udp_dstport 50013 
 # udp port second quadrant, second halfmodule  
-1:udp_dstport2 50014 
+#1:udp_dstport2 50014 
     
 # output directory
 fpath /sls/X12SA/data/x12saop/Data10/Eiger0.5M

examples/jungfrau_two.config

@@ -4,14 +4,18 @@ detsize 1024 1024
 # detector hostname
 hostname bchip048+bchip052+
 
-# 1Gb receiver pc hostname  (default tcpport: 1954)
+# increasing receiver ports 1954 and 1955 (multi detector command)
-rx_hostname pcmoench01:1954+pcmoench01:1955+
+rx_tcpport 1954
+
+# 1Gb receiver pc hostname
+rx_hostname pcmoench01
 
 
+# increasing udp ports 50004 and 50005 (multi detector command)
+udp_dstport 50004
+# or custom udp destination port (receiver) for 1st module
+#0:udp_dstport 50014
 
-# udp configurations for 1st module
-# udp destination port (receiver)
-0:udp_dstport 50004
 
 # udp destination ip (receiver)
 0:udp_dstip 10.1.1.100
@@ -19,17 +23,11 @@ rx_hostname pcmoench01:1954+pcmoench01:1955+
 # udp source ip (same subnet as 0:udp_dstip)
 0:udp_srcip 10.1.1.10
 
-
-
-# udp configurations for 2nd module
-# udp destination port (receiver)
-1:udp_dstport 50005
-
 # udp destination ip (receiver)
-1:udp_dstip 10.1.1.100
+1:udp_dstip 10.1.2.100
 
 # udp source ip (same subnet as 1:udp_dstip)
-1:udp_srcip 10.1.1.11
+1:udp_srcip 10.1.2.11
 
 
 
@@ -45,5 +43,5 @@ timing trigger
 # output file directory
 fpath /external_pool/jungfrau_data/softwaretest
 
-# disable file writing
+# disable file writing (default)
 fwrite 0

examples/virtual_eiger_2_half_modules.config

@@ -2,10 +2,8 @@
 hostname localhost:1900+localhost:1902+
 
 # udp destination ports
-0:udp_dstport 50000
+udp_dstport 50000
-0:udp_dstport2 50001
+udp_dstport2 50001
-1:udp_dstport 50002
-1:udp_dstport2 50003
 
 # receiver hostname
 rx_hostname mpc1922:2000+mpc1922:2001+

examples/virtual_jungfrau_4.config

@@ -5,24 +5,26 @@ detsize 2048 1024
 virtual 4 1952
 
 # udp destination ports
-0:udp_dstport2 50001
+udp_dstport 50001
-0:udp_dstport2 50002
+#0:udp_dstport2 50001
-1:udp_dstport 50003
+#0:udp_dstport2 50002
-1:udp_dstport2 50004
+#1:udp_dstport 50003
-2:udp_dstport 50005
+#1:udp_dstport2 50004
-2:udp_dstport2 50006
+#2:udp_dstport 50005
-3:udp_dstport 50007
+#2:udp_dstport2 50006
-3:udp_dstport2 50008
+#3:udp_dstport 50007
+#3:udp_dstport2 50008
 
 # udp source ip (same subnet as udp_dstip)
 udp_srcip 192.168.1.100
 udp_srcip2 192.168.1.100
 
 # receiver hostname and tcpports
-0:rx_tcpport 1970
+rx_tcpport 1970
-1:rx_tcpport 1971
+#0:rx_tcpport 1970
-2:rx_tcpport 1972
+#1:rx_tcpport 1971
-3:rx_tcpport 1973
+#2:rx_tcpport 1972
+#3:rx_tcpport 1973
 rx_hostname mpc1922
 
 # udp destination ip from rx_hostname

python/slsdet/detector.py

@@ -360,7 +360,8 @@ class Detector(CppDetectorApi):
     @property
     def settings(self):
         """
-        Detector settings. Enum: detectorSettings
+        Detector settings. 
+        Enum: detectorSettings
 
         Note
         -----
@@ -400,6 +401,9 @@ class Detector(CppDetectorApi):
     def framesl(self):
         """
         [Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB] Number of frames left in acquisition.\n
+
+        Note
+        ----
         [Gotthard2] only in continuous auto mode.
 
         :setter: Not Implemented
@@ -475,7 +479,8 @@ class Detector(CppDetectorApi):
     @element
     def gaincaps(self):
         """
-        [Mythen3] Gain caps. Enum: M3_GainCaps \n
+        [Mythen3] Gain caps. 
+        Enum: M3_GainCaps
         
         Note
         ----
@@ -573,8 +578,6 @@ class Detector(CppDetectorApi):
         """
         Period between frames, accepts either a value in seconds or datetime.timedelta
 
-        Note
-        -----
         :getter: always returns in seconds. To get in DurationWrapper, use getPeriod
 
         Example
@@ -641,9 +644,6 @@ class Detector(CppDetectorApi):
         """
         [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2] Delay after trigger, accepts either a value in seconds, DurationWrapper or datetime.timedelta
 
-        Note
-        -----
-
         :getter: always returns in seconds. To get in DurationWrapper, use getDelayAfterTrigger
 
         Example
@@ -895,7 +895,8 @@ class Detector(CppDetectorApi):
     @element
     def rx_discardpolicy(self):
         """
-        Frame discard policy of receiver. Enum: frameDiscardPolicy
+        Frame discard policy of receiver. 
+        Enum: frameDiscardPolicy
         
         Note
         -----
@@ -969,7 +970,8 @@ class Detector(CppDetectorApi):
     @property
     @element
     def fformat(self):
-        """ File format of data file in receiver. Enum: fileFormat
+        """ File format of data file in receiver. 
+        Enum: fileFormat
     
         Note
         -----
@@ -1565,7 +1567,8 @@ class Detector(CppDetectorApi):
     @property
     @element
     def status(self):
-        """Gets detector status. Enum: runStatus
+        """Gets detector status. 
+        Enum: runStatus
         
         Note
         -----
@@ -1579,7 +1582,8 @@ class Detector(CppDetectorApi):
     @property
     @element
     def rx_status(self):
-        """Gets receiver listener status. Enum: runStatus
+        """Gets receiver listener status. 
+        Enum: runStatus
         
         Note
         -----
@@ -1673,6 +1677,11 @@ class Detector(CppDetectorApi):
     def sync(self):
         """
         [Jungfrau][Moench] Enables or disables synchronization between modules.
+
+        Note
+        ----
+        Sync mode requires at least one master configured. Also requires flatband cabling between master and slave with termination board.
+
         """
         return self.getSynchronization()
 
@@ -1803,6 +1812,7 @@ class Detector(CppDetectorApi):
     def daclist(self):
         """
         List of enums/names for every dac for this detector
+
         :setter: Only implemented for Chiptestboard
         
         """
@@ -1815,9 +1825,7 @@ class Detector(CppDetectorApi):
     @property
     def adclist(self):
         """
-        List of names for every adc for this board. 32 adcs
+        [Chiptestboard] List of names for every adc for this board. 32 adcs
-        :setter: Only implemented for Chiptestboard
-        
         """
         return self.getAdcNames()
 
@@ -1828,9 +1836,7 @@ class Detector(CppDetectorApi):
     @property
     def signallist(self):
         """
-        List of names for every io signal for this board. 64 signals
+        [Chiptestboard] List of names for every io signal for this board. 64 signals        
-        :setter: Only implemented for Chiptestboard
-        
         """
         return self.getSignalNames()
 
@@ -1841,8 +1847,7 @@ class Detector(CppDetectorApi):
     @property
     def powerlist(self):
         """
-        List of names for every power for this board. 5 power supply
+        [Chiptestboard] List of names for every power for this board. 5 power supply
-        :setter: Only implemented for Chiptestboard
         
         """
         return self.getPowerNames()
@@ -1854,8 +1859,7 @@ class Detector(CppDetectorApi):
     @property
     def slowadclist(self):
         """
-        List of names for every slowadc for this board. 8 slowadc
+        [Chiptestboard] List of names for every slowadc for this board. 8 slowadc
-        :setter: Only implemented for Chiptestboard
         
         """
         return self.getSlowADCNames()
@@ -1874,7 +1878,7 @@ class Detector(CppDetectorApi):
 
     @property
     def powervalues(self):
-        """Gets the power values for every power for this detector."""
+        """[Chiptestboard] Gets the power values for every power for this detector."""
         return {
             power.name.lower(): element_if_equal(np.array(self.getPower(power)))
             for power in self.getPowerList()
@@ -1882,7 +1886,7 @@ class Detector(CppDetectorApi):
 
     @property
     def slowadcvalues(self):
-        """Gets the slow adc values for every slow adc for this detector."""
+        """[Chiptestboard] Gets the slow adc values for every slow adc for this detector."""
         return {
             slowadc.name.lower(): element_if_equal(np.array(self.getSlowADC(slowadc)))
             for slowadc in self.getSlowADCList()
@@ -2056,8 +2060,7 @@ class Detector(CppDetectorApi):
         -----
         To set default rate correction from trimbit file, use setDefaultRateCorrection
 
-        Known Issue
+        Known Issue:
-        ------------
 
         :getter: Always give 0 due to the microseconds precision.
         :setter: Use scientific notation to set custom rate correction, since timedelta resolution is 1 microseconds. \n
@@ -2081,7 +2084,8 @@ class Detector(CppDetectorApi):
     @element
     def readoutspeed(self):
         """
-        [Eiger][Jungfrau|Gotthard2] Readout speed of chip. Enum: speedLevel
+        [Eiger][Jungfrau|Gotthard2] Readout speed of chip. 
+        Enum: speedLevel
         
         Note
         -----
@@ -2170,7 +2174,8 @@ class Detector(CppDetectorApi):
     @element
     def timing(self):
         """
-        Set Timing Mode of detector. Enum: timingMode
+        Set Timing Mode of detector. 
+        Enum: timingMode
         
         Note
         -----
@@ -2230,13 +2235,11 @@ class Detector(CppDetectorApi):
     @property
     @element
     def type(self):
-        """ Returns detector type. Enum: detectorType
+        """ Returns detector type. 
-        
+        Enum: detectorType
-        Note
+        [EIGER, JUNGFRAU, GOTTHARD, MOENCH, MYTHEN3, GOTTHARD2, CHIPTESTBOARD]
-        ----
 
         :setter: Not implemented
-        Values: EIGER, JUNGFRAU, GOTTHARD, MOENCH, MYTHEN3, GOTTHARD2, CHIPTESTBOARD
         """
         return self.getDetectorType()
 
@@ -2497,9 +2500,6 @@ class Detector(CppDetectorApi):
         """
         [Eiger] Measured sub frame period between last sub frame and previous one. 
         
-        Note
-        -----
-        
         :setter: Not implemented
         """
         return ut.reduce_time(self.getMeasuredSubFramePeriod())
@@ -2777,7 +2777,8 @@ class Detector(CppDetectorApi):
     @property
     def gainmode(self):
         """
-        [Jungfrau] Detector gain mode. Enum: gainMode
+        [Jungfrau] Detector gain mode. 
+        Enum: gainMode
         
         Note
         -----
@@ -2890,11 +2891,8 @@ class Detector(CppDetectorApi):
     @property
     def maxclkphaseshift(self):
         """
-        [Gotthard2][Mythen3] Absolute maximum Phase shift of  clocks.
+        [Gotthard2][Mythen3] Absolute maximum Phase shift of clocks.
-        
+               
-        Note
-        ----
-        
         :setter: Not Implemented
         
         Example
@@ -2912,7 +2910,8 @@ class Detector(CppDetectorApi):
     @element
     def timingsource(self):
         """
-        [Gotthard2] Timing source. Enum: timingSourceType
+        [Gotthard2] Timing source. 
+        Enum: timingSourceType
         
         Note
         -----
@@ -2956,7 +2955,8 @@ class Detector(CppDetectorApi):
     @property
     @element
     def burstmode(self):
-        """[Gotthard2] Burst mode of detector. Enum: burstMode
+        """[Gotthard2] Burst mode of detector. 
+        Enum: burstMode
         
         Note
         ----
@@ -2974,9 +2974,6 @@ class Detector(CppDetectorApi):
         """
         [Gotthard2] Period between 2 bursts. Only in burst mode and auto timing mode.
         
-        Note
-        -----
-        
         :getter: always returns in seconds. To get in DurationWrapper, use getBurstPeriod
         :setter: Not Implemented
 
@@ -3099,7 +3096,8 @@ class Detector(CppDetectorApi):
 
     @property
     def vetoalg(self):
-        """[Gotthard2] Algorithm used for veto. Enum: vetoAlgorithm, streamingInterface
+        """[Gotthard2] Algorithm used for veto. 
+        Enum: vetoAlgorithm, streamingInterface
         
         Note
         ----
@@ -3273,7 +3271,8 @@ class Detector(CppDetectorApi):
     @element
     def romode(self):
         """
-        [CTB] Readout mode of detector. Enum: readoutMode
+        [CTB] Readout mode of detector. 
+        Enum: readoutMode
         
         Note
         ------
@@ -3379,9 +3378,6 @@ class Detector(CppDetectorApi):
     def maxdbitphaseshift(self):
         """[CTB][Jungfrau] Absolute maximum Phase shift of of the clock to latch digital bits.
         
-        Note
-        -----
-        
         :setter: Not Implemented
         """
         return self.getMaxDBITPhaseShift()
@@ -3426,9 +3422,6 @@ class Detector(CppDetectorApi):
     def maxadcphaseshift(self):
         """[Jungfrau][Moench][CTB] Absolute maximum Phase shift of ADC clock.
         
-        Note
-        -----
-        
         :setter: Not Implemented
         """
         return self.getMaxADCPhaseShift()
@@ -3478,9 +3471,6 @@ class Detector(CppDetectorApi):
         """
         [Ctb] Sync clock in MHz.
         
-        Note
-        -----
-        
         :setter: Not implemented
         """
         return self.getSYNCClock()
@@ -3488,10 +3478,7 @@ class Detector(CppDetectorApi):
     @property
     def pattern(self):
         """[Mythen3][Ctb] Loads ASCII pattern file directly to server (instead of executing line by line).
-        
+               
-        Note
-        ----
-        
         :getter: Not Implemented
         
         Example
@@ -3919,10 +3906,7 @@ class Detector(CppDetectorApi):
     @element
     def im_a(self):
         """[Ctb] Measured current of power supply a in mA.
-        
+              
-        Note
-        -----
-        
         :setter: Not implemented
         """
         return self.getMeasuredCurrent(dacIndex.I_POWER_A)
@@ -3932,9 +3916,6 @@ class Detector(CppDetectorApi):
     def im_b(self):
         """[Ctb] Measured current of power supply b in mA.
         
-        Note
-        -----
-        
         :setter: Not implemented
         """
         return self.getMeasuredCurrent(dacIndex.I_POWER_B)
@@ -3944,9 +3925,6 @@ class Detector(CppDetectorApi):
     def im_c(self):
         """[Ctb] Measured current of power supply c in mA.
                 
-        Note
-        -----
-        
         :setter: Not implemented
         """
         return self.getMeasuredCurrent(dacIndex.I_POWER_C)
@@ -3956,9 +3934,6 @@ class Detector(CppDetectorApi):
     def im_d(self):
         """[Ctb] Measured current of power supply d in mA.
                 
-        Note
-        -----
-        
         :setter: Not implemented
         """
         return self.getMeasuredCurrent(dacIndex.I_POWER_D)
@@ -3968,9 +3943,6 @@ class Detector(CppDetectorApi):
     def im_io(self):
         """[Ctb] Measured current of power supply io in mA.
                 
-        Note
-        -----
-        
         :setter: Not implemented
         """
         return self.getMeasuredCurrent(dacIndex.I_POWER_IO)
@@ -4020,9 +3992,6 @@ class Detector(CppDetectorApi):
     def exptimel(self):
         """[Gotthard] Exposure time left for current frame.
         
-        Note
-        -----
-        
         :getter: always returns in seconds. To get in DurationWrapper, use getExptimeLeft
         :setter: Not Implemented
         
@@ -4057,9 +4026,6 @@ class Detector(CppDetectorApi):
         """
         [Gotthard2][Mythen3] Frequency of clock in Hz. 
         
-        Note
-        ----
-        
         :setter: Not implemented. Use clkdiv to set frequency
 
         Example
@@ -4079,7 +4045,9 @@ class Detector(CppDetectorApi):
     @property
     @element
     def polarity(self):
-        """[Mythen3] Set positive or negative polarity. Enum: polarity"""
+        """[Mythen3] Set positive or negative polarity. 
+        Enum: polarity
+        """
         return self.getPolarity()
 
     @polarity.setter

serverBin/ctbDetectorServer_developer

@@ -1 +0,0 @@
-../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer

serverBin/ctbDetectorServerv8.0.0

@@ -0,0 +1 @@
+../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv8.0.0

serverBin/eigerDetectorServer_developer

@@ -1 +0,0 @@
-../slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer

serverBin/eigerDetectorServerv8.0.0

@@ -0,0 +1 @@
+../slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv8.0.0

serverBin/gotthard2DetectorServer_developer

@@ -1 +0,0 @@
-../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer

serverBin/gotthard2DetectorServerv8.0.0

@@ -0,0 +1 @@
+../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv8.0.0

serverBin/gotthardDetectorServer_developer

@@ -1 +0,0 @@
-../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer

serverBin/gotthardDetectorServerv8.0.0

@@ -0,0 +1 @@
+../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv8.0.0

serverBin/jungfrauDetectorServer_developer

@@ -1 +0,0 @@
-../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer

serverBin/jungfrauDetectorServerv8.0.0

@@ -0,0 +1 @@
+../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv8.0.0

serverBin/moenchDetectorServer_developer

@@ -1 +0,0 @@
-../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer

serverBin/moenchDetectorServerv8.0.0

@@ -0,0 +1 @@
+../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv8.0.0

serverBin/mythen3DetectorServer_developer

@@ -1 +0,0 @@
-../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer

serverBin/mythen3DetectorServerv8.0.0

@@ -0,0 +1 @@
+../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv8.0.0

slsDetectorGui/src/qDrawPlot.cpp

@@ -193,6 +193,7 @@ void qDrawPlot::SetupPlots() {
     gainplot2d = new SlsQt2DPlot(boxPlot, true);
     gainplot2d->SetData(nPixelsX, -0.5, nPixelsX - 0.5, nPixelsY, -0.5,
                         nPixelsY - 0.5, gainData);
+    gainplot2d->Update();
     gainplot2d->hide();
     connect(plot2d, SIGNAL(PlotZoomedSignal(const QRectF &)), this,
             SLOT(Zoom2DGainPlot(const QRectF &)));
@@ -1009,6 +1010,7 @@ void qDrawPlot::Update2dPlot() {
     if (isGainDataExtracted) {
         gainplot2d->SetData(nPixelsX, -0.5, nPixelsX - 0.5, nPixelsY, -0.5,
                             nPixelsY - 0.5, gainData);
+        gainplot2d->Update();
         if (!gainplot2d->isVisible()) {
             gainplot2d->setFixedWidth(plot2d->width() /
                                       qDefs::DATA_GAIN_PLOT_RATIO);

slsDetectorGui/src/qTabMeasurement.cpp

@@ -803,8 +803,9 @@ void qTabMeasurement::GetNextFrameNumber() {
             "Inconsistent starting frame number for all detectors.");
         spinNextFrameNumber->setValue(retval);
     }
-    CATCH_DISPLAY("Could not get starting frame number.",
+    CATCH_HANDLE("Could not get starting frame number.",
-                  "qTabMeasurement::GetNextFrameNumber")
+                 "qTabMeasurement::GetNextFrameNumber", spinNextFrameNumber,
+                 &QSpinBox::setValue, -1)
     connect(spinNextFrameNumber, SIGNAL(valueChanged(int)), this,
             SLOT(SetNextFrameNumber(int)));
 }

slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h

@@ -10,7 +10,7 @@
 #define HARDWARE_VERSION_NAMES                                                 \
     { "FX70T", "FX30T" }
 
-#define REQUIRED_FIRMWARE_VERSION (31)
+#define REQUIRED_FIRMWARE_VERSION (32)
 // virtual ones renamed for consistency
 // real ones keep previous name for compatibility (already in production)
 #ifdef VIRTUAL

slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c

@@ -3323,6 +3323,27 @@ void *start_timer(void *arg) {
                 break;
             }
 
+            // change gain and data for every frame
+            {
+                const int nchannels = NCHIP * NCHAN;
+                int gainVal = 0;
+                for (int i = 0; i < nchannels; ++i) {
+                    if ((i % nchannels) < 400) {
+                        gainVal = 1 + frameNr;
+                    } else if ((i % nchannels) < 800) {
+                        gainVal = 2 + frameNr;
+                    } else {
+                        gainVal = 3 + frameNr;
+                    }
+                    int dataVal =
+                        *((uint16_t *)(imageData + i * sizeof(uint16_t)));
+                    dataVal += frameNr;
+                    int channelVal =
+                        (dataVal & ~GAIN_VAL_MSK) | (gainVal << GAIN_VAL_OFST);
+                    *((uint16_t *)(imageData + i * sizeof(uint16_t))) =
+                        (uint16_t)channelVal;
+                }
+            }
             // sleep for exposure time
             struct timespec begin, end;
             clock_gettime(CLOCK_REALTIME, &begin);

slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h

@@ -24,16 +24,18 @@
 
 #define RUN_BUSY_OFST                       (0)
 #define RUN_BUSY_MSK                        (0x00000001 << RUN_BUSY_OFST)
-#define WAITING_FOR_TRIGGER_OFST            (3)
+#define WAITING_FOR_TRIGGER_OFST            (1)
 #define WAITING_FOR_TRIGGER_MSK             (0x00000001 << WAITING_FOR_TRIGGER_OFST)
-#define DELAYBEFORE_OFST                    (4) // Not used in software
+#define WAITING_FOR_START_FRAME_OFST        (2)
-#define DELAYBEFORE_MSK                     (0x00000001 << DELAYBEFORE_OFST) // Not used in software
+#define WAITING_FOR_START_FRAME_MSK         (0x00000001 << WAITING_FOR_START_FRAME_OFST)
-#define DELAYAFTER_OFST                     (5) // Not used in software
+#define ACQUIRING_FRAME_OFST                (3) // Not used in software
-#define DELAYAFTER_MSK                      (0x00000001 << DELAYAFTER_OFST) // Not used in software
+#define ACQUIRING_FRAME_MSK                 (0x00000001 << ACQUIRING_FRAME_OFST)
-#define STOPPED_OFST                        (15)
+#define WAITING_FOR_PERIOD_TO_ELAPSE_OFST   (4) // Not used in software
+#define WAITING_FOR_PERIOD_TO_ELAPSE_MSK    (0x00000001 << WAITING_FOR_PERIOD_TO_ELAPSE_OFST) 
+#define STOPPED_OFST                        (8)
 #define STOPPED_MSK                         (0x00000001 << STOPPED_OFST)
-#define RUNMACHINE_BUSY_OFST                (17)
+#define INTERNAL_STOP_OFST                  (9)
-#define RUNMACHINE_BUSY_MSK                 (0x00000001 << RUNMACHINE_BUSY_OFST)
+#define INTERNAL_STOP_MSK                   (0x00000001 << INTERNAL_STOP_OFST)
 
 /* Look at me register */
 #define LOOK_AT_ME_REG                      (0x03 << MEM_MAP_SHIFT) // Not used in firmware or software

slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c

@@ -2552,8 +2552,7 @@ void setPedestalMode(int enable, uint8_t frames, uint16_t loops) {
     if (enable) {
         LOG(logINFOBLUE, ("Enabling pedestal mode [frames: %hhu, loops: %hu]\n",
                           frames, loops));
-        // enable
+
-        bus_w(addr, bus_r(addr) | PEDESTAL_MODE_ENBLE_MSK);
         // frames
         bus_w(addr, bus_r(addr) & ~PEDESTAL_MODE_LNGTH_MSK);
         bus_w(addr, bus_r(addr) | ((frames << PEDESTAL_MODE_LNGTH_OFST) &
@@ -2562,6 +2561,8 @@ void setPedestalMode(int enable, uint8_t frames, uint16_t loops) {
         bus_w(addr, bus_r(addr) & ~PEDESTAL_MODE_ITRTNS_MSK);
         bus_w(addr, bus_r(addr) | ((loops << PEDESTAL_MODE_ITRTNS_OFST) &
                                    PEDESTAL_MODE_ITRTNS_MSK));
+        // enable
+        bus_w(addr, bus_r(addr) | PEDESTAL_MODE_ENBLE_MSK);
 
         // if it was switched off before, remember the #frames and #triggers
         if (prevPedestalEnable == 0) {
@@ -2726,6 +2727,7 @@ void *start_timer(void *arg) {
             if (i % pixelsPerPacket == 0) {
                 ++dataVal;
             }
+
             if ((i % 1024) < 300) {
                 gainVal = 1;
             } else if ((i % 1024) < 600) {
@@ -2766,6 +2768,28 @@ void *start_timer(void *arg) {
             clock_gettime(CLOCK_REALTIME, &begin);
             usleep(expUs);
 
+            // change gain and data for every frame
+            {
+                const int npixels = (NCHAN * NCHIP);
+                for (int i = 0; i < npixels; ++i) {
+                    int gainVal = 0;
+                    if ((i % 1024) < 300) {
+                        gainVal = 1 + iframes;
+                    } else if ((i % 1024) < 600) {
+                        gainVal = 2 + iframes;
+                    } else {
+                        gainVal = 3 + iframes;
+                    }
+                    int dataVal =
+                        *((uint16_t *)(imageData + i * sizeof(uint16_t)));
+                    dataVal += iframes;
+                    int pixelVal =
+                        (dataVal & ~GAIN_VAL_MSK) | (gainVal << GAIN_VAL_OFST);
+                    *((uint16_t *)(imageData + i * sizeof(uint16_t))) =
+                        (uint16_t)pixelVal;
+                }
+            }
+
             int srcOffset = 0;
             int srcOffset2 = DATA_BYTES / 2;
             int row0 = (numInterfaces == 1 ? detPos[1] : detPos[3]);
@@ -2900,14 +2924,17 @@ int softwareTrigger(int block) {
     LOG(logINFO, ("Sending Software Trigger\n"));
     bus_w(CONTROL_REG, bus_r(CONTROL_REG) | CONTROL_SOFTWARE_TRIGGER_MSK);
     bus_w(CONTROL_REG, bus_r(CONTROL_REG) & ~CONTROL_SOFTWARE_TRIGGER_MSK);
+    // wait to make sure its out of this state and even 'wait for start frame'
+    usleep(100);
 
 #ifndef VIRTUAL
-    // block till frame is sent out
+    // block till frame sent out & back to wait for trigger (or not busy
+    // anymore)
     if (block) {
-        enum runStatus s = getRunStatus();
+        uint32_t retval = bus_r(STATUS_REG);
-        while (s == RUNNING || s == TRANSMITTING) {
+        while ((retval & RUN_BUSY_MSK) && !(retval & WAITING_FOR_TRIGGER_MSK)) {
             usleep(5000);
-            s = getRunStatus();
+            retval = bus_r(STATUS_REG);
         }
     }
     LOG(logINFO, ("Ready for Next Trigger...\n"));
@@ -2940,9 +2967,16 @@ enum runStatus getRunStatus() {
     u_int32_t retval = bus_r(STATUS_REG);
     LOG(logINFO, ("Status Register: %08x\n", retval));
 
+    // error
+    if (retval & INTERNAL_STOP_MSK) {
+        LOG(logINFOBLUE, ("Status: ERROR\n"));
+        s = ERROR;
+    }
+
     // running
-    if (retval & RUN_BUSY_MSK) {
+    else if (retval & RUN_BUSY_MSK) {
-        if (retval & WAITING_FOR_TRIGGER_MSK) {
+        if ((retval & WAITING_FOR_TRIGGER_MSK) ||
+            (retval & WAITING_FOR_START_FRAME_MSK)) {
             LOG(logINFOBLUE, ("Status: WAITING\n"));
             s = WAITING;
         } else {
@@ -2953,19 +2987,13 @@ enum runStatus getRunStatus() {
 
     // not running
     else {
-        // stopped or error
+        // stopped or idle
         if (retval & STOPPED_MSK) {
             LOG(logINFOBLUE, ("Status: STOPPED\n"));
             s = STOPPED;
-        } else if (retval & RUNMACHINE_BUSY_MSK) {
+        } else {
-            LOG(logINFOBLUE, ("Status: READ MACHINE BUSY\n"));
-            s = TRANSMITTING;
-        } else if (!retval) {
             LOG(logINFOBLUE, ("Status: IDLE\n"));
             s = IDLE;
-        } else {
-            LOG(logERROR, ("Status: Unknown status %08x\n", retval));
-            s = ERROR;
         }
     }
 

slsDetectorServers/slsDetectorServer/src/blackfin.c

@@ -15,6 +15,11 @@ u_int32_t *csp0base = 0;
 #define CSP0     0x20200000
 #define MEM_SIZE 0x100000
 
+#ifdef JUNGFRAUD
+
+extern void configureChip();
+#endif
+
 void bus_w16(u_int32_t offset, u_int16_t data) {
     volatile u_int16_t *ptr1;
     ptr1 = (u_int16_t *)(csp0base + offset / 2);
@@ -80,7 +85,21 @@ u_int32_t readRegister(u_int32_t offset) {
 }
 
 u_int32_t writeRegister(u_int32_t offset, u_int32_t data) {
+    // if electron mode bit touched
+#ifdef JUNGFRAUD
+    int electronCollectionModeChange = 0;
+    if ((offset << MEM_MAP_SHIFT) == DAQ_REG) {
+        if ((readRegister(offset) ^ data) & DAQ_ELCTRN_CLLCTN_MDE_MSK) {
+            electronCollectionModeChange = 1;
+        }
+    }
+#endif
     bus_w(offset << MEM_MAP_SHIFT, data);
+#ifdef JUNGFRAUD
+    if (electronCollectionModeChange) {
+        configureChip();
+    }
+#endif
     return readRegister(offset);
 }
 

slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c

@@ -532,6 +532,11 @@ int executeCommand(char *command, char *result, enum TLogLevel level) {
 
     fflush(stdout);
     FILE *sysFile = popen(cmd, "r");
+    if (sysFile == NULL) {
+        ret = FAIL;
+        sprintf(mess, "Executing cmd[%s] failed\n", cmd);
+        return ret;
+    }
     while (fgets(temp, tempsize, sysFile) != NULL) {
         // size left excludes terminating character
         size_t sizeleft = MAX_STR_LENGTH - strlen(result) - 1;
@@ -547,17 +552,15 @@ int executeCommand(char *command, char *result, enum TLogLevel level) {
     if (strlen(result) == 0) {
         strcpy(result, "No result");
     }
-
-    int retval = OK;
     int success = pclose(sysFile);
-    if (success) {
+    if (success == -1) {
-        retval = FAIL;
+        ret = FAIL;
-        LOG(logERROR, ("Executing cmd[%s]:%s\n", cmd, result));
+        strcpy(mess, result);
+        LOG(logERROR, ("Executing cmd[%s] failed:%s\n", cmd, mess));
     } else {
         LOG(level, ("Result:\n[%s]\n", result));
     }
-
+    return ret;
-    return retval;
 }
 
 int M_nofunc(int file_des) {
@@ -585,7 +588,7 @@ int exec_command(int file_des) {
 
     // set
     if (Server_VerifyLock() == OK) {
-        ret = executeCommand(cmd, retval, logINFO);
+        executeCommand(cmd, retval, logINFO);
     }
     return Server_SendResult(file_des, OTHER, retval, sizeof(retval));
 }
@@ -1948,59 +1951,57 @@ int acquire(int blocking, int file_des) {
 #ifdef EIGERD
             // check for hardware mac and hardware ip
             if (udpDetails[0].srcmac != getDetectorMAC()) {
-                ret = FAIL;
+            ret = FAIL;
-                uint64_t sourcemac = getDetectorMAC();
+            uint64_t sourcemac = getDetectorMAC();
-                char src_mac[MAC_ADDRESS_SIZE];
+            char src_mac[MAC_ADDRESS_SIZE];
-                getMacAddressinString(src_mac, MAC_ADDRESS_SIZE, sourcemac);
+            getMacAddressinString(src_mac, MAC_ADDRESS_SIZE, sourcemac);
-                sprintf(
+            sprintf(mess,
-                    mess,
                     "Invalid udp source mac address for this detector. Must be "
                     "same as hardware detector mac address %s\n",
                     src_mac);
-                LOG(logERROR, (mess));
+            LOG(logERROR, (mess));
-            } else if (!enableTenGigabitEthernet(GET_FLAG) &&
+        } else if (!enableTenGigabitEthernet(GET_FLAG) &&
-                       (udpDetails[0].srcip != getDetectorIP())) {
+                   (udpDetails[0].srcip != getDetectorIP())) {
-                ret = FAIL;
+            ret = FAIL;
-                uint32_t sourceip = getDetectorIP();
+            uint32_t sourceip = getDetectorIP();
-                char src_ip[INET_ADDRSTRLEN];
+            char src_ip[INET_ADDRSTRLEN];
-                getIpAddressinString(src_ip, sourceip);
+            getIpAddressinString(src_ip, sourceip);
-                sprintf(
+            sprintf(mess,
-                    mess,
                     "Invalid udp source ip address for this detector. Must be "
                     "same as hardware detector ip address %s in 1G readout "
                     "mode \n",
                     src_ip);
-                LOG(logERROR, (mess));
+            LOG(logERROR, (mess));
-            } else
+        } else
 #endif
-                if (configured == FAIL) {
+            if (configured == FAIL) {
+            ret = FAIL;
+            strcpy(mess, "Could not start acquisition because ");
+            strcat(mess, configureMessage);
+            LOG(logERROR, (mess));
+        } else if (sharedMemory_getScanStatus() == RUNNING) {
+            ret = FAIL;
+            strcpy(mess, "Could not start acquisition because a scan is "
+                         "already running!\n");
+            LOG(logERROR, (mess));
+        } else {
+            memset(scanErrMessage, 0, MAX_STR_LENGTH);
+            sharedMemory_setScanStop(0);
+            sharedMemory_setScanStatus(IDLE); // if it was error
+            if (pthread_create(&pthread_tid, NULL, &start_state_machine,
+                               &blocking)) {
                 ret = FAIL;
-                strcpy(mess, "Could not start acquisition because ");
+                strcpy(mess, "Could not start acquisition thread!\n");
-                strcat(mess, configureMessage);
-                LOG(logERROR, (mess));
-            } else if (sharedMemory_getScanStatus() == RUNNING) {
-                ret = FAIL;
-                strcpy(mess, "Could not start acquisition because a scan is "
-                             "already running!\n");
                 LOG(logERROR, (mess));
             } else {
-                memset(scanErrMessage, 0, MAX_STR_LENGTH);
+                // wait for blocking always (scan or not)
-                sharedMemory_setScanStop(0);
+                // non blocking-no scan also wait (for error message)
-                sharedMemory_setScanStatus(IDLE); // if it was error
+                // non blcoking-scan dont wait (there is scanErrorMessage)
-                if (pthread_create(&pthread_tid, NULL, &start_state_machine,
+                if (blocking || !scan) {
-                                   &blocking)) {
+                    pthread_join(pthread_tid, NULL);
-                    ret = FAIL;
-                    strcpy(mess, "Could not start acquisition thread!\n");
-                    LOG(logERROR, (mess));
-                } else {
-                    // wait for blocking always (scan or not)
-                    // non blocking-no scan also wait (for error message)
-                    // non blcoking-scan dont wait (there is scanErrorMessage)
-                    if (blocking || !scan) {
-                        pthread_join(pthread_tid, NULL);
-                    }
                 }
             }
+        }
     }
     return Server_SendResult(file_des, INT32, NULL, 0);
 }
@@ -4771,7 +4772,8 @@ int set_read_n_rows(int file_des) {
     functionNotImplemented();
 #else
     // only set
-    if (Server_VerifyLock() == OK) {
+    if ((Server_VerifyLock() == OK) &&
+        (check_detector_idle("set number of rows") == OK)) {
         if (arg < MIN_ROWS_PER_READOUT || arg > MAX_ROWS_PER_READOUT) {
             ret = FAIL;
             sprintf(mess,
@@ -4803,8 +4805,7 @@ int set_read_n_rows(int file_des) {
                 LOG(logERROR, (mess));
             } else
 #elif defined(JUNGFRAUD) || defined(MOENCHD)
-            if ((check_detector_idle("set number of rows") == OK) &&
+            if (arg % READ_N_ROWS_MULTIPLE != 0) {
-                (arg % READ_N_ROWS_MULTIPLE != 0)) {
                 ret = FAIL;
                 sprintf(mess,
                         "Could not set number of rows. %d must be a multiple "
@@ -8471,9 +8472,9 @@ int set_master(int file_des) {
     functionNotImplemented();
 #else
     // only set
-    if (Server_VerifyLock() == OK) {
+    if ((Server_VerifyLock() == OK) &&
-        if ((check_detector_idle("set master") == OK) &&
+        (check_detector_idle("set master") == OK)) {
-            (arg != 0 && arg != 1)) {
+        if (arg != 0 && arg != 1) {
             ret = FAIL;
             sprintf(mess, "Could not set master. Invalid argument %d.\n", arg);
             LOG(logERROR, (mess));
@@ -9027,9 +9028,9 @@ int set_flip_rows(int file_des) {
     functionNotImplemented();
 #else
     // only set
-    if (Server_VerifyLock() == OK) {
+    if ((Server_VerifyLock() == OK) &&
-        if ((check_detector_idle("set flip rows") == OK) &&
+        (check_detector_idle("set flip rows") == OK)) {
-            (arg != 0 && arg != 1)) {
+        if (arg != 0 && arg != 1) {
             ret = FAIL;
             sprintf(mess, "Could not set flip rows. Invalid argument %d.\n",
                     arg);
@@ -10364,9 +10365,9 @@ int set_synchronization(int file_des) {
     functionNotImplemented();
 #else
     // only set
-    if (Server_VerifyLock() == OK) {
+    if ((Server_VerifyLock() == OK) &&
-        if ((check_detector_idle("set synchronization") == OK) &&
+        (check_detector_idle("set synchronization") == OK)) {
-            (arg != 0 && arg != 1)) {
+        if (arg != 0 && arg != 1) {
             ret = FAIL;
             sprintf(mess,
                     "Could not set synchronization. Invalid argument %d.\n",

slsDetectorSoftware/include/sls/Detector.h

@@ -216,7 +216,10 @@ class Detector {
     /** [Jungfrau][Moench] **/
     Result<bool> getSynchronization(Positions pos = {}) const;
 
-    /** [Jungfrau][Moench]  */
+    /** [Jungfrau][Moench]  Sync mode requires at least one master configured.
+       Also requires flatband cabling between master and slave with
+       termination board.
+     */
     void setSynchronization(bool value);
 
     /** [Gotthard2][Mythen3] */

slsDetectorSoftware/include/sls/Result.h

@@ -8,7 +8,8 @@
  * from the detector. Since every module could have a different value, we need
  * to return a vector instead of just a single value.
  *
- * Easy conversions to single values are provided using the squash method.
+ * Easy conversions to single values are provided using the squash and tsquash
+ * method.
  */
 
 #include <algorithm>
@@ -16,6 +17,7 @@
 #include <vector>
 
 #include "sls/ToString.h"
+#include "sls/TypeTraits.h"
 #include "sls/container_utils.h"
 
 namespace sls {
@@ -128,6 +130,25 @@ template <class T, class Allocator = std::allocator<T>> class Result {
     /** Test whether all elements of the result are equal */
     bool equal() const noexcept { return allEqual(vec); }
 
+    /** Test whether any element of the result are equal to a value */
+    bool any(const T &value) const noexcept { return anyEqualTo(vec, value); }
+
+    template <typename V, typename... Args, typename = AllSame<V, Args...>>
+    typename std::enable_if<std::is_same<V, T>::value, bool>::type
+    contains_only(const V &a, const Args &...args) const noexcept {
+        auto values = {a, args...};
+        for (const auto &element : vec) {
+            int found = 0;
+            for (const auto &value : values) {
+                if (value == element)
+                    found++;
+            }
+            if (!found)
+                return false;
+        }
+        return true;
+    }
+
     /** Convert Result<T> to std::vector<T> */
     operator std::vector<T>() { return vec; }
 };

slsDetectorSoftware/src/CmdProxy.h

@@ -1543,7 +1543,9 @@ class CmdProxy {
     INTEGER_COMMAND_SET_NOID_GET_ID(
         sync, getSynchronization, setSynchronization, StringTo<int>,
         "[0, 1]\n\t[Jungfrau][Moench] Enables or disables "
-        "synchronization between modules.");
+        "synchronization between modules. Sync mode requires at least one "
+        "master configured. Also requires flatband cabling between master and "
+        "slave with termination board.");
 
     INTEGER_COMMAND_VEC_ID(row, getRow, setRow, StringTo<int>,
                            "[value]\n\tSet Detector row (udp header) to value. "

slsDetectorSoftware/src/Detector.cpp

@@ -18,6 +18,7 @@
 
 #include <chrono>
 #include <fstream>
+#include <set>
 #include <thread>
 
 namespace sls {
@@ -873,18 +874,26 @@ void Detector::startDetectorReadout() {
 
 void Detector::stopDetector(Positions pos) {
 
-    // stop and check status X times
     int retries{0};
-    // avoid default construction of runStatus::IDLE on squash
+    auto status = getDetectorStatus(pos);
-    auto status = getDetectorStatus().squash(defs::runStatus::RUNNING);
+
-    while (status != defs::runStatus::IDLE &&
+    // jf sync fix: status [stopped or idle] = [stopped]
-           status != defs::runStatus::STOPPED) {
+    // sync issue: (master idle sometimes, slaves stopped)
-        if (status == defs::runStatus::ERROR) {
+
-            throw RuntimeError(
+    // eiger fix: stop multiple times from multi client till all modules stopped
-                "Could not stop detector. Returned error status.");
+    // issue: asynchronous start and stop scripts with a module being started
+    // (stop before) and waiting for the other to be done. So a module that was
+    // idle before stopping will return running (after async start script) when
+    // getting status after, which will then be stopped again.
+
+    while (!status.contains_only(defs::runStatus::IDLE,
+                                 defs::runStatus::STOPPED)) {
+        if (status.any(defs::runStatus::ERROR)) {
+            throw RuntimeError("Could not stop detector. At least one module "
+                               "returned error status.");
         }
         pimpl->stopDetector(pos);
-        status = getDetectorStatus().squash(defs::runStatus::RUNNING);
+        status = getDetectorStatus(pos);
         ++retries;
 
         if (retries == 10)
@@ -903,7 +912,7 @@ void Detector::stopDetector(Positions pos) {
             for (auto it : res) {
                 maxVal = std::max(maxVal, it);
             }
-            setNextFrameNumber(maxVal + 1);
+            setNextFrameNumber(maxVal + 1, pos);
         }
     } break;
     default:

slsDetectorSoftware/src/DetectorImpl.cpp

@@ -1220,10 +1220,26 @@ int DetectorImpl::acquire() {
         dataProcessingThread.join();
 
         if (acquisition_finished != nullptr) {
-            int status = Parallel(&Module::getRunStatus, {}).squash(ERROR);
+            // status
+            runStatus status = IDLE;
+            auto statusList = Parallel(&Module::getRunStatus, {});
+            status = statusList.squash(ERROR);
+            // difference, but none error
+            if (status == ERROR && (!statusList.any(ERROR))) {
+                // handle jf sync issue (master idle, slaves stopped)
+                if (statusList.contains_only(IDLE, STOPPED)) {
+                    status = STOPPED;
+                } else
+                    status = statusList.squash(RUNNING);
+            }
+
+            // progress
             auto a = Parallel(&Module::getReceiverProgress, {});
             double progress = (*std::max_element(a.begin(), a.end()));
-            acquisition_finished(progress, status, acqFinished_p);
+
+            // callback
+            acquisition_finished(progress, static_cast<int>(status),
+                                 acqFinished_p);
         }
 
         clock_gettime(CLOCK_REALTIME, &end);
@@ -1293,13 +1309,24 @@ void DetectorImpl::startAcquisition(const bool blocking, Positions pos) {
         std::vector<int> masters;
         std::vector<int> slaves;
         getMasterSlaveList(pos, masters, slaves);
+        if (masters.empty()) {
+            throw RuntimeError("Cannot start acquisition in sync mode. No "
+                               "master module found");
+        }
         if (!slaves.empty()) {
             Parallel(&Module::startAcquisition, slaves);
         }
-        if (!masters.empty()) {
+        if (blocking) {
-            Parallel((blocking ? &Module::startAndReadAll
+            Parallel(&Module::startAndReadAll, masters);
-                               : &Module::startAcquisition),
+            // ensure all status normal (slaves not blocking)
-                     masters);
+            // to catch those slaves that are still 'waiting'
+            auto status = Parallel(&Module::getRunStatus, pos);
+            if (!status.contains_only(IDLE, STOPPED, RUN_FINISHED)) {
+                throw RuntimeError("Acquisition not successful. "
+                                   "Unexpected detector status");
+            }
+        } else {
+            Parallel(&Module::startAcquisition, masters);
         }
     }
     // all in parallel

slsDetectorSoftware/src/DetectorImpl.h

@@ -84,9 +84,7 @@ class DetectorImpl : public virtual slsDetectorDefs {
      */
     virtual ~DetectorImpl();
 
-    template <class CT> struct NonDeduced {
+    template <class CT> struct NonDeduced { using type = CT; };
-        using type = CT;
-    };
     template <typename RT, typename... CT>
     Result<RT> Parallel(RT (Module::*somefunc)(CT...),
                         std::vector<int> positions,

slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp

@@ -356,15 +356,29 @@ TEST_CASE("powerindex", "[.cmd]") {
 TEST_CASE("powervalues", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
-    REQUIRE_NOTHROW(proxy.Call("powervalues", {}, -1, GET));
+
-    REQUIRE_THROWS(proxy.Call("powervalues", {}, -1, PUT));
+    auto det_type = det.getDetectorType().squash();
+
+    if (det_type == defs::CHIPTESTBOARD) {
+        REQUIRE_NOTHROW(proxy.Call("powervalues", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("powervalues", {}, -1, PUT));
+    } else {
+        REQUIRE_THROWS(proxy.Call("powervalues", {}, -1, GET));
+    }
 }
 
 TEST_CASE("slowadcvalues", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
-    REQUIRE_NOTHROW(proxy.Call("slowadcvalues", {}, -1, GET));
+
-    REQUIRE_THROWS(proxy.Call("slowadcvalues", {}, -1, PUT));
+    auto det_type = det.getDetectorType().squash();
+
+    if (det_type == defs::CHIPTESTBOARD) {
+        REQUIRE_NOTHROW(proxy.Call("slowadcvalues", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("slowadcvalues", {}, -1, PUT));
+    } else {
+        REQUIRE_THROWS(proxy.Call("slowadcvalues", {}, -1, GET));
+    }
 }
 
 TEST_CASE("slowadclist", "[.cmd]") {

slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp

@@ -689,10 +689,11 @@ TEST_CASE("confadc", "[.cmd]") {
     auto det_type = det.getDetectorType().squash();
 
     if (det_type == defs::GOTTHARD2) {
-        int ndet = det.size();
+        const int ndet = det.size();
-        int nchip = 10;
+        const int nchip = 10;
-        int nadc = 32;
+        const int nadc = 32;
-        int prev_val[ndet][nchip][nadc];
+        std::vector<std::vector<std::vector<int>>> prev_val(
+            ndet, std::vector<std::vector<int>>(nchip, std::vector<int>(nadc)));
         for (int i = 0; i != ndet; ++i) {
             for (int j = 0; j != nchip; ++j) {
                 for (int k = 0; k != nadc; ++k) {

slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp

@@ -23,7 +23,7 @@ TEST_CASE("Setting and reading back Jungfrau dacs", "[.cmd][.dacs]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+    if (det_type == defs::JUNGFRAU) {
         SECTION("vb_comp") { test_dac(defs::VB_COMP, "vb_comp", 1220); }
         SECTION("vdd_prot") { test_dac(defs::VDD_PROT, "vdd_prot", 3000); }
         SECTION("vin_com") { test_dac(defs::VIN_COM, "vin_com", 1053); }
@@ -163,7 +163,7 @@ TEST_CASE("chipversion", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+    if (det_type == defs::JUNGFRAU) {
         REQUIRE_NOTHROW(proxy.Call("chipversion", {}, -1, GET));
     } else {
         REQUIRE_THROWS(proxy.Call("chipversion", {}, -1, GET));
@@ -705,6 +705,34 @@ TEST_CASE("sync", "[.cmd]") {
             proxy.Call("sync", {}, -1, GET, oss);
             REQUIRE(oss.str() == "sync 1\n");
         }
+        // setting sync when running
+        {
+            auto prev_timing =
+                det.getTimingMode().tsquash("inconsistent timing mode in test");
+            auto prev_frames =
+                det.getNumberOfFrames().tsquash("inconsistent #frames in test");
+            auto prev_exptime =
+                det.getExptime().tsquash("inconsistent exptime in test");
+            auto prev_period =
+                det.getPeriod().tsquash("inconsistent period in test");
+            det.setTimingMode(defs::AUTO_TIMING);
+            det.setNumberOfFrames(10000);
+            det.setExptime(std::chrono::microseconds(200));
+            det.setPeriod(std::chrono::milliseconds(1000));
+            det.setSynchronization(1);
+            det.startDetector();
+            REQUIRE_THROWS(proxy.Call("sync", {"0"}, -1, PUT));
+            {
+                std::ostringstream oss;
+                proxy.Call("sync", {}, -1, GET, oss);
+                REQUIRE(oss.str() == "sync 1\n");
+            }
+            det.stopDetector();
+            det.setTimingMode(prev_timing);
+            det.setNumberOfFrames(prev_frames);
+            det.setExptime(prev_exptime);
+            det.setPeriod(prev_period);
+        }
         det.setSynchronization(prev_val);
     } else {
         REQUIRE_THROWS(proxy.Call("sync", {}, -1, GET));

slsDetectorSoftware/tests/test-CmdProxy-moench.cpp

@@ -18,5 +18,92 @@ using test::GET;
 using test::PUT;
 
 /* dacs */
+TEST_CASE("Setting and reading back moench dacs", "[.cmd][.dacs]") {
+    // vbp_colbuf, vipre, vin_cm, vb_sda, vcasc_sfp, vout_cm, vipre_cds,
+    // ibias_sfp
+    Detector det;
+    CmdProxy proxy(&det);
+    auto det_type = det.getDetectorType().squash();
+    if (det_type == defs::MOENCH) {
+        SECTION("vbp_colbuf") {
+            test_dac(defs::VBP_COLBUF, "vbp_colbuf", 1300);
+        }
+        SECTION("vipre") { test_dac(defs::VIPRE, "vipre", 1000); }
+        SECTION("vin_cm") { test_dac(defs::VIN_CM, "vin_cm", 1400); }
+        SECTION("vb_sda") { test_dac(defs::VB_SDA, "vb_sda", 680); }
+        SECTION("vcasc_sfp") { test_dac(defs::VCASC_SFP, "vcasc_sfp", 1428); }
+        SECTION("vout_cm") { test_dac(defs::VOUT_CM, "vout_cm", 1200); }
+        SECTION("vipre_cds") { test_dac(defs::VIPRE_CDS, "vipre_cds", 800); }
+        SECTION("ibias_sfp") { test_dac(defs::IBIAS_SFP, "ibias_sfp", 900); }
+        // eiger
+        REQUIRE_THROWS(proxy.Call("vthreshold", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vsvp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vsvn", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vtrim", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vrpreamp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vrshaper", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vtgstv", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcmp_ll", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcmp_lr", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcal", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcmp_rl", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcmp_rr", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("rxb_rb", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("rxb_lb", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcn", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vishaper", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("iodelay", {}, -1, GET));
+        // gotthard
+        REQUIRE_THROWS(proxy.Call("vref_ds", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcascn_pb", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcascp_pb", {}, -1, GET));
+        // REQUIRE_THROWS(proxy.Call("vout_cm", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcasc_out", {}, -1, GET));
+        // REQUIRE_THROWS(proxy.Call("vin_cm", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_comp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("ib_test_c", {}, -1, GET));
+        // mythen3
+        REQUIRE_THROWS(proxy.Call("vrpreamp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vrshaper", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vrshaper_n", {}, -1, GET));
+        // REQUIRE_THROWS(proxy.Call("vipre", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vishaper", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vdcsh", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vth1", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vth2", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vth3", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcal_n", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcal_p", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vtrim", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcassh", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcas", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vicin", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vipre_out", {}, -1, GET));
+        // gotthard2
+        REQUIRE_THROWS(proxy.Call("vref_h_adc", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_comp_fe", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_comp_adc", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcom_cds", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_rstore", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_opa_1st", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_comp_fe", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcom_adc1", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_l_adc", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_cds", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_cs", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_opa_fd", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcom_adc2", {}, -1, GET));
+        // jungfrau
+        REQUIRE_THROWS(proxy.Call("vb_comp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vdd_prot", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vin_com", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_prech", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_pixbuf", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_ds", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_ds", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_comp", {}, -1, GET));
+    }
+}
 
 } // namespace sls

slsDetectorSoftware/tests/test-CmdProxy.cpp

@@ -2064,7 +2064,7 @@ TEST_CASE("defaultdac", "[.cmd]") {
                 det.setDefaultDac(it, prev_val[i], {i});
             }
         }
-        if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+        if (det_type == defs::JUNGFRAU) {
             std::vector<defs::dacIndex> daclist = {
                 defs::VREF_PRECH, defs::VREF_DS, defs::VREF_COMP};
             for (auto it : daclist) {
@@ -2417,10 +2417,13 @@ TEST_CASE("scan", "[.cmd]") {
         notImplementedInd = defs::VCASCP_PB;
         break;
     case defs::JUNGFRAU:
-    case defs::MOENCH:
         ind = defs::VB_COMP;
         notImplementedInd = defs::VSVP;
         break;
+    case defs::MOENCH:
+        ind = defs::VIN_CM;
+        notImplementedInd = defs::VSVP;
+        break;
     case defs::GOTTHARD:
         ind = defs::VREF_DS;
         notImplementedInd = defs::VSVP;
@@ -3472,7 +3475,7 @@ TEST_CASE("lock", "[.cmd]") {
 TEST_CASE("execcommand", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
-    REQUIRE_NOTHROW(proxy.Call("execcommand", {"ls"}, -1, PUT));
+    REQUIRE_NOTHROW(proxy.Call("execcommand", {"ls *.txt"}, -1, PUT));
 }
 
 TEST_CASE("framecounter", "[.cmd]") {

slsDetectorSoftware/tests/test-Result.cpp

@@ -196,4 +196,24 @@ TEST_CASE("String conversions") {
             "[{one: 1}, {one: 1, three: 3, two: 2}, {one: 1}]");
 }
 
+TEST_CASE("Any element is equal") {
+    Result<int> r{1, 2, 3, 4, 5};
+    REQUIRE(r.any(3));
+    REQUIRE_FALSE(r.any(9));
+}
+
+TEST_CASE("Result contains only the specified elements") {
+    Result<int> r{1, 1, 1};
+    REQUIRE(r.contains_only(1));
+    REQUIRE(r.contains_only(1, 1));
+}
+
+TEST_CASE("Only with multiple values") {
+    Result<int> r{1, 1, 2, 1, 2, 1, 1};
+    REQUIRE_FALSE(r.contains_only(1));
+    REQUIRE_FALSE(r.contains_only(2));
+    REQUIRE(r.contains_only(1, 2));
+    REQUIRE(r.contains_only(2, 1));
+}
+
 } // namespace sls

slsSupportLib/include/sls/TypeTraits.h

@@ -103,4 +103,13 @@ template <typename T> struct is_vector : public std::false_type {};
 template <typename T>
 struct is_vector<std::vector<T>> : public std::true_type {};
 
+template <class...> struct Conjunction : std::true_type {};
+template <class B1> struct Conjunction<B1> : B1 {};
+template <class B1, class... Bn>
+struct Conjunction<B1, Bn...>
+    : std::conditional<bool(B1::value), Conjunction<Bn...>, B1>::type {};
+
+template <typename T, typename... Ts>
+using AllSame =
+    typename std::enable_if<Conjunction<std::is_same<T, Ts>...>::value>::type;
 } // namespace sls

slsSupportLib/include/sls/versionAPI.h

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: LGPL-3.0-or-other
 // Copyright (C) 2021 Contributors to the SLS Detector Package
 /** API versions */
-#define RELEASE      "developer"
+#define RELEASE      "8.0.0"
-#define APILIB       "developer 0x230224"
+#define APILIB       "8.0.0 0x231108"
-#define APIRECEIVER  "developer 0x230224"
+#define APIRECEIVER  "8.0.0 0x231108"
-#define APICTB       "developer 0x230922"
+#define APICTB       "8.0.0 0x231109"
-#define APIGOTTHARD  "developer 0x230922"
+#define APIGOTTHARD  "8.0.0 0x231109"
-#define APIGOTTHARD2 "developer 0x230922"
+#define APIGOTTHARD2 "8.0.0 0x231109"
-#define APIMYTHEN3   "developer 0x230922"
+#define APIJUNGFRAU  "8.0.0 0x231109"
-#define APIMOENCH    "developer 0x230922"
+#define APIMYTHEN3   "8.0.0 0x231109"
-#define APIEIGER     "developer 0x230922"
+#define APIMOENCH    "8.0.0 0x231109"
-#define APIJUNGFRAU "developer 0x230928"
+#define APIEIGER     "8.0.0 0x231109"

tests/scripts/test_simulators.py

@@ -4,7 +4,7 @@
 This file is used to start up simulators, receivers and run all the tests on them and finally kill the simulators and receivers.
 '''
 import argparse
-import os, sys, subprocess, time, colorama, signal, psutil
+import os, sys, subprocess, time, colorama, signal
 
 from colorama import Fore
 from slsdet import Detector, detectorType, detectorSettings
@@ -21,29 +21,37 @@ class RuntimeException (Exception):
 def Log(color, message):
     print('\n' + color + message, flush=True)
 
+
 def checkIfProcessRunning(processName):
-    '''
+    cmd = "ps -ef | grep " + processName
-    Check if there is any running process that contains the given name processName.
+    print(cmd)
-    https://gist.github.com/Sanix-Darker/8cbed2ff6f8eb108ce2c8c51acd2aa5a
+    res=subprocess.getoutput(cmd)
-    '''
+    print(res)
-    # Iterate over the all the running process
+    # eg. of output
-    for proc in psutil.process_iter():
+    #l_user  250506  243295  0 14:38 pts/5    00:00:00 /bin/sh -c ps -ef | grep slsReceiver
-        try:
+    #l_user  250508  250506  0 14:38 pts/5    00:00:00 grep slsReceiver
-            # Check if process name contains the given name string.
+
-            if processName.lower() in proc.name().lower():
+    print('how many')
-                return True
+    cmd = "ps -ef | grep " + processName + " | wc -l"
-        except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
+    print(cmd)
-            pass
+    res=subprocess.getoutput(cmd)
-    return False;
+    print(res)
+
+    if res == '2':
+        return False
+    return True
+
 
 def killProcess(name):
     if checkIfProcessRunning(name):
         Log(Fore.GREEN, 'killing ' + name)
         p = subprocess.run(['killall', name])
         if p.returncode != 0:
-            raise RuntimeException('error in killall ' + name)
+            raise RuntimeException('killall failed for ' + name)
+    else:
+        print('process not running : ' + name)
 
-def cleanup(name, d):
+def cleanup(name):
     '''
     kill both servers, receivers and clean shared memory
     '''
@@ -51,18 +59,27 @@ def cleanup(name, d):
     killProcess(name + 'DetectorServer_virtual')
     killProcess('slsReceiver')
     killProcess('slsMultiReceiver')
-    d.freeSharedMemory()
+    cleanSharedmemory()
+
+def cleanSharedmemory():
+    Log(Fore.GREEN, 'Cleaning up shared memory...')
+    try:
+        p = subprocess.run(['sls_detector_get', 'free'], stdout=fp, stderr=fp)
+    except:
+        Log(Fore.RED, 'Could not free shared memory')
+        raise
 
 def startProcessInBackground(name):
     try:
         # in background and dont print output
-        p = subprocess.Popen(name.split(), stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) 
+        p = subprocess.Popen(name.split(), stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, restore_signals=False) 
         Log(Fore.GREEN, 'Starting up ' + name + ' ...')
     except:
         Log(Fore.RED, 'Could not start ' + name)
         raise
 
 def startServer(name):
+    
     startProcessInBackground(name + 'DetectorServer_virtual')
     # second half
     if name == 'eiger':
@@ -79,6 +96,7 @@ def startReceiver(name):
     time.sleep(2)
 
 def loadConfig(name, rx_hostname, settingsdir):
+    Log(Fore.GREEN, 'Loading config')
     try:
         d = Detector()
         if name == 'eiger':
@@ -106,25 +124,36 @@ def loadConfig(name, rx_hostname, settingsdir):
         Log(Fore.RED, 'Could not load config for ' + name)
         raise
 
-def startCmdTests(name, fp):
+def startCmdTests(name, fp, fname):
-    try:
+    Log(Fore.GREEN, 'Cmd Tests for ' + name)
-        p = subprocess.run(['tests', '--abort', '[.cmd]'], stdout=fp, stderr=fp)
+    cmd = 'tests --abort [.cmd] -s -o ' + fname
-        if p.returncode != 0:
+    p = subprocess.run(cmd.split(), stdout=fp, stderr=fp, check=True, text=True)
-            raise Exception 
+    p.check_returncode()
-    except:
+
-        Log(Fore.RED, 'Cmd tests failed for ' + name) 
+    with open (fname, 'r') as f:
-        raise
+        for line in f:
+            if "FAILED" in line:
+                msg = 'Cmd tests failed for ' + name + '!!!'
+                Log(Fore.RED, msg)
+                raise Exception(msg)
+
+    Log(Fore.GREEN, 'Cmd Tests successful for ' + name)
+
+def startGeneralTests(fp, fname):
+    Log(Fore.GREEN, 'General Tests')
+    cmd = 'tests --abort -s -o ' + fname
+    p = subprocess.run(cmd.split(), stdout=fp, stderr=fp, check=True, text=True)
+    p.check_returncode()
+
+    with open (fname, 'r') as f:
+        for line in f:
+            if "FAILED" in line:
+                msg = 'General tests failed !!!'
+                Log(Fore.RED, msg)
+                raise Exception(msg)
+
+    Log(Fore.GREEN, 'General Tests successful')
 
-def startNormalTests(d, fp):
-    try:
-        Log(Fore.BLUE, '\nNormal tests')
-        p = subprocess.run(['tests', '--abort' ], stdout=fp, stderr=fp)
-        if p.returncode != 0:
-            raise Exception 
-        d.freeSharedMemory()
-    except:
-        Log(Fore.RED, 'Normal tests failed') 
-        raise
 
 
 # parse cmd line for rx_hostname and settingspath using the argparse library
@@ -149,46 +178,51 @@ if args.servers is None:
 else:
     servers = args.servers
 
-Log(Fore.WHITE, 'rx_hostname: ' + args.rx_hostname + '\settingspath: \'' + args.settingspath + '\'')
 
-
+Log(Fore.WHITE, 'Arguments:\nrx_hostname: ' + args.rx_hostname + '\nsettingspath: \'' + args.settingspath + '\'') 
-# handle zombies (else killing slsReceivers will fail)
-# dont care about child process success
-signal.signal(signal.SIGCHLD, signal.SIG_IGN)
 
 
 # redirect to file
+prefix_fname = '/tmp/slsDetectorPackage_virtual_test'
 original_stdout = sys.stdout
 original_stderr = sys.stderr
-fname = '/tmp/slsDetectorPackage_virtual_test.txt'
+fname = prefix_fname + '_log.txt'
-Log(Fore.BLUE, 'Tests -> ' + fname)
+Log(Fore.BLUE, '\nLog File: ' + fname) 
+
 with open(fname, 'w') as fp:
+
+    # general tests
+    file_results = prefix_fname + '_results_general.txt'
+    Log(Fore.BLUE, 'General tests (results: ' + file_results + ')')
     sys.stdout = fp
     sys.stderr = fp
-
+    Log(Fore.BLUE, 'General tests (results: ' + file_results + ')')
-    d = Detector()
+    startGeneralTests(fp, file_results)
-    # TODO: redirect Detector object print out also to file
-    startNormalTests(d, fp)
 
     for server in servers:
         try:
             # print to terminal for progress
             sys.stdout = original_stdout
             sys.stderr = original_stderr
-            Log(Fore.BLUE, server + ' tests')
+            file_results = prefix_fname + '_results_cmd_' + server + '.txt'
+            Log(Fore.BLUE, 'Cmd tests for ' + server + ' (results: ' + file_results + ')')
             sys.stdout = fp
             sys.stderr = fp
+            Log(Fore.BLUE, 'Cmd tests for ' + server + ' (results: ' + file_results + ')')
             
             # cmd tests for det
-            Log(Fore.BLUE, 'Cmd Tests for ' + server)
+            cleanup(server)
-            cleanup(server, d)
             startServer(server)
             startReceiver(server)
             loadConfig(server, args.rx_hostname, args.settingspath)
-            startCmdTests(server, fp)
+            startCmdTests(server, fp, file_results)
-            cleanup(server, d)
+            cleanup(server)
         except:
-            cleanup(server, d)
+            Log(log.RED, 'Exception caught. Cleaning up.')
+            cleanup(server)
+            sys.stdout = original_stdout
+            sys.stderr = original_stderr
+            Log(Fore.RED, 'Cmd tests failed for ' + server + '!!!')
             raise