Merge branch 'developer' into jf_json_rxroi

minor
Dev/jf/fix pedestal (#821 )
2025-06-23 10:07:59 +02:00 · 2023-10-06 12:02:16 +02:00 · 2023-10-06 11:55:20 +02:00 · 2023-10-05 10:29:33 +02:00 · 2023-10-03 17:22:32 +02:00 · 2023-08-04 16:12:27 +02:00
86 changed files with 1092 additions and 1938 deletions
--- a/CMakeLists.txt
+++ b/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 8.0.1)
+set(PROJECT_VERSION 7.0.0)

 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")

@ -33,7 +33,7 @@ else()
    # Standard behaviour use libzmq included in this repo (libs/libzmq)
    FetchContent_Declare(
        libzmq
-        URL ${CMAKE_CURRENT_SOURCE_DIR}/libs/libzmq/libzmq-4.3.4.tar.gz
+        URL ${CMAKE_SOURCE_DIR}/libs/libzmq/libzmq-4.3.4.tar.gz
        URL_HASH MD5=cc20b769ac10afa352e5ed2769bb23b3
    )
 endif()
--- a/RELEASE.txt
+++ b/RELEASE.txt
@ -1,13 +1,21 @@
-SLS Detector Package Major Release 8.0.1 released on 16.01.2024
+SLS Detector Package Major Release 7.x.x released on xx.xx.2023
 ===============================================================

-This document describes the differences between v8.0.1 and v8.0.0
+This document describes the differences between v7.x.x and v7.0.2   



    CONTENTS
    --------
-    1           Resolved Issues
+    1           New, Changed or Resolved Features
+        1.1     Compilation
+        1.2     Callback
+        1.3     Python
+        1.4     Client
+        1.5     Detector Server
+        1.6     Simulator
+        1.7     Receiver
+        1.8     Gui
    2           On-board Detector Server Compatibility
    3           Firmware Requirements
    4           Kernel Requirements
@ -16,27 +24,13 @@ This document describes the differences between v8.0.1 and v8.0.0



-1 Resolved Issues
-=================
+1 New, Changed or Resolved Features
+=====================================


-    Compilation
-    -----------
-
-
-    *   Fixed compilation error when building without zmq-devel installed
-        and removed dependency on zeromq in conda build. 
-
-
-    *   Fixed libzmq compilation error to build the package as a submodule.
-
-
-    Calibration
-    -----------
-
-
-    *   [Moench] Fixed Moench calibration
-
+- moench being made compatible with jungfrau 2.0 boards (jungfrau structure, away from ctb)
+- eiger febl and feb in versions
+- fix ctb slow adcs



@ -44,13 +38,13 @@ This document describes the differences between v8.0.1 and v8.0.0
 ==========================================


-    Eiger       8.0.0
-    Jungfrau    8.0.0
-    Mythen3     8.0.0
-    Gotthard2   8.0.0
-    Gotthard    8.0.0
-    Moench      8.0.0
-    Ctb         8.0.0
+    Eiger       7.0.0
+    Jungfrau    7.0.2
+    Mythen3     7.0.0
+    Gotthard2   7.0.0
+    Gotthard    7.0.0
+    Moench      7.0.0
+    Ctb         7.0.0
    

    On-board Detector Server Upgrade
@ -71,21 +65,21 @@ This document describes the differences between v8.0.1 and v8.0.0
 ========================


-    Eiger       02.10.2023 (v32)                    (updated in 7.0.3)
+    Eiger       20.02.2023 (v31)
    
-    Jungfrau    20.09.2023 (v1.5, HW v1.0)          (updated in 8.0.0)
-                21.09.2023 (v2.5, HW v2.0)          (updated in 8.0.0)
+    Jungfrau    04.11.2022 (v1.4, HW v1.0) 
+                03.11.2022 (v2.4, HW v2.0)

-    Mythen3     24.01.2023 (v1.4)                   (updated in 7.0.0)
+    Mythen3     24.01.2023 (v1.4)

-    Gotthard2   23.11.2022 (v0.3)                   (updated in 7.0.0)
+    Gotthard2   23.11.2022 (v0.3)

    Gotthard    08.02.2018 (50um and 25um Master)
                09.02.2018 (25 um Slave) 

-    Moench      10.07.2023 (v0.3.2)                 (updated in 8.0.0, under development)
+    Moench      05.12.2022 (v0.3)

-    Ctb         28.08.2023 (v1.2)                   (updated in 8.0.0)
+    Ctb         03.04.2023 (v1.2?)


    Detector Upgrade
--- a/cmk.sh
+++ b/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
--- a/conda-recepie/conda_build_config.yaml
+++ b/conda-recepie/conda_build_config.yaml
@ -3,5 +3,6 @@ python:
    - 3.9
    - 3.10
    - 3.11
-    - 3.12
    
+numpy: 
+    - 1.17
--- a/conda-recepie/meta.yaml
+++ b/conda-recepie/meta.yaml
@ -18,6 +18,7 @@ requirements:
    - {{compiler('cxx')}}
    - cmake
    - qt 5.*
+    - zeromq
    - xorg-libx11
    - xorg-libice
    - xorg-libxext
@ -36,6 +37,7 @@ requirements:
  host:
    - libstdcxx-ng
    - libgcc-ng
+    - zeromq
    - xorg-libx11
    - xorg-libice
    - xorg-libxext
@ -46,6 +48,7 @@ requirements:
    - expat

  run:
+    - zeromq
    - libstdcxx-ng
    - libgcc-ng 

@ -60,11 +63,15 @@ outputs:
        - {{compiler('cxx')}}
        - libstdcxx-ng
        - libgcc-ng
+        - zeromq

+      host:
+        - zeromq

      run: 
        - libstdcxx-ng
        - libgcc-ng
+        - zeromq

  - name: slsdet

@ -77,12 +84,10 @@ outputs:
        - {{compiler('cxx')}}
        - {{ pin_subpackage('slsdetlib', exact=True) }}
        - setuptools
-        - pybind11=2.11

      host:
        - python
        - {{ pin_subpackage('slsdetlib', exact=True) }}
-        - pybind11=2.11


      run:
--- a/docs/src/consuming.rst
+++ b/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.14)
+    cmake_minimum_required(VERSION 3.12)
    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.14)
+    cmake_minimum_required(VERSION 3.12)
    project(myintegration)

    find_package(slsDetectorPackage 5.0 REQUIRED)
--- a/docs/src/dependencies.rst
+++ b/docs/src/dependencies.rst
@ -13,36 +13,24 @@ 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.14 
+ * CMake > 3.12 
 * C++11 compatible compiler. (We test with gcc and clang)
-
-----------------------
-Python bindings
-----------------------
-
- * Python > 3.6
- * 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>` 
+ * ZeroMQ version 4

 -----------------------
 GUI
 -----------------------

 * Qt 5.9
- * Qwt 6.1.5 (packaged in libs)
+ * Qwt 6.1.5 (packaged in libs/)
+
+-----------------------
+Python bindings
+-----------------------
+
+ * Python > 3.6
+ * pybind11 (packaged in libs/)
+

 -----------------------
 Moench executables
@ -67,5 +55,3 @@ Packaged in libs/
 * catch2 (unit testing)
 * rapidjson (streaming from receiver)
 * pybind11 (python bindings)  
- * qwt (gui plotting)
- * libzmq (streaming to/from receiver)
--- a/docs/src/detector.rst
+++ b/docs/src/detector.rst
@ -1,19 +1,16 @@
 Detector
 ==============================================

-The sls::Detector is the public API to control 
+The sls::Detector is the new 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. (:ref:`Result class<Result Class>`)
+containing results from all modules. (Result<T>)

-Here are some :ref:`examples <Cplusplus Api Examples>` on how to use the API.
-
-.. _Cplusplus Api Examples:
 .. doxygenclass:: sls::Detector
   :members:
   :undoc-members:
--- a/docs/src/examples.rst
+++ b/docs/src/examples.rst
@ -1,4 +1,3 @@
-.. _Cplusplus Api Examples:



@ -54,8 +53,8 @@ then set up the detector.

    jungfrauDetectorServer_virtual

-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 a few such as stop and status on 1953. 
+This launches a virtual Jungfrau detector server. As default is uses port 1952 and 1953
+for communication over TCP. Most commands go on 1952 and only stop and status on 1953. 

 **Run example to configure**

@ -91,10 +90,7 @@ 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);



--- a/docs/src/firmware.rst
+++ b/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

-        #  older versions: v5.0.0 - 6.0.0 using tftp from tftp folder of pc
+        # v5.0.0 - 6.0.0 (copies server from tftp folder of the 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

-        #  older versions: v5.0.0 - 6.0.0 using tftp from tftp folder of pc
+        # v5.0.0 - 6.0.0 (copies server from tftp folder of the 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

-        #  older versions: v5.0.0 - 6.0.0 using tftp from tftp folder of pc
+        # v5.0.0 - 6.0.0 (copies server from tftp folder of the 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

-        #  older versions: v5.0.0 - 6.0.0 using tftp from tftp folder of pc
+        # v5.0.0 - 6.0.0 (copies server from tftp folder of the 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

-        #  older versions: v5.0.0 - 6.0.0 using tftp from tftp folder of pc
+        # v5.0.0 - 6.0.0 (copies server from tftp folder of the pc)
        sls_detector_put update ctbDetectorServervxxx pcxxx xx.pof

        # v6.1.1 - present (copies server from the full path provided)
--- a/docs/src/index.rst
+++ b/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.
-    For further documentation, visit the official page: https://www.psi.ch/en/detectors/documentation
+    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

 .. toctree::
    :maxdepth: 1
--- a/docs/src/installation.rst
+++ b/docs/src/installation.rst
@ -57,6 +57,7 @@ We have three different packages available:
 Build from source
 -------------------

+
 1. Download Source Code from github
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

@ -64,9 +65,23 @@ Build from source

    git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git --branch 6.1.1

-.. note ::   

-      For v6.x.x of slsDetectorPackage and older, refer :ref:`pybind11 notes on cloning. <pybind for different slsDetectorPackage versions>`  
+| **Pybind for Python**
+| 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:

@ -103,23 +118,20 @@ 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 (maybe multiple times till you see [g])
+    # first press [c] - configure
    # then press [g] - generate


-===============================     ===============================
+
+===============================     ===========================================
 Example cmake options               Comment
-===============================     ===============================
+===============================     ===========================================
 -DSLS_USE_PYTHON=ON                 Python
-DPython_FIND_VIRTUALENV=ONLY       Python from the conda env 
+-DPython_FIND_VIRTUALENV=ONLY       Python from only the conda environment 
+-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
@ -130,9 +142,9 @@ Build using in-built cmk.sh script

    The binaries are generated in slsDetectorPackage/build/bin directory.

-    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: ./cmk.sh [-b] [-c] [-d <HDF5 directory>] [e] [g] [-h] [i] [-j <Number of threads>] 
+    [-k <CMake command>] [-l <Install directory>] [m] [n] [-p] [-q <Zmq hint directory>] 
+    [r] [s] [t] [u] [z]  
    -[no option]: only make
    -b: Builds/Rebuilds CMake files normal mode
    -c: Clean
@ -147,6 +159,7 @@ 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
@ -163,13 +176,9 @@ Build using in-built cmk.sh script
    # new build, python and compile in parallel:
    ./cmk.sh -cbpj5

-    #For rebuilding only certain sections
-    ./cmk.sh -tg #only text client and gui
-    ./cmk.sh -r #only receiver
+    #To use the system zmq (/usr/lib64) instead
+    ./cmk.sh -cbj5 -q /usr/lib64

-.. 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
@ -182,7 +191,7 @@ using this compiler
 .. code-block:: bash

    #Create an environment with the dependencies
-    conda create -n myenv gxx_linux-64 cmake
+    conda create -n myenv gxx_linux-64 cmake zmq
    conda activate myenv

    # outside slsDetecorPackage folder
@ -191,11 +200,6 @@ 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)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -224,9 +228,9 @@ Build slsDetectorGui (Qt5)

        # create environment to compile
        # on rhel7
-        conda create -n slsgui gxx_linux-64 gxx_linux-64 mesa-libgl-devel-cos6-x86_64 qt
+        conda create -n slsgui zeromq gxx_linux-64 gxx_linux-64 mesa-libgl-devel-cos6-x86_64 qt
        # on fedora or newer systems
-        conda create -n slsgui qt
+        conda create -n slsgui zeromq qt

        # when using conda compilers, would also need libgl, but no need for it on fedora unless maybe using it with ROOT

@ -242,9 +246,6 @@ 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>` 



@ -257,7 +258,7 @@ is to use conda

 .. code-block:: bash

-    conda create -n myenv python=3.12 sphinx sphinx_rtd_theme breathe doxygen numpy
+    conda create -n myenv python sphinx_rtd_theme breathe


 .. code-block:: bash
@ -269,51 +270,3 @@ 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
-
--- a/docs/src/quick_start_guide.rst
+++ b/docs/src/quick_start_guide.rst
@ -109,14 +109,12 @@ For Multiple Modules
        # connects to mulitple modules
        hostname bchipxxx+bchipyyy+

-        # tcp port increases for each module (multi detector command)
-        rx_tcpport 2012
-
        # connects to receivers at ports 2012 and 2014
-        rx_hostname mpc1922
+        rx_hostname mpc1922:2012+mpc1922:2013+

-        # increasing udp ports (multi detector command)
-        udp_dstport 50012
+        # sets differernt destination udp ports
+        0:udp_dstport 50012
+        1:udp_dstport 50014

        # source udp ips must be same subnet at destintaion udp ips
        0:udp_srcip 192.168.1.112
--- a/docs/src/result.rst
+++ b/docs/src/result.rst
@ -1,5 +1,3 @@
-.. _Result Class:
-
 Result
 ==============================================

--- a/docs/src/slsreceiver.rst
+++ b/docs/src/slsreceiver.rst
@ -53,12 +53,7 @@ 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
-
-        # or specify multi modules with custom ports on same rxr pc
+        # multi modules with custom ports on same rxr pc
        0:rx_tcpport 1954
        1:rx_tcpport 1955
        2:rx_tcpport 1956
--- a/docs/src/troubleshooting.rst
+++ b/docs/src/troubleshooting.rst
@ -92,9 +92,6 @@ 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:

@ -424,20 +421,3 @@ 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
--- a/docs/src/virtualserver.rst
+++ b/docs/src/virtualserver.rst
@ -86,8 +86,7 @@ For a Single Module (With Options)
        udp_dstport 50012

        # source udp ips must be same subnet at destintaion udp ips
-        # takes the same ip as hostname
-        udp_srcip auto
+        udp_srcip 192.168.1.112

        # destination udp ip picked up from rx_hostname (if auto)
        udp_dstip auto
@ -102,14 +101,12 @@ For Multiple Modules
        virtual 2 1912
        # or hostname localhost:1912+localhost:1914+

-        # increasing receiver tcp ports (multi detector command)
-        rx_tcpport 2012
+        # connects to receivers at ports 2012 and 2014
+        rx_hostname mpc1922:2012+mpc1922:2013+

-        # connects to reciever at port 2012 and 2013
-        rx_hostname mpc1922
-
-        # sets increasing destination udp ports
-        udp_dstport 50012
+        # sets differernt destination udp ports
+        0:udp_dstport 50012
+        1:udp_dstport 50014

        # source udp ips must be same subnet at destintaion udp ips
        0:udp_srcip 192.168.1.112
--- a/examples/eiger_10Gb.config
+++ b/examples/eiger_10Gb.config
@ -4,26 +4,14 @@ detsize 1024 512
 # detector hostname for controls
 hostname beb059+beb058+ 

-# increasing receiver tcp port (multi detector command)
-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
+# 1Gb receiver pc hostname with tcp port to configure receiver
+rx_hostname x12sa-vcons:1991+x12sa-vcons:1992

 # udp port first quadrant, first halfmodule         
-#0:udp_dstport 50011 
+0:udp_dstport 50011 
+
 # udp port second quadrant, first halfmodule       
-#0:udp_dstport2 50012 
-# udp port first quadrant, second halfmodule       
-#1:udp_dstport 50013 
-# udp port second quadrant, second halfmodule  
-#1:udp_dstport2 50014 
+0:udp_dstport2 50012 

 # udp IP of the receiver over 10Gb              
 0:udp_dstip 10.0.30.210 
@ -31,6 +19,12 @@ udp_dstport 50011
 # 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  

--- a/examples/eiger_1Gb.config
+++ b/examples/eiger_1Gb.config
@ -4,23 +4,18 @@ detsize 1024 512
 # detector hostname for controls
 hostname beb059+beb058+ 

-# increasing receiver tcp port (multi detector command)
-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
+# 1Gb receiver pc hostname with tcp port to configure receiver
+rx_hostname x12sa-vcons:1991+x12sa-vcons:1992

 # 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
--- a/examples/jungfrau_two.config
+++ b/examples/jungfrau_two.config
@ -4,18 +4,14 @@ detsize 1024 1024
 # detector hostname
 hostname bchip048+bchip052+

-# increasing receiver ports 1954 and 1955 (multi detector command)
-rx_tcpport 1954
-
-# 1Gb receiver pc hostname
-rx_hostname pcmoench01
+# 1Gb receiver pc hostname  (default tcpport: 1954)
+rx_hostname pcmoench01:1954+pcmoench01:1955+


-# 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
@ -23,11 +19,17 @@ udp_dstport 50004
 # 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.2.100
+1:udp_dstip 10.1.1.100

 # udp source ip (same subnet as 1:udp_dstip)
-1:udp_srcip 10.1.2.11
+1:udp_srcip 10.1.1.11



@ -43,5 +45,5 @@ timing trigger
 # output file directory
 fpath /external_pool/jungfrau_data/softwaretest

-# disable file writing (default)
+# disable file writing
 fwrite 0
--- a/examples/rawdata.config
+++ b/examples/rawdata.config
@ -1,22 +0,0 @@
-numfiles 1
-nthreads 5,
-fifosize 5000
-nsigma 5
-gainfile none
-detectorMode counting
-threshold 0
-pedestalfile none
-nframes 0
-xMin 0
-xMax 400
-yMin 0
-yMax 400
-outdir ./
-indir ./
-flist none
-fformat none
-runmin 0
-runmax -1
-readnrows 400
-eMin 0
-eMax 16000
--- a/examples/virtual_eiger_2_half_modules.config
+++ b/examples/virtual_eiger_2_half_modules.config
@ -2,8 +2,10 @@
 hostname localhost:1900+localhost:1902+

 # udp destination ports
-udp_dstport 50000
-udp_dstport2 50001
+0:udp_dstport 50000
+0:udp_dstport2 50001
+1:udp_dstport 50002
+1:udp_dstport2 50003

 # receiver hostname
 rx_hostname mpc1922:2000+mpc1922:2001+
--- a/examples/virtual_jungfrau_4.config
+++ b/examples/virtual_jungfrau_4.config
@ -5,26 +5,24 @@ detsize 2048 1024
 virtual 4 1952

 # udp destination ports
-udp_dstport 50001
-#0:udp_dstport2 50001
-#0:udp_dstport2 50002
-#1:udp_dstport 50003
-#1:udp_dstport2 50004
-#2:udp_dstport 50005
-#2:udp_dstport2 50006
-#3:udp_dstport 50007
-#3:udp_dstport2 50008
+0:udp_dstport2 50001
+0:udp_dstport2 50002
+1:udp_dstport 50003
+1:udp_dstport2 50004
+2:udp_dstport 50005
+2:udp_dstport2 50006
+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
-rx_tcpport 1970
-#0:rx_tcpport 1970
-#1:rx_tcpport 1971
-#2:rx_tcpport 1972
-#3:rx_tcpport 1973
+0:rx_tcpport 1970
+1:rx_tcpport 1971
+2:rx_tcpport 1972
+3:rx_tcpport 1973
 rx_hostname mpc1922

 # udp destination ip from rx_hostname
--- a/examples/zmq.config
+++ b/examples/zmq.config
@ -1,16 +0,0 @@
-numinterfaces 1
-rx_zmqip 10.1.2.102
-rx_zmqport 1978
-zmqip 129.129.202.57
-zmqport 1979
-nthreads 6
-fifosize 5000
-nsigma 5
-gainfile none
-nbinsx 5
-nbinsy 5
-etafile none
-etabinsx 1000
-etabinsy 1000
-etamin -1
-etamax 2
--- a/python/setup.py
+++ b/python/setup.py
@ -7,6 +7,7 @@ Build upon the pybind11 example found here: https://github.com/pybind/python_exa

 import os
 import sys
+sys.path.append('../libs/pybind')
 from setuptools import setup, find_packages
 from pybind11.setup_helpers import Pybind11Extension, build_ext

@ -40,10 +41,11 @@ ext_modules = [
        
        ,
        include_dirs=[
+            os.path.join('../libs/pybind/include'),
            os.path.join(get_conda_path(), 'include'),

        ],
-        libraries=['SlsDetector', 'SlsSupport', 'SlsReceiver'],
+        libraries=['SlsDetector', 'SlsSupport', 'SlsReceiver', 'zmq'],
        library_dirs=[
            os.path.join(get_conda_path(), 'lib'),
        ],
--- a/python/slsdet/detector.py
+++ b/python/slsdet/detector.py
@ -360,8 +360,7 @@ class Detector(CppDetectorApi):
    @property
    def settings(self):
        """
-        Detector settings. 
-        Enum: detectorSettings
+        Detector settings. Enum: detectorSettings

        Note
        -----
@ -401,9 +400,6 @@ 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
@ -479,8 +475,7 @@ class Detector(CppDetectorApi):
    @element
    def gaincaps(self):
        """
-        [Mythen3] Gain caps. 
-        Enum: M3_GainCaps
+        [Mythen3] Gain caps. Enum: M3_GainCaps \n
        
        Note
        ----
@ -578,6 +573,8 @@ 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
@ -644,6 +641,9 @@ 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,8 +895,7 @@ class Detector(CppDetectorApi):
    @element
    def rx_discardpolicy(self):
        """
-        Frame discard policy of receiver. 
-        Enum: frameDiscardPolicy
+        Frame discard policy of receiver. Enum: frameDiscardPolicy
        
        Note
        -----
@ -970,8 +969,7 @@ 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
        -----
@ -1567,8 +1565,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def status(self):
-        """Gets detector status. 
-        Enum: runStatus
+        """Gets detector status. Enum: runStatus
        
        Note
        -----
@ -1582,8 +1579,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def rx_status(self):
-        """Gets receiver listener status. 
-        Enum: runStatus
+        """Gets receiver listener status. Enum: runStatus
        
        Note
        -----
@ -1677,11 +1673,6 @@ 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()

@ -1812,7 +1803,6 @@ class Detector(CppDetectorApi):
    def daclist(self):
        """
        List of enums/names for every dac for this detector
-
        :setter: Only implemented for Chiptestboard
        
        """
@ -1825,7 +1815,9 @@ class Detector(CppDetectorApi):
    @property
    def adclist(self):
        """
-        [Chiptestboard] List of names for every adc for this board. 32 adcs
+        List of names for every adc for this board. 32 adcs
+        :setter: Only implemented for Chiptestboard
+        
        """
        return self.getAdcNames()

@ -1836,7 +1828,9 @@ class Detector(CppDetectorApi):
    @property
    def signallist(self):
        """
-        [Chiptestboard] List of names for every io signal for this board. 64 signals        
+        List of names for every io signal for this board. 64 signals
+        :setter: Only implemented for Chiptestboard
+        
        """
        return self.getSignalNames()

@ -1847,7 +1841,8 @@ class Detector(CppDetectorApi):
    @property
    def powerlist(self):
        """
-        [Chiptestboard] List of names for every power for this board. 5 power supply
+        List of names for every power for this board. 5 power supply
+        :setter: Only implemented for Chiptestboard
        
        """
        return self.getPowerNames()
@ -1859,7 +1854,8 @@ class Detector(CppDetectorApi):
    @property
    def slowadclist(self):
        """
-        [Chiptestboard] List of names for every slowadc for this board. 8 slowadc
+        List of names for every slowadc for this board. 8 slowadc
+        :setter: Only implemented for Chiptestboard
        
        """
        return self.getSlowADCNames()
@ -1878,7 +1874,7 @@ class Detector(CppDetectorApi):

    @property
    def powervalues(self):
-        """[Chiptestboard] Gets the power values for every power for this detector."""
+        """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()
@ -1886,7 +1882,7 @@ class Detector(CppDetectorApi):

    @property
    def slowadcvalues(self):
-        """[Chiptestboard] Gets the slow adc values for every slow adc for this detector."""
+        """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()
@ -2060,7 +2056,8 @@ 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
@ -2084,8 +2081,7 @@ 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
        -----
@ -2174,8 +2170,7 @@ class Detector(CppDetectorApi):
    @element
    def timing(self):
        """
-        Set Timing Mode of detector. 
-        Enum: timingMode
+        Set Timing Mode of detector. Enum: timingMode
        
        Note
        -----
@ -2235,11 +2230,13 @@ class Detector(CppDetectorApi):
    @property
    @element
    def type(self):
-        """ Returns detector type. 
-        Enum: detectorType
-        [EIGER, JUNGFRAU, GOTTHARD, MOENCH, MYTHEN3, GOTTHARD2, CHIPTESTBOARD]
+        """ Returns detector type. Enum: detectorType
+        
+        Note
+        ----

        :setter: Not implemented
+        Values: EIGER, JUNGFRAU, GOTTHARD, MOENCH, MYTHEN3, GOTTHARD2, CHIPTESTBOARD
        """
        return self.getDetectorType()

@ -2500,6 +2497,9 @@ 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,8 +2777,7 @@ class Detector(CppDetectorApi):
    @property
    def gainmode(self):
        """
-        [Jungfrau] Detector gain mode. 
-        Enum: gainMode
+        [Jungfrau] Detector gain mode. Enum: gainMode
        
        Note
        -----
@ -2891,7 +2890,10 @@ 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
        
@ -2910,8 +2912,7 @@ class Detector(CppDetectorApi):
    @element
    def timingsource(self):
        """
-        [Gotthard2] Timing source. 
-        Enum: timingSourceType
+        [Gotthard2] Timing source. Enum: timingSourceType
        
        Note
        -----
@ -2955,8 +2956,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def burstmode(self):
-        """[Gotthard2] Burst mode of detector. 
-        Enum: burstMode
+        """[Gotthard2] Burst mode of detector. Enum: burstMode
        
        Note
        ----
@ -2974,6 +2974,9 @@ 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

@ -3096,8 +3099,7 @@ class Detector(CppDetectorApi):

    @property
    def vetoalg(self):
-        """[Gotthard2] Algorithm used for veto. 
-        Enum: vetoAlgorithm, streamingInterface
+        """[Gotthard2] Algorithm used for veto. Enum: vetoAlgorithm, streamingInterface
        
        Note
        ----
@ -3271,8 +3273,7 @@ class Detector(CppDetectorApi):
    @element
    def romode(self):
        """
-        [CTB] Readout mode of detector. 
-        Enum: readoutMode
+        [CTB] Readout mode of detector. Enum: readoutMode
        
        Note
        ------
@ -3378,6 +3379,9 @@ 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()
@ -3422,6 +3426,9 @@ class Detector(CppDetectorApi):
    def maxadcphaseshift(self):
        """[Jungfrau][Moench][CTB] Absolute maximum Phase shift of ADC clock.
        
+        Note
+        -----
+        
        :setter: Not Implemented
        """
        return self.getMaxADCPhaseShift()
@ -3471,6 +3478,9 @@ class Detector(CppDetectorApi):
        """
        [Ctb] Sync clock in MHz.
        
+        Note
+        -----
+        
        :setter: Not implemented
        """
        return self.getSYNCClock()
@ -3479,6 +3489,9 @@ class Detector(CppDetectorApi):
    def pattern(self):
        """[Mythen3][Ctb] Loads ASCII pattern file directly to server (instead of executing line by line).
        
+        Note
+        ----
+        
        :getter: Not Implemented
        
        Example
@ -3907,6 +3920,9 @@ class Detector(CppDetectorApi):
    def im_a(self):
        """[Ctb] Measured current of power supply a in mA.
        
+        Note
+        -----
+        
        :setter: Not implemented
        """
        return self.getMeasuredCurrent(dacIndex.I_POWER_A)
@ -3916,6 +3932,9 @@ 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)
@ -3925,6 +3944,9 @@ 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)
@ -3934,6 +3956,9 @@ 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)
@ -3943,6 +3968,9 @@ 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)
@ -3992,6 +4020,9 @@ 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
        
@ -4026,6 +4057,9 @@ class Detector(CppDetectorApi):
        """
        [Gotthard2][Mythen3] Frequency of clock in Hz. 
        
+        Note
+        ----
+        
        :setter: Not implemented. Use clkdiv to set frequency

        Example
@ -4045,9 +4079,7 @@ 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
--- a/serverBin/ctbDetectorServer_developer
+++ b/serverBin/ctbDetectorServer_developer
@ -0,0 +1 @@
+../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
--- a/serverBin/ctbDetectorServerv8.0.0
+++ b/serverBin/ctbDetectorServerv8.0.0
@ -1 +0,0 @@
-../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv8.0.0
--- a/serverBin/eigerDetectorServer_developer
+++ b/serverBin/eigerDetectorServer_developer
@ -0,0 +1 @@
+../slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
--- a/serverBin/eigerDetectorServerv8.0.0
+++ b/serverBin/eigerDetectorServerv8.0.0
@ -1 +0,0 @@
-../slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv8.0.0
--- a/serverBin/gotthard2DetectorServer_developer
+++ b/serverBin/gotthard2DetectorServer_developer
@ -0,0 +1 @@
+../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
--- a/serverBin/gotthard2DetectorServerv8.0.0
+++ b/serverBin/gotthard2DetectorServerv8.0.0
@ -1 +0,0 @@
-../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv8.0.0
--- a/serverBin/gotthardDetectorServer_developer
+++ b/serverBin/gotthardDetectorServer_developer
@ -0,0 +1 @@
+../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
--- a/serverBin/gotthardDetectorServerv8.0.0
+++ b/serverBin/gotthardDetectorServerv8.0.0
@ -1 +0,0 @@
-../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv8.0.0
--- a/serverBin/jungfrauDetectorServer_developer
+++ b/serverBin/jungfrauDetectorServer_developer
@ -0,0 +1 @@
+../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
--- a/serverBin/jungfrauDetectorServerv8.0.0
+++ b/serverBin/jungfrauDetectorServerv8.0.0
@ -1 +0,0 @@
-../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv8.0.0
--- a/serverBin/moenchDetectorServer_developer
+++ b/serverBin/moenchDetectorServer_developer
@ -0,0 +1 @@
+../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
--- a/serverBin/moenchDetectorServerv8.0.0
+++ b/serverBin/moenchDetectorServerv8.0.0
@ -1 +0,0 @@
-../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv8.0.0
--- a/serverBin/mythen3DetectorServer_developer
+++ b/serverBin/mythen3DetectorServer_developer
@ -0,0 +1 @@
+../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
--- a/serverBin/mythen3DetectorServerv8.0.0
+++ b/serverBin/mythen3DetectorServerv8.0.0
@ -1 +0,0 @@
-../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv8.0.0
--- a/slsDetectorCalibration/dataStructures/jungfrauLGADStrixelsData_new.h
+++ b/slsDetectorCalibration/dataStructures/jungfrauLGADStrixelsData_new.h
@ -28,6 +28,10 @@
    @li version is the version number of this structure format
 */

+#include <algorithm>
+#include <numeric>
+#include <tuple>
+
 namespace strixelSingleChip {
 constexpr int nc_rawimg = 1024; // for full images  //256;
 constexpr int nr_rawimg = 512;
@ -77,7 +81,7 @@ constexpr int c6g1_ystart = c6g2_yend + 1;        // 448
 constexpr int c6g1_yend = c6g2_yend + 64 - gr;    // 502

 // y shift due to faulty bonding (relevant for M408)
-constexpr int bond_shift_y = 1; // CHANGE IF YOU CHANGE MODULE!
+constexpr int bond_shift_y = 0; // CHANGE IF YOU CHANGE MODULE!

 } // namespace strixelSingleChip

@ -97,6 +101,13 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
    int chip_x0;
    int chip_y0;
    int x0, y0, x1, y1, shifty;
+    struct {
+      uint16_t xmin;
+      uint16_t xmax;
+      uint16_t ymin;
+      uint16_t ymax;
+      int nc;
+    } globalROI;

    int getMultiplicator(const int group) {
        int multiplicator;
@ -215,9 +226,113 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
        }
    }

-    void remapROI(uint16_t xmin, uint16_t xmax, uint16_t ymin, uint16_t ymax) {
+
+    std::tuple< uint16_t, uint16_t, uint16_t, uint16_t > adjustROItoLimits(uint16_t xmin,
+									   uint16_t xmax,
+									   uint16_t ymin,
+									   uint16_t ymax,
+									   uint16_t lim_roi_xmin,
+									   uint16_t lim_roi_xmax,
+									   uint16_t lim_roi_ymin,
+									   uint16_t lim_roi_ymax) {
+      uint16_t xmin_roi, xmax_roi, ymin_roi, ymax_roi;
+      if ( xmin < lim_roi_xmin)
+        xmin_roi = lim_roi_xmin;
+      else
+        xmin_roi = xmin;
+      if ( xmax > lim_roi_xmax )
+        xmax_roi = lim_roi_xmax;
+      else
+        xmax_roi = xmax;
+      if ( ymin < lim_roi_ymin )
+        ymin_roi = lim_roi_ymin;
+      else
+        ymin_roi = ymin;
+      if ( ymax > lim_roi_ymax )
+        ymax_roi = lim_roi_ymax;
+      else
+        ymax_roi = ymax;
+      return std::make_tuple(xmin_roi, xmax_roi, ymin_roi, ymax_roi);
+    }
+
+    std::vector < std::tuple< int, int, uint16_t, uint16_t, uint16_t, uint16_t > > mapSubROIs(uint16_t xmin,
+											      uint16_t xmax,
+											      uint16_t ymin,
+											      uint16_t ymax) {
+      bool chip_1_1 = false;
+      bool chip_1_2 = false;
+      bool chip_1_3 = false;
+      bool chip_6_1 = false;
+      bool chip_6_2 = false;
+      bool chip_6_3 = false;
+
+      for ( int x=xmin; x!=xmax+1; ++x ) {
+	for ( int y=ymin; y!=ymax; ++y ) {
+	  if ( c1g1_xstart<=x && x<=c1_xend && (c1g1_ystart+bond_shift_y)<=y && y<=(c1g1_yend+bond_shift_y) )
+	    chip_1_1 = true;
+	  if ( c1g2_xstart<=x && x<=c1_xend && (c1g2_ystart+bond_shift_y)<=y && y<=(c1g2_yend+bond_shift_y) )
+	    chip_1_2 = true;
+	  if ( c1g3_xstart<=x && x<=c1_xend && (c1g3_ystart+bond_shift_y)<=y && y<=(c1g3_yend+bond_shift_y) )
+	    chip_1_3 = true;
+	  if ( c6_xstart<=x && x<=c6g1_xend && (c6g1_ystart-bond_shift_y)<=y && y<=(c6g1_yend-bond_shift_y) )
+	    chip_6_1 = true;
+	  if ( c6_xstart<=x && x<=c6g2_xend && (c6g2_ystart-bond_shift_y)<=y && y<=(c6g2_yend-bond_shift_y) )
+	    chip_6_2 = true;
+	  if ( c6_xstart<=x && x<=c6g3_xend && (c6g3_ystart-bond_shift_y)<=y && y<=(c6g3_yend-bond_shift_y) )
+	    chip_6_3 = true;
+	}
+      }
+
+      uint16_t xmin_roi{}, xmax_roi{}, ymin_roi{}, ymax_roi{};
+       //[ chip, group, xmin, xmax, ymin, ymax ]
+      std::vector < std::tuple< int, int, uint16_t, uint16_t, uint16_t, uint16_t > > rois{};
+
+      if (chip_1_1) {
+	std::tie( xmin_roi, xmax_roi, ymin_roi, ymax_roi ) =
+	  adjustROItoLimits( xmin, xmax, ymin, ymax,
+			     c1g1_xstart, c1_xend, 0, c1g1_yend+bond_shift_y );
+	rois.push_back( std::make_tuple( 1, 1, xmin_roi, xmax_roi, ymin_roi, ymax_roi ) );
+      }
+      if (chip_1_2) {
+	std::tie( xmin_roi, xmax_roi, ymin_roi, ymax_roi ) =
+	  adjustROItoLimits( xmin, xmax, ymin, ymax,
+			     c1g2_xstart, c1_xend, c1g2_ystart+bond_shift_y, c1g2_yend+bond_shift_y );
+	rois.push_back( std::make_tuple( 1, 2, xmin_roi, xmax_roi, ymin_roi, ymax_roi ) );
+      }
+      if (chip_1_3) {
+	std::tie( xmin_roi, xmax_roi, ymin_roi, ymax_roi ) =
+	  adjustROItoLimits( xmin, xmax, ymin, ymax,
+			     c1g3_xstart, c1_xend, c1g3_ystart+bond_shift_y, c1g3_yend+bond_shift_y );
+	rois.push_back( std::make_tuple( 1, 3, xmin_roi, xmax_roi, ymin_roi, ymax_roi ) );
+      }
+      if (chip_6_3) {
+	std::tie( xmin_roi, xmax_roi, ymin_roi, ymax_roi ) =
+	  adjustROItoLimits( xmin, xmax, ymin, ymax,
+			     c6_xstart, c6g3_xend, c6g3_ystart-bond_shift_y, c6g3_yend-bond_shift_y );
+	rois.push_back( std::make_tuple( 6, 3, xmin_roi, xmax_roi, ymin_roi, ymax_roi ) );
+      }
+      if (chip_6_2) {
+	std::tie( xmin_roi, xmax_roi, ymin_roi, ymax_roi ) =
+	  adjustROItoLimits( xmin, xmax, ymin, ymax,
+			     c6_xstart, c6g2_xend, c6g2_ystart-bond_shift_y, c6g2_yend-bond_shift_y );
+	rois.push_back( std::make_tuple( 6, 2, xmin_roi, xmax_roi, ymin_roi, ymax_roi ) );
+      }
+      if (chip_6_1) {
+	std::tie( xmin_roi, xmax_roi, ymin_roi, ymax_roi ) =
+	  adjustROItoLimits( xmin, xmax, ymin, ymax,
+			     c6_xstart, c6g1_xend, c6g1_ystart-bond_shift_y, 511 );
+	rois.push_back( std::make_tuple( 6, 1, xmin_roi, xmax_roi, ymin_roi, ymax_roi ) );
+      }
+
+      return rois;
+
+    }
+
+    void remapROI(std::tuple< int, int, uint16_t, uint16_t, uint16_t, uint16_t > roi) {
        // determine group and chip selected by ROI
-        int group;
+      int group, xmin, xmax, ymin, ymax;
+	std::tie( mchip, group, xmin, xmax, ymin, ymax ) = roi;
+	/*
        if (ymax <= c1g1_yend + bond_shift_y) {
            group = 1;
            mchip = 1;
@ -243,18 +358,17 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
 	  group = -1;
 	  mchip = -1;
 	}
+	*/
        int multiplicator = getMultiplicator(group);
        setMappingShifts(group);

-        std::cout << "chip: " << mchip << ", group: " << group << ", m: " << multiplicator
+        std::cout << "remapping chip: " << mchip << ", group: " << group << ", m: " << multiplicator
                  << ", x0: " << x0 << ", x1: " << x1 << ", y0: " << y0
                  << ", y1: " << y1 << std::endl;
-
-        // get ROI raw image number of columns
-        int nc_roi = xmax - xmin + 1;
-        std::cout << "nc_roi = " << nc_roi << std::endl;
+	std::cout << "Adjusted roi: [" << xmin << ", " << xmax << ", " << ymin << ", " << ymax << "]" << std::endl;

        // make sure loop bounds are correct
+	/*
        if (y0 < ymin)
            std::cout << "Error ymin" << std::endl;
        if (y1 > ymax)
@ -264,6 +378,7 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
            std::cout << "Error xmin" << std::endl;
        if (x1 > xmax)
            std::cout << "Error xmax" << std::endl;
+	*/

        // remapping loop
        int ix, iy = 0;
@ -277,8 +392,10 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
                }

                //	  if (iy< 40)	  cout << iy << "  " << ix <<endl;
-                dataMap[iy][ix] =
-                    sizeof(header) + (nc_roi * (ipy - ymin) + (ipx - xmin)) * 2;
+		if ( ipx>=xmin && ipx<=xmax && ipy>=ymin && ipy <=ymax )
+		  dataMap[iy][ix] =
+                    sizeof(header) + (globalROI.nc * (ipy - globalROI.ymin) + (ipx - globalROI.xmin)) * 2;
+		else dataMap[iy][ix] = sizeof(header);
                groupmap[iy][ix] = group - 1;
            }
        }
@ -307,16 +424,31 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
            }
        }

+	globalROI.xmin = xmin;
+	globalROI.xmax = xmax;
+	globalROI.ymin = ymin;
+	globalROI.ymax = ymax;
+
        std::cout << "sizeofheader = " << sizeof(header) << std::endl;
        std::cout << "Jungfrau strixels 2X single chip with full module data "
                  << std::endl;

        if (xmin < xmax && ymin < ymax) {

-            dataSize =
-                (xmax - xmin + 1) * (ymax - ymin + 1) * 2 + sizeof(header);
-            std::cout << "datasize " << dataSize << std::endl;
-            remapROI(xmin, xmax, ymin, ymax);
+	  // get ROI raw image number of columns
+	  globalROI.nc = xmax - xmin + 1;
+	  std::cout << "nc_roi = " << globalROI.nc << std::endl;
+	  
+	  dataSize =
+	    (xmax - xmin + 1) * (ymax - ymin + 1) * 2 + sizeof(header);
+	  std::cout << "datasize " << dataSize << std::endl;
+
+	  //[ chip, group, xmin, xmax, ymin, ymax ]
+	  auto rois = mapSubROIs(xmin, xmax, ymin, ymax);
+	  //function to fill vector of rois from globalROI
+
+	  for ( auto roi : rois )
+	    remapROI(roi);

        } else {

--- a/slsDetectorCalibration/dataStructures/jungfrauModuleData.h
+++ b/slsDetectorCalibration/dataStructures/jungfrauModuleData.h
@ -3,6 +3,7 @@
 #ifndef JUNGFRAUMODULEDATA_H
 #define JUNGFRAUMODULEDATA_H
 #include <cstdint>
+#include "sls/sls_detector_defs.h"
 #include "slsDetectorData.h"

 //#define VERSION_V2
@ -27,7 +28,7 @@ typedef struct {
    uint64_t bunchNumber; /**< is the frame number */
    uint64_t pre;         /**< something */

-} jf_header;
+} jf_header; //Aldo's header!

 using namespace std;  
 class jungfrauModuleData : public slsDetectorData<uint16_t> {
@ -42,20 +43,56 @@ class jungfrauModuleData : public slsDetectorData<uint16_t> {
       1286 large etc.) \param c crosstalk parameter for the output buffer

   */
+
+#ifdef ALDO
+    using header = jf_header;
+#else
+    using header = sls::defs::sls_receiver_header;
+#endif
+
 #ifndef ZMQ
-#define off sizeof(jf_header)
+#define off sizeof(header)
 #endif
 #ifdef ZMQ
 #define off 0
 #endif


-    jungfrauModuleData()
+ jungfrauModuleData(uint16_t xmin=0, uint16_t xmax=0,
+		    uint16_t ymin=0, uint16_t ymax=0)
        : slsDetectorData<uint16_t>(1024, 512,
                                    1024* 512 * 2 + off) {

-        for (int ix = 0; ix < 1024; ix++) {
-            for (int iy = 0; iy < 512; iy++) {
+      for (int ix = 0; ix != 1024; ++ix) {
+	for (int iy = 0; iy != 512; ++iy) {
+	  dataMap[iy][ix] = off;
+	}
+      }
+
+      if (xmin < xmax && ymin < ymax) {
+
+	int nc_roi = xmax - xmin + 1;
+	int nr_roi = ymax - ymin + 1;
+	std::cout << "nc_roi = " << nc_roi << std::endl;
+	std::cout << "nr_roi = " << nr_roi << std::endl;
+	  
+	dataSize =
+	  (xmax - xmin + 1) * (ymax - ymin + 1) * 2 + off;
+	std::cout << "datasize " << dataSize << std::endl;
+
+	for (int ix = xmin; ix < xmax+1; ++ix) {
+            for (int iy = ymin; iy < ymax+1; ++iy) {
+                dataMap[iy][ix] = off + (nc_roi * iy + ix) * 2;
+#ifdef HIGHZ
+                dataMask[iy][ix] = 0x3fff;
+#endif
+            }
+        }
+
+      } else {
+	  
+        for (int ix = 0; ix < 1024; ++ix) {
+            for (int iy = 0; iy < 512; ++iy) {
                dataMap[iy][ix] = off + (1024 * iy + ix) * 2;
 #ifdef HIGHZ
                dataMask[iy][ix] = 0x3fff;
@ -63,7 +100,7 @@ class jungfrauModuleData : public slsDetectorData<uint16_t> {
            }
        }

-
+      }


        iframe = 0;
@ -150,7 +187,7 @@ class jungfrauModuleData : public slsDetectorData<uint16_t> {
        //int pn;

        //  cout << dataSize << endl;
-        if (ff >= 0)
+        //if (ff >= 0)
 	  //fnum = ff;

        if (filebin.is_open()) {
--- a/slsDetectorCalibration/dataStructures/moench03v2Data.h
+++ b/slsDetectorCalibration/dataStructures/moench03v2Data.h
@ -1,240 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-or-other
-// Copyright (C) 2021 Contributors to the SLS Detector Package
-#ifndef MOENCH03v2DATA_H
-#define MOENCH03v2DATA_H
-//#define MYROOT
-
-#ifndef MYROOT
-#include "sls/sls_detector_defs.h"
-#endif
-
-
-
-
-#ifdef MYROOT
-
-    typedef struct {
-        uint64_t frameNumber;
-        uint32_t expLength;
-        uint32_t packetNumber;
-        uint64_t bunchId;
-        uint64_t timestamp;
-        uint16_t modId;
-        uint16_t row;
-        uint16_t column;
-        uint16_t reserved;
-        uint32_t debug;
-        uint16_t roundRNumber;
-        uint8_t detType;
-        uint8_t version;
-    } sls_detector_header;
-#define MAX_NUM_PACKETS 512
-// using sls_bitset = std::bitset<MAX_NUM_PACKETS>;
-//  using bitset_storage = uint8_t[MAX_NUM_PACKETS / 8];
-  struct sls_receiver_header {
-        sls_detector_header detHeader; /**< is the detector header */
-        uint8_t packetsMask[64];        /**< is the packets caught bit mask */
-    };
-#endif
-
-#include "slsDetectorData.h"
-#ifdef RAWDATA
-#define DATA_OFFSET sizeof(header)
-#endif
-#ifndef RAWDATA
-#define DATA_OFFSET 0
-#endif
-
-
-class moench03v2Data : public slsDetectorData<uint16_t> {
-
-  private:
-    int iframe;
-    const int nRows;
-    
-    
-
-    double ghost[200][25];
-
-    // Single point of definition if we need to customize
-#ifndef MYROOT
-    using header = sls::defs::sls_receiver_header;
-#endif
-#ifdef MYROOT
-    sls_receiver_header header;
-#endif
-  public:
-    /**
-       Implements the slsReceiverData structure for the moench02 prototype read
-       out by a module i.e. using the slsReceiver (160x160 pixels, 40 packets
-       1286 large etc.) \param c crosstalk parameter for the output buffer
-
-    */
-    moench03v2Data(int nrows = 200)
-        : slsDetectorData<uint16_t>(400, nrows*2,2* 400*nrows*2 + DATA_OFFSET),
-      nRows(nrows) {
-	
-	std::cout << "MOENCH width new firmware " << dataSize << std::endl;
-	
-	int off=DATA_OFFSET;
-	    for (int ix = 0; ix < 400; ix++) {
-	      for (int iy = 0; iy < nRows*2; iy++) {
-		dataMap[iy][ix]=off+2*(iy*400+ix);
-	      }
-	    }
-	    
-        iframe = 0;
-        //  cout << "data struct created" << endl;
-      };
-
-    /**
-       Returns the value of the selected channel for the given dataset as
-       double. \param data pointer to the dataset (including headers etc) \param
-       ix pixel number in the x direction \param iy pixel number in the y
-       direction \returns data for the selected channel, with inversion if
-       required as double
-
-    */
-    double getValue(char *data, int ix, int iy = 0) override {
-        uint16_t val = getChannel(data, ix, iy) & 0x3fff;
-        return val;
-    };
-
-    virtual void calcGhost(char *data, int ix, int iy) {
-        double val = 0;
-        /* for (int ix=0; ix<25; ix++){ */
-        /*   for (int iy=0; iy<200; iy++) { */
-        val = 0;
-        //	cout << "** ";
-        for (int isc = 0; isc < 16; isc++) {
-            //  for (int ii=0; ii<2; ii++) {
-            val += getChannel(data, ix + 25 * isc, iy);
-            //  cout << "(" << isc << "," << val << " " ;
-            val += getChannel(data, ix + 25 * isc, 399 - iy);
-            // cout << val << " " ;
-            // }
-        }
-        ghost[iy][ix] = val; //-6224;
-                             //	cout << " --"<< endl;
-                             /*   }  */
-                             /* } */
-                             // cout << "*" << endl;
-    }
-
-    virtual void calcGhost(char *data) {
-        for (int ix = 0; ix < 25; ix++) {
-            for (int iy = 0; iy < 200; iy++) {
-                calcGhost(data, ix, iy);
-            }
-        }
-        // cout << "*" << endl;
-    }
-
-    double getGhost(int ix, int iy) {
-        if (iy < 200)
-            return ghost[iy][ix % 25];
-        if (iy < 400)
-            return ghost[399 - iy][ix % 25];
-        return 0;
-    };
-
-    /**
-
-    Returns the frame number for the given dataset. Purely virtual func.
-    \param buff pointer to the dataset
-    \returns frame number
-
- */
-
-    int getFrameNumber(char *buff) {
-#ifdef RAWDATA
-      return ((sls::defs::sls_receiver_header *)buff)->detHeader.frameNumber;
-#endif
-#ifndef RAWDATA
-      return 1;
-#endif
-
-    }
-
-    /**
-
-       Returns the packet number for the given dataset. purely virtual func
-       \param buff pointer to the dataset
-       \returns packet number number
-
-
-
-    */
-    int getPacketNumber(char *buff) {
-#ifdef RAWDATA
-      return ((sls::defs::sls_receiver_header  *)buff)->detHeader.packetNumber;
-#endif
-#ifndef RAWDATA
-      return 0;
-#endif
-      
-    }
-
-    char *readNextFrame(std::ifstream &filebin) override {
-        int ff = -1, np = -1;
-        return readNextFrame(filebin, ff, np);
-    }
-
-    // not present in base class
-    virtual char *readNextFrame(std::ifstream &filebin, int &ff) {
-        int np = -1;
-        return readNextFrame(filebin, ff, np);
-    };
-
-    // not present in base class
-    virtual char *readNextFrame(std::ifstream &filebin, int &ff, int &np) {
-        char *data = new char[dataSize];
-        char *d = readNextFrame(filebin, ff, np, data);
-        if (d == NULL) {
-            delete[] data;
-            data = NULL;
-        }
-        return data;
-    }
-
-    // not present in base class
-    virtual char *readNextFrame(std::ifstream &filebin, int &ff, int &np,
-                                char *data) {
-        np = 0;
-        if (filebin.is_open()) {
-            if (filebin.read(data, dataSize)) {
-                ff = getFrameNumber(data);
-                np = getPacketNumber(data);
-		//	std::cout << "**" << ff << " " << dataSize << " " << ff << " " << np << std::endl;
-
-                return data;
-            }
-        }
-	std::cout << "**" << ff << " " << dataSize << " " << ff << " " << np << std::endl;
-        return nullptr;
-    }
-
-    /**
-
-       Loops over a memory slot until a complete frame is found (i.e. all
-       packets 0 to nPackets, same frame number). purely virtual func \param
-       data pointer to the memory to be analyzed \param ndata reference to the
-       amount of data found for the frame, in case the frame is incomplete at
-       the end of the memory slot \param dsize size of the memory slot to be
-       analyzed \returns pointer to the beginning of the last good frame (might
-       be incomplete if ndata smaller than dataSize), or NULL if no frame is
-       found
-
-    */
-    char *findNextFrame(char *data, int &ndata, int dsize) override {
-        if (dsize < dataSize)
-            ndata = dsize;
-        else
-            ndata = dataSize;
-        return data;
-    }
-
-    // int getPacketNumber(int x, int y) {return dataMap[y][x]/packetSize;};
-};
-
-#endif
--- a/slsDetectorCalibration/dataStructures/moench03v2HalfData.h
+++ b/slsDetectorCalibration/dataStructures/moench03v2HalfData.h
@ -1,240 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-or-other
-// Copyright (C) 2021 Contributors to the SLS Detector Package
-#ifndef MOENCH03v2DATA_H
-#define MOENCH03v2DATA_H
-//#define MYROOT
-
-#ifndef MYROOT
-#include "sls/sls_detector_defs.h"
-#endif
-
-
-
-
-#ifdef MYROOT
-
-    typedef struct {
-        uint64_t frameNumber;
-        uint32_t expLength;
-        uint32_t packetNumber;
-        uint64_t bunchId;
-        uint64_t timestamp;
-        uint16_t modId;
-        uint16_t row;
-        uint16_t column;
-        uint16_t reserved;
-        uint32_t debug;
-        uint16_t roundRNumber;
-        uint8_t detType;
-        uint8_t version;
-    } sls_detector_header;
-#define MAX_NUM_PACKETS 512
-// using sls_bitset = std::bitset<MAX_NUM_PACKETS>;
-//  using bitset_storage = uint8_t[MAX_NUM_PACKETS / 8];
-  struct sls_receiver_header {
-        sls_detector_header detHeader; /**< is the detector header */
-        uint8_t packetsMask[64];        /**< is the packets caught bit mask */
-    };
-#endif
-
-#include "slsDetectorData.h"
-#ifdef RAWDATA
-#define DATA_OFFSET sizeof(header)
-#endif
-#ifndef RAWDATA
-#define DATA_OFFSET 0
-#endif
-
-
-class moench03v2Data : public slsDetectorData<uint16_t> {
-
-  private:
-    int iframe;
-    const int nRows;
-    
-    
-
-    double ghost[200][25];
-
-    // Single point of definition if we need to customize
-#ifndef MYROOT
-    using header = sls::defs::sls_receiver_header;
-#endif
-#ifdef MYROOT
-    sls_receiver_header header;
-#endif
-  public:
-    /**
-       Implements the slsReceiverData structure for the moench02 prototype read
-       out by a module i.e. using the slsReceiver (160x160 pixels, 40 packets
-       1286 large etc.) \param c crosstalk parameter for the output buffer
-
-    */
-    moench03v2Data(int nrows = 200)
-        : slsDetectorData<uint16_t>(400, nrows*2,2* 400*nrows*2 + DATA_OFFSET),
-      nRows(nrows) {
-	
-	std::cout << "MOENCH width new firmware " << dataSize << std::endl;
-	
-	int off=DATA_OFFSET;
-	    for (int ix = 0; ix < 400; ix++) {
-	      for (int iy = 0; iy < nRows*2; iy++) {
-		dataMap[iy][ix]=off+2*(iy*400+ix);
-	      }
-	    }
-	    
-        iframe = 0;
-        //  cout << "data struct created" << endl;
-      };
-
-    /**
-       Returns the value of the selected channel for the given dataset as
-       double. \param data pointer to the dataset (including headers etc) \param
-       ix pixel number in the x direction \param iy pixel number in the y
-       direction \returns data for the selected channel, with inversion if
-       required as double
-
-    */
-    double getValue(char *data, int ix, int iy = 0) override {
-        uint16_t val = getChannel(data, ix, iy) & 0x3fff;
-        return val;
-    };
-
-    virtual void calcGhost(char *data, int ix, int iy) {
-        double val = 0;
-        /* for (int ix=0; ix<25; ix++){ */
-        /*   for (int iy=0; iy<200; iy++) { */
-        val = 0;
-        //	cout << "** ";
-        for (int isc = 0; isc < 16; isc++) {
-            //  for (int ii=0; ii<2; ii++) {
-            val += getChannel(data, ix + 25 * isc, iy);
-            //  cout << "(" << isc << "," << val << " " ;
-            val += getChannel(data, ix + 25 * isc, 399 - iy);
-            // cout << val << " " ;
-            // }
-        }
-        ghost[iy][ix] = val; //-6224;
-                             //	cout << " --"<< endl;
-                             /*   }  */
-                             /* } */
-                             // cout << "*" << endl;
-    }
-
-    virtual void calcGhost(char *data) {
-        for (int ix = 0; ix < 25; ix++) {
-            for (int iy = 0; iy < 200; iy++) {
-                calcGhost(data, ix, iy);
-            }
-        }
-        // cout << "*" << endl;
-    }
-
-    double getGhost(int ix, int iy) {
-        if (iy < 200)
-            return ghost[iy][ix % 25];
-        if (iy < 400)
-            return ghost[399 - iy][ix % 25];
-        return 0;
-    };
-
-    /**
-
-    Returns the frame number for the given dataset. Purely virtual func.
-    \param buff pointer to the dataset
-    \returns frame number
-
- */
-
-    int getFrameNumber(char *buff) {
-#ifdef RAWDATA
-      return ((sls::defs::sls_receiver_header *)buff)->detHeader.frameNumber;
-#endif
-#ifndef RAWDATA
-      return 1;
-#endif
-
-    }
-
-    /**
-
-       Returns the packet number for the given dataset. purely virtual func
-       \param buff pointer to the dataset
-       \returns packet number number
-
-
-
-    */
-    int getPacketNumber(char *buff) {
-#ifdef RAWDATA
-      return ((sls::defs::sls_receiver_header  *)buff)->detHeader.packetNumber;
-#endif
-#ifndef RAWDATA
-      return 0;
-#endif
-      
-    }
-
-    char *readNextFrame(std::ifstream &filebin) override {
-        int ff = -1, np = -1;
-        return readNextFrame(filebin, ff, np);
-    }
-
-    // not present in base class
-    virtual char *readNextFrame(std::ifstream &filebin, int &ff) {
-        int np = -1;
-        return readNextFrame(filebin, ff, np);
-    };
-
-    // not present in base class
-    virtual char *readNextFrame(std::ifstream &filebin, int &ff, int &np) {
-        char *data = new char[dataSize];
-        char *d = readNextFrame(filebin, ff, np, data);
-        if (d == NULL) {
-            delete[] data;
-            data = NULL;
-        }
-        return data;
-    }
-
-    // not present in base class
-    virtual char *readNextFrame(std::ifstream &filebin, int &ff, int &np,
-                                char *data) {
-        np = 0;
-        if (filebin.is_open()) {
-            if (filebin.read(data, dataSize)) {
-                ff = getFrameNumber(data);
-                np = getPacketNumber(data);
-	std::cout << "**" << ff << " " << dataSize << " " << ff << " " << np << std::endl;
-
-                return data;
-            }
-        }
-	std::cout << "**" << ff << " " << dataSize << " " << ff << " " << np << std::endl;
-        return nullptr;
-    }
-
-    /**
-
-       Loops over a memory slot until a complete frame is found (i.e. all
-       packets 0 to nPackets, same frame number). purely virtual func \param
-       data pointer to the memory to be analyzed \param ndata reference to the
-       amount of data found for the frame, in case the frame is incomplete at
-       the end of the memory slot \param dsize size of the memory slot to be
-       analyzed \returns pointer to the beginning of the last good frame (might
-       be incomplete if ndata smaller than dataSize), or NULL if no frame is
-       found
-
-    */
-    char *findNextFrame(char *data, int &ndata, int dsize) override {
-        if (dsize < dataSize)
-            ndata = dsize;
-        else
-            ndata = dataSize;
-        return data;
-    }
-
-    // int getPacketNumber(int x, int y) {return dataMap[y][x]/packetSize;};
-};
-
-#endif
--- a/slsDetectorCalibration/jungfrauExecutables/CMakeLists.txt
+++ b/slsDetectorCalibration/jungfrauExecutables/CMakeLists.txt
@ -7,6 +7,7 @@
 set(JUNGFRAU_EXECUTABLES)

 find_package(fmt REQUIRED)
+find_package(nlohmann_json 3.11.2 REQUIRED)

 # jungfrauRawDataProcess
 add_executable(jungfrauRawDataProcess jungfrauRawDataProcess.cpp)
@ -79,6 +80,7 @@ foreach(exe ${JUNGFRAU_EXECUTABLES})
        pthread 
        tiffio
        fmt::fmt
+	nlohmann_json::nlohmann_json
          #-L/usr/lib64/
        #-lm  -lstdc++  -lrt

--- a/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess.cpp
+++ b/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess.cpp
@ -41,6 +41,9 @@
 #include <ctime>
 #include <fmt/core.h>

+#include <nlohmann/json.hpp>
+using json = nlohmann::json;
+

 std::string getRootString( const std::string& filepath ) {
  size_t pos1 = filepath.find_last_of("/");
@ -61,20 +64,24 @@ std::string getRootString( const std::string& filepath ) {
 std::string createFileName( const std::string& dir, const std::string& fprefix="run", const std::string& fsuffix="", const std::string& fext="raw", int aindex=0, int mindex=0, int findex=0, int outfilecounter=-1 ) {
  if (outfilecounter >= 0)
    return fmt::format("{:s}/{:s}_d{:d}_f{:d}_{:d}_f{:05d}.{:s}", dir, fprefix, mindex, findex, aindex, outfilecounter, fext);
-  else if (fsuffix.length()!=0)
-    return fmt::format("{:s}/{:s}_{:s}.{:s}", dir, fprefix, fsuffix, fext);
+  else if (fsuffix.length()!=0) {
+    if (fsuffix == "master")
+      return fmt::format("{:s}/{:s}_master_{:d}.{:s}", dir, fprefix, aindex, fext);
+    else
+      return fmt::format("{:s}/{:s}_{:s}.{:s}", dir, fprefix, fsuffix, fext);
+  }
  else
    return fmt::format("{:s}/{:s}_d{:d}_f{:d}_{:d}.{:s}", dir, fprefix, mindex, findex, aindex, fext);
 }

 int main(int argc, char *argv[]) {

-    if (argc < 5) {
+    if (argc < 6) {
        std::cout
            << "Usage is " << argv[0]
-            << "indir outdir fprefix(excluding slsDetector standard suffixes and extension) fextension "
-               "[runmin] [runmax] [pedfile (raw or tiff)] [threshold] "
-               "[nframes] [xmin xmax ymin ymax] [gainmap]"
+            << "indir outdir [fprefix(excluding slsDetector standard suffixes and extension)] [fextension] "
+	       "[fmin] [fmax] [runmin] [runmax] [pedfile (raw or tiff)] [threshold] "
+               "[nframes] [xmin xmax ymin ymax] [optional: bool read rxroi from data file header] [gainmap]"
            << std::endl;
        std::cout
            << "threshold <0 means analog; threshold=0 means cluster finder; "
@ -106,34 +113,69 @@ int main(int argc, char *argv[]) {
    std::string outdir(argv[2]);
    std::string fprefix(argv[3]);
    std::string fext(argv[4]);
+
+    int fmin = 0;
+    if (argc >= 6)
+        fmin = atoi(argv[5]);
+    int fmax = fmin;
+    if (argc >= 7)
+        fmax = atoi(argv[6]);
+
    int runmin = 0;
-
    // cout << "argc is " << argc << endl;
-    if (argc >= 6) {
-        runmin = atoi(argv[5]);
+    if (argc >= 8) {
+        runmin = atoi(argv[7]);
    }
-
    int runmax = runmin;
-
-    if (argc >= 7) {
-        runmax = atoi(argv[6]);
+    if (argc >= 9) {
+        runmax = atoi(argv[8]);
    }

    std::string pedfilename{};
-    if (argc >= 8) {
-        pedfilename = argv[7];
+    if (argc >= 10) {
+        pedfilename = argv[9];
    }
    double thr = 0;
    double thr1 = 1;

-    if (argc >= 9) {
-        thr = atof(argv[8]);
+    if (argc >= 11) {
+        thr = atof(argv[10]);
    }

    int nframes = 0;

-    if (argc >= 10) {
-        nframes = atoi(argv[9]);
+    if (argc >= 12) {
+        nframes = atoi(argv[11]);
+    }
+
+    bool readrxroifromdatafile = false;
+    if (argc >= 17)
+      readrxroifromdatafile = atoi(argv[16]);
+    
+    // Receiver ROI
+    uint16_t rxroi_xmin = 0;
+    uint16_t rxroi_xmax = 0;
+    uint16_t rxroi_ymin = 0;
+    uint16_t rxroi_ymax = 0;
+
+    { //protective scope so ifstream gets destroyed properly
+
+      auto jsonmastername = createFileName( indir, fprefix, "master", "json", runmin );
+      std::cout << "json master file " << jsonmastername << std::endl;
+      std::ifstream masterfile(jsonmastername); //, ios::in | ios::binary);
+      if (masterfile.is_open()) {
+	json j;
+	masterfile >> j;
+	rxroi_xmin = j["Receiver Roi"]["xmin"];
+	rxroi_xmax = j["Receiver Roi"]["xmax"];
+	rxroi_ymin = j["Receiver Roi"]["ymin"];
+	rxroi_ymax = j["Receiver Roi"]["ymax"];
+	masterfile.close();
+	std::cout << "Read Receiver ROI [" << rxroi_xmin << ", " << rxroi_xmax << ", "
+		  << rxroi_ymin << ", " << rxroi_ymax << "] from json master file" << std::endl;
+      } else 
+	std::cout << "Could not open master file " << jsonmastername << std::endl;
+    
    }

    // Define decoders...
@ -144,56 +186,52 @@ int main(int argc, char *argv[]) {
    int nx = 256, ny = 256;
 #endif
 #ifdef MODULE
-    jungfrauModuleData *decoder = new jungfrauModuleData();
+    jungfrauModuleData *decoder = new jungfrauModuleData(rxroi_xmin, rxroi_xmax, rxroi_ymin, rxroi_ymax);
    int nx = 1024, ny = 512;
 #endif
 #endif

 #ifdef JFSTRX
    cout << "Jungfrau strixel full module readout" << endl;
-    // ROI
-    uint16_t xxmin = 0;
-    uint16_t xxmax = 0;
-    uint16_t yymin = 0;
-    uint16_t yymax = 0;

 #ifndef ALDO
-    { //THIS SCOPE IS IMPORTANT! (To ensure proper destruction of ifstream)
-      using header = sls::defs::sls_receiver_header;
-      // check if there is a roi in the header
-      typedef struct {
-        uint16_t xmin;
-        uint16_t xmax;
-        uint16_t ymin;
-        uint16_t ymax;
-      } receiverRoi_compact;
-      receiverRoi_compact croi;
-      std::string fsuffix{};
-      auto filename = createFileName( indir, fprefix, fsuffix, fext, runmin );
-      std::cout << "Reading header of file " << filename << " to check for ROI "
-		<< std::endl;
-      ifstream firstfile(filename, ios::in | ios::binary);
-      if (firstfile.is_open()) {
-        header hbuffer;
-        std::cout << "sizeof(header) = " << sizeof(header) << std::endl;
-        if (firstfile.read((char *)&hbuffer, sizeof(header))) {
-	  memcpy(&croi, &hbuffer.detHeader.detSpec1, 8);
-	  std::cout << "Read ROI [" << croi.xmin << ", " << croi.xmax << ", "
-		    << croi.ymin << ", " << croi.ymax << "]" << std::endl;
-	  xxmin = croi.xmin;
-	  xxmax = croi.xmax;
-	  yymin = croi.ymin;
-	  yymax = croi.ymax;
-        } else
-	  std::cout << "reading error" << std::endl;
-        firstfile.close();
-      } else
-        std::cout << "Could not open " << filename << " for reading " << std::endl;
-    } //end of protective scope
+    if (readrxroifromdatafile)
+      { //THIS SCOPE IS IMPORTANT! (To ensure proper destruction of ifstream)
+	using header = sls::defs::sls_receiver_header;
+	// check if there is a roi in the header
+	typedef struct {
+	  uint16_t xmin;
+	  uint16_t xmax;
+	  uint16_t ymin;
+	  uint16_t ymax;
+	} receiverRoi_compact;
+	receiverRoi_compact croi;
+	std::string fsuffix{};
+	auto filename = createFileName( indir, fprefix, fsuffix, fext, runmin );
+	std::cout << "Reading header of file " << filename << " to check for ROI "
+		  << std::endl;
+	ifstream firstfile(filename, ios::in | ios::binary);
+	if (firstfile.is_open()) {
+	  header hbuffer;
+	  std::cout << "sizeof(header) = " << sizeof(header) << std::endl;
+	  if (firstfile.read((char *)&hbuffer, sizeof(header))) {
+	    memcpy(&croi, &hbuffer.detHeader.detSpec1, 8);
+	    std::cout << "Read ROI [" << croi.xmin << ", " << croi.xmax << ", "
+		      << croi.ymin << ", " << croi.ymax << "]" << std::endl;
+	    rxroi_xmin = croi.xmin;
+	    rxroi_xmax = croi.xmax;
+	    rxroi_ymin = croi.ymin;
+	    rxroi_ymax = croi.ymax;
+	  } else
+	    std::cout << "reading error" << std::endl;
+	  firstfile.close();
+	} else
+	  std::cout << "Could not open " << filename << " for reading " << std::endl;
+      } //end of protective scope
 #endif

    jungfrauLGADStrixelsData *decoder =
-        new jungfrauLGADStrixelsData(xxmin, xxmax, yymin, yymax);
+      new jungfrauLGADStrixelsData(rxroi_xmin, rxroi_xmax, rxroi_ymin, rxroi_ymax);
    int nx = 1024 / 3, ny = 512 * 5;
 #endif
 #ifdef JFSTRXCHIP1
@ -218,19 +256,20 @@ int main(int argc, char *argv[]) {
    decoder->getDetectorSize(nx, ny);
    std::cout << "Detector size is " << nx << " " << ny << std::endl;

-    int xmin = 0, xmax = nx, ymin = 0, ymax = ny;
-    if (argc >= 14) {
-        xmin = atoi(argv[10]);
-        xmax = atoi(argv[11]);
-        ymin = atoi(argv[12]);
-        ymax = atoi(argv[13]);
+    //Cluster finder ROI
+    int xmin = 0, xmax = nx-1, ymin = 0, ymax = ny-1;
+    if (argc >= 16) {
+        xmin = atoi(argv[12]);
+        xmax = atoi(argv[13]);
+        ymin = atoi(argv[14]);
+        ymax = atoi(argv[15]);
    }
-    std::cout << xmin << " " << xmax << " " << ymin << " " << ymax << " "
+    std::cout << "Cluster finder ROI: [" << xmin << ", " << xmax << ", " << ymin << ", " << ymax << "]"
              << std::endl;

    char *gainfname = NULL;
-    if (argc > 14) {
-        gainfname = argv[14];
+    if (argc > 17) {
+        gainfname = argv[17];
        std::cout << "Gain map file name is: " << gainfname << std::endl;
    }

@ -239,6 +278,8 @@ int main(int argc, char *argv[]) {
    std::cout << "input directory is " << indir << std::endl;
    std::cout << "output directory is " << outdir << std::endl;
    std::cout << "input file prefix is " << fprefix << std::endl;
+    std::cout << "fmin is " << fmin << std::endl;
+    std::cout << "fmax is " << fmax << std::endl;
    std::cout << "runmin is " << runmin << std::endl;
    std::cout << "runmax is " << runmax << std::endl;
    if (pedfilename.length()!=0)
@ -319,7 +360,7 @@ int main(int argc, char *argv[]) {

 	  mt->setFrameMode(ePedestal);

-	  ifstream pedefile(fname, ios::in | ios::binary);
+	  std::ifstream pedefile(fname, ios::in | ios::binary);
 	  //      //open file
 	  if (pedefile.is_open()) {
 	    std::cout << "bbbb " << std::ctime(&end_time) << std::endl;
@ -380,26 +421,27 @@ int main(int argc, char *argv[]) {
    }

    ifr = 0;
-    int ifile = 0;
+    int ioutfile = 0;

    mt->setFrameMode(eFrame);

    FILE *of = NULL;
    
-    for (int irun = runmin; irun <= runmax; irun++) {
+    for (int irun = runmin; irun <= runmax; ++irun) {
+      for (int ifile = fmin; ifile <= fmax; ++ifile) {
        std::cout << "DATA ";
 	std::string fsuffix{};
-	auto fname = createFileName( indir, fprefix, fsuffix, fext, irun );
-	auto imgfname = createFileName( outdir, fprefix, fsuffix, "tiff", irun );
-	auto cfname = createFileName( outdir, fprefix, fsuffix, "clust", irun );
+	auto fname = createFileName( indir, fprefix, fsuffix, fext, irun, 0, ifile );
+	auto imgfname = createFileName( outdir, fprefix, fsuffix, "tiff", irun, 0, ifile );
+	auto cfname = createFileName( outdir, fprefix, fsuffix, "clust", irun, 0, ifile );
        std::cout << fname << " ";
        std::cout << imgfname << std::endl;
        std::time(&end_time);
        std::cout << std::ctime(&end_time) << std::endl;
        //  std::cout <<  fname << " " << outfname << " " << imgfname <<  std::endl;
-        ifstream filebin(fname, ios::in | ios::binary);
+	std::ifstream filebin(fname, ios::in | ios::binary);
        //      //open file
-        ifile = 0;
+        ioutfile = 0;
        if (filebin.is_open()) {
            if (thr <= 0 && cf != 0) { // cluster finder
                if (of == NULL) {
@ -436,10 +478,10 @@ int main(int argc, char *argv[]) {
                    std::cout << " " << ifr << " " << ff << std::endl;
                if (nframes > 0) {
                    if (ifr % nframes == 0) {
-		      imgfname = createFileName( outdir, fprefix, fsuffix, "tiff", irun, 0, 0, ifile );
+		      imgfname = createFileName( outdir, fprefix, fsuffix, "tiff", irun, 0, 0, ioutfile );
 		      mt->writeImage(imgfname.c_str(), thr1);
                        mt->clearImage();
-                        ifile++;
+                        ioutfile++;
                    }
                }
                // } else
@ -453,7 +495,7 @@ int main(int argc, char *argv[]) {
            }
            if (nframes >= 0) {
                if (nframes > 0)
-		  imgfname = createFileName( outdir, fprefix, fsuffix, "tiff", irun, 0, 0, ifile );
+		  imgfname = createFileName( outdir, fprefix, fsuffix, "tiff", irun, 0, 0, ioutfile );
                std::cout << "Writing tiff to " << imgfname << " " << thr1
                          << std::endl;
                mt->writeImage(imgfname.c_str(), thr1);
@ -469,9 +511,10 @@ int main(int argc, char *argv[]) {
        } else
            std::cout << "Could not open " << fname << " for reading "
                      << std::endl;
+      }
    }
    if (nframes < 0) {
-      auto imgfname = createFileName( outdir, fprefix, "sum", "tiff", -1, 0, 0, -1 );
+      auto imgfname = createFileName( outdir, fprefix, "sum", "tiff", runmin, 0, fmin, -1 );
        std::cout << "Writing tiff to " << imgfname << " " << thr1 << std::endl;
        mt->writeImage(imgfname.c_str(), thr1);
    }
--- a/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess_filetxt.cpp
+++ b/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess_filetxt.cpp
@ -41,6 +41,9 @@
 #include <ctime>
 #include <fmt/core.h>

+#include <nlohmann/json.hpp>
+using json = nlohmann::json;
+

 std::string getRootString( const std::string& filepath ) {
  size_t pos1;
@ -71,11 +74,11 @@ std::string createFileName( const std::string& dir, const std::string& fprefix="
 //NOTE THAT THE DATA FILES HAVE TO BE IN THE RIGHT ORDER SO THAT PEDESTAL TRACKING WORKS!
 int main(int argc, char *argv[]) {

-    if (argc < 10) {
+    if (argc < 11) {
        std::cout
            << "Usage is " << argv[0]
-            << " filestxt outdir [pedfile (raw or tiff)] [xmin xmax ymin ymax] "
-               "[threshold] [nframes] "
+            << " filestxt outdir [json master] [pedfile (raw or tiff)] [xmin xmax ymin ymax] "
+               "[threshold] [nframes] [optional: bool read rxroi from data file header]"
 	       "NOTE THAT THE DATA FILES HAVE TO BE IN THE RIGHT ORDER SO THAT PEDESTAL TRACKING WORKS! "
            << std::endl;
        std::cout
@ -105,19 +108,19 @@ int main(int argc, char *argv[]) {

    const std::string txtfilename(argv[1]);
    const std::string outdir(argv[2]);
-    const std::string pedfilename(argv[3]);
-
-    int xmin = atoi(argv[4]);
-    int xmax = atoi(argv[5]);
-    int ymin = atoi(argv[6]);
-    int ymax = atoi(argv[7]);
+    const std::string jsonmastername(argv[3]);
+    const std::string pedfilename(argv[4]);

    double thr = 0;
    double thr1 = 1;
-    thr = atof(argv[8]);
+    thr = atof(argv[9]);

    int nframes = 0;
-    nframes = atoi(argv[9]);
+    nframes = atoi(argv[10]);
+
+    bool readrxroifromdatafile = false;
+    if (argc > 11)
+      readrxroifromdatafile = atoi(argv[11]);

    //Get vector of filenames from input txt-file
    std::vector<std::string> filenames{};
@ -147,6 +150,30 @@ int main(int argc, char *argv[]) {

    std::cout << "###############" << std::endl;

+    // Receiver ROI
+    uint16_t rxroi_xmin = 0;
+    uint16_t rxroi_xmax = 0;
+    uint16_t rxroi_ymin = 0;
+    uint16_t rxroi_ymax = 0;
+
+    { //protective scope so ifstream gets destroyed properly
+
+      std::ifstream masterfile(jsonmastername); //, ios::in | ios::binary);
+      if (masterfile.is_open()) {
+	json j;
+	masterfile >> j;
+	rxroi_xmin = j["Receiver Roi"]["xmin"];
+	rxroi_xmax = j["Receiver Roi"]["xmax"];
+	rxroi_ymin = j["Receiver Roi"]["ymin"];
+	rxroi_ymax = j["Receiver Roi"]["ymax"];
+	masterfile.close();
+	std::cout << "Read rxROI [" << rxroi_xmin << ", " << rxroi_xmax << ", "
+		      << rxroi_ymin << ", " << rxroi_ymax << "]" << std::endl;
+      } else 
+	std::cout << "Could not open master file " << jsonmastername << std::endl;
+      
+    }
+
    // Define decoders...
 #if !defined JFSTRX && !defined JFSTRXOLD && !defined JFSTRXCHIP1 &&           \
    !defined JFSTRXCHIP6
@ -162,48 +189,44 @@ int main(int argc, char *argv[]) {

 #ifdef JFSTRX
    cout << "Jungfrau strixel full module readout" << endl;
-    // ROI
-    uint16_t xxmin = 0;
-    uint16_t xxmax = 0;
-    uint16_t yymin = 0;
-    uint16_t yymax = 0;

 #ifndef ALDO
-    { //THIS SCOPE IS IMPORTANT! (To ensure proper destruction of ifstream)
-      using header = sls::defs::sls_receiver_header;
-      // check if there is a roi in the header
-      typedef struct {
-        uint16_t xmin;
-        uint16_t xmax;
-        uint16_t ymin;
-        uint16_t ymax;
-      } receiverRoi_compact;
-      receiverRoi_compact croi;
-      //std::string filepath(argv[9]); //This is a problem if the input files have different ROIs!
-      std::cout << "Reading header of file " << filenames[0] << " to check for ROI "
-		<< std::endl;
-      ifstream firstfile(filenames[0], ios::in | ios::binary);
-      if (firstfile.is_open()) {
-        header hbuffer;
-        std::cout << "sizeof(header) = " << sizeof(header) << std::endl;
-        if (firstfile.read((char *)&hbuffer, sizeof(header))) {
-	  memcpy(&croi, &hbuffer.detHeader.detSpec1, 8);
-	  std::cout << "Read ROI [" << croi.xmin << ", " << croi.xmax << ", "
-		    << croi.ymin << ", " << croi.ymax << "]" << std::endl;
-	  xxmin = croi.xmin;
-	  xxmax = croi.xmax;
-	  yymin = croi.ymin;
-	  yymax = croi.ymax;
-        } else
-	  std::cout << "reading error" << std::endl;
-        firstfile.close();
-      } else
-        std::cout << "Could not open " << filenames[0] << " for reading " << std::endl;
-    } //end of protective scope
+    if (readrxroifromdatafile)
+      { //THIS SCOPE IS IMPORTANT! (To ensure proper destruction of ifstream)
+	using header = sls::defs::sls_receiver_header;
+	// check if there is a roi in the header
+	typedef struct {
+	  uint16_t xmin;
+	  uint16_t xmax;
+	  uint16_t ymin;
+	  uint16_t ymax;
+	} receiverRoi_compact;
+	receiverRoi_compact croi;
+	//std::string filepath(argv[9]); //This is a problem if the input files have different ROIs!
+	std::cout << "Reading header of file " << filenames[0] << " to check for ROI "
+		  << std::endl;
+	std::ifstream firstfile( filenames[0], ios::in | ios::binary);
+	if (firstfile.is_open()) {
+	  header hbuffer;
+	  std::cout << "sizeof(header) = " << sizeof(header) << std::endl;
+	  if (firstfile.read((char *)&hbuffer, sizeof(header))) {
+	    memcpy(&croi, &hbuffer.detHeader.detSpec1, 8);
+	    std::cout << "Read ROI [" << croi.xmin << ", " << croi.xmax << ", "
+		      << croi.ymin << ", " << croi.ymax << "]" << std::endl;
+	    rxroi_xmin = croi.xmin;
+	    rxroi_xmax = croi.xmax;
+	    rxroi_ymin = croi.ymin;
+	    rxroi_ymax = croi.ymax;
+	  } else
+	    std::cout << "reading error" << std::endl;
+	  firstfile.close();
+	} else
+	  std::cout << "Could not open " << filenames[0] << " for reading " << std::endl;
+      } //end of protective scope
 #endif

    jungfrauLGADStrixelsData *decoder =
-        new jungfrauLGADStrixelsData(xxmin, xxmax, yymin, yymax);
+        new jungfrauLGADStrixelsData(rxroi_xmin, rxroi_xmax, rxroi_ymin, rxroi_ymax);
    int nx = 1024 / 3, ny = 512 * 5;
 #endif
 #ifdef JFSTRXCHIP1
@ -228,7 +251,16 @@ int main(int argc, char *argv[]) {
    decoder->getDetectorSize(nx, ny);
    std::cout << "Detector size is " << nx << " " << ny << std::endl;

+    //Cluster finder ROI
+    int xmin = 0, xmax = nx-1, ymin = 0, ymax = ny-1;
+    xmin = atoi(argv[5]);
+    xmax = atoi(argv[6]);
+    ymin = atoi(argv[7]);
+    ymax = atoi(argv[8]);
+    std::cout << "Cluster finder ROI: [" << xmin << ", " << xmax << ", " << ymin << ", " << ymax << "]"
+              << std::endl;

+    /* old
    if ( xmin == xmax ) {
      xmin = 0;
      xmax = nx;
@ -239,6 +271,7 @@ int main(int argc, char *argv[]) {
    }
    std::cout << xmin << " " << xmax << " " << ymin << " " << ymax << " "
              << std::endl;
+    */

    /*
    char *gainfname = NULL;
@ -410,7 +443,7 @@ int main(int argc, char *argv[]) {
      std::time(&end_time);
      std::cout << std::ctime(&end_time) << std::endl;

-      ifstream filebin(filenames[ifile], ios::in | ios::binary);
+      std::ifstream filebin(filenames[ifile], ios::in | ios::binary);
      //      //open file
      ioutfile = 0;
      if (filebin.is_open()) {
--- a/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp
+++ b/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp
@ -33,7 +33,7 @@ int main(int argc, char *argv[]) {
 #ifndef FF
    if (argc < 9) {
        cout << "Wrong usage! Should be: " << argv[0]
-             << " infile  etafile outfile runmin runmax ns [cmin cmax xmin xmax ymin ymax]" << endl;
+             << " infile  etafile outfile runmin runmax ns cmin cmax" << endl;
        return 1;
    }
 #endif
@ -41,7 +41,7 @@ int main(int argc, char *argv[]) {
 #ifdef FF
    if (argc < 7) {
        cout << "Wrong usage! Should be: " << argv[0]
-             << " infile  etafile runmin runmax [cmin cmax xmin xmax ymin ymax]" << endl;
+             << " infile  etafile runmin runmax cmin cmax" << endl;
        return 1;
    }
 #endif
@ -65,30 +65,13 @@ int main(int argc, char *argv[]) {
    nsubpix = atoi(argv[iarg++]);
    cout << "Subpix: " << nsubpix << endl;
 #endif
-    
-    float cmin = 0;
-    float cmax=1000000;
-    if (argc>iarg)
-      cmin=atof(argv[iarg++]);
-    if (argc>iarg)
-      cmax= atof(argv[iarg++]);
+    float cmin = atof(argv[iarg++]);
+    float cmax = atof(argv[iarg++]);
    cout << "Energy min: " << cmin << endl;
    cout << "Energy max: " << cmax << endl;
-    int xmin=0, xmax=NC, ymin=0, ymax=NR;
-    
-    if (argc>iarg)
-      xmin=atof(argv[iarg++]);
-    if (argc>iarg)
-      xmax= atof(argv[iarg++]);
-    
-    if (argc>iarg)
-      ymin=atof(argv[iarg++]);
-    if (argc>iarg)
-      ymax= atof(argv[iarg++]);
-    
    // int etabins=500;
    int etabins = 1000; // nsubpix*2*100;
-    double etamin = -0.25, etamax = 1.25;
+    double etamin = -1, etamax = 2;
    // double etamin=-0.1, etamax=1.1;
    //   double eta3min = -2, eta3max = 2;
    double sum, totquad;
@ -97,7 +80,7 @@ int main(int argc, char *argv[]) {
    // double eta3x, eta3y, int3_x, int3_y, noint_x, noint_y;
   
    int ix, iy, isx, isy;
-    int nframes = 0, lastframe = -1, iframe, nphFrame;
+    int nframes = 0, lastframe = -1;
    //double d_x, d_y, res = 5, xx, yy;
    int nph = 0, totph = 0;
    //badph = 0, 
@ -115,7 +98,7 @@ int main(int argc, char *argv[]) {
    //  int nSubPixels = nsubpix;
 #ifndef NOINTERPOLATION
    eta2InterpolationPosXY *interp =
-      new eta2InterpolationPosXY(NC, NR, nsubpix, nsubpix, etabins, etabins, etamin, etamax);
+      new eta2InterpolationPosXY(NC, NR, nsubpix, nsubpix,etabins,etabins, etamin, etamax);
    // eta2InterpolationCleverAdaptiveBins *interp=new
    // eta2InterpolationCleverAdaptiveBins(NC, NR, nsubpix, etabins, etamin,
    // etamax);
@ -124,8 +107,8 @@ int main(int argc, char *argv[]) {
    noInterpolation *interp = new noInterpolation(NC, NR, nsubpix);
 #endif

-    int quad; 
 #ifndef FF
+    int quad; 
 #ifndef NOINTERPOLATION
    char fname[10000];
    int ok;
@ -159,26 +142,19 @@ int main(int argc, char *argv[]) {
 #endif

    int irun;
-    for (irun = runmin; irun <= runmax; irun++) {
+    for (irun = runmin; irun < runmax; irun++) {
        sprintf(infname, argv[1], irun);
 #ifndef FF
        sprintf(outfname, argv[3], irun);
 #endif

-
        f = fopen(infname, "r");
        if (f) {
            cout << infname << endl;
            nframes = 0;
            //f0 = -1;

-	    //iff=0;
-	    while (fread((void*)&iframe, 1,  sizeof(int), f)) {
-	      //n=0;
-	      if (fread((void*)&nphFrame, 1,  sizeof(int), f)) {
-		for (int iph=0; iph<nphFrame; iph++) {
-		//while (cl.read(f)) {
-		  if (cl.read(f)) {
+            while (cl.read(f)) {
                totph++;
                if (lastframe != cl.iframe) {
                    lastframe = cl.iframe;
@ -189,28 +165,18 @@ int main(int argc, char *argv[]) {
                    nframes++;
                }
                // quad=interp->calcQuad(cl.get_cluster(), sum, totquad, sDum);
-// #ifndef FF
-//                 quad = interp->calcEta(cl.get_cluster(), etax, etay, sum,
-//                                        totquad, sDum);
-// #endif
-// #ifdef FF
-	
+#ifndef FF
                quad = interp->calcEta(cl.get_cluster(), etax, etay, sum,
                                       totquad, sDum);
+#endif
+#ifdef FF
+                interp->calcEta(cl.get_cluster(), etax, etay, sum,
+                                       totquad, sDum);
+#endif

-		
-		/*	cl.print();
-		cout << "(" << etax <<","<< etay <<")"<< quad<< endl;
-		*/
-		//#endif
-
-		if (totquad > cmin && cl.x >= xmin && cl.x <= xmax && 
-		    cl.y >= ymin && cl.y <= ymax &&
-		    totquad < cmax) {
-
-		  //	if (sum > cmin && totquad / sum > 0.8 && totquad / sum < 1.2 &&
-		  //	sum < cmax) {
-		  nph++;
+      if (sum > cmin && totquad / sum > 0.8 && totquad / sum < 1.2 &&
+                    sum < cmax) {
+                    nph++;
                    //  if (sum>200 && sum<580) {
                    //  interp->getInterpolatedPosition(cl.x,cl.y,
                    //  totquad,quad,cl.get_cluster(),int_x, int_y);
@ -261,12 +227,9 @@ int main(int argc, char *argv[]) {
 #ifdef FF
                        interp->writeFlatField(outfname);
 #endif
-		    }
                    }
                }
-	      }
-	    }
-	    }
+            }

            fclose(f);
 #ifdef FF
--- a/slsDetectorCalibration/moenchExecutables/moenchRawDataProcess.cpp
+++ b/slsDetectorCalibration/moenchExecutables/moenchRawDataProcess.cpp
@ -13,7 +13,7 @@

 #ifndef MOENCH04
 #ifndef RECT
-#include "moench03v2Data.h"
+#include "moench03T1ReceiverDataNew.h"
 #endif
 #endif

@ -41,147 +41,34 @@ using namespace std;

 int main(int argc, char *argv[]) {

-  std::map<std::string, std::string> args = {
-    {"numfiles","1"},
-    {"nthreads","5"},
-    {"fifosize","5000"},
-    {"nsigma","5"},
-    {"gainfile","none"},
-    {"detectorMode","counting"},
-    {"threshold","0"},
-    {"pedestalfile","none"},
-    {"nframes","0"},
-    {"xMin","0"},
-    {"xMax","400"},
-    {"yMin","0"},
-    {"yMax","400"},
-    {"eMin","0"},
-    {"eMax","16000"},
-    {"outdir","./"},
-    {"indir","./"},
-    {"flist","none"},
-    {"fformat","none"},
-    {"runmin","0"},
-    {"runmax","-1"},
-    {"readnrows","400"}
-  };
-  //float *gm;
-  
-  int ff, np;
-  // cout << " data size is " << dsize;
-  
-  ifstream filebin;
-  if (argc < 4) {
-    std::string name, value,sline;
-    int ic=0;
-    ifstream flist;
-    flist.open (argv[1], std::ifstream::in);
-    if (flist.is_open()) {
-      cout << "Using config file " <<argv[1] << endl;
-       while (std::getline(flist,sline)){
-	 if (sline.at(0)!='#') {
-	   ic=sline.find(' ');
-	   name = sline.substr(0,ic); 
-	   value = sline.substr(ic+1,sline.size()-ic); 
-	   args[name]=value;
-	 }
-	 
-       } 
-       flist.close();
-    } else {
+    if (argc < 4) {
        cout << "Usage is " << argv[0]
             << "indir outdir fname(no extension) [runmin] [runmax] [pedfile (raw or tiff)] [threshold] "
-	  "[nframes] [xmin xmax ymin ymax] [gainmap]"
+                "[nframes] [xmin xmax ymin ymax] [gainmap]"
             << endl;
        cout << "threshold <0 means analog; threshold=0 means cluster finder; "
-	  "threshold>0 means photon counting"
+                "threshold>0 means photon counting"
             << endl;
        cout << "nframes <0 means sum everything; nframes=0 means one file per "
-	  "run; nframes>0 means one file every nframes"
+                "run; nframes>0 means one file every nframes"
             << endl;
-	return EXIT_FAILURE;
-      }
-    } else {
-      args["indir"]=argv[1];
-      args["outdir"]=argv[1];
-      args["fformat"]=argv[3];
-      if (argc >= 5) {
-	args["runmin"] = argv[4];
-      }
-	args["runmax"] = args["runmin"];
-
-      if (argc >= 6) {
-	args["runmax"] = argv[5];
-      }
-      if (argc >= 7) {
-        args["pedestalfile"] = argv[6];
-      }
-      if (argc >= 8) {
-        args["threshold"] = argv[7];
-      }
-      if (argc >= 9) {
-        args["nframes"] = argv[8];
-      }
-      if (argc >= 13) {
-        args["xMin"] = argv[9];
-        args["xMax"] = argv[10];
-        args["yMin"] = argv[11];
-        args["yMax"] = argv[12];
-      }
-      if (argc > 13) {
-	args["gainfile"] = argv[13];
-      }
-      
-      if (atof(args["threshold"].c_str())<0) {
-	args["detectorMode"]="analog";
-      }
-
+        return 1;
    }

-
-
-    for (auto const& x : args)
-      {
-	std::cout << x.first  // string (key)
-		  << ':' 
-		  << x.second // string's value 
-		  << std::endl;
-      }
-
-
-    string indir=args["indir"]; 
-    string outdir = args["outdir"];
-    string fformat= args["fformat"];
-    int runmin = atoi(args["runmin"].c_str());
-    int runmax = atoi(args["runmin"].c_str());
-    string pedfile =args["pedestalfile"];
-    double thr = atof(args["threshold"].c_str());
-    double thr1 = 1;
-    
-    int nframes = atoi(args["nframes"].c_str());
-    
-    int xmin =  atoi(args["xMin"].c_str()), xmax =  atoi(args["xMax"].c_str()), ymin = atoi(args["yMin"].c_str()), ymax = atoi(args["yMax"].c_str());
-    
-    string gainfname=args["gainfile"];
-    
-    int fifosize = atoi(args["fifosize"].c_str());
-    int nthreads = atoi(args["nthreads"].c_str());
-    int nsigma = atoi(args["nsigma"].c_str());
-    int nrows = atoi(args["readnrows"].c_str());
-    float eMin = atof(args["eMin"].c_str());
-    float eMax = atof(args["eMax"].c_str());
+    int fifosize = 1000;
+    int nthreads = 10;
    int csize = 3;
-    int nped = 1000;
+    int nsigma = 5;
+    int nped = 10000;

    int cf = 0;
-    int numberOfPackets=nrows/8;
-
+    int numberOfPackets=40;
 #ifdef RECT
    cout << "Should be rectangular but now it will crash! No data structure defined!" << endl;
 #endif

 #ifndef MOENCH04
-    moench03v2Data *decoder = new moench03v2Data(100);
+    moench03T1ReceiverDataNew *decoder = new moench03T1ReceiverDataNew();
    cout << "MOENCH03!" << endl;
 #endif

@ -199,10 +86,62 @@ int main(int argc, char *argv[]) {
    
 #endif

+    //Read detector size from decoder
    int nx , ny;
    decoder->getDetectorSize(nx, ny);

-    //Read detector size from decoder
+    //float *gm;
+
+    int ff, np;
+    // cout << " data size is " << dsize;
+
+    ifstream filebin;
+    char *indir = argv[1];
+    char *outdir = argv[2];
+    char *fformat = argv[3];
+    int runmin = 0;
+
+    // cout << "argc is " << argc << endl;
+    if (argc >= 5) {
+        runmin = atoi(argv[4]);
+    }
+
+    int runmax = runmin;
+
+    if (argc >= 6) {
+        runmax = atoi(argv[5]);
+    }
+
+    char *pedfile = NULL;
+    if (argc >= 7) {
+        pedfile = argv[6];
+    }
+    double thr = 0;
+    double thr1 = 1;
+
+    if (argc >= 8) {
+        thr = atof(argv[7]);
+    }
+
+    int nframes = 0;
+
+    if (argc >= 9) {
+        nframes = atoi(argv[8]);
+    }
+
+    int xmin = 0, xmax = nx, ymin = 0, ymax = ny;
+    if (argc >= 13) {
+        xmin = atoi(argv[9]);
+        xmax = atoi(argv[10]);
+        ymin = atoi(argv[11]);
+        ymax = atoi(argv[12]);
+    }
+
+    char *gainfname = NULL;
+    if (argc > 13) {
+        gainfname = argv[13];
+        cout << "Gain map file name is: " << gainfname << endl;
+    }

    char ffname[10000];
    char fname[10000];
@ -212,6 +151,17 @@ int main(int argc, char *argv[]) {
    std::time_t end_time;

    FILE *of = NULL;
+    cout << "input directory is " << indir << endl;
+    cout << "output directory is " << outdir << endl;
+    cout << "input file is " << fformat << endl;
+    cout << "runmin is " << runmin << endl;
+    cout << "runmax is " << runmax << endl;
+    if (pedfile)
+        cout << "pedestal file is " << pedfile << endl;
+    if (thr > 0)
+        cout << "threshold is " << thr << endl;
+    cout << "Nframes is " << nframes << endl;
+
    uint32_t nnx, nny;


@ -232,26 +182,26 @@ int main(int argc, char *argv[]) {
    singlePhotonDetector *filter = new singlePhotonDetector(
        decoder, csize, nsigma, 1, cm, nped, 200, -1, -1, gainmap, gs);

-    //if (gainfname) {
+    if (gainfname) {

-    if (filter->readGainMap(gainfname.c_str()))
+        if (filter->readGainMap(gainfname))
            cout << "using gain map " << gainfname << endl;
        else
            cout << "Could not open gain map " << gainfname << endl;
-    // } else
-    thr = 0.15 * thr;
+    } else
+        thr = 0.15 * thr;
    filter->newDataSet();
    //int dsize = decoder->getDataSize();

    if (thr > 0) {
-      cout << "threshold is " << thr << endl;
-      filter->setThreshold(thr);
-      cf = 0;
+        cout << "threshold is " << thr << endl;
+        filter->setThreshold(thr);
+        cf = 0;
+
    } else
-      cf = 1;
+        cf = 1;

    filter->setROI(xmin, xmax, ymin, ymax);
-    filter->setEnergyRange(eMin, eMax);
    std::time(&end_time);
    cout << std::ctime(&end_time) << endl;

@ -261,33 +211,21 @@ int main(int argc, char *argv[]) {
    // multiThreadedAnalogDetector(filter,nthreads,fifosize);
    multiThreadedCountingDetector *mt =
        new multiThreadedCountingDetector(filter, nthreads, fifosize);
-    
-    if (args["detectorMode"]=="counting") {
-      mt->setDetectorMode(ePhotonCounting);
-      if (thr > 0) {
+#ifndef ANALOG
+    mt->setDetectorMode(ePhotonCounting);
+    cout << "Counting!" << endl;
+    if (thr > 0) {
        cf = 0;
-      }
-    } else {
-      mt->setDetectorMode(eAnalog);
-      cf = 0;
    }
-      
-      
-// #ifndef ANALOG
-//     mt->setDetectorMode(ePhotonCounting);
-//     cout << "Counting!" << endl;
-//     if (thr > 0) {
-//         cf = 0;
-//     }
-// #endif
-// //{
-// #ifdef ANALOG
-//     mt->setDetectorMode(eAnalog);
-//     cout << "Analog!" << endl;
-//     cf = 0;
-//     // thr1=thr;
-// #endif
-//     //  }
+#endif
+//{
+#ifdef ANALOG
+    mt->setDetectorMode(eAnalog);
+    cout << "Analog!" << endl;
+    cf = 0;
+    // thr1=thr;
+#endif
+    //  }

    mt->StartThreads();
    mt->popFree(buff);
@ -298,17 +236,18 @@ int main(int argc, char *argv[]) {
    char froot[1000];
    double *ped=new double[nx * ny];//, *ped1;
    int pos,pos1;
-    //return  0;
-    if (pedfile.find(".raw") != std::string::npos) {
-      pos1=pedfile.rfind("/");
-      strcpy(froot,pedfile.substr(pos1).c_str());
-      pos=string(froot).find(".raw");
-      froot[pos]='\0';
-    }
    
-    cout << "PEDESTAL " << endl;
-    if (pedfile.find(".tif") == std::string::npos) {
-      sprintf(fname, "%s", pedfile.c_str());
+    if (pedfile) {
+      if (string(pedfile).find(".raw") != std::string::npos) {
+	pos1=string(pedfile).rfind("/");
+	strcpy(froot,pedfile+pos1);
+	pos=string(froot).find(".raw");
+	froot[pos]='\0';
+      }
+
+      cout << "PEDESTAL " << endl;
+      if (string(pedfile).find(".tif") == std::string::npos) {
+            sprintf(fname, "%s", pedfile);
            cout << fname << endl;
            std::time(&end_time);
            //cout << "aaa" << std::ctime(&end_time) << endl;
@ -318,97 +257,63 @@ int main(int argc, char *argv[]) {
            filebin.open((const char *)(fname), ios::in | ios::binary);
            //      //open file
            if (filebin.is_open()) {
-	      ff = -1;
+                ff = -1;
                while (decoder->readNextFrame(filebin, ff, np, buff)) {
-		  if (np == numberOfPackets) {
-		    mt->pushData(buff);
+                    if (np == numberOfPackets) {
+                        mt->pushData(buff);
                        mt->nextThread();
                        mt->popFree(buff);
                        ifr++;
-			if (ifr % 100 == 0)
-			  cout << ifr << " " << ff << " " << np << endl;
-			    //	break;
-		  } else {
-		    cout << ifr << " " << ff << " " << np << endl;
-		    break;
-		  }
+                        if (ifr % 100 == 0)
+                            cout << ifr << " " << ff << " " << np << endl;
+                    } else
+                        cout << ifr << " " << ff << " " << np << endl;
                    ff = -1;
                }
                filebin.close();
                while (mt->isBusy()) {
-		  ;
-
+                    ;
                }

-		sprintf(imgfname, "%s/%s_ped.tiff", outdir.c_str(),froot);
+		sprintf(imgfname, "%s/%s_ped.tiff", outdir,froot);
 		mt->writePedestal(imgfname);
-		sprintf(imgfname, "%s/%s_var.tiff", outdir.c_str(),froot);
+		sprintf(imgfname, "%s/%s_var.tiff", outdir,froot);
 		mt->writePedestalRMS(imgfname);
            } else
-	      cout << "Could not open pedestal file " << fname
-		   << " for reading " << endl;
-    } else {
-      float *pp = ReadFromTiff(pedfile.c_str(), nny, nnx);
-      if (pp && (int)nnx == nx && (int)nny == ny) {
-	for (int i = 0; i < nx * ny; i++) {
-                    ped[i] = pp[i];
-	}
-	delete[] pp;
-	mt->setPedestal(ped);
-	cout << "Pedestal set from tiff file " << pedfile << endl;
-      } else {
-	cout << "Could not open pedestal tiff file " << pedfile
+                cout << "Could not open pedestal file " << fname
                     << " for reading " << endl;
-      }
+        } else {
+            float *pp = ReadFromTiff(pedfile, nny, nnx);
+            if (pp && (int)nnx == nx && (int)nny == ny) {
+                for (int i = 0; i < nx * ny; i++) {
+                    ped[i] = pp[i];
+                }
+                delete[] pp;
+                mt->setPedestal(ped);
+                cout << "Pedestal set from tiff file " << pedfile << endl;
+            } else {
+                cout << "Could not open pedestal tiff file " << pedfile
+                     << " for reading " << endl;
+            }
+        }
+        std::time(&end_time);
+        cout << std::ctime(&end_time) << endl;
    }
-    std::time(&end_time);
-    cout << std::ctime(&end_time) << endl;
-

    ifr = 0;
    int ifile = 0;

    mt->setFrameMode(eFrame);
-    //t filelist=0;
-    ifstream flist;
-    flist.open (args["flist"].c_str(), std::ifstream::in);
-    if (flist.is_open()) {
-      cout << "Using file list" << endl;
-      runmin=0;
-       runmax=0;
-       while (flist.getline(ffname,10000)){
-	 cout << ffname << endl;
-	 runmax++;
-       }
-       runmax--;
-       flist.close();
-       cout << "Found " << runmax << " files " << endl;
-       flist.open (fformat, std::ifstream::in);
-    } 

    for (int irun = runmin; irun <= runmax; irun++) {
        cout << "DATA ";
        // sprintf(fn,fformat,irun);
-        // sprintf(ffname, "%s/%s.raw", indir, fformat);
-        // sprintf(fname, (const char*)ffname, irun);
-        // sprintf(ffname, "%s/%s.tiff", outdir, fformat);
-        // sprintf(imgfname, (const char*)ffname, irun);
-        // sprintf(ffname, "%s/%s.clust", outdir, fformat);
-        // sprintf(cfname, (const char*)ffname, irun);
-	if (flist.is_open()) {
-	  flist.getline(ffname,10000);
-	  cout << "file list " << ffname << endl;
-	} else {
-	  //sprintf(ffname,(const char*)fformat,irun);
-	  sprintf(ffname,args["fformat"].c_str(),irun);
-	  cout << "loop " << ffname << endl;
-	}
-	cout << "ffname "<< ffname << endl;
-	sprintf(fname,  "%s/%s.raw",indir.c_str(),ffname);
-	sprintf(imgfname,  "%s/%s.tiff",outdir.c_str(),ffname);
-	sprintf(cfname,  "%s/%s.clust",outdir.c_str(),ffname);
-
-
+        sprintf(ffname, "%s/%s.raw", indir, fformat);
+        sprintf(fname, (const char*)ffname, irun);
+        sprintf(ffname, "%s/%s.tiff", outdir, fformat);
+        sprintf(imgfname, (const char*)ffname, irun);
+        sprintf(ffname, "%s/%s.clust", outdir, fformat);
+        sprintf(cfname, (const char*)ffname, irun);
        cout << fname << " ";
        cout << imgfname << endl;
        std::time(&end_time);
@ -418,7 +323,7 @@ int main(int argc, char *argv[]) {
        //      //open file
        ifile = 0;
        if (filebin.is_open()) {
-            if (cf != 0) { // cluster finder
+            if (thr <= 0 && cf != 0) { // cluster finder
                if (of == NULL) {
                    of = fopen(cfname, "w");
                    if (of) {
@ -436,7 +341,7 @@ int main(int argc, char *argv[]) {
            ff = -1;
            ifr = 0;
            while (decoder->readNextFrame(filebin, ff, np, buff)) {
-	      if (np == numberOfPackets) {
+                if (np == numberOfPackets) {
                    //         //push
                    mt->pushData(buff);
                    // 	//         //pop
@ -445,26 +350,21 @@ int main(int argc, char *argv[]) {

                    ifr++;
 		    if (ifr % 100 == 0)
-		      cout << ifr << " " << ff << " " << np << endl;
-		    //break;
+                        cout << ifr << " " << ff << endl;
                    if (nframes > 0) {
                        if (ifr % nframes == 0) {
-                            // sprintf(ffname, "%s/%s_f%05d.tiff", outdir, fformat,
-                            //         ifile);
-                            // sprintf(imgfname, (const char*)ffname, irun);
-			  sprintf(imgfname,  "%s/%s_f%05d.tiff",outdir.c_str(),ffname,ifile);
-                           while (mt->isBusy()) 
-                             ;
-
+                            sprintf(ffname, "%s/%s_f%05d.tiff", outdir, fformat,
+                                    ifile);
+                            sprintf(imgfname, (const char*)ffname, irun);
                            mt->writeImage(imgfname, thr1);
                            mt->clearImage();
                            ifile++;
                        }
                    }
-	      } else {
-		cout << "bp " << ifr << " " << ff << " " << np << endl;
-		//break;
-	      }
+                } else {
+		  cout << "bp " << ifr << " " << ff << " " << np << endl;
+		  //break;
+		}
                ff = -1;
            }
            cout << "--" << endl;
@ -474,17 +374,13 @@ int main(int argc, char *argv[]) {
            }
            if (nframes >= 0) {
                if (nframes > 0) {
-		  sprintf(imgfname,  "%s/%s_f%05d.tiff",outdir.c_str(),ffname,ifile);
-                  //  sprintf(ffname, "%s/%s_f%05d.tiff", outdir, fformat, ifile);
-		  //sprintf(imgfname, (const char*)ffname, irun);
+                    sprintf(ffname, "%s/%s_f%05d.tiff", outdir, fformat, ifile);
+                    sprintf(imgfname, (const char*)ffname, irun);
                } else {
-		  sprintf(imgfname,  "%s/%s.tiff",outdir.c_str(),ffname);
-                  //  sprintf(ffname, "%s/%s.tiff", outdir, fformat);
-                  //  sprintf(imgfname, (const char*)ffname, irun);
+                    sprintf(ffname, "%s/%s.tiff", outdir, fformat);
+                    sprintf(imgfname, (const char*)ffname, irun);
                }
                cout << "Writing tiff to " << imgfname << " " << thr1 << endl;
-		while (mt->isBusy()) 
-		  ;
                mt->writeImage(imgfname, thr1);
                mt->clearImage();
                if (of) {
@ -499,16 +395,11 @@ int main(int argc, char *argv[]) {
            cout << "Could not open " << fname << " for reading " << endl;
    }
    if (nframes < 0) {
-      //sprintf(ffname, "%s/%s.tiff", outdir, fformat);
-      //  strcpy(imgfname, ffname);
-      sprintf(imgfname,  "%s/%s_tot.tiff",outdir.c_str(),ffname);
-      cout << "Writing tiff to " << imgfname << " " << thr1 << endl;
-      while (mt->isBusy()) 
-	;
-      mt->writeImage(imgfname, thr1);
-    }
-    if (flist.is_open()) {
-      flist.close();
+        sprintf(ffname, "%s/%s.tiff", outdir, fformat);
+        strcpy(imgfname, ffname);
+        cout << "Writing tiff to " << imgfname << " " << thr1 << endl;
+        mt->writeImage(imgfname, thr1);
    }
+
    return 0;
 }
--- a/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp
+++ b/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp
@ -13,8 +13,7 @@
 #include "sls/sls_detector_defs.h"
 #ifndef MOENCH04
 //#ifndef RECT
-#include "moench03v2Data.h"
-//#include "moench03T1ZmqDataNew.h"
+#include "moench03T1ZmqDataNew.h"
 //#endif
 //#ifdef RECT
 //#include "moench03T1ZmqDataNewRect.h"
@ -32,7 +31,6 @@
 #include <sstream>
 #include <string>
 #include <vector>
-#include <map>

 #include <rapidjson/document.h> //json header in zmq stream

@ -66,47 +64,35 @@ int main(int argc, char *argv[]) {
     * number]
     *
     */
-  std::map<std::string, std::string> args = {
-    {"numinterfaces","1"},	
-    {"rx_zmqip","10.1.2.102"},	
-    {"rx_zmqport","7770"},
-    {"zmqip","129.129.202.153"},
-    {"zmqport","7780"},
-    {"nthreads","5"},
-    {"fifosize","5000"},
-    {"nsigma","5"},
-    {"gainfile","none"},
-    {"nbinsx","5"},
-    {"nbinsy","5"},
-    {"etafile","none"},
-    {"etabinsx","1000"},
-    {"etamin","-1"},
-    {"etamax","2"}  };
-  FILE *of = NULL;
+    FILE *of = NULL;
+    int fifosize = 5000;
    int etabins = 1000, etabinsy = 1000; // nsubpix*2*100;
    double etamin = -1, etamax = 2;
    int nSubPixelsX = 2;
    int emin, emax;
    int nSubPixelsY = 2;
-    int nthreads = 5;
-    int fifosize = 5000;
-    uint32_t nSigma = 5;

-    string etafname;// = NULL;
-    string gainfname;// = NULL;
+    // help
+    if (argc < 3) {
+        cprintf(RED, "Help: ./trial [receive socket ip] [receive starting port "
+                     "number] [send_socket ip] [send starting port number] "
+                     "[nthreads] [nsubpix] [gainmap]  [etafile]\n");
+        return EXIT_FAILURE;
+    }

    // receive parameters
    bool send = false;
+    char *socketip = argv[1];
+    uint32_t portnum = atoi(argv[2]);
    // send parameters if any
-    string socketip2;// = 0;
+    char *socketip2 = 0;
    uint32_t portnum2 = 0;
-    string socketip;// = 0;
-    uint32_t portnum = 0;

    sls::zmqHeader zHeader, outHeader;
    zHeader.jsonversion = SLS_DETECTOR_JSON_HEADER_VERSION;
    outHeader.jsonversion = SLS_DETECTOR_JSON_HEADER_VERSION;

+    uint32_t nSigma = 5;

    int ok;

@ -116,85 +102,48 @@ int main(int argc, char *argv[]) {
    // time_t begin,end,finished;
    int rms = 0;

-    send = true;
-    // help
-    if (argc < 5) {
-      std::string name, value,sline;
-      int ic=0;
-      ifstream flist;
-      flist.open (argv[1], std::ifstream::in);
-      if (flist.is_open()) {
-	cout << "Using config file " <<argv[1] << endl;
-       while (std::getline(flist,sline)){
-	 if (sline.at(0)!='#') {
-	   ic=sline.find(' ');
-	   name = sline.substr(0,ic); 
-	   value = sline.substr(ic+1,sline.size()-ic); 
-	   args[name]=value;
-	 }
+    if (argc > 4) {
+        socketip2 = argv[3];
+        portnum2 = atoi(argv[4]);
+        if (portnum2 > 0)
+            send = true;
+    }
+    cout << "\nrx socket ip : " << socketip << "\nrx port num  : " << portnum;
+    if (send) {
+        cout << "\ntx socket ip : " << socketip2
+             << "\ntx port num  : " << portnum2;
+    }
+    int nthreads = 5;
+    if (argc > 5)
+        nthreads = atoi(argv[5]);

-       } 
-       flist.close();
-      } else {
-        cprintf(RED, "Arguments are either: \n [config file] \n or the following list (deprecated): [receive socket ip] [receive starting port "
-		"number] [send_socket ip] [send starting port number] "
-		"[nthreads] [nsubpix] [gainmap]  [etafile]\n");
-        return EXIT_FAILURE;
-      }
-    } else {
-       args["rx_zmqip"]=argv[1];	
-       args["rx_zmqport"]=argv[2];
-
-       args["zmqip"]=argv[3];
-       args["zmqport"]=argv[4];
-       if (argc > 5)
-        args["nthreads"] = argv[5];
-       if (argc > 6) {
-	 args["nbinsx"]=argv[6];
-	 args["nbinsy"]=argv[6];
-       }
-       
-      if (argc > 7) {
-	args["gainfile"]=argv[7];
-      }
-      if (argc > 8) {
-	args["etafilefile"]=argv[8];
-      }
+    cout << "Number of threads is: " << nthreads << endl;
+    if (argc > 6) {
+        nSubPixelsX = atoi(argv[6]);
+        nSubPixelsY = nSubPixelsX;
+#ifdef RECT
+        nSubPixelsX = 2;
+#endif
+    }
+    cout << "Number of subpixels is: " << nSubPixelsX << " " << nSubPixelsY
+         << endl;

+    char *gainfname = NULL;
+    if (argc > 7) {
+        gainfname = argv[7];
+        cout << "Gain map file name is: " << gainfname << endl;
    }

-       for (auto const& x : args)
-	 {
-	   std::cout << x.first  // string (key)
-		     << ':' 
-		     << x.second // string's value 
-		     << std::endl;
-	 }
-
-    socketip = args["rx_zmqip"];
-    portnum = atoi(args["rx_zmqport"].c_str());
-    
-    socketip2 = args["zmqip"];
-    portnum2 = atoi(args["zmqport"].c_str());
-
-    nthreads = atoi(args["nthreads"].c_str());
-    nSubPixelsX =atoi(args["nbinsx"].c_str());
-    nSubPixelsY =atoi(args["nbinsy"].c_str());
-    gainfname = args["gainfile"];
-    etafname = args["etafilefile"];
-    
-    if (atoi(args["nuninterfaces"].c_str())>1){
-      cprintf(RED, "Sorry, at the  moment only a single interface is supported instead of %d\n",atoi(args["nuninterfaces"].c_str()));
-      return EXIT_FAILURE;
+    char *etafname = NULL;
+    if (argc > 8) {
+        etafname = argv[8];
+        cout << "Eta file name is: " << etafname << endl;
    }

-
    // slsDetectorData *det=new moench03T1ZmqDataNew();
 #ifndef MOENCH04
-    cout << "This is a Moench03 v2" << endl;
-    //moench03T1ZmqDataNew *det = new moench03T1ZmqDataNew();
-    moench03v2Data *det = new moench03v2Data();
-    cout << "MOENCH03!" << endl;
+    cout << "This is a Moench03" << endl;
+    moench03T1ZmqDataNew *det = new moench03T1ZmqDataNew();
 #endif
 #ifdef MOENCH04
    cout << "This is a Moench04" << endl;
@ -228,8 +177,8 @@ int main(int argc, char *argv[]) {
    double *gmap = NULL;

    uint32_t nnnx, nnny;
-    //if (gainfname) {
-        gm = ReadFromTiff(gainfname.c_str(), nnny, nnnx);
+    if (gainfname) {
+        gm = ReadFromTiff(gainfname, nnny, nnnx);
        if (gm && nnnx == (uint)npx && nnny == (uint)npy) {
            gmap = new double[npx * npy];
            for (int i = 0; i < npx * npy; i++) {
@ -238,7 +187,7 @@ int main(int argc, char *argv[]) {
            delete[] gm;
        } else
            cout << "Could not open gain map " << gainfname << endl;
-	//}
+    }

    // analogDetector<uint16_t> *filter=new
    // analogDetector<uint16_t>(det,1,NULL,1000);
@ -256,8 +205,8 @@ int main(int argc, char *argv[]) {
    eta2InterpolationPosXY *interp = new eta2InterpolationPosXY(
        npx, npy, nSubPixelsX, nSubPixelsY, etabins, etabinsy, etamin, etamax);

-    //if (etafname)
-    interp->readFlatField(etafname.c_str());
+    if (etafname)
+        interp->readFlatField(etafname);

    interpolatingDetector *filter = new interpolatingDetector(
        det, interp, nSigma, 1, cm, 1000, 10, -1, -1, gainmap, gs);
@ -277,13 +226,13 @@ int main(int argc, char *argv[]) {
    try {
 #endif

-      zmqsocket = new sls::ZmqSocket(socketip.c_str(), portnum);
+      zmqsocket = new sls::ZmqSocket(socketip, portnum);

 #ifdef NEWZMQ
    } catch (...) {
        cprintf(RED,
                "Error: Could not create Zmq socket on port %d with ip %s\n",
-                portnum, socketip.c_str());
+                portnum, socketip);
        delete zmqsocket;
        return EXIT_FAILURE;
    }
@ -293,7 +242,7 @@ int main(int argc, char *argv[]) {
    if (zmqsocket->IsError()) {
        cprintf(RED,
                "Error: Could not create Zmq socket on port %d with ip %s\n",
-                portnum, socketip.c_str());
+                portnum, socketip);
        delete zmqsocket;
        return EXIT_FAILURE;
    }
@ -314,14 +263,14 @@ int main(int argc, char *argv[]) {
        // receive socket
        try {
 #endif
-	  zmqsocket2 = new sls::ZmqSocket(portnum2, socketip2.c_str());
+	  zmqsocket2 = new sls::ZmqSocket(portnum2, socketip2);

 #ifdef NEWZMQ
        } catch (...) {
            cprintf(RED,
                    "Error: Could not create Zmq socket server on port %d and "
                    "ip %s\n",
-                    portnum2, socketip2.c_str());
+                    portnum2, socketip2);
            //	delete zmqsocket2;
            //	zmqsocket2=NULL;
            //	delete zmqsocket;
@ -335,7 +284,7 @@ int main(int argc, char *argv[]) {
            cprintf(RED,
                    "AAA Error: Could not create Zmq socket server on port %d "
                    "and ip %s\n",
-                    portnum2, socketip2.c_str());
+                    portnum2, socketip2);
            //	delete zmqsocket2;
            // delete zmqsocket;
            //	return EXIT_FAILURE;
@ -773,25 +722,6 @@ int main(int argc, char *argv[]) {

            cprintf(MAGENTA, "%d %d %d %d\n", xmin, xmax, ymin, ymax);
            mt->setROI(xmin, xmax, ymin, ymax);
-
-             if (addJsonHeader.find("xMin") != addJsonHeader.end()) {
-                 istringstream(addJsonHeader.at("xMin")) >> xmin;
-             }
- 
-             if (addJsonHeader.find("yMin") != addJsonHeader.end()) {
-                 istringstream(addJsonHeader.at("yMin")) >> ymin;
-             }
- 
-             if (addJsonHeader.find("xMax") != addJsonHeader.end()) {
-                 istringstream(addJsonHeader.at("xMax")) >> xmax;
-             }
- 
-             if (addJsonHeader.find("yMax") != addJsonHeader.end()) {
-                 istringstream(addJsonHeader.at("yMax")) >> ymax;
-             }
-
-
-
            if (addJsonHeader.find("dynamicRange") != addJsonHeader.end()) {
                istringstream(addJsonHeader.at("dynamicRange")) >> dr;
                dr = 32;
@ -891,7 +821,7 @@ int main(int argc, char *argv[]) {
        // cout << acqIndex << " " << frameIndex << " " << subFrameIndex << "
        // "<< detSpec1 << " " << timestamp << " " << packetNumber << endl;
        // cprintf(GREEN, "frame\n");
-        if (packetNumber <= 50) {
+        if (packetNumber >= 40) {
            //*((int*)buff)=frameIndex;
            if (insubframe == 0)
                f0 = frameIndex;
--- a/slsDetectorGui/src/qTabMeasurement.cpp
+++ b/slsDetectorGui/src/qTabMeasurement.cpp
@ -803,9 +803,8 @@ void qTabMeasurement::GetNextFrameNumber() {
            "Inconsistent starting frame number for all detectors.");
        spinNextFrameNumber->setValue(retval);
    }
-    CATCH_HANDLE("Could not get starting frame number.",
-                 "qTabMeasurement::GetNextFrameNumber", spinNextFrameNumber,
-                 &QSpinBox::setValue, -1)
+    CATCH_DISPLAY("Could not get starting frame number.",
+                  "qTabMeasurement::GetNextFrameNumber")
    connect(spinNextFrameNumber, SIGNAL(valueChanged(int)), this,
            SLOT(SetNextFrameNumber(int)));
 }
--- a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
+++ b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
--- a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv8.0.0
+++ b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv8.0.0
--- a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
+++ b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
--- a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
@ -10,7 +10,7 @@
 #define HARDWARE_VERSION_NAMES                                                 \
    { "FX70T", "FX30T" }

-#define REQUIRED_FIRMWARE_VERSION (32)
+#define REQUIRED_FIRMWARE_VERSION (31)
 // virtual ones renamed for consistency
 // real ones keep previous name for compatibility (already in production)
 #ifdef VIRTUAL
--- a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
+++ b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
--- a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv8.0.0
+++ b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv8.0.0
--- a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
+++ b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
--- a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv8.0.0
+++ b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv8.0.0
--- a/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h
+++ b/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h
@ -24,18 +24,16 @@

 #define RUN_BUSY_OFST                       (0)
 #define RUN_BUSY_MSK                        (0x00000001 << RUN_BUSY_OFST)
-#define WAITING_FOR_TRIGGER_OFST            (1)
+#define WAITING_FOR_TRIGGER_OFST            (3)
 #define WAITING_FOR_TRIGGER_MSK             (0x00000001 << WAITING_FOR_TRIGGER_OFST)
-#define WAITING_FOR_START_FRAME_OFST        (2)
-#define WAITING_FOR_START_FRAME_MSK         (0x00000001 << WAITING_FOR_START_FRAME_OFST)
-#define ACQUIRING_FRAME_OFST                (3) // Not used in software
-#define ACQUIRING_FRAME_MSK                 (0x00000001 << ACQUIRING_FRAME_OFST)
-#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 DELAYBEFORE_OFST                    (4) // Not used in software
+#define DELAYBEFORE_MSK                     (0x00000001 << DELAYBEFORE_OFST) // Not used in software
+#define DELAYAFTER_OFST                     (5) // Not used in software
+#define DELAYAFTER_MSK                      (0x00000001 << DELAYAFTER_OFST) // Not used in software
+#define STOPPED_OFST                        (15)
 #define STOPPED_MSK                         (0x00000001 << STOPPED_OFST)
-#define INTERNAL_STOP_OFST                  (9)
-#define INTERNAL_STOP_MSK                   (0x00000001 << INTERNAL_STOP_OFST)
+#define RUNMACHINE_BUSY_OFST                (17)
+#define RUNMACHINE_BUSY_MSK                 (0x00000001 << RUNMACHINE_BUSY_OFST)

 /* Look at me register */
 #define LOOK_AT_ME_REG                      (0x03 << MEM_MAP_SHIFT) // Not used in firmware or software
--- a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
+++ b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
--- a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv8.0.0
+++ b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv8.0.0
--- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
@ -2924,17 +2924,14 @@ 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 sent out & back to wait for trigger (or not busy
-    // anymore)
+    // block till frame is sent out
    if (block) {
-        uint32_t retval = bus_r(STATUS_REG);
-        while ((retval & RUN_BUSY_MSK) && !(retval & WAITING_FOR_TRIGGER_MSK)) {
+        enum runStatus s = getRunStatus();
+        while (s == RUNNING || s == TRANSMITTING) {
            usleep(5000);
-            retval = bus_r(STATUS_REG);
+            s = getRunStatus();
        }
    }
    LOG(logINFO, ("Ready for Next Trigger...\n"));
@ -2967,16 +2964,9 @@ 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
-    else if (retval & RUN_BUSY_MSK) {
-        if ((retval & WAITING_FOR_TRIGGER_MSK) ||
-            (retval & WAITING_FOR_START_FRAME_MSK)) {
+    if (retval & RUN_BUSY_MSK) {
+        if (retval & WAITING_FOR_TRIGGER_MSK) {
            LOG(logINFOBLUE, ("Status: WAITING\n"));
            s = WAITING;
        } else {
@ -2987,13 +2977,19 @@ enum runStatus getRunStatus() {

    // not running
    else {
-        // stopped or idle
+        // stopped or error
        if (retval & STOPPED_MSK) {
            LOG(logINFOBLUE, ("Status: STOPPED\n"));
            s = STOPPED;
-        } else {
+        } else if (retval & RUNMACHINE_BUSY_MSK) {
+            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;
        }
    }

--- a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
+++ b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
--- a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv8.0.0
+++ b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv8.0.0
--- a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
+++ b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
--- a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv8.0.0
+++ b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv8.0.0
--- a/slsDetectorServers/slsDetectorServer/src/blackfin.c
+++ b/slsDetectorServers/slsDetectorServer/src/blackfin.c
@ -15,11 +15,6 @@ 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);
@ -85,21 +80,7 @@ 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);
 }

--- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
+++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
@ -532,11 +532,6 @@ 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;
@ -552,15 +547,17 @@ 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 == -1) {
-        ret = FAIL;
-        strcpy(mess, result);
-        LOG(logERROR, ("Executing cmd[%s] failed:%s\n", cmd, mess));
+    if (success) {
+        retval = FAIL;
+        LOG(logERROR, ("Executing cmd[%s]:%s\n", cmd, result));
    } else {
        LOG(level, ("Result:\n[%s]\n", result));
    }
-    return ret;
+
+    return retval;
 }

 int M_nofunc(int file_des) {
@ -588,7 +585,7 @@ int exec_command(int file_des) {

    // set
    if (Server_VerifyLock() == OK) {
-        executeCommand(cmd, retval, logINFO);
+        ret = executeCommand(cmd, retval, logINFO);
    }
    return Server_SendResult(file_des, OTHER, retval, sizeof(retval));
 }
@ -1951,57 +1948,59 @@ int acquire(int blocking, int file_des) {
 #ifdef EIGERD
            // check for hardware mac and hardware ip
            if (udpDetails[0].srcmac != getDetectorMAC()) {
-            ret = FAIL;
-            uint64_t sourcemac = getDetectorMAC();
-            char src_mac[MAC_ADDRESS_SIZE];
-            getMacAddressinString(src_mac, MAC_ADDRESS_SIZE, sourcemac);
-            sprintf(mess,
+                ret = FAIL;
+                uint64_t sourcemac = getDetectorMAC();
+                char src_mac[MAC_ADDRESS_SIZE];
+                getMacAddressinString(src_mac, MAC_ADDRESS_SIZE, sourcemac);
+                sprintf(
+                    mess,
                    "Invalid udp source mac address for this detector. Must be "
                    "same as hardware detector mac address %s\n",
                    src_mac);
-            LOG(logERROR, (mess));
-        } else if (!enableTenGigabitEthernet(GET_FLAG) &&
-                   (udpDetails[0].srcip != getDetectorIP())) {
-            ret = FAIL;
-            uint32_t sourceip = getDetectorIP();
-            char src_ip[INET_ADDRSTRLEN];
-            getIpAddressinString(src_ip, sourceip);
-            sprintf(mess,
+                LOG(logERROR, (mess));
+            } else if (!enableTenGigabitEthernet(GET_FLAG) &&
+                       (udpDetails[0].srcip != getDetectorIP())) {
+                ret = FAIL;
+                uint32_t sourceip = getDetectorIP();
+                char src_ip[INET_ADDRSTRLEN];
+                getIpAddressinString(src_ip, sourceip);
+                sprintf(
+                    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));
-        } else
+                LOG(logERROR, (mess));
+            } else
 #endif
-            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)) {
+                if (configured == FAIL) {
                ret = FAIL;
-                strcpy(mess, "Could not start acquisition thread!\n");
+                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 {
-                // 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);
+                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 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);
 }
@ -4772,8 +4771,7 @@ int set_read_n_rows(int file_des) {
    functionNotImplemented();
 #else
    // only set
-    if ((Server_VerifyLock() == OK) &&
-        (check_detector_idle("set number of rows") == OK)) {
+    if (Server_VerifyLock() == OK) {
        if (arg < MIN_ROWS_PER_READOUT || arg > MAX_ROWS_PER_READOUT) {
            ret = FAIL;
            sprintf(mess,
@ -4805,7 +4803,8 @@ int set_read_n_rows(int file_des) {
                LOG(logERROR, (mess));
            } else
 #elif defined(JUNGFRAUD) || defined(MOENCHD)
-            if (arg % READ_N_ROWS_MULTIPLE != 0) {
+            if ((check_detector_idle("set number of rows") == OK) &&
+                (arg % READ_N_ROWS_MULTIPLE != 0)) {
                ret = FAIL;
                sprintf(mess,
                        "Could not set number of rows. %d must be a multiple "
@ -8472,9 +8471,9 @@ int set_master(int file_des) {
    functionNotImplemented();
 #else
    // only set
-    if ((Server_VerifyLock() == OK) &&
-        (check_detector_idle("set master") == OK)) {
-        if (arg != 0 && arg != 1) {
+    if (Server_VerifyLock() == OK) {
+        if ((check_detector_idle("set master") == OK) &&
+            (arg != 0 && arg != 1)) {
            ret = FAIL;
            sprintf(mess, "Could not set master. Invalid argument %d.\n", arg);
            LOG(logERROR, (mess));
@ -9028,9 +9027,9 @@ int set_flip_rows(int file_des) {
    functionNotImplemented();
 #else
    // only set
-    if ((Server_VerifyLock() == OK) &&
-        (check_detector_idle("set flip rows") == OK)) {
-        if (arg != 0 && arg != 1) {
+    if (Server_VerifyLock() == OK) {
+        if ((check_detector_idle("set flip rows") == OK) &&
+            (arg != 0 && arg != 1)) {
            ret = FAIL;
            sprintf(mess, "Could not set flip rows. Invalid argument %d.\n",
                    arg);
@ -10365,9 +10364,9 @@ int set_synchronization(int file_des) {
    functionNotImplemented();
 #else
    // only set
-    if ((Server_VerifyLock() == OK) &&
-        (check_detector_idle("set synchronization") == OK)) {
-        if (arg != 0 && arg != 1) {
+    if (Server_VerifyLock() == OK) {
+        if ((check_detector_idle("set synchronization") == OK) &&
+            (arg != 0 && arg != 1)) {
            ret = FAIL;
            sprintf(mess,
                    "Could not set synchronization. Invalid argument %d.\n",
--- a/slsDetectorSoftware/include/sls/Detector.h
+++ b/slsDetectorSoftware/include/sls/Detector.h
@ -216,10 +216,7 @@ class Detector {
    /** [Jungfrau][Moench] **/
    Result<bool> getSynchronization(Positions pos = {}) const;

-    /** [Jungfrau][Moench]  Sync mode requires at least one master configured.
-       Also requires flatband cabling between master and slave with
-       termination board.
-     */
+    /** [Jungfrau][Moench]  */
    void setSynchronization(bool value);

    /** [Gotthard2][Mythen3] */
--- a/slsDetectorSoftware/include/sls/Result.h
+++ b/slsDetectorSoftware/include/sls/Result.h
@ -8,8 +8,7 @@
 * 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 and tsquash
- * method.
+ * Easy conversions to single values are provided using the squash method.
 */

 #include <algorithm>
@ -17,7 +16,6 @@
 #include <vector>

 #include "sls/ToString.h"
-#include "sls/TypeTraits.h"
 #include "sls/container_utils.h"

 namespace sls {
@ -130,25 +128,6 @@ 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; }
 };
--- a/slsDetectorSoftware/src/CmdProxy.h
+++ b/slsDetectorSoftware/src/CmdProxy.h
@ -1543,9 +1543,7 @@ 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. Sync mode requires at least one "
-        "master configured. Also requires flatband cabling between master and "
-        "slave with termination board.");
+        "synchronization between modules.");

    INTEGER_COMMAND_VEC_ID(row, getRow, setRow, StringTo<int>,
                           "[value]\n\tSet Detector row (udp header) to value. "
--- a/slsDetectorSoftware/src/Detector.cpp
+++ b/slsDetectorSoftware/src/Detector.cpp
@ -18,7 +18,6 @@

 #include <chrono>
 #include <fstream>
-#include <set>
 #include <thread>

 namespace sls {
@ -874,26 +873,18 @@ void Detector::startDetectorReadout() {

 void Detector::stopDetector(Positions pos) {

+    // stop and check status X times
    int retries{0};
-    auto status = getDetectorStatus(pos);
-
-    // jf sync fix: status [stopped or idle] = [stopped]
-    // sync issue: (master idle sometimes, slaves stopped)
-
-    // eiger fix: stop multiple times from multi client till all modules stopped
-    // 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.");
+    // avoid default construction of runStatus::IDLE on squash
+    auto status = getDetectorStatus().squash(defs::runStatus::RUNNING);
+    while (status != defs::runStatus::IDLE &&
+           status != defs::runStatus::STOPPED) {
+        if (status == defs::runStatus::ERROR) {
+            throw RuntimeError(
+                "Could not stop detector. Returned error status.");
        }
        pimpl->stopDetector(pos);
-        status = getDetectorStatus(pos);
+        status = getDetectorStatus().squash(defs::runStatus::RUNNING);
        ++retries;

        if (retries == 10)
@ -912,7 +903,7 @@ void Detector::stopDetector(Positions pos) {
            for (auto it : res) {
                maxVal = std::max(maxVal, it);
            }
-            setNextFrameNumber(maxVal + 1, pos);
+            setNextFrameNumber(maxVal + 1);
        }
    } break;
    default:
--- a/slsDetectorSoftware/src/DetectorImpl.cpp
+++ b/slsDetectorSoftware/src/DetectorImpl.cpp
@ -1220,26 +1220,10 @@ int DetectorImpl::acquire() {
        dataProcessingThread.join();

        if (acquisition_finished != nullptr) {
-            // 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
+            int status = Parallel(&Module::getRunStatus, {}).squash(ERROR);
            auto a = Parallel(&Module::getReceiverProgress, {});
            double progress = (*std::max_element(a.begin(), a.end()));
-
-            // callback
-            acquisition_finished(progress, static_cast<int>(status),
-                                 acqFinished_p);
+            acquisition_finished(progress, status, acqFinished_p);
        }

        clock_gettime(CLOCK_REALTIME, &end);
@ -1309,24 +1293,13 @@ 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 (blocking) {
-            Parallel(&Module::startAndReadAll, masters);
-            // ensure all status normal (slaves not blocking)
-            // 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);
+        if (!masters.empty()) {
+            Parallel((blocking ? &Module::startAndReadAll
+                               : &Module::startAcquisition),
+                     masters);
        }
    }
    // all in parallel
--- a/slsDetectorSoftware/src/DetectorImpl.h
+++ b/slsDetectorSoftware/src/DetectorImpl.h
@ -84,7 +84,9 @@ class DetectorImpl : public virtual slsDetectorDefs {
     */
    virtual ~DetectorImpl();

-    template <class CT> struct NonDeduced { using type = CT; };
+    template <class CT> struct NonDeduced {
+        using type = CT;
+    };
    template <typename RT, typename... CT>
    Result<RT> Parallel(RT (Module::*somefunc)(CT...),
                        std::vector<int> positions,
--- a/slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp
@ -356,29 +356,15 @@ TEST_CASE("powerindex", "[.cmd]") {
 TEST_CASE("powervalues", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
-
-    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));
-    }
+    REQUIRE_NOTHROW(proxy.Call("powervalues", {}, -1, GET));
+    REQUIRE_THROWS(proxy.Call("powervalues", {}, -1, PUT));
 }

 TEST_CASE("slowadcvalues", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
-
-    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));
-    }
+    REQUIRE_NOTHROW(proxy.Call("slowadcvalues", {}, -1, GET));
+    REQUIRE_THROWS(proxy.Call("slowadcvalues", {}, -1, PUT));
 }

 TEST_CASE("slowadclist", "[.cmd]") {
--- a/slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp
@ -689,11 +689,10 @@ TEST_CASE("confadc", "[.cmd]") {
    auto det_type = det.getDetectorType().squash();

    if (det_type == defs::GOTTHARD2) {
-        const int ndet = det.size();
-        const int nchip = 10;
-        const int nadc = 32;
-        std::vector<std::vector<std::vector<int>>> prev_val(
-            ndet, std::vector<std::vector<int>>(nchip, std::vector<int>(nadc)));
+        int ndet = det.size();
+        int nchip = 10;
+        int nadc = 32;
+        int prev_val[ndet][nchip][nadc];
        for (int i = 0; i != ndet; ++i) {
            for (int j = 0; j != nchip; ++j) {
                for (int k = 0; k != nadc; ++k) {
--- a/slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp
+++ b/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) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
        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) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
        REQUIRE_NOTHROW(proxy.Call("chipversion", {}, -1, GET));
    } else {
        REQUIRE_THROWS(proxy.Call("chipversion", {}, -1, GET));
@ -705,34 +705,6 @@ 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));
--- a/slsDetectorSoftware/tests/test-CmdProxy-moench.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-moench.cpp
@ -18,92 +18,5 @@ 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
--- a/slsDetectorSoftware/tests/test-CmdProxy.cpp
+++ b/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) {
+        if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
            std::vector<defs::dacIndex> daclist = {
                defs::VREF_PRECH, defs::VREF_DS, defs::VREF_COMP};
            for (auto it : daclist) {
@ -2417,11 +2417,8 @@ TEST_CASE("scan", "[.cmd]") {
        notImplementedInd = defs::VCASCP_PB;
        break;
    case defs::JUNGFRAU:
-        ind = defs::VB_COMP;
-        notImplementedInd = defs::VSVP;
-        break;
    case defs::MOENCH:
-        ind = defs::VIN_CM;
+        ind = defs::VB_COMP;
        notImplementedInd = defs::VSVP;
        break;
    case defs::GOTTHARD:
@ -3475,7 +3472,7 @@ TEST_CASE("lock", "[.cmd]") {
 TEST_CASE("execcommand", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
-    REQUIRE_NOTHROW(proxy.Call("execcommand", {"ls *.txt"}, -1, PUT));
+    REQUIRE_NOTHROW(proxy.Call("execcommand", {"ls"}, -1, PUT));
 }

 TEST_CASE("framecounter", "[.cmd]") {
--- a/slsDetectorSoftware/tests/test-Result.cpp
+++ b/slsDetectorSoftware/tests/test-Result.cpp
@ -196,24 +196,4 @@ 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
--- a/slsSupportLib/include/sls/TypeTraits.h
+++ b/slsSupportLib/include/sls/TypeTraits.h
@ -103,13 +103,4 @@ 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
--- a/slsSupportLib/include/sls/ZmqSocket.h
+++ b/slsSupportLib/include/sls/ZmqSocket.h
@ -24,9 +24,8 @@
 #include <rapidjson/document.h> //json header in zmq stream
 #pragma GCC diagnostic pop

-//#include <zmq.h>
+#include <zmq.h>

-class zmq_msg_t;
 namespace sls {

 #define MAX_STR_LENGTH 1000
--- a/slsSupportLib/include/sls/versionAPI.h
+++ b/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      "8.0.1"
-#define APIRECEIVER  "8.0.0 0x231108"
-#define APICTB       "8.0.0 0x231109"
-#define APIGOTTHARD  "8.0.0 0x231109"
-#define APIGOTTHARD2 "8.0.0 0x231109"
-#define APIJUNGFRAU  "8.0.0 0x231109"
-#define APIMYTHEN3   "8.0.0 0x231109"
-#define APIMOENCH    "8.0.0 0x231109"
-#define APIEIGER     "8.0.0 0x231109"
-#define APILIB       "8.0.1 0x240112"
+#define RELEASE      "developer"
+#define APILIB       "developer 0x230224"
+#define APIRECEIVER  "developer 0x230224"
+#define APICTB       "developer 0x230922"
+#define APIGOTTHARD  "developer 0x230922"
+#define APIGOTTHARD2 "developer 0x230922"
+#define APIMYTHEN3   "developer 0x230922"
+#define APIMOENCH    "developer 0x230922"
+#define APIEIGER     "developer 0x230922"
+#define APIJUNGFRAU "developer 0x230928"
--- a/slsSupportLib/src/ZmqSocket.cpp
+++ b/slsSupportLib/src/ZmqSocket.cpp
@ -10,7 +10,7 @@
 #include <string.h>
 #include <thread>
 #include <vector>
-#include <zmq.h>
+
 namespace sls {

 using namespace rapidjson;
--- a/tests/scripts/test_simulators.py
+++ b/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
+import os, sys, subprocess, time, colorama, signal, psutil

 from colorama import Fore
 from slsdet import Detector, detectorType, detectorSettings
@ -21,37 +21,29 @@ class RuntimeException (Exception):
 def Log(color, message):
    print('\n' + color + message, flush=True)

-
 def checkIfProcessRunning(processName):
-    cmd = "ps -ef | grep " + processName
-    print(cmd)
-    res=subprocess.getoutput(cmd)
-    print(res)
-    # eg. of output
-    #l_user  250506  243295  0 14:38 pts/5    00:00:00 /bin/sh -c ps -ef | grep slsReceiver
-    #l_user  250508  250506  0 14:38 pts/5    00:00:00 grep slsReceiver
-
-    print('how many')
-    cmd = "ps -ef | grep " + processName + " | wc -l"
-    print(cmd)
-    res=subprocess.getoutput(cmd)
-    print(res)
-
-    if res == '2':
-        return False
-    return True
-
+    '''
+    Check if there is any running process that contains the given name processName.
+    https://gist.github.com/Sanix-Darker/8cbed2ff6f8eb108ce2c8c51acd2aa5a
+    '''
+    # Iterate over the all the running process
+    for proc in psutil.process_iter():
+        try:
+            # Check if process name contains the given name string.
+            if processName.lower() in proc.name().lower():
+                return True
+        except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
+            pass
+    return False;

 def killProcess(name):
    if checkIfProcessRunning(name):
        Log(Fore.GREEN, 'killing ' + name)
        p = subprocess.run(['killall', name])
        if p.returncode != 0:
-            raise RuntimeException('killall failed for ' + name)
-    else:
-        print('process not running : ' + name)
+            raise RuntimeException('error in killall ' + name)

-def cleanup(name):
+def cleanup(name, d):
    '''
    kill both servers, receivers and clean shared memory
    '''
@ -59,27 +51,18 @@ def cleanup(name):
    killProcess(name + 'DetectorServer_virtual')
    killProcess('slsReceiver')
    killProcess('slsMultiReceiver')
-    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
+    d.freeSharedMemory()

 def startProcessInBackground(name):
    try:
        # in background and dont print output
-        p = subprocess.Popen(name.split(), stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, restore_signals=False) 
+        p = subprocess.Popen(name.split(), stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) 
        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':
@ -96,7 +79,6 @@ def startReceiver(name):
    time.sleep(2)

 def loadConfig(name, rx_hostname, settingsdir):
-    Log(Fore.GREEN, 'Loading config')
    try:
        d = Detector()
        if name == 'eiger':
@ -124,36 +106,25 @@ def loadConfig(name, rx_hostname, settingsdir):
        Log(Fore.RED, 'Could not load config for ' + name)
        raise

-def startCmdTests(name, fp, fname):
-    Log(Fore.GREEN, 'Cmd Tests for ' + name)
-    cmd = 'tests --abort [.cmd] -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 = '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 startCmdTests(name, fp):
+    try:
+        p = subprocess.run(['tests', '--abort', '[.cmd]'], stdout=fp, stderr=fp)
+        if p.returncode != 0:
+            raise Exception 
+    except:
+        Log(Fore.RED, 'Cmd tests failed for ' + name) 
+        raise

+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
@ -178,51 +149,46 @@ 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 = prefix_fname + '_log.txt'
-Log(Fore.BLUE, '\nLog File: ' + fname) 
-
+fname = '/tmp/slsDetectorPackage_virtual_test.txt'
+Log(Fore.BLUE, 'Tests -> ' + 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 + ')')
-    startGeneralTests(fp, file_results)
+
+    d = Detector()
+    # 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
-            file_results = prefix_fname + '_results_cmd_' + server + '.txt'
-            Log(Fore.BLUE, 'Cmd tests for ' + server + ' (results: ' + file_results + ')')
+            Log(Fore.BLUE, server + ' tests')
            sys.stdout = fp
            sys.stderr = fp
-            Log(Fore.BLUE, 'Cmd tests for ' + server + ' (results: ' + file_results + ')')
            
            # cmd tests for det
-            cleanup(server)
+            Log(Fore.BLUE, 'Cmd Tests for ' + server)
+            cleanup(server, d)
            startServer(server)
            startReceiver(server)
            loadConfig(server, args.rx_hostname, args.settingspath)
-            startCmdTests(server, fp, file_results)
-            cleanup(server)
+            startCmdTests(server, fp)
+            cleanup(server, d)
        except:
-            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 + '!!!')
+            cleanup(server, d)
            raise
Author	SHA1	Message	Date
vhinger182	d2fcc1f344	Merge branch 'developer' into jf_json_rxroi	2023-10-06 12:02:16 +02:00
vhinger182	2b93ef4565	minor	2023-10-06 11:55:20 +02:00
Dhanya Thattil	d34f396ef8	Dev/jf/fix pedestal (#821 ) * jf pedestal fix: touch enable bit last	2023-10-05 10:29:33 +02:00
Dhanya Thattil	f9c4405da6	dev: update 2d gain plot color map (if no x and ymin/max changes or window resizing): setFixedWidth was updating for window resize, updated virtual servers for g2 and jungfrau to keep changing gain and data for every frame. the data value (#819 )	2023-10-03 17:22:32 +02:00
vhinger182	78cbe8e660	fix jungfrauModuleData empty if statement	2023-08-04 16:12:27 +02:00
vhinger182	0ee54be252	rx_roi for module data	2023-08-04 15:31:30 +02:00
vhinger182	f90a9b7520	Read rx_ROI from json master	2023-08-03 18:25:43 +02:00
vhinger182	558c2de85c	Merge branch 'developer' into jf_json_rxroi	2023-08-03 18:24:08 +02:00
vhinger182	877a648d9e	Merge branch 'developer' into jf_json_rxroi	2023-07-28 12:18:29 +02:00
vhinger182	9ea5101299	Merge branch 'developer' into jf_json_rxroi	2023-07-20 16:56:38 +02:00
vhinger182	c57f10c242	Merge branch 'developer' into jf_json_rxroi	2023-07-20 16:40:53 +02:00
vhinger182	6d6b6b98df	Fix strixel mapping and interpolation	2023-07-20 11:12:13 +02:00
				`@ -0,0 +1 @@`
				`../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer`
				`@ -1 +0,0 @@`
				`../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv8.0.0`
				`@ -0,0 +1 @@`
				`../slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer`
				`@ -0,0 +1 @@`
				`../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer`
				`@ -0,0 +1 @@`
				`../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer`
				`@ -0,0 +1 @@`
				`../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer`
				`@ -0,0 +1 @@`
				`../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer`
				`@ -0,0 +1 @@`
				`../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer`