wip print

* binaries in

CMakeLists.txt

@@ -2,15 +2,7 @@
 # Copyright (C) 2021 Contributors to the SLS Detector Package
 cmake_minimum_required(VERSION 3.14)
 project(slsDetectorPackage)
-
-# Read VERSION file into project version
-set(VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/VERSION")
-file(READ "${VERSION_FILE}" VERSION_CONTENT)
-string(STRIP "${VERSION_CONTENT}" PROJECT_VERSION_STRING)
-set(PROJECT_VERSION ${PROJECT_VERSION_STRING})
-
-# Pass it to the compiler
-add_compile_definitions(SLS_DET_VERSION="${PROJECT_VERSION}")
+set(PROJECT_VERSION 9.0.0)
 
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
 
@@ -304,20 +296,19 @@ if (SLS_USE_INTEGRATION_TESTS)
 endif (SLS_USE_INTEGRATION_TESTS)
 
 if (SLS_USE_PYTHON)
-    find_package (Python 3.8 COMPONENTS Interpreter Development)
+    find_package (Python 3.6 COMPONENTS Interpreter Development)
     if(SLS_FETCH_PYBIND11_FROM_GITHUB)
         FetchContent_Declare(
             pybind11
             GIT_REPOSITORY https://github.com/pybind/pybind11
-            GIT_TAG        v2.13.6
+            GIT_TAG        v2.11.0
         )
 
     else()
-    # https://github.com/pybind/pybind11/releases
         FetchContent_Declare(
             pybind11
-            URL ${CMAKE_CURRENT_SOURCE_DIR}/libs/pybind11/v2.13.6.tar.gz
-            URL_HASH MD5=a04dead9c83edae6d84e2e343da7feeb
+            URL ${CMAKE_SOURCE_DIR}/libs/pybind11/v2.11.0.tar.gz
+            URL_HASH MD5=90c4946e87c64d8d8fc0ae4edf35d780
         )
     endif()
     FetchContent_MakeAvailable(pybind11)

README.md

@@ -2,11 +2,7 @@
 Before building from source make sure that you have the [software wiki](https://slsdetectorgroup.github.io/devdoc/dependencies.html) installed. If installing using conda, conda will manage the dependencies. Avoid also installing packages with pip. 
 
 ## Documentaion
-Detailed documentation including installation can be found in the [software wiki](https://slsdetectorgroup.github.io/devdoc/index.html).
-
-Different releases can be found on the [official site](https://www.psi.ch/en/lxn/software-releases).
-
-Firmware compatiblity can be found in [firmware page](https://github.com/slsdetectorgroup/slsDetectorFirmware)
+Detailed documentation can be found in the [software wiki](https://slsdetectorgroup.github.io/devdoc/index.html) and on the [official site](https://www.psi.ch/en/detectors/software).
 
 ## Installation
 
@@ -46,20 +42,33 @@ conda search slsdet
 conda search slsdetgui
 ```
 
-## 2. Build from source
+### 2. Build from source
 
-### 2.1 Download Source Code from github
+##### 2.1 Download Source Code from github
 ```
 git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git --branch 7.0.0
 ```
 
-> **Note:** For v6.x.x of slsDetectorPackage and older, refer [pybind11 notes on cloning](#Pybind-and-Zeromq).
+**Pybind for Python**<br>
+* **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.
+
+```
+# 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
+```
+
+##### 2.2 Build from source
 
 
-### 2.2 Build from source
-
-
-### Build using CMake
+###### Build using CMake
 
 ```
 # outside slsDetecorPackage folder
@@ -85,28 +94,26 @@ 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 (unil 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 only 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 [zeromq notes for cmake option to hint library location](#Pybind-and-Zeromq).
 
-### Build using in-built cmk.sh script
+###### 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
@@ -121,6 +128,7 @@ Usage: $0 [-b] [-c] [-d <HDF5 directory>] [-e] [-g] [-h] [-i]
 -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
@@ -137,14 +145,11 @@ Usage: $0 [-b] [-c] [-d <HDF5 directory>] [-e] [-g] [-h] [-i]
 # 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 [zeromq notes for cmk script option to hint library location](#Pybind-and-Zeromq).
-
-### Build on old distributions
+###### Build on old distributions
 
 If your linux distribution doesn't come with a C++11 compiler (gcc>4.8) then 
 it's possible to install a newer gcc using conda and build the slsDetectorPackage
@@ -161,10 +166,7 @@ cmake ../slsDetectorPackage -DCMAKE_PREFIX_PATH=$CONDA_PREFIX
 make -j12
 ```
 
-> **Note:** For v7.x.x of slsDetectorPackage and older, refer [zeromq notes for dependencies for conda](#Pybind-and-Zeromq).
-
-
-### Build slsDetectorGui (Qt5)
+###### Build slsDetectorGui (Qt5)
 
 1. Using pre-built binary on conda
 ```
@@ -178,14 +180,7 @@ yum install qt5-qtbase-devel.x86_64
 yum install qt5-qtsvg-devel.x86_64 
 ```
 
-3. Using system installation on RHEL8
-```
-yum install qt5-qtbase-devel.x86_64
-yum install qt5-qtsvg-devel.x86_64 
-yum install expat-devel.x86_64
-```
-
-4. Using conda
+3. Using conda
 ```
 #Add channels for dependencies and our library
 conda config --add channels conda-forge
@@ -213,15 +208,13 @@ cd slsDetectorPackage
 ./cmk.sh -cbgj9
 ```
 
-> **Note:** For v7.x.x of slsDetectorPackage and older, refer [zeromq notes for dependencies for conda](#Pybind-and-Zeromq).
-
-### Build documentation from package
+###### Build documentation from package
 The documentation for the slsDetectorPackage is build using a combination 
 of Doxygen, Sphinx and Breathe. The easiest way to install the dependencies
 is to use conda 
 
 ```
-conda create -n myenv python=3.12 sphinx sphinx_rtd_theme breathe doxygen numpy
+conda create -n myenv python sphinx_rtd_theme breathe
 ```
 
 ```
@@ -235,47 +228,6 @@ make rst # rst only, saves time in case the API did not change
 ```
 
 
-
-## Pybind and Zeromq
-
-### Pybind11 for Python
-**v8.0.0+**:
-pybind11 is built
-* by default from tar file in repo (libs/pybind/v2.1x.0.tar.gz)
-* or use advanced option SLS_FETCH_PYBIND11_FROM_GITHUB [link].
-   * v9.0.0+: pybind11 (v2.13.6)
-   * v8.x.x : pybind11 (v2.11.0)
-
-**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.
-
-```
-# 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
-**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].
-
-**v7.x.x and older**:
-zeromq-devel 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
-
-
 ## Support
     dhanya.thattil@psi.ch
     erik.frojdh@psi.ch

RELEASE.txt

@@ -1,285 +1,34 @@
-SLS Detector Package Major Release 9.0.0 released on 26.11.2024
+SLS Detector Package Major Release x.x.x released on xx.xx.202x
 ===============================================================
 
-This document describes the differences between v9.0.0 and v8.0.2
+This document describes the differences between vx.x.x and vx.0.2   
 
 
 
     CONTENTS
     --------
-    1           Compilation Changes
-    2           New or Changed Features
-        2.1         Breaking API
-        2.2         Resolved or Changed Features
-        2.3         New Features
-    3           On-board Detector Server Compatibility
-    4           Firmware Requirements
-    5           Kernel Requirements
-    6           Download, Documentation & Support
+    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
+    5           Download, Documentation & Support
 
 
 
 
-2 Compilation Changes
-=====================
-
-
-    *   Python version
-        Minimum python version is changed from 3.6 to 3.8
-
-
-    *   Pybind11 version
-        In-built version and the one picked up from github 
-        updated from v2.11.0 to v2.13.6
-
-
-    *   Python lib versioning
-        slsdet.__version__ now returns the package release version.
-
-
-    *   Python version in conda build
-        Added python 3.13 also to conda build
-
-
-
-2 New, Changed or Resolved Features
+1 New, Changed or Resolved Features
 =====================================
 
 
 
-2.1 Breaking API
-==================
-
-
-    Receiver
-    --------
-
-
-    *   Receiver callbacks
-        Brought much more metadata to receiver callbacks to construct the image.
-        Update MultiReceiverApp to reflect this change.
-
-
-    *   File path
-        At start of acquisition or at rx_start command, the file path is only 
-        then verified if it exists and created if it does not.
-
-
-    Client
-    ------
-
-
-    *   Removed receiver/publisher ZMQ IP
-        Command line: rx_zmqip gives a warning and does nothing
-        Python : rx_zmqip removed
-        C++ API: get/setRxZmqIP removed
-
-        Publisher zmq IP set to '0.0.0.0' or to listen on all interfaces.
-        The publisher will determine which interface to stream out from based on
-        the network route to the subscriber IP. Hence, receiver zmq IP is not 
-        required.
-
-
-    *   Write register, Set or Clear bit
-        Validation for this advanced feature has been removed by default. 
-        One can force validation by using --validate in the command line or by 
-        setting the validate option in the API.
-       
-
-    ZMQ
-    ---
-
-
-    *   Publisher socket constructor does not take an IP anymore.
-        The details are above under 'Removed receiver/publisher ZMQ IP'.
-
-
-    GUI/ Client Callback
-    --------------------
-
-
-    *   completeImage member in detectorData attribute now returns false only
-        if any the sub images (from different udp ports) have completeImage
-        set to false in the JSON header. This is set if therea are any missing 
-        packets for that udp port on slsReceiver/slsMultiReceiver. 
-        
-        The different subimages are anyway not synchronized. This errs when
-        there are different missing images across multiple UDP ports. 
-
-        The Gui does not show "complete image" in the status bar anymore. 
-        If any of the udp ports have missing packets for that current disaplayed 
-        image, then the "missing packets" will show in red in the status bar.
-
-
-    Detector Server
-    ---------------
-
-
-    *   [Mythen3] Only run clock can be set
-        Clock 0 is now the run clock and the only one that can be set. 
-        The others are be read only.
-        This affects the following commands:
-        Command line or python API: clkdiv, clkfreq, clkphase, maxclkphaseshift
-        C++ API: get/setClockDivider, getClockFrequency, get/setClockPhase, 
-        getMaxClockPhaseShift
-
-
-    *   [Jungfrau] Temperature Control
-        Temperature control is enabled by default at on-board detector server 
-        startup. 
-        As before, the default temperature threshold is 65°C and crossing this
-        value will set a temperature event.
-
-
-
-2.2 Resolved or Changed Features
-================================
-
-
-    Compilation
-    -----------
-
-
-    *   cmake_source_dir
-        Fixed compilation error when using python and adding the slsDetectorPackage 
-        as a subfolder due to cmake source directory changing.
-
-
-    Client
-    ------
-
-
-    *   Command line Code Generation
-        The command line parsing code is now generated from a yaml file. This is
-        transparent to the user.
-
-    
-    *   Clearer error message about freeing shared memory.
-
-
-    Detector Server
-    ---------------
-
-
-    *   [Gotthard2] Chip reconfiguration
-
-            -   Powering off/on the chip will now switch off chip configuration 
-                property/ configure the chip every time.
-
-            -   Switching off high voltage from a non zero value will now wait 
-                10s to return for safety reasons.
-
-            -   Powering off the chip requires high voltage to have been 
-                switched off prior.
-
-            -   Acquisition requires chip to have been configured prior.
-
-
-    *   [Gotthard2] Burst mode options restricted
-        Burst mode external and continuous mode internal are not allowed to be set
-        anymore as they are anyway not implemented.
-
-
-    Receiver
-    --------
-
-
-    *   [Gotthard I] fixed header stripping fixing segfault.
-
-
-    *   Error or help message for invalid arguments to slsMultiReceiver.
-
-
-    Simulator
-    ---------
-
-
-    *   Refactored stop server to have better start up.
-
-
-    *   Fixed possible memory leak when taking non blocking acquisitions.
-
-
-    *   [Jungfrau] Valid gain values in data sent out. Previously, 2 was also sent out.
-
-   
-    ZMQ
-    ---
-
-
-    *   Publiser socket constructor
-
-        -   enables keep alive socket options to send heartbeat messages to prevent
-            discarded TCP flows if there is no packet for a longer period.
-
-        -   enables IPv6 interfaces
-
-    *   Prints specific error for ENOENT (endpoint does not exist)
-
-
-
-2.3 New Features
-================
-
-
-    Client
-    ------
-
-
-    *   Auto completion
-        bash_autocomplete.sh or zsh_autocomplete.sh must be sourced from the 
-        main package folder to enable auto completion of commands and arguments 
-        for the command line on that shell.
-
-
-    *   sls_detector
-        New executable that can be used instead of 'sls_detector_get' and 
-        'sls_detector_put' for most commands. It will infer from the number of 
-        arguments, which executable (sls_detector_put or sls_detector_get) to use. 
-        For the rare commands that cannot be inferred from the number of arguments,
-        it will complain accordingly.  
-
-
-    *   [Jungfrau] Timing Info Decoder (Advanced configuration)
-        Command line or python API: timing_info_decoder
-        C++ API: get/setTimingInfoDecoder. Options: SWISSFEL (Default), SHINE
-
-
-    *   [Jungfrau] Collection Mode (Advanced configuration)
-        Command line or python API: collectionmode 
-        C++ API: get/setCollectionMode. Options: ELECTRON, HOLE (Default)
-        If chip v1.1, also configures the chip afterwards. 
-        
-        
-    *   [Gotthard2] Next frame number
-        'Stop' in G2 25um is not synchronous and hence might trigger an extra set
-        of frames in the slave module, resulting in the next acquiistion starting
-        with inconsistent frame numbers between master and slave. Solved by 
-        setting next frame number to the larger value (max + 1) after a stop command. 
-        Requires a firmware update.
-
-        Command line or python API: nextframenumber
-        C++ API: get/setNextFrameNumber
-        Can set/get the starting frame number for the next acquistion.
-
-
-    *   [Mythen3] Readout speed
-        Command line, python API: readoutspeed. Options: full_speed (10MHz), 
-        half_speed (20MHz, default), quarter_speed (40MHz)
-        C++ API: get/setReadoutSpeed
-        Also affect: 
-        Command line, python API: readoutspeedlist
-        C++ API: getReadoutSpeedList
-
-
-    *   Sleep
-        Command line, python/ C++ API:  sleep
-        Client sleeps for required time. Advanced command mainly for firmware
-        developers to use in config files.
-
-
-    *   Xilinx Chip Test Board added
-
 
 
 2  On-board Detector Server Compatibility
@@ -317,14 +66,14 @@ This document describes the differences between v9.0.0 and v8.0.2
 
     Eiger       02.10.2023 (v32)                    (updated in 7.0.3)
     
-    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    01.10.2024 (v1.6, HW v1.0)          (updated in 9.0.0)
+                01.10.2024 (v2.6, HW v2.0)          (updated in 9.0.0)
 
-    Mythen3     13.11.2024 (v2.0)                   (updated in 9.0.0)
+    Mythen3     11.10.2024 (v1.5)                   (updated in 9.0.0)
 
     Gotthard2   03.10.2024 (v1.0)                   (updated in 9.0.0)
 
-    Moench      26.10.2023 (v2.0)                   (updated in 8.0.2)
+    Moench      26.10.2023 (v2.0)                   (updated in 9.0.0)
 
     Gotthard    08.02.2018 (50um and 25um Master)
                 09.02.2018 (25 um Slave) 
@@ -360,6 +109,7 @@ This document describes the differences between v9.0.0 and v8.0.2
 4 Kernel Requirements
 ======================
 
+
     Blackfin 
     --------
     Latest version: Fri Oct 29 00:00:00 2021
@@ -367,10 +117,12 @@ This document describes the differences between v9.0.0 and v8.0.2
     Older ones will work, but might have issues with programming firmware via
     the package.
 
+
     Nios
     -----
     Compatible version: Mon May 10 18:00:21 CEST 2021
 
+
     Kernel Upgrade
     ---------------
     Eiger   via bit files

VERSION

@@ -1 +0,0 @@
-9.0.0

conda-recepie/build.sh

@@ -1,12 +1,8 @@
 # SPDX-License-Identifier: LGPL-3.0-or-other
 # Copyright (C) 2021 Contributors to the SLS Detector Package
 
-if [ ! -d "build" ]; then
-    mkdir build
-fi
-if [ ! -d "install" ]; then
-    mkdir install
-fi
+mkdir build
+mkdir install
 cd build
 cmake .. \
       -DCMAKE_PREFIX_PATH=$CONDA_PREFIX \

conda-recepie/build_pylib.sh

@@ -2,10 +2,5 @@
 # Copyright (C) 2021 Contributors to the SLS Detector Package
 
 echo "|<-------- starting python build"
-
 cd python
-
-# copy VERSION into slsdet for installation
-cp ../VERSION slsdet/VERSION
-
 ${PYTHON} setup.py install

conda-recepie/conda_build_config.yaml

@@ -4,5 +4,4 @@ python:
     - 3.10
     - 3.11 
     - 3.12
-    - 3.13
     

conda-recepie/meta.yaml

@@ -1,10 +1,10 @@
+
 package:
   name: sls_detector_software
   version: {{ environ.get('GIT_DESCRIBE_TAG', '') }}
 
-
 source:
-  path: ..
+  - path: ..
 
 build:
   number: 0
@@ -61,11 +61,13 @@ outputs:
         - libstdcxx-ng
         - libgcc-ng
 
+
       run: 
         - libstdcxx-ng
         - libgcc-ng
 
   - name: slsdet
+
     script: build_pylib.sh
 
     requirements:
@@ -75,13 +77,12 @@ outputs:
         - {{compiler('cxx')}}
         - {{ pin_subpackage('slsdetlib', exact=True) }}
         - setuptools
-        - pybind11=2.13
+        - pybind11=2.11
 
       host:
         - python
         - {{ pin_subpackage('slsdetlib', exact=True) }}
-        - setuptools
-        - pybind11=2.13
+        - pybind11=2.11
 
 
       run:
@@ -91,11 +92,11 @@ outputs:
         - numpy
         - {{ pin_subpackage('slsdetlib', exact=True) }}
 
+
     test:
       imports:
         - slsdet
 
-
   - name: slsdetgui
     script: copy_gui.sh
     requirements:

docs/CMakeLists.txt

@@ -58,12 +58,6 @@ set(SPHINX_SOURCE_FILES
   src/udpheader.rst
   src/udpconfig.rst
   src/udpdetspec.rst
-  src/fileformat.rst
-  src/slsreceiverheaderformat.rst
-  src/masterfileattributes.rst
-  src/binaryfileformat.rst
-  src/hdf5fileformat.rst
-  src/zmqjsonheaderformat.rst
 )
 
 foreach(filename ${SPHINX_SOURCE_FILES})

docs/src/binaryfileformat.rst

@@ -1,438 +0,0 @@
-Binary File Format
-====================
-
-This is the default file format that can be configured using command `fformat <commandline.html#term-fformat-binary-hdf5>`_.
-
-    .. code-block:: bash
-
-        sls_detector_put fformat binary
-
-
-Master File
---------------
-
-* File Name: [fpath]/[fname]_master_[findex].json :ref:`Details here<file name format>`
-
-* It is in json format and created for every acquisition.
-
-* It contains :ref:`attributes<master file attributes>` relevant to the acquisition. This can vary with detector type shown in :ref:`master json file examples <json master file examples>` here.
-
-* It shows the :ref:`**SLS Receiver Header** <sls receiver header format>` format used in data files.
-
-* Enabled/disabled using command `fmaster <commandline.html#term-fmaster-0-1>`_. 
-
-
-Data File
-----------
-
-* File Name: [fpath]/[fname]_dx_fy_[findex].raw :ref:`Details here<file name format>`
-
-* It store multiple frames sequentially, with total number of frames determined by `rx_framesperfile <commandline.html#term-rx_framesperfile-n_frames>`_ parameter.
-
-* Each frame includes a :ref:`**sls_receiver_header** <sls receiver header format>` structure, followed by the actual frame data.
-
-
-
-.. _json master file examples:
-
-JSON Master File Examples
----------------------------------------------------
-
-Eiger
-^^^^^
-
-.. code-block:: text
-
-    {
-        "Version": 7.2,
-        "Timestamp": "Wed Nov 13 15:46:30 2024",
-        "Detector Type": "Eiger",
-        "Timing Mode": "auto",
-        "Geometry": {
-            "x": 2,
-            "y": 1
-        },
-        "Image Size in bytes": 262144,
-        "Pixels": {
-            "x": 512,
-            "y": 256
-        },
-        "Max Frames Per File": 10000,
-        "Frame Discard Policy": "nodiscard",
-        "Frame Padding": 1,
-        "Scan Parameters": "[disabled]",
-        "Total Frames": 1,
-        "Receiver Roi": {
-            "xmin": 4294967295,
-            "xmax": 4294967295,
-            "ymin": 4294967295,
-            "ymax": 4294967295
-        },
-        "Dynamic Range": 16,
-        "Ten Giga": 0,
-        "Exptime": "1s",
-        "Period": "1s",
-        "Threshold Energy": -1,
-        "Sub Exptime": "2.62144ms",
-        "Sub Period": "2.62144ms",
-        "Quad": 0,
-        "Number of rows": 256,
-        "Rate Corrections": "[0]",
-        "Frames in File": 1,
-        "Frame Header Format": {
-            "Frame Number": "8 bytes",
-            "SubFrame Number/ExpLength": "4 bytes",
-            "Packet Number": "4 bytes",
-            "Bunch ID": "8 bytes",
-            "Timestamp": "8 bytes",
-            "Module Id": "2 bytes",
-            "Row": "2 bytes",
-            "Column": "2 bytes",
-            "Reserved": "2 bytes",
-            "Debug": "4 bytes",
-            "Round Robin Number": "2 bytes",
-            "Detector Type": "1 byte",
-            "Header Version": "1 byte",
-            "Packets Caught Mask": "64 bytes"
-        }
-    }
-
-
-
-Jungfrau
-^^^^^^^^
-
-.. code-block:: text
-
-    {
-        "Version": 7.2,
-        "Timestamp": "Wed Nov 13 13:03:53 2024",
-        "Detector Type": "Jungfrau",
-        "Timing Mode": "auto",
-        "Geometry": {
-            "x": 1,
-            "y": 1
-        },
-        "Image Size in bytes": 1048576,
-        "Pixels": {
-            "x": 1024,
-            "y": 512
-        },
-        "Max Frames Per File": 10000,
-        "Frame Discard Policy": "nodiscard",
-        "Frame Padding": 1,
-        "Scan Parameters": "[disabled]",
-        "Total Frames": 1000,
-        "Receiver Roi": {
-            "xmin": 4294967295,
-            "xmax": 4294967295,
-            "ymin": 4294967295,
-            "ymax": 4294967295
-        },
-        "Exptime": "10us",
-        "Period": "2ms",
-        "Number of UDP Interfaces": 1,
-        "Number of rows": 512,
-        "Frames in File": 10,
-        "Frame Header Format": {
-            "Frame Number": "8 bytes",
-            "SubFrame Number/ExpLength": "4 bytes",
-            "Packet Number": "4 bytes",
-            "Bunch ID": "8 bytes",
-            "Timestamp": "8 bytes",
-            "Module Id": "2 bytes",
-            "Row": "2 bytes",
-            "Column": "2 bytes",
-            "Reserved": "2 bytes",
-            "Debug": "4 bytes",
-            "Round Robin Number": "2 bytes",
-            "Detector Type": "1 byte",
-            "Header Version": "1 byte",
-            "Packets Caught Mask": "64 bytes"
-        }
-    }
-
-
-Gotthard2
-^^^^^^^^^^^^
-
-.. code-block:: text
-
-    {
-        "Version": 7.2,
-        "Timestamp": "Wed Nov 13 14:18:17 2024",
-        "Detector Type": "Gotthard2",
-        "Timing Mode": "auto",
-        "Geometry": {
-            "x": 1,
-            "y": 1
-        },
-        "Image Size in bytes": 2560,
-        "Pixels": {
-            "x": 1280,
-            "y": 1
-        },
-        "Max Frames Per File": 20000,
-        "Frame Discard Policy": "nodiscard",
-        "Frame Padding": 1,
-        "Scan Parameters": "[disabled]",
-        "Total Frames": 10,
-        "Receiver Roi": {
-            "xmin": 4294967295,
-            "xmax": 4294967295,
-            "ymin": 4294967295,
-            "ymax": 4294967295
-        },
-        "Exptime": "0ns",
-        "Period": "0ns",
-        "Burst Mode": "burst_internal",
-        "Frames in File": 10,
-        "Frame Header Format": {
-            "Frame Number": "8 bytes",
-            "SubFrame Number/ExpLength": "4 bytes",
-            "Packet Number": "4 bytes",
-            "Bunch ID": "8 bytes",
-            "Timestamp": "8 bytes",
-            "Module Id": "2 bytes",
-            "Row": "2 bytes",
-            "Column": "2 bytes",
-            "Reserved": "2 bytes",
-            "Debug": "4 bytes",
-            "Round Robin Number": "2 bytes",
-            "Detector Type": "1 byte",
-            "Header Version": "1 byte",
-            "Packets Caught Mask": "64 bytes"
-        }
-    }
-
-Mythen3
-^^^^^^^
-
-.. code-block:: text
-
-    {
-        "Version": 7.2,
-        "Timestamp": "Wed Nov 13 14:39:14 2024",
-        "Detector Type": "Mythen3",
-        "Timing Mode": "auto",
-        "Geometry": {
-            "x": 1,
-            "y": 1
-        },
-        "Image Size in bytes": 15360,
-        "Pixels": {
-            "x": 3840,
-            "y": 1
-        },
-        "Max Frames Per File": 10000,
-        "Frame Discard Policy": "nodiscard",
-        "Frame Padding": 1,
-        "Scan Parameters": "[disabled]",
-        "Total Frames": 1,
-        "Receiver Roi": {
-            "xmin": 4294967295,
-            "xmax": 4294967295,
-            "ymin": 4294967295,
-            "ymax": 4294967295
-        },
-        "Dynamic Range": 32,
-        "Ten Giga": 1,
-        "Period": "2ms",
-        "Counter Mask": "0x7",
-        "Exptime1": "0.1s",
-        "Exptime2": "0.1s",
-        "Exptime3": "0.1s",
-        "GateDelay1": "0ns",
-        "GateDelay2": "0ns",
-        "GateDelay3": "0ns",
-        "Gates": 1,
-        "Threshold Energies": "[-1, -1, -1]",
-        "Frames in File": 1,
-        "Frame Header Format": {
-            "Frame Number": "8 bytes",
-            "SubFrame Number/ExpLength": "4 bytes",
-            "Packet Number": "4 bytes",
-            "Bunch ID": "8 bytes",
-            "Timestamp": "8 bytes",
-            "Module Id": "2 bytes",
-            "Row": "2 bytes",
-            "Column": "2 bytes",
-            "Reserved": "2 bytes",
-            "Debug": "4 bytes",
-            "Round Robin Number": "2 bytes",
-            "Detector Type": "1 byte",
-            "Header Version": "1 byte",
-            "Packets Caught Mask": "64 bytes"
-        }
-    }
-
-
-Moench
-^^^^^^
-
-.. code-block:: text
-
-    {
-        "Version": 7.2,
-        "Timestamp": "Wed Nov 13 14:41:32 2024",
-        "Detector Type": "Moench",
-        "Timing Mode": "auto",
-        "Geometry": {
-            "x": 1,
-            "y": 1
-        },
-        "Image Size in bytes": 320000,
-        "Pixels": {
-            "x": 400,
-            "y": 400
-        },
-        "Max Frames Per File": 100000,
-        "Frame Discard Policy": "discardpartial",
-        "Frame Padding": 1,
-        "Scan Parameters": "[disabled]",
-        "Total Frames": 1,
-        "Receiver Roi": {
-            "xmin": 4294967295,
-            "xmax": 4294967295,
-            "ymin": 4294967295,
-            "ymax": 4294967295
-        },
-        "Exptime": "10us",
-        "Period": "2ms",
-        "Number of UDP Interfaces": 1,
-        "Number of rows": 400,
-        "Frames in File": 1,
-        "Frame Header Format": {
-            "Frame Number": "8 bytes",
-            "SubFrame Number/ExpLength": "4 bytes",
-            "Packet Number": "4 bytes",
-            "Bunch ID": "8 bytes",
-            "Timestamp": "8 bytes",
-            "Module Id": "2 bytes",
-            "Row": "2 bytes",
-            "Column": "2 bytes",
-            "Reserved": "2 bytes",
-            "Debug": "4 bytes",
-            "Round Robin Number": "2 bytes",
-            "Detector Type": "1 byte",
-            "Header Version": "1 byte",
-            "Packets Caught Mask": "64 bytes"
-        }
-    }
-
-Gotthard I
-^^^^^^^^^^^
-
-.. code-block:: text
-
-    {
-        "Version": 7.2,
-        "Timestamp": "Wed Nov 13 15:16:19 2024",
-        "Detector Type": "Gotthard",
-        "Timing Mode": "auto",
-        "Geometry": {
-            "x": 1,
-            "y": 1
-        },
-        "Image Size in bytes": 2560,
-        "Pixels": {
-            "x": 1280,
-            "y": 1
-        },
-        "Max Frames Per File": 20000,
-        "Frame Discard Policy": "nodiscard",
-        "Frame Padding": 1,
-        "Scan Parameters": "[disabled]",
-        "Total Frames": 1,
-        "Receiver Roi": {
-            "xmin": 4294967295,
-            "xmax": 4294967295,
-            "ymin": 4294967295,
-            "ymax": 4294967295
-        },
-        "Exptime": "1.00001ms",
-        "Period": "1s",
-        "Detector Roi": {
-            "xmin": 4294967295,
-            "xmax": 4294967295
-        },
-        "Frames in File": 1,
-        "Frame Header Format": {
-            "Frame Number": "8 bytes",
-            "SubFrame Number/ExpLength": "4 bytes",
-            "Packet Number": "4 bytes",
-            "Bunch ID": "8 bytes",
-            "Timestamp": "8 bytes",
-            "Module Id": "2 bytes",
-            "Row": "2 bytes",
-            "Column": "2 bytes",
-            "Reserved": "2 bytes",
-            "Debug": "4 bytes",
-            "Round Robin Number": "2 bytes",
-            "Detector Type": "1 byte",
-            "Header Version": "1 byte",
-            "Packets Caught Mask": "64 bytes"
-        }
-    }
-
-Chip Test Board
-^^^^^^^^^^^^^^^
-
-.. code-block:: text
-
-    {
-        "Version": 7.2,
-        "Timestamp": "Wed Nov 13 15:32:59 2024",
-        "Detector Type": "ChipTestBoard",
-        "Timing Mode": "auto",
-        "Geometry": {
-            "x": 1,
-            "y": 1
-        },
-        "Image Size in bytes": 48018,
-        "Pixels": {
-            "x": 3,
-            "y": 1
-        },
-        "Max Frames Per File": 20000,
-        "Frame Discard Policy": "nodiscard",
-        "Frame Padding": 1,
-        "Scan Parameters": "[disabled]",
-        "Total Frames": 1,
-        "Receiver Roi": {
-            "xmin": 4294967295,
-            "xmax": 4294967295,
-            "ymin": 4294967295,
-            "ymax": 4294967295
-        },
-        "Exptime": "0ns",
-        "Period": "0.18s",
-        "Ten Giga": 0,
-        "ADC Mask": "0x2202",
-        "Analog Flag": 1,
-        "Analog Samples": 8003,
-        "Digital Flag": 0,
-        "Digital Samples": 1000,
-        "Dbit Offset": 0,
-        "Dbit Bitset": 0,
-        "Transceiver Mask": "0x3",
-        "Transceiver Flag": 0,
-        "Transceiver Samples": 1,
-        "Frames in File": 1,
-        "Frame Header Format": {
-            "Frame Number": "8 bytes",
-            "SubFrame Number/ExpLength": "4 bytes",
-            "Packet Number": "4 bytes",
-            "Bunch ID": "8 bytes",
-            "Timestamp": "8 bytes",
-            "Module Id": "2 bytes",
-            "Row": "2 bytes",
-            "Column": "2 bytes",
-            "Reserved": "2 bytes",
-            "Debug": "4 bytes",
-            "Round Robin Number": "2 bytes",
-            "Detector Type": "1 byte",
-            "Header Version": "1 byte",
-            "Packets Caught Mask": "64 bytes"
-        }
-    }

docs/src/commandline.rst

@@ -8,7 +8,7 @@ Commands can be used either with sls_detector_get or sls_detector_put
 
 .. code-block::
 
-    sls_detector_get exptime
+    sls_detector_get vrf
 
 Help
 --------
@@ -25,16 +25,6 @@ Help
     sls_detector_get -h fpath
     sls_detector_help fpath
   
-    # list of deprecated commands
-    list deprecated
-
-    # autocompletion
-    # bash_autocomplete.sh or zsh_autocomplete.sh must be sourced from the 
-    # main package folder to enable auto completion of commands and arguments 
-    # for the command line on that shell.
-    source bash_autocomplete.sh
-
-  
 
 Commands
 -----------

docs/src/dependencies.rst

@@ -20,8 +20,8 @@ the shared libraries these are needed:
 Python bindings
 -----------------------
 
- * Python >= 3.8
- * pybind11 2.13.6 (packaged in libs)
+ * Python > 3.6
+ * pybind11 2.11.0 (packaged in libs)
 
 .. note ::  
 

docs/src/fileformat.rst

@@ -1,62 +0,0 @@
-File format
-================================
-
-If `fwrite <commandline.html#term-fwrite-0-1>`_ is enabled, the receiver will write data to files. 
-
-Number of Files
-----------------
-
-Every acquisition will create a master file and data files. 
-
-An acquisition can have multiple data files for a single frame. The number of files is determined by the number of UDP ports per module and the number of modules.
-
-    * Every modules has its own receiver process. Every receiver process can have 1 or 2 UDP ports.
-    * Each UDP port will create its own file. Therefore, each receiver can write 1 or 2 files.
-    * So, for example a detector with 4 modules with 2 UDP ports each will create a total of 8 files with file names containing UDP port index **'_d0'** to **'_d7'**.
-
-A new file containing **'_f[file_index]'** in file name is also created when reaching the maximum frames per file. Configured using `rx_framesperfile <commandline.html#term-rx_framesperfile-n_frames>`_.
-
-.. _file name format:
-
-Naming
--------
-| Master File Name: [fpath]/[fname]_master_[findex].[ext]
-
-
-| Data File Name: [fpath]/[fname]_dx_fy_[findex].[ext] 
-
-   * fpath: file path set using command `fpath <commandline.html#term-fpath-path>`_. Default: '/'
-   * fname: file name prefix using command `fname <commandline.html#term-fname-name>`_. Default: "run"
-   * findex: acquisition index using command `findex <commandline.html#term-findex-n_value>`_. Automatically incremented for every acquisition with `sls_detector_acquire <commandline.html#term-acquire>`_ (if `fwrite <commandline.html#term-fwrite-0-1>`_ enabled).
-   * x: unique udp port index. New file per UDP port.
-   * y: file index. New file created after reaching max frames per file.
-   * ext: file extension. Default: "raw"(data file) or "json"(master file)
-
-
-Some file name examples:
-
-    .. code-block:: bash
-
-        # first file
-        path-to-file/run_d0_f0_0.raw
-
-        # first file for second UDP port
-        path-to-file/run_d1_f0_0.raw
-
-        # second file after reaching max frames in first file
-        path-to-file/run_d0_f1_0.raw
-        
-        # second acquisition, first file
-        path-to-file/run_d0_f0_1.raw
-
-
-Formats
---------
-
-There are 2 file formats supported by the receiver:
-
-    * Binary - extension .json (master file) or .raw (data files)
-    * HDF5 - extension .h5
-
-The default is binary. HDF5 can be enabled by compiling the package with HDF5 option enabled. The file format is set using the command `fformat <commandline.html#term-fformat-binary-hdf5>`_.
-

docs/src/firmware.rst

@@ -98,7 +98,7 @@ Upgrade
 
     * 6.1.2 server has a fix for seamless fpga programming
 
-    * We recommend first updating the on-board detector server to 6.1.2 (with client 6.1.x) using command `updatedetectorserver <commandline.html#term-updatedetectorserver-server_name-with-full-path>`_.
+    * We recommend first updating the on-board detector server to 6.1.2 (with client 6.1.x) using command 'updatedetectorserver' or 'copydetectorserver'.
 
     * Then use command 'programfpga' to only update firmware or use command 'update' to update firmware and server to the latest release.
 
@@ -257,7 +257,7 @@ Upgrade
 
     * 6.1.2 server has a fix for seamless fpga programming
 
-    * We recommend first updating the on-board detector server to 6.1.2 (with client 6.1.x) using command `updatedetectorserver <commandline.html#term-updatedetectorserver-server_name-with-full-path>`_.
+    * We recommend first updating the on-board detector server to 6.1.2 (with client 6.1.x) using command 'updatedetectorserver' or 'copydetectorserver'.
 
     * Then use command 'programfpga' to only update firmware or use command 'update' to update firmware and server to the latest release.
 

docs/src/gendoc.cpp

@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include "Caller.h"
+#include "CmdProxy.h"
 #include "sls/Detector.h"
 #include "sls/sls_detector_defs.h"
 
@@ -37,8 +37,8 @@ int main() {
 
     std::cout << "Generating command line documentation!\n";
 
-    sls::Caller caller(nullptr);
-    auto commands = caller.getAllCommands();
+    sls::CmdProxy proxy(nullptr);
+    auto commands = proxy.GetProxyCommands();
 
     std::ofstream fs("commands.rst");
     fs << ".. glossary::\n";
@@ -46,7 +46,7 @@ int main() {
     for (const auto &cmd : commands) {
         std::ostringstream os;
         std::cout << cmd << '\n';
-        caller.call(cmd, {}, -1, slsDetectorDefs::HELP_ACTION, os);
+        proxy.Call(cmd, {}, -1, slsDetectorDefs::HELP_ACTION, os);
 
         auto tmp = os.str().erase(0, cmd.size());
         auto usage = tmp.substr(0, tmp.find_first_of('\n'));
@@ -57,7 +57,7 @@ int main() {
 
     std::ofstream fs2("deprecated.csv");
     fs2 << "Old, New\n";
-    auto cmds = caller.GetDeprecatedCommands();
+    auto cmds = proxy.GetDeprecatedCommands();
     for (auto it : cmds) {
         fs2 << it.first << ", " << it.second << '\n';
     }

docs/src/hdf5fileformat.rst

@@ -1,89 +0,0 @@
-
-
-HDF5 File Format
-================================
-
-Compilation
--------------
-
-#. Compile the package with HDF5 option enabled
-
-    #. Using cmk script: ./cmk.sh -hj9 -d [path of hdf5 dir] (-d is optional and for custom installation folder)
-
-    #. Enable using cmake option **-DSLS_USE_HDF5=ON** and **-DCMAKE_INSTALL_PREFIX=/path/to/custom/hdf/installation** (optional).
-
-
-Setup
--------
-
-#. Start Receiver process
-
-#. Load config file
-
-#. Set file format using command `fformat <commandline.html#term-fformat-binary-hdf5>`_.
-
-    .. code-block:: bash
-
-        sls_detector_put fformat hdf5
-
-
-Master File
--------------
-
-* File Name: [fpath]/[fname]_master_[findex].h5 :ref:`Details here<file name format>`
-
-* It contains  :ref:`attributes<master file attributes>` relevant to the acquisition. This can vary with detector type.
-
-.. code-block:: text
-
-    /                                               # Root level
-    |---> entry                                     # entry group
-    |    |---> data                                 # data group
-    |         |---> column                          # dataset of each sls_receiver_header member
-    |         |---> data
-    |         |---> detector header version
-    |         |---> detector specific 1
-    |         |---> detector specific 2
-    |         |---> detector specific 3
-    |         |---> detector specific 4
-    |         |---> detector type
-    |         |---> exp length or sub exposure time
-    |         |---> frame number
-    |         |---> mod id
-    |         |---> packets caught
-    |         |---> packets caught bit mask
-    |         |---> row
-    |         |---> timestamp
-    |    |---> instrument                           # instrument group
-    |         |---> beam                            # beam group
-    |         |---> detector                        # detector group
-    |              |---> Master File Attribute 1    # dataset of each master file attribute
-    |              |---> Master File Attribute 2
-    |              |---> Master File Attribute 3
-    |              |---> Master File Attribute ..
-    |    |---> sample                               # sample group
-
-
-If more than 1 data file per frame:
-    * The dataset of each :ref:`**SLS Receiver Header** <sls receiver header format>` member is a virtual dataset.
-    * **data** dataset is a virtual dataset.
-
-
-More details regarding master file attributes can be found :ref:`here<master file attributes>`.
-
-Data File
------------
-
-* File Name: [fpath]/[fname]_dx_fy_[findex].h5 :ref:`Details here<file name format>`
-
-
-Virtual Data File
-------------------
-
-* File Name: [fpath]/[fname]_virtual_[findex].h5 :ref:`Details here<file name format>`
-
-* For multiple modules, a virtual file linking data from all the modules is created. The individual files are expected to be present.
-
-* It is linked in the master file.
-
-

docs/src/index.rst

@@ -12,7 +12,7 @@ Welcome to slsDetectorPackage's documentation!
     For further documentation, visit the official page: https://www.psi.ch/en/detectors/documentation
 
 .. toctree::
-    :maxdepth: 3
+    :maxdepth: 1
     :caption: Installation:
 
     installation
@@ -82,22 +82,6 @@ Welcome to slsDetectorPackage's documentation!
     receivers
     slsreceiver
 
-.. toctree::
-    :caption: Receiver Files
-    :maxdepth: 3
-
-    fileformat
-    slsreceiverheaderformat
-    masterfileattributes
-    binaryfileformat
-    hdf5fileformat
-
-.. toctree::
-    :caption: Receiver ZMQ Stream
-    :maxdepth: 2
-
-    zmqjsonheaderformat
-
 .. toctree::
     :caption: Troubleshooting
 

docs/src/installation.rst

@@ -1,3 +1,8 @@
+.. warning ::
+    
+    Before building from source make sure that you have the 
+    :doc:`dependencies <../dependencies>` installed. If installing using conda, conda will 
+    manage the dependencies. Avoid also installing packages with pip. 
    
 
 .. _Installation:
@@ -6,18 +11,8 @@
 Installation
 ===============
 
-One can either install pre-built binaries using conda or build from source.
-
-.. warning ::
-    
-    Before building from source make sure that you have the 
-    :doc:`dependencies <../dependencies>` installed. If installing using conda, conda will 
-    manage the dependencies. Avoid also installing packages with pip. 
-   
-
-
 Install binaries using conda
-----------------------------------
+-------------------------------
 
 Conda is not only useful to manage python environments but can also
 be used as a user space package manager. Dates in the tag (for eg. 2020.07.23.dev0) 
@@ -60,7 +55,7 @@ We have three different packages available:
 
 
 Build from source
-----------------------
+-------------------
 
 1. Download Source Code from github
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -80,10 +75,8 @@ Build from source
 2. Build from Source
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-One can either build using cmake or use the in-built cmk.sh script.
-
 Build using CMake
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^
 
 .. code-block:: bash
 
@@ -110,7 +103,7 @@ 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 (until you see [g])
+    # first press [c] - configure (maybe multiple times till you see [g])
     # then press [g] - generate
 
 
@@ -130,7 +123,7 @@ Example cmake options               Comment
 
 
 Build using in-built cmk.sh script
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
 .. code-block:: bash
@@ -180,7 +173,7 @@ Build using in-built cmk.sh script
 
 
 Build on old distributions
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 If your linux distribution doesn't come with a C++11 compiler (gcc>4.8) then 
 it's possible to install a newer gcc using conda and build the slsDetectorPackage
@@ -205,10 +198,9 @@ using this compiler
 
 
 Build slsDetectorGui (Qt5)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 1. Using pre-built binary on conda
-
     .. code-block:: bash
 
         conda create -n myenv slsdetgui=7.0.0
@@ -216,22 +208,13 @@ Build slsDetectorGui (Qt5)
 
 
 2. Using system installation on RHEL7
-
     .. code-block:: bash
 
         yum install qt5-qtbase-devel.x86_64
         yum install qt5-qtsvg-devel.x86_64 
 
-3. Using system installation on RHEL8
-
-    .. code-block:: bash
-
-        yum install qt5-qtbase-devel.x86_64
-        yum install qt5-qtsvg-devel.x86_64 
-        yum install expat-devel.x86_64
-
-4. Using conda
 
+3. Using conda
     .. code-block:: bash
 
         #Add channels for dependencies and our library
@@ -266,7 +249,7 @@ Build slsDetectorGui (Qt5)
 
 
 Build this documentation
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^
 
 The documentation for the slsDetectorPackage is build using a combination 
 of Doxygen, Sphinx and Breathe. The easiest way to install the dependencies
@@ -289,18 +272,16 @@ is to use conda
 
 
 Pybind and Zeromq
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^
 
 .. _pybind for different slsDetectorPackage versions:
 
 
-| **Pybind11 for Python**
+| **Pybind for Python**
 | v8.0.0+:
-|   pybind11 is built
-|   * by default from tar file in repo (libs/pybind/v2.1x.0.tar.gz) 
+|   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>`__].
-|      * v9.0.0+: pybind11 (v2.13.6)
-|      * v8.x.x : pybind11 (v2.11.0)
 |
 | v7.x.x:
 |   pybind11 packaged into 'libs/pybind'. No longer a submodule. No need for "recursive" or "submodule update".
@@ -331,7 +312,7 @@ Pybind and Zeromq
 |   * or use advanced option SLS_FETCH_ZMQ_FROM_GITHUB [`link <https://github.com/zeromq/libzmq.git>`__].
 |
 | v7.x.x and older:
-|   zeromq-devel must be installed and one can hint its location using
+|   zeromq must be installed and one can hint its location using
 |   * cmake option:'-DZeroMQ_HINT=/usr/lib64' or 
 |   * option '-q' in cmk.sh script: : ./cmk.sh -cbj5 -q /usr/lib64
 |   * 'zeromq' dependency added when installing using conda

docs/src/masterfileattributes.rst

@@ -1,408 +0,0 @@
-
-.. _master file attributes:
-Master File Attributes
-=======================
-
-These attributes are the same in binary and HDF5 file, but vary depending on detector type.
-
-
-Eiger
-^^^^^
-
-   +-----------------------+-------------------------------------------------+
-   | **Key**               | **Description**                                 |
-   +-----------------------+-------------------------------------------------+
-   | Version               | Version of the master file                      |
-   |                       | Current value:8.0                               |
-   +-----------------------+-------------------------------------------------+
-   | Timestamp             | Timestamp of creation of master file            |
-   +-----------------------+-------------------------------------------------+
-   | Detector Type         | Detector type                                   |
-   +-----------------------+-------------------------------------------------+
-   | Timing Mode           | Timing Mode                                     |
-   +-----------------------+-------------------------------------------------+
-   | Geometry              | Number of UDP ports in x and y dimension for    |
-   |                       | complete detector                               |
-   +-----------------------+-------------------------------------------------+
-   | Image Size in bytes   | Image size in bytes per UDP port                |
-   +-----------------------+-------------------------------------------------+
-   | Pixels                | Number of pixels in x and y dimension           |
-   |                       | per UDP port                                    |
-   +-----------------------+-------------------------------------------------+
-   | Max Frames Per File   | Maximum frames per file                         |
-   +-----------------------+-------------------------------------------------+
-   | Frame Discard Policy  | Receiever Frame discard policy                  |
-   |                       | for partial frames                              |
-   +-----------------------+-------------------------------------------------+
-   | Frame Padding         | Receiver Frame padding enable                   |
-   |                       | for partial frames                              |
-   +-----------------------+-------------------------------------------------+
-   | Scan Parameters       | Scanning mode on detector                       |
-   +-----------------------+-------------------------------------------------+
-   | Total Frames          | Total number of frames and triggers expected    |
-   +-----------------------+-------------------------------------------------+
-   | Receiver Roi          | Receiver ROI in file including xmax and ymax    |
-   +-----------------------+-------------------------------------------------+
-   | Dynamic Range         | Bits per pixel                                  |
-   +-----------------------+-------------------------------------------------+
-   | Ten Giga              | 10GbE enable for data                           |
-   +-----------------------+-------------------------------------------------+
-   | Exptime               | Exposure time                                   |
-   +-----------------------+-------------------------------------------------+
-   | Period                | Period between frames                           |
-   +-----------------------+-------------------------------------------------+
-   | Threshold Energy      | Threshold energy                                |
-   +-----------------------+-------------------------------------------------+
-   | Sub Exptime           | Sub exposure time in 32 bit mode                |
-   +-----------------------+-------------------------------------------------+
-   | Sub Period            | Sub period between frames in 32 bit mode        |
-   +-----------------------+-------------------------------------------------+
-   | Quad                  | Quad enable (hardware)                          |
-   +-----------------------+-------------------------------------------------+
-   | Number of rows        | Number of rows enabled for readout              |
-   +-----------------------+-------------------------------------------------+
-   | Rate Corrections      | Rate Corrections                                |
-   +-----------------------+-------------------------------------------------+
-   | Frames in File        | Number of frames written to file by Receiver 0  |
-   +-----------------------+-------------------------------------------------+
-   | Frame Header Format   | Expected frame header format for the data files |
-   +-----------------------+-------------------------------------------------+
-
-
-Jungfrau
-^^^^^^^^
-
-   +-----------------------+-------------------------------------------------+
-   | **Key**               | **Description**                                 |
-   +-----------------------+-------------------------------------------------+
-   | Version               | Version of the master file                      |
-   |                       | Current value:8.0                               |
-   +-----------------------+-------------------------------------------------+
-   | Timestamp             | Timestamp of creation of master file            |
-   +-----------------------+-------------------------------------------------+
-   | Detector Type         | Detector type                                   |
-   +-----------------------+-------------------------------------------------+
-   | Timing Mode           | Timing Mode                                     |
-   +-----------------------+-------------------------------------------------+
-   | Geometry              | Number of UDP ports in x and y dimension for    |
-   |                       | complete detector                               |
-   +-----------------------+-------------------------------------------------+
-   | Image Size in bytes   | Image size in bytes per UDP port                |
-   +-----------------------+-------------------------------------------------+
-   | Pixels                | Number of pixels in x and y dimension           |
-   |                       | per UDP port                                    |
-   +-----------------------+-------------------------------------------------+
-   | Max Frames Per File   | Maximum frames per file                         |
-   +-----------------------+-------------------------------------------------+
-   | Frame Discard Policy  | Receiever Frame discard policy                  |
-   |                       | for partial frames                              |
-   +-----------------------+-------------------------------------------------+
-   | Frame Padding         | Receiver Frame padding enable                   |
-   |                       | for partial frames                              |
-   +-----------------------+-------------------------------------------------+
-   | Scan Parameters       | Scanning mode on detector                       |
-   +-----------------------+-------------------------------------------------+
-   | Total Frames          | Total number of frames and triggers expected    |
-   +-----------------------+-------------------------------------------------+
-   | Receiver Roi          | Receiver ROI in file including xmax and ymax    |
-   +-----------------------+-------------------------------------------------+
-   | Exptime               | Exposure time                                   |
-   +-----------------------+-------------------------------------------------+
-   | Period                | Period between frames                           |
-   +-----------------------+-------------------------------------------------+
-   | Number of UDP         | Number of UDP Interfaces enabled per module     |
-   | Interfaces            |                                                 |
-   +-----------------------+-------------------------------------------------+
-   | Number of rows        | Number of rows enabled for readout              |
-   +-----------------------+-------------------------------------------------+
-   | Frames in File        | Number of frames written to file by Receiver 0  |
-   +-----------------------+-------------------------------------------------+
-   | Frame Header Format   | Expected frame header format for the data files |
-   +-----------------------+-------------------------------------------------+
-
-Gotthard II
-^^^^^^^^^^^^
-
-   +-----------------------+-------------------------------------------------+
-   | **Key**               | **Description**                                 |
-   +-----------------------+-------------------------------------------------+
-   | Version               | Version of the master file                      |
-   |                       | Current value:8.0                               |
-   +-----------------------+-------------------------------------------------+
-   | Timestamp             | Timestamp of creation of master file            |
-   +-----------------------+-------------------------------------------------+
-   | Detector Type         | Detector type                                   |
-   +-----------------------+-------------------------------------------------+
-   | Timing Mode           | Timing Mode                                     |
-   +-----------------------+-------------------------------------------------+
-   | Geometry              | Number of UDP ports in x and y dimension for    |
-   |                       | complete detector                               |
-   +-----------------------+-------------------------------------------------+
-   | Image Size in bytes   | Image size in bytes per UDP port                |
-   +-----------------------+-------------------------------------------------+
-   | Pixels                | Number of pixels in x and y dimension           |
-   |                       | per UDP port                                    |
-   +-----------------------+-------------------------------------------------+
-   | Max Frames Per File   | Maximum frames per file                         |
-   +-----------------------+-------------------------------------------------+
-   | Frame Discard Policy  | Receiever Frame discard policy                  |
-   |                       | for partial frames                              |
-   +-----------------------+-------------------------------------------------+
-   | Frame Padding         | Receiver Frame padding enable                   |
-   |                       | for partial frames                              |
-   +-----------------------+-------------------------------------------------+
-   | Scan Parameters       | Scanning mode on detector                       |
-   +-----------------------+-------------------------------------------------+
-   | Total Frames          | Total number of frames and triggers expected    |
-   +-----------------------+-------------------------------------------------+
-   | Receiver Roi          | Receiver ROI in file including xmax and ymax    |
-   +-----------------------+-------------------------------------------------+
-   | Exptime               | Exposure time                                   |
-   +-----------------------+-------------------------------------------------+
-   | Period                | Period between frames                           |
-   +-----------------------+-------------------------------------------------+
-   | Burst Mode            | Burst mode of detector                          |
-   +-----------------------+-------------------------------------------------+
-   | Frames in File        | Number of frames written to file by Receiver 0  |
-   +-----------------------+-------------------------------------------------+
-   | Frame Header Format   | Expected frame header format for the data files |
-   +-----------------------+-------------------------------------------------+
-
-Mythen3
-^^^^^^^
-
-
-   +-----------------------+-------------------------------------------------+
-   | **Key**               | **Description**                                 |
-   +-----------------------+-------------------------------------------------+
-   | Version               | Version of the master file                      |
-   |                       | Current value:8.0                               |
-   +-----------------------+-------------------------------------------------+
-   | Timestamp             | Timestamp of creation of master file            |
-   +-----------------------+-------------------------------------------------+
-   | Detector Type         | Detector type                                   |
-   +-----------------------+-------------------------------------------------+
-   | Timing Mode           | Timing Mode                                     |
-   +-----------------------+-------------------------------------------------+
-   | Geometry              | Number of UDP ports in x and y dimension for    |
-   |                       | complete detector                               |
-   +-----------------------+-------------------------------------------------+
-   | Image Size in bytes   | Image size in bytes per UDP port                |
-   +-----------------------+-------------------------------------------------+
-   | Pixels                | Number of pixels in x and y dimension           |
-   |                       | per UDP port                                    |
-   +-----------------------+-------------------------------------------------+
-   | Max Frames Per File   | Maximum frames per file                         |
-   +-----------------------+-------------------------------------------------+
-   | Frame Discard Policy  | Receiever Frame discard policy                  |
-   |                       | for partial frames                              |
-   +-----------------------+-------------------------------------------------+
-   | Frame Padding         | Receiver Frame padding enable                   |
-   |                       | for partial frames                              |
-   +-----------------------+-------------------------------------------------+
-   | Scan Parameters       | Scanning mode on detector                       |
-   +-----------------------+-------------------------------------------------+
-   | Total Frames          | Total number of frames and triggers expected    |
-   +-----------------------+-------------------------------------------------+
-   | Receiver Roi          | Receiver ROI in file including xmax and ymax    |
-   +-----------------------+-------------------------------------------------+
-   | Dynamic Range         | Bits per pixel                                  |
-   +-----------------------+-------------------------------------------------+
-   | Ten Giga              | 10GbE enable for data                           |
-   +-----------------------+-------------------------------------------------+
-   | Period                | Period between frames                           |
-   +-----------------------+-------------------------------------------------+
-   | Counter Mask          | Mask of counters enabled                        |
-   +-----------------------+-------------------------------------------------+
-   | Exptime1              | Exposure time of counter 1                      |
-   +-----------------------+-------------------------------------------------+
-   | Exptime2              | Exposure time of counter 2                      |
-   +-----------------------+-------------------------------------------------+
-   | Exptime3              | Exposure time of counter 3                      |
-   +-----------------------+-------------------------------------------------+
-   | GateDelay1            | Gate delay of counter 1                         |
-   +-----------------------+-------------------------------------------------+
-   | GateDelay2            | Gate delay of counter 2                         |
-   +-----------------------+-------------------------------------------------+
-   | GateDelay3            | Gate delay of counter 3                         |
-   +-----------------------+-------------------------------------------------+
-   | Gates                 | Number of gates                                 |
-   +-----------------------+-------------------------------------------------+
-   | Threshold energies    | Threshold energy of all 3 counters              |
-   +-----------------------+-------------------------------------------------+
-   | Frames in File        | Number of frames written to file by Receiver 0  |
-   +-----------------------+-------------------------------------------------+
-   | Frame Header Format   | Expected frame header format for the data files |
-   +-----------------------+-------------------------------------------------+
-
-
-Moench
-^^^^^^
-
-   +-----------------------+-------------------------------------------------+
-   | **Key**               | **Description**                                 |
-   +-----------------------+-------------------------------------------------+
-   | Version               | Version of the master file                      |
-   |                       | Current value:8.0                               |
-   +-----------------------+-------------------------------------------------+
-   | Timestamp             | Timestamp of creation of master file            |
-   +-----------------------+-------------------------------------------------+
-   | Detector Type         | Detector type                                   |
-   +-----------------------+-------------------------------------------------+
-   | Timing Mode           | Timing Mode                                     |
-   +-----------------------+-------------------------------------------------+
-   | Geometry              | Number of UDP ports in x and y dimension for    |
-   |                       | complete detector                               |
-   +-----------------------+-------------------------------------------------+
-   | Image Size in bytes   | Image size in bytes per UDP port                |
-   +-----------------------+-------------------------------------------------+
-   | Pixels                | Number of pixels in x and y dimension           |
-   |                       | per UDP port                                    |
-   +-----------------------+-------------------------------------------------+
-   | Max Frames Per File   | Maximum frames per file                         |
-   +-----------------------+-------------------------------------------------+
-   | Frame Discard Policy  | Receiever Frame discard policy                  |
-   |                       | for partial frames                              |
-   +-----------------------+-------------------------------------------------+
-   | Frame Padding         | Receiver Frame padding enable                   |
-   |                       | for partial frames                              |
-   +-----------------------+-------------------------------------------------+
-   | Scan Parameters       | Scanning mode on detector                       |
-   +-----------------------+-------------------------------------------------+
-   | Total Frames          | Total number of frames and triggers expected    |
-   +-----------------------+-------------------------------------------------+
-   | Receiver Roi          | Receiver ROI in file including xmax and ymax    |
-   +-----------------------+-------------------------------------------------+
-   | Exptime               | Exposure time                                   |
-   +-----------------------+-------------------------------------------------+
-   | Period                | Period between frames                           |
-   +-----------------------+-------------------------------------------------+
-   | Number of UDP         | Number of UDP Interfaces enabled per module     |
-   | Interfaces            |                                                 |
-   +-----------------------+-------------------------------------------------+
-   | Number of rows        | Number of rows enabled for readout              |
-   +-----------------------+-------------------------------------------------+
-   | Frames in File        | Number of frames written to file by Receiver 0  |
-   +-----------------------+-------------------------------------------------+
-   | Frame Header Format   | Expected frame header format for the data files |
-   +-----------------------+-------------------------------------------------+
-
-Gotthard I
-^^^^^^^^^^^
-
-   +-----------------------+-------------------------------------------------+
-   | **Key**               | **Description**                                 |
-   +-----------------------+-------------------------------------------------+
-   | Version               | Version of the master file                      |
-   |                       | Current value:8.0                               |
-   +-----------------------+-------------------------------------------------+
-   | Timestamp             | Timestamp of creation of master file            |
-   +-----------------------+-------------------------------------------------+
-   | Detector Type         | Detector type                                   |
-   +-----------------------+-------------------------------------------------+
-   | Timing Mode           | Timing Mode                                     |
-   +-----------------------+-------------------------------------------------+
-   | Geometry              | Number of UDP ports in x and y dimension for    |
-   |                       | complete detector                               |
-   +-----------------------+-------------------------------------------------+
-   | Image Size in bytes   | Image size in bytes per UDP port                |
-   +-----------------------+-------------------------------------------------+
-   | Pixels                | Number of pixels in x and y dimension           |
-   |                       | per UDP port                                    |
-   +-----------------------+-------------------------------------------------+
-   | Max Frames Per File   | Maximum frames per file                         |
-   +-----------------------+-------------------------------------------------+
-   | Frame Discard Policy  | Receiever Frame discard policy                  |
-   |                       | for partial frames                              |
-   +-----------------------+-------------------------------------------------+
-   | Frame Padding         | Receiver Frame padding enable                   |
-   |                       | for partial frames                              |
-   +-----------------------+-------------------------------------------------+
-   | Scan Parameters       | Scanning mode on detector                       |
-   +-----------------------+-------------------------------------------------+
-   | Total Frames          | Total number of frames and triggers expected    |
-   +-----------------------+-------------------------------------------------+
-   | Receiver Roi          | Receiver ROI in file including xmax and ymax    |
-   +-----------------------+-------------------------------------------------+
-   | Exptime               | Exposure time                                   |
-   +-----------------------+-------------------------------------------------+
-   | Period                | Period between frames                           |
-   +-----------------------+-------------------------------------------------+
-   | Detector Roi          | Roi in detector restricted to an ADC.           |
-   |                       | Includes xmax                                   |
-   +-----------------------+-------------------------------------------------+
-   | Burst Mode            | Burst mode of detector                          |
-   +-----------------------+-------------------------------------------------+
-   | Frames in File        | Number of frames written to file by Receiver 0  |
-   +-----------------------+-------------------------------------------------+
-   | Frame Header Format   | Expected frame header format for the data files |
-   +-----------------------+-------------------------------------------------+
-
-Chip Test Board
-^^^^^^^^^^^^^^^
-
-
-   +-----------------------+-------------------------------------------------+
-   | **Key**               | **Description**                                 |
-   +-----------------------+-------------------------------------------------+
-   | Version               | Version of the master file                      |
-   |                       | Current value:8.0                               |
-   +-----------------------+-------------------------------------------------+
-   | Timestamp             | Timestamp of creation of master file            |
-   +-----------------------+-------------------------------------------------+
-   | Detector Type         | Detector type                                   |
-   +-----------------------+-------------------------------------------------+
-   | Timing Mode           | Timing Mode                                     |
-   +-----------------------+-------------------------------------------------+
-   | Geometry              | Number of UDP ports in x and y dimension for    |
-   |                       | complete detector                               |
-   +-----------------------+-------------------------------------------------+
-   | Image Size in bytes   | Image size in bytes per UDP port                |
-   +-----------------------+-------------------------------------------------+
-   | Pixels                | Number of pixels in x and y dimension           |
-   |                       | per UDP port                                    |
-   +-----------------------+-------------------------------------------------+
-   | Max Frames Per File   | Maximum frames per file                         |
-   +-----------------------+-------------------------------------------------+
-   | Frame Discard Policy  | Receiever Frame discard policy                  |
-   |                       | for partial frames                              |
-   +-----------------------+-------------------------------------------------+
-   | Frame Padding         | Receiver Frame padding enable                   |
-   |                       | for partial frames                              |
-   +-----------------------+-------------------------------------------------+
-   | Scan Parameters       | Scanning mode on detector                       |
-   +-----------------------+-------------------------------------------------+
-   | Total Frames          | Total number of frames and triggers expected    |
-   +-----------------------+-------------------------------------------------+
-   | Receiver Roi          | Receiver ROI in file including xmax and ymax    |
-   +-----------------------+-------------------------------------------------+
-   | Exptime               | Exposure time                                   |
-   +-----------------------+-------------------------------------------------+
-   | Period                | Period between frames                           |
-   +-----------------------+-------------------------------------------------+
-   | Ten Giga              | Ten giga enable                                 |
-   +-----------------------+-------------------------------------------------+
-   | ADC Mask              | Mask of channels enabled in ADC                 |
-   +-----------------------+-------------------------------------------------+
-   | Analog Flag           | Analog readout enable                           |
-   +-----------------------+-------------------------------------------------+
-   | Analog Samples        | Number of analog samples                        |
-   +-----------------------+-------------------------------------------------+
-   | Digital Flag          | Digital readout enable                          |
-   +-----------------------+-------------------------------------------------+
-   | Digital Samples       | Number of digital samples                       |
-   +-----------------------+-------------------------------------------------+
-   | Dbit Offset           | Digital offset of valid data in bytes           |
-   +-----------------------+-------------------------------------------------+
-   | Dbit Bitset           | Digital 64 bit mask of bits enabled in receiver |
-   +-----------------------+-------------------------------------------------+
-   | Transceiver Mask      | Mask of channels enabled in Transceiver         |
-   +-----------------------+-------------------------------------------------+
-   | Transceiver Flag      | Transceiver readout enable                      |
-   +-----------------------+-------------------------------------------------+
-   | Transceiver Samples   | Number of transceiver samples                   |
-   +-----------------------+-------------------------------------------------+
-   | Frames in File        | Number of frames written to file by Receiver 0  |
-   +-----------------------+-------------------------------------------------+
-   | Frame Header Format   | Expected frame header format for the data files |
-   +-----------------------+-------------------------------------------------+

docs/src/pygettingstarted.rst

@@ -6,7 +6,7 @@ Getting Started
 Which Python?  
 --------------------
 
-We require at least Python 3.8 and strongly recommended that you don't use the system
+We require at least Python 3.6 and strongly recommended that you don't use the system
 Python installation. The examples in this documentation uses `conda
 <https://docs.conda.io/en/latest/miniconda.html>`_ since it provides good support
 also for non Python packages but there are also other alternatives like, pyenv. 

docs/src/slsreceiver.rst

@@ -91,6 +91,245 @@ Client Commands
         sls_detector_get -h rx_framescaught
 
 
+ZMQ: Json Header Format
+------------------------
+
+
+**Change in field names from slsDetectorPackage v6.x.x to v7.0.0**
+
+* detSpec1 <- bunchId
+* detSpec2 <- reserved
+* detSpec3 <- debug
+* detSpec4 <- roundRNumber
+
+
+**Format**
+
+    .. code-block:: bash 
+
+        {
+            "jsonversion": unsigned int,
+            "bitmode": unsigned int,
+            "fileIndex": unsigned long int,
+            "detshape": [
+                unsigned int,
+                unsigned int
+            ],
+            "shape": [
+                unsigned int,
+                unsigned int
+            ],
+            "size": unsigned int,
+            "acqIndex": unsigned long int,
+            "frameIndex": unsigned long int,
+            "progress": double,
+            "fname": string,
+            "data": unsigned int,
+            "completeImage": unsigned int,
+
+            "frameNumber": unsigned long long int,
+            "expLength": unsigned int,
+            "packetNumber": unsigned int,
+            "detSpec1": unsigned long int,
+            "timestamp": unsigned long int,
+            "modId": unsigned int,
+            "row": unsigned int,
+            "column": unsigned int,
+            "detSpec2": unsigned int,
+            "detSpec3": unsigned int,
+            "detSpec4": unsigned int,
+            "detType": unsigned int,
+            "version": unsigned int,
+            
+            "flipRows": unsigned int,
+            "quad": unsigned int,
+            "addJsonHeader": {
+                string : string
+            }
+        }
+
+   +--------------+----------------------------------------------+
+   |   Field      |       Description                            |
+   +--------------+----------------------------------------------+
+   | jsonversion  | Version of the json header.                  |
+   |              | Value at 4 for v6.x.x and v7.x.x             |
+   +--------------+----------------------------------------------+
+   | bitmode      | Bits per pixel [4|8|16|32]                   |
+   +--------------+----------------------------------------------+
+   | fileIndex    | Current file acquisition index               |
+   +--------------+----------------------------------------------+
+   | detshape     | Geometry of the entire detector              |
+   +--------------+----------------------------------------------+
+   | shape        | Geometry of the current port streamed out    |
+   +--------------+----------------------------------------------+
+   | size         | Size of image of current port in bytesout    |
+   +--------------+----------------------------------------------+
+   | acqIndex     | Frame number from the detector (redundant)   |
+   +--------------+----------------------------------------------+
+   | frameIndex   | Frame number of current acquisition          |
+   |              | (Starting at 0)                              |
+   +--------------+----------------------------------------------+
+   | progress     | Progress of current acquisition in %         |
+   +--------------+----------------------------------------------+
+   | fname        | Current file name                            |
+   +--------------+----------------------------------------------+
+   | data         | 1 if there is data following                 |
+   |              | 0 if dummy header                            |
+   +--------------+----------------------------------------------+
+   | completeImage| 1 if no missing packets for this frame       |
+   |              | in this port, else 0                         |
+   +--------------+----------------------------------------------+
+   | frameNumber  | Frame number                                 |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | expLength    | subframe number (32 bit eiger)               |
+   |              | or real time exposure time in 100ns (others) |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | packetNumber | Number of packets caught for that frame      |
+   +--------------+----------------------------------------------+
+   | detSpec1     | See :ref:`here<Detector Specific Fields>`    |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | timestamp    | Timestamp with 10 MHz clock                  |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | modId        | Module Id                                    |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | row          | Row number in detector                       |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | column       | Column number in detector                    |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | detSpec2     | See :ref:`here<Detector Specific Fields>`    |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | detSpec3     | See :ref:`here<Detector Specific Fields>`    |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | detSpec4     | See :ref:`here<Detector Specific Fields>`    |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | detType      | Detector type enum                           |
+   | detSpec3     | See :ref:`Detector enum<Detector Enum>`      |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | version      | Detector header version. At 2                |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | flipRows     | 1 if rows should be flipped.                 |
+   |              | Usually for Eiger bottom.                    |
+   +--------------+----------------------------------------------+
+   | quad         | 1 if its an Eiger quad.                      |
+   +--------------+----------------------------------------------+
+   | addJsonHeader| Optional custom parameters that is required  |
+   |              | for processing code.                         |
+   +--------------+----------------------------------------------+
+
+
+SLS Receiver Header Format
+--------------------------
+
+It is 112 bytes and consists of:
+    * 48 bytes of the SLS Detector Header (described in :ref:`the current detector header <detector udp header>`)
+    * 64 bytes of packet mask
+
+.. code-block:: cpp 
+    
+    typedef struct {
+        uint64_t frameNumber;
+        uint32_t expLength;
+        uint32_t packetNumber;
+        uint64_t detSpec1;
+        uint64_t timestamp;
+        uint16_t modId;
+        uint16_t row;
+        uint16_t column;
+        uint16_t detSpec2;
+        uint32_t detSpec3;
+        uint16_t detSpec4;
+        uint8_t detType;
+        uint8_t version;
+    } sls_detector_header;
+
+    struct sls_receiver_header {
+        sls_detector_header detHeader; /**< is the detector header */
+        sls_bitset packetsMask;        /**< is the packets caught bit mask */
+    };
+
+
+.. note :: 
+
+    | The packetNumber in the SLS Receiver Header will be modified to number of packets caught by receiver for that frame. For eg. Jungfrau will have 128 packets per frame. If it is less, then this is a partial frame due to missing packets.
+    
+    | Furthermore, the bit mask will specify which packets have been received.
+
+
+
+
+File format
+--------------
+
+Master file is in json format.
+
+The file name format is [fpath]/[fname]_dx_fy_[findex].raw, where x is module index and y is file index. **fname** is file name prefix and by default "run". **fpath** is '/' by default.
+
+
+Each acquisition will have an increasing acquisition index or findex (if file write enabled). This can be retrieved by using **findex** command. 
+
+
+Each acquisition can have multiple files (the file index number **y**), with **rx_framesperfile** being the maximum number of frames per file. The default varies for each detector type.
+
+
+Some file name examples:
+
+    .. code-block:: bash
+
+        # first file
+        path-to-file/run_d0_f0_0.raw
+
+        # second file after reaching max frames in first file
+        path-to-file/run_d0_f1_0.raw
+        
+        # second acquisition, first file
+        path-to-file/run_d0_f0_1.raw
+
+
+Each acquisition will create a master file that can be enabled/disabled using **fmaster**. This should have parameters relevant to the acquisition.
+
+
+**Binary file format**
+
+This is the default file format. 
+
+
+Each data file will consist of frames, each consisting of slsReceiver Header followed by data for 1 frame.
+
+
+Master file is of ASCII format and will also include the format of the slsReceiver Header.
+
+
+**HDF5 file formats**
+
+#. Compile the package with HDF5 option enabled
+
+    #. Using cmk script: ./cmk.sh -hj9 -d [path of hdf5 dir]
+
+    #. Enable using cmake **-DCMAKE_INSTALL_PREFIX=/path/to/hdf/installation** and **-DSLS_USE_HDF5=ON**
+
+#. Start Receiver process
+
+#. Load config file
+
+#. Set file format from client or in config file
+    .. code-block:: bash
+
+        sls_detector_put fformat hdf5
+
+
+| For multiple, modules, a virtual file linking all the modules is created. Both the data files and virtual files are linked in the master file.
 
 
 Performance 

docs/src/slsreceiverheaderformat.rst

@@ -1,40 +0,0 @@
-
-.. _sls receiver header format:
-
-SLS Receiver Header Format
-====================================================
-
-It is 112 bytes and consists of:
-    * 48 bytes of the SLS Detector Header 
-    * 64 bytes of packet mask
-
-.. code-block:: cpp 
-    
-    typedef struct {
-        uint64_t frameNumber;
-        uint32_t expLength;
-        uint32_t packetNumber;
-        uint64_t detSpec1;
-        uint64_t timestamp;
-        uint16_t modId;
-        uint16_t row;
-        uint16_t column;
-        uint16_t detSpec2;
-        uint32_t detSpec3;
-        uint16_t detSpec4;
-        uint8_t detType;
-        uint8_t version;
-    } sls_detector_header;
-
-    struct sls_receiver_header {
-        sls_detector_header detHeader; /**< is the detector header */
-        sls_bitset packetsMask;        /**< is the packets caught bit mask */
-    };
-
-
-
-| **sls_detector_header** (described in :ref:`the current detector header <detector udp header>`)
-    
-| The **packetNumber** from detector UDP header is modified in **sls_receiver_header** to number of packets caught by receiver for that frame and the bit mask for each packet caught is the **packetsMask**. The packetsMask is a total of 512 bits due to the largest number of packets per frame among our detectors.
-
-| For eg. Jungfrau has 128 packets per frame. If **packetNumeber** is 128, then this frame is complete. If it is 127 or less, it is a partial frame due to missing packets. If one would still like to use it, the **packetsMask** will specify which packet has been received or is missing.

docs/src/troubleshooting.rst

@@ -394,14 +394,6 @@ Missing first frame or next frame after a delay
 Connect the data link from the Module directly to receiver pc or to a private network.
 
 
-Mythen3
---------
-
-Detector status is waiting even in auto timing mode
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Check if the control board or the flat band cable is connected properly. If not, connect them properly and try again.
-
-
 Jungfrau
 ---------
 

docs/src/udpheader.rst

@@ -3,7 +3,7 @@
 Format
 =======
 
-The UDP data format for the packets consist of a common header of 48 bytes for all detectors, followed by the data for that one packet.
+The UDP data format for the packets consist of a common header for all detectors, followed by the data for that one packet.
 
 
 Current Version
@@ -11,25 +11,6 @@ Current Version
 
 **v2.0 (slsDetectorPackage v7.0.0+)**
 
-.. code-block:: cpp 
-    
-    typedef struct {
-        uint64_t frameNumber;
-        uint32_t expLength;
-        uint32_t packetNumber;
-        uint64_t detSpec1;
-        uint64_t timestamp;
-        uint16_t modId;
-        uint16_t row;
-        uint16_t column;
-        uint16_t detSpec2;
-        uint32_t detSpec3;
-        uint16_t detSpec4;
-        uint8_t detType;
-        uint8_t version;
-    } sls_detector_header;
-
-
 .. table:: <---------------------------------------------------- 8 bytes per row --------------------------------------------->
     :align: center
     :widths: 30,30,30,15,15
@@ -82,8 +63,6 @@ Description
 * **version**: current version of the detector header (0x2).
 
 
-.. _detector enum:
-
 Detector Enum
 --------------
 

docs/src/zmqjsonheaderformat.rst

@@ -1,137 +0,0 @@
-ZMQ: Json Header Format
-========================
-
-
-**Change in field names from slsDetectorPackage v6.x.x to v7.0.0**
-
-* detSpec1 <- bunchId
-* detSpec2 <- reserved
-* detSpec3 <- debug
-* detSpec4 <- roundRNumber
-
-
-**Format**
-
-    .. code-block:: bash 
-
-        {
-            "jsonversion": unsigned int,
-            "bitmode": unsigned int,
-            "fileIndex": unsigned long int,
-            "detshape": [
-                unsigned int,
-                unsigned int
-            ],
-            "shape": [
-                unsigned int,
-                unsigned int
-            ],
-            "size": unsigned int,
-            "acqIndex": unsigned long int,
-            "frameIndex": unsigned long int,
-            "progress": double,
-            "fname": string,
-            "data": unsigned int,
-            "completeImage": unsigned int,
-
-            "frameNumber": unsigned long long int,
-            "expLength": unsigned int,
-            "packetNumber": unsigned int,
-            "detSpec1": unsigned long int,
-            "timestamp": unsigned long int,
-            "modId": unsigned int,
-            "row": unsigned int,
-            "column": unsigned int,
-            "detSpec2": unsigned int,
-            "detSpec3": unsigned int,
-            "detSpec4": unsigned int,
-            "detType": unsigned int,
-            "version": unsigned int,
-            
-            "flipRows": unsigned int,
-            "quad": unsigned int,
-            "addJsonHeader": {
-                string : string
-            }
-        }
-
-   +--------------+----------------------------------------------+
-   |   Field      |       Description                            |
-   +--------------+----------------------------------------------+
-   | jsonversion  | Version of the json header.                  |
-   |              | Value at 4 for v6.x.x and v7.x.x             |
-   +--------------+----------------------------------------------+
-   | bitmode      | Bits per pixel [4|8|16|32]                   |
-   +--------------+----------------------------------------------+
-   | fileIndex    | Current file acquisition index               |
-   +--------------+----------------------------------------------+
-   | detshape     | Geometry of the entire detector              |
-   +--------------+----------------------------------------------+
-   | shape        | Geometry of the current port streamed out    |
-   +--------------+----------------------------------------------+
-   | size         | Size of image of current port in bytesout    |
-   +--------------+----------------------------------------------+
-   | acqIndex     | Frame number from the detector (redundant)   |
-   +--------------+----------------------------------------------+
-   | frameIndex   | Frame number of current acquisition          |
-   |              | (Starting at 0)                              |
-   +--------------+----------------------------------------------+
-   | progress     | Progress of current acquisition in %         |
-   +--------------+----------------------------------------------+
-   | fname        | Current file name                            |
-   +--------------+----------------------------------------------+
-   | data         | 1 if there is data following                 |
-   |              | 0 if dummy header                            |
-   +--------------+----------------------------------------------+
-   | completeImage| 1 if no missing packets for this frame       |
-   |              | in this port, else 0                         |
-   +--------------+----------------------------------------------+
-   | frameNumber  | Frame number                                 |
-   |              | [From detector udp header]                   |
-   +--------------+----------------------------------------------+
-   | expLength    | subframe number (32 bit eiger)               |
-   |              | or real time exposure time in 100ns (others) |
-   |              | [From detector udp header]                   |
-   +--------------+----------------------------------------------+
-   | packetNumber | Number of packets caught for that frame      |
-   +--------------+----------------------------------------------+
-   | detSpec1     | See :ref:`here<Detector Specific Fields>`    |
-   |              | [From detector udp header]                   |
-   +--------------+----------------------------------------------+
-   | timestamp    | Timestamp with 10 MHz clock                  |
-   |              | [From detector udp header]                   |
-   +--------------+----------------------------------------------+
-   | modId        | Module Id                                    |
-   |              | [From detector udp header]                   |
-   +--------------+----------------------------------------------+
-   | row          | Row number in detector                       |
-   |              | [From detector udp header]                   |
-   +--------------+----------------------------------------------+
-   | column       | Column number in detector                    |
-   |              | [From detector udp header]                   |
-   +--------------+----------------------------------------------+
-   | detSpec2     | See :ref:`here<Detector Specific Fields>`    |
-   |              | [From detector udp header]                   |
-   +--------------+----------------------------------------------+
-   | detSpec3     | See :ref:`here<Detector Specific Fields>`    |
-   |              | [From detector udp header]                   |
-   +--------------+----------------------------------------------+
-   | detSpec4     | See :ref:`here<Detector Specific Fields>`    |
-   |              | [From detector udp header]                   |
-   +--------------+----------------------------------------------+
-   | detType      | Detector type enum                           |
-   | detSpec3     | See :ref:`Detector enum<detector enum>`      |
-   |              | [From detector udp header]                   |
-   +--------------+----------------------------------------------+
-   | version      | Detector header version. At 2                |
-   |              | [From detector udp header]                   |
-   +--------------+----------------------------------------------+
-   | flipRows     | 1 if rows should be flipped.                 |
-   |              | Usually for Eiger bottom.                    |
-   +--------------+----------------------------------------------+
-   | quad         | 1 if its an Eiger quad.                      |
-   +--------------+----------------------------------------------+
-   | addJsonHeader| Optional custom parameters that is required  |
-   |              | for processing code.                         |
-   +--------------+----------------------------------------------+
-

python/CMakeLists.txt

@@ -49,6 +49,7 @@ set( PYTHON_FILES
     slsdet/temperature.py
     slsdet/lookup.py
     slsdet/utils.py
+
 )
 
 foreach(FILE ${PYTHON_FILES})
@@ -57,6 +58,7 @@ foreach(FILE ${PYTHON_FILES})
 
 endforeach(FILE ${PYTHON_FILES})
 
+
 configure_file( scripts/basic.py  
     ${CMAKE_BINARY_DIR}/basic.py 
 )
@@ -64,9 +66,6 @@ configure_file( scripts/test_virtual.py
     ${CMAKE_BINARY_DIR}/test_virtual.py 
 )
 
-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/../VERSION  
-    ${CMAKE_BINARY_DIR}/bin/slsdet/VERSION
-)
 
 if(SLS_INSTALL_PYTHONEXT)
     install(TARGETS _slsdet
@@ -75,5 +74,4 @@ if(SLS_INSTALL_PYTHONEXT)
     )
 
     install(FILES ${PYTHON_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/python/slsdet)
-    install(FILES ../VERSION DESTINATION ${CMAKE_INSTALL_PREFIX}/python/slsdet)
 endif()

python/setup.py

@@ -10,15 +10,14 @@ import sys
 from setuptools import setup, find_packages
 from pybind11.setup_helpers import Pybind11Extension, build_ext
 
-def read_version():
-    try:
-        version_file = os.path.join(os.path.dirname(__file__), 'slsdet', 'VERSION')
-        with open(version_file, "r") as f:
-            return f.read().strip()
-    except:
-        raise RuntimeError("VERSION file not found in slsdet package from setup.py.")
 
-__version__ = read_version()
+import subprocess
+def get_git_tag():
+    try:
+        return subprocess.check_output(['git', 'describe', '--tags', '--abbrev=0']).strip().decode('utf-8')
+    except subprocess.CalledProcessError:
+        return 'developer'
+__version__ = get_git_tag()
 
 
 def get_conda_path():
@@ -68,9 +67,6 @@ setup(
     description='Detector API for SLS Detector Group detectors',
     long_description='',
     packages=find_packages(exclude=['contrib', 'docs', 'tests']),
-    package_data={
-        'slsdet': ['VERSION'], 
-    },  
     ext_modules=ext_modules,
     cmdclass={"build_ext": build_ext},
     zip_safe=False,

python/slsdet/__init__.py

@@ -22,7 +22,6 @@ defs = _slsdet.slsDetectorDefs
 from .enums import *
 from .defines import *
 
-
 IpAddr = _slsdet.IpAddr
 MacAddr = _slsdet.MacAddr
 scanParameters = _slsdet.scanParameters
@@ -30,14 +29,12 @@ currentSrcParameters = _slsdet.currentSrcParameters
 DurationWrapper = _slsdet.DurationWrapper
 pedestalParameters = _slsdet.pedestalParameters
 
-import os
-def read_version():
+
+import subprocess
+def get_git_tag():
     try:
-        version_file = os.path.join(os.path.dirname(__file__), 'VERSION')
-        with open(version_file, "r") as f:
-            return f.read().strip()
-    except:
-        raise RuntimeError("VERSION file not found in slsdet package from init.py")
-    
-__version__ = read_version()
+        return subprocess.check_output(['git', 'describe', '--tags', '--abbrev=0']).strip().decode('utf-8')
+    except subprocess.CalledProcessError:
+        return 'developer'
+__version__ = get_git_tag()
 

python/slsdet/jungfrau.py

@@ -24,7 +24,7 @@ class JungfrauDacs(DetectorDacs):
              ('vdd_prot',   dacIndex.VDD_PROT, 0, 4000,    3000),
              ('vin_com',    dacIndex.VIN_COM, 0, 4000,    1053),
              ('vref_prech', dacIndex.VREF_PRECH, 0, 4000,    1450),
-             ('vb_pixbuf', dacIndex.VB_PIXBUF, 0, 4000,     750),
+             ('vb_pixbuff', dacIndex.VB_PIXBUF, 0, 4000,     750),
              ('vb_ds',      dacIndex.VB_DS, 0, 4000,    1000),
              ('vref_ds',    dacIndex.VREF_DS, 0, 4000,     480),
              ('vref_comp',  dacIndex.VREF_COMP, 0, 4000,     420),

python/src/detector.cpp

@@ -21,13 +21,11 @@ void init_det(py::module &m) {
     using sls::Positions;
     using sls::Result;
 
-    m.def("freeSharedMemory",
-          (void (*)(const int, const int)) & sls::freeSharedMemory,
-          py::arg() = 0, py::arg() = -1);
-
     py::class_<Detector> CppDetectorApi(m, "CppDetectorApi");
     CppDetectorApi.def(py::init<int>());
 
+    CppDetectorApi.def("freeSharedMemory",
+                       (void (Detector::*)()) & Detector::freeSharedMemory);
     CppDetectorApi.def("loadConfig",
                        (void (Detector::*)(const std::string &)) &
                            Detector::loadConfig,

python/src/detector_in.cpp

@@ -18,8 +18,6 @@ void init_det(py::module &m) {
     using sls::Positions;
     using sls::Result;
 
-    m.def("freeSharedMemory", (void (*)(const int, const int)) &sls::freeSharedMemory, py::arg() = 0, py::arg() = -1);
-    
     py::class_<Detector> CppDetectorApi(m, "CppDetectorApi");
     CppDetectorApi.def(py::init<int>());
 

serverBin/ctbDetectorServer_developer

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

serverBin/ctbDetectorServerv9.0.0

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

serverBin/eigerDetectorServer_developer

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

serverBin/eigerDetectorServerv9.0.0

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

serverBin/gotthard2DetectorServer_developer

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

serverBin/gotthard2DetectorServerv9.0.0

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

serverBin/gotthardDetectorServer_developer

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

serverBin/gotthardDetectorServerv9.0.0

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

serverBin/jungfrauDetectorServer_developer

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

serverBin/jungfrauDetectorServerv9.0.0

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

serverBin/moenchDetectorServer_developer

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

serverBin/moenchDetectorServerv9.0.0

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

serverBin/mythen3DetectorServer_developer

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

serverBin/mythen3DetectorServerv9.0.0

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

serverBin/xilinx_ctbDetectorServerv9.0.0

@@ -1 +0,0 @@
-../slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServerv9.0.0

slsDetectorGui/forms/form_plot.ui

@@ -457,7 +457,7 @@
       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If sub images have missing packets&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
-      <string/>
+      <string>Complete Image</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>
@@ -523,7 +523,6 @@
      </property>
      <property name="font">
       <font>
-       <family>Cantarell</family>
        <pointsize>10</pointsize>
       </font>
      </property>

slsDetectorGui/include/qDrawPlot.h

@@ -123,7 +123,7 @@ class qDrawPlot : public QWidget, private Ui::PlotObject {
     QString zTitle2d{"Intensity"};
     QString plotTitle{""};
     QString indexTitle{""};
-    bool completeImage{true};
+    bool completeImage{false};
     bool xyRangeChanged{false};
     double xyRange[4]{0, 0, 0, 0};
     bool isXYRange[4]{false, false, false, false};

slsDetectorGui/src/qDrawPlot.cpp

@@ -107,7 +107,7 @@ void qDrawPlot::SetupPlots() {
     LOG(logINFO) << "nPixelsY:" << nPixelsY;
 
     widgetStatistics->hide();
-    lblCompleteImage->show();
+    lblCompleteImage->hide();
     lblInCompleteImage->hide();
     lblRxRoiEnabled->hide();
 

slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c

@@ -51,12 +51,12 @@ int dataBytes = 0;
 int analogDataBytes = 0;
 int digitalDataBytes = 0;
 int transceiverDataBytes = 0;
-char *analogData = NULL;
-char *digitalData = NULL;
-char *transceiverData = NULL;
-char volatile *analogDataPtr = NULL;
-char volatile *digitalDataPtr = NULL;
-char volatile *transceiverDataPtr = NULL;
+char *analogData = 0;
+char *digitalData = 0;
+char *transceiverData = 0;
+char volatile *analogDataPtr = 0;
+char volatile *digitalDataPtr = 0;
+char volatile *transceiverDataPtr = 0;
 char udpPacketData[UDP_PACKET_DATA_BYTES + sizeof(sls_detector_header)];
 uint32_t adcEnableMask_1g = BIT32_MSK;
 // 10g readout
@@ -475,15 +475,21 @@ void setupDetector() {
     analogDataBytes = 0;
     digitalDataBytes = 0;
     transceiverDataBytes = 0;
+    if (analogData) {
         free(analogData);
-    analogData = NULL;
+        analogData = 0;
+    }
+    if (digitalData) {
         free(digitalData);
-    digitalData = NULL;
+        digitalData = 0;
+    }
+    if (transceiverData) {
         free(transceiverData);
-    transceiverData = NULL;
-    analogDataPtr = NULL;
-    digitalDataPtr = NULL;
-    transceiverData = NULL;
+        transceiverData = 0;
+    }
+    analogDataPtr = 0;
+    digitalDataPtr = 0;
+    transceiverData = 0;
     {
         for (int i = 0; i < NUM_CLOCKS; ++i) {
             clkPhase[i] = 0;
@@ -634,15 +640,22 @@ int updateDatabytesandAllocateRAM() {
         return FAIL;
     }
     // clear RAM
+    if (analogData) {
         free(analogData);
-    analogData = NULL;
+        analogData = 0;
+    }
+    if (digitalData) {
         free(digitalData);
-    digitalData = NULL;
+        digitalData = 0;
+    }
+    if (transceiverData) {
         free(transceiverData);
-    transceiverData = NULL;
+        transceiverData = 0;
+    }
     // allocate RAM
     if (analogDataBytes) {
         analogData = malloc(analogDataBytes);
+        // cannot malloc
         if (analogData == NULL) {
             LOG(logERROR, ("Can not allocate analog data RAM for even 1 frame. "
                            "Probable cause: Memory Leak.\n"));
@@ -652,6 +665,7 @@ int updateDatabytesandAllocateRAM() {
     }
     if (digitalDataBytes) {
         digitalData = malloc(digitalDataBytes);
+        // cannot malloc
         if (digitalData == NULL) {
             LOG(logERROR,
                 ("Can not allocate digital data RAM for even 1 frame. "
@@ -663,6 +677,7 @@ int updateDatabytesandAllocateRAM() {
     }
     if (transceiverDataBytes) {
         transceiverData = malloc(transceiverDataBytes);
+        // cannot malloc
         if (transceiverData == NULL) {
             LOG(logERROR,
                 ("Can not allocate transceiver data RAM for even 1 frame. "
@@ -2194,8 +2209,7 @@ int startStateMachine() {
         LOG(logERROR, ("Could not start Virtual acquisition thread\n"));
         sharedMemory_setStatus(IDLE);
         return FAIL;
-    } else
-        pthread_detach(pthread_virtual_tid);
+    }
     LOG(logINFOGREEN, ("Virtual Acquisition started\n"));
     return OK;
 #endif
@@ -2537,8 +2551,7 @@ int readSample(int ns) {
 
     // read digital output
     if (digitalEnable && ns < ndSamples) {
-
-        if (!(ns % 1000)) {
+        /*if (!(ns % 1000)) {
             LOG(logDEBUG1,
                 ("Reading sample ns:%d of %d DEmtpy:%d DFull:%d Status:0x%x\n",
                  ns, ndSamples,
@@ -2549,6 +2562,25 @@ int readSample(int ns) {
                    FIFO_DIN_STATUS_FIFO_FULL_MSK) >>
                   FIFO_DIN_STATUS_FIFO_FULL_OFST),
                  bus_r(STATUS_REG)));
+        }*/
+
+        // wait for data
+        int fifoEmtpy = 1;
+        int times = 0;
+        while (fifoEmtpy) {
+            fifoEmtpy = ((bus_r(FIFO_DIN_STATUS_REG) &
+                          FIFO_DIN_STATUS_FIFO_EMPTY_MSK) >>
+                         FIFO_DIN_STATUS_FIFO_EMPTY_OFST);
+            if (!fifoEmtpy)
+                break;
+            if (times == 0)
+                printf("\n");
+            ++times;
+            printf(".");
+            usleep(200);
+            /*if (times % 10 == 0) {
+                printf(".");
+            }*/
         }
 
         // read fifo and write it to current position of data pointer

slsDetectorServers/eigerDetectorServer/Beb.c

@@ -46,27 +46,17 @@ int Beb_deactivated_left_datastream = 1;
 int Beb_deactivated_right_datastream = 1;
 int Beb_deactivated_num_destinations = 1;
 
-int Beb_Beb() {
+void Beb_Beb() {
     Beb_send_ndata = 0;
     Beb_send_buffer_size = 1026;
-
     Beb_send_data_raw =
         malloc((Beb_send_buffer_size + 1) * sizeof(unsigned int));
-    if (Beb_send_data_raw == NULL) {
-        LOG(logERROR, ("Could not allocate memory for beb (send_data_raw)\n"));
-        return 0;
-    }
     Beb_send_data = &Beb_send_data_raw[1];
 
     Beb_recv_ndata = 0;
     Beb_recv_buffer_size = 1026;
-
     Beb_recv_data_raw =
         malloc((Beb_recv_buffer_size + 1) * sizeof(unsigned int));
-    if (Beb_recv_data_raw == NULL) {
-        LOG(logERROR, ("Could not allocate memory for beb (recv_data_raw)\n"));
-        return 0;
-    }
     Beb_recv_data = &Beb_recv_data_raw[1];
 
     udp_header = (struct udp_header_type){
@@ -93,7 +83,6 @@ int Beb_Beb() {
     Beb_ClearHeaderData(1);
 
     Beb_bit_mode = 4;
-    return 1;
 }
 
 void Beb_ClearHeaderData(int ten_gig) {

slsDetectorServers/eigerDetectorServer/Beb.h

@@ -6,7 +6,7 @@
 #include "slsDetectorServer_defs.h"
 #include <stdlib.h>
 
-int Beb_Beb();
+void Beb_Beb();
 void Beb_ClearHeaderData(int ten_gig);
 int Beb_SetUpUDPHeader(unsigned int header_number, int ten_gig,
                        uint64_t src_mac, uint32_t src_ip, uint16_t src_port,

slsDetectorServers/eigerDetectorServer/FebControl.c

@@ -57,19 +57,11 @@ int Feb_Control_FebControl(int normal) {
     Feb_Control_externalEnableMode = 0;
     Feb_Control_subFrameMode = 0;
     Feb_Control_trimbit_size = 263680;
-
     Feb_Control_last_downloaded_trimbits =
         malloc(Feb_Control_trimbit_size * sizeof(int));
-    if (Feb_Control_last_downloaded_trimbits == NULL) {
-        LOG(logERROR,
-            ("Could not allocate memory for last downloaded trimbits\n"));
-        return 0;
-    }
 
     Feb_Control_normal = normal;
-    if (!Feb_Interface_SetAddress(Feb_Control_rightAddress,
-                                  Feb_Control_leftAddress))
-        return 0;
+    Feb_Interface_SetAddress(Feb_Control_rightAddress, Feb_Control_leftAddress);
     if (Feb_Control_activated) {
         return Feb_Interface_SetByteOrder();
     }

slsDetectorServers/eigerDetectorServer/FebInterface.c

@@ -22,57 +22,34 @@ unsigned int Feb_Interface_recv_buffer_size;
 unsigned int *Feb_Interface_recv_data_raw;
 unsigned int *Feb_Interface_recv_data;
 
-int Feb_Interface_FebInterface() {
+void Feb_Interface_FebInterface() {
     ll = &ll_local;
     Feb_Interface_nfebs = 0;
     Feb_Interface_feb_numb = 0;
 
     Feb_Interface_send_ndata = 0;
     Feb_Interface_send_buffer_size = 1026;
-
     Feb_Interface_send_data_raw =
         malloc((Feb_Interface_send_buffer_size + 1) * sizeof(unsigned int));
-    if (Feb_Interface_send_data_raw == NULL) {
-        LOG(logERROR,
-            ("Could not allocate memory for feb interface (send_data_raw)\n"));
-        return 0;
-    }
     Feb_Interface_send_data = &Feb_Interface_send_data_raw[1];
 
     Feb_Interface_recv_ndata = 0;
     Feb_Interface_recv_buffer_size = 1026;
-
     Feb_Interface_recv_data_raw =
         malloc((Feb_Interface_recv_buffer_size + 1) * sizeof(unsigned int));
-    if (Feb_Interface_recv_data_raw == NULL) {
-        LOG(logERROR,
-            ("Could not allocate memory for feb interface (recv_data_raw)\n"));
-
-        return 0;
-    }
     Feb_Interface_recv_data = &Feb_Interface_recv_data_raw[1];
 
     Local_LocalLinkInterface(
         ll, XPAR_PLB_LL_FIFO_AURORA_DUAL_CTRL_FEB_RIGHT_BASEADDR);
-
-    return 1;
 }
 
-int Feb_Interface_SetAddress(unsigned int leftAddr, unsigned int rightAddr) {
+void Feb_Interface_SetAddress(unsigned int leftAddr, unsigned int rightAddr) {
+    if (Feb_Interface_feb_numb)
         free(Feb_Interface_feb_numb);
     Feb_Interface_nfebs = 2;
-
     Feb_Interface_feb_numb = malloc(2 * sizeof(unsigned int));
-    if (Feb_Interface_feb_numb == NULL) {
-        LOG(logERROR,
-            ("Could not allocate memory for feb interface (feb_numb)\n"));
-        Feb_Interface_nfebs = 0;
-        return 0;
-    }
-
     Feb_Interface_feb_numb[0] = leftAddr;
     Feb_Interface_feb_numb[1] = rightAddr;
-    return 1;
 }
 
 int Feb_Interface_WriteTo(unsigned int ch) {

slsDetectorServers/eigerDetectorServer/FebInterface.h

@@ -4,8 +4,8 @@
 
 int Feb_Interface_WriteTo(unsigned int ch);
 int Feb_Interface_ReadFrom(unsigned int ch, unsigned int ntrys);
-int Feb_Interface_FebInterface();
-int Feb_Interface_SetAddress(unsigned int leftAddr, unsigned int rightAddr);
+void Feb_Interface_FebInterface();
+void Feb_Interface_SetAddress(unsigned int leftAddr, unsigned int rightAddr);
 int Feb_Interface_SetByteOrder();
 int Feb_Interface_ReadRegister(unsigned int sub_num, unsigned int reg_num,
                                unsigned int *value_read);

slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c

@@ -662,15 +662,7 @@ int checkCommandLineConfiguration() {
 #ifndef VIRTUAL
 void setupFebBeb() {
     sharedMemory_lockLocalLink();
-    if (!Feb_Interface_FebInterface()) {
-        initError = FAIL;
-        sprintf(initErrorMessage,
-                "Could not intitalize eiger detector sever: feb interface\n");
-        LOG(logERROR, (initErrorMessage));
-        initCheckDone = 1;
-        sharedMemory_unlockLocalLink();
-        return;
-    }
+    Feb_Interface_FebInterface();
     if (!Feb_Control_FebControl(normal)) {
         initError = FAIL;
         sprintf(initErrorMessage,
@@ -694,14 +686,7 @@ void setupFebBeb() {
     LOG(logDEBUG1, ("%s server: FEB Initialization done\n",
                     isControlServer ? "Control" : "Stop"));
     Beb_SetTopVariable(top);
-    if (!Beb_Beb()) {
-        initError = FAIL;
-        sprintf(initErrorMessage,
-                "Could not intitalize eiger detector sever: beb\n");
-        LOG(logERROR, (initErrorMessage));
-        initCheckDone = 1;
-        return;
-    }
+    Beb_Beb();
     LOG(logDEBUG1, ("%s server: BEB Initialization done\n",
                     isControlServer ? "Control" : "Stop"));
 
@@ -739,23 +724,17 @@ void setupFebBeb() {
 }
 #endif
 
-int allocateDetectorStructureMemory() {
+void allocateDetectorStructureMemory() {
+    LOG(logINFO, ("This Server is for 1 Eiger half module (250k)\n\n"));
+
+    // Allocation of memory
     detectorModules = malloc(sizeof(sls_detector_module));
     detectorChans = malloc(NCHIP * NCHAN * sizeof(int));
     detectorDacs = malloc(NDAC * sizeof(int));
-    if (detectorModules == NULL || detectorChans == NULL ||
-        detectorDacs == NULL) {
-        initError = FAIL;
-        strcpy(initErrorMessage,
-               "Could not allocate memory for dacs or channels in detector\n");
-        LOG(logERROR, (initErrorMessage));
-        return FAIL;
-    }
     LOG(logDEBUG1,
         ("modules from 0x%x to 0x%x\n", detectorModules, detectorModules));
     LOG(logDEBUG1, ("chans from 0x%x to 0x%x\n", detectorChans, detectorChans));
     LOG(logDEBUG1, ("dacs from 0x%x to 0x%x\n", detectorDacs, detectorDacs));
-
     detectorModules->dacs = detectorDacs;
     detectorModules->chanregs = detectorChans;
     detectorModules->ndac = NDAC;
@@ -769,21 +748,14 @@ int allocateDetectorStructureMemory() {
     detectorModules->eV[2] = -1;
     thisSettings = UNINITIALIZED;
 
-    // initialize (trimbits at -1 for unknown)
-    for (int idac = 0; idac < (detectorModules)->ndac; ++idac) {
-        detectorDacs[idac] = 0;
-    }
+    // if trimval requested, should return -1 to acknowledge unknown
     for (int ichan = 0; ichan < (detectorModules->nchan); ichan++) {
         *((detectorModules->chanregs) + ichan) = -1;
     }
-    return OK;
 }
 
 void setupDetector() {
-    LOG(logINFO, ("This Server is for 1 Eiger half module (250k)\n\n"));
-
-    if (allocateDetectorStructureMemory() == FAIL)
-        return;
+    allocateDetectorStructureMemory();
 
     // force top or master if in config file
     if (readConfigFile() == FAIL)
@@ -2600,8 +2572,7 @@ int startStateMachine() {
         sharedMemory_setStatus(IDLE);
         sharedMemory_unlockAcqFlag();
         return FAIL;
-    } else
-        pthread_detach(virtual_tid);
+    }
     LOG(logINFO, ("Virtual Acquisition started\n"));
     sharedMemory_unlockAcqFlag();
     return OK;

slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c

@@ -987,8 +987,6 @@ int readConfigFile() {
 
         // to inform powerchip config parameters are set
         startupPowerChipConfigDone = 1;
-        chipConfigured = 1;
-        LOG(logINFOBLUE, ("Chip configured\n"));
     }
     return initError;
 }
@@ -2280,7 +2278,8 @@ int powerChip(int on, char *mess) {
     if (on) {
         LOG(logINFO, ("Powering chip: on\n"));
         bus_w(CONTROL_REG, bus_r(CONTROL_REG) | CONTROL_PWR_CHIP_MSK);
-        if (configureChip(mess) == FAIL)
+        // only if power chip config done, configure chip with current set up
+        if (startupPowerChipConfigDone == 1 && configureChip(mess) == FAIL)
             return FAIL;
     } else {
         // throw if high voltage on
@@ -2311,12 +2310,6 @@ int getPowerChip() {
 int isChipConfigured() { return chipConfigured; }
 
 int configureChip(char *mess) {
-
-    if (!startupPowerChipConfigDone) {
-        LOG(logINFOBLUE,
-            ("Startup: Chip to be configured when reading config file\n"));
-        return OK;
-    }
     LOG(logINFOBLUE, ("\tConfiguring chip\n"));
 
     // on chip dacs
@@ -3326,12 +3319,11 @@ int *getBadChannels(int *numChannels) {
     if (*numChannels > 0) {
         // get list of bad channels
         retvals = malloc(*numChannels * sizeof(int));
+        memset(retvals, 0, *numChannels * sizeof(int));
         if (retvals == NULL) {
-            LOG(logERROR, ("Could not allocate memory to get bad channels\n"));
             *numChannels = -1;
             return NULL;
         }
-        memset(retvals, 0, *numChannels * sizeof(int));
         int chIndex = 0;
         int numAddr = MASK_STRIP_NUM_REGS;
         // loop through registers
@@ -3381,8 +3373,7 @@ int startStateMachine() {
         LOG(logERROR, ("Could not start Virtual acquisition thread\n"));
         sharedMemory_setStatus(IDLE);
         return FAIL;
-    } else
-        pthread_detach(pthread_virtual_tid);
+    }
     LOG(logINFOGREEN, ("Virtual Acquisition started\n"));
     return OK;
 #endif

slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c

@@ -1667,8 +1667,7 @@ int startStateMachine() {
         LOG(logERROR, ("Could not start Virtual acquisition thread\n"));
         sharedMemory_setStatus(IDLE);
         return FAIL;
-    } else
-        pthread_detach(pthread_virtual_tid);
+    }
     LOG(logINFOGREEN, ("Virtual Acquisition started\n"));
     return OK;
 #endif

slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c

@@ -555,7 +555,6 @@ void setupDetector() {
     setNextFrameNumber(DEFAULT_STARTING_FRAME_NUMBER);
 
     // temp threshold and reset event
-    setTemperatureControl(DEFAULT_TMP_CNTRL);
     setThresholdTemperature(DEFAULT_TMP_THRSHLD);
     setTemperatureEvent(0);
     if (getChipVersion() == 11) {
@@ -2255,6 +2254,7 @@ int setThresholdTemperature(int val) {
 
     double ftemp = (double)temp / 1000.00;
     LOG(logDEBUG1, ("Threshold Temperature read %f °C\n", ftemp));
+
     return temp;
 }
 
@@ -2555,7 +2555,6 @@ void getPedestalParameters(uint8_t *frames, uint16_t *loops) {
 }
 
 void setPedestalMode(int enable, uint8_t frames, uint16_t loops) {
-    // Note: loops is 8 bit in firmware as a bug.To be fixed in next version
     int prevPedestalEnable = getPedestalMode();
     uint32_t addr = PEDESTAL_MODE_REG;
 
@@ -2734,8 +2733,7 @@ int startStateMachine() {
         LOG(logERROR, ("Could not start Virtual acquisition thread\n"));
         sharedMemory_setStatus(IDLE);
         return FAIL;
-    } else
-        pthread_detach(pthread_virtual_tid);
+    }
     LOG(logINFOGREEN, ("Virtual Acquisition started\n"));
     return OK;
 #endif
@@ -2791,9 +2789,9 @@ void *start_timer(void *arg) {
             }
 
             if ((i % 1024) < 300) {
-                gainVal = 0;
-            } else if ((i % 1024) < 600) {
                 gainVal = 1;
+            } else if ((i % 1024) < 600) {
+                gainVal = 2;
             } else {
                 gainVal = 3;
             }
@@ -2830,29 +2828,17 @@ void *start_timer(void *arg) {
             clock_gettime(CLOCK_REALTIME, &begin);
             usleep(expUs);
 
-#ifdef TEST_CHANGE_GAIN_EVERY_FRAME
             // change gain and data for every frame
             {
                 const int npixels = (NCHAN * NCHIP);
-
-                // random gain values, 2 becomes 3 as 2 is invalid
-                int randomGainValues[3] = {0};
-                srand(time(0));
-                for (int i = 0; i != 3; ++i) {
-                    int r = rand() % 3;
-                    if (r == 2)
-                        r = 3;
-                    randomGainValues[i] = r;
-                }
-
                 for (int i = 0; i < npixels; ++i) {
                     int gainVal = 0;
                     if ((i % 1024) < 300) {
-                        gainVal = randomGainValues[0];
+                        gainVal = 1 + iframes;
                     } else if ((i % 1024) < 600) {
-                        gainVal = randomGainValues[1];
+                        gainVal = 2 + iframes;
                     } else {
-                        gainVal = randomGainValues[2];
+                        gainVal = 3 + iframes;
                     }
                     int dataVal =
                         *((uint16_t *)(imageData + i * sizeof(uint16_t)));
@@ -2863,7 +2849,7 @@ void *start_timer(void *arg) {
                         (uint16_t)pixelVal;
                 }
             }
-#endif
+
             int srcOffset = 0;
             int srcOffset2 = DATA_BYTES / 2;
             int row0 = (numInterfaces == 1 ? detPos[1] : detPos[3]);

slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h

@@ -5,8 +5,8 @@
 #include "sls/sls_detector_defs.h"
 
 #define MIN_REQRD_VRSN_T_RD_API  0x171220
-#define REQRD_FRMWRE_VRSN_BOARD2 0x230920 // 1.0 pcb (version = 010)
-#define REQRD_FRMWRE_VRSN        0x230921 // 2.0 pcb (version = 011)
+#define REQRD_FRMWRE_VRSN_BOARD2 0x241001 // 1.0 pcb (version = 010)
+#define REQRD_FRMWRE_VRSN        0x241001 // 2.0 pcb (version = 011)
 
 #define NUM_HARDWARE_VERSIONS (2)
 #define HARDWARE_VERSION_NUMBERS                                               \
@@ -48,7 +48,6 @@
 #define DEFAULT_SETTINGS                 (GAIN0)
 #define DEFAULT_GAINMODE                 (DYNAMIC)
 #define DEFAULT_TX_UDP_PORT              (0x7e9a)
-#define DEFAULT_TMP_CNTRL                (1)
 #define DEFAULT_TMP_THRSHLD              (65 * 1000) // milli degree Celsius
 #define DEFAULT_NUM_STRG_CLLS            (0)
 #define DEFAULT_STRG_CLL_STRT            (0xf)
@@ -63,7 +62,6 @@
 #define DEFAULT_TIMING_INFO_DECODER      (SWISSFEL)
 #define DEFAULT_ELECTRON_COLLECTION_MODE (0)
 
-#define MAX_PEDESTAL_LOOPS   (0xFF) // until fixed in firmware
 #define HIGHVOLTAGE_MIN      (60)
 #define HIGHVOLTAGE_MAX      (200)
 #define DAC_MIN_MV           (0)

slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c

@@ -1858,8 +1858,7 @@ int startStateMachine() {
         LOG(logERROR, ("Could not start Virtual acquisition thread\n"));
         sharedMemory_setStatus(IDLE);
         return FAIL;
-    } else
-        pthread_detach(pthread_virtual_tid);
+    }
     LOG(logINFOGREEN, ("Virtual Acquisition started\n"));
     return OK;
 #endif

slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c

@@ -404,24 +404,18 @@ void initStopServer() {
 
 /* set up detector */
 
-int allocateDetectorStructureMemory() {
+void allocateDetectorStructureMemory() {
+    // Allocation of memory
     detectorModules = malloc(sizeof(sls_detector_module));
     detectorChans = malloc(NCHAN_PER_MODULE * sizeof(int));
-    detectorDacs = malloc(NDAC * sizeof(int));
     badChannelMask = malloc(NCHAN_PER_MODULE * sizeof(char));
-    if (detectorModules == NULL || detectorChans == NULL ||
-        detectorDacs == NULL || badChannelMask == NULL) {
-        initError = FAIL;
-        strcpy(initErrorMessage, "Could not allocate memory for dacs, channels "
-                                 "or bad channel mask in detector\n");
-        LOG(logERROR, (initErrorMessage));
-        return FAIL;
-    }
+    memset(badChannelMask, 0, NCHAN_PER_MODULE * sizeof(char));
+    detectorDacs = malloc(NDAC * sizeof(int));
+
     LOG(logDEBUG1,
         ("modules from 0x%x to 0x%x\n", detectorModules, detectorModules));
     LOG(logDEBUG1, ("chans from 0x%x to 0x%x\n", detectorChans, detectorChans));
     LOG(logDEBUG1, ("dacs from 0x%x to 0x%x\n", detectorDacs, detectorDacs));
-
     (detectorModules)->dacs = detectorDacs;
     (detectorModules)->chanregs = detectorChans;
     (detectorModules)->ndac = NDAC;
@@ -435,22 +429,21 @@ int allocateDetectorStructureMemory() {
     (detectorModules)->eV[2] = 0;
     thisSettings = UNINITIALIZED;
 
-    // initialize
+    // initialize dacs
     for (int idac = 0; idac < (detectorModules)->ndac; ++idac) {
         detectorDacs[idac] = 0;
     }
+
+    // trimbits start at 0
     for (int ichan = 0; ichan < (detectorModules->nchan); ichan++) {
         *((detectorModules->chanregs) + ichan) = 0;
     }
-    memset(badChannelMask, 0, NCHAN_PER_MODULE * sizeof(char));
-    return OK;
 }
 
 void setupDetector() {
     LOG(logINFO, ("This Server is for 1 Mythen3 module \n"));
 
-    if (allocateDetectorStructureMemory() == FAIL)
-        return;
+    allocateDetectorStructureMemory();
 
     if (checkCommandLineConfiguration() == FAIL)
         return;
@@ -1419,10 +1412,6 @@ int setTrimbits(int *trimbits) {
 int setAllTrimbits(int val) {
     LOG(logINFO, ("Setting all trimbits to %d\n", val));
     int *trimbits = malloc(sizeof(int) * ((detectorModules)->nchan));
-    if (trimbits == NULL) {
-        LOG(logERROR, ("Could not allocate memory to set all trimbits\n"));
-        return FAIL;
-    }
     for (int ichan = 0; ichan < ((detectorModules)->nchan); ++ichan) {
         trimbits[ichan] = val;
     }
@@ -2480,12 +2469,11 @@ int *getBadChannels(int *numChannels) {
     }
     if (*numChannels > 0) {
         retvals = malloc(*numChannels * sizeof(int));
+        memset(retvals, 0, *numChannels * sizeof(int));
         if (retvals == NULL) {
-            LOG(logERROR, ("Could not allocate memory to get bad channels\n"));
             *numChannels = -1;
             return NULL;
         }
-        memset(retvals, 0, *numChannels * sizeof(int));
         // return only 1 channel for all counters
         int ich = 0;
         for (int i = 0; i != NCHAN_PER_MODULE; i = i + NCOUNTERS) {
@@ -2544,8 +2532,7 @@ int startStateMachine() {
         LOG(logERROR, ("Could not start Virtual acquisition thread\n"));
         sharedMemory_setStatus(IDLE);
         return FAIL;
-    } else
-        pthread_detach(pthread_virtual_tid);
+    }
     LOG(logINFOGREEN, ("Virtual Acquisition started\n"));
     return OK;
 #endif

slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h

@@ -3,7 +3,7 @@
 #pragma once
 #include "sls/sls_detector_defs.h"
 
-#define REQRD_FRMWRE_VRSN (0x241113)
+#define REQRD_FRMWRE_VRSN (0x230124)
 #define KERNEL_DATE_VRSN  "Mon May 10 18:00:21 CEST 2021"
 #define ID_FILE           "detid_mythen3.txt"
 

slsDetectorServers/slsDetectorServer/include/clogger.h

@@ -91,7 +91,7 @@ static inline void FILELOG_PrintLog(enum TLogLevel level, char *m) {
 }
 
 static inline char *FILELOG_BuildLog(const char *fmt, ...) {
-    char *p = NULL;
+    char *p;
     va_list ap;
     p = malloc(ERROR_MSG_LENGTH);
     va_start(ap, fmt);

slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h

@@ -140,7 +140,7 @@ void checkVirtual9MFlag();
 void setupFebBeb();
 #endif
 #if defined(EIGERD) || defined(MYTHEN3D)
-int allocateDetectorStructureMemory();
+void allocateDetectorStructureMemory();
 #endif
 void setupDetector();
 #if defined(CHIPTESTBOARDD)

slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h

@@ -11,8 +11,6 @@
 // initialization functions
 int updateModeAllowedFunction(int file_des);
 int printSocketReadError();
-int sendError(int file_des);
-void setMemoryAllocationErrorMessage();
 void init_detector();
 int decode_function(int);
 const char *getRetName();

slsDetectorServers/slsDetectorServer/src/communication_funcs.c

@@ -590,17 +590,14 @@ int Server_SendResult(int fileDes, intType itype, void *retval,
     sendData(fileDes, &ret1, sizeof(ret1), INT32);
     if (ret == FAIL) {
         // send error message
-        if (strlen(mess)) {
+        if (strlen(mess))
             sendData(fileDes, mess, MAX_STR_LENGTH, OTHER);
-            usleep(0); // test
-        }
         // debugging feature. should not happen.
-        else {
+        else
             LOG(logERROR, ("No error message provided for this failure in %s "
                            "server. Will mess up TCP.\n",
                            (isControlServer ? "control" : "stop")));
     }
-    }
     // send return value
     sendData(fileDes, retval, retvalSize, itype);
 

slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c

@@ -115,28 +115,6 @@ int printSocketReadError() {
     return FAIL;
 }
 
-int sendError(int file_des) {
-    ret = FAIL;
-    LOG(logERROR, (mess));
-    Server_SendResult(file_des, INT32, NULL, 0);
-    return ret;
-}
-
-void setMemoryAllocationErrorMessage() {
-    struct sysinfo info;
-    sysinfo(&info);
-    sprintf(
-        mess,
-        "Memory allocation error (%s). Available space: %d MB. Please reboot",
-        getFunctionNameFromEnum((enum detFuncs)fnum),
-        (int)(info.freeram / (1024 * 1024)));
-#ifdef EIGERD
-    strcat(mess, ".\n");
-#else
-    strcat(mess, " using sls_detector_put rebootcontroller.\n");
-#endif
-}
-
 void init_detector() {
     memset(udpDetails, 0, sizeof(udpDetails));
 #ifdef VIRTUAL
@@ -1750,45 +1728,67 @@ int get_module(int file_des) {
     ret = OK;
     memset(mess, 0, sizeof(mess));
 
-#if !defined(MYTHEN3D) && !defined(EIGERD)
-    functionNotImplemented();
-    return Server_SendResult(file_des, INT32, NULL, 0);
-#else
-    int ndac = getNumberOfDACs();
-    int nchan = getTotalNumberOfChannels();
-    if (ndac <= 0 || nchan <= 0) {
-        strcpy(mess, "Invalid number of dacs/channels to set module\n");
-        return sendError(file_des);
-    }
-
     sls_detector_module module;
+    int *myDac = NULL;
+    int *myChan = NULL;
     module.dacs = NULL;
     module.chanregs = NULL;
-    int *myDac = malloc(ndac * sizeof(int));
-    int *myChan = malloc(nchan * sizeof(int));
-    if (myDac == NULL || myChan == NULL) {
-        free(myDac);
-        free(myChan);
-        setMemoryAllocationErrorMessage();
-        return sendError(file_des);
-    }
-    module.dacs = myDac;
-    module.ndac = ndac;
-    module.chanregs = myChan;
-    module.nchan = nchan;
-    module.nchip = getNumberOfChips();
-    getModule(&module);
 
-    Server_SendResult(file_des, INT32, NULL, 0);
-    if (ret == OK && sendModule(file_des, &module) < 0) {
-        strcpy(mess, "Could not send module data\n");
+#if !defined(MYTHEN3D) && !defined(EIGERD)
+    functionNotImplemented();
+#else
+
+    // allocate to receive module structure
+    // allocate dacs
+    myDac = malloc(getNumberOfDACs() * sizeof(int));
+    // error
+    if (getNumberOfDACs() > 0 && myDac == NULL) {
         ret = FAIL;
+        sprintf(mess, "Could not allocate dacs\n");
+        LOG(logERROR, (mess));
+    } else
+        module.dacs = myDac;
+
+    // allocate chans
+    if (ret == OK) {
+        myChan = malloc(getTotalNumberOfChannels() * sizeof(int));
+        if (getTotalNumberOfChannels() > 0 && myChan == NULL) {
+            ret = FAIL;
+            strcpy(mess, "Could not allocate chans\n");
+            LOG(logERROR, (mess));
+        } else
+            module.chanregs = myChan;
+    }
+
+    // receive module structure
+    if (ret == OK) {
+        module.nchip = getNumberOfChips();
+        module.nchan = getTotalNumberOfChannels();
+        module.ndac = getNumberOfDACs();
+
+        // ensure nchan is not 0, else trimbits not copied
+        if (module.nchan == 0) {
+            strcpy(mess, "Could not get module as the number of channels to "
+                         "copy is 0\n");
+            LOG(logERROR, (mess));
+            return FAIL;
+        }
+        getModule(&module);
+    }
+#endif
+    Server_SendResult(file_des, INT32, NULL, 0);
+    if (ret != FAIL) {
+        if (sendModule(file_des, &module) < 0) {
+            ret = FAIL;
+            strcpy(mess, "Could not send module data\n");
             LOG(logERROR, (mess));
         }
+    }
+    if (myChan != NULL)
         free(myChan);
+    if (myDac != NULL)
         free(myDac);
     return ret;
-#endif
 }
 
 int set_module(int file_des) {
@@ -1798,30 +1798,39 @@ int set_module(int file_des) {
 #if !(defined(MYTHEN3D) || defined(EIGERD))
     functionNotImplemented();
 #else
-    int ndac = getNumberOfDACs();
-    int nchan = getTotalNumberOfChannels();
-    if (ndac <= 0 || nchan <= 0) {
-        strcpy(mess, "Invalid number of dacs/channels to set module\n");
-        return sendError(file_des);
-    }
 
     sls_detector_module module;
+    int *myDac = NULL;
+    int *myChan = NULL;
     module.dacs = NULL;
     module.chanregs = NULL;
-    int *myDac = malloc(ndac * sizeof(int));
-    int *myChan = malloc(nchan * sizeof(int));
-    if (myDac == NULL || myChan == NULL) {
-        free(myDac);
-        free(myChan);
-        setMemoryAllocationErrorMessage();
-        return sendError(file_des);
-    }
-    module.dacs = myDac;
-    module.ndac = ndac;
-    module.chanregs = myChan;
-    module.nchan = nchan;
-    module.nchip = getNumberOfChips();
 
+    // allocate to receive arguments
+    // allocate dacs
+    myDac = malloc(getNumberOfDACs() * sizeof(int));
+    // error
+    if (getNumberOfDACs() > 0 && myDac == NULL) {
+        ret = FAIL;
+        strcpy(mess, "Could not allocate dacs\n");
+        LOG(logERROR, (mess));
+    } else
+        module.dacs = myDac;
+
+    // allocate chans
+    if (ret == OK) {
+        myChan = malloc(getTotalNumberOfChannels() * sizeof(int));
+        if (getTotalNumberOfChannels() > 0 && myChan == NULL) {
+            ret = FAIL;
+            strcpy(mess, "Could not allocate chans\n");
+            LOG(logERROR, (mess));
+        } else
+            module.chanregs = myChan;
+    }
+    // receive arguments
+    if (ret == OK) {
+        module.nchip = getNumberOfChips();
+        module.nchan = getTotalNumberOfChannels();
+        module.ndac = getNumberOfDACs();
         int ts = receiveModule(file_des, &module);
         if (ts < 0) {
             free(myChan);
@@ -1834,17 +1843,18 @@ int set_module(int file_des) {
                         module.iodelay, module.tau, module.eV[0]));
         // should at least have a dac
         if (ts <= (int)sizeof(sls_detector_module)) {
+            ret = FAIL;
             strcpy(mess, "Cannot set module. Received incorrect number of "
                          "dacs or channels\n");
-        free(myChan);
-        free(myDac);
-        return sendError(file_des);
+            LOG(logERROR, (mess));
+        }
     }
 
     // only set
-    if (Server_VerifyLock() == OK) {
+    if (ret == OK && Server_VerifyLock() == OK) {
         // check index
-        // setsettings
+
+// setsettings
 #ifndef MYTHEN3D
         // m3 uses reg for chip (not settings)
         validate_settings((enum detectorSettings)(module.reg));
@@ -1857,7 +1867,9 @@ int set_module(int file_des) {
 #endif
         LOG(logDEBUG1, ("Settings: %d\n", retval));
     }
+    if (myChan != NULL)
         free(myChan);
+    if (myDac != NULL)
         free(myDac);
 #endif
 
@@ -2105,8 +2117,7 @@ int acquire(int blocking, int file_des) {
                 // scanErrorMessage)
                 if (blocking || !scan) {
                     pthread_join(pthread_tid, NULL);
-                } else
-                    pthread_detach(pthread_tid);
+                }
             }
         }
     }
@@ -2202,13 +2213,6 @@ void *start_state_machine(void *arg) {
                     ret = FAIL;
                     strcpy(mess, "Could not start read frames thread!\n");
                     LOG(logERROR, (mess));
-                } else {
-                    // blocking or scan
-                    // wait to finish reading from fifo (1g real ctb)
-                    if (*blocking || times > 1)
-                        pthread_join(pthread_tid_ctb_1g, NULL);
-                    else
-                        pthread_detach(pthread_tid_ctb_1g);
                 }
             }
             // add scan error message
@@ -2225,6 +2229,12 @@ void *start_state_machine(void *arg) {
 #endif
         // blocking or scan
         if (*blocking || times > 1) {
+            // wait to finish reading from fifo (1g real ctb)
+#if defined(CHIPTESTBOARDD) && !defined(VIRTUAL)
+            if (!enableTenGigabitEthernet(-1)) {
+                pthread_join(pthread_tid_ctb_1g, NULL);
+            }
+#endif
 #ifdef EIGERD
             waitForAcquisitionEnd(&ret, mess);
             if (ret == FAIL && scan) {
@@ -2945,7 +2955,6 @@ int get_frames_left(int file_des) {
     retval = getNumFramesLeft();
     LOG(logDEBUG1, ("retval num frames left %lld\n", (long long int)retval));
 #endif
-
     return Server_SendResult(file_des, INT64, &retval, sizeof(retval));
 }
 
@@ -6538,10 +6547,6 @@ int set_veto_photon(int file_des) {
     ret = OK;
     memset(mess, 0, sizeof(mess));
 
-#ifndef GOTTHARD2D
-    functionNotImplemented();
-#else
-
     int args[2] = {-1, -1};
     if (receiveData(file_des, args, sizeof(args), INT32) < 0)
         return printSocketReadError();
@@ -6549,17 +6554,14 @@ int set_veto_photon(int file_des) {
     const int numChannels = args[1];
 
     int *gainIndices = malloc(sizeof(int) * numChannels);
-    int *values = malloc(sizeof(int) * numChannels);
-    if (gainIndices == NULL || values == NULL) {
+    if (receiveData(file_des, gainIndices, sizeof(int) * numChannels, INT32) <
+        0) {
         free(gainIndices);
-        free(values);
-        setMemoryAllocationErrorMessage();
-        return sendError(file_des);
+        return printSocketReadError();
     }
 
-    if ((receiveData(file_des, gainIndices, sizeof(int) * numChannels, INT32) <
-         0) ||
-        (receiveData(file_des, values, sizeof(int) * numChannels, INT32)) < 0) {
+    int *values = malloc(sizeof(int) * numChannels);
+    if (receiveData(file_des, values, sizeof(int) * numChannels, INT32) < 0) {
         free(gainIndices);
         free(values);
         return printSocketReadError();
@@ -6568,6 +6570,9 @@ int set_veto_photon(int file_des) {
     LOG(logINFO, ("Setting Veto Photon: [chipIndex:%d, nch:%d]\n", chipIndex,
                   numChannels));
 
+#ifndef GOTTHARD2D
+    functionNotImplemented();
+#else
     // only set
     if (Server_VerifyLock() == OK) {
         if (numChannels != NCHAN) {
@@ -6614,38 +6619,42 @@ int set_veto_photon(int file_des) {
             }
         }
     }
-
-    free(gainIndices);
-    free(values);
 #endif
+    if (gainIndices != NULL) {
+        free(gainIndices);
+    }
+    if (values != NULL) {
+        free(values);
+    }
     return Server_SendResult(file_des, INT32, NULL, 0);
 }
 
 int get_veto_photon(int file_des) {
     ret = OK;
     memset(mess, 0, sizeof(mess));
-
-#ifndef GOTTHARD2D
-    functionNotImplemented();
-    return Server_SendResult(file_des, INT32, NULL, 0);
-#else
-
     int arg = -1;
+    int *retvals = NULL;
+    int *gainRetvals = NULL;
+
     if (receiveData(file_des, &arg, sizeof(arg), INT32) < 0)
         return printSocketReadError();
     LOG(logDEBUG1, ("Getting veto photon [chip Index:%d]\n", arg));
 
-    int *retvals = malloc(sizeof(int) * NCHAN);
-    int *gainRetvals = malloc(sizeof(int) * NCHAN);
-    if (gainRetvals == NULL || retvals == NULL) {
-        free(gainRetvals);
-        free(retvals);
-        setMemoryAllocationErrorMessage();
-        return sendError(file_des);
-    }
+#ifndef GOTTHARD2D
+    functionNotImplemented();
+#else
+    retvals = malloc(sizeof(int) * NCHAN);
+    gainRetvals = malloc(sizeof(int) * NCHAN);
     memset(retvals, 0, sizeof(int) * NCHAN);
     memset(gainRetvals, 0, sizeof(int) * NCHAN);
 
+    if (retvals == NULL || gainRetvals == NULL) {
+        ret = FAIL;
+        strcpy(
+            mess,
+            "Could not get veto photon. Could not allocate memory in server\n");
+        LOG(logERROR, (mess));
+    } else {
         // get only
         int chipIndex = arg;
         if (chipIndex < -1 || chipIndex >= NCHIP) {
@@ -6656,7 +6665,8 @@ int get_veto_photon(int file_des) {
         } else {
             ret = getVetoPhoton(chipIndex, retvals, gainRetvals);
             if (ret == FAIL) {
-            strcpy(mess, "Could not get veto photon for chipIndex -1. Not the "
+                strcpy(mess,
+                       "Could not get veto photon for chipIndex -1. Not the "
                        "same for all chips. Select specific chip index "
                        "instead.\n");
                 LOG(logERROR, (mess));
@@ -6667,7 +6677,8 @@ int get_veto_photon(int file_des) {
                 }
             }
         }
-
+    }
+#endif
     Server_SendResult(file_des, INT32, NULL, 0);
     if (ret != FAIL) {
         int nch = NCHAN;
@@ -6675,10 +6686,13 @@ int get_veto_photon(int file_des) {
         sendData(file_des, gainRetvals, sizeof(int) * NCHAN, INT32);
         sendData(file_des, retvals, sizeof(int) * NCHAN, INT32);
     }
+    if (retvals != NULL) {
         free(retvals);
+    }
+    if (gainRetvals != NULL) {
         free(gainRetvals);
+    }
     return ret;
-#endif
 }
 
 int set_veto_reference(int file_des) {
@@ -7847,19 +7861,17 @@ int set_pattern(int file_des) {
     !defined(MYTHEN3D)
     functionNotImplemented();
 #else
-    patternParameters *pat = malloc(sizeof(patternParameters));
-    if (pat == NULL) {
-        setMemoryAllocationErrorMessage();
-        return sendError(file_des);
-    }
-    memset(pat, 0, sizeof(patternParameters));
 
+    patternParameters *pat = malloc(sizeof(patternParameters));
+    memset(pat, 0, sizeof(patternParameters));
     // ignoring endianness for eiger
     if (receiveData(file_des, pat, sizeof(patternParameters), INT32) < 0) {
+        if (pat != NULL)
             free(pat);
         return printSocketReadError();
     }
     if (receiveData(file_des, args, MAX_STR_LENGTH, OTHER) < 0) {
+        if (pat != NULL)
             free(pat);
         return printSocketReadError();
     }
@@ -7868,6 +7880,7 @@ int set_pattern(int file_des) {
         LOG(logDEBUG1, ("Setting Pattern from structure\n"));
         ret = loadPattern(mess, logINFO, pat, args);
     }
+    if (pat != NULL)
         free(pat);
 #endif
 
@@ -7904,10 +7917,6 @@ int get_pattern(int file_des) {
 #else
 
     patternParameters *pat = malloc(sizeof(patternParameters));
-    if (pat == NULL) {
-        setMemoryAllocationErrorMessage();
-        return sendError(file_des);
-    }
     memset(pat, 0, sizeof(patternParameters));
 
     if (Server_VerifyLock() == OK) {
@@ -7917,6 +7926,7 @@ int get_pattern(int file_des) {
     // ignoring endianness for eiger
     int ret =
         Server_SendResult(file_des, INT32, pat, sizeof(patternParameters));
+    if (pat != NULL)
         free(pat);
     return ret;
 #endif
@@ -8025,13 +8035,10 @@ int set_scan(int file_des) {
                 if (ret == OK) {
                     scan = 1;
                     numScanSteps = (abs(stop - start) / abs(step)) + 1;
-                    // freed only at startup of the next scan
+                    if (scanSteps != NULL) {
                         free(scanSteps);
-                    scanSteps = malloc(numScanSteps * sizeof(int));
-                    if (scanSteps == NULL) {
-                        setMemoryAllocationErrorMessage();
-                        return sendError(file_des);
                     }
+                    scanSteps = malloc(numScanSteps * sizeof(int));
                     for (int i = 0; i != numScanSteps; ++i) {
                         scanSteps[i] = start + i * step;
                         LOG(logDEBUG1, ("scansteps[%d]:%d\n", i, scanSteps[i]));
@@ -8305,54 +8312,55 @@ int set_adc_config(int file_des) {
 int get_bad_channels(int file_des) {
     ret = OK;
     memset(mess, 0, sizeof(mess));
+    int nretvals = 0;
+    int *retvals = NULL;
+
     LOG(logDEBUG1, ("Getting bad channels\n"));
 
 #if !defined(GOTTHARD2D) && !defined(MYTHEN3D)
     functionNotImplemented();
-    return Server_SendResult(file_des, INT32, NULL, 0);
 #else
     // get only
-    int nretvals = 0;
-    int *retvals = getBadChannels(&nretvals);
+    retvals = getBadChannels(&nretvals);
     if (nretvals == -1) {
-        setMemoryAllocationErrorMessage();
-        return sendError(file_des);
+        ret = FAIL;
+        strcpy(mess, "Could not get bad channels. Memory allcoation error\n");
+        LOG(logERROR, (mess));
     }
-
+#endif
     Server_SendResult(file_des, INT32, NULL, 0);
+    if (ret != FAIL) {
         sendData(file_des, &nretvals, sizeof(nretvals), INT32);
         if (nretvals > 0) {
             sendData(file_des, retvals, sizeof(int) * nretvals, INT32);
         }
+    }
+    if (retvals != NULL) {
         free(retvals);
+    }
     return ret;
-#endif
 }
 
 int set_bad_channels(int file_des) {
     ret = OK;
     memset(mess, 0, sizeof(mess));
+    int nargs = 0;
+    int *args = NULL;
+
+    if (receiveData(file_des, &nargs, sizeof(nargs), INT32) < 0)
+        return printSocketReadError();
+
+    if (nargs > 0) {
+        args = malloc(nargs * sizeof(int));
+        if (receiveData(file_des, args, nargs * sizeof(int), INT32) < 0)
+            return printSocketReadError();
+    }
+
+    LOG(logDEBUG1, ("Setting %d bad channels\n", nargs));
 
 #if !defined(GOTTHARD2D) && !defined(MYTHEN3D)
     functionNotImplemented();
 #else
-    int nargs = 0;
-    if (receiveData(file_des, &nargs, sizeof(nargs), INT32) < 0)
-        return printSocketReadError();
-    int *args = NULL;
-    if (nargs > 0) {
-        args = malloc(nargs * sizeof(int));
-        if (args == NULL) {
-            setMemoryAllocationErrorMessage();
-            return sendError(file_des);
-        }
-        if (receiveData(file_des, args, nargs * sizeof(int), INT32) < 0) {
-            free(args);
-            return printSocketReadError();
-        }
-    }
-    LOG(logDEBUG1, ("Setting %d bad channels\n", nargs));
-
     // only set
     if (Server_VerifyLock() == OK) {
         // validate bad channel number
@@ -8381,11 +8389,11 @@ int set_bad_channels(int file_des) {
                 int nretvals = 0;
                 int *retvals = getBadChannels(&nretvals);
                 if (nretvals == -1) {
-                    free(args);
-                    setMemoryAllocationErrorMessage();
-                    return sendError(file_des);
-                }
-                if (nretvals != nargs) {
+                    ret = FAIL;
+                    strcpy(mess, "Could not get bad channels. Memory "
+                                 "allcoation error\n");
+                    LOG(logERROR, (mess));
+                } else if (nretvals != nargs) {
                     ret = FAIL;
                     sprintf(mess,
                             "Could not set bad channels. Set %d channels, but "
@@ -8394,11 +8402,15 @@ int set_bad_channels(int file_des) {
                             nargs, nretvals);
                     LOG(logERROR, (mess));
                 }
+                if (retvals != NULL) {
                     free(retvals);
                 }
             }
         }
+    }
+    if (args != NULL) {
         free(args);
+    }
 #endif
     return Server_SendResult(file_des, INT32, NULL, 0);
 }
@@ -8503,8 +8515,7 @@ int start_readout(int file_des) {
                         ret = FAIL;
                         strcpy(mess, "Could not start read frames thread!\n");
                         LOG(logERROR, (mess));
-                    } else
-                        pthread_detach(pthread_tid_ctb_1g);
+                    }
                 }
             }
 #endif
@@ -9852,12 +9863,11 @@ int receive_program(int file_des, enum PROGRAM_INDEX index) {
             strcpy(mess, "Server name is the same as the symbolic link. Please "
                          "use a different server name\n");
             LOG(logERROR, (mess));
-            Server_SendResult(file_des, INT32, NULL, 0);
         }
 
         // in same folder as current process (will also work for virtual then
         // with write permissions)
-        if (ret == OK) {
+        {
             const int fileNameSize = 128;
             char fname[fileNameSize];
             if (getAbsPath(fname, fileNameSize, serverName) == FAIL) {
@@ -9927,9 +9937,14 @@ void receive_program_via_blackfin(int file_des, enum PROGRAM_INDEX index,
         src = malloc(MAX_BLACKFIN_PROGRAM_SIZE);
         if (src == NULL) {
             fclose(fd);
-            setMemoryAllocationErrorMessage();
-            ret = FAIL;
+            struct sysinfo info;
+            sysinfo(&info);
+            sprintf(mess,
+                    "Could not %s. Memory allocation failure. Free "
+                    "space: %d MB\n",
+                    functionType, (int)(info.freeram / (1024 * 1024)));
             LOG(logERROR, (mess));
+            ret = FAIL;
         }
     }
     Server_SendResult(file_des, INT32, NULL, 0);
@@ -10072,7 +10087,6 @@ void receive_program_default(int file_des, enum PROGRAM_INDEX index,
     }
     Server_SendResult(file_des, INT32, NULL, 0);
     if (ret == FAIL) {
-        free(src);
         return;
     }
 
@@ -11024,13 +11038,6 @@ int set_pedestal_mode(int file_des) {
                         "be 0. [%hhu, %hu].\n",
                         frames, loops);
                 LOG(logERROR, (mess));
-            } else if (loops > MAX_PEDESTAL_LOOPS) {
-                ret = FAIL;
-                sprintf(mess,
-                        "Could not set pedestal mode. Loops [%hu] cannot be "
-                        "greater than %d.\n",
-                        loops, MAX_PEDESTAL_LOOPS);
-                LOG(logERROR, (mess));
             } else {
                 setPedestalMode(enable, frames, loops);
                 int retvalEnable = getPedestalMode();

slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c

@@ -1329,8 +1329,7 @@ int startStateMachine() {
         LOG(logERROR, ("Could not start Virtual acquisition thread\n"));
         sharedMemory_setStatus(IDLE);
         return FAIL;
-    } else
-        pthread_detach(pthread_virtual_tid);
+    }
     LOG(logINFOGREEN, ("Virtual Acquisition started\n"));
     return OK;
 #endif

slsDetectorSoftware/generator/Caller.in.h

@@ -55,7 +55,6 @@ class Caller {
     }
 
     std::vector<std::string> getAllCommands();
-    std::map<std::string, std::string> GetDeprecatedCommands();
     std::string list(int action);
 
     // THIS COMMENT TO BE REPLACED BY THE ACTUAL CODE (1)

slsDetectorSoftware/generator/commands.yaml

@@ -688,7 +688,7 @@ column:
       function: setColumn
 
 timing:
-  help: "[auto|trigger|gating|burst_trigger|trigger_gating]\n\tTiming Mode of detector.\n\t[Jungfrau][Moench][Gotthard][Ctb][Gotthard2][Xilinx Ctb] [auto|trigger]\n\t[Mythen3] [auto|trigger|gating|trigger_gating]\n\t[Eiger] [auto|trigger|gating|burst_trigger]"
+  help: "[auto|trigger|gating|burst_trigger]\n\tTiming Mode of detector.\n\t[Jungfrau][Moench][Gotthard][Ctb][Gotthard2][Xilinx Ctb] [auto|trigger]\n\t[Mythen3] [auto|trigger|gating|trigger_gating]\n\t[Eiger] [auto|trigger|gating|burst_trigger]"
   inherit_actions: INTEGER_COMMAND_VEC_ID
   actions:
     GET:
@@ -793,7 +793,7 @@ selinterface:
       input_types: [ bool ]
 
 udp_firstdst:
-  help: "\n\t[0 - N]\n\twhere N is the max number of udp destinations - 1.\n\t[Jungfrau][Moench][Gotthard2] Max number of udp destinations is 32.\n\t[Mythen3] Max number of udp destination is 64.\n\t One can set which is the first destination that the detector will stream images out from in a round robin fashion. The entry must not have been empty. Default: 0"
+  help: "\n[0 - 31 (or number of udp destinations)]\n\t[Jungfrau][Moench][Gotthard2]\n[0-63]\n\t[Mythen3]\n\n\t One can set which is the first destination that the detector will stream images out from in a round robin fashion. The entry must not have been empty. Default: 0"
   inherit_actions: INTEGER_COMMAND_VEC_ID
   actions:
     GET:
@@ -1074,7 +1074,7 @@ interruptsubframe:
       input_types: [ bool ]
 
 activate:
-  help: "[0, 1]\n\t[Eiger] 1 is default. 0 deactivates readout and does not send data."
+  help: "[0, 1] \n\t[Eiger] 1 is default. 0 deactivates readout and does not send data."
   inherit_actions: INTEGER_COMMAND_VEC_ID
   actions:
     GET:
@@ -1736,7 +1736,7 @@ readout:
 
 rx_clearroi:
   inherit_actions: EXECUTE_SET_COMMAND_NOID
-  help: "\n\tResets Region of interest in receiver. Default is all channels/pixels enabled."
+  help: "Resets Region of interest in receiver. Default is all channels/pixels enabled."
   actions:
     PUT:
       function: clearRxROI
@@ -1779,7 +1779,7 @@ udp_validate:
 
 clearroi:
   inherit_actions: EXECUTE_SET_COMMAND
-  help: "\n\t[Gotthard] Resets Region of interest in detector. All channels enabled. Default is all channels enabled."
+  help: "[Gotthard] Resets Region of interest in detector. All channels enabled. Default is all channels enabled."
   actions:
     PUT:
       function: clearROI
@@ -2034,7 +2034,7 @@ framecounter:
 ################# GET_COMMAND_HEX ############################
 serialnumber:
   inherit_actions: GET_COMMAND
-  help: "\n\t[Jungfrau][Moench][Gotthard][Mythen3][Gotthard2][Ctb]\n\tSerial number of detector."
+  help: "\n\t[Jungfrau][Moench][Gotthard][Mythen3][Gotthard2][Ctb]\nSerial number of detector."
   actions:
     GET:
       function: getSerialNumber
@@ -3147,7 +3147,7 @@ maxclkphaseshift:
       function: getMaxClockPhaseShift
 
 clkdiv:
-  help: "[n_clock] [n_divider]\n\t[Gotthard2][Mythen3] Clock Divider of clock n_clock. Must be greater than 1.\n\t[Gotthard2] Clock index range: 0-5\n\t[Mythen3] Clock index range: 0"
+  help: "[n_clock] [n_divider]\n\t[Gotthard2][Mythen3] Clock Divider of clock n_clock. Must be greater than 1.n\t[Gotthard2] Clock index range: 0-5\n\t[Mythen3] Clock index range: 0"
   actions:
     GET:
       extra_variables:
@@ -3429,7 +3429,7 @@ udp_dstlist:
       output: [ ToString(args) ]
 
 txdelay:
-  help: "[n_delay]\n\t[Eiger][Jungfrau][Moench][Mythen3] Set transmission delay for all modules in the detector using the step size provided.Sets up \n\t[Eiger] txdelay_left to (2 * mod_index * n_delay), \n\t[Eiger] txdelay_right to ((2 * mod_index + 1) * n_delay) and \n\t[Eiger] txdelay_frame to (2 *num_modules * n_delay)\n\t[Jungfrau][Moench][Mythen3] txdelay_frame to (num_modules * n_delay) for every module."
+  help: "[n_delay]\n\t[Eiger][Jungfrau][Moench][Mythen3] Set transmission delay for all modules in the detector using the step size provided.Sets up \n\t\t[Eiger] txdelay_left to (2 * mod_index * n_delay), \n\t\t[Eiger] txdelay_right to ((2 * mod_index + 1) * n_delay) and \n\t\t[Eiger] txdelay_frame to (2 *num_modules * n_delay)  \n\t\t[Jungfrau][Moench][Mythen3] txdelay_frame to (num_modules * n_delay)  \nfor every module."
   actions:
     GET:
       argc: 0
@@ -3560,7 +3560,7 @@ temp_event:
       output: [ '"cleared"' ]
 
 pedestalmode:
-  help: " [frames<uint8_t>] [loops<uint16_t>]\n\t\t[Jungfrau] Enable pedestal mode. \n\t\tThe number of frames or triggers is overwritten by: \n\t\t(#pedestal_frames x #pedestal_loops x 2). \n\t\tIn auto timing mode or in trigger mode with #frames > 1, \n\t\t#frames is overwritten and #triggers = 1, \n\t\telse #triggers is overwritten and #frames = 1. \n\t\tOne cannot set #frames, #triggers or timing mode in pedestal mode (exception thrown).\n\tpedestalmode [0]\n\t\t[Jungfrau] Disable pedestal mode.\n\t\tDisabling pedestal mode will set back the normal mode values of #frames and #triggers."
+  help: " [frames<uint8_t>] [loops<uint16_t>]\n\t\t[Jungfrau] Enable pedestal mode. \n\t\tThe number of frames or triggers is overwritten by: \n\t\t(#pedestal_frames x #pedestal_loops x 2). \n\t\tIn auto timing mode or in trigger mode with #frames > 1, \n\t\t#frames is overwritten and #triggers = 1, \n\t\telse #triggers is overwritten and #frames = 1. \n\t\tOne cannot set #frames, #triggers or timing mode in pedestal mode (exception thrown).\n\npedestalmode [0]\n\t\t[Jungfrau] Disable pedestal mode.\n\t\tDisabling pedestal mode will set back the normal mode values of #frames and #triggers."
   actions: 
     GET:
       argc: 0
@@ -3627,7 +3627,7 @@ inj_ch:
       output: [ ToString(args) ]
 
 vetophoton:
-  help: "[ichip] [#photons] [energy in keV] [reference file]\n\t[Gotthard2] Set veto reference for 128 channels for chip ichip according to reference file and #photons and energy in keV.\n\t[ichip] [output file]\n\t Get gain indices and veto reference for 128 channels for chip ichip, saved to file."
+  help: "[ichip] [#photons] [energy in keV] [reference file]\n\t[Gotthard2] Set veto reference for 128 channels for chip ichip according to reference file and #photons and energy in keV.\n[ichip] [output file]\n\t Get gain indices and veto reference for 128 channels for chip ichip, saved to file."
   actions:
     GET:
       argc: 2
@@ -3963,7 +3963,7 @@ patloop:
       output: [level,"' '" , "'['" , "ToStringHex(start, 4)" , '", "' , "ToStringHex(stop, 4)", "']'" ]
 
 patloop0:
-    help: "\n\tDeprecated command. Use patloop."
+    help: "Deprecated command. Use patloop."
     inherit_actions: patloop
     actions:
       GET:
@@ -4010,7 +4010,7 @@ patnloop:
       output: [ level,"' '" , nloops ]
 
 patnloop0:
-    help: "\n\tDeprecated command. Use patnloop."
+    help: "Deprecated command. Use patnloop."
     inherit_actions: patnloop
     actions:
       GET:
@@ -4056,7 +4056,7 @@ patwait:
       output: [level,"' '" ,  "ToStringHex(addr, 4)" ]
 
 patwait0:
-    help: "\n\tDeprecated command. Use patwait."
+    help: "Deprecated command. Use patwait."
     inherit_actions: patwait
     actions:
       GET:
@@ -4102,7 +4102,7 @@ patwaittime:
       output: [level,"' '" ,  "waittime" ]
 
 patwaittime0:
-    help: "\n\tDeprecated command. Use patwaittime."
+    help: "Deprecated command. Use patwaittime."
     inherit_actions: patwaittime
     actions:
       GET:

slsDetectorSoftware/generator/extended_commands.yaml

@@ -67,7 +67,8 @@ activate:
         store_result_in_t: false
   command_name: activate
   function_alias: activate
-  help: "[0, 1]\n\t[Eiger] 1 is default. 0 deactivates readout and does not send data."
+  help: "[0, 1] \n\t[Eiger] 1 is default. 0 deactivates readout and does not send\
+    \ data."
   infer_action: true
   template: true
 adcclk:
@@ -1205,8 +1206,8 @@ clearroi:
         store_result_in_t: false
   command_name: clearroi
   function_alias: clearroi
-  help: "\n\t[Gotthard] Resets Region of interest in detector. All channels enabled.\
-    \ Default is all channels enabled."
+  help: '[Gotthard] Resets Region of interest in detector. All channels enabled. Default
+    is all channels enabled.'
   infer_action: true
   template: true
 clientversion:
@@ -1292,7 +1293,7 @@ clkdiv:
   command_name: clkdiv
   function_alias: clkdiv
   help: "[n_clock] [n_divider]\n\t[Gotthard2][Mythen3] Clock Divider of clock n_clock.\
-    \ Must be greater than 1.\n\t[Gotthard2] Clock index range: 0-5\n\t[Mythen3] Clock\
+    \ Must be greater than 1.n\t[Gotthard2] Clock index range: 0-5\n\t[Mythen3] Clock\
     \ index range: 0"
   infer_action: true
 clkfreq:
@@ -6077,7 +6078,7 @@ patloop0:
         store_result_in_t: false
   command_name: patloop0
   function_alias: patloop0
-  help: "\n\tDeprecated command. Use patloop."
+  help: Deprecated command. Use patloop.
   infer_action: true
 patloop1:
   actions:
@@ -6146,7 +6147,7 @@ patloop1:
         store_result_in_t: false
   command_name: patloop1
   function_alias: patloop1
-  help: "\n\tDeprecated command. Use patloop."
+  help: Deprecated command. Use patloop.
   infer_action: true
 patloop2:
   actions:
@@ -6215,7 +6216,7 @@ patloop2:
         store_result_in_t: false
   command_name: patloop2
   function_alias: patloop2
-  help: "\n\tDeprecated command. Use patloop."
+  help: Deprecated command. Use patloop.
   infer_action: true
 patmask:
   actions:
@@ -6376,7 +6377,7 @@ patnloop0:
         store_result_in_t: false
   command_name: patnloop0
   function_alias: patnloop0
-  help: "\n\tDeprecated command. Use patnloop."
+  help: Deprecated command. Use patnloop.
   infer_action: true
 patnloop1:
   actions:
@@ -6434,7 +6435,7 @@ patnloop1:
         store_result_in_t: false
   command_name: patnloop1
   function_alias: patnloop1
-  help: "\n\tDeprecated command. Use patnloop."
+  help: Deprecated command. Use patnloop.
   infer_action: true
 patnloop2:
   actions:
@@ -6492,7 +6493,7 @@ patnloop2:
         store_result_in_t: false
   command_name: patnloop2
   function_alias: patnloop2
-  help: "\n\tDeprecated command. Use patnloop."
+  help: Deprecated command. Use patnloop.
   infer_action: true
 patsetbit:
   actions:
@@ -6699,7 +6700,7 @@ patwait0:
         store_result_in_t: false
   command_name: patwait0
   function_alias: patwait0
-  help: "\n\tDeprecated command. Use patwait."
+  help: Deprecated command. Use patwait.
   infer_action: true
 patwait1:
   actions:
@@ -6757,7 +6758,7 @@ patwait1:
         store_result_in_t: false
   command_name: patwait1
   function_alias: patwait1
-  help: "\n\tDeprecated command. Use patwait."
+  help: Deprecated command. Use patwait.
   infer_action: true
 patwait2:
   actions:
@@ -6815,7 +6816,7 @@ patwait2:
         store_result_in_t: false
   command_name: patwait2
   function_alias: patwait2
-  help: "\n\tDeprecated command. Use patwait."
+  help: Deprecated command. Use patwait.
   infer_action: true
 patwaittime:
   actions:
@@ -6936,7 +6937,7 @@ patwaittime0:
         store_result_in_t: false
   command_name: patwaittime0
   function_alias: patwaittime0
-  help: "\n\tDeprecated command. Use patwaittime."
+  help: Deprecated command. Use patwaittime.
   infer_action: true
 patwaittime1:
   actions:
@@ -6994,7 +6995,7 @@ patwaittime1:
         store_result_in_t: false
   command_name: patwaittime1
   function_alias: patwaittime1
-  help: "\n\tDeprecated command. Use patwaittime."
+  help: Deprecated command. Use patwaittime.
   infer_action: true
 patwaittime2:
   actions:
@@ -7052,7 +7053,7 @@ patwaittime2:
         store_result_in_t: false
   command_name: patwaittime2
   function_alias: patwaittime2
-  help: "\n\tDeprecated command. Use patwaittime."
+  help: Deprecated command. Use patwaittime.
   infer_action: true
 patword:
   actions:
@@ -7171,7 +7172,7 @@ pedestalmode:
     \ x #pedestal_loops x 2). \n\t\tIn auto timing mode or in trigger mode with #frames\
     \ > 1, \n\t\t#frames is overwritten and #triggers = 1, \n\t\telse #triggers is\
     \ overwritten and #frames = 1. \n\t\tOne cannot set #frames, #triggers or timing\
-    \ mode in pedestal mode (exception thrown).\n\tpedestalmode [0]\n\t\t[Jungfrau]\
+    \ mode in pedestal mode (exception thrown).\n\npedestalmode [0]\n\t\t[Jungfrau]\
     \ Disable pedestal mode.\n\t\tDisabling pedestal mode will set back the normal\
     \ mode values of #frames and #triggers."
   infer_action: true
@@ -8441,8 +8442,7 @@ rx_clearroi:
         store_result_in_t: false
   command_name: rx_clearroi
   function_alias: rx_clearroi
-  help: "\n\tResets Region of interest in receiver. Default is all channels/pixels\
-    \ enabled."
+  help: Resets Region of interest in receiver. Default is all channels/pixels enabled.
   infer_action: true
   template: true
 rx_dbitlist:
@@ -9754,7 +9754,7 @@ serialnumber:
         store_result_in_t: true
   command_name: serialnumber
   function_alias: serialnumber
-  help: "\n\t[Jungfrau][Moench][Gotthard][Mythen3][Gotthard2][Ctb]\n\tSerial number\
+  help: "\n\t[Jungfrau][Moench][Gotthard][Mythen3][Gotthard2][Ctb]\nSerial number\
     \ of detector."
   infer_action: true
   template: true
@@ -11446,9 +11446,9 @@ timing:
         store_result_in_t: false
   command_name: timing
   function_alias: timing
-  help: "[auto|trigger|gating|burst_trigger|trigger_gating]\n\tTiming Mode of detector.\n\
-    \t[Jungfrau][Moench][Gotthard][Ctb][Gotthard2][Xilinx Ctb] [auto|trigger]\n\t\
-    [Mythen3] [auto|trigger|gating|trigger_gating]\n\t[Eiger] [auto|trigger|gating|burst_trigger]"
+  help: "[auto|trigger|gating|burst_trigger]\n\tTiming Mode of detector.\n\t[Jungfrau][Moench][Gotthard][Ctb][Gotthard2][Xilinx\
+    \ Ctb] [auto|trigger]\n\t[Mythen3] [auto|trigger|gating|trigger_gating]\n\t[Eiger]\
+    \ [auto|trigger|gating|burst_trigger]"
   infer_action: true
   template: true
 timing_info_decoder:
@@ -11913,11 +11913,11 @@ txdelay:
   command_name: txdelay
   function_alias: txdelay
   help: "[n_delay]\n\t[Eiger][Jungfrau][Moench][Mythen3] Set transmission delay for\
-    \ all modules in the detector using the step size provided.Sets up \n\t[Eiger]\
-    \ txdelay_left to (2 * mod_index * n_delay), \n\t[Eiger] txdelay_right to ((2\
-    \ * mod_index + 1) * n_delay) and \n\t[Eiger] txdelay_frame to (2 *num_modules\
-    \ * n_delay)\n\t[Jungfrau][Moench][Mythen3] txdelay_frame to (num_modules * n_delay)\
-    \ for every module."
+    \ all modules in the detector using the step size provided.Sets up \n\t\t[Eiger]\
+    \ txdelay_left to (2 * mod_index * n_delay), \n\t\t[Eiger] txdelay_right to ((2\
+    \ * mod_index + 1) * n_delay) and \n\t\t[Eiger] txdelay_frame to (2 *num_modules\
+    \ * n_delay)  \n\t\t[Jungfrau][Moench][Mythen3] txdelay_frame to (num_modules\
+    \ * n_delay)  \nfor every module."
   infer_action: true
 txdelay_frame:
   actions:
@@ -12417,11 +12417,10 @@ udp_firstdst:
         store_result_in_t: false
   command_name: udp_firstdst
   function_alias: udp_firstdst
-  help: "\n\t[0 - N]\n\twhere N is the max number of udp destinations - 1.\n\t[Jungfrau][Moench][Gotthard2]\
-    \ Max number of udp destinations is 32.\n\t[Mythen3] Max number of udp destination\
-    \ is 64.\n\t One can set which is the first destination that the detector will\
-    \ stream images out from in a round robin fashion. The entry must not have been\
-    \ empty. Default: 0"
+  help: "\n[0 - 31 (or number of udp destinations)]\n\t[Jungfrau][Moench][Gotthard2]\n\
+    [0-63]\n\t[Mythen3]\n\n\t One can set which is the first destination that the\
+    \ detector will stream images out from in a round robin fashion. The entry must\
+    \ not have been empty. Default: 0"
   infer_action: true
   template: true
 udp_numdst:
@@ -13711,7 +13710,7 @@ vetophoton:
   function_alias: vetophoton
   help: "[ichip] [#photons] [energy in keV] [reference file]\n\t[Gotthard2] Set veto\
     \ reference for 128 channels for chip ichip according to reference file and #photons\
-    \ and energy in keV.\n\t[ichip] [output file]\n\t Get gain indices and veto reference\
+    \ and energy in keV.\n[ichip] [output file]\n\t Get gain indices and veto reference\
     \ for 128 channels for chip ichip, saved to file."
   infer_action: true
 vetoref:

slsDetectorSoftware/generator/gen_commands.py

@@ -60,6 +60,7 @@ def generate(
                 if command["help"].startswith('code:'):
                     codegen.write_line(command["help"].strip('code:'))
                 else:
+                    codegen.write_line(f'os << "Command: {command_name}" << std::endl;')
                     codegen.write_line(f'os << R"V0G0N({command["help"]} )V0G0N" << std::endl;')
                     codegen.write_line('return os.str();')
 

slsDetectorSoftware/include/sls/Detector.h

@@ -20,7 +20,7 @@ class IpAddr;
 // Free function to avoid dependence on class
 // and avoid the option to free another objects
 // shm by mistake
-void freeSharedMemory(const int detectorIndex = 0, const int moduleIndex = -1);
+void freeSharedMemory(int detectorIndex, int moduleIndex = -1);
 
 /**
  * \class Detector
@@ -46,13 +46,9 @@ class Detector {
     Detector(int shm_id = 0);
     ~Detector();
 
-    // Disable copy since SharedMemory object is unique in DetectorImpl
-    Detector(const Detector &other) = delete;
-    Detector &operator=(const Detector &other) = delete;
-
-    // Move constructor and assignment operator
-    Detector(Detector &&other) noexcept;
-    Detector &operator=(Detector &&other) noexcept;
+    /** Free the shared memory of this detector and all modules
+    belonging to it */
+    void freeSharedMemory();
 
     /** Frees shared memory before loading configuration file. Set up once
     normally */

slsDetectorSoftware/src/Caller.h

@@ -55,7 +55,6 @@ class Caller {
     }
 
     std::vector<std::string> getAllCommands();
-    std::map<std::string, std::string> GetDeprecatedCommands();
     std::string list(int action);
 
     std::string acquire(int action);

slsDetectorSoftware/src/CallerSpecial.cpp

@@ -16,10 +16,6 @@ std::vector<std::string> Caller::getAllCommands() {
     return ret;
 }
 
-std::map<std::string, std::string> Caller::GetDeprecatedCommands() {
-    return deprecated_functions;
-}
-
 void Caller::call(const std::string &command,
                   const std::vector<std::string> &arguments, int detector_id,
                   int action, std::ostream &os, int receiver_id) {
@@ -67,35 +63,12 @@ bool Caller::ReplaceIfDeprecated(std::string &command) {
 }
 
 std::string Caller::list(int action) {
-    if (action == defs::HELP_ACTION) {
-        return "[deprecated(optional)]\n\tlists all available commands, list "
-               "deprecated - list deprecated commands\n";
-    }
-    if (args.empty()) {
     std::string ret = "free\n";
     for (auto &f : functions) {
         ret += f.first + "\n";
     }
+
     return ret;
-    } else if (args.size() == 1) {
-        if (args[0] == "deprecated") {
-            std::ostringstream os;
-            os << "The following " << deprecated_functions.size()
-               << " commands are deprecated\n";
-            const size_t field_width = 20;
-            for (const auto &it : deprecated_functions) {
-                os << std::right << std::setw(field_width) << it.first << " -> "
-                   << it.second << '\n';
-            }
-            return os.str();
-        } else {
-            throw RuntimeError(
-                "Could not decode argument. Possible options: deprecated");
-        }
-    } else {
-        WrongNumberOfParameters(0);
-        return "";
-    }
 }
 
 /* Network Configuration (Detector<->Receiver) */
@@ -250,7 +223,8 @@ void Caller::EmptyDataCallBack(detectorData *data, uint64_t frameIndex,
 std::string Caller::acquire(int action) {
     std::ostringstream os;
     if (action == defs::HELP_ACTION) {
-        os << "\n\tAcquire the number of frames set up.\n\tBlocking command, "
+        os << cmd
+           << "\n\tAcquire the number of frames set up.\n\tBlocking command, "
               "where control server is blocked and cannot accept other "
               "commands until acquisition is done. \n\t- sets acquiring "
               "flag\n\t- starts the receiver listener (if enabled)\n\t- starts "
@@ -370,8 +344,7 @@ std::string Caller::threshold(int action) {
         if (cmd == "thresholdnotb") {
             os << "Trimbits are not loaded.";
         }
-        os << "\n\t" << cmd
-           << " [eV1] [eV2] [eV3] [(optional settings)]"
+        os << "\n\nthreshold [eV1] [eV2] [eV3] [(optional settings)]"
               "\n\t[Mythen3] Threshold in eV for each counter. It loads trim "
               "files from settingspath. An energy of -1 will pick up values "
               " from detector.";
@@ -447,9 +420,10 @@ std::string Caller::trimen(int action) {
     std::ostringstream os;
     if (action == defs::HELP_ACTION) {
         os << "[trim_ev1] [trim_Ev2 (optional)] [trim_ev3 (optional)] "
-              "...\n\t[Eiger][Mythen3] list of trim energies, where "
-              "corresponding default trim files exist in corresponding trim "
-              "folders."
+              "...\n\t[Eiger][Mythen3] Number of trim energies and list of "
+              "trim "
+              "energies, where corresponding default trim files exist in "
+              "corresponding trim folders."
            << '\n';
     } else if (action == defs::GET_ACTION) {
         if (!args.empty()) {