updated docs and versions

formatting
updating release notes
2025-06-17 07:17:13 +02:00 · 2023-07-12 16:50:13 +02:00 · 2023-07-12 16:06:31 +02:00 · 2023-07-11 17:02:27 +02:00 · 2023-07-11 17:01:14 +02:00 · 2023-07-11 17:00:42 +02:00
113 changed files with 5259 additions and 5814 deletions
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@ -1,38 +0,0 @@
-name: CMake
-
-on: [push, pull_request]
-
-env:
-  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  BUILD_TYPE: Debug
-
-jobs:
-  build:
-    # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
-    # You can convert this to a matrix build if you need cross-platform coverage.
-    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: ubuntu-latest
-    name: Configure and build using cmake
-    steps:
-      - uses: actions/checkout@v3
-      - uses: awalsh128/cache-apt-pkgs-action@latest
-        with:
-          packages: libzmq3-dev libhdf5-dev qtbase5-dev qt5-qmake libqt5svg5-dev
-          version: 1.0
-
-      - name: Configure CMake
-        # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-        # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DSLS_USE_TESTS=ON -DSLS_USE_HDF5=ON -DSLS_USE_GUI=ON
-
-      - name: Build
-        # Build your program with the given configuration
-        run: cmake --build ${{github.workspace}}/build -j2 --config ${{env.BUILD_TYPE}}
-
-      - name: Test
-        working-directory: ${{github.workspace}}/build
-        # Execute tests defined by the CMake configuration.
-        # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-        run: ctest -C ${{env.BUILD_TYPE}} -j1
-
-
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -2,7 +2,7 @@
 # Copyright (C) 2021 Contributors to the SLS Detector Package
 cmake_minimum_required(VERSION 3.12)
 project(slsDetectorPackage)
-set(PROJECT_VERSION 7.0.0)
+set(PROJECT_VERSION 7.0.2)

 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")

--- a/RELEASE.txt
+++ b/RELEASE.txt
@ -1,42 +1,80 @@
-SLS Detector Package Major Release 7.x.x released on xx.xx.2023
+SLS Detector Package Major Release 7.0.2 released on 12.07.2023
 ===============================================================

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



    CONTENTS
    --------
-    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
+    1   Resolved Issues
+    2   On-board Detector Server Compatibility
+    3   Firmware Requirements
+    4   Kernel Requirements
+    5   Download, Documentation & Support



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


- moench being made compatible with jungfrau 2.0 boards (jungfrau structure, away from ctb)
- rx_hostname and port can be combo to one or to all, or vector or hostnames and ports. ignoring none or empty, then verifying no duplicates for the host port combo including from shared memory
- same for hostname and port combo (for virtual servers)
- eiger febl and febr in versions, ensure its the same as beb fw version
- eiger hardware version fx30 and fx70 (versions command)
- fixed rx_arping error
- fix hdf5 compilation (detspec fields)
- print server version atleast in exception msg when connecting to an older server, also able to add hostname to shm
+    Firmware
+    --------

+    *   [Jungfrau] Stopping acquisition in sync mode
+        Previously, stopping acquisition in sync mode would result in the slave
+        status remaining in Running status for next acquisition and framesl (frames
+        left) would be stuck from the previous acquisition. This is fixed in firmware.
+  
+
+
+    Detector Server
+    ---------------
+
+    *   [Jungfrau] Changing master to slave in sync mode
+        When in sync mode, changing from master to slave would change the status
+        to Running in firmware. A workaround in the detector server fixes this.
+
+    *   [Jungfrau] Row and column for multi module Jungfrau 
+        This mainly affected only the GUI, unless one was using the row and column
+        sent out by the detector. Row and column values were mixed up, but fixed now.
+
+    *   [Jungfrau] Timing in sync mode
+        When sync is enabled, setting or getting timing would give an error. This 
+        is fixed now.
+
+
+    Client
+    ------
+
+    *   [Jungfrau] Multi module sync mode
+        For start, stop and trigger acquisition, the procedure to start the slaves
+        (or the master for stop acquisition) first had to be obeyed. This is fixed
+        now.
+    
+
+    ZMQ
+    ---
+
+    *   [Jungfrau][Gotthard2] Client ZMQ port when using 2 interfaces
+        When switching between 1 and 2 interfaces, the client or gui zmq port
+        was not set properly and resulted in dummy streaming forever. This is
+        fixed now.
+
+    *   Rx_roi
+        This parameter is now also streamed in the zmq header to be able to use in 
+        external GUIs.
+
+
+    GUI
+    ---
+
+    *   [Jungfrau] Show Fix_G0 in expert mode
+        Fix_G0 was only shown when expert mode was enabled from Settings Tab. Now, 
+        fixed to show when expert mode enabled from any tab.
+
+    


 2  On-board Detector Server Compatibility
@ -44,7 +82,7 @@ This document describes the differences between v7.x.x and v7.0.0


    Eiger       7.0.0
-    Jungfrau    7.0.0
+    Jungfrau    7.0.2
    Mythen3     7.0.0
    Gotthard2   7.0.0
    Gotthard    7.0.0
@ -72,8 +110,8 @@ This document describes the differences between v7.x.x and v7.0.0

    Eiger       20.02.2023 (v31)
    
-    Jungfrau    04.11.2022 (v1.4, HW v1.0) 
-                03.11.2022 (v2.4, HW v2.0)
+    Jungfrau    16.05.2023 (v1.4.1, HW v1.0) 
+                15.05.2023 (v2.4.1, HW v2.0)

    Mythen3     24.01.2023 (v1.4)

@ -218,3 +256,4 @@ This document describes the differences between v7.x.x and v7.0.0

        dhanya.thattil@psi.ch
        erik.frojdh@psi.ch
+
--- a/docs/src/slsreceiver.rst
+++ b/docs/src/slsreceiver.rst
@ -140,14 +140,21 @@ ZMQ: Json Header Format
            "quad": unsigned int,
            "addJsonHeader": {
                string : string
-            }
+            },
+            "rx_roi": [
+                unsigned int,
+                unsigned int,
+                unsigned int,
+                unsigned int
+            ]
        }

   +--------------+----------------------------------------------+
   |   Field      |       Description                            |
   +--------------+----------------------------------------------+
   | jsonversion  | Version of the json header.                  |
-   |              | Value at 4 for v6.x.x and v7.x.x             |
+   |              | Value at 4 for v6.x.x - v7.0.1               | 
+   |              | Value at 5 for v7.0.2                        |
   +--------------+----------------------------------------------+
   | bitmode      | Bits per pixel [4|8|16|32]                   |
   +--------------+----------------------------------------------+
@ -222,7 +229,10 @@ ZMQ: Json Header Format
   | addJsonHeader| Optional custom parameters that is required  |
   |              | for processing code.                         |
   +--------------+----------------------------------------------+
-
+   | rx_roi       | ROI in the receiver per port (xmin, xmax,    |
+   |              | ymin, ymax). For external guis to know       |
+   |              | what is saved                                |
+   +--------------+----------------------------------------------+

 SLS Receiver Header Format
 --------------------------
--- a/python/slsdet/detector.py
+++ b/python/slsdet/detector.py
@ -230,8 +230,7 @@ class Detector(CppDetectorApi):
    @element
    def hardwareversion(self):
        """
-        [Jungfrau][Moench][Gotthard2][Myhten3][Gotthard][Ctb] Hardware version of detector. \n
-        [Eiger] Hardware version of front FPGA on detector.
+        [Jungfrau][Gotthard2][Myhten3][Gotthard][Ctb][Moench] Hardware version of detector.
        """
        return self.getHardwareVersion()

@ -306,7 +305,7 @@ class Detector(CppDetectorApi):
        -----
        [Eiger] Options: 4, 8, 12, 16, 32. If set to 32, also sets clkdivider to 2 (quarter speed), else to 0 (full speed)\n
        [Mythen3] Options: 8, 16, 32 \n
-        [Jungfrau][Moench][Gotthard][Ctb][Mythen3][Gotthard2] 16
+        [Jungfrau][Gotthard][Ctb][Moench][Mythen3][Gotthard2] 16
        """
        return self.getDynamicRange()

@ -364,9 +363,10 @@ class Detector(CppDetectorApi):
        -----
        
        [Eiger] Use threshold command to load settings
-        [Jungfrau][Moench] GAIN0, HIGHGAIN0 \n
+        [Jungfrau] GAIN0, HIGHGAIN0 \n
        [Gotthard] DYNAMICGAIN, HIGHGAIN, LOWGAIN, MEDIUMGAIN, VERYHIGHGAIN \n
        [Gotthard2] DYNAMICGAIN, FIXGAIN1, FIXGAIN2 \n
+        [Moench] G1_HIGHGAIN, G1_LOWGAIN, G2_HIGHCAP_HIGHGAIN, G2_HIGHCAP_LOWGAIN, G2_LOWCAP_HIGHGAIN, G2_LOWCAP_LOWGAIN, G4_HIGHGAIN, G4_LOWGAIN \n
        [Eiger] settings loaded from file found in settingspath
        """
        return element_if_equal(self.getSettings())
@ -396,7 +396,7 @@ class Detector(CppDetectorApi):
    @element
    def framesl(self):
        """
-        [Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB] Number of frames left in acquisition.\n
+        [Gotthard][Jungfrau][Mythen3][Gotthard2][CTB][Moench] Number of frames left in acquisition.\n
        [Gotthard2] only in continuous auto mode.

        :setter: Not Implemented
@ -407,7 +407,7 @@ class Detector(CppDetectorApi):
    @element
    def framecounter(self):
        """
-        [Jungfrau][Moench][Mythen3][Gotthard2][CTB] Number of frames from start run control.
+        [Jungfrau][Mythen3][Gotthard2][Moench][CTB] Number of frames from start run control.

        Note
        -----
@ -436,11 +436,12 @@ class Detector(CppDetectorApi):
    @element
    def powerchip(self):
        """
-        [Jungfrau][Moench][Mythen3][Gotthard2] Power the chip. 
+        [Jungfrau][Mythen3][Gotthard2][Moench] Power the chip. 

        Note
        ----
-        [Jungfrau][Moench] Default is disabled. Get will return power status. Can be off if temperature event occured (temperature over temp_threshold with temp_control enabled. Will configure chip (only chip v1.1).\n
+        [Moench] Default is disabled. \n
+        [Jungfrau] Default is disabled. Get will return power status. Can be off if temperature event occured (temperature over temp_threshold with temp_control enabled. Will configure chip (only chip v1.1).\n
        [Mythen3][Gotthard2] Default is 1. If module not connected or wrong module, powerchip will fail.
        """
        return self.getPowerChip()
@ -614,7 +615,7 @@ class Detector(CppDetectorApi):
    @element
    def periodl(self):
        """
-        [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2] Period left for current frame.
+        [Gotthard][Jungfrau][CTB][Moench][Mythen3][Gotthard2] Period left for current frame.

        Note
        -----
@ -636,7 +637,7 @@ class Detector(CppDetectorApi):
    @element
    def delay(self):
        """
-        [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2] Delay after trigger, accepts either a value in seconds, DurationWrapper or datetime.timedelta
+        [Gotthard][Jungfrau][CTB][Moench][Mythen3][Gotthard2] Delay after trigger, accepts either a value in seconds, DurationWrapper or datetime.timedelta

        Note
        -----
@ -681,7 +682,7 @@ class Detector(CppDetectorApi):
    @element
    def delayl(self):
        """
-        [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2] Delay left after trigger during acquisition, accepts either a value in seconds, datetime.timedelta or DurationWrapper
+        [Gotthard][Jungfrau][CTB][Moench][Mythen3][Gotthard2] Delay left after trigger during acquisition, accepts either a value in seconds, datetime.timedelta or DurationWrapper

        Note
        -----
@ -740,7 +741,7 @@ class Detector(CppDetectorApi):
    @element
    def txdelay(self):
        """
-        [Eiger][Jungfrau][Moench][Mythen3] Set transmission delay for all modules in the detector using the step size provided.
+        [Eiger][Jungfrau][Mythen3] Set transmission delay for all modules in the detector using the step size provided.
        
        Note
        ----
@ -748,7 +749,7 @@ class Detector(CppDetectorApi):
        \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)\n\n
+        \t\t[Jungfrau][Mythen3] txdelay_frame to (num_modules * n_delay)\n\n
        Please refer txdelay_left, txdelay_right and txdelay_frame for details.
        """
        return self.getTransmissionDelay()
@ -761,11 +762,11 @@ class Detector(CppDetectorApi):
    @element
    def txdelay_frame(self):
        """
-        [Eiger][Jungfrau][Moench][Mythen3] Transmission delay of first udp packet being streamed out of the module.\n
+        [Eiger][Jungfrau][Mythen3] Transmission delay of first udp packet being streamed out of the module.\n

        Note
        ----
-        [Jungfrau][Moench] [0-31] Each value represents 1 ms. \n 
+        [Jungfrau] [0-31] Each value represents 1 ms. \n 
        [Eiger] Additional delay to txdelay_left and txdelay_right. Each value represents 10ns. Typical value is 50000. \n
        [Mythen3] [0-16777215] Each value represents 8 ns (125 MHz clock), max is 134 ms.
        """
@ -948,7 +949,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def numinterfaces(self):
-        """[Jungfrau][Moench][Gotthard2] Number of udp interfaces to stream data from detector. Default is 1.
+        """[Jungfrau][Gotthard2] Number of udp interfaces to stream data from detector. Default is 1.
        
        Note
        -----
@ -1294,11 +1295,11 @@ class Detector(CppDetectorApi):
    @element
    def udp_dstip2(self):
        """
-        [Jungfrau][Moench][Gotthard2] Ip address of the receiver (destination) udp interface 2.
+        [Jungfrau][Gotthard2] Ip address of the receiver (destination) udp interface 2.
        
        Note
        ----
-        [Jungfrau][Moench] bottom half \n
+        [Jungfrau] bottom half \n
        [Gotthard2] veto debugging \n
        If 'auto' used, then ip is set to ip of rx_hostname. \n
        To set IPs for individual modules, use setDestinationUDPIP2. 
@ -1347,13 +1348,13 @@ class Detector(CppDetectorApi):
    @element
    def udp_dstmac2(self):
        """
-        [Jungfrau][Moench][Gotthard2] Mac address of the receiver (destination) udp interface 2.
+        [Jungfrau][Gotthard2] Mac address of the receiver (destination) udp interface 2.
        
        Note
        ----
        Not mandatory to set as udp_dstip2 retrieves it from slsReceiver process but must be set if you use a custom receiver (not slsReceiver).  \n
        To set MACs for individual modules, use setDestinationUDPMAC2. \n
-        [Jungfrau][Moench] bottom half \n
+        [Jungfrau] bottom half \n
        [Gotthard2] veto debugging \n
        Use router mac if router between detector and receiver.
        
@ -1398,11 +1399,11 @@ class Detector(CppDetectorApi):
    @element
    def udp_srcmac2(self):
        """
-        [Jungfrau][Moench][Gotthard2] Mac address of the receiver (source) udp interface 2. 
+        [Jungfrau][Gotthard2] Mac address of the receiver (source) udp interface 2. 
        
        Note
        ----
-        [Jungfrau][Moench] bottom half \n
+        [Jungfrau] bottom half \n
        [Gotthard2] veto debugging \n
        To set MACs for individual modules, use setSourceUDPMAC2. 
        
@ -1448,11 +1449,11 @@ class Detector(CppDetectorApi):
    @element
    def udp_srcip2(self):
        """
-        [Jungfrau][Moench][Gotthard2] Ip address of the detector (source) udp interface 2. 
+        [Jungfrau][Gotthard2] Ip address of the detector (source) udp interface 2. 
        
        Note
        -----
-        [Jungfrau][Moench] bottom half \n
+        [Jungfrau] bottom half \n
        [Gotthard2] veto debugging \n
        Must be same subnet as destination udp ip2.\n
        To set IPs for individual modules, use setSourceUDPIP2. 
@ -1498,7 +1499,7 @@ class Detector(CppDetectorApi):
        ----
        Default is 50002. \n
        [Eiger] right half \n
-        [Jungfrau][Moench] bottom half \n
+        [Jungfrau] bottom half \n
        [Gotthard2] veto debugging \n
        Ports for each module is calculated (incremented by 2) \n
        To set ports for individual modules, use setDestinationUDPPort2.
@ -1518,7 +1519,7 @@ class Detector(CppDetectorApi):
        -----
        [Gotthard] 0, 90, 110, 120, 150, 180, 200 \n
        [Eiger][Mythen3][Gotthard2] 0 - 200 \n
-        [Jungfrau][Moench][Ctb] 0, 60 - 200
+        [Jungfrau][Ctb][Moench] 0, 60 - 200
        """
        return self.getHighVoltage()

@ -1641,8 +1642,8 @@ class Detector(CppDetectorApi):
    @element
    def master(self):
        """
-        [Eiger][Gotthard2][Jungfrau][Moench] Sets (half) module to master and other(s) to slaves.\n
-        [Gotthard][Gotthard2][Mythen3][Eiger][Jungfrau][Moench] Gets if the current (half) module is master.
+        [Eiger][Gotthard2][Jungfrau] Sets (half) module to master and other(s) to slaves.\n
+        [Gotthard][Gotthard2][Mythen3][Eiger][Jungfrau] Gets if the current (half) module is master.
        """
        return self.getMaster()

@ -1654,7 +1655,7 @@ class Detector(CppDetectorApi):
    @element
    def sync(self):
        """
-        [Jungfrau][Moench] Enables or disables synchronization between modules.
+        [Jungfrau] Enables or disables synchronization between modules.
        """
        return self.getSynchronization()

@ -1808,7 +1809,7 @@ class Detector(CppDetectorApi):

    @property
    def adcreg(self):
-        """[Jungfrau][Moench][Ctb][Gotthard] Writes to an adc register 
+        """[Jungfrau][Ctb][Moench][Gotthard] Writes to an adc register 

        Note
        -----
@ -1821,7 +1822,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def adcinvert(self):
-        """[Ctb][Jungfrau][Moench] ADC Inversion Mask.
+        """[Ctb][Moench][Jungfrau] ADC Inversion Mask.
        
        Note
        -----
@ -1837,7 +1838,7 @@ class Detector(CppDetectorApi):
    @element
    def triggersl(self):
        """
-        [Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB] Number of triggers left in acquisition.\n
+        [Gotthard][Jungfrau][Mythen3][Gotthard2][CTB][Moench] Number of triggers left in acquisition.\n
        
        Note
        ----
@ -1850,7 +1851,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def frametime(self):
-        """[Jungfrau][Moench][Mythen3][Gotthard2][CTB] Timestamp at a frame start.
+        """[Jungfrau][Mythen3][Gotthard2][Moench][CTB] Timestamp at a frame start.
        
        Note
        ----
@ -1891,22 +1892,14 @@ class Detector(CppDetectorApi):
    def versions(self):
        version_list = {'type': self.type,
                'package': self.packageversion, 
-                'client': self.clientversion}
-                
-        if self.type == detectorType.EIGER:
-            version_list ['firmware (Beb)'] = self.firmwareversion
-            version_list ['firmware(Febl)'] = self.getFrontEndFirmwareVersion(slsDetectorDefs.fpgaPosition.FRONT_LEFT)
-            version_list ['firmware (Febr)'] = self.getFrontEndFirmwareVersion(slsDetectorDefs.fpgaPosition.FRONT_RIGHT)
-        else:
-            version_list ['firmware'] = self.firmwareversion
-
-        version_list ['detectorserver'] = self.detectorserverversion
-        version_list ['kernel'] = self.kernelversion
-        version_list ['hardware'] = self.hardwareversion
-
+                'client': self.clientversion,
+                'firmware': self.firmwareversion,
+                'detectorserver': self.detectorserverversion,
+                'kernel': self.kernelversion}
+        if self.type != detectorType.EIGER:
+            version_list ['hardware'] = self.hardwareversion
        if self.use_receiver:
            version_list ['receiver'] = self.rx_version
-
        return version_list

    @property
@ -1974,10 +1967,10 @@ class Detector(CppDetectorApi):
        
        Note
        -----
-        [Jungfrau][Moench] FULL_SPEED, HALF_SPEED (Default), QUARTER_SPEED
+        [Jungfrau] FULL_SPEED, HALF_SPEED (Default), QUARTER_SPEED
        [Eiger] FULL_SPEED (Default), HALF_SPEED, QUARTER_SPEED
        [Gottthard2] G2_108MHZ (Default), G2_144MHZ
-        [Jungfrau][Moench] FULL_SPEED option only available from v2.0 boards and is recommended to set number of interfaces to 2.  \n
+        [Jungfrau] FULL_SPEED option only available from v2.0 boards and is recommended to set number of interfaces to 2.  \n
        Also overwrites adcphase to recommended default.
        """
        return element_if_equal(self.getReadoutSpeed())
@ -2063,7 +2056,7 @@ class Detector(CppDetectorApi):
        Note
        -----
        Default: AUTO_TIMING \n
-        [Jungfrau][Moench][Gotthard][Ctb][Gotthard2] AUTO_TIMING, TRIGGER_EXPOSURE \n
+        [Jungfrau][Gotthard][Ctb][Moench][Gotthard2] AUTO_TIMING, TRIGGER_EXPOSURE \n
        [Mythen3] AUTO_TIMING, TRIGGER_EXPOSURE, GATED, TRIGGER_GATED \n
        [Eiger] AUTO_TIMING, TRIGGER_EXPOSURE, GATED, BURST_TRIGGER
        """
@ -2222,13 +2215,13 @@ class Detector(CppDetectorApi):
    def readnrows(self):
        """
        [Eiger] Number of rows to read out per half module starting from the centre.
-        [Jungfrau][Moench] Number of rows to read per module starting from the centre.
+        [Jungfrau] Number of rows to read per module starting from the centre.
        
        Note
        ----
        [Eiger] Options: 1 - 256. 256 is default. \n
        [Eiger]The permissible values depend on dynamic range and 10Gbe enabled.\n\n
-        [Jungfrau][Moench] Options: 8 - 512 (multiples of 8)
+        [Jungfrau] Options: 8 - 512 (multiples of 8)
        """
        return self.getReadNRows()

@ -2319,7 +2312,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def tengiga(self):
-        """[Eiger][Ctb][Mythen3] 10GbE Enable."""
+        """[Eiger][Ctb][Moench][Mythen3] 10GbE Enable."""
        return self.getTenGiga()

    @tengiga.setter
@ -2339,7 +2332,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def flowcontrol10g(self):
-        """[Eiger][Jungfrau][Moench] Enable or disable 10GbE Flow Control."""
+        """[Eiger][Jungfrau] Enable or disable 10GbE Flow Control."""
        return self.getTenGigaFlowControl()

    @flowcontrol10g.setter
@ -2359,7 +2352,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def gappixels(self):
-        """[Eiger][Jungfrau][Moench] Include Gap pixels in client data call back in Detecor api. Will not be in detector streaming, receiver file or streaming. Default is disabled. """
+        """[Eiger][Jungfrau] Include Gap pixels in client data call back in Detecor api. Will not be in detector streaming, receiver file or streaming. Default is disabled. """
        return self.getRxAddGapPixels()

    @gappixels.setter
@ -2415,7 +2408,7 @@ class Detector(CppDetectorApi):
    @element
    def chipversion(self):
        """
-        [Jungfrau][Moench] Chip version of module. Can be 1.0 or 1.1.
+        [Jungfrau] Chip version of module. Can be 1.0 or 1.1.

        Example
        -------
@ -2428,7 +2421,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def autocompdisable(self):
-        """[Jungfrau][Moench] Enable or disable auto comparator disable mode. 
+        """[Jungfrau] Enable or disable auto comparator disable mode. 

        Note
        -----
@ -2444,7 +2437,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def compdisabletime(self):
-        """[Jungfrau][Moench] Time before end of exposure when comparator is disabled. 
+        """[Jungfrau] Time before end of exposure when comparator is disabled. 

        Note
        -----
@ -2490,7 +2483,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def runtime(self):
-        """[Jungfrau][Moench][Mythen3][Gotthard2][CTB] Time from detector start up.
+        """[Jungfrau][Mythen3][Gotthard2][Moench][CTB] Time from detector start up.
        
        Note
        -----
@ -2583,7 +2576,7 @@ class Detector(CppDetectorApi):
    @element
    def temp_threshold(self):
        """
-        [Jungfrau][Moench] Threshold temperature in degrees. 
+        [Jungfrau] Threshold temperature in degrees. 
        
        Note
        -----
@ -2600,7 +2593,7 @@ class Detector(CppDetectorApi):
    @element
    def temp_event(self):
        """
-        [Jungfrau][Moench] 1, if a temperature event occured. \n
+        [Jungfrau] 1, if a temperature event occured. \n
        
        Note
        ----
@ -2628,7 +2621,7 @@ class Detector(CppDetectorApi):
    @element
    def temp_control(self):
        """
-        [Jungfrau][Moench] Temperature control enable. 
+        [Jungfrau] Temperature control enable. 
        
        Note
        -----
@ -2645,7 +2638,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def selinterface(self):
-        """[Jungfrau][Moench] The udp interface to stream data from detector. 
+        """[Jungfrau] The udp interface to stream data from detector. 
        
        Note
        -----
@ -2665,11 +2658,11 @@ class Detector(CppDetectorApi):
    @property
    def gainmode(self):
        """
-        [Jungfrau][Moench] Detector gain mode. Enum: gainMode
+        [Jungfrau] Detector gain mode. Enum: gainMode
        
        Note
        -----
-        [Jungfrau][Moench] DYNAMIC, FORCE_SWITCH_G1, FORCE_SWITCH_G2, FIX_G1, FIX_G2, FIX_G0 \n
+        [Jungfrau] DYNAMIC, FORCE_SWITCH_G1, FORCE_SWITCH_G2, FIX_G1, FIX_G2, FIX_G0 \n
        CAUTION: Do not use FIX_G0 without caution, you can damage the detector!!!
        """
        return element_if_equal(self.getGainMode())
@ -2724,14 +2717,14 @@ class Detector(CppDetectorApi):
    @element
    def filterresistor(self):
        """
-        [Gotthard2][Jungfrau][Moench] Set filter resistor. Increasing values for increasing "
+        [Gotthard2][Jungfrau] Set filter resistor. Increasing values for increasing "
        "resistance.
        
        Note
        ----
        Advanced user command.
        [Gotthard2] Default is 0. Options: 0-3.
-        [Jungfrau][Moench] Default is 1. Options: 0-1.
+        [Jungfrau] Default is 1. Options: 0-1.
        """
        return self.getFilterResistor()

@ -2743,11 +2736,11 @@ class Detector(CppDetectorApi):
    @element
    def filtercells(self):
        """
-        [Jungfrau][Moench] Set filter capacitor. 
+        [Jungfrau] Set filter capacitor. 
        
        Note
        ----
-        [Jungfrau][Moench] Options: 0-12. Default: 0. Advanced user command. Only for chipv1.1.
+        [Jungfrau] Options: 0-12. Default: 0. Advanced user command. Only for chipv1.1.
        """
        return self.getNumberOfFilterCells()

@ -3083,7 +3076,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def adcenable(self):
-        """[Ctb] ADC Enable Mask for 1Gb. Enable for each 32 ADC channel."""
+        """[Ctb][Moench] ADC Enable Mask for 1Gb. Enable for each 32 ADC channel."""
        return self.getADCEnableMask()

    @adcenable.setter
@ -3093,7 +3086,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def adcenable10g(self):
-        """[Ctb] ADC Enable Mask for 10Gb mode for each 32 ADC channel. 
+        """[Ctb][Moench] ADC Enable Mask for 10Gb mode for each 32 ADC channel. 

        Note
        -----
@ -3110,6 +3103,7 @@ class Detector(CppDetectorApi):
    def samples(self):
        """
        [CTB] Number of samples (both analog and digitial) expected. \n
+        [Moench] Number of samples (analog only)
        """
        return self.getNumberOfAnalogSamples()

@ -3120,7 +3114,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def runclk(self):
-        """[Ctb] Run clock in MHz."""
+        """[Ctb][Moench] Run clock in MHz."""
        return self.getRUNClock()

    @runclk.setter
@ -3153,7 +3147,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def asamples(self):
-        """[Ctb] Number of analog samples expected. """
+        """[Ctb][Moench] Number of analog samples expected. """
        return element_if_equal(self.getNumberOfAnalogSamples())

    @asamples.setter
@ -3173,7 +3167,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def dbitphase(self):
-        """[Ctb][Jungfrau][Moench] Phase shift of clock to latch digital bits. Absolute phase shift.
+        """[Ctb][Jungfrau] Phase shift of clock to latch digital bits. Absolute phase shift.

        Note
        -----
@ -3225,7 +3219,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def maxdbitphaseshift(self):
-        """[CTB][Jungfrau][Moench] Absolute maximum Phase shift of of the clock to latch digital bits.
+        """[CTB][Jungfrau] Absolute maximum Phase shift of of the clock to latch digital bits.
        
        Note
        -----
@ -3272,7 +3266,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def maxadcphaseshift(self):
-        """[Jungfrau][Moench][CTB] Absolute maximum Phase shift of ADC clock.
+        """[Jungfrau][CTB][Moench] Absolute maximum Phase shift of ADC clock.
        
        Note
        -----
@ -3284,12 +3278,12 @@ class Detector(CppDetectorApi):
    @property
    @element
    def adcphase(self):
-        """[Gotthard][Jungfrau][Moench][CTB] Sets phase shift of ADC clock. 
+        """[Gotthard][Jungfrau][CTB][Moench] Sets phase shift of ADC clock. 

        Note
        -----
-        [Jungfrau][Moench] Absolute phase shift. Changing Speed also resets adcphase to recommended defaults.\n
-        [Ctb] Absolute phase shift. Changing adcclk also resets adcphase and sets it to previous values.\n
+        [Jungfrau] Absolute phase shift. Changing Speed also resets adcphase to recommended defaults.\n
+        [Ctb][Moench] Absolute phase shift. Changing adcclk also resets adcphase and sets it to previous values.\n
        [Gotthard] Relative phase shift.

        :getter: Not implemented for Gotthard
@ -3303,7 +3297,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def adcpipeline(self):
-        """[Ctb] Sets pipeline for ADC clock. """
+        """[Ctb][Moench] Sets pipeline for ADC clock. """
        return self.getADCPipeline()

    @adcpipeline.setter
@ -3313,7 +3307,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def adcclk(self):
-        """[Ctb] Sets ADC clock frequency in MHz. """
+        """[Ctb][Moench] Sets ADC clock frequency in MHz. """
        return self.getADCClock()

    @adcclk.setter
@ -3324,7 +3318,7 @@ class Detector(CppDetectorApi):
    @element
    def syncclk(self):
        """
-        [Ctb] Sync clock in MHz.
+        [Ctb][Moench] Sync clock in MHz.
        
        Note
        -----
@ -3335,7 +3329,7 @@ class Detector(CppDetectorApi):

    @property
    def pattern(self):
-        """[Mythen3][Ctb] Loads ASCII pattern file directly to server (instead of executing line by line).
+        """[Mythen3][Moench][Ctb] Loads ASCII pattern file directly to server (instead of executing line by line).
        
        Note
        ----
@ -3357,7 +3351,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def patioctrl(self):
-        """[Ctb] 64 bit mask defining input (0) and output (1) signals.
+        """[Ctb][Moench] 64 bit mask defining input (0) and output (1) signals.
        
        Example
        --------
@ -3374,7 +3368,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def patlimits(self):
-        """[Ctb][Mythen3] Limits (start and stop address) of complete pattern.
+        """[Ctb][Moench][Mythen3] Limits (start and stop address) of complete pattern.
        
        Example
        ---------
@ -3394,7 +3388,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def patsetbit(self):
-        """[Ctb][Mythen3] Sets the mask applied to every pattern to the selected bits. 
+        """[Ctb][Moench][Mythen3] Sets the mask applied to every pattern to the selected bits. 
        
        Example
        --------
@ -3411,7 +3405,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def patmask(self):
-        """[Ctb][Mythen3] Selects the bits that will have a pattern mask applied to the selected patmask for every pattern.
+        """[Ctb][Moench][Mythen3] Selects the bits that will have a pattern mask applied to the selected patmask for every pattern.
        
        Example
        --------
@ -3429,7 +3423,7 @@ class Detector(CppDetectorApi):
    # @element
    def patwait(self):
        """
-        [Ctb][Mythen3] Wait address of loop level provided.
+        [Ctb][Moench][Mythen3] Wait address of loop level provided.
        
        Example
        -------
@ -3446,7 +3440,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def patwait0(self):
-        """[Ctb][Mythen3] Wait 0 address.
+        """[Ctb][Moench][Mythen3] Wait 0 address.
                
        Example
        --------
@ -3466,7 +3460,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def patwait1(self):
-        """[Ctb][Mythen3] Wait 1 address.
+        """[Ctb][Moench][Mythen3] Wait 1 address.
                
        Example
        --------
@ -3486,7 +3480,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def patwait2(self):
-        """[Ctb][Mythen3] Wait 2 address.
+        """[Ctb][Moench][Mythen3] Wait 2 address.
                
        Example
        --------
@ -3506,7 +3500,7 @@ class Detector(CppDetectorApi):
    @property
    def patwaittime(self):
        """
-        [Ctb][Mythen3] Wait time in clock cycles of loop level provided.
+        [Ctb][Moench][Mythen3] Wait time in clock cycles of loop level provided.
        
        Example
        -------
@ -3523,7 +3517,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def patwaittime0(self):
-        """[Ctb][Mythen3] Wait 0 time in clock cycles."""
+        """[Ctb][Moench][Mythen3] Wait 0 time in clock cycles."""
        return self.getPatternWaitTime(0)

    @patwaittime0.setter
@ -3534,7 +3528,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def patwaittime1(self):
-        """[Ctb][Mythen3] Wait 1 time in clock cycles."""
+        """[Ctb][Moench][Mythen3] Wait 1 time in clock cycles."""
        return self.getPatternWaitTime(1)

    @patwaittime1.setter
@ -3545,7 +3539,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def patwaittime2(self):
-        """[Ctb][Mythen3] Wait 2 time in clock cycles."""
+        """[Ctb][Moench][Mythen3] Wait 2 time in clock cycles."""
        return self.getPatternWaitTime(2)

    @patwaittime2.setter
@ -3557,7 +3551,7 @@ class Detector(CppDetectorApi):
    @property
    def patloop(self):
        """
-        [Ctb][Mythen3] Limits (start and stop address) of the loop provided.
+        [Ctb][Moench][Mythen3] Limits (start and stop address) of the loop provided.
        
        Example
        -------
@ -3574,7 +3568,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def patloop0(self):
-        """[Ctb][Mythen3] Limits (start and stop address) of loop 0.
+        """[Ctb][Moench][Mythen3] Limits (start and stop address) of loop 0.
        
        Example
        ---------
@ -3594,7 +3588,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def patloop1(self):
-        """[Ctb][Mythen3] Limits (start and stop address) of loop 1.
+        """[Ctb][Moench][Mythen3] Limits (start and stop address) of loop 1.
        
        Example
        ---------
@ -3615,7 +3609,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def patloop2(self):
-        """[Ctb][Mythen3] Limits (start and stop address) of loop 2.
+        """[Ctb][Moench][Mythen3] Limits (start and stop address) of loop 2.
        
        Example
        ---------
@ -3637,7 +3631,7 @@ class Detector(CppDetectorApi):
    @property
    def patnloop(self):
        """
-        [Ctb][Mythen3] Number of cycles of the loop provided.
+        [Ctb][Moench][Mythen3] Number of cycles of the loop provided.
        
        Example
        -------
@ -3654,7 +3648,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def patnloop0(self):
-        """[Ctb][Mythen3] Number of cycles of loop 0."""
+        """[Ctb][Moench][Mythen3] Number of cycles of loop 0."""
        return self.getPatternLoopCycles(0)

    @patnloop0.setter
@ -3665,7 +3659,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def patnloop1(self):
-        """[Ctb][Mythen3] Number of cycles of loop 1."""
+        """[Ctb][Moench][Mythen3] Number of cycles of loop 1."""
        return self.getPatternLoopCycles(1)

    @patnloop1.setter
@ -3676,7 +3670,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def patnloop2(self):
-        """[Ctb][Mythen3] Number of cycles of loop 2."""
+        """[Ctb][Moench][Mythen3] Number of cycles of loop 2."""
        return self.getPatternLoopCycles(2)

    @patnloop2.setter
@ -3747,7 +3741,7 @@ class Detector(CppDetectorApi):
    @property
    @element
    def v_limit(self):
-        """[Ctb] Soft limit for power supplies (ctb only) and DACS in mV."""
+        """[Ctb][Moench] Soft limit for power supplies (ctb only) and DACS in mV."""
        return self.getDAC(dacIndex.V_LIMIT, True)

    @v_limit.setter
--- a/python/src/detector.cpp
+++ b/python/src/detector.cpp
@ -61,11 +61,6 @@ void init_det(py::module &m) {
                       (Result<int64_t>(Detector::*)(sls::Positions) const) &
                           Detector::getFirmwareVersion,
                       py::arg() = Positions{});
-    CppDetectorApi.def("getFrontEndFirmwareVersion",
-                       (Result<int64_t>(Detector::*)(const defs::fpgaPosition,
-                                                     sls::Positions) const) &
-                           Detector::getFrontEndFirmwareVersion,
-                       py::arg(), py::arg() = Positions{});
    CppDetectorApi.def(
        "getDetectorServerVersion",
        (Result<std::string>(Detector::*)(sls::Positions) const) &
--- a/python/src/enums.cpp
+++ b/python/src/enums.cpp
@ -286,11 +286,6 @@ void init_enums(py::module &m) {
        .value("BOTTOM", slsDetectorDefs::portPosition::BOTTOM)
        .export_values();

-    py::enum_<slsDetectorDefs::fpgaPosition>(Defs, "fpgaPosition")
-        .value("FRONT_LEFT", slsDetectorDefs::fpgaPosition::FRONT_LEFT)
-        .value("FRONT_RIGHT", slsDetectorDefs::fpgaPosition::FRONT_RIGHT)
-        .export_values();
-
    py::enum_<slsDetectorDefs::streamingInterface>(Defs, "streamingInterface",
                                                   py::arithmetic())
        .value("NONE", slsDetectorDefs::streamingInterface::NONE)
--- a/serverBin/ctbDetectorServer_developer
+++ b/serverBin/ctbDetectorServer_developer
@ -1 +0,0 @@
-../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
--- a/serverBin/eigerDetectorServer_developer
+++ b/serverBin/eigerDetectorServer_developer
@ -1 +0,0 @@
-../slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
--- a/serverBin/gotthard2DetectorServer_developer
+++ b/serverBin/gotthard2DetectorServer_developer
@ -1 +0,0 @@
-../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
--- a/serverBin/gotthardDetectorServer_developer
+++ b/serverBin/gotthardDetectorServer_developer
@ -1 +0,0 @@
-../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
--- a/serverBin/jungfrauDetectorServer_developer
+++ b/serverBin/jungfrauDetectorServer_developer
@ -1 +0,0 @@
-../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
--- a/serverBin/jungfrauDetectorServerv7.0.0
+++ b/serverBin/jungfrauDetectorServerv7.0.0
@ -1 +0,0 @@
-../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0
--- a/serverBin/jungfrauDetectorServerv7.0.2
+++ b/serverBin/jungfrauDetectorServerv7.0.2
@ -0,0 +1 @@
+../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.2
--- a/serverBin/moenchDetectorServer_developer
+++ b/serverBin/moenchDetectorServer_developer
@ -1 +0,0 @@
-../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
--- a/serverBin/mythen3DetectorServer_developer
+++ b/serverBin/mythen3DetectorServer_developer
@ -1 +0,0 @@
-../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
--- a/slsDetectorCalibration/analogDetector.h
+++ b/slsDetectorCalibration/analogDetector.h
@ -1097,9 +1097,6 @@ template <class dataType> class analogDetector {
        return thr;
    };

-    virtual int setClusterSize(int n = -1) { 
-    };
-
    /**
       gets threshold value for conversion into number of photons
       \returns threshold value
--- a/slsDetectorCalibration/dataStructures/jungfrauLGADStrixelsData.h
+++ b/slsDetectorCalibration/dataStructures/jungfrauLGADStrixelsData.h
@ -2,11 +2,7 @@
 // Copyright (C) 2021 Contributors to the SLS Detector Package
 #ifndef JUNGFRAULGADSTRIXELDATA_H
 #define JUNGFRAULGADSTRIXELDATA_H
-#ifdef CINT
-#include "sls/sls_detector_defs_CINT.h"
-#else
 #include "sls/sls_detector_defs.h"
-#endif
 #include "slsDetectorData.h"

 /*
@ -36,7 +32,7 @@ typedef struct {
    uint64_t bunchNumber; /**< is the frame number */
    uint64_t pre;         /**< something */

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


 using namespace std;    
@ -45,11 +41,7 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
  private:
    int iframe;

-#ifdef ALDO //VH
-    using header = jf_header; //VH
-#else //VH
    using header = sls::defs::sls_receiver_header;
-#endif //VH
  public:
    /**
       Implements the slsReceiverData structure for the moench02 prototype read
@ -61,9 +53,6 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
        : slsDetectorData<uint16_t>(1024/5, 512*5,
                                    512 * 1024 * 2 + sizeof(header)) {
      cout << "aaa" << endl;
-#ifdef ALDO //VH
-      cout<< "using reduced jf_header" << endl; //VH
-#endif //VH
        for (int ix = 0; ix < 1024/5; ix++) {
            for (int iy = 0; iy < 512*5; iy++) {
 	      dataMap[iy][ix] = sizeof(header);//+ ( 1024 * 5 + 300) * 2; //somewhere on the guardring of the LGAD
@ -72,51 +61,44 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
 #endif
            }
        }
-
-	//chip1
-	/*
-	 * TL;DR comments: y0 is too high by 1, group 1 and group 2 are by one row too short
-	 * group34 by 2 rows, x is by one column too short
-	 * NOTE: If x0, x1, y0 are changed, likely also ox (and oy and ooy) will be affected!
-	 */
-
-	cout << "G0" << endl; //chip coordinates of chip1 group1: x=255+10 to x=255+246, y=10 to y=64
-	//9 pixels guard ring, bonding shift by one pixel in y, one square pixel in x on the left
-
-	int x0=256+10, x1=256+246; //excludes first column (in chip coordinates)
-	int y0=10, y1=256-10; //y1 does nothing
+	int x0=256+10, x1=256+246;
+	int y0=10, y1=256-10;
 	int ix,iy;
 	int ox=0, oy=0, ooy=0;
 	ox=0;
+	cout << "G0" << endl;
+
+	//chip1
+
 	for (int ipx=x0; ipx<x1; ipx++) {
-	  for (int ipy=y0; ipy<y0+54; ipy++) { //y0+54 excludes the last row (in chip coordinates), should be y0+55 to include all rows
+	  for (int ipy=y0; ipy<y0+54; ipy++) {
 	    ix=(ipx-x0+ox)/3;
 	    iy=(ipx-x0+ox)%3+(ipy-y0+oy)*3+ooy;
 	    dataMap[iy][ix] = sizeof(header) + (1024 * ipy + ipx) * 2;
-	     //  cout << ipx << " " << ipy << " " << ix << " " << iy << endl;
+	    
+	    //  cout << ipx << " " << ipy << " " << ix << " " << iy << endl;
+
+
 	  }
 	}
-
-	cout << "G1" << endl; //chip coordinates of chip1 group2: x=255+12 to x=255+246, y=65 to y=128
-	//3 square pixels in x on the left
+	cout << "G1" << endl;
 	oy=-54;
 	ooy=54*3;
 	ox=3;
 	for (int ipx=x0; ipx<x1; ipx++) {
-	  for (int ipy=y0+54; ipy<y0+64+54; ipy++) { //I think y0+54 catches the last row of group1! Should be y0+55 if we want to include all rows? And y0+55+64
+	  for (int ipy=y0+54; ipy<y0+64+54; ipy++) {
 	    ix=(ipx-x0+ox)/5;
 	    iy=(ipx-x0+ox)%5+(ipy-y0+oy)*5+ooy;
 	    dataMap[iy][ix] = sizeof(header) + (1024 * ipy + ipx) * 2;
 	  }
 	}
 	
-	cout << "G2" << endl; //chip coordinates of chip1 group34: x=255+11 to x=255+246, y=129 to y=247
-	//2 square pixels on the left
+	cout << "G2" << endl;
 	oy=-54-64;
 	ooy=54*3+64*5;	
 	ox=3;
 	for (int ipx=x0; ipx<x1; ipx++) {
-	  for (int ipy=y0+64+54; ipy<y0+64*2+54*2; ipy++) { //Same as above, I think it should be y0+55+64 and y0+55*2+64*2 to include all rows
+	  for (int ipy=y0+64+54; ipy<y0+64*2+54*2; ipy++) {
 	    ix=(ipx-x0+ox)/4;
 	    iy=(ipx-x0+ox)%4+(ipy-y0+oy)*4+ooy;
 	    dataMap[iy][ix] = sizeof(header) + (1024 * ipy + ipx) * 2;
@ -124,50 +106,43 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
 	}
 	
 	//chip 6
-	/*
-	 * TL;DR comments: y0 is too high by 3, group34 and group 1 are by one row too short
-	 * x is by two columns too short
-	 * NOTE: If x0, x1, y0 are changed, likely also ox (and oy and ooy) will be affected!
-	 */

-	cout << "G0" << endl; //chip coordinates of chip6 group34: x=255+256+9 to x=255+256+244, y=255+8 to y=255+126
-	//9 pixels guard ring, bonding shift by one pixel in -y, 2 square pixels in x on the right
 	x0=256*2+10;
 	y0=256+10;
 	x1=256*2+246;
 	ooy=256*5;
 	oy=0;
 	ox=1;
+	cout << "G0" << endl;
 	for (int ipx=x0; ipx<x1; ipx++) {
-	  for (int ipy=y0; ipy<y0+54+64; ipy++) { //shifted by 3 rows because of y0, if y0 is corrected it should be y0+55+64 to include all rows
+	  for (int ipy=y0; ipy<y0+54+64; ipy++) {
 	    ix=(ipx-x0+ox)/4;
 	    iy=(ipx-x0+ox)%4+(ipy-y0+oy)*4+ooy;
 	    dataMap[iy][ix] = sizeof(header) + (1024 * ipy + ipx) * 2;
-	    //if (ipx==x0)
-	    //  cout << ipx << " " << ipy << " " << ix << " " << iy << endl;
+	    if (ipx==x0)
+	      cout << ipx << " " << ipy << " " << ix << " " << iy << endl;
+
+
 	  }
 	}
-
-	cout << "G1" << endl; //chip coordinates of chip6 group2: x=255+256+9 to x=255+256+243, y=255+127 to y=255+190
-	//3 square pixels in x on the right
+	cout << "G1" << endl;
 	oy=-54-64;
 	ooy+=(54+64)*4;
 	ox=1;
 	for (int ipx=x0; ipx<x1; ipx++) {
-	  for (int ipy=y0+54+64; ipy<y0+64*2+54; ipy++) { //shifted by 3 rows because of y0, if y0 is corrected it should be y0+55+64 and y0+55+64*2 to include all rows
+	  for (int ipy=y0+54+64; ipy<y0+64*2+54; ipy++) {
 	    ix=(ipx-x0+ox)/5;
 	    iy=(ipx-x0+ox)%5+(ipy-y0+oy)*5+ooy;
 	    dataMap[iy][ix] = sizeof(header) + (1024 * ipy + ipx) * 2;
 	  }
 	}
 	
-	cout << "G2" << endl; //chip coordinates of chip6 group1: x=255+256+9 to x=255+256+245, y=255+191 to y=255+245
-	//one square pixel in x on the right
+	cout << "G2" << endl;
 	oy=-54-64*2;
 	ooy+=64*5;	
 	ox=1;
 	for (int ipx=x0; ipx<x1; ipx++) {
-	  for (int ipy=y0+64*2+54; ipy<y0+64*2+54*2; ipy++) { //shifted by 3 rows because of y0, if y0 is corrected it should be y0+55+64*2 and y0+55*2+64*2
+	  for (int ipy=y0+64*2+54; ipy<y0+64*2+54*2; ipy++) {
 	    ix=(ipx-x0+ox)/3;
 	    iy=(ipx-x0+ox)%3+(ipy-y0+oy)*3+ooy;
 	    dataMap[iy][ix] = sizeof(header) + (1024 * ipy + ipx) * 2;
@ -231,11 +206,7 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {


    int getFrameNumber(char *buff) {
-#ifdef ALDO //VH
-      return ((header *)buff)->bunchNumber; //VH
-#else //VH
-      return ((header *)buff)->detHeader.frameNumber;
-#endif //VH
+        return ((header *)buff)->detHeader.frameNumber;
    };

    /**
@ -248,11 +219,7 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {

    */
    int getPacketNumber(char *buff) {
-#ifdef ALDO //VH
-      return -1; //VH //TODO: Keep in mind in case of bugs!
-#else //VH
-      return ((header *)buff)->detHeader.packetNumber;
-#endif //VH
+        return ((header *)buff)->detHeader.packetNumber;
    };

   
@ -298,6 +265,8 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
        return NULL;
    };

+    /*  /**
+
    /*    Loops over a memory slot until a complete frame is found (i.e. all */
    /*    packets 0 to nPackets, same frame number). purely virtual func \param */
    /*    data pointer to the memory to be analyzed \param ndata reference to the */
--- a/slsDetectorCalibration/dataStructures/jungfrauLGADStrixelsDataSingleChip.h
+++ b/slsDetectorCalibration/dataStructures/jungfrauLGADStrixelsDataSingleChip.h
@ -1,305 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-or-other
-// Copyright (C) 2021 Contributors to the SLS Detector Package
-#ifndef JUNGFRAULGADSTRIXELSDATASINGLECHIP_H
-#define JUNGFRAULGADSTRIXELSDATASINGLECHIP_H
-#ifdef CINT
-#include "sls/sls_detector_defs_CINT.h"
-#else
-#include "sls/sls_detector_defs.h"
-#endif
-#include "slsDetectorData.h"
-
-/*
-/afs/psi.ch/project/mythen/Anna/slsDetectorPackageDeveloperMpc2011/slsDetectorCalibration/jungfrauExecutables 
-make -f Makefile.rawdataprocess jungfrauRawDataProcessStrx
- ../dataStructures/jungfrauLGADStrixelsData.h
-*/
-//#define VERSION_V2
-/**
-    @short  structure for a Detector Packet or Image Header
-    @li frameNumber is the frame number
-    @li expLength is the subframe number (32 bit eiger) or real time exposure
-   time in 100ns (others)
-    @li packetNumber is the packet number
-    @li bunchId is the bunch id from beamline
-    @li timestamp is the time stamp with 10 MHz clock
-    @li modId is the unique module id (unique even for left, right, top, bottom)
-    @li xCoord is the x coordinate in the complete detector system
-    @li yCoord is the y coordinate in the complete detector system
-    @li zCoord is the z coordinate in the complete detector system
-    @li debug is for debugging purposes
-    @li roundRNumber is the round robin set number
-    @li detType is the detector type see :: detectorType
-    @li version is the version number of this structure format
-*/
-
-namespace strixelSingleChip {
-  constexpr int nc_chip = 256;
-  constexpr int nr_chip = 256;
-  constexpr int gr = 9;
-
-  //Group 1: 25um pitch, groups of 3, 1 column of square pixels
-  constexpr int g1_ncols{ (nc_chip-(2*gr)-1)/3 }; //79
-  constexpr int g1_nrows{ ( (nr_chip/4)-gr )*3 }; //165
-  
-  //Group 2: 15um pitch, groups of 5, 3 columns of square pixels
-  constexpr int g2_ncols{ (nc_chip-(2*gr)-3)/5 }; //47
-  constexpr int g2_nrows{ (nr_chip/4)*5 }; //320
-  
-  //Group 3: 18.75um pitch, groups of 4, 2 columns of square pixels (double the size of the other groups)
-  constexpr int g3_ncols{ (nc_chip-(2*gr)-2)/4 }; //59
-  constexpr int g3_nrows{ ( ((nr_chip/4)*2)-gr )*4 }; //476
-
-  constexpr int nc_strixel = 2*gr + 1 + g1_ncols; //group 1 is the "longest" group in x and has one extra square pixel
-  constexpr int nr_strixel = 2*gr + g1_nrows + g2_nrows + g3_nrows;
-}
-
-typedef struct {
-    uint64_t bunchNumber; /**< is the frame number */
-    uint64_t pre;         /**< something */
-
-} jf_header; //Aldo's header
-
-
-using namespace strixelSingleChip;    
-class jungfrauLGADStrixelsDataSingleChip : public slsDetectorData<uint16_t> {
-
-  private:
-    int iframe;
-    int mchip;
-
-    void remapGroup( const int group ) {
-      int ix, iy;
-      int x0, y0, x1, y1, shifty;
-      int multiplicator;
-
-      switch (group) {
-      default:
-      case 1:
-	multiplicator = 3;
-	break;
-      case 2:
-	multiplicator = 5;
-	break;
-      case 3:
-	multiplicator = 4;
-	break;
-      }
-
-      if ( mchip == 1 ) {
-	switch (group) {
-	default:
-	case 1:
-	  x0 = 10;
-	  x1 = 247;
-	  y0 = 10;
-	  y1 = 65;
-	  shifty = 0;
-	  break;
-	case 2:
-	  x0 = 12;
-	  x1 = 247;
-	  y0 = 65;
-	  y1 = 129;
-	  shifty = ( (nr_chip/4)-gr )*3;
-	  break;
-	case 3:
-	  x0 = 11;
-	  x1 = 247;
-	  y0 = 129;
-	  y1 = 248;
-	  shifty = ( (nr_chip/4)-gr )*3 + (nr_chip/4)*5;
-	  break;
-	}
-      }
-
-      if ( mchip == 6 ) {
-	switch (group) {
-	default:
-	case 1:
-	  x0 = 9;
-	  x1 = 246;
-	  y0 = 191;
-	  y1 = 246;
-	  shifty = ( (nr_chip/4)-gr+(nr_chip/4) )*4 + (nr_chip/4)*5;
-	  break;
-	case 2:
-	  x0 = 9;
-	  x1 = 244;
-	  y0 = 127;
-	  y1 = 191;
-	  shifty = ( (nr_chip/4)-gr+(nr_chip/4) )*4;
-	  break;
-	case 3:
-	  x0 = 9;
-	  x1 = 245;
-	  y0 = 8;
-	  y1 = 127;
-	  shifty = 0;
-	  break;
-	}
-      }
-     
-      //remapping loop
-      for ( int ipx=x0; ipx!=x1; ++ipx ) {
-	for ( int ipy=y0; ipy!=y1; ++ipy) {
-	  ix = (ipx-x0)/multiplicator;
-	  for ( int m=0; m!=multiplicator; ++m ) {
-	    if ( (ipx-x0)%multiplicator==m ) iy=(ipy-y0)*multiplicator + m + shifty;
-	  }
-	  dataMap[iy][ix] = sizeof(header) + (nc_chip * ipy + ipx) * 2;
-	}
-      } 
-
-    }
-
-  public:
-
-#ifdef ALDO //VH
-    using header = jf_header; //VH
-#else //VH
-    using header = sls::defs::sls_receiver_header;
-#endif //VH
-    
-    jungfrauLGADStrixelsDataSingleChip( const int chip )
-      : slsDetectorData<uint16_t>( /*nc_strixel*/nc_chip/3, /*nr_strixel*/ nr_chip*5,
-                                    nc_chip * nr_chip * 2 + sizeof(header) ) {
-      std::cout << "Jungfrau strixels single chip" << std::endl;
-#ifdef ALDO //VH
-      std::cout<< "using reduced jf_header" << std::endl; //VH
-#endif //VH
-
-      mchip = chip;
-      //Fill all strixels with dummy values
-      for (int ix = 0; ix != nc_strixel; ++ix) {
-	for (int iy = 0; iy != nr_strixel; ++iy) {
-	  dataMap[iy][ix] = sizeof(header);
-#ifdef HIGHZ
-	  dataMask[iy][ix] = 0x3fff;
-#endif
-	}
-      }
-
-      remapGroup(1);
-      remapGroup(2);
-      remapGroup(3);
-	
-      iframe = 0;
-      std::cout << "data struct created" << std::endl;
-    };
-
-    /**
-       Returns the value of the selected channel for the given dataset as
-       double. \param data pointer to the dataset (including headers etc) \param
-       ix pixel number in the x direction \param iy pixel number in the y
-       direction \returns data for the selected channel, with inversion if
-       required as double
-
-    */
-    virtual double getValue(char *data, int ix, int iy = 0) {
-
-        uint16_t val = getChannel(data, ix, iy) & 0x3fff;
-        return val;
-    };
-
-    /**
-
-    Returns the frame number for the given dataset. Purely virtual func.
-    \param buff pointer to the dataset
-    \returns frame number
-
-    */
-
-
-    int getFrameNumber(char *buff) {
-#ifdef ALDO //VH
-      return ((header *)buff)->bunchNumber; //VH
-#else //VH
-      return ((header *)buff)->detHeader.frameNumber;
-#endif //VH
-    };
-
-    /**
-
-       Returns the packet number for the given dataset. purely virtual func
-       \param buff pointer to the dataset
-       \returns packet number number
-
-
-
-    */
-    int getPacketNumber(char *buff) {
-#ifdef ALDO //VH
-      //uint32_t fakePacketNumber = 1000;
-      //return fakePacketNumber; //VH //TODO: Keep in mind in case of bugs! //This is definitely bad!
-      return 1000;
-#else //VH
-      return ((header *)buff)->detHeader.packetNumber;
-#endif //VH
-    };
-
-   
-
-    char *readNextFrame(std::ifstream &filebin) {
-        int ff = -1, np = -1;
-        return readNextFrame(filebin, ff, np);
-    };
-
-    char *readNextFrame(std::ifstream &filebin, int &ff) {
-        int np = -1;
-        return readNextFrame(filebin, ff, np);
-    };
-
-    char *readNextFrame(std::ifstream &filebin, int &ff, int &np) {
-        char *data = new char[dataSize];
-        char *d = readNextFrame(filebin, ff, np, data);
-        if (d == NULL) {
-            delete[] data;
-            data = NULL;
-        }
-        return data;
-    };
-
-    char *readNextFrame(std::ifstream &filebin, int &ff, int &np,char *data) {
-        char *retval = 0;
-        int nd;
-        int fnum = -1;
-        np = 0;
-        int pn;
-
-        //  cout << dataSize << endl;
-        if (ff >= 0)
-            fnum = ff;
-
-        if (filebin.is_open()) {
-            if (filebin.read(data, dataSize)) {
-                ff = getFrameNumber(data);
-                np = getPacketNumber(data);
-                return data;
-            }
-        }
-        return NULL;
-    };
-
-    /*    Loops over a memory slot until a complete frame is found (i.e. all */
-    /*    packets 0 to nPackets, same frame number). purely virtual func \param */
-    /*    data pointer to the memory to be analyzed \param ndata reference to the */
-    /*    amount of data found for the frame, in case the frame is incomplete at */
-    /*    the end of the memory slot \param dsize size of the memory slot to be */
-    /*    analyzed \returns pointer to the beginning of the last good frame (might */
-    /*    be incomplete if ndata smaller than dataSize), or NULL if no frame is */
-    /*    found */
-
-    /* *\/ */
-    virtual char *findNextFrame(char *data, int &ndata, int dsize) {
-        if (dsize < dataSize)
-            ndata = dsize;
-        else
-            ndata = dataSize;
-        return data;
-    };
-
-    // int getPacketNumber(int x, int y) {return dataMap[y][x]/packetSize;};
-};
-
-#endif
--- a/slsDetectorCalibration/dataStructures/jungfrauStrixelsHalfModuleOldDesign.h
+++ b/slsDetectorCalibration/dataStructures/jungfrauStrixelsHalfModuleOldDesign.h
@ -1,271 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-or-other
-// Copyright (C) 2021 Contributors to the SLS Detector Package
-#ifndef JUNGFRAUSTRIXELSHALFMODULEOLD_H
-#define JUNGFRAUSTRIXELSHALFMODULEOLD_H
-#ifdef CINT
-#include "sls/sls_detector_defs_CINT.h"
-#else
-#include "sls/sls_detector_defs.h"
-#endif
-#include "slsDetectorData.h"
-
-/*
-/afs/psi.ch/project/mythen/Anna/slsDetectorPackageDeveloperMpc2011/slsDetectorCalibration/jungfrauExecutables 
-make -f Makefile.rawdataprocess jungfrauRawDataProcessStrx
- ../dataStructures/jungfrauLGADStrixelsData.h
-*/
-//#define VERSION_V2
-/**
-    @short  structure for a Detector Packet or Image Header
-    @li frameNumber is the frame number
-    @li expLength is the subframe number (32 bit eiger) or real time exposure
-   time in 100ns (others)
-    @li packetNumber is the packet number
-    @li bunchId is the bunch id from beamline
-    @li timestamp is the time stamp with 10 MHz clock
-    @li modId is the unique module id (unique even for left, right, top, bottom)
-    @li xCoord is the x coordinate in the complete detector system
-    @li yCoord is the y coordinate in the complete detector system
-    @li zCoord is the z coordinate in the complete detector system
-    @li debug is for debugging purposes
-    @li roundRNumber is the round robin set number
-    @li detType is the detector type see :: detectorType
-    @li version is the version number of this structure format
-*/
-
-namespace strixelsOldDesign {
-  constexpr int NC_STRIXEL = (1024*3);
-  constexpr int NR_TOTAL = (512/3);
-  constexpr int NR_STRIXEL = ( (256-4)/3 );
-}
-
-typedef struct {
-    uint64_t bunchNumber; /**< is the frame number */
-    uint64_t pre;         /**< something */
-
-} jf_header; //Aldo's header
-
-
-using namespace strixelsOldDesign;    
-class jungfrauStrixelsHalfModuleOldDesign : public slsDetectorData<uint16_t> {
-
-  private:
-    int iframe;
-
-#ifdef ALDO //VH
-    using header = jf_header; //VH
-#else //VH
-    using header = sls::defs::sls_receiver_header;
-#endif //VH
-  public:
-    /**
-       Implements the slsReceiverData structure for the moench02 prototype read
-       out by a module i.e. using the slsReceiver (160x160 pixels, 40 packets
-       1286 large etc.) \param c crosstalk parameter for the output buffer
-
-    */
-    jungfrauStrixelsHalfModuleOldDesign()
-      : slsDetectorData<uint16_t>( 1024*3, 512/3,
-                                    512 * 1024 * 2 + sizeof(header) ) {
-      std::cout << "Jungfrau strixels old design" << std::endl;
-#ifdef ALDO //VH
-      std::cout<< "using reduced jf_header" << std::endl; //VH
-#endif //VH
-      for (int ix = 0; ix != 1024*3; ++ix) {
-	for (int iy = 0; iy != 512/3; ++iy) {
-	  dataMap[iy][ix] = sizeof(header);//+ ( 1024 * 5 + 300) * 2; //somewhere on the guardring of the LGAD
-#ifdef HIGHZ
-	  dataMask[iy][ix] = 0x3fff;
-#endif
-	}
-      }
-
-      //remap
-      int ix, iy;
-      for (int ipx=0; ipx!=1024; ++ipx) {
-	for (int ipy=0; ipy!=256-4; ++ipy) {
-	  iy=ipy/3;
-	  /* //1
-	  if (ipy%3==0) ix=ipx*3+2;
-	  if (ipy%3==1) ix=ipx*3+1;
-	  if (ipy%3==2) ix=ipx*3;
-	  */
-	  /* //2
-	  if (ipy%3==2) ix=ipx*3+2;
-	  if (ipy%3==0) ix=ipx*3+1;
-	  if (ipy%3==1) ix=ipx*3;
-	  */
-	  /* //3
-	  if (ipy%3==1) ix=ipx*3+2;
-	  if (ipy%3==2) ix=ipx*3+1;
-	  if (ipy%3==0) ix=ipx*3;
-	  */
-	  //4 //This seems to be correct //corresponds to looking from the backside of the sensor
-	  if (ipy%3==0) ix=ipx*3;
-	  if (ipy%3==1) ix=ipx*3+1;
-	  if (ipy%3==2) ix=ipx*3+2;
-	  
-	  /* //5
-	  if (ipy%3==2) ix=ipx*3;
-	  if (ipy%3==0) ix=ipx*3+1;
-	  if (ipy%3==1) ix=ipx*3+2;
-	  */
-	  /* //6
-	  if (ipy%3==1) ix=ipx*3;
-	  if (ipy%3==2) ix=ipx*3+1;
-	  if (ipy%3==0) ix=ipx*3+2;
-	  */
-
-	  if ( ipx!=255 && ipx!=256 && ipx!=511 && ipx!=512 && ipx!=767 && ipx!=768 ) //avoid double pixels
-	    // ( !( ipx%256==0 || ipx%256==255 ) || ipx==0 || ipx==1023 )
-	    dataMap[iy][ix] = sizeof(header) + (1024 * ipy + ipx) * 2;
-	  //  cout << ipx << " " << ipy << " " << ix << " " << iy << endl;
-	}
-      }
-	
-      iframe = 0;
-      std::cout << "data struct created" << std::endl;
-    };
-
-    /**
-       Returns the value of the selected channel for the given dataset as
-       double. \param data pointer to the dataset (including headers etc) \param
-       ix pixel number in the x direction \param iy pixel number in the y
-       direction \returns data for the selected channel, with inversion if
-       required as double
-
-    */
-    virtual double getValue(char *data, int ix, int iy = 0) {
-
-        uint16_t val = getChannel(data, ix, iy) & 0x3fff;
-        return val;
-    };
-
-    /* virtual void calcGhost(char *data, int ix, int iy) { */
-    /*   double val=0; */
-    /*   ghost[iy][ix]=0; */
-
-    /* } */
-
-    /* virtual void calcGhost(char *data) { */
-    /*   for (int ix=0; ix<25; ix++){ */
-    /*     for (int iy=0; iy<200; iy++) { */
-    /* 	calcGhost(data, ix,iy); */
-    /*     }  */
-    /*   } */
-    /*   // cout << "*" << endl; */
-    /* } */
-
-    /* double getGhost(int ix, int iy) { */
-    /*   return 0; */
-    /* }; */
-
-    /**
-
-    Returns the frame number for the given dataset. Purely virtual func.
-    \param buff pointer to the dataset
-    \returns frame number
-
- */
-
-    /* class jfrau_packet_header_t { */
-    /*  public: */
-    /* 	unsigned char reserved[4]; */
-    /* 	unsigned char packetNumber[1]; */
-    /* 	unsigned char frameNumber[3]; */
-    /* 	unsigned char bunchid[8]; */
-    /* }; */
-
-
-    int getFrameNumber(char *buff) {
-#ifdef ALDO //VH
-      return ((header *)buff)->bunchNumber; //VH
-#else //VH
-      return ((header *)buff)->detHeader.frameNumber;
-#endif //VH
-    };
-
-    /**
-
-       Returns the packet number for the given dataset. purely virtual func
-       \param buff pointer to the dataset
-       \returns packet number number
-
-
-
-    */
-    int getPacketNumber(char *buff) {
-#ifdef ALDO //VH
-      //uint32_t fakePacketNumber = 1000;
-      //return fakePacketNumber; //VH //TODO: Keep in mind in case of bugs! //This is definitely bad!
-      return 1000;
-#else //VH
-      return ((header *)buff)->detHeader.packetNumber;
-#endif //VH
-    };
-
-   
-
-    char *readNextFrame(std::ifstream &filebin) {
-        int ff = -1, np = -1;
-        return readNextFrame(filebin, ff, np);
-    };
-
-    char *readNextFrame(std::ifstream &filebin, int &ff) {
-        int np = -1;
-        return readNextFrame(filebin, ff, np);
-    };
-
-    char *readNextFrame(std::ifstream &filebin, int &ff, int &np) {
-        char *data = new char[dataSize];
-        char *d = readNextFrame(filebin, ff, np, data);
-        if (d == NULL) {
-            delete[] data;
-            data = NULL;
-        }
-        return data;
-    };
-
-    char *readNextFrame(std::ifstream &filebin, int &ff, int &np,char *data) {
-        char *retval = 0;
-        int nd;
-        int fnum = -1;
-        np = 0;
-        int pn;
-
-        //  cout << dataSize << endl;
-        if (ff >= 0)
-            fnum = ff;
-
-        if (filebin.is_open()) {
-            if (filebin.read(data, dataSize)) {
-                ff = getFrameNumber(data);
-                np = getPacketNumber(data);
-                return data;
-            }
-        }
-        return NULL;
-    };
-
-    /*    Loops over a memory slot until a complete frame is found (i.e. all */
-    /*    packets 0 to nPackets, same frame number). purely virtual func \param */
-    /*    data pointer to the memory to be analyzed \param ndata reference to the */
-    /*    amount of data found for the frame, in case the frame is incomplete at */
-    /*    the end of the memory slot \param dsize size of the memory slot to be */
-    /*    analyzed \returns pointer to the beginning of the last good frame (might */
-    /*    be incomplete if ndata smaller than dataSize), or NULL if no frame is */
-    /*    found */
-
-    /* *\/ */
-    virtual char *findNextFrame(char *data, int &ndata, int dsize) {
-        if (dsize < dataSize)
-            ndata = dsize;
-        else
-            ndata = dataSize;
-        return data;
-    };
-
-    // int getPacketNumber(int x, int y) {return dataMap[y][x]/packetSize;};
-};
-
-#endif
--- a/slsDetectorCalibration/dataStructures/slsDetectorData.h
+++ b/slsDetectorCalibration/dataStructures/slsDetectorData.h
@ -217,7 +217,6 @@ void slsDetectorData<dataType>::setDataMap(int **dMap) {
            }
        }
    }
-    /* //commented this part because it causes out-of-bound issues if nx or ny are larger than dataMap bounds (single-chip readout of strixel with groups of different pitches) VH 2023-02-24
    for (iy = 0; iy < ny; iy++) {
        for (ix = 0; ix < nx; ix++) {
            ip = dataMap[iy][ix] / sizeof(dataType);
@ -225,7 +224,7 @@ void slsDetectorData<dataType>::setDataMap(int **dMap) {
            ymap[ip] = iy;
        }
    }
-     */
+
    // cout << "nx:" <<nx << " ny:" << ny << endl;
 }

--- a/slsDetectorCalibration/interpolations/slsInterpolation.h
+++ b/slsDetectorCalibration/interpolations/slsInterpolation.h
@ -22,7 +22,7 @@ enum quadrant {

 #include <iostream>
 #include <stdio.h>
-//using namespace std;
+using namespace std;

 //#ifdef MYROOT1
 //: public TObject
@ -128,7 +128,7 @@ class slsInterpolation {
                        nSubPixelsY * nPixelsY);
            delete[] gm;
        } else
-	  std::cout << "Could not allocate float image " << std::endl;
+            cout << "Could not allocate float image " << endl;
        return NULL;
    }

@ -323,7 +323,7 @@ class slsInterpolation {
                if (ix > 1)
                    sumR += cl[ix + iy * 3];
                if (iy < 1)
-		  sumB = cl[ix + iy * 3]; //???? not "+="? VH
+                    sumB = cl[ix + iy * 3];
                if (iy > 1)
                    sumT += cl[ix + iy * 3];
            }
@ -472,13 +472,13 @@ class slsInterpolation {
                val = cl[ix + 3 * iy];
                sum += val;
                if (iy == 0)
-                    b += val;
-                if (iy == 2)
-                    t += val;
-                if (ix == 0)
                    l += val;
-                if (ix == 2)
+                if (iy == 2)
                    r += val;
+                if (ix == 0)
+                    b += val;
+                if (ix == 2)
+                    t += val;
            }
        }
        if (sum > 0) {
@ -526,185 +526,6 @@ class slsInterpolation {
        return calcEta3X(cli, etax, etay, sum);
    }

-    /************************************************/
-    /* Additional strixel eta functions by Viktoria */
-    /************************************************/
-    //Etax: only central row, etay: only central column
-    static int calcEta1x3( double* cl, double& etax, double& etay, double& toth, double& totv ) {
-      double l, r, t, b;
-      //sum = cl[0] + cl[1] + cl[2] + cl[3] + cl[4] + cl[5] + cl[6] + cl[7] + cl[8];
-      toth = cl[3] + cl[4] + cl[5];
-      if (toth > 0) {
-	l = cl[3];
-	r = cl[5];
-      }
-      etax = (-l + r) / toth;
-      totv = cl[1] + cl[4] + cl[7];
-      if (toth > 0) {
-	b = cl[1];
-	t = cl[7];
-      }
-      etay = (-b + t) / totv;
-      return -1;
-    }
-
-    static int calcEta1x3( int* cl, double& etax, double& etay, double& toth, double& totv ) {
-      double cli[9];
-      for ( int ix = 0; ix != 9; ++ix )
-	cli[ix] = cl[ix];
-      return calcEta1x3( cli, etax, etay, toth , totv );
-    }
-
-    //Eta 1x2 essentially the same as etaL, but we also return toth and totv
-    static int calcEta1x2(double totquad, int corner, double sDum[2][2],
-			  double &etax, double &etay, double& toth, double& totv) {
-        double t, r;
-        if (totquad > 0) {
-            switch (corner) {
-            case TOP_LEFT:
-                t = sDum[1][1];
-                r = sDum[0][1];
-                toth = sDum[0][1] + sDum[0][0];
-                totv = sDum[0][1] + sDum[1][1];
-                break;
-            case TOP_RIGHT:
-                t = sDum[1][0];
-                r = sDum[0][1];
-                toth = sDum[0][1] + sDum[0][0];
-                totv = sDum[1][0] + sDum[0][0];
-                break;
-            case BOTTOM_LEFT:
-                r = sDum[1][1];
-                t = sDum[1][1];
-                toth = sDum[1][0] + sDum[1][1];
-                totv = sDum[0][1] + sDum[1][1];
-                break;
-            case BOTTOM_RIGHT:
-                t = sDum[1][0];
-                r = sDum[1][1];
-                toth = sDum[1][0] + sDum[1][1];
-                totv = sDum[1][0] + sDum[0][0];
-                break;
-            default:
-                etax = -1000;
-                etay = -1000;
-                return 0;
-            }
-            // etax=r/totquad;
-            // etay=t/totquad;
-            etax = r / toth;
-            etay = t / totv;
-        }
-        return 0;
-    }
-
-    static int calcEta1x2( double *cl, double &etax, double &etay, double &sum,
-			   double &totquad, double sDum[2][2], double& toth, double& totv ) {
-        int corner = calcQuad( cl, sum, totquad, sDum );
-        calcEta1x2( totquad, corner, sDum, etax, etay, toth, totv );
-        return corner;
-    }
-
-    static int calcEta1x2( int *cl, double &etax, double &etay, double &sum,
-			 double &totquad, double sDum[2][2], double& toth, double& totv ) {
-        int corner = calcQuad( cl, sum, totquad, sDum );
-        calcEta1x2( totquad, corner, sDum, etax, etay, toth , totv );
-        return corner;
-    }
-
-    //Two functions to calculate 2x3 or 3x2 eta
-    static int calcEta2x3( double* cl, double totquad, int corner, double& etax, double& etay, double& tot6 ) {
-      double t, b, r;
-      if (totquad > 0) {
-	switch (corner) {
-	case TOP_LEFT:
-	case BOTTOM_LEFT:
-	  t = cl[6] + cl[7];
-	  b = cl[0] + cl[1];
-	  r = cl[1] + cl[4] + cl[7];
-	  tot6 = cl[0] + cl[1] + cl[3] + cl[4] + cl[6] + cl[7];
-	  break;
-	case TOP_RIGHT:
-	case BOTTOM_RIGHT:
-	  t = cl[7] + cl[8];
-	  b = cl[1] + cl[2];
-	  r = cl[2] + cl[5] + cl[8];
-	  tot6 = cl[1] + cl[2] + cl[4] + cl[5] + cl[7] + cl[8];
-	  break;
-	default:
-	  etax = -1000;
-	  etay = -1000;
-	  return -1;
-	}
-	etax = r / tot6;
-	etay = (-b + t) / tot6;
-      }
-      return -1;
-    }
-
-    static int calcEta3x2( double* cl, double totquad, int corner, double& etax, double& etay, double& tot6 ) {
-      double t, l, r;
-      if (totquad > 0) {
-	switch (corner) {
-	case TOP_LEFT:
-	case TOP_RIGHT:
-	  l = cl[3] + cl[6];
-	  r = cl[5] + cl[8];
-	  t = cl[6] + cl[7] + cl[8];
-	  tot6 = cl[3] + cl[4] + cl[5] + cl[6] + cl[7] + cl[8];
-	  break;
-	case BOTTOM_LEFT:
-	case BOTTOM_RIGHT:
-	  l = cl[0] + cl[3];
-	  r = cl[2] + cl[5];
-	  t = cl[3] + cl[4] + cl[5];
-	  tot6 = cl[0] + cl[1] + cl[2] + cl[3] + cl[4] + cl[5];
-	  break;
-	default:
-	  etax = -1000;
-	  etay = -1000;
-	  return -1;
-	}
-	etax = (-l + r) / tot6;
-	etay = t / tot6;
-      }
-      return -1;
-    }
-
-    //overload including both eta2x3 and eta3x2
-    //ornt (orientation of long side (3) of eta) decides which eta is chosen
-    enum orientation {
-      HORIZONTAL_ORIENTATION = 0,
-      VERTICAL_ORIENTATION = 1, 
-      UNDEFINED_ORIENTATION = -1
-    };
-    static int calcEta2x3( int ornt, double* cl, double& etax, double& etay, double& tot6 ) {
-      double sum{};
-      double totquad{};
-      double sDum[2][2]{};
-      int corner = calcQuad( cl, sum, totquad, sDum );
-      switch (ornt) {
-      case HORIZONTAL_ORIENTATION:
-	calcEta3x2( cl, totquad, corner, etax, etay, tot6 );
-	break;
-      case VERTICAL_ORIENTATION:
-	calcEta2x3( cl, totquad, corner, etax, etay, tot6 );
-	break;
-      default:
-	etax = -1000;
-	etay = -1000;
-	return -1;
-      }
-      return corner;
-    }
-
-    static int calcEta2x3( int strxo, int* cl, double& etax, double& etay, double& tot6 ) {
-      double cli[9]{};
-      for ( int ix = 0; ix != 9; ++ix )
-	cli[ix] = cl[ix];
-      return calcEta2x3( strxo, cli, etax, etay, tot6 );
-    }
-
    /* static int calcMyEta(double totquad, int quad, double *cl, double &etax,
     * double &etay) { */
    /*   double l,r,t,b, sum; */
--- a/slsDetectorCalibration/jungfrauExecutables/Makefile.rawdataprocess
+++ b/slsDetectorCalibration/jungfrauExecutables/Makefile.rawdataprocess
@ -14,19 +14,7 @@ jungfrauRawDataProcess:  jungfrauRawDataProcess.cpp  $(INCS) clean
 			 g++ -o jungfrauRawDataProcess  jungfrauRawDataProcess.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF) -DSAVE_ALL  -DMODULE

 jungfrauRawDataProcessStrx:  jungfrauRawDataProcess.cpp  $(INCS) clean
-			 g++ -o jungfrauRawDataProcessStrx  jungfrauRawDataProcess.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF) -DSAVE_ALL -DJFSTRX
-
-jungfrauRawDataProcessStrxChip1:  jungfrauRawDataProcess.cpp  $(INCS) clean
-			 g++ -o jungfrauRawDataProcessStrxChip1  jungfrauRawDataProcess.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF) -DSAVE_ALL -DJFSTRXCHIP1
-
-jungfrauRawDataProcessStrxChip6:  jungfrauRawDataProcess.cpp  $(INCS) clean
-			 g++ -o jungfrauRawDataProcessStrxChip6  jungfrauRawDataProcess.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF) -DSAVE_ALL -DJFSTRXCHIP6
-
-jungfrauRawDataProcessStrxChip1Aldo:  jungfrauRawDataProcess.cpp  $(INCS) clean
-			 g++ -o jungfrauRawDataProcessStrxChip1Aldo  jungfrauRawDataProcess.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF) -DSAVE_ALL -DJFSTRXCHIP1 -DALDO
-
-jungfrauRawDataProcessStrxChip6Aldo:  jungfrauRawDataProcess.cpp  $(INCS) clean
-			 g++ -o jungfrauRawDataProcessStrxChip6Aldo  jungfrauRawDataProcess.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF) -DSAVE_ALL -DJFSTRXCHIP6 -DALDO
+			 g++ -o jungfrauRawDataProcessStrx  jungfrauRawDataProcess.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF) -DSAVE_ALL -DJFSTRX 

 jungfrauRawDataProcessStrxAldo:  jungfrauRawDataProcess.cpp  $(INCS) clean
 			 g++ -o jungfrauRawDataProcessStrxAldo  jungfrauRawDataProcess.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF) -DSAVE_ALL -DJFSTRX -DALDO
--- a/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess.cpp
+++ b/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess.cpp
@ -10,7 +10,8 @@

 #define RAWDATA

-#if !defined JFSTRX && !defined JFSTRXOLD && !defined JFSTRXCHIP1 && !defined JFSTRXCHIP6
+#ifndef JFSTRX
+#ifndef JFSTRXOLD
 #ifndef MODULE
 #include "jungfrauHighZSingleChipData.h"
 #endif
@ -18,13 +19,10 @@
 #include "jungfrauModuleData.h"
 #endif
 #endif
-
+#endif
 #ifdef JFSTRX
 #include "jungfrauLGADStrixelsData.h"
 #endif
-#if defined JFSTRXCHIP1 || defined JFSTRXCHIP6
-#include "jungfrauLGADStrixelsDataSingleChip.h"
-#endif
 #ifdef JFSTRXOLD
 #include "jungfrauStrixelsHalfModuleOldDesign.h"
 #endif
@ -58,14 +56,15 @@ int main(int argc, char *argv[]) {

    int fifosize = 1000;
    int nthreads = 10;
-    int csize = 3; //3
+    int csize = 3;
    int nsigma = 5;
    int nped = 10000;

    int cf = 0;


-#if !defined JFSTRX && !defined JFSTRXOLD && !defined JFSTRXCHIP1 && !defined JFSTRXCHIP6
+#ifndef JFSTRX
+#ifndef JFSTRXOLD
 #ifndef MODULE
    jungfrauHighZSingleChipData *decoder = new jungfrauHighZSingleChipData();
    int nx = 256, ny = 256;
@ -73,26 +72,17 @@ int main(int argc, char *argv[]) {
 #ifdef MODULE
    jungfrauModuleData *decoder = new jungfrauModuleData();
    int nx = 1024, ny = 512;
-#endif
-#endif

+#endif
+#endif
+#endif
 #ifdef JFSTRX
-    cout << "Jungfrau strixel full module readout" << endl;
+    cout << "bbb" << endl;
    jungfrauLGADStrixelsData *decoder = new jungfrauLGADStrixelsData();
    int nx = 1024/5, ny = 512*5;
 #endif
-#ifdef JFSTRXCHIP1
-    std::cout << "Jungfrau strixel LGAD single chip 1" << std::endl;
-    jungfrauLGADStrixelsDataSingleChip *decoder = new jungfrauLGADStrixelsDataSingleChip(1);
-    int nx = 256/3, ny = 256*5;
-#endif
-#ifdef JFSTRXCHIP6
-    std::cout << "Jungfrau strixel LGAD single chip 6" << std::endl;
-    jungfrauLGADStrixelsDataSingleChip *decoder = new jungfrauLGADStrixelsDataSingleChip(6);
-    int nx = 256/3, ny = 256*5;
-#endif
 #ifdef JFSTRXOLD
-    std::cout << "Jungfrau strixels old design" << std::endl;
+    cout << "ccc" << endl;
    jungfrauStrixelsHalfModuleOldDesign *decoder = new jungfrauStrixelsHalfModuleOldDesign();
    int nx = 1024*3, ny = 512/3;
 #endif
@ -190,7 +180,7 @@ int main(int argc, char *argv[]) {
    uint32_t nnx, nny;

    singlePhotonDetector *filter = new singlePhotonDetector(
-        decoder, 3, nsigma, 1, NULL, nped, 200, -1, -1, gainmap, NULL);
+        decoder, csize, nsigma, 1, NULL, nped, 200, -1, -1, gainmap, NULL);

    if (gainfname) {

@ -221,8 +211,6 @@ int main(int argc, char *argv[]) {
    // multiThreadedAnalogDetector(filter,nthreads,fifosize);
    multiThreadedCountingDetector *mt =
        new multiThreadedCountingDetector(filter, nthreads, fifosize);
-    mt->setClusterSize(csize,csize);
-
 #ifndef ANALOG
    mt->setDetectorMode(ePhotonCounting);
    cout << "Counting!" << endl;
--- a/slsDetectorCalibration/multiThreadedAnalogDetector.h
+++ b/slsDetectorCalibration/multiThreadedAnalogDetector.h
@ -69,11 +69,6 @@ class threadedAnalogDetector {
    };
    virtual double setThreshold(double th) { return det->setThreshold(th); };

-    virtual double setClusterSize(int csx, int csy) { 
-      //cout << "44" << endl; 
-      return det->setClusterSize(csx); 
-    };
-
    virtual void setROI(int xmin, int xmax, int ymin, int ymax) {
        det->setROI(xmin, xmax, ymin, ymax);
    };
--- a/slsDetectorCalibration/multiThreadedCountingDetector.h
+++ b/slsDetectorCalibration/multiThreadedCountingDetector.h
@ -19,7 +19,7 @@ using namespace std;

 class multiThreadedCountingDetector : public multiThreadedAnalogDetector {
  public:
- multiThreadedCountingDetector(singlePhotonDetector *d, int n, int fs = 1000)
+    multiThreadedCountingDetector(singlePhotonDetector *d, int n, int fs = 1000)
        : multiThreadedAnalogDetector(d, n, fs){};
    // virtual
    // ~multiThreadedCountingDetector{multiThreadedAnalogDetector::~multiThreadedAnalogDetector();};
@ -33,11 +33,6 @@ class multiThreadedCountingDetector : public multiThreadedAnalogDetector {
        for (int i = 0; i < nThreads; i++)
            (dets[i])->setEnergyRange(emi, ema);
    };
-    virtual void setClusterSize(int sizex, int sizey) {
-        for (int i = 0; i < nThreads; i++)
-	  ((dets[i]))->setClusterSize(sizex, sizey);
-	//std::cout << "+++++++++++++ sizex " << sizex << std::endl;
-    };
 };

 #endif
--- a/slsDetectorCalibration/singlePhotonDetector.h
+++ b/slsDetectorCalibration/singlePhotonDetector.h
@ -174,9 +174,8 @@ class singlePhotonDetector : public analogDetector<uint16_t> {
                clusterSizeY = clusterSize;
            else
                clusterSizeY = 1;
-            for (int ip = 0; ip < nx * ny; ip++) {
+            for (int ip = 0; ip < nx * ny; ip++)
                (clusters + ip)->set_cluster_size(clusterSize, clusterSizeY);
-	    }
            // cluster=new single_photon_hit(clusterSize,clusterSizeY);
        }
        return clusterSize;
@ -534,7 +533,6 @@ class singlePhotonDetector : public analogDetector<uint16_t> {
 		      (clusters + nph)->print();
 		      cout << max << " " <<  val[iy * nx + ix] << endl;
 		    }
-		    //else (clusters + nph)->print();
                    good = 1;
                    if (eMin > 0 && tot < eMin)
                        good = 0;
--- a/slsDetectorCalibration/single_photon_hit.h
+++ b/slsDetectorCalibration/single_photon_hit.h
@ -44,12 +44,14 @@ class single_photon_hit {
        // fwrite((void*)this, 1, 3*sizeof(int)+4*sizeof(double)+sizeof(quad),
        // myFile);  // if (fwrite((void*)this, 1,
        // sizeof(int)+2*sizeof(int16_t), myFile))
+#ifdef OLDFORMAT
+        if (fwrite((void *)&iframe, 1, sizeof(int), myFile)) {
+        };
+#endif
 #ifndef WRITE_QUAD
        // printf("no quad ");
-        if ( fwrite( (void*)&x, sizeof(int16_t), 1, myFile ) ) {
-	  if ( fwrite( (void*)&y, sizeof(int16_t), 1, myFile ) )
+        if (fwrite((void *)&x, sizeof(int16_t), 2, myFile))
            return fwrite((void *)data, sizeof(int), dx * dy, myFile);
-	}
 #endif
 #ifdef WRITE_QUAD
        //  printf("quad ");
@ -107,27 +109,14 @@ class single_photon_hit {
        // fread((void*)this, 1,  3*sizeof(int)+4*sizeof(double)+sizeof(quad),
        // myFile);

+#ifdef OLDFORMAT
+        if (fread((void *)&iframe, 1, sizeof(int), myFile)) {
+        }
+#endif
 #ifndef WRITE_QUAD
-        //printf( "no quad \n");
-	//This reads two values of size int16_t into x
-	//If x is located next to y (int16_t distance), this reads the values into x and y
-	//How can I be sure, this is always the case?
-	//If, e.g., the memory is padded after int16_t x, do we read the padding instead of y?
-	//How can I be sure the memory is packed and y follows right after x with no padding?
-	//Anyway, this is dangerous if anyone, at any point, changes the order of variable declaration,
-	//or uses another architecture (64 bit vs 32 bit for instance).
-	/*
+        // printf( "no quad \n");
        if (fread((void *)&x, sizeof(int16_t), 2, myFile))
            return fread((void *)data, sizeof(int), dx * dy, myFile);
-	*/
-	
-	//Suggestion
-	if ( fread( (void*)&x, sizeof(int16_t), 1, myFile) ) {     //reads x
-	  if ( fread( (void*)&y, sizeof(int16_t), 1, myFile ) )    //reads y
-	  return fread( (void*)data, sizeof(int), dx*dy, myFile ); //reads and returns data
-	}
-	
-	
 #endif
 #ifdef WRITE_QUAD
        int qq[4];
@ -228,7 +217,7 @@ class single_photon_hit {
        // int ix, iy;

      printf("***************\n");
-      printf("** %d %d ** %d %d **\n", x, y, dx, dy);
+      printf("** %d %d **\n",x,y);
        for (int iy = 0; iy < dy; iy++) {
            for (int ix = 0; ix < dx; ix++) {
                printf("%d \t", data[ix + iy * dx]);
@ -272,11 +261,10 @@ class single_photon_hit {
       x within the cluster (center is (0,0)) \param iy coordinate y within the
       cluster (center is (0,0)) \returns value of the cluster element
  */
-    //Why not make these const? VH
-    double get_data(int ix, int iy = 0) const {
-      return data[(iy + dy / 2) * dx + ix + dx / 2]; //NOTE: those are int divisions
+    double get_data(int ix, int iy = 0) {
+        return data[(iy + dy / 2) * dx + ix + dx / 2];
    };
-    int *get_cluster() const { return data; };
+    int *get_cluster() { return data; };

    int iframe; /**< frame number */
    double
--- a/slsDetectorGui/forms/form_tab_measurement.ui
+++ b/slsDetectorGui/forms/form_tab_measurement.ui
--- a/slsDetectorGui/include/qTabMeasurement.h
+++ b/slsDetectorGui/include/qTabMeasurement.h
@ -32,6 +32,7 @@ class qTabMeasurement : public QWidget, private Ui::TabMeasurementObject {
    void SetNumFrames(int val);
    void SetNumTriggers(int val);
    void SetNumBursts(int val);
+    void SetNumSamples(int val);
    void SetNumGates(int val);
    void SetExposureTime();
    void SetAcquisitionPeriod();
@ -63,6 +64,7 @@ class qTabMeasurement : public QWidget, private Ui::TabMeasurementObject {
    void GetNumFrames();
    void GetNumTriggers();
    void GetNumBursts();
+    void GetNumSamples();
    void GetNumGates();
    void GetExposureTime();
    void GetAcquisitionPeriod();
@ -94,6 +96,7 @@ class qTabMeasurement : public QWidget, private Ui::TabMeasurementObject {
    QString errPeriodTip;
    QPalette red;
    bool delayImplemented;
+    bool sampleImplemented;
    bool gateImplemented;
    bool startingFnumImplemented;
    bool isAcquisitionStopped{false};
--- a/slsDetectorGui/src/qDrawPlot.cpp
+++ b/slsDetectorGui/src/qDrawPlot.cpp
@ -52,7 +52,6 @@ void qDrawPlot::SetupWidgetWindow() {
    detType = det->getDetectorType().squash();
    switch (detType) {
    case slsDetectorDefs::JUNGFRAU:
-    case slsDetectorDefs::MOENCH:
        pixelMask = ((1 << 14) - 1);
        gainMask = (3 << 14);
        gainOffset = 14;
@ -1143,8 +1142,7 @@ void qDrawPlot::toDoublePixelData(double *dest, char *source, int size,
        break;

    case 16:
-        if (detType == slsDetectorDefs::MOENCH ||
-            detType == slsDetectorDefs::JUNGFRAU ||
+        if (detType == slsDetectorDefs::JUNGFRAU ||
            detType == slsDetectorDefs::GOTTHARD2) {

            // show gain plot
--- a/slsDetectorGui/src/qTabAdvanced.cpp
+++ b/slsDetectorGui/src/qTabAdvanced.cpp
@ -48,10 +48,6 @@ void qTabAdvanced::SetupWidgetWindow() {
        lblDiscardBits->setEnabled(true);
        spinDiscardBits->setEnabled(true);
        break;
-    case slsDetectorDefs::JUNGFRAU:
-        lblNumStoragecells->setEnabled(true);
-        spinNumStoragecells->setEnabled(true);
-        break;
    default:
        break;
    }
--- a/slsDetectorGui/src/qTabDataOutput.cpp
+++ b/slsDetectorGui/src/qTabDataOutput.cpp
@ -40,11 +40,13 @@ void qTabDataOutput::SetupWidgetWindow() {
        comboClkDivider->setEnabled(true);
        chkParallel->setEnabled(true);
        break;
+    case slsDetectorDefs::MOENCH:
+        chkTenGiga->setEnabled(true);
+        break;
    case slsDetectorDefs::MYTHEN3:
        chkParallel->setEnabled(true);
        break;
    case slsDetectorDefs::JUNGFRAU:
-    case slsDetectorDefs::MOENCH:
        lblClkDivider->setEnabled(true);
        comboClkDivider->setEnabled(true);
        break;
--- a/slsDetectorGui/src/qTabDeveloper.cpp
+++ b/slsDetectorGui/src/qTabDeveloper.cpp
@ -111,7 +111,6 @@ void qTabDeveloper::SetupWidgetWindow() {
            break;

        case slsDetectorDefs::JUNGFRAU:
-        case slsDetectorDefs::MOENCH:
            dacWidgets.push_back(
                new qDacWidget(this, det, true,
                               "v vb comp: ", getSLSIndex(detType, tempid++)));
@ -140,6 +139,72 @@ void qTabDeveloper::SetupWidgetWindow() {
                "Temperature ADC: ", getSLSIndex(detType, tempid++)));
            break;

+        case slsDetectorDefs::MOENCH:
+            dacWidgets.push_back(
+                new qDacWidget(this, det, true,
+                               "vbp_colbuf: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(new qDacWidget(
+                this, det, true, "vipre: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(new qDacWidget(
+                this, det, true, "vin_cm: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(new qDacWidget(
+                this, det, true, "vb_sda: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(
+                new qDacWidget(this, det, true,
+                               "vcasc_sfp: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(new qDacWidget(
+                this, det, true, "vout_cm: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(
+                new qDacWidget(this, det, true,
+                               "vipre_cds: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(
+                new qDacWidget(this, det, true,
+                               "ibias_sfp: ", getSLSIndex(detType, tempid++)));
+            break;
+
+        case slsDetectorDefs::MYTHEN3:
+            dacWidgets.push_back(new qDacWidget(
+                this, det, true, "vcassh: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(new qDacWidget(
+                this, det, true, "vth2: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(new qDacWidget(
+                this, det, true, "vrshaper: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(
+                new qDacWidget(this, det, true,
+                               "vrshaper_n: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(
+                new qDacWidget(this, det, true,
+                               "vipre_out: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(new qDacWidget(
+                this, det, true, "vth3: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(new qDacWidget(
+                this, det, true, "vth1: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(new qDacWidget(
+                this, det, true, "vicin: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(new qDacWidget(
+                this, det, true, "vcas: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(new qDacWidget(
+                this, det, true, "vrpreamp: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(new qDacWidget(
+                this, det, true, "vcal_p: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(new qDacWidget(
+                this, det, true, "vipre: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(new qDacWidget(
+                this, det, true, "vishaper: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(new qDacWidget(
+                this, det, true, "vcal_n: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(new qDacWidget(
+                this, det, true, "vtrim: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(new qDacWidget(
+                this, det, true, "vdcsh: ", getSLSIndex(detType, tempid++)));
+            dacWidgets.push_back(
+                new qDacWidget(this, det, true,
+                               "vthreshold: ", getSLSIndex(detType, tempid++)));
+            adcWidgets.push_back(new qDacWidget(
+                this, det, false,
+                "Temperature FPGA: ", getSLSIndex(detType, tempid++)));
+            break;
+
        case slsDetectorDefs::GOTTHARD2:
            dacWidgets.push_back(
                new qDacWidget(this, det, true,
@ -321,7 +386,6 @@ qTabDeveloper::getSLSIndex(slsDetectorDefs::detectorType detType, int index) {
        break;

    case slsDetectorDefs::JUNGFRAU:
-    case slsDetectorDefs::MOENCH:
        switch (index) {
        case 0:
            return slsDetectorDefs::VB_COMP;
@ -347,6 +411,30 @@ qTabDeveloper::getSLSIndex(slsDetectorDefs::detectorType detType, int index) {
        }
        break;

+    case slsDetectorDefs::MOENCH:
+        switch (index) {
+        case 0:
+            return slsDetectorDefs::VBP_COLBUF;
+        case 1:
+            return slsDetectorDefs::VIPRE;
+        case 2:
+            return slsDetectorDefs::VIN_CM;
+        case 3:
+            return slsDetectorDefs::VB_SDA;
+        case 4:
+            return slsDetectorDefs::VCASC_SFP;
+        case 5:
+            return slsDetectorDefs::VOUT_CM;
+        case 6:
+            return slsDetectorDefs::VIPRE_CDS;
+        case 7:
+            return slsDetectorDefs::IBIAS_SFP;
+        default:
+            throw RuntimeError(std::string("Unknown dac/adc index") +
+                               std::to_string(index));
+        }
+        break;
+
    case slsDetectorDefs::MYTHEN3:
        switch (index) {
        case 0:
--- a/slsDetectorGui/src/qTabMeasurement.cpp
+++ b/slsDetectorGui/src/qTabMeasurement.cpp
@ -35,6 +35,7 @@ void qTabMeasurement::SetupWidgetWindow() {
    // timer to update the progress bar
    progressTimer = new QTimer(this);

+    sampleImplemented = false;
    gateImplemented = false;
    delayImplemented = true;
    startingFnumImplemented = false;
@ -46,11 +47,18 @@ void qTabMeasurement::SetupWidgetWindow() {
    // default is triggers and delay (not #bursts and burst period for gotthard2
    // in auto mode)
    ShowTriggerDelay();
+    // default is to show samples, mythen3, show gates
+    ShowGates();

    // enabling according to det type
    lblBurstMode->hide();
    comboBurstMode->hide();
    switch (det->getDetectorType().squash()) {
+    case slsDetectorDefs::MOENCH:
+        lblNumSamples->setEnabled(true);
+        spinNumSamples->setEnabled(true);
+        sampleImplemented = true;
+        break;
    case slsDetectorDefs::EIGER:
        delayImplemented = false;
        lblNextFrameNumber->setEnabled(true);
@ -58,7 +66,6 @@ void qTabMeasurement::SetupWidgetWindow() {
        startingFnumImplemented = true;
        break;
    case slsDetectorDefs::JUNGFRAU:
-    case slsDetectorDefs::MOENCH:
        lblNextFrameNumber->setEnabled(true);
        spinNextFrameNumber->setEnabled(true);
        startingFnumImplemented = true;
@ -105,6 +112,10 @@ void qTabMeasurement::Initialization() {
        connect(spinNumBursts, SIGNAL(valueChanged(int)), this,
                SLOT(SetNumBursts(int)));
    }
+    if (spinNumSamples->isEnabled()) {
+        connect(spinNumSamples, SIGNAL(valueChanged(int)), this,
+                SLOT(SetNumSamples(int)));
+    }
    if (gateImplemented) {
        connect(spinNumGates, SIGNAL(valueChanged(int)), this,
                SLOT(SetNumGates(int)));
@ -187,6 +198,16 @@ void qTabMeasurement::ShowTriggerDelay() {
    }
 }

+void qTabMeasurement::ShowGates() {
+    if (det->getDetectorType().squash() == slsDetectorDefs::MYTHEN3) {
+        stackedLblSamplesGates->setCurrentWidget(pageLblGates);
+        stackedSpinSamplesGates->setCurrentWidget(pageSpinGates);
+    } else {
+        stackedLblSamplesGates->setCurrentWidget(pageLblSamples);
+        stackedSpinSamplesGates->setCurrentWidget(pageSpinSamples);
+    }
+}
+
 void qTabMeasurement::SetupTimingMode() {
    QStandardItemModel *model =
        qobject_cast<QStandardItemModel *>(comboTimingMode->model());
@ -489,6 +510,31 @@ void qTabMeasurement::SetNumBursts(int val) {
                 &qTabMeasurement::GetNumBursts)
 }

+void qTabMeasurement::GetNumSamples() {
+    LOG(logDEBUG) << "Getting number of samples";
+    disconnect(spinNumSamples, SIGNAL(valueChanged(int)), this,
+               SLOT(SetNumSamples(int)));
+    try {
+        auto retval = det->getNumberOfAnalogSamples().tsquash(
+            "Inconsistent number of analog samples for all detectors.");
+        spinNumSamples->setValue(retval);
+    }
+    CATCH_DISPLAY("Could not get number of samples.",
+                  "qTabMeasurement::GetNumSamples")
+    connect(spinNumSamples, SIGNAL(valueChanged(int)), this,
+            SLOT(SetNumSamples(int)));
+}
+
+void qTabMeasurement::SetNumSamples(int val) {
+    LOG(logINFO) << "Setting number of samples to " << val;
+    try {
+        det->setNumberOfAnalogSamples(val);
+    }
+    CATCH_HANDLE("Could not set number of samples.",
+                 "qTabMeasurement::SetNumSamples", this,
+                 &qTabMeasurement::GetNumSamples)
+}
+
 void qTabMeasurement::GetNumGates() {
    LOG(logDEBUG) << "Getting number of gates";
    disconnect(spinNumGates, SIGNAL(valueChanged(int)), this,
@ -957,6 +1003,9 @@ void qTabMeasurement::Refresh() {
        if (spinBurstPeriod->isEnabled()) {
            GetBurstPeriod();
        }
+        if (sampleImplemented) {
+            GetNumSamples();
+        }
        if (gateImplemented) {
            GetNumGates();
        }
--- a/slsDetectorGui/src/qTabPlot.cpp
+++ b/slsDetectorGui/src/qTabPlot.cpp
@ -62,11 +62,6 @@ void qTabPlot::SetupWidgetWindow() {
        chkGainPlot->setChecked(true);
        plot->EnableGainPlot(true);
        break;
-    case slsDetectorDefs::MOENCH:
-        chkGainPlot->setEnabled(true);
-        chkGainPlot->setChecked(true);
-        plot->EnableGainPlot(true);
-        break;
    default:
        break;
    }
@ -804,9 +799,6 @@ void qTabPlot::Refresh() {
            chkGainPlot->setEnabled(true);
            GetGapPixels();
            break;
-        case slsDetectorDefs::MOENCH:
-            chkGainPlot->setEnabled(true);
-            break;
        case slsDetectorDefs::GOTTHARD2:
            chkGainPlot1D->setEnabled(true);
            break;
--- a/slsDetectorGui/src/qTabSettings.cpp
+++ b/slsDetectorGui/src/qTabSettings.cpp
@ -92,8 +92,7 @@ void qTabSettings::SetupWidgetWindow() {
        comboDynamicRange->setEnabled(true);
        lblThreshold->setEnabled(true);
        spinThreshold->setEnabled(true);
-    } else if (detType == slsDetectorDefs::JUNGFRAU ||
-               detType == slsDetectorDefs::MOENCH) {
+    } else if (detType == slsDetectorDefs::JUNGFRAU) {
        lblSpinHV->show();
        spinHV->show();
        lblGainMode->setEnabled(true);
@ -101,6 +100,9 @@ void qTabSettings::SetupWidgetWindow() {
    } else if (detType == slsDetectorDefs::GOTTHARD) {
        comboHV->show();
        lblComboHV->show();
+    } else if (detType == slsDetectorDefs::MOENCH) {
+        lblSpinHV->show();
+        spinHV->show();
    } else if (detType == slsDetectorDefs::GOTTHARD2) {
        lblSpinHV->show();
        spinHV->show();
@ -130,7 +132,7 @@ void qTabSettings::SetupWidgetWindow() {
 }

 void qTabSettings::SetExportMode(bool exportMode) {
-    if (comboGainMode->isVisible()) {
+    if (comboGainMode->isEnabled()) {
        ShowFixG0(exportMode);
    }
 }
--- a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
+++ b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
--- a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0
+++ b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0
--- a/slsDetectorServers/eigerDetectorServer/FebControl.c
+++ b/slsDetectorServers/eigerDetectorServer/FebControl.c
@ -1742,7 +1742,6 @@ int Feb_Control_WriteRegister_BitMask(uint32_t offset, uint32_t data,

 int Feb_Control_ReadRegister_BitMask(uint32_t offset, uint32_t *retval,
                                     uint32_t bitmask) {
-
    uint32_t actualOffset = offset;
    char side[2][10] = {"right", "left"};
    unsigned int addr[2] = {Feb_Control_rightAddress, Feb_Control_leftAddress};
@ -2207,51 +2206,6 @@ int Feb_Control_GetRightFPGATemp() {
    return (int)temperature;
 }

-int Feb_Control_GetFPGAHardwareVersion(int *retval) {
-    if (!Feb_Control_activated) {
-        return 0;
-    }
-    unsigned int value = 0;
-    if (!Feb_Control_ReadRegister_BitMask(FEB_REG_STATUS, &value,
-                                          FEB_REG_STATUS_FX30_MSK)) {
-        LOG(logERROR,
-            ("Trouble reading FEB_REG_STATUS reg to feb hardware version\n"));
-        return 0;
-    }
-    *retval = (value >> FEB_REG_STATUS_FX30_OFST);
-    return 1;
-}
-
-int64_t Feb_Control_GetFrontLeftFirmwareVersion() {
-    if (!Feb_Control_activated) {
-        return 0;
-    }
-    unsigned int value = 0;
-    if (!Feb_Interface_ReadRegister(Feb_Control_leftAddress, FEB_REG_STATUS,
-                                    &value)) {
-        LOG(logERROR, ("Trouble reading FEB_REG_STATUS reg to get left feb "
-                       "fw version\n"));
-        return 0;
-    }
-    return ((value & FEB_REG_STATUS_FW_VERSION_MSK) >>
-            FEB_REG_STATUS_FW_VERSION_OFST);
-}
-
-int64_t Feb_Control_GetFrontRightFirmwareVersion() {
-    if (!Feb_Control_activated) {
-        return 0;
-    }
-    unsigned int value = 0;
-    if (!Feb_Interface_ReadRegister(Feb_Control_rightAddress, FEB_REG_STATUS,
-                                    &value)) {
-        LOG(logERROR, ("Trouble reading FEB_REG_STATUS reg to get right feb "
-                       "fw version\n"));
-        return 0;
-    }
-    return ((value & FEB_REG_STATUS_FW_VERSION_MSK) >>
-            FEB_REG_STATUS_FW_VERSION_OFST);
-}
-
 int64_t Feb_Control_GetMeasuredPeriod() {
    if (!Feb_Control_activated) {
        return 0;
--- a/slsDetectorServers/eigerDetectorServer/FebControl.h
+++ b/slsDetectorServers/eigerDetectorServer/FebControl.h
@ -119,7 +119,5 @@ int Feb_Control_PrintCorrectedValues();
 // adcs
 int Feb_Control_GetLeftFPGATemp();
 int Feb_Control_GetRightFPGATemp();
-int64_t Feb_Control_GetFrontLeftFirmwareVersion();
-int64_t Feb_Control_GetFrontRightFirmwareVersion();
 int64_t Feb_Control_GetMeasuredPeriod();
 int64_t Feb_Control_GetSubMeasuredPeriod();
--- a/slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h
+++ b/slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h
@ -46,10 +46,6 @@
 #define FEB_REG_STATUS_WAIT_FOR_TRGGR_MSK   (0x00000001 << FEB_REG_STATUS_WAIT_FOR_TRGGR_OFST)
 #define FEB_REG_STATUS_ACQ_DONE_OFST        (6)
 #define FEB_REG_STATUS_ACQ_DONE_MSK         (0x00000001 << FEB_REG_STATUS_ACQ_DONE_OFST)
-#define FEB_REG_STATUS_FX30_OFST            (7)
-#define FEB_REG_STATUS_FX30_MSK             (0x00000001 << FEB_REG_STATUS_FX30_OFST)
-#define FEB_REG_STATUS_FW_VERSION_OFST      (8)
-#define FEB_REG_STATUS_FW_VERSION_MSK       (0x000000FF << FEB_REG_STATUS_FW_VERSION_OFST)
 #define FEB_REG_STATUS_TEMP_OFST            (16)
 #define FEB_REG_STATUS_TEMP_MSK             (0x0000FFFF << FEB_REG_STATUS_TEMP_OFST)

--- a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
+++ b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
--- a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv7.0.0
+++ b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv7.0.0
--- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
@ -123,18 +123,18 @@ void basictests() {
    int64_t sw_fw_apiversion = getFirmwareAPIVersion();

    LOG(logINFOBLUE,
-        ("\n********************************************************\n"
-         "Detector IP Addr         : 0x%x\n"
-         "Detector MAC Addr        : 0x%llx\n"
+        ("**************************************************\n"
+         "Detector IP Addr:\t\t 0x%x\n"
+         "Detector MAC Addr:\t\t 0x%llx\n"

-         "Firmware (Beb) Version   : %lld\n"
-         "F/w-S/w API Version      : %lld\n"
-         "Required Firmware Version: %d\n"
-         "Software Version         : %s\n"
+         "Firmware Version:\t\t %lld\n"
+         "Software Version:\t\t %s\n"
+         "F/w-S/w API Version:\t\t %lld\n"
+         "Required Firmware Version:\t %d\n"
         "********************************************************\n",
         (unsigned int)ipadd, (long long unsigned int)macadd,
-         (long long int)fwversion, (long long int)sw_fw_apiversion,
-         REQUIRED_FIRMWARE_VERSION, swversion));
+         (long long int)fwversion, swversion, (long long int)sw_fw_apiversion,
+         REQUIRED_FIRMWARE_VERSION));

    // update default udpdstip and udpdstmac (1g is hardware ip and hardware
    // mac)
@ -161,9 +161,9 @@ void basictests() {
    // check for API compatibility - old server
    if (sw_fw_apiversion > REQUIRED_FIRMWARE_VERSION) {
        sprintf(initErrorMessage,
-                "This firmware-software api version (0x%lld) is incompatible "
+                "This firmware-software api version (0x%llx) is incompatible "
                "with the software's minimum required firmware version "
-                "(0x%lld).\nPlease update detector software to be compatible "
+                "(0x%llx).\nPlease update detector software to be compatible "
                "with this firmware.\n",
                (long long int)sw_fw_apiversion,
                (long long int)REQUIRED_FIRMWARE_VERSION);
@ -210,70 +210,20 @@ void getServerVersion(char *version) { strcpy(version, APIEIGER); }

 u_int64_t getFirmwareVersion() {
 #ifdef VIRTUAL
-    return REQUIRED_FIRMWARE_VERSION;
+    return 0;
 #else
    return Beb_GetFirmwareRevision();
 #endif
 }

-uint64_t getFrontEndFirmwareVersion(enum fpgaPosition fpgaPosition) {
-    uint64_t retval = 0;
-#ifdef VIRTUAL
-    return REQUIRED_FIRMWARE_VERSION;
-#else
-    sharedMemory_lockLocalLink();
-    switch (fpgaPosition) {
-    case FRONT_LEFT:
-        retval = Feb_Control_GetFrontLeftFirmwareVersion(fpgaPosition);
-        break;
-    case FRONT_RIGHT:
-        retval = Feb_Control_GetFrontRightFirmwareVersion(fpgaPosition);
-        break;
-    default:
-        LOG(logERROR,
-            ("unknown index for fpga position to read firmware version\n"));
-        retval = 0;
-    }
-    sharedMemory_unlockLocalLink();
-#endif
-    return retval;
-}
-
 u_int64_t getFirmwareAPIVersion() {
 #ifdef VIRTUAL
-    return REQUIRED_FIRMWARE_VERSION;
+    return 0;
 #else
-    return Beb_GetFirmwareSoftwareAPIVersion();
+    return (u_int64_t)Beb_GetFirmwareSoftwareAPIVersion();
 #endif
 }

-void getHardwareVersion(char *version) {
-    strcpy(version, "unknown");
-    int hwversion = getHardwareVersionNumber();
-    const int hwNumberList[] = HARDWARE_VERSION_NUMBERS;
-    const char *hwNamesList[] = HARDWARE_VERSION_NAMES;
-    for (int i = 0; i != NUM_HARDWARE_VERSIONS; ++i) {
-        LOG(logDEBUG, ("0x%x %d 0x%x %s\n", hwversion, i, hwNumberList[i],
-                       hwNamesList[i]));
-        if (hwNumberList[i] == hwversion) {
-            strcpy(version, hwNamesList[i]);
-            return;
-        }
-    }
-}
-
-int getHardwareVersionNumber() {
-    int retval = 0;
-#ifndef VIRTUAL
-    sharedMemory_lockLocalLink();
-    if (!Feb_Control_GetFPGAHardwareVersion(&retval)) {
-        retval = -1;
-    }
-    sharedMemory_unlockLocalLink();
-#endif
-    return retval;
-}
-
 int getModuleId(int *ret, char *mess) {
    return getModuleIdInFile(ret, mess, ID_FILE);
 }
@ -405,37 +355,6 @@ void initControlServer() {
        Beb_SetTopVariable(top);
        Beb_Beb();
        LOG(logDEBUG1, ("Control server: BEB Initialization done\n"));
-
-        // Getting the feb versions after initialization
-        char hversion[MAX_STR_LENGTH] = {0};
-        memset(hversion, 0, MAX_STR_LENGTH);
-        getHardwareVersion(hversion);
-        int64_t fwversion = getFirmwareVersion();
-        int64_t feblfwversion = getFrontEndFirmwareVersion(FRONT_LEFT);
-        int64_t febrfwversion = getFrontEndFirmwareVersion(FRONT_RIGHT);
-        LOG(logINFOBLUE,
-            ("\n********************************************************\n"
-             "Feb Versions\n"
-             "Hardware Version         : %s\n"
-             "Firmware (Febl) Version  : %lld\n"
-             "Firmware (Febr) Version  : %lld\n"
-             "********************************************************\n",
-             hversion, (long long int)feblfwversion,
-             (long long int)febrfwversion));
-
-        // ensure febl, febr and beb fw versions are the same
-        if (fwversion != feblfwversion || fwversion != febrfwversion) {
-            sprintf(
-                initErrorMessage,
-                "Inconsistent firmware versions in feb and beb. [Beb: %lld, "
-                "Febl: %lld Febr: %lld]\n",
-                (long long int)fwversion, (long long int)feblfwversion,
-                (long long int)febrfwversion);
-            LOG(logERROR, (initErrorMessage));
-            initError = FAIL;
-            return;
-        }
-
 #endif
        // also reads config file and deactivates
        setupDetector();
--- a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
@ -5,11 +5,6 @@

 #define LINKED_SERVER_NAME "eigerDetectorServer"

-#define NUM_HARDWARE_VERSIONS    (2)
-#define HARDWARE_VERSION_NUMBERS {0x0, 0x1};
-#define HARDWARE_VERSION_NAMES                                                 \
-    { "FX70T", "FX30T" }
-
 #define REQUIRED_FIRMWARE_VERSION (31)
 // virtual ones renamed for consistency
 // real ones keep previous name for compatibility (already in production)
--- a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
+++ b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
--- a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0
+++ b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0
--- a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
+++ b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
--- a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0
+++ b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0
--- a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
+++ b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
--- a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.2
+++ b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.2
--- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
@ -1388,14 +1388,18 @@ int setMaster(enum MASTERINDEX m) {
    char *master_names[] = {MASTER_NAMES};
    LOG(logINFOBLUE, ("Setting up as %s in (%s server)\n", master_names[m],
                      (isControlServer ? "control" : "stop")));
+
+    int prevSync = getSynchronization();
+    setSynchronization(0);
    int retval = -1;
+    int retMaster = OK;
    switch (m) {
    case OW_MASTER:
        bus_w(CONTROL_REG, bus_r(CONTROL_REG) | CONTROL_MASTER_MSK);
        isMaster(&retval);
        if (retval != 1) {
            LOG(logERROR, ("Could not set master\n"));
-            return FAIL;
+            retMaster = FAIL;
        }
        break;
    case OW_SLAVE:
@ -1403,15 +1407,16 @@ int setMaster(enum MASTERINDEX m) {
        isMaster(&retval);
        if (retval != 0) {
            LOG(logERROR, ("Could not set slave\n"));
-            return FAIL;
+            retMaster = FAIL;
        }
        break;
    default:
        LOG(logERROR, ("Cannot reset to hardware settings from client. Restart "
                       "detector server.\n"));
-        return FAIL;
+        retMaster = FAIL;
    }
-    return OK;
+    setSynchronization(prevSync);
+    return retMaster;
 }

 int isMaster(int *retval) {
@ -1449,7 +1454,7 @@ void setTiming(enum timingMode arg) {
 }

 enum timingMode getTiming() {
-    if (bus_r(EXT_SIGNAL_REG) == EXT_SIGNAL_MSK)
+    if ((bus_r(EXT_SIGNAL_REG) & EXT_SIGNAL_MSK) >> EXT_SIGNAL_OFST)
        return TRIGGER_EXPOSURE;
    return AUTO_TIMING;
 }
@ -1736,40 +1741,40 @@ int setDetectorPosition(int pos[]) {
    detPos[2] = outerPos[X];
    detPos[3] = outerPos[Y];

-    // row
+    // row [Y]
    // outer
    uint32_t addr = COORD_ROW_REG;
    bus_w(addr,
          (bus_r(addr) & ~COORD_ROW_OUTER_MSK) |
-              ((outerPos[X] << COORD_ROW_OUTER_OFST) & COORD_ROW_OUTER_MSK));
+              ((outerPos[Y] << COORD_ROW_OUTER_OFST) & COORD_ROW_OUTER_MSK));
    if (((bus_r(addr) & COORD_ROW_OUTER_MSK) >> COORD_ROW_OUTER_OFST) !=
-        outerPos[X])
-        ret = FAIL;
-    // inner
-    bus_w(addr,
-          (bus_r(addr) & ~COORD_ROW_INNER_MSK) |
-              ((innerPos[X] << COORD_ROW_INNER_OFST) & COORD_ROW_INNER_MSK));
-    if (((bus_r(addr) & COORD_ROW_INNER_MSK) >> COORD_ROW_INNER_OFST) !=
-        innerPos[X])
-        ret = FAIL;
-
-    // col
-    // outer
-    addr = COORD_COL_REG;
-    bus_w(addr,
-          (bus_r(addr) & ~COORD_COL_OUTER_MSK) |
-              ((outerPos[Y] << COORD_COL_OUTER_OFST) & COORD_COL_OUTER_MSK));
-    if (((bus_r(addr) & COORD_COL_OUTER_MSK) >> COORD_COL_OUTER_OFST) !=
        outerPos[Y])
        ret = FAIL;
    // inner
    bus_w(addr,
-          (bus_r(addr) & ~COORD_COL_INNER_MSK) |
-              ((innerPos[Y] << COORD_COL_INNER_OFST) & COORD_COL_INNER_MSK));
-    if (((bus_r(addr) & COORD_COL_INNER_MSK) >> COORD_COL_INNER_OFST) !=
+          (bus_r(addr) & ~COORD_ROW_INNER_MSK) |
+              ((innerPos[Y] << COORD_ROW_INNER_OFST) & COORD_ROW_INNER_MSK));
+    if (((bus_r(addr) & COORD_ROW_INNER_MSK) >> COORD_ROW_INNER_OFST) !=
        innerPos[Y])
        ret = FAIL;

+    // col [X]
+    // outer
+    addr = COORD_COL_REG;
+    bus_w(addr,
+          (bus_r(addr) & ~COORD_COL_OUTER_MSK) |
+              ((outerPos[X] << COORD_COL_OUTER_OFST) & COORD_COL_OUTER_MSK));
+    if (((bus_r(addr) & COORD_COL_OUTER_MSK) >> COORD_COL_OUTER_OFST) !=
+        outerPos[X])
+        ret = FAIL;
+    // inner
+    bus_w(addr,
+          (bus_r(addr) & ~COORD_COL_INNER_MSK) |
+              ((innerPos[X] << COORD_COL_INNER_OFST) & COORD_COL_INNER_MSK));
+    if (((bus_r(addr) & COORD_COL_INNER_MSK) >> COORD_COL_INNER_OFST) !=
+        innerPos[X])
+        ret = FAIL;
+
    if (ret == OK) {
        if (getNumberofUDPInterfaces() == 1) {
            LOG(logINFOBLUE, ("Position set to [%d, %d] #(col, row)\n",
--- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
+++ b/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 0x221104 // 1.0 pcb (version = 010)
-#define REQRD_FRMWRE_VRSN        0x221103 // 2.0 pcb (version = 011)
+#define REQRD_FRMWRE_VRSN_BOARD2 0x230516 // 1.0 pcb (version = 010)
+#define REQRD_FRMWRE_VRSN        0x230515 // 2.0 pcb (version = 011)

 #define NUM_HARDWARE_VERSIONS (2)
 #define HARDWARE_VERSION_NUMBERS                                               \
--- a/slsDetectorServers/moenchDetectorServer/CMakeLists.txt
+++ b/slsDetectorServers/moenchDetectorServer/CMakeLists.txt
@ -8,28 +8,35 @@ add_executable(moenchDetectorServer_virtual
    ../slsDetectorServer/src/blackfin.c
    ../slsDetectorServer/src/common.c
    ../slsDetectorServer/src/commonServerFunctions.c
+    ../slsDetectorServer/src/communication_funcs_UDP.c
+    ../slsDetectorServer/src/UDPPacketHeaderGenerator.c
    ../slsDetectorServer/src/AD9257.c
    ../slsDetectorServer/src/ALTERA_PLL.c
    ../slsDetectorServer/src/LTC2620.c
    ../slsDetectorServer/src/MAX1932.c
-    ../slsDetectorServer/src/programViaBlackfin.c
-    ../slsDetectorServer/src/communication_funcs_UDP.c    
+    ../slsDetectorServer/src/programViaBlackfin.c   
+    ../slsDetectorServer/src/loadPattern.c         
    ../slsDetectorServer/src/sharedMemory.c
    ../../slsSupportLib/src/md5.c
 )

-target_include_directories(moenchDetectorServer_virtual
-    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+include_directories(
    ../slsDetectorServer/include
    ../../slsSupportLib/include
+    ../../slsDetectorSoftware/include/sls/
+)
+
+target_include_directories(moenchDetectorServer_virtual
+    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
 )

 target_compile_definitions(moenchDetectorServer_virtual
-    PUBLIC MOENCHD VIRTUAL STOP_SERVER #TEST_MOD_GEOMETRY
+    PUBLIC MOENCHD VIRTUAL STOP_SERVER
 )

 target_link_libraries(moenchDetectorServer_virtual
    PUBLIC pthread rt slsProjectCSettings
+    m
 )

 set_target_properties(moenchDetectorServer_virtual PROPERTIES
@ -37,9 +44,7 @@ set_target_properties(moenchDetectorServer_virtual PROPERTIES
 )

 install(TARGETS moenchDetectorServer_virtual
-    EXPORT "${TARGETS_EXPORT_NAME}"
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR}
 )

-configure_file(config_moench.txt ${CMAKE_BINARY_DIR}/bin/config_moench.txt COPYONLY)
-configure_file(detid_moench.txt ${CMAKE_BINARY_DIR}/bin/detid_moench.txt COPYONLY)
+configure_file(DefaultPattern_moench.txt ${CMAKE_BINARY_DIR}/bin/DefaultPattern_moench.txt COPYONLY)
--- a/slsDetectorServers/moenchDetectorServer/DefaultPattern_moench.txt
+++ b/slsDetectorServers/moenchDetectorServer/DefaultPattern_moench.txt
@ -0,0 +1,301 @@
+patword 0x0000 0x0008599f0418503a
+patword 0x0001 0x0008599f0418503a
+patword 0x0002 0x000859960418503a
+patword 0x0003 0x000859960418503a
+patword 0x0004 0x000859960418503a
+patword 0x0005 0x000859960418503a
+patword 0x0006 0x000859960418503a
+patword 0x0007 0x000859960418503a
+patword 0x0008 0x000859960418503a
+patword 0x0009 0x000859960418503a
+patword 0x000a 0x000859960418503a
+patword 0x000b 0x000859960418503a
+patword 0x000c 0x000859960418503a
+patword 0x000d 0x000859960418503a
+patword 0x000e 0x000859960418503a
+patword 0x000f 0x000859960418503a
+patword 0x0010 0x000859960418503a
+patword 0x0011 0x000859960418503a
+patword 0x0012 0x000859960418503a
+patword 0x0013 0x000859960418503a
+patword 0x0014 0x000859960418503a
+patword 0x0015 0x000859960418503a
+patword 0x0016 0x000819960418501a
+patword 0x0017 0x000819960418501a
+patword 0x0018 0x000819960418501a
+patword 0x0019 0x000819960418501a
+patword 0x001a 0x000819960418501a
+patword 0x001b 0x000819960418501a
+patword 0x001c 0x000819960418501a
+patword 0x001d 0x000819960418501a
+patword 0x001e 0x000819960418501a
+patword 0x001f 0x000819960418501a
+patword 0x0020 0x000819960418501a
+patword 0x0021 0x000819960418501a
+patword 0x0022 0x000819960418501a
+patword 0x0023 0x000819960418501a
+patword 0x0024 0x000819960418501a
+patword 0x0025 0x000819960418501a
+patword 0x0026 0x000819960418501a
+patword 0x0027 0x000819960418501a
+patword 0x0028 0x000819960418501a
+patword 0x0029 0x000819960418501a
+patword 0x002a 0x000819960418501a
+patword 0x002b 0x000819960418501a
+patword 0x002c 0x000819960418501a
+patword 0x002d 0x000819960418501a
+patword 0x002e 0x000819960418501a
+patword 0x002f 0x000819960418501a
+patword 0x0030 0x000819960008501a
+patword 0x0031 0x000819960008501a
+patword 0x0032 0x000819960008501a
+patword 0x0033 0x000819960008501a
+patword 0x0034 0x000819960008501a
+patword 0x0035 0x000819960008501a
+patword 0x0036 0x000819960008501a
+patword 0x0037 0x000819960008501a
+patword 0x0038 0x000819960008501a
+patword 0x0039 0x000819960008501a
+patword 0x003a 0x000819960008501a
+patword 0x003b 0x000819960008501a
+patword 0x003c 0x000819960008501a
+patword 0x003d 0x000819960008501a
+patword 0x003e 0x000819960008501a
+patword 0x003f 0x000819960008501a
+patword 0x0040 0x000819960008501a
+patword 0x0041 0x000819960008501a
+patword 0x0042 0x000819960008501a
+patword 0x0043 0x000819960008501a
+patword 0x0044 0x0008199f0008501a
+patword 0x0045 0x0008199f0008501a
+patword 0x0046 0x0008199f0008501a
+patword 0x0047 0x0008199f0008501a
+patword 0x0048 0x0008199f0008501a
+patword 0x0049 0x0008199f0008501a
+patword 0x004a 0x0008199f0008501a
+patword 0x004b 0x0008199f0008501a
+patword 0x004c 0x0008199f0008501a
+patword 0x004d 0x0008199f0008501a
+patword 0x004e 0x0008199f0008501a
+patword 0x004f 0x0008199f0008501a
+patword 0x0050 0x0008199f0008501a
+patword 0x0051 0x0008199f0008501a
+patword 0x0052 0x0008199f0008501a
+patword 0x0053 0x0008199f0008501a
+patword 0x0054 0x0008199f0008501a
+patword 0x0055 0x0008199f0008501a
+patword 0x0056 0x0008199f0008501a
+patword 0x0057 0x0008199f0008501a
+patword 0x0058 0x0008599f0008503a
+patword 0x0059 0x0008599f0008503a
+patword 0x005a 0x000c599f000850ba
+patword 0x005b 0x000c599f000850ba
+patword 0x005c 0x000c599f000850ba
+patword 0x005d 0x000c599f000850ba
+patword 0x005e 0x000c599f000850ba
+patword 0x005f 0x000c599f000850ba
+patword 0x0060 0x000c599f000850ba
+patword 0x0061 0x000c599f000850ba
+patword 0x0062 0x000c599f000850ba
+patword 0x0063 0x000c599f000850ba
+patword 0x0064 0x000c599f000850ba
+patword 0x0065 0x000c599f000850ba
+patword 0x0066 0x000c599f000850ba
+patword 0x0067 0x000c599f000850ba
+patword 0x0068 0x000c599f000850ba
+patword 0x0069 0x000c599f000850ba
+patword 0x006a 0x000c599f000850ba
+patword 0x006b 0x000c599f000850ba
+patword 0x006c 0x000c599f000850ba
+patword 0x006d 0x000c599f000850ba
+patword 0x006e 0x000c799f010858ba
+patword 0x006f 0x000c799f010858ba
+patword 0x0070 0x000c599f000850ba
+patword 0x0071 0x000c599f000850ba
+patword 0x0072 0x000c599f000850ba
+patword 0x0073 0x000c599f000850ba
+patword 0x0074 0x000c599f000850ba
+patword 0x0075 0x000c599f000850ba
+patword 0x0076 0x000c599f000850ba
+patword 0x0077 0x000c599f000850ba
+patword 0x0078 0x000c599f000850ba
+patword 0x0079 0x000c599f000850ba
+patword 0x007a 0x000c599f000850ba
+patword 0x007b 0x000c599f000850ba
+patword 0x007c 0x000c599f000850ba
+patword 0x007d 0x000c599f000850ba
+patword 0x007e 0x000c599f000850ba
+patword 0x007f 0x000c599f000850ba
+patword 0x0080 0x000c599f000850ba
+patword 0x0081 0x000c599f000850ba
+patword 0x0082 0x000c599f000850ba
+patword 0x0083 0x000c599f000850ba
+patword 0x0084 0x000c599f000850ba
+patword 0x0085 0x000c599f000850ba
+patword 0x0086 0x000c599f400850ba
+patword 0x0087 0x000c599f400850ba
+patword 0x0088 0x000c599f600850ba
+patword 0x0089 0x000c599f400850ba
+patword 0x008a 0x000c599f400850ba
+patword 0x008b 0x000c599f400850ba
+patword 0x008c 0x840c599f682e50ba
+patword 0x008d 0x840c599f482850ba
+patword 0x008e 0x840c599f000e50ba
+patword 0x008f 0x840c599f000850ba
+patword 0x0090 0x840c599f000e50ba
+patword 0x0091 0x840c599f000850ba
+patword 0x0092 0x840c599f000e50ba
+patword 0x0093 0x840c599f000850ba
+patword 0x0094 0x840c599f000e50ba
+patword 0x0095 0x840c599f000850ba
+patword 0x0096 0x840c599f000e50ba
+patword 0x0097 0x840c599f000850ba
+patword 0x0098 0x840c599f000e50ba
+patword 0x0099 0x840c599f000850ba
+patword 0x009a 0x840c599f000e50ba
+patword 0x009b 0x840c599f000850ba
+patword 0x009c 0x840c599f000e50ba
+patword 0x009d 0x840c599f000850ba
+patword 0x009e 0x840c599f000e50ba
+patword 0x009f 0x840c599f000850ba
+patword 0x00a0 0x840c599f000e50ba
+patword 0x00a1 0x840c599f000850ba
+patword 0x00a2 0x840c599f000e50ba
+patword 0x00a3 0x840c599f000850ba
+patword 0x00a4 0x840c599f000e50ba
+patword 0x00a5 0x840c599f000850ba
+patword 0x00a6 0x840c599f200e50ba
+patword 0x00a7 0x840c599f000850ba
+patword 0x00a8 0x840c599f000e50ba
+patword 0x00a9 0x840c599f000850ba
+patword 0x00aa 0x840c599f000e50ba
+patword 0x00ab 0x840c599f000850ba
+patword 0x00ac 0x840c599f000e50ba
+patword 0x00ad 0x840c599f000850ba
+patword 0x00ae 0x840c599f000e50ba
+patword 0x00af 0x840c599f000850ba
+patword 0x00b0 0x840c599f000e50ba
+patword 0x00b1 0x840c599f000850ba
+patword 0x00b2 0x840c599f000e50ba
+patword 0x00b3 0x840c599f000850ba
+patword 0x00b4 0x840c599f000e50ba
+patword 0x00b5 0x840c599f000850ba
+patword 0x00b6 0x840c599f000e50ba
+patword 0x00b7 0x840c599f000850ba
+patword 0x00b8 0x840c599f000e50ba
+patword 0x00b9 0x840c599f000850ba
+patword 0x00ba 0x840c599f000e50ba
+patword 0x00bb 0x840c599f000850ba
+patword 0x00bc 0x840c599f000e50ba
+patword 0x00bd 0x840c599f000850ba
+patword 0x00be 0x840c599f282e50ba
+patword 0x00bf 0x840c599f082850ba
+patword 0x00c0 0x840c599f000e50ba
+patword 0x00c1 0x840c599f000850ba
+patword 0x00c2 0x840c599f000e50ba
+patword 0x00c3 0x840c599f000850ba
+patword 0x00c4 0x840c599f000e50ba
+patword 0x00c5 0x840c599f000850ba
+patword 0x00c6 0x840c599f000e50ba
+patword 0x00c7 0x840c599f000850ba
+patword 0x00c8 0x840c599f000e50ba
+patword 0x00c9 0x840c599f000850ba
+patword 0x00ca 0x840c599f000e50ba
+patword 0x00cb 0x840c599f000850ba
+patword 0x00cc 0x840c599f000e50ba
+patword 0x00cd 0x840c599f000850ba
+patword 0x00ce 0x840c599f000e50ba
+patword 0x00cf 0x840c599f000850ba
+patword 0x00d0 0x840c599f000e50ba
+patword 0x00d1 0x840c599f000850ba
+patword 0x00d2 0x840c599f000e50ba
+patword 0x00d3 0x840c599f000850ba
+patword 0x00d4 0x840c599f000e50ba
+patword 0x00d5 0x840c599f000850ba
+patword 0x00d6 0x840c599f000e50ba
+patword 0x00d7 0x840c599f000850ba
+patword 0x00d8 0x840c599f200e50ba
+patword 0x00d9 0x840c599f000850ba
+patword 0x00da 0x840c599f000e50ba
+patword 0x00db 0x840c599f000850ba
+patword 0x00dc 0x840c599f000e50ba
+patword 0x00dd 0x840c599f000850ba
+patword 0x00de 0x840c599f000e50ba
+patword 0x00df 0x840c599f000850ba
+patword 0x00e0 0x840c599f000e50ba
+patword 0x00e1 0x840c599f000850ba
+patword 0x00e2 0x840c599f000e50ba
+patword 0x00e3 0x840c599f000850ba
+patword 0x00e4 0x840c599f000e50ba
+patword 0x00e5 0x840c599f000850ba
+patword 0x00e6 0x840c599f000e50ba
+patword 0x00e7 0x840c599f000850ba
+patword 0x00e8 0x840c599f000e50ba
+patword 0x00e9 0x840c599f000850ba
+patword 0x00ea 0x840c599f000e50ba
+patword 0x00eb 0x840c599f000850ba
+patword 0x00ec 0x840c599f000e50ba
+patword 0x00ed 0x840c599f000850ba
+patword 0x00ee 0x840c599f000e50ba
+patword 0x00ef 0x840c599f000850ba
+patword 0x00f0 0x040c599f000850ba
+patword 0x00f1 0x040c599f000850ba
+patword 0x00f2 0x000c599f000850ba
+patword 0x00f3 0x000c599f000850ba
+patword 0x00f4 0x0008599f200e503a
+patword 0x00f5 0x0008599f0008503a
+patword 0x00f6 0x0008599f200e503a
+patword 0x00f7 0x0008599f0008503a
+patword 0x00f8 0x0008599f0008503a
+patword 0x00f9 0x0008599f0008503a
+patword 0x00fa 0x0008599f0008503a
+patword 0x00fb 0x0008599f0008503a
+patword 0x00fc 0x0008599f0008503a
+patword 0x00fd 0x0008599f0008503a
+patword 0x00fe 0x0008599f0008503a
+patword 0x00ff 0x0008599f0008503a
+patword 0x0100 0x0008599f0008503a
+patword 0x0101 0x0008599f0008503a
+patword 0x0102 0x0008599f0008503a
+patword 0x0103 0x0008599f0008503a
+patword 0x0104 0x0008599f0008503a
+patword 0x0105 0x0008599f0008503a
+patword 0x0106 0x0008599f0008503a
+patword 0x0107 0x0008599f0008503a
+patword 0x0108 0x0008599f0008503a
+patword 0x0109 0x0008599f0008503a
+patword 0x010a 0x0008599f0008503a
+patword 0x010b 0x0008599f0008503a
+patword 0x010c 0x0008599f0008503a
+patword 0x010d 0x0008599f0008503a
+patword 0x010e 0x0008599f0008503a
+patword 0x010f 0x0008599f0008503a
+patword 0x0110 0x0008599f0008503a
+patword 0x0111 0x0008599f0008503a
+patioctrl 0x8f0effff6dbffdbf
+patlimits 0x0000 0x0110
+patloop 0 0x00be 0x00ef
+patnloop 0 199
+patloop 1 0x0400 0x0400
+patnloop 1 0
+patloop 2 0x0400 0x0400
+patnloop 2 0
+patwait 0 0x002e
+patwaittime 0 800
+patwait 1 0x0400
+patwaittime 1 0
+patwait 2 0x0400
+patwaittime 2 0
+
+patloop 3 0x1fff 0x1fff
+patnloop 3 0
+patloop 4 0x1fff 0x1fff
+patnloop 4 0
+patloop 5 0x1fff 0x1fff
+patnloop 5 0
+patwait 3 0x1fff
+patwaittime 3 0
+patwait 4 0x1fff
+patwaittime 4 0
+patwait 5 0x1fff
+patwaittime 5 0
--- a/slsDetectorServers/moenchDetectorServer/Makefile
+++ b/slsDetectorServers/moenchDetectorServer/Makefile
@ -4,21 +4,22 @@ current_dir = $(shell pwd)
 main_inc = ../slsDetectorServer/include/
 main_src = ../slsDetectorServer/src/
 support_lib = ../../slsSupportLib/include/
+det_lib = ../../slsDetectorSoftware/include/sls/
 md5_dir = ../../slsSupportLib/src/

 CROSS  		= bfin-uclinux-
 CC    		= $(CROSS)gcc
-CFLAGS		+=  -Wall -std=gnu99 -DMOENCHD  -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir)  #-DVERBOSEI #-DVERBOSE 
-LDLIBS		+= 	-lm -lrt -pthread
+CFLAGS		+=  -Wall -std=gnu99 -DMOENCHD  -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(det_lib) -I$(current_dir)   #-DVERBOSEI #-DVERBOSE 
+LDLIBS		+= 	-lm -lrt -pthread  
 PROGS		= 	moenchDetectorServer 
 DESTDIR		?= 	bin
 INSTMODE	= 	0777

-SRCS	=	slsDetectorFunctionList.c 
-SRCS	+=	$(main_src)slsDetectorServer.c $(main_src)slsDetectorServer_funcs.c $(main_src)communication_funcs.c $(main_src)blackfin.c $(main_src)common.c $(main_src)commonServerFunctions.c  $(main_src)AD9257.c $(main_src)ALTERA_PLL.c $(main_src)LTC2620.c $(main_src)MAX1932.c $(main_src)programViaBlackfin.c $(main_src)/sharedMemory.c $(md5_dir)md5.c
+SRCS 		= 	slsDetectorFunctionList.c 
+SRCS		+=	$(main_src)slsDetectorServer.c $(main_src)slsDetectorServer_funcs.c $(main_src)communication_funcs.c $(main_src)blackfin.c $(main_src)common.c $(main_src)commonServerFunctions.c $(main_src)communication_funcs_UDP.c $(main_src)UDPPacketHeaderGenerator.c $(main_src)AD9257.c $(main_src)ALTERA_PLL.c $(main_src)LTC2620.c $(main_src)MAX1932.c $(main_src)programViaBlackfin.c $(main_src)loadPattern.c $(main_src)/sharedMemory.c $(md5_dir)md5.c
+
+OBJS 		= 	$(SRCS:.c=.o) 

-OBJS 	= 	$(SRCS:.c=.o) 
- 
 all: clean $(PROGS)
 version: clean versioning $(PROGS)

@ -34,12 +35,12 @@ versioning:
 $(PROGS): $(OBJS)
 #	echo $(OBJS) 
 	mkdir -p $(DESTDIR) 
-	$(CC) -o $@ $^ $(CFLAGS)  $(LDLIBS)  
+	$(CC) -o $@ $^ $(CFLAGS) $(LDLIBS) 
 	mv $(PROGS) $(DESTDIR)
-	cp config_moench.txt $(DESTDIR)
-	cp detid_moench.txt $(DESTDIR)
+	cp DefaultPattern_moench.txt $(DESTDIR)
 	rm *.gdb
-	rm $(main_src)*.o $(md5_dir)*.o
+	rm $(main_src)*.o
+	rm *.o  $(md5_dir)*.o

 clean:
 	rm -rf $(DESTDIR)/$(PROGS)  *.o *.gdb $(main_src)*.o $(md5_dir)*.o
--- a/slsDetectorServers/moenchDetectorServer/RegisterDefs.h
+++ b/slsDetectorServers/moenchDetectorServer/RegisterDefs.h
--- a/slsDetectorServers/moenchDetectorServer/bin/DefaultPattern_moench.txt
+++ b/slsDetectorServers/moenchDetectorServer/bin/DefaultPattern_moench.txt
@ -0,0 +1,301 @@
+patword 0x0000 0x0008599f0418503a
+patword 0x0001 0x0008599f0418503a
+patword 0x0002 0x000859960418503a
+patword 0x0003 0x000859960418503a
+patword 0x0004 0x000859960418503a
+patword 0x0005 0x000859960418503a
+patword 0x0006 0x000859960418503a
+patword 0x0007 0x000859960418503a
+patword 0x0008 0x000859960418503a
+patword 0x0009 0x000859960418503a
+patword 0x000a 0x000859960418503a
+patword 0x000b 0x000859960418503a
+patword 0x000c 0x000859960418503a
+patword 0x000d 0x000859960418503a
+patword 0x000e 0x000859960418503a
+patword 0x000f 0x000859960418503a
+patword 0x0010 0x000859960418503a
+patword 0x0011 0x000859960418503a
+patword 0x0012 0x000859960418503a
+patword 0x0013 0x000859960418503a
+patword 0x0014 0x000859960418503a
+patword 0x0015 0x000859960418503a
+patword 0x0016 0x000819960418501a
+patword 0x0017 0x000819960418501a
+patword 0x0018 0x000819960418501a
+patword 0x0019 0x000819960418501a
+patword 0x001a 0x000819960418501a
+patword 0x001b 0x000819960418501a
+patword 0x001c 0x000819960418501a
+patword 0x001d 0x000819960418501a
+patword 0x001e 0x000819960418501a
+patword 0x001f 0x000819960418501a
+patword 0x0020 0x000819960418501a
+patword 0x0021 0x000819960418501a
+patword 0x0022 0x000819960418501a
+patword 0x0023 0x000819960418501a
+patword 0x0024 0x000819960418501a
+patword 0x0025 0x000819960418501a
+patword 0x0026 0x000819960418501a
+patword 0x0027 0x000819960418501a
+patword 0x0028 0x000819960418501a
+patword 0x0029 0x000819960418501a
+patword 0x002a 0x000819960418501a
+patword 0x002b 0x000819960418501a
+patword 0x002c 0x000819960418501a
+patword 0x002d 0x000819960418501a
+patword 0x002e 0x000819960418501a
+patword 0x002f 0x000819960418501a
+patword 0x0030 0x000819960008501a
+patword 0x0031 0x000819960008501a
+patword 0x0032 0x000819960008501a
+patword 0x0033 0x000819960008501a
+patword 0x0034 0x000819960008501a
+patword 0x0035 0x000819960008501a
+patword 0x0036 0x000819960008501a
+patword 0x0037 0x000819960008501a
+patword 0x0038 0x000819960008501a
+patword 0x0039 0x000819960008501a
+patword 0x003a 0x000819960008501a
+patword 0x003b 0x000819960008501a
+patword 0x003c 0x000819960008501a
+patword 0x003d 0x000819960008501a
+patword 0x003e 0x000819960008501a
+patword 0x003f 0x000819960008501a
+patword 0x0040 0x000819960008501a
+patword 0x0041 0x000819960008501a
+patword 0x0042 0x000819960008501a
+patword 0x0043 0x000819960008501a
+patword 0x0044 0x0008199f0008501a
+patword 0x0045 0x0008199f0008501a
+patword 0x0046 0x0008199f0008501a
+patword 0x0047 0x0008199f0008501a
+patword 0x0048 0x0008199f0008501a
+patword 0x0049 0x0008199f0008501a
+patword 0x004a 0x0008199f0008501a
+patword 0x004b 0x0008199f0008501a
+patword 0x004c 0x0008199f0008501a
+patword 0x004d 0x0008199f0008501a
+patword 0x004e 0x0008199f0008501a
+patword 0x004f 0x0008199f0008501a
+patword 0x0050 0x0008199f0008501a
+patword 0x0051 0x0008199f0008501a
+patword 0x0052 0x0008199f0008501a
+patword 0x0053 0x0008199f0008501a
+patword 0x0054 0x0008199f0008501a
+patword 0x0055 0x0008199f0008501a
+patword 0x0056 0x0008199f0008501a
+patword 0x0057 0x0008199f0008501a
+patword 0x0058 0x0008599f0008503a
+patword 0x0059 0x0008599f0008503a
+patword 0x005a 0x000c599f000850ba
+patword 0x005b 0x000c599f000850ba
+patword 0x005c 0x000c599f000850ba
+patword 0x005d 0x000c599f000850ba
+patword 0x005e 0x000c599f000850ba
+patword 0x005f 0x000c599f000850ba
+patword 0x0060 0x000c599f000850ba
+patword 0x0061 0x000c599f000850ba
+patword 0x0062 0x000c599f000850ba
+patword 0x0063 0x000c599f000850ba
+patword 0x0064 0x000c599f000850ba
+patword 0x0065 0x000c599f000850ba
+patword 0x0066 0x000c599f000850ba
+patword 0x0067 0x000c599f000850ba
+patword 0x0068 0x000c599f000850ba
+patword 0x0069 0x000c599f000850ba
+patword 0x006a 0x000c599f000850ba
+patword 0x006b 0x000c599f000850ba
+patword 0x006c 0x000c599f000850ba
+patword 0x006d 0x000c599f000850ba
+patword 0x006e 0x000c799f010858ba
+patword 0x006f 0x000c799f010858ba
+patword 0x0070 0x000c599f000850ba
+patword 0x0071 0x000c599f000850ba
+patword 0x0072 0x000c599f000850ba
+patword 0x0073 0x000c599f000850ba
+patword 0x0074 0x000c599f000850ba
+patword 0x0075 0x000c599f000850ba
+patword 0x0076 0x000c599f000850ba
+patword 0x0077 0x000c599f000850ba
+patword 0x0078 0x000c599f000850ba
+patword 0x0079 0x000c599f000850ba
+patword 0x007a 0x000c599f000850ba
+patword 0x007b 0x000c599f000850ba
+patword 0x007c 0x000c599f000850ba
+patword 0x007d 0x000c599f000850ba
+patword 0x007e 0x000c599f000850ba
+patword 0x007f 0x000c599f000850ba
+patword 0x0080 0x000c599f000850ba
+patword 0x0081 0x000c599f000850ba
+patword 0x0082 0x000c599f000850ba
+patword 0x0083 0x000c599f000850ba
+patword 0x0084 0x000c599f000850ba
+patword 0x0085 0x000c599f000850ba
+patword 0x0086 0x000c599f400850ba
+patword 0x0087 0x000c599f400850ba
+patword 0x0088 0x000c599f600850ba
+patword 0x0089 0x000c599f400850ba
+patword 0x008a 0x000c599f400850ba
+patword 0x008b 0x000c599f400850ba
+patword 0x008c 0x840c599f682e50ba
+patword 0x008d 0x840c599f482850ba
+patword 0x008e 0x840c599f000e50ba
+patword 0x008f 0x840c599f000850ba
+patword 0x0090 0x840c599f000e50ba
+patword 0x0091 0x840c599f000850ba
+patword 0x0092 0x840c599f000e50ba
+patword 0x0093 0x840c599f000850ba
+patword 0x0094 0x840c599f000e50ba
+patword 0x0095 0x840c599f000850ba
+patword 0x0096 0x840c599f000e50ba
+patword 0x0097 0x840c599f000850ba
+patword 0x0098 0x840c599f000e50ba
+patword 0x0099 0x840c599f000850ba
+patword 0x009a 0x840c599f000e50ba
+patword 0x009b 0x840c599f000850ba
+patword 0x009c 0x840c599f000e50ba
+patword 0x009d 0x840c599f000850ba
+patword 0x009e 0x840c599f000e50ba
+patword 0x009f 0x840c599f000850ba
+patword 0x00a0 0x840c599f000e50ba
+patword 0x00a1 0x840c599f000850ba
+patword 0x00a2 0x840c599f000e50ba
+patword 0x00a3 0x840c599f000850ba
+patword 0x00a4 0x840c599f000e50ba
+patword 0x00a5 0x840c599f000850ba
+patword 0x00a6 0x840c599f200e50ba
+patword 0x00a7 0x840c599f000850ba
+patword 0x00a8 0x840c599f000e50ba
+patword 0x00a9 0x840c599f000850ba
+patword 0x00aa 0x840c599f000e50ba
+patword 0x00ab 0x840c599f000850ba
+patword 0x00ac 0x840c599f000e50ba
+patword 0x00ad 0x840c599f000850ba
+patword 0x00ae 0x840c599f000e50ba
+patword 0x00af 0x840c599f000850ba
+patword 0x00b0 0x840c599f000e50ba
+patword 0x00b1 0x840c599f000850ba
+patword 0x00b2 0x840c599f000e50ba
+patword 0x00b3 0x840c599f000850ba
+patword 0x00b4 0x840c599f000e50ba
+patword 0x00b5 0x840c599f000850ba
+patword 0x00b6 0x840c599f000e50ba
+patword 0x00b7 0x840c599f000850ba
+patword 0x00b8 0x840c599f000e50ba
+patword 0x00b9 0x840c599f000850ba
+patword 0x00ba 0x840c599f000e50ba
+patword 0x00bb 0x840c599f000850ba
+patword 0x00bc 0x840c599f000e50ba
+patword 0x00bd 0x840c599f000850ba
+patword 0x00be 0x840c599f282e50ba
+patword 0x00bf 0x840c599f082850ba
+patword 0x00c0 0x840c599f000e50ba
+patword 0x00c1 0x840c599f000850ba
+patword 0x00c2 0x840c599f000e50ba
+patword 0x00c3 0x840c599f000850ba
+patword 0x00c4 0x840c599f000e50ba
+patword 0x00c5 0x840c599f000850ba
+patword 0x00c6 0x840c599f000e50ba
+patword 0x00c7 0x840c599f000850ba
+patword 0x00c8 0x840c599f000e50ba
+patword 0x00c9 0x840c599f000850ba
+patword 0x00ca 0x840c599f000e50ba
+patword 0x00cb 0x840c599f000850ba
+patword 0x00cc 0x840c599f000e50ba
+patword 0x00cd 0x840c599f000850ba
+patword 0x00ce 0x840c599f000e50ba
+patword 0x00cf 0x840c599f000850ba
+patword 0x00d0 0x840c599f000e50ba
+patword 0x00d1 0x840c599f000850ba
+patword 0x00d2 0x840c599f000e50ba
+patword 0x00d3 0x840c599f000850ba
+patword 0x00d4 0x840c599f000e50ba
+patword 0x00d5 0x840c599f000850ba
+patword 0x00d6 0x840c599f000e50ba
+patword 0x00d7 0x840c599f000850ba
+patword 0x00d8 0x840c599f200e50ba
+patword 0x00d9 0x840c599f000850ba
+patword 0x00da 0x840c599f000e50ba
+patword 0x00db 0x840c599f000850ba
+patword 0x00dc 0x840c599f000e50ba
+patword 0x00dd 0x840c599f000850ba
+patword 0x00de 0x840c599f000e50ba
+patword 0x00df 0x840c599f000850ba
+patword 0x00e0 0x840c599f000e50ba
+patword 0x00e1 0x840c599f000850ba
+patword 0x00e2 0x840c599f000e50ba
+patword 0x00e3 0x840c599f000850ba
+patword 0x00e4 0x840c599f000e50ba
+patword 0x00e5 0x840c599f000850ba
+patword 0x00e6 0x840c599f000e50ba
+patword 0x00e7 0x840c599f000850ba
+patword 0x00e8 0x840c599f000e50ba
+patword 0x00e9 0x840c599f000850ba
+patword 0x00ea 0x840c599f000e50ba
+patword 0x00eb 0x840c599f000850ba
+patword 0x00ec 0x840c599f000e50ba
+patword 0x00ed 0x840c599f000850ba
+patword 0x00ee 0x840c599f000e50ba
+patword 0x00ef 0x840c599f000850ba
+patword 0x00f0 0x040c599f000850ba
+patword 0x00f1 0x040c599f000850ba
+patword 0x00f2 0x000c599f000850ba
+patword 0x00f3 0x000c599f000850ba
+patword 0x00f4 0x0008599f200e503a
+patword 0x00f5 0x0008599f0008503a
+patword 0x00f6 0x0008599f200e503a
+patword 0x00f7 0x0008599f0008503a
+patword 0x00f8 0x0008599f0008503a
+patword 0x00f9 0x0008599f0008503a
+patword 0x00fa 0x0008599f0008503a
+patword 0x00fb 0x0008599f0008503a
+patword 0x00fc 0x0008599f0008503a
+patword 0x00fd 0x0008599f0008503a
+patword 0x00fe 0x0008599f0008503a
+patword 0x00ff 0x0008599f0008503a
+patword 0x0100 0x0008599f0008503a
+patword 0x0101 0x0008599f0008503a
+patword 0x0102 0x0008599f0008503a
+patword 0x0103 0x0008599f0008503a
+patword 0x0104 0x0008599f0008503a
+patword 0x0105 0x0008599f0008503a
+patword 0x0106 0x0008599f0008503a
+patword 0x0107 0x0008599f0008503a
+patword 0x0108 0x0008599f0008503a
+patword 0x0109 0x0008599f0008503a
+patword 0x010a 0x0008599f0008503a
+patword 0x010b 0x0008599f0008503a
+patword 0x010c 0x0008599f0008503a
+patword 0x010d 0x0008599f0008503a
+patword 0x010e 0x0008599f0008503a
+patword 0x010f 0x0008599f0008503a
+patword 0x0110 0x0008599f0008503a
+patword 0x0111 0x0008599f0008503a
+patioctrl 0x8f0effff6dbffdbf
+patlimits 0x0000 0x0110
+patloop 0 0x00be 0x00ef
+patnloop 0 199
+patloop 1 0x0400 0x0400
+patnloop 1 0
+patloop 2 0x0400 0x0400
+patnloop 2 0
+patwait 0 0x002e
+patwaittime 0 800
+patwait 1 0x0400
+patwaittime 1 0
+patwait 2 0x0400
+patwaittime 2 0
+
+patloop 3 0x1fff 0x1fff
+patnloop 3 0
+patloop 4 0x1fff 0x1fff
+patnloop 4 0
+patloop 5 0x1fff 0x1fff
+patnloop 5 0
+patwait 3 0x1fff
+patwaittime 3 0
+patwait 4 0x1fff
+patwaittime 4 0
+patwait 5 0x1fff
+patwaittime 5 0
--- a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
+++ b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
--- a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0
+++ b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0
--- a/slsDetectorServers/moenchDetectorServer/config_moench.txt
+++ b/slsDetectorServers/moenchDetectorServer/config_moench.txt
@ -1,4 +0,0 @@
-
-
-#chip version       version (multiplied by 10)
-chipversion         11
--- a/slsDetectorServers/moenchDetectorServer/detid_moench.txt
+++ b/slsDetectorServers/moenchDetectorServer/detid_moench.txt
@ -1 +0,0 @@
-1234
--- a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
--- a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h
@ -4,140 +4,18 @@
 #include "RegisterDefs.h"
 #include "sls/sls_detector_defs.h"

-#define REQRD_FRMWRE_VRSN_BOARD2 0x221130 // 1.0 pcb (version = 010)
-#define REQRD_FRMWRE_VRSN        0x221130 // 2.0 pcb (version = 011)
+#define MIN_REQRD_VRSN_T_RD_API 0x180314
+#define REQRD_FRMWR_VRSN        0x221205

-#define NUM_HARDWARE_VERSIONS (2)
+#define NUM_HARDWARE_VERSIONS (1)
 #define HARDWARE_VERSION_NUMBERS                                               \
-    { 0x2, 0x3 }
+    { 0x1 }
 #define HARDWARE_VERSION_NAMES                                                 \
-    { "1.0", "2.0" }
+    { "1.0" }

-#define ID_FILE            ("detid_moench.txt")
-#define CONFIG_FILE        ("config_moench.txt")
 #define LINKED_SERVER_NAME "moenchDetectorServer"

-#define CTRL_SRVR_INIT_TIME_US (300 * 1000)
-
-/* Hardware Definitions */
-#define NCHAN               (400 * 400)
-#define NCHIP               (1)
-#define NDAC                (8)
-#define DYNAMIC_RANGE       (16)
-#define NUM_BYTES_PER_PIXEL (DYNAMIC_RANGE / 8)
-#define DATA_BYTES          (NCHIP * NCHAN * NUM_BYTES_PER_PIXEL)
-#define CLK_RUN             (40) // MHz
-#define CLK_SYNC            (20) // MHz
-#define ADC_CLK_INDEX       (1)
-#define DBIT_CLK_INDEX      (0)
-
-/** Default Parameters */
-#define DEFAULT_NUM_FRAMES            (1)
-#define DEFAULT_STARTING_FRAME_NUMBER (1)
-#define DEFAULT_NUM_CYCLES            (1)
-#define DEFAULT_EXPTIME               (10 * 1000)       // ns
-#define DEFAULT_PERIOD                (2 * 1000 * 1000) // ns
-#define DEFAULT_DELAY                 (0)
-#define DEFAULT_HIGH_VOLTAGE          (0)
-#define DEFAULT_TIMING_MODE           (AUTO_TIMING)
-#define DEFAULT_SETTINGS              (GAIN0)
-#define DEFAULT_GAINMODE              (DYNAMIC)
-#define DEFAULT_TX_UDP_PORT           (0x7e9a)
-#define DEFAULT_TMP_THRSHLD           (65 * 1000) // milli degree Celsius
-#define DEFAULT_FLIP_ROWS             (0)
-#define DEFAULT_FILTER_RESISTOR       (1) // higher resistor
-#define DEFAULT_FILTER_CELL           (0)
-
-#define HIGHVOLTAGE_MIN     (60)
-#define HIGHVOLTAGE_MAX     (200)
-#define DAC_MIN_MV          (0)
-#define DAC_MAX_MV          (2500)
-#define MAX_FILTER_CELL_VAL (12)
-
-#define READ_N_ROWS_MULTIPLE (16) // 400 rows/50packets * 2 interfaces
-#define MIN_ROWS_PER_READOUT (16)
-#define MAX_ROWS_PER_READOUT (400)
-#define ROWS_PER_PACKET      (8)
-
-/* Defines in the Firmware */
-#define MAX_TIMESLOT_VAL          (0x1F)
-#define MAX_THRESHOLD_TEMP_VAL    (127999) // millidegrees
-#define ACQ_TIME_MIN_CLOCK        (2)
-#define ASIC_FILTER_MAX_RES_VALUE (1)
-#define MAX_SELECT_CHIP10_VAL     (63)
-
-#define MAX_PHASE_SHIFTS (240)
-#define BIT16_MASK       (0xFFFF)
-
-#define GAIN_VAL_OFST (14)
-#define GAIN_VAL_MSK  (0x3 << GAIN_VAL_OFST)
-
-// pipeline
-#define ADC_PORT_INVERT_VAL        (0x5A5A5A5A)
-#define ADC_PORT_INVERT_BOARD2_VAL (0x453b2a9c)
-
-// 2.0 pcb (chipv1.1)
-#define SAMPLE_ADC_FULL_SPEED_CHIP11                                           \
-    (SAMPLE_ADC_SAMPLE_0_VAL + SAMPLE_ADC_DECMT_FACTOR_0_VAL +                 \
-     SAMPLE_DGTL_SAMPLE_0_VAL + SAMPLE_DECMT_FACTOR_FULL_VAL) // 0x0000
-#define SAMPLE_ADC_HALF_SPEED_CHIP11                                           \
-    (SAMPLE_ADC_SAMPLE_0_VAL + SAMPLE_ADC_DECMT_FACTOR_1_VAL +                 \
-     SAMPLE_DGTL_SAMPLE_1_VAL + SAMPLE_DECMT_FACTOR_HALF_VAL) // 0x1110
-#define SAMPLE_ADC_QUARTER_SPEED_CHIP11                                        \
-    (SAMPLE_ADC_SAMPLE_0_VAL + SAMPLE_ADC_DECMT_FACTOR_3_VAL +                 \
-     SAMPLE_DGTL_SAMPLE_2_VAL + SAMPLE_DECMT_FACTOR_QUARTER_VAL) // 0x2230
-
-#define ADC_PHASE_FULL_SPEED_CHIP11    (160)
-#define ADC_PHASE_HALF_SPEED_CHIP11    (160)
-#define ADC_PHASE_QUARTER_SPEED_CHIP11 (160)
-
-#define DBIT_PHASE_FULL_SPEED_CHIP11    (80)
-#define DBIT_PHASE_HALF_SPEED_CHIP11    (135)
-#define DBIT_PHASE_QUARTER_SPEED_CHIP11 (135)
-
-#define ADC_OFST_FULL_SPEED_VAL_CHIP11    (0x10)
-#define ADC_OFST_HALF_SPEED_VAL_CHIP11    (0x08)
-#define ADC_OFST_QUARTER_SPEED_VAL_CHIP11 (0x04)
-
-// 2.0 pcb (chipv1.0)
-#define SAMPLE_ADC_FULL_SPEED_CHIP10                                           \
-    (SAMPLE_ADC_SAMPLE_0_VAL + SAMPLE_ADC_DECMT_FACTOR_0_VAL +                 \
-     SAMPLE_DGTL_SAMPLE_1_VAL + SAMPLE_DECMT_FACTOR_FULL_VAL) // 0x0100
-#define SAMPLE_ADC_HALF_SPEED_CHIP10                                           \
-    (SAMPLE_ADC_SAMPLE_0_VAL + SAMPLE_ADC_DECMT_FACTOR_1_VAL +                 \
-     SAMPLE_DGTL_SAMPLE_3_VAL + SAMPLE_DECMT_FACTOR_HALF_VAL) // 0x1310
-#define SAMPLE_ADC_QUARTER_SPEED_CHIP10                                        \
-    (SAMPLE_ADC_SAMPLE_0_VAL + SAMPLE_ADC_DECMT_FACTOR_3_VAL +                 \
-     SAMPLE_DGTL_SAMPLE_6_VAL + SAMPLE_DECMT_FACTOR_QUARTER_VAL) // 0x2630
-
-#define ADC_PHASE_FULL_SPEED_CHIP10    (160)
-#define ADC_PHASE_HALF_SPEED_CHIP10    (160)
-#define ADC_PHASE_QUARTER_SPEED_CHIP10 (160)
-
-#define DBIT_PHASE_FULL_SPEED_CHIP10    (125)
-#define DBIT_PHASE_HALF_SPEED_CHIP10    (175)
-#define DBIT_PHASE_QUARTER_SPEED_CHIP10 (175)
-
-#define ADC_OFST_FULL_SPEED_VAL_CHIP10    (0x10)
-#define ADC_OFST_HALF_SPEED_VAL_CHIP10    (0x08)
-#define ADC_OFST_QUARTER_SPEED_VAL_CHIP10 (0x04)
-
-// 1.0 pcb (2 resistor network)
-#define SAMPLE_ADC_HALF_SPEED_BOARD2                                           \
-    (SAMPLE_ADC_SAMPLE_0_VAL + SAMPLE_ADC_DECMT_FACTOR_0_VAL +                 \
-     SAMPLE_DGTL_SAMPLE_3_VAL + SAMPLE_DECMT_FACTOR_HALF_VAL) // 0x1300
-#define SAMPLE_ADC_QUARTER_SPEED_BOARD2                                        \
-    (SAMPLE_ADC_SAMPLE_0_VAL + SAMPLE_ADC_DECMT_FACTOR_1_VAL +                 \
-     SAMPLE_DGTL_SAMPLE_6_VAL + SAMPLE_DECMT_FACTOR_QUARTER_VAL) // 0x2610
-
-#define ADC_PHASE_HALF_SPEED_BOARD2    (110)
-#define ADC_PHASE_QUARTER_SPEED_BOARD2 (220)
-
-#define DBIT_PHASE_HALF_SPEED_BOARD2    (150)
-#define DBIT_PHASE_QUARTER_SPEED_BOARD2 (150)
-
-#define ADC_OFST_HALF_SPEED_BOARD2_VAL    (0x10)
-#define ADC_OFST_QUARTER_SPEED_BOARD2_VAL (0x08)
+#define CTRL_SRVR_INIT_TIME_US (2 * 1000 * 1000)

 /* Struct Definitions */
 typedef struct udp_header_struct {
@ -167,44 +45,111 @@ typedef struct udp_header_struct {
 #define UDP_IP_HEADER_LENGTH_BYTES (28)

 /* Enums */
-enum ADCINDEX { TEMP_FPGA, TEMP_ADC };
 enum DACINDEX {
-    J_VB_COMP,
-    J_VDD_PROT,
-    J_VIN_COM,
-    J_VREF_PRECH,
-    J_VB_PIXBUF,
-    J_VB_DS,
-    J_VREF_DS,
-    J_VREF_COMP
+    MO_VBP_COLBUF,
+    MO_VIPRE,
+    MO_VIN_CM,
+    MO_VB_SDA,
+    MO_VCASC_SFP,
+    MO_VOUT_CM,
+    MO_VIPRE_CDS,
+    MO_IBIAS_SFP
 };
 #define DAC_NAMES                                                              \
-    "vb_comp", "vdd_prot", "vin_com", "vref_prech", "vb_pixbuf", "vb_ds",      \
-        "vref_ds", "vref_comp"
-
+    "vbp_colbuf", "vipre", "vin_cm", "vb_sda", "vcasc_sfp", "vout_cm",         \
+        "vipre_cds", "ibias_sfp"
 #define DEFAULT_DAC_VALS                                                       \
    {                                                                          \
-        1220, /* J_VB_COMP */                                                  \
-        3000, /* J_VDD_PROT */                                                 \
-        1053, /* J_VIN_COM */                                                  \
-        1450, /* J_VREF_PRECH */                                               \
-        750,  /* J_VB_PIXBUF */                                                \
-        1000, /* J_VB_DS */                                                    \
-        480,  /* J_VREF_DS */                                                  \
-        420   /* J_VREF_COMP */                                                \
+        1300, /* MO_VBP_COLBUF */                                              \
+        1000, /* MO_VIPRE */                                                   \
+        1400, /* MO_VIN_CM */                                                  \
+        680,  /* MO_VB_SDA */                                                  \
+        1428, /* MO_VCASC_SFP */                                               \
+        1200, /* MO_VOUT_CM */                                                 \
+        800,  /* MO_VIPRE_CDS */                                               \
+        900   /* MO_IBIAS_SFP */                                               \
    };

-enum MASTERINDEX { MASTER_HARDWARE, OW_MASTER, OW_SLAVE };
-#define MASTER_NAMES "hardware", "master", "slave"
+enum CLKINDEX { RUN_CLK, ADC_CLK, SYNC_CLK, DBIT_CLK, NUM_CLOCKS };
+#define CLK_NAMES "run", "adc", "sync", "dbit"

-#define NUMSETTINGS     (2)
-#define NSPECIALDACS    (3)
-#define SPECIALDACINDEX {J_VREF_PRECH, J_VREF_DS, J_VREF_COMP};
-#define SPECIAL_DEFAULT_DYNAMIC_GAIN_VALS                                      \
-    { 1450, 480, 420 }
-#define SPECIAL_DEFAULT_DYNAMICHG0_GAIN_VALS                                   \
-    { 1550, 450, 620 }
+/* Hardware Definitions */
+#define NCHAN               (32)
+#define NCHIP               (1)
+#define NDAC                (8)
+#define DYNAMIC_RANGE       (16)
+#define NUM_BYTES_PER_PIXEL (DYNAMIC_RANGE / 8)
+#define CLK_FREQ            (156.25) /* MHz */
+#define NSAMPLES_PER_ROW    (25)
+#define NCHANS_PER_ADC      (25)

-enum NETWORKINDEX { TXN_FRAME, FLOWCTRL_10G };
-enum CLKINDEX { RUN_CLK, ADC_CLK, DBIT_CLK, NUM_CLOCKS };
-#define CLK_NAMES "run", "adc", "dbit"
+/** Default Parameters */
+#define DEFAULT_PATTERN_FILE          ("DefaultPattern_moench.txt")
+#define DEFAULT_STARTING_FRAME_NUMBER (1)
+#define DEFAULT_DATA_BYTES            (NCHIP * NCHAN * NUM_BITS_PER_PIXEL)
+#define DEFAULT_NUM_SAMPLES           (5000)
+#define DEFAULT_EXPTIME               (0)
+#define DEFAULT_NUM_FRAMES            (1)
+#define DEFAULT_NUM_CYCLES            (1)
+#define DEFAULT_PERIOD                (1 * 1000 * 1000) // ns
+#define DEFAULT_DELAY                 (0)
+#define DEFAULT_HIGH_VOLTAGE          (0)
+#define DEFAULT_VLIMIT                (-100)
+#define DEFAULT_TIMING_MODE           (AUTO_TIMING)
+#define DEFAULT_TX_UDP_PORT           (0x7e9a)
+
+#define DEFAULT_RUN_CLK_AT_STARTUP  (200) // 40
+#define DEFAULT_ADC_CLK_AT_STARTUP  (40)  // 20
+#define DEFAULT_SYNC_CLK_AT_STARTUP (40)  // 20
+#define DEFAULT_DBIT_CLK_AT_STARTUP (200)
+
+#define DEFAULT_RUN_CLK       (40)
+#define DEFAULT_ADC_CLK       (20)
+#define DEFAULT_DBIT_CLK      (40)
+#define DEFAULT_ADC_PHASE_DEG (30)
+
+#define DEFAULT_PIPELINE (15)
+#define DEFAULT_SETTINGS (G4_HIGHGAIN)
+
+#define UDP_HEADER_MAX_FRAME_VALUE (0xFFFFFFFFFFFF)
+
+// settings
+#define DEFAULT_PATMASK               (0x00000C800000800AULL)
+#define G1_HIGHGAIN_PATSETBIT         (0x00000C0000008008ULL)
+#define G1_LOWGAIN_PATSETBIT          (0x0000040000008000ULL)
+#define G2_HIGHCAP_HIGHGAIN_PATSETBIT (0x0000080000000008ULL)
+#define G2_HIGHCAP_LOWGAIN_PATSETBIT  (0x0000000000000000ULL)
+#define G2_LOWCAP_HIGHGAIN_PATSETBIT  (0x00000C800000800AULL)
+#define G2_LOWCAP_LOWGAIN_PATSETBIT   (0x0000048000008002ULL)
+#define G4_HIGHGAIN_PATSETBIT         (0x000008800000000AULL)
+#define G4_LOWGAIN_PATSETBIT          (0x0000008000000002ULL)
+
+#define HIGHVOLTAGE_MIN (60)
+#define HIGHVOLTAGE_MAX (200) // min dac val
+#define DAC_MIN_MV      (0)
+#define DAC_MAX_MV      (2500)
+
+/* Defines in the Firmware */
+#define DIGITAL_IO_DELAY_MAXIMUM_PS                                            \
+    ((OUTPUT_DELAY_0_OTPT_STTNG_MSK >> OUTPUT_DELAY_0_OTPT_STTNG_OFST) *       \
+     OUTPUT_DELAY_0_OTPT_STTNG_STEPS)
+#define MAX_PHASE_SHIFTS_STEPS (8)
+
+#define WAIT_TME_US_FR_ACQDONE_REG                                             \
+    (100) // wait time in us after acquisition done to ensure there is no data
+          // in fifo
+#define WAIT_TIME_US_PLL           (10 * 1000)
+#define WAIT_TIME_US_STP_ACQ       (100)
+#define WAIT_TIME_CONFIGURE_MAC    (2 * 1000 * 1000)
+#define WAIT_TIME_PATTERN_READ     (10)
+#define WAIT_TIME_1US_FOR_LOOP_CNT (50) // around 30 is 1 us in blackfin
+
+/* MSB & LSB DEFINES */
+#define MSB_OF_64_BIT_REG_OFST (32)
+#define LSB_OF_64_BIT_REG_OFST (0)
+#define BIT32_MSK              (0xFFFFFFFF)
+#define BIT16_MASK             (0xFFFF)
+
+#define ADC_PORT_INVERT_VAL (0x4a342593)
+#define MAXIMUM_ADC_CLK     (20)
+#define PLL_VCO_FREQ_MHZ    (800)
--- a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
+++ b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
--- a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.0
+++ b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.0
--- a/slsDetectorServers/slsDetectorServer/include/ALTERA_PLL.h
+++ b/slsDetectorServers/slsDetectorServer/include/ALTERA_PLL.h
@ -4,7 +4,7 @@

 #include <inttypes.h>

-#if defined(JUNGFRAUD) || defined(MOENCHD)
+#ifdef JUNGFRAUD
 /**
 * Set Defines
 * @param creg control register
@ -14,9 +14,8 @@
 * @param prmsk pll reset mask
 * @param amsk address mask
 * @param aofst address offset
- * @param wd2msk write parameter mask for pll for dbit clock (Jungfrau/moench
- * only)
- * @param clk2Index clkIndex of second pll (Jungfrau/moench only)
+ * @param wd2msk write parameter mask for pll for dbit clock (Jungfrau only)
+ * @param clk2Index clkIndex of second pll (Jungfrau only)
 */
 void ALTERA_PLL_SetDefines(uint32_t creg, uint32_t preg, uint32_t rprmsk,
                           uint32_t wpmsk, uint32_t prmsk, uint32_t amsk,
@ -51,8 +50,8 @@ void ALTERA_PLL_ResetPLLAndReconfiguration();
 * Set PLL Reconfig register
 * @param reg register
 * @param val value
- * @param useDefaultWRMask only jungfrau/moench for dbit clk (clkindex1, use
- * second WR mask)
+ * @param useDefaultWRMask only jungfrau for dbit clk (clkindex1, use second WR
+ * mask)
 */
 void ALTERA_PLL_SetPllReconfigReg(uint32_t reg, uint32_t val,
                                  int useSecondWRMask);
--- a/slsDetectorServers/slsDetectorServer/include/loadPattern.h
+++ b/slsDetectorServers/slsDetectorServer/include/loadPattern.h
@ -6,7 +6,7 @@
 #include "clogger.h"

 void initializePatternAddresses();
-#ifdef CHIPTESTBOARDD
+#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
 #ifdef VIRTUAL
 void initializePatternWord();
 #endif
--- a/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
+++ b/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
@ -6,8 +6,8 @@
 #include "AD9252.h"  // old board compatibility
 #include "clogger.h" // runState(enum TLogLevel)
 #endif
-#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(MOENCHD) ||            \
-    defined(CHIPTESTBOARDD)
+#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) ||     \
+    defined(MOENCHD)
 #include "AD9257.h" // commonServerFunctions.h, blackfin.h, ansi.h
 #endif

@ -20,8 +20,8 @@

 #if defined(MYTHEN3D) || defined(GOTTHARD2D)
 #include "nios.h"
-#elif defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(MOENCHD) ||          \
-    defined(CHIPTESTBOARDD)
+#elif defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) ||   \
+    defined(MOENCHD)
 #include "blackfin.h"
 #endif

@ -61,16 +61,15 @@ typedef struct udpStruct_s {
 int isInitCheckDone();
 int getInitResult(char **mess);
 void basictests();
-#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(MOENCHD) ||            \
-    defined(CHIPTESTBOARDD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
+#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) ||     \
+    defined(MOENCHD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
 int checkType();
 int testFpga();
 int testBus();
 #endif

 #if defined(GOTTHARDD) ||                                                      \
-    ((defined(EIGERD) || defined(JUNGFRAUD) || defined(MOENCHD)) &&            \
-     defined(VIRTUAL))
+    ((defined(EIGERD) || defined(JUNGFRAUD)) && defined(VIRTUAL))
 void setTestImageMode(int ival);
 int getTestImageMode();
 #endif
@ -78,24 +77,19 @@ int getTestImageMode();
 // Ids
 void getServerVersion(char *version);
 u_int64_t getFirmwareVersion();
-#ifdef EIGERD
-uint64_t getFrontEndFirmwareVersion(enum fpgaPosition fpgaPosition);
-#endif
 u_int64_t getFirmwareAPIVersion();
+#ifndef EIGERD
 void getHardwareVersion(char *version);
-#ifdef EIGERD
-int getHardwareVersionNumber();
-#else
 u_int16_t getHardwareVersionNumber();
 #endif
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD)
+#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
 u_int16_t getHardwareSerialNumber();
 #endif
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARD2D) ||           \
-    defined(MYTHEN3D) || defined(GOTTHARDD)
+#if defined(JUNGFRAUD) || defined(GOTTHARD2D) || defined(MYTHEN3D) ||          \
+    defined(GOTTHARDD)
 int isHardwareVersion_1_0();
 #endif
-#if defined(JUNGFRAUD) || defined(MOENCHD)
+#ifdef JUNGFRAUD
 int getChipVersion();
 void setChipVersion(int version);
 #endif
@ -104,7 +98,7 @@ u_int32_t getDetectorNumber();
 #endif

 #if defined(GOTTHARD2D) || defined(EIGERD) || defined(MYTHEN3D) ||             \
-    defined(JUNGFRAUD) || defined(MOENCHD)
+    defined(JUNGFRAUD)
 int getModuleId(int *ret, char *mess);
 int updateModuleId();
 #ifndef EIGERD
@ -131,7 +125,7 @@ void checkVirtual9MFlag();
 void allocateDetectorStructureMemory();
 #endif
 void setupDetector();
-#if defined(CHIPTESTBOARDD)
+#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
 int updateDatabytesandAllocateRAM();
 void updateDataBytes();
 #endif
@ -147,8 +141,7 @@ void setASICDefaults();
 #ifdef MYTHEN3D
 void setADIFDefaults();
 #endif
-#if defined(GOTTHARD2D) || defined(EIGERD) || defined(JUNGFRAUD) ||            \
-    defined(MOENCHD)
+#if defined(GOTTHARD2D) || defined(EIGERD) || defined(JUNGFRAUD)
 int readConfigFile();
 #endif
 #if defined(GOTTHARDD) || defined(GOTTHARD2D) || defined(EIGERD) ||            \
@ -164,13 +157,14 @@ void resetToHardwareSettings();
 int writeRegister(uint32_t offset, uint32_t data);
 int readRegister(uint32_t offset, uint32_t *retval);
 #elif GOTTHARDD
-uint32_t writeRegister16And32(uint32_t offset,
-                              uint32_t data); // FIXME its not there in ctb
+uint32_t
+writeRegister16And32(uint32_t offset,
+                     uint32_t data); // FIXME its not there in ctb or moench?
 uint32_t readRegister16And32(uint32_t offset);
 #endif

 // firmware functions (resets)
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD) ||       \
+#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD) ||       \
    defined(MYTHEN3D) || defined(GOTTHARD2D)
 void cleanFifos();
 void resetCore();
@ -195,11 +189,11 @@ int getDynamicRange(int *retval);
 int setROI(ROI arg);
 ROI getROI();
 #endif
-#if defined(JUNGFRAUD) || defined(MOENCHD)
+#ifdef JUNGFRAUD
 void setADCInvertRegister(uint32_t val);
 uint32_t getADCInvertRegister();
 #endif
-#if defined(CHIPTESTBOARDD)
+#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
 int setADCEnableMask(uint32_t mask);
 uint32_t getADCEnableMask();
 void setADCEnableMask_10G(uint32_t mask);
@ -227,11 +221,11 @@ int getReadoutMode();
 #endif

 // parameters - timer
-#if defined(JUNGFRAUD)
+#ifdef JUNGFRAUD
 int selectStoragecellStart(int pos);
 int getMaxStoragecellStart();
 #endif
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(EIGERD) ||               \
+#if defined(JUNGFRAUD) || defined(EIGERD) || defined(MOENCHD) ||               \
    defined(CHIPTESTBOARDD)
 int setNextFrameNumber(uint64_t value);
 int getNextFrameNumber(uint64_t *value);
@ -271,13 +265,13 @@ int64_t getSubDeadTime();
 int64_t getMeasuredPeriod();
 int64_t getMeasuredSubPeriod();
 #endif
-#if defined(JUNGFRAUD)
+#ifdef JUNGFRAUD
 void setNumAdditionalStorageCells(int val);
 int getNumAdditionalStorageCells();
 int setStorageCellDelay(int64_t val);
 int64_t getStorageCellDelay();
 #endif
-#if defined(CHIPTESTBOARDD)
+#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
 int setNumAnalogSamples(int val);
 int getNumAnalogSamples();
 #endif
@ -292,8 +286,8 @@ uint32_t getCounterMask();
 void updatePacketizing();
 #endif

-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARDD) ||            \
-    defined(CHIPTESTBOARDD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
+#if defined(JUNGFRAUD) || defined(GOTTHARDD) || defined(CHIPTESTBOARDD) ||     \
+    defined(MOENCHD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
 int setDelayAfterTrigger(int64_t val);
 int64_t getDelayAfterTrigger();
 int64_t getNumFramesLeft();
@ -307,7 +301,7 @@ int64_t getNumBurstsLeft();
 #ifdef GOTTHARDD
 int64_t getExpTimeLeft();
 #endif
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD) ||       \
+#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD) ||       \
    defined(MYTHEN3D) || defined(GOTTHARD2D)
 int64_t getFramesFromStart();
 int64_t getActualTime();
@ -318,7 +312,7 @@ int64_t getMeasurementTime();
 #if defined(MYTHEN3D) || defined(EIGERD)
 void getModule(sls_detector_module *myMod);
 #endif
-#if (!defined(CHIPTESTBOARDD)) && (!defined(GOTTHARD2D))
+#if (!defined(CHIPTESTBOARDD)) && (!defined(MOENCHD)) && (!defined(GOTTHARD2D))
 int setModule(sls_detector_module myMod, char *mess);
 #endif

@ -334,7 +328,7 @@ int getAllTrimbits();
 enum detectorSettings setSettings(enum detectorSettings sett);
 #endif
 enum detectorSettings getSettings();
-#if defined(JUNGFRAUD) || defined(MOENCHD)
+#ifdef JUNGFRAUD
 enum gainMode getGainMode();
 void setGainMode(enum gainMode mode);
 #endif
@ -363,7 +357,7 @@ void setDAC(enum DACINDEX ind, int val, int mV);
 #endif
 int getDAC(enum DACINDEX ind, int mV);
 int getMaxDacSteps();
-#if defined(CHIPTESTBOARDD)
+#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
 int dacToVoltage(int dac);
 int checkVLimitCompliant(int mV);
 int checkVLimitDacCompliant(int dac);
@ -386,15 +380,14 @@ void powerOff();

 #if defined(MYTHEN3D) || defined(GOTTHARD2D)
 int getADC(enum ADCINDEX ind, int *value);
-#else
+#elif !defined(MOENCHD)
 int getADC(enum ADCINDEX ind);
 #endif

 int setHighVoltage(int val);

 // parameters - timing, extsig
-#if defined(EIGERD) || defined(GOTTHARD2D) || defined(JUNGFRAUD) ||            \
-    defined(MOENCHD)
+#if defined(EIGERD) || defined(GOTTHARD2D) || defined(JUNGFRAUD)
 int setMaster(enum MASTERINDEX m);
 #endif
 #ifdef EIGERD
@ -402,11 +395,11 @@ int setTop(enum TOPINDEX t);
 int isTop(int *retval);
 #endif
 #if defined(MYTHEN3D) || defined(EIGERD) || defined(GOTTHARDD) ||              \
-    defined(GOTTHARD2D) || defined(JUNGFRAUD) || defined(MOENCHD)
+    defined(GOTTHARD2D) || defined(JUNGFRAUD)
 int isMaster(int *retval);
 #endif

-#if defined(JUNGFRAUD) || defined(MOENCHD)
+#ifdef JUNGFRAUD
 int getSynchronization();
 void setSynchronization(int enable);
 #endif
@ -437,30 +430,29 @@ int getExtSignal(int signalIndex);
 #ifdef GOTTHARDD
 void calcChecksum(mac_conf *mac, int sourceip, int destip);
 #endif
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARD2D)
+#if defined(JUNGFRAUD) || defined(GOTTHARD2D)
 void setNumberofUDPInterfaces(int val);
 #endif
 int getNumberofUDPInterfaces();

-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(EIGERD) ||               \
-    defined(MYTHEN3D) || defined(GOTTHARD2D)
+#if defined(JUNGFRAUD) || defined(EIGERD) || defined(MYTHEN3D) ||              \
+    defined(GOTTHARD2D)
 int getNumberofDestinations(int *retval);
 int setNumberofDestinations(int value);
 #endif
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(MYTHEN3D) ||             \
-    defined(GOTTHARD2D)
+#if defined(JUNGFRAUD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
 int getFirstUDPDestination();
 void setFirstUDPDestination(int value);
 #endif
-#if defined(JUNGFRAUD) || defined(MOENCHD)
+#ifdef JUNGFRAUD
 void selectPrimaryInterface(int val);
 int getPrimaryInterface();
 void setupHeader(int iRxEntry, enum interfaceType type, uint32_t destip,
                 uint64_t destmac, uint32_t destport, uint64_t sourcemac,
                 uint32_t sourceip, uint32_t sourceport);
 #endif
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARD2D) ||           \
-    defined(MYTHEN3D) || defined(CHIPTESTBOARDD)
+#if defined(JUNGFRAUD) || defined(GOTTHARD2D) || defined(MYTHEN3D) ||          \
+    defined(CHIPTESTBOARDD) || defined(MOENCHD)
 void calcChecksum(udp_header *udp);
 #endif
 #ifdef GOTTHARDD
@ -479,15 +471,22 @@ int getInterruptSubframe();
 int setReadNRows(int value);
 int getReadNRows();
 #endif
-#if defined(CHIPTESTBOARDD) || defined(EIGERD) || defined(MYTHEN3D)
+#if defined(CHIPTESTBOARDD) || defined(MOENCHD) || defined(EIGERD) ||          \
+    defined(MYTHEN3D)
 int enableTenGigabitEthernet(int val);
 #endif

 // very detector specific

-// chip test board specific - configure frequency, phase, pll,
+// moench specific - powerchip
+#ifdef MOENCHD
+int powerChip(int on);
+int setAnalogOnlyReadout();
+#endif
+
+// chip test board or moench specific - configure frequency, phase, pll,
 // flashing firmware
-#if defined(CHIPTESTBOARDD)
+#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
 int setPhase(enum CLKINDEX ind, int val, int degrees);
 int getPhase(enum CLKINDEX ind, int degrees);
 int getMaxPhase(enum CLKINDEX ind);
@ -506,9 +505,9 @@ int setLEDEnable(int enable);
 void setDigitalIODelay(uint64_t pinMask, int delay);
 #endif

-// jungfrau/moench specific - powerchip, autocompdisable, clockdiv, asictimer,
-// clock, pll, flashing firmware
-#if defined(JUNGFRAUD) || defined(MOENCHD)
+// jungfrau specific - powerchip, autocompdisable, clockdiv, asictimer, clock,
+// pll, flashing firmware
+#ifdef JUNGFRAUD
 int setReadNRows(int value);
 int getReadNRows();
 void initReadoutConfiguration();
@ -518,9 +517,7 @@ void configureChip();
 int autoCompDisable(int on);
 int setComparatorDisableTime(int64_t val);
 int64_t getComparatorDisableTime();
-#ifndef MOENCHD
 void configureASICTimer();
-#endif
 int setReadoutSpeed(int val);
 int getReadoutSpeed(int *retval);
 int setPhase(enum CLKINDEX ind, int val, int degrees);
@ -640,12 +637,11 @@ int setBadChannels(int numChannels, int *channelList);
 int *getBadChannels(int *numChannels);
 #endif

-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(EIGERD)
+#if defined(JUNGFRAUD) || defined(EIGERD)
 int getTenGigaFlowControl();
 int setTenGigaFlowControl(int value);
 #endif
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(EIGERD) ||               \
-    defined(MYTHEN3D)
+#if defined(JUNGFRAUD) || defined(EIGERD) || defined(MYTHEN3D)
 int getTransmissionDelayFrame();
 int setTransmissionDelayFrame(int value);
 #endif
@ -665,14 +661,14 @@ int stopStateMachine();
 #ifdef MYTHEN3D
 int softwareTrigger();
 #endif
-#if defined(EIGERD) || defined(JUNGFRAUD) || defined(MOENCHD)
+#if defined(EIGERD) || defined(JUNGFRAUD)
 int softwareTrigger(int block);
 #endif
 #if defined(EIGERD) || defined(MYTHEN3D)
 int startReadOut();
 #endif
 enum runStatus getRunStatus();
-#if defined(CHIPTESTBOARDD)
+#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
 void readFrames(int *ret, char *mess);
 #endif
 #ifdef EIGERD
@ -680,7 +676,7 @@ void waitForAcquisitionEnd(int *ret, char *mess);
 #else
 void waitForAcquisitionEnd();
 #endif
-#if defined(CHIPTESTBOARDD)
+#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
 void readandSendUDPFrames(int *ret, char *mess);
 void unsetFifoReadStrobes();
 void readSample(int ns);
@ -689,8 +685,8 @@ int checkFifoForEndOfAcquisition();
 int readFrameFromFifo();
 #endif

-#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(MOENCHD) ||            \
-    defined(CHIPTESTBOARDD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
+#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) ||     \
+    defined(MOENCHD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
 u_int32_t runBusy();
 #endif

@ -701,7 +697,7 @@ u_int32_t runState(enum TLogLevel lev);
 // common
 int calculateDataBytes();
 int getTotalNumberOfChannels();
-#if defined(CHIPTESTBOARDD)
+#if defined(MOENCHD) || defined(CHIPTESTBOARDD)
 void getNumberOfChannels(int *nchanx, int *nchany);
 #endif
 int getNumberOfChips();
--- a/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h
+++ b/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h
@ -306,4 +306,3 @@ int get_module(int);
 int get_synchronization(int);
 int set_synchronization(int);
 int get_hardware_version(int);
-int get_frontend_firmware_version(int);
--- a/slsDetectorServers/slsDetectorServer/src/AD9257.c
+++ b/slsDetectorServers/slsDetectorServer/src/AD9257.c
@ -300,7 +300,7 @@ void AD9257_Configure() {
                                         AD9257_CLK_CH_IFCO_MSK);

    // vref
-#ifdef GOTTHARDD
+#if defined(GOTTHARDD) || defined(MOENCHD)
    LOG(logINFO, ("\tVref default at 2.0\n"));
    AD9257_SetVrefVoltage(AD9257_VREF_DEFAULT_VAL, 0);
 #else
--- a/slsDetectorServers/slsDetectorServer/src/ALTERA_PLL.c
+++ b/slsDetectorServers/slsDetectorServer/src/ALTERA_PLL.c
@ -127,7 +127,7 @@ uint32_t ALTERA_PLL_Cntrl_Reg = 0x0;
 uint32_t ALTERA_PLL_Param_Reg = 0x0;
 uint32_t ALTERA_PLL_Cntrl_RcnfgPrmtrRstMask = 0x0;
 uint32_t ALTERA_PLL_Cntrl_WrPrmtrMask = 0x0;
-#if defined(JUNGFRAUD) || defined(MOENCHD)
+#ifdef JUNGFRAUD
 uint32_t ALTERA_PLL_Cntrl_DBIT_PLL_WrPrmtrMask = 0x0;
 int ALTERA_PLL_Cntrl_DBIT_ClkIndex = 0;

@ -136,7 +136,7 @@ uint32_t ALTERA_PLL_Cntrl_PLLRstMask = 0x0;
 uint32_t ALTERA_PLL_Cntrl_AddrMask = 0x0;
 int ALTERA_PLL_Cntrl_AddrOfst = 0;

-#if defined(JUNGFRAUD) || defined(MOENCHD)
+#ifdef JUNGFRAUD
 void ALTERA_PLL_SetDefines(uint32_t creg, uint32_t preg, uint32_t rprmsk,
                           uint32_t wpmsk, uint32_t prmsk, uint32_t amsk,
                           int aofst, uint32_t wd2msk, int clk2Index) {
@ -201,7 +201,7 @@ void ALTERA_PLL_SetPllReconfigReg(uint32_t reg, uint32_t val,
         reg, val, useSecondWRMask));

    uint32_t wrmask = ALTERA_PLL_Cntrl_WrPrmtrMask;
-#if defined(JUNGFRAUD) || defined(MOENCHD)
+#ifdef JUNGFRAUD
    if (useSecondWRMask) {
        wrmask = ALTERA_PLL_Cntrl_DBIT_PLL_WrPrmtrMask;
    }
@ -252,7 +252,7 @@ void ALTERA_PLL_SetPhaseShift(int32_t phase, int clkIndex, int pos) {
    LOG(logDEBUG1, ("C%d phase word:0x%08x\n", clkIndex, value));

    int useSecondWR = 0;
-#if defined(JUNGFRAUD) || defined(MOENCHD)
+#ifdef JUNGFRAUD
    if (clkIndex == ALTERA_PLL_Cntrl_DBIT_ClkIndex) {
        useSecondWR = 1;
    }
--- a/slsDetectorServers/slsDetectorServer/src/common.c
+++ b/slsDetectorServers/slsDetectorServer/src/common.c
@ -224,10 +224,10 @@ int getModuleIdInFile(int *ret, char *mess, char *fileName) {
    // open id file
    FILE *fd = fopen(fname, "r");
    if (fd == NULL) {
-#if defined(JUNGFRAUD) || defined(MOENCHD)
+#ifdef JUNGFRAUD
        *ret = OK;
-        LOG(logWARNING, ("Could not find detid file to set module id. "
-                         "Continuing without.\n"));
+        LOG(logWARNING,
+            ("Could not find detid_jungfrau.txt to set module id\n"));
        return 0;
 #else
        *ret = FAIL;
@ -485,7 +485,7 @@ int setupDetectorServer(char *mess, char *sname) {

    // blackfin boards (respawn) (only kept for backwards compatibility)
 #ifndef VIRTUAL
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD) ||       \
+#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD) ||       \
    defined(GOTTHARDD)
    // delete every line with DetectorServer in /etc/inittab
    strcpy(cmd, "sed -i '/DetectorServer/d' /etc/inittab");
--- a/slsDetectorServers/slsDetectorServer/src/loadPattern.c
+++ b/slsDetectorServers/slsDetectorServer/src/loadPattern.c
@ -13,7 +13,7 @@
 extern enum TLogLevel trimmingPrint;
 #endif

-#ifdef CHIPTESTBOARDD
+#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
 #ifdef VIRTUAL
 uint64_t virtual_pattern[MAX_PATTERN_LENGTH];
 #endif
@ -40,7 +40,7 @@ void initializePatternAddresses() {
    }
 }

-#ifdef CHIPTESTBOARDD
+#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
 #ifdef VIRTUAL
 void initializePatternWord() {
    memset(virtual_pattern, 0, sizeof(virtual_pattern));
@ -128,7 +128,7 @@ int validate_writePatternWord(char *message, int addr, uint64_t word) {

    // validate result
    int ret = OK;
-    // cannot validate for ctb ( same as executing pattern word)
+    // cannot validate for moench, ctb ( same as executing pattern word)
 #ifdef MYTHEN3D
    uint64_t retval = readPatternWord(addr);
    LOG(logDEBUG1, ("Pattern word (addr:0x%x) retval: 0x%llx\n", addr,
--- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c
+++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c
@ -88,7 +88,7 @@ int main(int argc, char *argv[]) {
            "and "
            "initial detector setup. \n"
            "\t-i, --ignore-config      : "
-            "[Eiger][Jungfrau][Gotthard][Gotthard2][Moench] \n"
+            "[Eiger][Jungfrau][Gotthard][Gotthard2] \n"
            "\t                           Ignore config file. \n"
            "\t-m, --master <master>    : "
            "[Eiger][Mythen3][Gotthard][Gotthard2] \n"
@ -205,7 +205,7 @@ int main(int argc, char *argv[]) {

        case 'i':
 #if defined(EIGERD) || defined(GOTTHARDD) || defined(GOTTHARD2D) ||            \
-    defined(JUNGFRAUD) || defined(MOENCHD)
+    defined(JUNGFRAUD)
            LOG(logINFO, ("Ignoring config file\n"));
            ignoreConfigFileFlag = 1;
 #else
--- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
+++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
--- a/slsDetectorSoftware/include/sls/Detector.h
+++ b/slsDetectorSoftware/include/sls/Detector.h
@ -78,22 +78,18 @@ class Detector {

    Result<int64_t> getFirmwareVersion(Positions pos = {}) const;

-    /** [Eiger] Options:  FRONT_LEFT, FRONT_RIGHT */
-    Result<int64_t>
-    getFrontEndFirmwareVersion(const defs::fpgaPosition fpgaPosition,
-                               Positions pos = {}) const;
-
    Result<std::string> getDetectorServerVersion(Positions pos = {}) const;

+    /** [Jungfrau][Gotthard2][Myhten3][Gotthard][Ctb][Moench] */
    Result<std::string> getHardwareVersion(Positions pos = {}) const;

    Result<std::string> getKernelVersion(Positions pos = {}) const;

-    /* [Jungfrau][Moench][Gotthard][Mythen3][Gotthard2][CTB] */
+    /* [Jungfrau][Gotthard][Mythen3][Gotthard2][CTB][Moench] */
    Result<int64_t> getSerialNumber(Positions pos = {}) const;

-    /** [Eiger][Gotthard2][Mythen3][Jungfrau][Moench] 6 bit value (ideally
-     * unique) that is streamed out in the UDP header of the detector.*/
+    /** [Eiger][Gotthard2][Mythen3][Jungfrau] 6 bit value (ideally unique) that
+     * is streamed out in the UDP header of the detector.*/
    Result<int> getModuleId(Positions pos = {}) const;

    Result<std::string> getReceiverVersion(Positions pos = {}) const;
@ -126,12 +122,14 @@ class Detector {
    /** list of possible settings for this detector */
    std::vector<defs::detectorSettings> getSettingsList() const;

-    /** [Jungfrau][Moench][Gotthard][Gotthard2][Mythen3] */
+    /** [Jungfrau][Gotthard][Gotthard2][Mythen3] */
    Result<defs::detectorSettings> getSettings(Positions pos = {}) const;

-    /** [Jungfrau][Moench] GAIN0, HIGHGAIN0 \n [Gotthard] DYNAMICGAIN, HIGHGAIN,
+    /** [Jungfrau] GAIN0, HIGHGAIN0 \n [Gotthard] DYNAMICGAIN, HIGHGAIN,
     * LOWGAIN, MEDIUMGAIN, VERYHIGHGAIN \n [Gotthard2] DYNAMICGAIN,
-     * FIXGAIN1, FIXGAIN2 \n [Mythen3] STANDARD, FAST,
+     * FIXGAIN1, FIXGAIN2 \n [Moench] G1_HIGHGAIN, G1_LOWGAIN,
+     * G2_HIGHCAP_HIGHGAIN, G2_HIGHCAP_LOWGAIN, G2_LOWCAP_HIGHGAIN,
+     * G2_LOWCAP_LOWGAIN, G4_HIGHGAIN, G4_LOWGAIN \n [Mythen3] STANDARD, FAST,
     * HIGHGAIN. Also changes vrshaper and vrpreamp \n [Eiger] Use threshold
     * command. Settings loaded from file found in settingspath
     */
@ -181,39 +179,38 @@ class Detector {
     * files exist in corresponding trim folders */
    void setTrimEnergies(std::vector<int> energies, Positions pos = {});

-    /**[Eiger][Jungfrau][Moench] */
+    /**[Eiger][Jungfrau] */
    bool getGapPixelsinCallback() const;

    /**
-     * [Eiger][Jungfrau][Moench]
+     * [Eiger][Jungfrau]
     * Include gap pixels in client data call back. Will not be in detector
     * streaming, receiver file or streaming. Default is disabled.
     */
    void setGapPixelsinCallback(const bool enable);

-    /** [Eiger][Jungfrau][Moench] */
+    /** [Eiger][Jungfrau] */
    Result<bool> getFlipRows(Positions pos = {}) const;

    /** [Eiger] flips rows paramater sent to slsreceiver to stream as json
-     * parameter to flip rows in gui \n[Jungfrau][Moench] flips rows in the
-     * detector itself.  For bottom module and number of interfaces must be set
-     * to 2. slsReceiver and slsDetectorGui does not handle.slsReceiver and
+     * parameter to flip rows in gui \n[Jungfrau] flips rows in the detector
+     * itself.  For bottom module and number of interfaces must be set to 2.
+     * slsReceiver and slsDetectorGui does not handle.slsReceiver and
     * slsDetectorGui does not handle
     */
    void setFlipRows(bool value, Positions pos = {});

-    /** [Eiger][Mythen3][Gotthard1][Gotthard2][Jungfrau][Moench] via stop server
-     * **/
+    /** [Eiger][Mythen3][Gotthard1][Gotthard2][Jungfrau] via stop server **/
    Result<bool> getMaster(Positions pos = {}) const;

-    /** [Eiger][Gotthard2][Jungfrau][Moench] Set (half) module to master and the
+    /** [Eiger][Gotthard2][Jungfrau] Set (half) module to master and the
     * other(s) to slaves */
    void setMaster(bool value, int pos);

-    /** [Jungfrau][Moench] **/
+    /** [Jungfrau] **/
    Result<bool> getSynchronization(Positions pos = {}) const;

-    /** [Jungfrau][Moench]  */
+    /** [Jungfrau]  */
    void setSynchronization(bool value);

    /** [Gotthard2][Mythen3] */
@ -288,11 +285,11 @@ class Detector {

    void setNumberOfTriggers(int64_t value);

-    /** [Gotthard][Jungfrau][Moench][Eiger][CTB][Gotthard2]  \n
+    /** [Gotthard][Jungfrau][Eiger][CTB][Moench][Gotthard2]  \n
     * [Mythen3] use function with gate index **/
    Result<ns> getExptime(Positions pos = {}) const;

-    /** [Gotthard][Jungfrau][Moench][Eiger][CTB][Gotthard2]  \n
+    /** [Gotthard][Jungfrau][Eiger][CTB][Moench][Gotthard2]  \n
     * [Mythen3] sets exptime for all gate signals. To specify gate index, use
     * function with gate index **/
    void setExptime(ns t, Positions pos = {});
@ -301,25 +298,25 @@ class Detector {

    void setPeriod(ns t, Positions pos = {});

-    /** [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2] */
+    /** [Gotthard][Jungfrau][CTB][Moench][Mythen3][Gotthard2] */
    Result<ns> getDelayAfterTrigger(Positions pos = {}) const;

-    /** [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2] */
+    /** [Gotthard][Jungfrau][CTB][Moench][Mythen3][Gotthard2] */
    void setDelayAfterTrigger(ns value, Positions pos = {});

-    /** [Gotthard][Jungfrau][Moench][CTB][Mythen3]
+    /** [Gotthard][Jungfrau][CTB][Moench][Mythen3]
     * [Gotthard2] only in continuous auto mode */
    Result<int64_t> getNumberOfFramesLeft(Positions pos = {}) const;

-    /** [Gotthard][Jungfrau][Moench][CTB][Mythen3]
+    /** [Gotthard][Jungfrau][CTB][Moench][Mythen3]
     * Only when external trigger used */
    Result<int64_t> getNumberOfTriggersLeft(Positions pos = {}) const;

-    /** [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2]
+    /** [Gotthard][Jungfrau][CTB][Moench][Mythen3][Gotthard2]
     * [Gotthard2] only in continuous mode */
    Result<ns> getPeriodLeft(Positions pos = {}) const;

-    /** [Gotthard][Jungfrau][Moench][CTB][Mythen3]
+    /** [Gotthard][Jungfrau][CTB][Moench][Mythen3]
     * [Gotthard2] only in continuous mode */
    Result<ns> getDelayAfterTriggerLeft(Positions pos = {}) const;

@ -328,7 +325,7 @@ class Detector {
    /**
     * [Eiger] Options: 4, 8, 12, 16, 32. If i is 32, also sets clkdivider to 2,
     * else sets clkdivider to 1 \n [Mythen3] Options: 8, 16, 32 \n
-     * [Jungfrau][Moench][Gotthard][Ctb][Mythen3][Gotthard2] 16
+     * [Jungfrau][Gotthard][Ctb][Moench][Mythen3][Gotthard2] 16
     */
    void setDynamicRange(int value);

@ -338,7 +335,7 @@ class Detector {
    Result<defs::timingMode> getTimingMode(Positions pos = {}) const;

    /**
-     * [Gotthard][Jungfrau][Moench][Gotthard][CTB][Gotthard2] Options:
+     * [Gotthard][Jungfrau][Gotthard][CTB][Moench][Gotthard2] Options:
     * AUTO_TIMING, TRIGGER_EXPOSURE \n
     * [Mythen3] Options: AUTO_TIMING, TRIGGER_EXPOSURE, GATED, TRIGGER_GATED \n
     * [Eiger] Options: AUTO_TIMING, TRIGGER_EXPOSURE, GATED, BURST_TRIGGER
@ -348,62 +345,64 @@ class Detector {
    /** list of possible timing modes for this detector */
    std::vector<defs::timingMode> getTimingModeList() const;

-    /** [Eiger][Jungfrau][Moench][Gotthard2] */
+    /** [Eiger][Jungfrau][Gotthard2] */
    Result<defs::speedLevel> getReadoutSpeed(Positions pos = {}) const;

-    /** [Eiger][Jungfrau][Moench][Gotthard2]
-     * [Jungfrau][Moench] Options: FULL_SPEED, HALF_SPEED (Default),
-     * QUARTER_SPEED \n [Eiger] Options: FULL_SPEED (Default), HALF_SPEED,
-     * QUARTER_SPEED \n [Gotthard2] Options: G2_108MHZ (Default), G2_144MHZ \n
-     * [Jungfrau][Moench] FULL_SPEED option only available from v2.0 boards and
-     * is recommended to set number of interfaces to 2. \n Also overwrites
-     * adcphase to recommended default.
+    /** [Eiger][Jungfrau][Gotthard2]
+     * [Jungfrau] Options: FULL_SPEED, HALF_SPEED (Default), QUARTER_SPEED \n
+     * [Eiger] Options: FULL_SPEED (Default), HALF_SPEED, QUARTER_SPEED \n
+     * [Gotthard2] Options: G2_108MHZ (Default), G2_144MHZ \n
+     * [Jungfrau] FULL_SPEED option only available from v2.0 boards and is
+     * recommended to set number of interfaces to 2. \n Also overwrites adcphase
+     * to recommended default.
     */
    void setReadoutSpeed(defs::speedLevel value, Positions pos = {});

    /** list of possible readoutspeed modes for this detector */
    std::vector<defs::speedLevel> getReadoutSpeedList() const;

-    /** [Jungfrau][Moench][CTB] */
+    /** [Jungfrau][CTB][Moench] */
    Result<int> getADCPhase(Positions pos = {}) const;

-    /** [Gotthard][Jungfrau][Moench][CTB]
-     * [Jungfrau][Moench] Absolute phase shift. Changing Speed also resets
-     * adcphase to recommended defaults. \n [Ctb] Absolute phase shift. Changing
-     * adcclk also resets adcphase and sets it to previous values. \n [Gotthard]
-     * Relative phase shift
+    /** [Gotthard][Jungfrau][CTB][Moench]
+     * [Jungfrau] Absolute phase shift. Changing Speed also resets adcphase to
+     * recommended defaults. \n
+     * [Ctb][Moench] Absolute phase shift. Changing adcclk also resets adcphase
+     * and sets it to previous values. \n
+     * [Gotthard] Relative phase shift
     */
    void setADCPhase(int value, Positions pos = {});

-    /** [Jungfrau][Moench][CTB] */
+    /** [Jungfrau][CTB][Moench] */
    Result<int> getMaxADCPhaseShift(Positions pos = {}) const;

-    /** [Gotthard][Jungfrau][Moench][CTB] */
+    /** [Gotthard][Jungfrau][CTB][Moench] */
    Result<int> getADCPhaseInDegrees(Positions pos = {}) const;

-    /** [Gotthard][Jungfrau][Moench][CTB]
-     * [Jungfrau][Moench] Absolute phase shift. Changing Speed also resets
-     * adcphase to recommended defaults. \n [Ctb] Absolute phase shift. Changing
-     * adcclk also resets adcphase and sets it to previous values. \n [Gotthard]
-     * Relative phase shift
+    /** [Gotthard][Jungfrau][CTB][Moench]
+     * [Jungfrau] Absolute phase shift. Changing Speed also resets adcphase to
+     * recommended defaults. \n
+     * [Ctb][Moench] Absolute phase shift. Changing adcclk also resets adcphase
+     * and sets it to previous values. \n
+     * [Gotthard] Relative phase shift
     */
    void setADCPhaseInDegrees(int value, Positions pos = {});

-    /** [CTB][Jungfrau][Moench] */
+    /** [CTB][Jungfrau] */
    Result<int> getDBITPhase(Positions pos = {}) const;

-    /** [CTB][Jungfrau][Moench] Absolute phase shift \n
+    /** [CTB][Jungfrau] Absolute phase shift \n
     * [CTB] changing dbitclk also resets dbitphase and sets to previous values.
     */
    void setDBITPhase(int value, Positions pos = {});

-    /** [CTB][Jungfrau][Moench] */
+    /** [CTB][Jungfrau] */
    Result<int> getMaxDBITPhaseShift(Positions pos = {}) const;

-    /** [CTB][Jungfrau][Moench] */
+    /** [CTB][Jungfrau] */
    Result<int> getDBITPhaseInDegrees(Positions pos = {}) const;

-    /** [CTB][Jungfrau][Moench] Absolute phase shift \n
+    /** [CTB][Jungfrau] Absolute phase shift \n
     * [CTB] changing dbitclk also resets dbitphase and sets to previous values.
     */
    void setDBITPhaseInDegrees(int value, Positions pos = {});
@ -436,18 +435,18 @@ class Detector {

    /**
     * [Gotthard] Options: 0, 90, 110, 120, 150, 180, 200
-     * [Jungfrau][Moench][CTB] Options: 0, 60 - 200
+     * [Jungfrau][CTB][Moench] Options: 0, 60 - 200
     * [Eiger][Mythen3][Gotthard2] Options: 0 - 200
     */
    void setHighVoltage(int value, Positions pos = {});

-    /** [Jungfrau][Moench][Mythen3][Gotthard2] */
+    /** [Jungfrau][Mythen3][Gotthard2][Moench] */
    Result<bool> getPowerChip(Positions pos = {}) const;

-    /** [Jungfrau][Moench][Mythen3][Gotthard2] Power the chip. \n
-     *  Default is disabled. \n
-     * [Jungfrau][Moench] Default is disabled. Get will return power status. Can
-     * be off if temperature event occured (temperature over temp_threshold with
+    /** [Jungfrau][Mythen3][Gotthard2][Moench] Power the chip. \n
+     * [Moench] Default is disabled. \n
+     * [Jungfrau] Default is disabled. Get will return power status. Can be off
+     * if temperature event occured (temperature over temp_threshold with
     * temp_control enabled. Will configure chip (only chip v1.1)\n
     * [Mythen3][Gotthard2] Default is 1. If module not connected or wrong
     * module, powerchip will fail.
@ -459,8 +458,8 @@ class Detector {

    /** [Gotthard] If 1, adds channel intensity with precalculated values.
     * Default is 0 \n
-     * [Eiger][Jungfrau][Moench] Only for virtual servers, if 1, pixels are
-     * saturated. If 0, increasing intensity */
+     * [Eiger][Jungfrau] Only for virtual servers, if 1, pixels are saturated.
+     * If 0, increasing intensity */
    void setImageTestMode(const int value, Positions pos = {});

    /** gets list of temperature indices for this detector */
@ -470,7 +469,7 @@ class Detector {
     * (Degrees)
     * [Mythen3][Gotthard2] Options: TEMPERATURE_FPGA
     * [Gotthard] Options: TEMPERATURE_ADC, TEMPERATURE_FPGA \n
-     * [Jungfrau][Moench] Options: TEMPERATURE_ADC, TEMPERATURE_FPGA \n
+     * [Jungfrau] Options: TEMPERATURE_ADC, TEMPERATURE_FPGA \n
     * [Eiger] Options: TEMPERATURE_FPGA, TEMPERATURE_FPGAEXT, TEMPERATURE_10GE,
     * TEMPERATURE_DCDC, TEMPERATURE_SODL, TEMPERATURE_SODR, TEMPERATURE_FPGA2,
     * TEMPERATURE_FPGA3 \n [CTB] Options: SLOW_ADC_TEMP
@ -487,11 +486,11 @@ class Detector {
    void setDefaultDac(defs::dacIndex index, int defaultValue,
                       Positions pos = {});

-    /** [Jungfrau][Moench][Mythen3] */
+    /** [Jungfrau][Mythen3] */
    Result<int> getDefaultDac(defs::dacIndex index, defs::detectorSettings sett,
                              Positions pos = {});

-    /** [Jungfrau][Moench][Mythen3] */
+    /** [Jungfrau][Mythen3] */
    void setDefaultDac(defs::dacIndex index, int defaultValue,
                       defs::detectorSettings sett, Positions pos = {});

@ -540,21 +539,20 @@ class Detector {
     * mode.*/
    void setParallelMode(bool value, Positions pos = {});

-    /** [Gotthard2][Jungfrau][Moench] */
+    /** [Gotthard2][Jungfrau] */
    Result<int> getFilterResistor(Positions pos = {}) const;

-    /** [Gotthard2][Jungfrau][Moench] Set filter resistor. Increasing values for
+    /** [Gotthard2][Jungfrau] Set filter resistor. Increasing values for
     * increasing resistance.\n[Gotthard2] Options: [0|1|2|3]. Default is
-     * 0.\n[Jungfrau][Moench] Options: [0|1]. Default is 1.*/
+     * 0.\n[Jungfrau] Options: [0|1]. Default is 1.*/
    void setFilterResistor(int value, Positions pos = {});

-    /** [Gotthard2][Jungfrau][Moench] */
+    /** [Gotthard2][Jungfrau] */
    Result<defs::currentSrcParameters>
    getCurrentSource(Positions pos = {}) const;

-    /** [Gotthard2][Jungfrau][Moench] Please refer documentation on
-     * currentSrcParameters (sls_detector_defs.h) on the structure and its
-     * members */
+    /** [Gotthard2][Jungfrau] Please refer documentation on currentSrcParameters
+     * (sls_detector_defs.h) on the structure and its members */
    void setCurrentSource(defs::currentSrcParameters par, Positions pos = {});

    /** [CTB][Gotthard2] */
@ -563,14 +561,14 @@ class Detector {
    /** [CTB] Options: 0-255 \n [Gotthard2] Options: 0-7 */
    void setDBITPipeline(int value, Positions pos = {});

-    /** [Eiger][Jungfrau][Moench] */
+    /** [Eiger][Jungfrau] */
    Result<int> getReadNRows(Positions pos = {}) const;

    /** [Eiger] Number of rows to read out per half module
     * Options: 0 - 256. 256 is default. The permissible values depend on
-     * dynamic range and 10Gbe enabled. \n[Jungfrau][Moench] Number of rows per
-     * module starting from the centre. Options: 8 - 512, must be multiples
-     * of 8. Default is 512.
+     * dynamic range and 10Gbe enabled. \n[Jungfrau] Number of rows per module
+     * starting from the centre. Options: 8 - 512, must be multiples of 8.
+     * Default is 512.
     */
    void setReadNRows(const int lines, Positions pos = {});

@ -649,9 +647,10 @@ class Detector {
     * different frame numbers for different modules.*/
    void setNextFrameNumber(uint64_t value, Positions pos = {});

-    /** [Eiger][Mythen3][Jungfrau][Moench] Sends an internal software trigger to
-     * the detector block true if command blocks till frames are sent out from
-     * that trigger [Eiger][Jungfrau][Moench] Block can be true
+    /** [Eiger][Mythen3][Jungfrau] Sends an internal software trigger to the
+     * detector block true if command blocks till frames are sent out from that
+     * trigger
+     * [Eiger][Jungfrau] Block can be true
     */
    void sendSoftwareTrigger(const bool block = false, Positions pos = {});

@ -677,23 +676,23 @@ class Detector {
     *                                                 *
     * ************************************************/

-    /** [Jungfrau][Moench][Gotthard2][Eiger] */
+    /** [Jungfrau][Gotthard2][Eiger] */
    Result<int> getNumberofUDPInterfaces(Positions pos = {}) const;

-    /** [Jungfrau][Moench][Gotthard2]  Number of udp interfaces to stream data
-     * from detector. Default is 1. \n Also enables second interface in receiver
-     * for listening (Writes a file per interface if writing enabled). \n Also
+    /** [Jungfrau][Gotthard2]  Number of udp interfaces to stream data from
+     * detector. Default is 1. \n Also enables second interface in receiver for
+     * listening (Writes a file per interface if writing enabled). \n Also
     * restarts client and receiver zmq sockets if zmq streaming enabled. \n
     * [Gotthard2] second interface enabled to send veto information via 10Gbps
     * for debugging. By default, if veto enabled, it is sent via 2.5 gbps
     * interface. */
    void setNumberofUDPInterfaces(int n, Positions pos = {});

-    /** [Jungfrau][Moench] */
+    /** [Jungfrau] */
    Result<int> getSelectedUDPInterface(Positions pos = {}) const;

    /**
-     * [Jungfrau][Moench]
+     * [Jungfrau]
     * Effective only when number of interfaces is 1.
     * Options: 0 (outer, default), 1(inner)] //TODO: enum?
     */
@ -707,11 +706,11 @@ class Detector {
     */
    void setSourceUDPIP(const IpAddr ip, Positions pos = {});

-    /** [Jungfrau][Moench] bottom half [Gotthard2] veto debugging */
+    /** [Jungfrau] bottom half [Gotthard2] veto debugging */
    Result<IpAddr> getSourceUDPIP2(Positions pos = {}) const;

-    /** [Jungfrau][Moench] bottom half [Gotthard2] veto debugging. \n The source
-     * UDP IP must be in the same subnet of the destination UDP IP2 */
+    /** [Jungfrau] bottom half [Gotthard2] veto debugging. \n The source UDP IP
+     * must be in the same subnet of the destination UDP IP2 */
    void setSourceUDPIP2(const IpAddr ip, Positions pos = {});

    Result<MacAddr> getSourceUDPMAC(Positions pos = {}) const;
@ -722,10 +721,10 @@ class Detector {
     */
    void setSourceUDPMAC(const MacAddr mac, Positions pos = {});

-    /** [Jungfrau][Moench] bottom half [Gotthard2] veto debugging */
+    /** [Jungfrau] bottom half [Gotthard2] veto debugging */
    Result<MacAddr> getSourceUDPMAC2(Positions pos = {}) const;

-    /** [Jungfrau][Moench] bottom half [Gotthard2] veto debugging */
+    /** [Jungfrau] bottom half [Gotthard2] veto debugging */
    void setSourceUDPMAC2(const MacAddr mac, Positions pos = {});

    Result<UdpDestination> getDestinationUDPList(const uint32_t entry,
@ -733,16 +732,16 @@ class Detector {

    void setDestinationUDPList(const UdpDestination, const int module_id);

-    /** [Jungfrau][Moench][Eiger][Mythen3][Gotthard2] */
+    /** [Jungfrau][Eiger][Mythen3][Gotthard2] */
    Result<int> getNumberofUDPDestinations(Positions pos = {}) const;

    void clearUDPDestinations(Positions pos = {});

-    /** [Jungfrau][Moench][Mythen3][Gotthard2] */
+    /** [Jungfrau][Mythen3][Gotthard2] */
    Result<int> getFirstUDPDestination(Positions pos = {}) const;

-    /**[Jungfrau][Moench][Gotthard2] Options 0-31 (or number of udp
-     * destinations)\n [Mythen3] Options 0-63 (or number of udp destinations)
+    /**[Jungfrau][Gotthard2] Options 0-31 (or number of udp destinations)\n
+     * [Mythen3] Options 0-63 (or number of udp destinations)
     */
    void setFirstUDPDestination(const int value, Positions pos = {});

@ -751,10 +750,10 @@ class Detector {
    /** IP of the interface in receiver that the detector sends data to */
    void setDestinationUDPIP(const IpAddr ip, Positions pos = {});

-    /** [Jungfrau][Moench] bottom half \n [Gotthard2] veto debugging */
+    /** [Jungfrau] bottom half \n [Gotthard2] veto debugging */
    Result<IpAddr> getDestinationUDPIP2(Positions pos = {}) const;

-    /** [Jungfrau][Moench] bottom half \n [Gotthard2] veto debugging */
+    /** [Jungfrau] bottom half \n [Gotthard2] veto debugging */
    void setDestinationUDPIP2(const IpAddr ip, Positions pos = {});

    Result<MacAddr> getDestinationUDPMAC(Positions pos = {}) const;
@ -766,15 +765,14 @@ class Detector {
     */
    void setDestinationUDPMAC(const MacAddr mac, Positions pos = {});

-    /** [Jungfrau][Moench] bottom half \n [Gotthard2] veto debugging */
+    /** [Jungfrau] bottom half \n [Gotthard2] veto debugging */
    Result<MacAddr> getDestinationUDPMAC2(Positions pos = {}) const;

-    /* [Jungfrau][Moench][Gotthard2] Mac address of the receiver (destination)
-     * udp interface 2. \n Not mandatory to set as udp_dstip2 retrieves it from
+    /* [Jungfrau][Gotthard2] Mac address of the receiver (destination) udp
+     * interface 2. \n Not mandatory to set as udp_dstip2 retrieves it from
     * slsReceiver process but must be set if you use a custom receiver (not
-     * slsReceiver). \n [Jungfrau][Moench] bottom half \n [Gotthard2] veto
-     * debugging \n Use router mac address if router in between detector and
-     * receiver.
+     * slsReceiver). \n [Jungfrau] bottom half \n [Gotthard2] veto debugging \n
+     * Use router mac address if router in between detector and receiver.
     */
    void setDestinationUDPMAC2(const MacAddr mac, Positions pos = {});

@ -784,13 +782,12 @@ class Detector {
     * calculated (incremented by 1 if no 2nd interface) */
    void setDestinationUDPPort(int port, int module_id = -1);

-    /** [Eiger] right port[Jungfrau][Moench] bottom half [Gotthard2] veto
-     * debugging */
+    /** [Eiger] right port[Jungfrau] bottom half [Gotthard2] veto debugging */
    Result<int> getDestinationUDPPort2(Positions pos = {}) const;

-    /** [Eiger] right port[Jungfrau][Moench] bottom half [Gotthard2] veto
-     * debugging \n Default is 50002. \n If module_id is -1, ports for each
-     * module is calculated (incremented by 1 if no 2nd interface)*/
+    /** [Eiger] right port[Jungfrau] bottom half [Gotthard2] veto debugging \n
+     * Default is 50002. \n If module_id is -1, ports for each module is
+     * calculated (incremented by 1 if no 2nd interface)*/
    void setDestinationUDPPort2(int port, int module_id = -1);

    /** Reconfigures Detector with UDP destination. More for debugging as the
@ -805,28 +802,27 @@ class Detector {

    Result<std::string> printRxConfiguration(Positions pos = {}) const;

-    /** [Eiger][CTB][Mythen3] */
+    /** [Eiger][CTB][Moench][Mythen3] */
    Result<bool> getTenGiga(Positions pos = {}) const;

-    /** [Eiger][CTB][Mythen3] */
+    /** [Eiger][CTB][Moench][Mythen3] */
    void setTenGiga(bool value, Positions pos = {});

-    /** [Eiger][Jungfrau][Moench] */
+    /** [Eiger][Jungfrau] */
    Result<bool> getTenGigaFlowControl(Positions pos = {}) const;

-    /** [Eiger][Jungfrau][Moench] */
+    /** [Eiger][Jungfrau] */
    void setTenGigaFlowControl(bool enable, Positions pos = {});

-    /** [Eiger][Jungfrau][Moench][Mythen3] */
+    /** [Eiger][Jungfrau][Mythen3] */
    Result<int> getTransmissionDelayFrame(Positions pos = {}) const;

    /**
-     * Eiger][Jungfrau][Moench][Mythen3] Transmission delay of first udp packet
-     * being streamed out of the module.\n[Jungfrau][Moench] [0-31] Each value
-     * represents 1 ms\n[Eiger] Additional delay to txndelay_left and
-     * txndelay_right. Each value represents 10ns. Typical value is
-     * 50000.\n[Mythen3] [0-16777215] Each value represents 8 ns (125 MHz
-     * clock), max is 134 ms.
+     * Eiger][Jungfrau][Mythen3] Transmission delay of first udp packet being
+     * streamed out of the module.\n[Jungfrau] [0-31] Each value represents 1
+     * ms\n[Eiger] Additional delay to txndelay_left and txndelay_right. Each
+     * value represents 10ns. Typical value is 50000.\n[Mythen3] [0-16777215]
+     * Each value represents 8 ns (125 MHz clock), max is 134 ms.
     */
    void setTransmissionDelayFrame(int value, Positions pos = {});

@ -851,16 +847,16 @@ class Detector {
     */
    void setTransmissionDelayRight(int value, Positions pos = {});

-    /** [Eiger][Jungfrau][Moench] */
+    /** [Eiger][Jungfrau] */
    int getTransmissionDelay() const;

    /**
-     * [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.
+     * [Eiger][Jungfrau][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][Mythen3] txdelay_frame to
+     * (num_modules * n_delay) \nfor every module.
     */
    void setTransmissionDelay(int step);

@ -1242,22 +1238,22 @@ class Detector {

    ///@}

-    /** @name Jungfrau/Moench Specific */
+    /** @name Jungfrau Specific */
    ///@{
    /**************************************************
     *                                                *
-     *    Jungfrau/Moench Specific                           *
+     *    Jungfrau Specific                           *
     *                                                *
     * ************************************************/

-    /** [Jungfrau][Moench] */
+    /** [Jungfrau] */
    Result<double> getChipVersion(Positions pos = {}) const;

-    /** [Jungfrau][Moench] */
+    /** [Jungfrau] */
    Result<int> getThresholdTemperature(Positions pos = {}) const;

    /**
-     * [Jungfrau][Moench]Set threshold temperature in degrees.
+     * [Jungfrau]Set threshold temperature in degrees.
     * If temperature crosses threshold temperature
     * and temperature control is enabled (default is disabled), power to chip
     * will be switched off and temperature event will be set. \n To power on
@ -1266,23 +1262,23 @@ class Detector {
     */
    void setThresholdTemperature(int temp, Positions pos = {});

-    /** [Jungfrau][Moench] */
+    /** [Jungfrau] */
    Result<bool> getTemperatureControl(Positions pos = {}) const;

-    /** [Jungfrau][Moench]  refer to setThresholdTemperature
+    /** [Jungfrau]  refer to setThresholdTemperature
     * Default is disabled */
    void setTemperatureControl(bool enable, Positions pos = {});

-    /** [Jungfrau][Moench] refer to setThresdholdTemperature */
+    /** [Jungfrau] refer to setThresdholdTemperature */
    Result<int> getTemperatureEvent(Positions pos = {}) const;

-    /** [Jungfrau][Moench] refer to setThresdholdTemperature */
+    /** [Jungfrau] refer to setThresdholdTemperature */
    void resetTemperatureEvent(Positions pos = {});

-    /** [Jungfrau][Moench] */
+    /** [Jungfrau] */
    Result<bool> getAutoComparatorDisable(Positions pos = {}) const;

-    /** [Jungfrau][Moench] Advanced
+    /** [Jungfrau] Advanced
     * //TODO naming
     * By default, the on-chip gain switching is active during the
     * entire exposure. This mode disables the on-chip gain switching comparator
@ -1294,11 +1290,11 @@ class Detector {
     */
    void setAutoComparatorDisable(bool value, Positions pos = {});

-    /** [Jungfrau][Moench] */
+    /** [Jungfrau] */
    Result<ns> getComparatorDisableTime(Positions pos = {}) const;

-    /** [Jungfrau][Moench] Time before end of exposure when comparator is
-     * disabled. It is only possible for chipv1.1.*/
+    /** [Jungfrau] Time before end of exposure when comparator is disabled. It
+     * is only possible for chipv1.1.*/
    void setComparatorDisableTime(ns t, Positions pos = {});

    /** [Jungfrau] Advanced TODO naming */
@ -1312,37 +1308,37 @@ class Detector {
    /** [Jungfrau] Advanced */
    Result<int> getStorageCellStart(Positions pos = {}) const;

-    /** [Jungfrau] Advanced. Sets the storage cell storing the first
-     * acquisition of the series. Options: 0-max. max is 15 (default) for
-     * chipv1.0 and 3 (default) for chipv1.1.
+    /** [Jungfrau] Advanced. Sets the storage cell storing the first acquisition
+     * of the series. Options: 0-max. max is 15 (default) for chipv1.0 and 3
+     * (default) for chipv1.1.
     */
    void setStorageCellStart(int cell, Positions pos = {});

    /** [Jungfrau] Advanced*/
    Result<ns> getStorageCellDelay(Positions pos = {}) const;

-    /** [Jungfrau] Advanced \n Additional time delay between 2
-     * consecutive exposures in burst mode. \n Options: (0-1638375 ns
-     * (resolution of 25ns)\n Only applicable for chipv1.0.
+    /** [Jungfrau] Advanced \n Additional time delay between 2 consecutive
+     * exposures in burst mode. \n Options: (0-1638375 ns (resolution of 25ns)\n
+     * Only applicable for chipv1.0.
     */
    void setStorageCellDelay(ns value, Positions pos = {});

    /** list of possible gainmode  */
    std::vector<defs::gainMode> getGainModeList() const;

-    /** [Jungfrau][Moench]*/
+    /** [Jungfrau]*/
    Result<defs::gainMode> getGainMode(Positions pos = {}) const;

-    /** [Jungfrau][Moench] Options: DYNAMIC, FORCE_SWITCH_G1, FORCE_SWITCH_G2,
+    /** [Jungfrau] Options: DYNAMIC, FORCE_SWITCH_G1, FORCE_SWITCH_G2,
     * FIX_G1, FIX_G2, FIX_G0 \n\CAUTION: Do not use FIX_G0 without caution, you
     * can damage the detector!!!\n
     */
    void setGainMode(const defs::gainMode mode, Positions pos = {});

-    /** [Jungfrau][Moench] Advanced */
+    /** [Jungfrau] Advanced */
    Result<int> getNumberOfFilterCells(Positions pos = {}) const;

-    /** [Jungfrau][Moench] Advanced Options[0-12], only for chip v1.1
+    /** [Jungfrau] Advanced Options[0-12], only for chip v1.1
     */
    void setNumberOfFilterCells(int cell, Positions pos = {});

@ -1574,68 +1570,69 @@ class Detector {

    ///@}

-    /** @name CTB Specific */
+    /** @name CTB / Moench Specific */
    ///@{
    /**************************************************
     *                                                *
-     *    CTB Specific                                *
+     *    CTB / Moench Specific                       *
     *                                                *
     * ************************************************/
-    /** [CTB] */
+    /** [CTB][Moench] */
    Result<int> getNumberOfAnalogSamples(Positions pos = {}) const;

-    /** [CTB] */
+    /** [CTB][Moench] */
    void setNumberOfAnalogSamples(int value, Positions pos = {});

-    /** [CTB] */
+    /** [CTB][Moench] */
    Result<int> getADCClock(Positions pos = {}) const;

-    /** [CTB] */
+    /** [CTB][Moench] */
    void setADCClock(int value_in_MHz, Positions pos = {});

-    /** [CTB] */
+    /** [CTB][Moench] */
    Result<int> getRUNClock(Positions pos = {}) const;

-    /** [CTB] */
+    /** [CTB][Moench] */
    void setRUNClock(int value_in_MHz, Positions pos = {});

-    /** [CTB]  in MHZ */
+    /** [CTB][Moench]  in MHZ */
    Result<int> getSYNCClock(Positions pos = {}) const;

-    /** [CTB] */
+    /** [CTB][Moench] */
    Result<int> getADCPipeline(Positions pos = {}) const;

-    /** [CTB] */
+    /** [CTB][Moench] */
    void setADCPipeline(int value, Positions pos = {});

-    /** [CTB] */
+    /** [CTB][Moench] */
    Result<int> getVoltage(defs::dacIndex index, Positions pos = {}) const;

    /**
-     * [CTB] mV
+     * [CTB][Moench] mV
     * [Ctb] Options: V_LIMIT, V_POWER_A, V_POWER_B, V_POWER_C,
     * V_POWER_D, V_POWER_IO, V_POWER_CHIP
+     * [Moench] Options: V_LIMIT
     */
    void setVoltage(defs::dacIndex index, int value, Positions pos = {});

    /**
-     * [CTB] Options: [0- 4] or [1V, 1.14V, 1.33V, 1.6V, 2V]
+     * [CTB][Moench] Options: [0- 4] or [1V, 1.14V, 1.33V, 1.6V, 2V]
     */
    Result<int> getADCVpp(bool mV = false, Positions pos = {}) const;

-    /** [CTB] */
+    /** [CTB][Moench] */
    void setADCVpp(int value, bool mV = false, Positions pos = {});

-    /** [CTB] */
+    /** [CTB][Moench] */
    Result<uint32_t> getADCEnableMask(Positions pos = {}) const;

-    /** [CTB] */
+    /** [CTB][Moench] */
    void setADCEnableMask(uint32_t mask, Positions pos = {});

-    /** [CTB] */
+    /** [CTB][Moench] */
    Result<uint32_t> getTenGigaADCEnableMask(Positions pos = {}) const;

-    /** [CTB] If any of a consecutive 4 bits are enabled, the "
+    /** [CTB][Moench] If any of a consecutive 4 bits are enabled, the "
        "complete 4 bits are enabled */
    void setTenGigaADCEnableMask(uint32_t mask, Positions pos = {});
    ///@}
@ -1737,78 +1734,78 @@ class Detector {
     *                                                *
     * ************************************************/

-    /** [CTB][Mythen3]  Loads ASCII pattern file directly to server
+    /** [CTB][Moench][Mythen3]  Loads ASCII pattern file directly to server
     * (instead of executing line by line)*/
    void setPattern(const std::string &fname, Positions pos = {});

-    /** [CTB][Mythen3]  Loads pattern parameters structure directly to
+    /** [CTB][Moench][Mythen3]  Loads pattern parameters structure directly to
     * server */
    void setPattern(const Pattern &pat, Positions pos = {});

-    /** [CTB][Mythen3] [Ctb][Mythen3] Saves pattern to file
-     * (ascii). \n [Ctb] Also executes pattern.*/
+    /** [CTB][Moench][Mythen3] [Ctb][Moench][Mythen3] Saves pattern to file
+     * (ascii). \n [Ctb][Moench] Also executes pattern.*/
    void savePattern(const std::string &fname);

-    /** [Mythen3] Loads and runs default pattern */
+    /** [Mythen3][Moench] Loads and runs default pattern */
    void loadDefaultPattern(Positions pos = {});

-    /** [CTB] */
+    /** [CTB][Moench] */
    Result<uint64_t> getPatternIOControl(Positions pos = {}) const;

-    /** [CTB] */
+    /** [CTB][Moench] */
    void setPatternIOControl(uint64_t word, Positions pos = {});

-    /** [CTB][Mythen3] same as executing for ctb */
+    /** [CTB][Moench][Mythen3] same as executing for ctb and moench */
    Result<uint64_t> getPatternWord(int addr, Positions pos = {});

-    /** [CTB] Caution: If word is  -1  reads the addr (same as
+    /** [CTB][Moench] Caution: If word is  -1  reads the addr (same as
     * executing the pattern)
     * [Mythen3] */
    void setPatternWord(int addr, uint64_t word, Positions pos = {});

-    /**[CTB][Mythen3] Options: level: -1 (complete pattern) and 0-2
+    /**[CTB][Moench][Mythen3] Options: level: -1 (complete pattern) and 0-2
     * levels
     * @returns array of start address and stop address
     */
    Result<std::array<int, 2>>
    getPatternLoopAddresses(int level, Positions pos = {}) const;

-    /** [CTB][Mythen3] Options: level: -1 (complete pattern) and 0-2
+    /** [CTB][Moench][Mythen3] Options: level: -1 (complete pattern) and 0-2
     * levels */
    void setPatternLoopAddresses(int level, int start, int stop,
                                 Positions pos = {});

-    /**[CTB][Mythen3] Options: level: -1 (complete pattern) and 0-2
+    /**[CTB][Moench][Mythen3] Options: level: -1 (complete pattern) and 0-2
     * levels  */
    Result<int> getPatternLoopCycles(int level, Positions pos = {}) const;

-    /** [CTB][Mythen3] n: 0-2, level: -1 (complete pattern) and 0-2
+    /** [CTB][Moench][Mythen3] n: 0-2, level: -1 (complete pattern) and 0-2
     * levels */
    void setPatternLoopCycles(int level, int n, Positions pos = {});

-    /**[CTB][Mythen3] */
+    /**[CTB][Moench][Mythen3] */
    Result<int> getPatternWaitAddr(int level, Positions pos = {}) const;

-    /** [CTB][Mythen3] Options: level 0-2 */
+    /** [CTB][Moench][Mythen3] Options: level 0-2 */
    void setPatternWaitAddr(int level, int addr, Positions pos = {});

-    /** [CTB][Mythen3]  */
+    /** [CTB][Moench][Mythen3]  */
    Result<uint64_t> getPatternWaitTime(int level, Positions pos = {}) const;

-    /** [CTB][Mythen3] Options: level 0-2 */
+    /** [CTB][Moench][Mythen3] Options: level 0-2 */
    void setPatternWaitTime(int level, uint64_t t, Positions pos = {});

-    /** [CTB][Mythen3] */
+    /** [CTB][Moench][Mythen3] */
    Result<uint64_t> getPatternMask(Positions pos = {});

-    /** [CTB][Mythen3] Selects the bits that will have a pattern mask
+    /** [CTB][Moench][Mythen3] Selects the bits that will have a pattern mask
     * applied to the selected patmask for every pattern. */
    void setPatternMask(uint64_t mask, Positions pos = {});

-    /** [CTB][Mythen3]  */
+    /** [CTB][Moench][Mythen3]  */
    Result<uint64_t> getPatternBitMask(Positions pos = {}) const;

-    /** [CTB][Mythen3] Sets the mask applied to every pattern to the
+    /** [CTB][Moench][Mythen3] Sets the mask applied to every pattern to the
     * selected bits */
    void setPatternBitMask(uint64_t mask, Positions pos = {});

@ -1816,18 +1813,19 @@ class Detector {
    void startPattern(Positions pos = {});
    ///@}

-    /** @name Json Header specific */
+    /** @name Moench specific */
    ///@{
    /**************************************************
     *                                                *
-     *    Json Header specific                        *
+     *    Moench specific                             *
     *                                                *
     * ************************************************/

+    /** [Moench] */
    Result<std::map<std::string, std::string>>
    getAdditionalJsonHeader(Positions pos = {}) const;

-    /**  If empty, reset additional json header. Default is empty. Max
+    /** [Moench] If empty, reset additional json header. Default is empty. Max
     * 20 characters for each key/value. Empty value deletes header. Use only if
     * to be processed by an intermediate user process listening to receiver zmq
     * packets such as in Moench */
@ -1835,9 +1833,11 @@ class Detector {
        const std::map<std::string, std::string> &jsonHeader,
        Positions pos = {});

+    /** [Moench] */
    Result<std::string> getAdditionalJsonParameter(const std::string &key,
                                                   Positions pos = {}) const;
    /**
+     * [Moench]
     * Sets the value for additional json header parameters. If not found,
     * the pair is appended. Empty value deletes parameter. Max 20 characters
     * for each key/value.
@ -1855,41 +1855,41 @@ class Detector {
     *                                                *
     * ************************************************/

-    /**  [Jungfrau][Moench][Gotthard][CTB][Mythen3][Gotthard2]
+    /**  [Jungfrau][Gotthard][CTB][Moench][Mythen3][Gotthard2]
     * Advanced user Function!
     * Program firmware from command line, after which detector controller is
     * rebooted. forceDeleteNormalFile is true, if normal file found
     * in device tree, it must be deleted, a new device drive created and
-     * programming continued.[Jungfrau][Moench][CTB] fname is a pof file (full
+     * programming continued.[Jungfrau][CTB][Moench] fname is a pof file (full
     * path) \n [Mythen3][Gotthard2] fname is an rbf file (full path)
     */
    void programFPGA(const std::string &fname, const bool forceDeleteNormalFile,
                     Positions pos = {});

-    /** [Jungfrau][Moench][CTB]  Advanced user Function!  */
+    /** [Jungfrau][CTB][Moench]  Advanced user Function!  */
    void resetFPGA(Positions pos = {});

-    /** [Jungfrau][Moench][Eiger][Ctb][Mythen3][Gotthard2] Copies detector
+    /** [Jungfrau][Eiger][Ctb][Moench][Mythen3][Gotthard2] Copies detector
     * server via TCP (without tftp).\nMakes a symbolic link with a shorter
     * name (without vx.x.x).\nThen, detector controller reboots (except
-     * Eiger).\n[Jungfrau][Moench][Ctb] Also deletes old server binary and
+     * Eiger).\n[Jungfrau][Ctb][Moench] Also deletes old server binary and
     *  changes respawn server to the link, which is effective after a reboot.
     */
    void updateDetectorServer(const std::string &fname, Positions pos = {});

-    /** [Jungfrau][Moench][Ctb][Mythen3][Gotthard2] \n
+    /** [Jungfrau][Ctb][Moench][Mythen3][Gotthard2] \n
     * Advanced Command!! You could damage the detector. Please use with
     * caution.\nUpdates the kernel image. Then, detector controller reboots
     *  with new kernel
     */
    void updateKernel(const std::string &fname, Positions pos = {});

-    /** [Jungfrau][Moench][Gotthard][CTB][Mythen3][Gotthard2] Advanced user
+    /** [Jungfrau][Gotthard][CTB][Moench][Mythen3][Gotthard2] Advanced user
     * Function! */
    void rebootController(Positions pos = {});

    /**
-     * Advanced user Function!\n [Jungfrau][Moench][Gotthard][CTB] Updates the
+     * Advanced user Function!\n [Jungfrau][Gotthard][CTB][Moench] Updates the
     * firmware, detector server, make a soft link and then reboots detector
     * controller. \n [Mythen3][Gotthard2] Will require a script to start up the
     * shorter named server link at start up \n sname is full path name of
@ -1926,16 +1926,16 @@ class Detector {
    /** Advanced user Function!  */
    Result<int> getBit(uint32_t addr, int bitnr, Positions pos = {});

-    /** [Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB] Advanced user
+    /** [Gotthard][Jungfrau][Mythen3][Gotthard2][CTB][Moench] Advanced user
     * Function! */
    void executeFirmwareTest(Positions pos = {});

-    /** [Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB] Advanced user
+    /** [Gotthard][Jungfrau][Mythen3][Gotthard2][CTB][Moench] Advanced user
     * Function! Writes different values in a R/W register and confirms the
     * writes to check bus */
    void executeBusTest(Positions pos = {});

-    /** [Gotthard][Jungfrau][Moench][CTB] Advanced user Function! not possible
+    /** [Gotthard][Jungfrau][CTB][Moench] Advanced user Function! not possible
     * to read back */
    void writeAdcRegister(uint32_t addr, uint32_t value, Positions pos = {});

@ -1948,11 +1948,11 @@ class Detector {
     * incompatible. \n Advanced user Function! */
    void setInitialChecks(const bool value);

-    /** [CTB][Jungfrau][Moench] Advanced user Function! */
+    /** [CTB][Moench][Jungfrau] Advanced user Function! */
    Result<uint32_t> getADCInvert(Positions pos = {}) const;

-    /** [CTB][Jungfrau][Moench] Advanced user Function! \n
-    [Jungfrau][Moench] Inversions on top of default mask */
+    /** [CTB][Moench][Jungfrau] Advanced user Function! \n
+    [Jungfrau] Inversions on top of default mask */
    void setADCInvert(uint32_t value, Positions pos = {});
    ///@}

@ -1989,15 +1989,15 @@ class Detector {
    Result<std::string> executeCommand(const std::string &value,
                                       Positions pos = {});

-    /** [Jungfrau][Moench][Mythen3][CTB]
+    /** [Jungfrau][Mythen3][CTB][Moench]
     * [Gotthard2] only in continuous mode */
    Result<int64_t> getNumberOfFramesFromStart(Positions pos = {}) const;

-    /** [Jungfrau][Moench][Mythen3][CTB] Get time from detector start
+    /** [Jungfrau][Mythen3][CTB][Moench] Get time from detector start
     * [Gotthard2] not in burst and auto mode */
    Result<ns> getActualTime(Positions pos = {}) const;

-    /** [Jungfrau][Moench][Mythen3][CTB] Get timestamp at a frame start
+    /** [Jungfrau][Mythen3][CTB][Moench] Get timestamp at a frame start
     * [Gotthard2] not in burst and auto mode */
    Result<ns> getMeasurementTime(Positions pos = {}) const;

--- a/slsDetectorSoftware/src/CmdProxy.cpp
+++ b/slsDetectorSoftware/src/CmdProxy.cpp
@ -277,34 +277,24 @@ std::string CmdProxy::Versions(int action) {
        }
        bool eiger = (det->getDetectorType().squash() == defs::EIGER);
        auto t = det->getFirmwareVersion(std::vector<int>{det_id});
-        os << "\nType            : " << OutString(det->getDetectorType())
-           << "\nRelease         : " << det->getPackageVersion() << std::hex
-           << "\nClient          : " << det->getClientVersion();
-
+        os << "\nType     : " << OutString(det->getDetectorType())
+           << "\nRelease  : " << det->getPackageVersion() << std::hex
+           << "\nClient   : " << det->getClientVersion();
+        os << "\nFirmware : ";
        if (eiger) {
-            os << "\nFirmware (Beb)  : "
-               << OutString(det->getFirmwareVersion(std::vector<int>{det_id}));
-            os << "\nFirmware (Febl) : "
-               << OutString(det->getFrontEndFirmwareVersion(
-                      defs::FRONT_LEFT, std::vector<int>{det_id}));
-            os << "\nFirmware (Febr) : "
-               << OutString(det->getFrontEndFirmwareVersion(
-                      defs::FRONT_RIGHT, std::vector<int>{det_id}));
+            os << OutString(t);
        } else {
-            os << "\nFirmware        : "
-               << OutStringHex(
-                      det->getFirmwareVersion(std::vector<int>{det_id}));
+            os << OutStringHex(t);
        }
-
-        os << "\nServer          : "
+        os << "\nServer   : "
           << OutString(det->getDetectorServerVersion(std::vector<int>{det_id}))
-           << "\nKernel          : "
-           << OutString(det->getKernelVersion({std::vector<int>{det_id}}))
-           << "\nHardware        : "
-           << OutString(det->getHardwareVersion(std::vector<int>{det_id}));
-
+           << "\nKernel   : "
+           << OutString(det->getKernelVersion({std::vector<int>{det_id}}));
+        if (!eiger)
+            os << "\nHardware : "
+               << OutString(det->getHardwareVersion(std::vector<int>{det_id}));
        if (det->getUseReceiverFlag().squash(true)) {
-            os << "\nReceiver        : "
+            os << "\nReceiver : "
               << OutString(det->getReceiverVersion(std::vector<int>{det_id}));
        }
        os << std::dec << '\n';
@ -526,8 +516,7 @@ std::string CmdProxy::GapPixels(int action) {
    std::ostringstream os;
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
-        os << "[0, 1]\n\t[Eiger][Jungfrau][Moench] Include Gap pixels in "
-              "client data "
+        os << "[0, 1]\n\t[Eiger][Jungfrau] Include Gap pixels in client data "
              "call back in Detecor api. Will not be in detector streaming, "
              "receiver file or streaming. Default is 0. "
           << '\n';
@ -617,8 +606,8 @@ std::string CmdProxy::Exptime(int action) {
    if (action == defs::HELP_ACTION) {
        if (cmd == "exptime") {
            os << "[duration] [(optional unit) "
-                  "ns|us|ms|s]\n\t[Eiger][Jungfrau][Moench][Gotthard]["
-                  "Gotthard2][Ctb] Exposure time"
+                  "ns|us|ms|s]\n\t[Eiger][Jungfrau][Gotthard][Gotthard2]["
+                  "Moench][Ctb] Exposure time"
                  "\n\t[Mythen3] Exposure time of all gate signals in auto and "
                  "trigger mode (internal gating). To specify gate index, use "
                  "exptime1, exptime2, exptime3."
@ -702,10 +691,9 @@ std::string CmdProxy::ReadoutSpeed(int action) {
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
        os << "\n\t[0 or full_speed|1 or half_speed|2 or "
-              "quarter_speed]\n\t\t[Eiger][Jungfrau][Moench] Readout "
+              "quarter_speed]\n\t\t[Eiger][Jungfrau] Readout "
              "speed of chip.\n\t\t[Eiger] Default speed is full_speed."
-              "\n\t\t[Jungfrau][Moench] Default speed is half_speed. "
-              "full_speed "
+              "\n\t\t[Jungfrau] Default speed is half_speed. full_speed "
              "option only available from v2.0 boards and is recommended to "
              "set "
              "number of interfaces to 2. Also overwrites "
@ -714,7 +702,7 @@ std::string CmdProxy::ReadoutSpeed(int action) {
           << '\n';
    } else {
        defs::detectorType type = det->getDetectorType().squash();
-        if (type == defs::CHIPTESTBOARD) {
+        if (type == defs::CHIPTESTBOARD || type == defs::MOENCH) {
            throw RuntimeError(
                "ReadoutSpeed not implemented. Did you mean runclk?");
        }
@ -743,11 +731,10 @@ std::string CmdProxy::Adcphase(int action) {
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
        os << "[n_value] "
-              "[(optional)deg]\n\t[Jungfrau][Moench][Ctb][Gotthard] "
-              "Phase shift of ADC clock. \n\t[Jungfrau][Moench] Absolute phase "
-              "shift. "
+              "[(optional)deg]\n\t[Jungfrau][Ctb][Moench][Gotthard] "
+              "Phase shift of ADC clock. \n\t[Jungfrau] Absolute phase shift. "
              "If deg used, then shift in degrees. Changing Speed also resets "
-              "adcphase to recommended defaults.\n\t[Ctb] Absolute "
+              "adcphase to recommended defaults.\n\t[Ctb][Moench] Absolute "
              "phase shift. If deg used, then shift in degrees. Changing "
              "adcclk also resets adcphase and sets it to previous "
              "values.\n\t[Gotthard] Relative phase shift. Cannot get"
@ -800,8 +787,7 @@ std::string CmdProxy::Dbitphase(int action) {
    std::ostringstream os;
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
-        os << "[n_value] [(optional)deg]\n\t[Ctb][Jungfrau][Moench] Phase "
-              "shift of "
+        os << "[n_value] [(optional)deg]\n\t[Ctb][Jungfrau] Phase shift of "
              "clock to latch digital bits. Absolute phase shift. If deg used, "
              "then shift in degrees. \n\t[Ctb]Changing dbitclk also resets "
              "dbitphase and sets to previous values."
@ -1038,8 +1024,7 @@ std::string CmdProxy::CurrentSource(int action) {
        os << "\n\t[0|1]\n\t\t[Gotthard2] Enable or disable current source. "
              "Default "
              "is disabled.\n\t[0|1] [fix|nofix] [select source] [(only for "
-              "chipv1.1)normal|low]\n\t\t[Jungfrau][Moench] Disable or enable "
-              "current "
+              "chipv1.1)normal|low]\n\t\t[Jungfrau] Disable or enable current "
              "source with some parameters. The select source is 0-63 for "
              "chipv1.0 and a 64 bit mask for chipv1.1. To disable, one needs "
              "only one argument '0'."
@ -1288,7 +1273,7 @@ std::string CmdProxy::ResetDacs(int action) {
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
        os << "[(optional) hard] "
-              "\n\t[Eiger][Jungfrau][Moench][Gotthard][Gotthard2]["
+              "\n\t[Eiger][Jungfrau][Gotthard][Moench][Gotthard2]["
              "Mythen3]Reset dac values to the defaults. A 'hard' optional "
              "reset will reset the dacs to the hardcoded defaults in on-board "
              "detector server."
@ -1319,8 +1304,7 @@ std::string CmdProxy::DefaultDac(int action) {
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
        os << "[dac name][value][(optional)setting]\n\tSets the default for "
-              "that dac to this value.\n\t[Jungfrau][Moench][Mythen3] When "
-              "settings is "
+              "that dac to this value.\n\t[Jungfrau][Mythen3] When settings is "
              "provided, it sets the default value only for that setting"
           << '\n';
    } else if (action == defs::GET_ACTION) {
@ -1463,12 +1447,10 @@ std::string CmdProxy::Trigger(int action) {
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
        if (cmd == "trigger") {
-            os << "\n\t[Eiger][Mythen3][Jungfrau][Moench] Sends software "
-                  "trigger "
+            os << "\n\t[Eiger][Mythen3][Jungfrau] Sends software trigger "
                  "signal to detector";
        } else if (cmd == "blockingtrigger") {
-            os << "\n\t[Eiger][Jungfrau][Moench] Sends software trigger signal "
-                  "to "
+            os << "\n\t[Eiger][Jungfrau] Sends software trigger signal to "
                  "detector and blocks till the frames are sent out for that "
                  "trigger.";
        } else {
@ -1572,8 +1554,7 @@ std::string CmdProxy::UDPDestinationList(int action) {
              "[(optional)mac2=xx:xx:xx:xx:xx:xx]\n\t[port=value] "
              "[(optional)port2=value\n\tThe order of ip, mac and port does "
              "not matter. entry_value can be >0 only for "
-              "[Eiger][Jungfrau][Moench][Mythen3][Gotthard2] where round robin "
-              "is "
+              "[Eiger][Jungfrau][Mythen3][Gotthard2] where round robin is "
              "implemented. If 'auto' used, then ip is set to ip of "
              "rx_hostname."
           << '\n';
@ -1653,10 +1634,9 @@ std::string CmdProxy::UDPSourceIP2(int action) {
    std::ostringstream os;
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
-        os << "[x.x.x.x] or auto\n\t[Jungfrau][Moench][Gotthard2] Ip address "
-              "of the "
+        os << "[x.x.x.x] or auto\n\t[Jungfrau][Gotthard2] Ip address of the "
              "detector (source) udp interface 2. Must be same subnet as "
-              "destination udp ip2.\n\t [Jungfrau][Moench] top half or inner "
+              "destination udp ip2.\n\t [Jungfrau] top half or inner "
              "interface\n\t [Gotthard2] veto debugging. \n\tOne can also set "
              "this to 'auto' for 1 GbE data and virtual detectors. It will "
              "set to IP of detector."
@ -1727,10 +1707,9 @@ std::string CmdProxy::UDPDestinationIP2(int action) {
    std::ostringstream os;
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
-        os << "[x.x.x.x] or auto\n\t[Jungfrau][Moench][Gotthard2] Ip address "
-              "of the "
+        os << "[x.x.x.x] or auto\n\t[Jungfrau][Gotthard2] Ip address of the "
              "receiver (destination) udp interface 2. If 'auto' used, then ip "
-              "is set to ip of rx_hostname.\n\t[Jungfrau][Moench] bottom half "
+              "is set to ip of rx_hostname.\n\t[Jungfrau] bottom half "
              "\n\t[Gotthard2] veto debugging. "
           << '\n';
    } else if (action == defs::GET_ACTION) {
@ -1764,13 +1743,12 @@ std::string CmdProxy::TransmissionDelay(int action) {
    std::ostringstream os;
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
-        os << "[n_delay]\n\t[Eiger][Jungfrau][Moench][Mythen3] Set "
-              "transmission delay "
+        os << "[n_delay]\n\t[Eiger][Jungfrau][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 "
+              "n_delay)  \n\t\t[Jungfrau][Mythen3] txdelay_frame to "
              "(num_modules * n_delay)  \nfor every module."
           << '\n';
    } else if (action == defs::GET_ACTION) {
@ -2112,8 +2090,7 @@ std::string CmdProxy::TemperatureEvent(int action) {
    std::ostringstream os;
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
-        os << "[0]\n\t[Jungfrau][Moench] 1, if a temperature event occured. To "
-              "clear "
+        os << "[0]\n\t[Jungfrau] 1, if a temperature event occured. To clear "
              "this event, set it to 0.\n\tIf temperature crosses threshold "
              "temperature and temperature control is enabled, power to chip "
              "will be switched off and temperature event occurs. To power on "
@ -2607,14 +2584,14 @@ std::string CmdProxy::GainCaps(int action) {
    return os.str();
 }

-/* CTB Specific */
+/* CTB / Moench Specific */

 std::string CmdProxy::Samples(int action) {
    std::ostringstream os;
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
        os << "[n_samples]\n\t[CTB] Number of samples (both analog and "
-              "digitial) expected.\n"
+              "digitial) expected.\n\t[Moench] Number of samples (analog only)"
           << '\n';
    } else if (action == defs::GET_ACTION) {
        if (!args.empty()) {
@ -2656,7 +2633,7 @@ std::string CmdProxy::AdcVpp(int action) {
    os << cmd << ' ';

    if (action == defs::HELP_ACTION) {
-        os << "[dac or mV value][(optional unit) mV] \n\t[Ctb] Vpp of "
+        os << "[dac or mV value][(optional unit) mV] \n\t[Ctb][Moench] Vpp of "
              "ADC.\n\t 0 -> 1V ; 1 -> 1.14V ; 2 -> 1.33V ; 3 -> 1.6V ; 4 -> "
              "2V. \n\tAdvanced User function!\n"
           << '\n';
@ -2798,7 +2775,7 @@ std::string CmdProxy::Pattern(int action) {
    std::ostringstream os;
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
-        os << "[fname]\n\t[Mythen3][Ctb] Loads ASCII pattern file "
+        os << "[fname]\n\t[Mythen3][Moench][Ctb] Loads ASCII pattern file "
              "directly to server (instead of executing line by line)"
           << '\n';
    } else if (action == defs::GET_ACTION) {
@ -2819,8 +2796,8 @@ std::string CmdProxy::PatternWord(int action) {
    std::ostringstream os;
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
-        os << "[step or address] [64 bit mask]\n\t[Ctb][Mythen3] 64 "
-              "bit pattern at address of pattern memory.\n\t[Ctb] read "
+        os << "[step or address] [64 bit mask]\n\t[Ctb][Moench][Mythen3] 64 "
+              "bit pattern at address of pattern memory.\n\t[Ctb][Moench] read "
              "is same as executing pattern"
           << '\n';
    } else if (action == defs::GET_ACTION) {
@ -2879,11 +2856,11 @@ std::string CmdProxy::PatternLoopAddresses(int action) {
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
        if (cmd == "patlimits") {
-            os << "[start addr] [stop addr] \n\t[Ctb][Mythen3] Limits "
+            os << "[start addr] [stop addr] \n\t[Ctb][Moench][Mythen3] Limits "
                  "of complete pattern."
               << '\n';
        } else if (cmd == "patloop") {
-            os << "[0-6] [start addr] [stop addr] \n\t[Ctb][Mythen3] "
+            os << "[0-6] [start addr] [stop addr] \n\t[Ctb][Moench][Mythen3] "
                  "Limits of the loop level provided."
               << "\n\t[Mythen3] Level options: 0-3 only." << '\n';
        } else {
@ -2924,7 +2901,7 @@ std::string CmdProxy::PatternLoopCycles(int action) {
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
        if (cmd == "patnloop") {
-            os << "[0-6] [n_cycles] \n\t[Ctb][Mythen3] Number of "
+            os << "[0-6] [n_cycles] \n\t[Ctb][Moench][Mythen3] Number of "
                  "cycles of "
                  "the loop level provided."
               << "\n\t[Mythen3] Level options: 0-3 only." << '\n';
@ -2960,7 +2937,7 @@ std::string CmdProxy::PatternWaitAddress(int action) {
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
        if (cmd == "patwait") {
-            os << "[0-6] [addr] \n\t[Ctb][Mythen3] Wait address for "
+            os << "[0-6] [addr] \n\t[Ctb][Moench][Mythen3] Wait address for "
                  "loop level provided."
               << "\n\t[Mythen3] Level options: 0-3 only.";
        } else {
@ -2996,7 +2973,7 @@ std::string CmdProxy::PatternWaitTime(int action) {
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
        if (cmd == "patwaittime") {
-            os << "[0-6] [n_clk] \n\t[Ctb][Mythen3] Wait time in clock "
+            os << "[0-6] [n_clk] \n\t[Ctb][Moench][Mythen3] Wait time in clock "
                  "cycles for the loop provided."
               << "\n\t[Mythen3] Level options: 0-3 only." << '\n';
        } else {
@ -3023,6 +3000,8 @@ std::string CmdProxy::PatternWaitTime(int action) {
    return os.str();
 }

+/* Moench */
+
 std::string CmdProxy::AdditionalJsonHeader(int action) {
    std::ostringstream os;
    os << cmd << ' ';
@ -3105,9 +3084,8 @@ std::string CmdProxy::ProgramFpga(int action) {
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
        os << "[fname.pof | fname.rbf (full "
-              "path)][(opitonal)--force-delete-normal-file]\n\t[Jungfrau]["
-              "Moench][Ctb] "
-              "Programs FPGA from pof file (full path). Then, detector "
+              "path)][(opitonal)--force-delete-normal-file]\n\t[Jungfrau][Ctb]["
+              "Moench] Programs FPGA from pof file (full path). Then, detector "
              "controller is rebooted. \n\t\tUse --force-delete-normal-file "
              "argument, if normal file found in device tree, it must be "
              "deleted, a new device drive created and programming "
@ -3141,11 +3119,11 @@ std::string CmdProxy::UpdateDetectorServer(int action) {
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
        os << "[server_name  with full "
-              "path]\n\t[Jungfrau][Moench][Eiger][Ctb][Mythen3][Gotthard2] "
+              "path]\n\t[Jungfrau][Eiger][Ctb][Moench][Mythen3][Gotthard2] "
              "Copies detector server via TCP (without tftp). Makes a symbolic "
              "link with a shorter name (without vx.x.x). Then, detector "
              "controller reboots (except "
-              "Eiger).\n\t[Jungfrau][Moench][Ctb]Also changes respawn server "
+              "Eiger).\n\t[Jungfrau][Ctb][Moench]Also changes respawn server "
              "to the link, which is effective after a reboot."
           << '\n';
    } else if (action == defs::GET_ACTION) {
@ -3167,7 +3145,7 @@ std::string CmdProxy::UpdateKernel(int action) {
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
        os << "[kernel_name with full "
-              "path]\n\t[Jungfrau][Moench][Ctb][Mythen3][Gotthard2] Advanced "
+              "path]\n\t[Jungfrau][Ctb][Moench][Mythen3][Gotthard2] Advanced "
              "Command!! You could damage the detector. Please use with "
              "caution.\n\tUpdates the kernel image. Then, detector controller "
              "reboots with new kernel."
@ -3192,7 +3170,7 @@ std::string CmdProxy::UpdateFirmwareAndDetectorServer(int action) {
    if (action == defs::HELP_ACTION) {
        os << "\n\tWithout tftp: [server_name (incl fullpath)] [fname.pof "
              "(incl full path)] This does not use "
-              "tftp.\n\t\t[Jungfrau][Moench][Gotthard][CTB] Updates the "
+              "tftp.\n\t\t[Jungfrau][Gotthard][CTB][Moench] Updates the "
              "firmware, detector server, deletes old server, creates the "
              "symbolic link and then reboots detector controller. "
              "\n\t\t[Mythen3][Gotthard2] will require a script to start up "
@ -3254,7 +3232,7 @@ std::string CmdProxy::AdcRegister(int action) {
    std::ostringstream os;
    os << cmd << ' ';
    if (action == defs::HELP_ACTION) {
-        os << "[address] [value]\n\t[Jungfrau][Moench][Ctb][Gotthard] Writes "
+        os << "[address] [value]\n\t[Jungfrau][Ctb][Moench][Gotthard] Writes "
              "to an adc register in hex. Advanced user Function!"
           << '\n';
    } else if (action == defs::GET_ACTION) {
--- a/slsDetectorSoftware/src/CmdProxy.h
+++ b/slsDetectorSoftware/src/CmdProxy.h
@ -1244,8 +1244,7 @@ class CmdProxy {

    GET_COMMAND(hardwareversion, getHardwareVersion,
                "\n\t[Jungfrau][Gotthard2][Myhten3][Gotthard][Ctb][Moench] "
-                "Hardware version of detector. \n\t[Eiger] Hardware version of "
-                "front FPGA on detector.");
+                "Hardware version of detector.");

    GET_COMMAND(
        kernelversion, getKernelVersion,
@ -1254,14 +1253,13 @@ class CmdProxy {
    GET_COMMAND(rx_version, getReceiverVersion, "\n\tReceiver version");

    GET_COMMAND_HEX(serialnumber, getSerialNumber,
-                    "\n\t[Jungfrau][Moench][Gotthard][Mythen3][Gotthard2][CTB]"
+                    "\n\t[Jungfrau][Gotthard][Mythen3][Gotthard2][CTB][Moench]"
                    "Serial number of detector.");

-    GET_COMMAND(
-        moduleid, getModuleId,
-        "\n\t[Gotthard2][Eiger][Mythen3][Jungfrau][Moench] 16 bit value "
-        "(ideally unique) that is streamed out in the UDP header of "
-        "the detector. Picked up from a file on the module.");
+    GET_COMMAND(moduleid, getModuleId,
+                "\n\t[Gotthard2][Eiger][Mythen3][Jungfrau] 16 bit value "
+                "(ideally unique) that is streamed out in the UDP header of "
+                "the detector. Picked up from a file on the module.");

    GET_COMMAND(type, getDetectorType,
                "\n\tReturns detector type. Can be Eiger, Jungfrau, Gotthard, "
@ -1281,10 +1279,12 @@ class CmdProxy {
        "verylowgain, g1_hg, g1_lg, g2_hc_hg, g2_hc_lg, "
        "g2_lc_hg, g2_lc_lg, g4_hg, g4_lg, gain0]"
        "\n\t Detector Settings"
-        "\n\t[Jungfrau][Moench] - [ gain0 | highgain0]"
+        "\n\t[Jungfrau] - [ gain0 | highgain0]"
        "\n\t[Gotthard] - [dynamicgain | highgain | lowgain | "
        "mediumgain | veryhighgain]"
        "\n\t[Gotthard2] - [dynamicgain | fixgain1 | fixgain2]"
+        "\n\t[Moench] - [g1_hg | g1_lg | g2_hc_hg | g2_hc_lg | "
+        "g2_lc_hg | g2_lc_lg | g4_hg | g4_lg]"
        "\n\t[Mythen3] - [standard | fast | highgain] Also changes vrshaper "
        "and vrpreamp. \n\t[Eiger] Use threshold or thresholdnotb. \n\t[Eiger] "
        "threshold and settings loaded from file found in settingspath. "
@ -1302,24 +1302,22 @@ class CmdProxy {
    INTEGER_COMMAND_VEC_ID(
        fliprows, getFlipRows, setFlipRows, StringTo<int>,
        "[0, 1]\n\t[Eiger] flips rows paramater sent to slsreceiver "
-        "to stream as json parameter to flip rows in gui "
-        "\n\t[Jungfrau][Moench] flips "
+        "to stream as json parameter to flip rows in gui \n\t[Jungfrau] flips "
        "rows in the detector itself. For bottom module and number of "
        "interfaces must be set to 2. slsReceiver and slsDetectorGui "
        "does not handle.");

-    INTEGER_COMMAND_VEC_ID_GET(master, getMaster, setMaster, StringTo<int>,
-                               "[0, 1]\n\t[Eiger][Gotthard2][Jungfrau][Moench] "
-                               "Sets (half) module to master "
-                               "and other(s) to "
-                               "slaves.\n\t[Gotthard][Gotthard2][Mythen3]["
-                               "Eiger][Jungfrau][Moench] Gets if "
-                               "the current (half) module is master.");
+    INTEGER_COMMAND_VEC_ID_GET(
+        master, getMaster, setMaster, StringTo<int>,
+        "[0, 1]\n\t[Eiger][Gotthard2][Jungfrau] Sets (half) module to master "
+        "and other(s) to "
+        "slaves.\n\t[Gotthard][Gotthard2][Mythen3][Eiger][Jungfrau] Gets if "
+        "the current (half) module is master.");

-    INTEGER_COMMAND_SET_NOID_GET_ID(
-        sync, getSynchronization, setSynchronization, StringTo<int>,
-        "[0, 1]\n\t[Jungfrau][Moench] Enables or disables "
-        "synchronization between modules.");
+    INTEGER_COMMAND_SET_NOID_GET_ID(sync, getSynchronization,
+                                    setSynchronization, StringTo<int>,
+                                    "[0, 1]\n\t[Jungfrau] Enables or disables "
+                                    "synchronization between modules.");

    /* acquisition parameters */

@ -1339,29 +1337,28 @@ class CmdProxy {
        period, getPeriod, setPeriod,
        "[duration] [(optional unit) ns|us|ms|s]\n\tPeriod between frames");

-    TIME_COMMAND(
-        delay, getDelayAfterTrigger, setDelayAfterTrigger,
-        "[duration] [(optional unit) "
-        "ns|us|ms|s]\n\t[Jungfrau][Moench][Gotthard][Mythen3][Gotthard2][Ctb]["
-        "Moench] Delay after trigger");
+    TIME_COMMAND(delay, getDelayAfterTrigger, setDelayAfterTrigger,
+                 "[duration] [(optional unit) "
+                 "ns|us|ms|s]\n\t[Jungfrau][Gotthard][Mythen3][Gotthard2][Ctb]["
+                 "Moench] Delay after trigger");

    GET_COMMAND(framesl, getNumberOfFramesLeft,
-                "\n\t[Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB] "
+                "\n\t[Gotthard][Jungfrau][Mythen3][Gotthard2][CTB][Moench] "
                "Number of frames left in acquisition."
                "\n\t[Gotthard2] only in continuous auto mode.");

    GET_COMMAND(triggersl, getNumberOfTriggersLeft,
-                "\n\t[Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB] "
+                "\n\t[Gotthard][Jungfrau][Mythen3][Gotthard2][CTB][Moench] "
                "Number of triggers left in acquisition. Only when external "
                "trigger used.");

    TIME_GET_COMMAND(delayl, getDelayAfterTriggerLeft,
-                     "\n\t[Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB]"
+                     "\n\t[Gotthard][Jungfrau][Mythen3][Gotthard2][CTB][Moench]"
                     " DelayLeft Delay Left in Acquisition."
                     "\n\t[Gotthard2] only in continuous mode.");

    TIME_GET_COMMAND(periodl, getPeriodLeft,
-                     "\n\t[Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2]"
+                     "\n\t[Gotthard][Jungfrau][CTB][Moench][Mythen3][Gotthard2]"
                     " Period left for current frame."
                     "\n\t[Gotthard2] only in continuous mode.");

@ -1372,7 +1369,7 @@ class CmdProxy {
        "[Eiger] Options: 4, 8, 12, 16, 32. If set to 32, also sets "
        "clkdivider to 2, else to 0.\n\t"
        "[Mythen3] Options: 8, 16, 32\n\t"
-        "[Jungfrau][Moench][Gotthard][Ctb][Mythen3][Gotthard2] 16");
+        "[Jungfrau][Gotthard][Ctb][Moench][Mythen3][Gotthard2] 16");

    GET_COMMAND_NOID(drlist, getDynamicRangeList,
                     "\n\tGets the list of dynamic ranges for this detector.");
@ -1381,7 +1378,7 @@ class CmdProxy {
        timing, getTimingMode, setTimingMode,
        StringTo<slsDetectorDefs::timingMode>,
        "[auto|trigger|gating|burst_trigger]\n\tTiming Mode of "
-        "detector.\n\t[Jungfrau][Moench][Gotthard][Ctb][Gotthard2] "
+        "detector.\n\t[Jungfrau][Gotthard][Ctb][Moench][Gotthard2] "
        "[auto|trigger]\n\t[Mythen3] "
        "[auto|trigger|gating|trigger_gating]\n\t[Eiger] "
        "[auto|trigger|gating|burst_trigger]");
@ -1394,25 +1391,24 @@ class CmdProxy {
        "\n\tList of readout speed levels implemented for this detector.");

    GET_COMMAND(maxadcphaseshift, getMaxADCPhaseShift,
-                "\n\t[Jungfrau][Moench][CTB] Absolute maximum Phase shift of "
+                "\n\t[Jungfrau][CTB][Moench] Absolute maximum Phase shift of "
                "ADC clock.");

-    GET_COMMAND(
-        maxdbitphaseshift, getMaxDBITPhaseShift,
-        "\n\t[CTB][Jungfrau][Moench] Absolute maximum Phase shift of of the "
-        "clock to latch digital bits.");
+    GET_COMMAND(maxdbitphaseshift, getMaxDBITPhaseShift,
+                "\n\t[CTB][Jungfrau] Absolute maximum Phase shift of of the "
+                "clock to latch digital bits.");

    INTEGER_COMMAND_VEC_ID(highvoltage, getHighVoltage, setHighVoltage,
                           StringTo<int>,
                           "[n_value]\n\tHigh voltage to the sensor in Voltage."
                           "\n\t[Gotthard] [0|90|110|120|150|180|200]"
                           "\n\t[Eiger][Mythen3][Gotthard2] 0-200"
-                           "\n\t[Jungfrau][Moench][Ctb] [0|60-200]");
+                           "\n\t[Jungfrau][Ctb][Moench] [0|60-200]");

    INTEGER_COMMAND_VEC_ID(
        powerchip, getPowerChip, setPowerChip, StringTo<int>,
-        "[0, 1]\n\t[Jungfrau][Moench][Mythen3][Gotthard2] Power "
-        "the chip. \n\t[Jungfrau][Moench] Default is 0. Get "
+        "[0, 1]\n\t[Jungfrau][Mythen3][Gotthard2][Moench] Power "
+        "the chip. \n\t[Moench] Default is 0. \n\t[Jungfrau] Default is 0. Get "
        "will return power status. Can be off if temperature event occured "
        "(temperature over temp_threshold with temp_control "
        "enabled. Will configure chip (only chip v1.1)\n\t[Mythen3][Gotthard2] "
@ -1423,8 +1419,7 @@ class CmdProxy {
        imagetest, getImageTestMode, setImageTestMode, StringTo<int>,
        "[0, 1]\n\t[Gotthard] 1 adds channel intensity with precalculated "
        "values when taking an acquisition. Default is 0."
-        "\n\t[Eiger][Jungfrau][Moench] Only for Virtual servers. If 0, each "
-        "pixel "
+        "\n\t[Eiger][Jungfrau] Only for Virtual servers. If 0, each pixel "
        "intensity incremented by 1. If 1, all pixels almost saturated.");

    INTEGER_COMMAND_VEC_ID(
@ -1438,10 +1433,9 @@ class CmdProxy {

    INTEGER_COMMAND_VEC_ID(
        filterresistor, getFilterResistor, setFilterResistor, StringTo<int>,
-        "[value] [Gotthard2][Jungfrau][Moench] Set filter resistor. Increasing "
-        "values "
+        "[value] [Gotthard2][Jungfrau] Set filter resistor. Increasing values "
        "for increasing resistance.\n\t[Gotthard2] Options: [0|1|2|3]. Default "
-        "is 0.\n\t[Jungfrau][Moench] Options: [0|1]. Default is 1.");
+        "is 0.\n\t[Jungfrau] Options: [0|1]. Default is 1.");

    INTEGER_COMMAND_VEC_ID(dbitpipeline, getDBITPipeline, setDBITPipeline,
                           StringTo<int>,
@ -1456,22 +1450,19 @@ class CmdProxy {
        "permissible values depend on dynamic range and 10Gbe "
        "enabled.\n\t[8-512 (multiple of 8)]\n\t\t[Jungfrau] Number of rows "
        "per module starting from the centre. Options: 8 - 512, must be "
-        "multiples of 8. Default is 512.\n\t\t[Moench] Number of rows "
-        "per module starting from the centre. Options:16 - 400, must be "
-        "multiples of 16. Default is 400.");
+        "multiples of 8. Default is 512.");

    /** temperature */
    GET_COMMAND_NOID(
        templist, getTemperatureList,
        "\n\tList of temperature commands implemented for this detector.");

-    GET_IND_COMMAND(
-        temp_adc, getTemperature, slsDetectorDefs::TEMPERATURE_ADC, " °C",
-        "[n_value]\n\t[Jungfrau][Moench][Gotthard] ADC Temperature");
+    GET_IND_COMMAND(temp_adc, getTemperature, slsDetectorDefs::TEMPERATURE_ADC,
+                    " °C", "[n_value]\n\t[Jungfrau][Gotthard] ADC Temperature");

    GET_IND_COMMAND(temp_fpga, getTemperature,
                    slsDetectorDefs::TEMPERATURE_FPGA, " °C",
-                    "[n_value]\n\t[Eiger][Jungfrau][Moench][Gotthard][Mythen3]["
+                    "[n_value]\n\t[Eiger][Jungfrau][Gotthard][Mythen3]["
                    "Gotthard2] FPGA Temperature");

    GET_IND_COMMAND(temp_fpgaext, getTemperature,
@ -1605,7 +1596,7 @@ class CmdProxy {
    INTEGER_COMMAND_VEC_ID(
        numinterfaces, getNumberofUDPInterfaces, setNumberofUDPInterfaces,
        StringTo<int>,
-        "[1, 2]\n\t[Jungfrau][Moench] Number of udp interfaces to stream "
+        "[1, 2]\n\t[Jungfrau] Number of udp interfaces to stream "
        "data from detector. Default: 1.\n\tAlso enables second interface in "
        "receiver for listening (Writes a file per interface if writing "
        "enabled).\n\tAlso restarts client and receiver zmq sockets if zmq "
@ -1614,14 +1605,12 @@ class CmdProxy {
    INTEGER_COMMAND_VEC_ID(
        selinterface, getSelectedUDPInterface, selectUDPInterface,
        StringTo<int>,
-        "[0, 1]\n\t[Jungfrau][Moench] The udp interface to stream data from "
-        "detector. "
+        "[0, 1]\n\t[Jungfrau] The udp interface to stream data from detector. "
        "Effective only when number of interfaces is 1. Default: 0 (outer)");

    GET_COMMAND(
        udp_numdst, getNumberofUDPDestinations,
-        "\n\t[Jungfrau][Moench][Eiger][Mythen3][Gotthard2] One can enter upto "
-        "32 (64 "
+        "\n\t[Jungfrau][Eiger][Mythen3][Gotthard2] One can enter upto 32 (64 "
        "for Mythen3) destinations that the detector will stream images out in "
        "a round robin fashion. This is get only command. Default: 1");

@ -1632,8 +1621,7 @@ class CmdProxy {
        udp_firstdst, getFirstUDPDestination, setFirstUDPDestination,
        StringTo<int>,
        "\n[0 - 31 (or number of udp "
-        "destinations)]\n\t[Jungfrau][Moench][Gotthard2]\n[0-63]\n\t[Mythen3]"
-        "\n\n\t "
+        "destinations)]\n\t[Jungfrau][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");
@ -1644,10 +1632,10 @@ class CmdProxy {
        "interface. \n\t[Eiger] Do not set as detector will replace with its "
        "own DHCP Mac (1G) or DHCP Mac + 1 (10G).");

-    INTEGER_COMMAND_VEC_ID(
-        udp_srcmac2, getSourceUDPMAC2, setSourceUDPMAC2, MacAddr,
-        "[x:x:x:x:x:x]\n\t[Jungfrau][Moench] Mac address of the top "
-        "half or inner (source) udp interface. ");
+    INTEGER_COMMAND_VEC_ID(udp_srcmac2, getSourceUDPMAC2, setSourceUDPMAC2,
+                           MacAddr,
+                           "[x:x:x:x:x:x]\n\t[Jungfrau] Mac address of the top "
+                           "half or inner (source) udp interface. ");

    INTEGER_COMMAND_VEC_ID(
        udp_dstmac, getDestinationUDPMAC, setDestinationUDPMAC, MacAddr,
@ -1659,12 +1647,10 @@ class CmdProxy {

    INTEGER_COMMAND_VEC_ID(
        udp_dstmac2, getDestinationUDPMAC2, setDestinationUDPMAC2, MacAddr,
-        "[x:x:x:x:x:x]\n\t[Jungfrau][Moench] Mac address of the receiver "
-        "(destination) "
+        "[x:x:x:x:x:x]\n\t[Jungfrau] Mac address of the receiver (destination) "
        "udp interface 2. Not mandatory to set as udp_dstip2 retrieves it from "
        "slsReceiver process but must be set if you use a custom receiver (not "
-        "slsReceiver). \n\t [Jungfrau][Moench] top half or inner interface "
-        "\n\t "
+        "slsReceiver). \n\t [Jungfrau] top half or inner interface \n\t "
        "[Gotthard2] veto debugging. Use router mac if router between detector "
        "and receiver.");

@ -1678,10 +1664,10 @@ class CmdProxy {
    INTEGER_COMMAND_VEC_ID_GET(
        udp_dstport2, getDestinationUDPPort2, setDestinationUDPPort2,
        StringTo<int>,
-        "[n]\n\t[Jungfrau][Moench][Eiger][Gotthard2] Port number of the "
+        "[n]\n\t[Jungfrau][Eiger][Gotthard2] Port number of the "
        "receiver (destination) udp interface 2. Default is 50002. "
        "\n\tIf multi command, ports for each module is calculated "
-        "(incremented by 2) \n\t[Jungfrau][Moench] top half or inner interface "
+        "(incremented by 2) \n\t[Jungfrau] top half or inner interface "
        "\n\t[Eiger] "
        "right half \n\t[Gotthard2] veto debugging");

@ -1700,21 +1686,19 @@ class CmdProxy {
    GET_COMMAND(rx_printconfig, printRxConfiguration,
                "\n\tPrints the receiver configuration.");

-    INTEGER_COMMAND_VEC_ID(tengiga, getTenGiga, setTenGiga, StringTo<int>,
-                           "[0, 1]\n\t[Eiger][Ctb][Mythen3] 10GbE Enable.");
-
    INTEGER_COMMAND_VEC_ID(
-        flowcontrol10g, getTenGigaFlowControl, setTenGigaFlowControl,
-        StringTo<int>,
-        "[0, 1]\n\t[Eiger][Jungfrau][Moench] 10GbE Flow Control.");
+        tengiga, getTenGiga, setTenGiga, StringTo<int>,
+        "[0, 1]\n\t[Eiger][Ctb][Moench][Mythen3] 10GbE Enable.");
+
+    INTEGER_COMMAND_VEC_ID(flowcontrol10g, getTenGigaFlowControl,
+                           setTenGigaFlowControl, StringTo<int>,
+                           "[0, 1]\n\t[Eiger][Jungfrau] 10GbE Flow Control.");

    INTEGER_COMMAND_VEC_ID(
        txdelay_frame, getTransmissionDelayFrame, setTransmissionDelayFrame,
        StringTo<int>,
-        "[n_delay]\n\t[Eiger][Jungfrau][Moench][Mythen3] Transmission delay of "
-        "first "
-        "udp packet being streamed out of the module.\n\t[Jungfrau][Moench] "
-        "[0-31] "
+        "[n_delay]\n\t[Eiger][Jungfrau][Mythen3] Transmission delay of first "
+        "udp packet being streamed out of the module.\n\t[Jungfrau] [0-31] "
        "Each value represents 1 ms\n\t[Eiger] Additional delay to "
        "txdelay_left and txdelay_right. Each value represents 10ns. Typical "
        "value is 50000.\n\t[Mythen3] [0-16777215] Each value represents 8 ns "
@ -1957,15 +1941,13 @@ class CmdProxy {

    /* Jungfrau Specific */

-    GET_COMMAND(
-        chipversion, getChipVersion,
-        "\n\t[Jungfrau][Moench] Returns chip version. Can be 1.0 or 1.1");
+    GET_COMMAND(chipversion, getChipVersion,
+                "\n\t[Jungfrau] Returns chip version. Can be 1.0 or 1.1");

    INTEGER_COMMAND_VEC_ID(
        temp_threshold, getThresholdTemperature, setThresholdTemperature,
        StringTo<int>,
-        "[n_temp (in degrees)]\n\t[Jungfrau][Moench] Threshold temperature in "
-        "degrees. "
+        "[n_temp (in degrees)]\n\t[Jungfrau] Threshold temperature in degrees. "
        "If temperature crosses threshold temperature and temperature control "
        "is enabled, power to chip will be switched off and temperature event "
        "occurs. To power on chip again, temperature has to be less than "
@ -1974,7 +1956,7 @@ class CmdProxy {
    INTEGER_COMMAND_VEC_ID(
        temp_control, getTemperatureControl, setTemperatureControl,
        StringTo<int>,
-        "[0, 1]\n\t[Jungfrau][Moench] Temperature control enable. Default is 0 "
+        "[0, 1]\n\t[Jungfrau] Temperature control enable. Default is 0 "
        "(disabled). If temperature crosses threshold temperature and "
        "temperature control is enabled, power to chip will be switched off "
        "and temperature event occurs. To power on chip again, temperature has "
@ -1984,8 +1966,7 @@ class CmdProxy {
    INTEGER_COMMAND_VEC_ID(
        autocompdisable, getAutoComparatorDisable, setAutoComparatorDisable,
        StringTo<int>,
-        "[0, 1]\n\t[Jungfrau][Moench] Auto comparator disable mode. By "
-        "default, the "
+        "[0, 1]\n\t[Jungfrau] Auto comparator disable mode. By default, the "
        "on-chip gain switching is active during the entire exposure.This mode "
        "disables the on - chip gain switching comparator automatically after "
        "93.75% (only for chipv1.0) of exposure time (only for longer than "
@ -1994,18 +1975,19 @@ class CmdProxy {
        "disabled(comparator enabled throughout). 1 enables mode. 0 disables "
        "mode. ");

-    TIME_COMMAND(
-        compdisabletime, getComparatorDisableTime, setComparatorDisableTime,
-        "[duration] [(optional unit) ns|us|ms|s]\n\t[Jungfrau][Moench] Time "
-        "before end of exposure when comparator is disabled. It is "
-        "only possible for chipv1.1.");
+    TIME_COMMAND(compdisabletime, getComparatorDisableTime,
+                 setComparatorDisableTime,
+                 "[duration] [(optional unit) ns|us|ms|s]\n\t[Jungfrau] Time "
+                 "before end of exposure when comparator is disabled. It is "
+                 "only possible for chipv1.1.");

    INTEGER_COMMAND_SET_NOID_GET_ID(
        extrastoragecells, getNumberOfAdditionalStorageCells,
        setNumberOfAdditionalStorageCells, StringTo<int>,
        "[0-15]\n\t[Jungfrau] Only for chipv1.0. Number of additional storage "
-        "cells. Default is 0. For advanced users only. \n\tThe #images = "
-        "#frames x #triggers x (#extrastoragecells + 1).");
+        "cells. Default is "
+        "0. For advanced users only. \n\tThe #images = #frames x #triggers x "
+        "(#extrastoragecells + 1).");

    INTEGER_COMMAND_VEC_ID(
        storagecell_start, getStorageCellStart, setStorageCellStart,
@ -2014,11 +1996,12 @@ class CmdProxy {
        "of the series. max is 15 (default) for chipv1.0 and 3 (default) for "
        "chipv1.1. For advanced users only.");

-    TIME_COMMAND(storagecell_delay, getStorageCellDelay, setStorageCellDelay,
-                 "[duration (0-1638375 ns)] [(optional unit) "
-                 "ns|us|ms|s]\n\t[Jungfrau] Additional time delay between 2 "
-                 "consecutive exposures in burst mode (resolution of 25ns). "
-                 "Only applicable for chipv1.0. For advanced users only.");
+    TIME_COMMAND(
+        storagecell_delay, getStorageCellDelay, setStorageCellDelay,
+        "[duration (0-1638375 ns)] [(optional unit) ns|us|ms|s]\n\t[Jungfrau] "
+        "Additional time delay between 2 consecutive exposures in burst mode "
+        "(resolution of 25ns). Only applicable for chipv1.0. For advanced "
+        "users only.");

    INTEGER_COMMAND_VEC_ID(
        gainmode, getGainMode, setGainMode, StringTo<slsDetectorDefs::gainMode>,
@ -2026,11 +2009,10 @@ class CmdProxy {
        "Jungfrau] Gain mode.\n\tCAUTION: Do not use fixg0 without caution, "
        "you can damage the detector!!!");

-    INTEGER_COMMAND_VEC_ID(
-        filtercells, getNumberOfFilterCells, setNumberOfFilterCells,
-        StringTo<int>,
-        "[0-12]\n\t[Jungfrau][Moench] Set Filter Cell. Only for "
-        "chipv1.1. Advanced user Command");
+    INTEGER_COMMAND_VEC_ID(filtercells, getNumberOfFilterCells,
+                           setNumberOfFilterCells, StringTo<int>,
+                           "[0-12]\n\t[Jungfrau] Set Filter Cell. Only for "
+                           "chipv1.1. Advanced user Command");

    /* Gotthard Specific */
    TIME_GET_COMMAND(exptimel, getExptimeLeft,
@ -2112,36 +2094,36 @@ class CmdProxy {
    INTEGER_COMMAND_VEC_ID(
        asamples, getNumberOfAnalogSamples, setNumberOfAnalogSamples,
        StringTo<int>,
-        "[n_samples]\n\t[CTB] Number of analog samples expected.");
+        "[n_samples]\n\t[CTB][Moench] Number of analog samples expected.");

    INTEGER_COMMAND_VEC_ID(
        adcclk, getADCClock, setADCClock, StringTo<int>,
-        "[n_clk in MHz]\n\t[Ctb] ADC clock frequency in MHz.");
+        "[n_clk in MHz]\n\t[Ctb][Moench] ADC clock frequency in MHz.");

    INTEGER_COMMAND_VEC_ID(runclk, getRUNClock, setRUNClock, StringTo<int>,
-                           "[n_clk in MHz]\n\t[Ctb] Run clock in MHz.");
+                           "[n_clk in MHz]\n\t[Ctb][Moench] Run clock in MHz.");

    GET_COMMAND(syncclk, getSYNCClock,
-                "[n_clk in MHz]\n\t[Ctb] Sync clock in MHz.");
+                "[n_clk in MHz]\n\t[Ctb][Moench] Sync clock in MHz.");

-    INTEGER_COMMAND_VEC_ID(adcpipeline, getADCPipeline, setADCPipeline,
-                           StringTo<int>,
-                           "[n_value]\n\t[Ctb] Pipeline for ADC clock.");
+    INTEGER_COMMAND_VEC_ID(
+        adcpipeline, getADCPipeline, setADCPipeline, StringTo<int>,
+        "[n_value]\n\t[Ctb][Moench] Pipeline for ADC clock.");

    INTEGER_IND_COMMAND(v_limit, getVoltage, setVoltage, StringTo<int>,
                        defs::V_LIMIT,
-                        "[n_value]\n\t[Ctb] Soft limit for power "
+                        "[n_value]\n\t[Ctb][Moench] Soft limit for power "
                        "supplies (ctb only) and DACS in mV.");

    INTEGER_COMMAND_HEX(adcenable, getADCEnableMask, setADCEnableMask,
                        StringTo<uint32_t>,
-                        "[bitmask]\n\t[Ctb] ADC Enable Mask for 1Gb "
+                        "[bitmask]\n\t[Ctb][Moench] ADC Enable Mask for 1Gb "
                        "Enable for each 32 ADC channel.");

    INTEGER_COMMAND_HEX(
        adcenable10g, getTenGigaADCEnableMask, setTenGigaADCEnableMask,
        StringTo<uint32_t>,
-        "[bitmask]\n\t[Ctb] ADC Enable Mask for 10Gb mode for each 32 "
+        "[bitmask]\n\t[Ctb][Moench] ADC Enable Mask for 10Gb mode for each 32 "
        "ADC channel. However, if any of a consecutive 4 bits are enabled, the "
        "complete 4 bits are enabled.");

@ -2242,28 +2224,28 @@ class CmdProxy {

    EXECUTE_SET_COMMAND_NOID_1ARG(
        savepattern, savePattern,
-        "[fname]\n\t[Ctb][Mythen3] Saves pattern to file (ascii). "
-        "\n\t[Ctb] Also executes pattern.");
+        "[fname]\n\t[Ctb][Moench][Mythen3] Saves pattern to file (ascii). "
+        "\n\t[Ctb][Moench] Also executes pattern.");

    EXECUTE_SET_COMMAND(
        defaultpattern, loadDefaultPattern,
-        "\n\t[Mythen3] Loads and runs default pattern in pattern "
+        "\n\t[Mythen3][Moench] Loads and runs default pattern in pattern "
        "generator. It is to go back to initial settings.");

    INTEGER_COMMAND_HEX_WIDTH16(patioctrl, getPatternIOControl,
                                setPatternIOControl, StringTo<uint64_t>,
-                                "[64 bit mask]\n\t[Ctb] 64 bit mask "
+                                "[64 bit mask]\n\t[Ctb][Moench] 64 bit mask "
                                "defining input (0) and output (1) signals.");

    INTEGER_COMMAND_HEX_WIDTH16(
        patmask, getPatternMask, setPatternMask, StringTo<uint64_t>,
-        "[64 bit mask]\n\t[Ctb][Mythen3] Selects the bits that will "
+        "[64 bit mask]\n\t[Ctb][Moench][Mythen3] Selects the bits that will "
        "have a pattern mask applied to the selected patmask for every "
        "pattern.");

    INTEGER_COMMAND_HEX_WIDTH16(
        patsetbit, getPatternBitMask, setPatternBitMask, StringTo<uint64_t>,
-        "[64 bit mask]\n\t[Ctb][Mythen3] Sets the mask applied to "
+        "[64 bit mask]\n\t[Ctb][Moench][Mythen3] Sets the mask applied to "
        "every pattern to the selected bits.");

    EXECUTE_SET_COMMAND(patternstart, startPattern,
@ -2273,10 +2255,10 @@ class CmdProxy {
    /* Advanced */

    EXECUTE_SET_COMMAND(resetfpga, resetFPGA,
-                        "\n\t[Jungfrau][Moench][Ctb] Reset FPGA.");
+                        "\n\t[Jungfrau][Ctb][Moench] Reset FPGA.");

    EXECUTE_SET_COMMAND(rebootcontroller, rebootController,
-                        "\n\t[Jungfrau][Moench][Ctb][Gotthard][Mythen3]["
+                        "\n\t[Jungfrau][Ctb][Moench][Gotthard][Mythen3]["
                        "Gotthard2] Reboot controller of detector.");

    INTEGER_COMMAND_VEC_ID(
@ -2287,18 +2269,18 @@ class CmdProxy {

    EXECUTE_SET_COMMAND(
        firmwaretest, executeFirmwareTest,
-        "\n\t[Jungfrau][Moench][Gotthard][Mythen3][Gotthard2][Ctb] Firmware "
+        "\n\t[Jungfrau][Gotthard][Mythen3][Gotthard2][Ctb][Moench] Firmware "
        "test, ie. reads a read fixed pattern from a register.");

    EXECUTE_SET_COMMAND(
        bustest, executeBusTest,
-        "\n\t[Jungfrau][Moench][Gotthard][Mythen3][Gotthard2][Ctb] Bus test, "
+        "\n\t[Jungfrau][Gotthard][Mythen3][Gotthard2][Ctb][Moench] Bus test, "
        "ie. Writes different values in a R/W register and confirms the "
        "writes to check bus.\n\tAdvanced User function!");

    INTEGER_COMMAND_HEX(
        adcinvert, getADCInvert, setADCInvert, StringTo<uint32_t>,
-        "[bitmask]\n\t[Ctb][Jungfrau][Moench] ADC Inversion "
+        "[bitmask]\n\t[Ctb][Moench][Jungfrau] ADC Inversion "
        "Mask.\n\t[Jungfrau][Moench] Inversions on top of the default mask.");

    /* Insignificant */
@ -2323,19 +2305,19 @@ class CmdProxy {
        "\n\tClient IP Address that last communicated with the detector.");

    GET_COMMAND(framecounter, getNumberOfFramesFromStart,
-                "\n\t[Jungfrau][Moench][Mythen3][Gotthard2][CTB] "
+                "\n\t[Jungfrau][Mythen3][Gotthard2][Moench][CTB] "
                "Number of frames from start run control."
                "\n\t[Gotthard2] only in continuous mode.");

    TIME_GET_COMMAND(runtime, getActualTime,
                     "[(optional unit) "
-                     "ns|us|ms|s]\n\t[Jungfrau][Moench][Mythen3][Gotthard2]["
+                     "ns|us|ms|s]\n\t[Jungfrau][Mythen3][Gotthard2][Moench]["
                     "CTB] Time from detector start up."
                     "\n\t[Gotthard2] not in burst and auto mode.");

    TIME_GET_COMMAND(frametime, getMeasurementTime,
                     "[(optional unit) "
-                     "ns|us|ms|s]\n\t[Jungfrau][Moench][Mythen3][Gotthard2]["
+                     "ns|us|ms|s]\n\t[Jungfrau][Mythen3][Gotthard2][Moench]["
                     "CTB] Timestamp at a frame start."
                     "\n\t[Gotthard2] not in burst and auto mode.");
 };
--- a/slsDetectorSoftware/src/Detector.cpp
+++ b/slsDetectorSoftware/src/Detector.cpp
@ -124,13 +124,6 @@ Result<int64_t> Detector::getFirmwareVersion(Positions pos) const {
    return pimpl->Parallel(&Module::getFirmwareVersion, pos);
 }

-Result<int64_t>
-Detector::getFrontEndFirmwareVersion(const defs::fpgaPosition fpgaPosition,
-                                     Positions pos) const {
-    return pimpl->Parallel(&Module::getFrontEndFirmwareVersion, pos,
-                           fpgaPosition);
-}
-
 Result<std::string> Detector::getDetectorServerVersion(Positions pos) const {
    return pimpl->Parallel(&Module::getDetectorServerVersion, pos);
 }
@ -190,12 +183,17 @@ std::vector<defs::detectorSettings> Detector::getSettingsList() const {
            defs::HIGHGAIN, defs::DYNAMICGAIN, defs::LOWGAIN, defs::MEDIUMGAIN,
            defs::VERYHIGHGAIN};
    case defs::JUNGFRAU:
-    case defs::MOENCH:
        return std::vector<defs::detectorSettings>{defs::GAIN0,
                                                   defs::HIGHGAIN0};
    case defs::GOTTHARD2:
        return std::vector<defs::detectorSettings>{
            defs::DYNAMICGAIN, defs::FIXGAIN1, defs::FIXGAIN2};
+    case defs::MOENCH:
+        return std::vector<defs::detectorSettings>{
+            defs::G1_HIGHGAIN,         defs::G1_LOWGAIN,
+            defs::G2_HIGHCAP_HIGHGAIN, defs::G2_HIGHCAP_LOWGAIN,
+            defs::G2_LOWCAP_HIGHGAIN,  defs::G2_LOWCAP_LOWGAIN,
+            defs::G4_HIGHGAIN,         defs::G4_LOWGAIN};
    case defs::MYTHEN3:
        return std::vector<defs::detectorSettings>{defs::STANDARD, defs::FAST,
                                                   defs::HIGHGAIN};
@ -507,7 +505,6 @@ std::vector<defs::speedLevel> Detector::getReadoutSpeedList() const {
    switch (getDetectorType().squash()) {
    case defs::EIGER:
    case defs::JUNGFRAU:
-    case defs::MOENCH:
        return std::vector<defs::speedLevel>{defs::FULL_SPEED, defs::HALF_SPEED,
                                             defs::QUARTER_SPEED};
    case defs::GOTTHARD2:
@ -630,7 +627,6 @@ std::vector<defs::dacIndex> Detector::getTemperatureList() const {
    case defs::CHIPTESTBOARD:
        return std::vector<defs::dacIndex>{defs::SLOW_ADC_TEMP};
    case defs::JUNGFRAU:
-    case defs::MOENCH:
    case defs::GOTTHARD:
        return std::vector<defs::dacIndex>{defs::TEMPERATURE_ADC,
                                           defs::TEMPERATURE_FPGA};
@ -669,7 +665,6 @@ Result<int> Detector::getTemperature(defs::dacIndex index,
    switch (getDetectorType().squash()) {
    case defs::EIGER:
    case defs::JUNGFRAU:
-    case defs::MOENCH:
    case defs::MYTHEN3:
    case defs::GOTTHARD2:
        for (auto &it : res) {
@ -697,7 +692,6 @@ std::vector<defs::dacIndex> Detector::getDacList() const {
            defs::VREF_DS,   defs::VCASCN_PB, defs::VCASCP_PB, defs::VOUT_CM,
            defs::VCASC_OUT, defs::VIN_CM,    defs::VREF_COMP, defs::IB_TESTC};
    case defs::JUNGFRAU:
-    case defs::MOENCH:
        return std::vector<defs::dacIndex>{
            defs::VB_COMP,   defs::VDD_PROT, defs::VIN_COM, defs::VREF_PRECH,
            defs::VB_PIXBUF, defs::VB_DS,    defs::VREF_DS, defs::VREF_COMP};
@ -715,6 +709,10 @@ std::vector<defs::dacIndex> Detector::getDacList() const {
            defs::VCAS,      defs::VRPREAMP, defs::VCAL_N,   defs::VIPRE,
            defs::VISHAPER,  defs::VCAL_P,   defs::VTRIM,    defs::VDCSH,
            defs::VTHRESHOLD};
+    case defs::MOENCH:
+        return std::vector<defs::dacIndex>{
+            defs::VBP_COLBUF, defs::VIPRE,   defs::VIN_CM,    defs::VB_SDA,
+            defs::VCASC_SFP,  defs::VOUT_CM, defs::VIPRE_CDS, defs::IBIAS_SFP};
    case defs::CHIPTESTBOARD:
        for (int i = 0; i != 18; ++i) {
            retval.push_back(static_cast<defs::dacIndex>(i));
@ -857,7 +855,7 @@ void Detector::stopDetector(Positions pos) {
            throw RuntimeError(
                "Could not stop detector. Returned error status.");
        }
-        pimpl->Parallel(&Module::stopAcquisition, pos);
+        pimpl->stopDetector(pos);
        status = getDetectorStatus().squash(defs::runStatus::RUNNING);
        ++retries;

@ -916,7 +914,7 @@ void Detector::setNextFrameNumber(uint64_t value, Positions pos) {
 }

 void Detector::sendSoftwareTrigger(const bool block, Positions pos) {
-    pimpl->Parallel(&Module::sendSoftwareTrigger, pos, block);
+    pimpl->sendSoftwareTrigger(block, pos);
 }

 Result<defs::scanParameters> Detector::getScan(Positions pos) const {
@ -944,8 +942,7 @@ Result<int> Detector::getNumberofUDPInterfaces(Positions pos) const {
 }

 void Detector::setNumberofUDPInterfaces(int n, Positions pos) {
-    auto detType = getDetectorType().squash();
-    if (detType != defs::JUNGFRAU && detType != defs::MOENCH) {
+    if (getDetectorType().squash() != defs::JUNGFRAU) {
        throw RuntimeError(
            "Cannot set number of udp interfaces for this detector.");
    }
@ -954,18 +951,23 @@ void Detector::setNumberofUDPInterfaces(int n, Positions pos) {
 }

 void Detector::setNumberofUDPInterfaces_(int n, Positions pos) {
+    if (!size()) {
+        throw RuntimeError("No modules added.");
+    }
    bool previouslyClientStreaming = pimpl->getDataStreamingToClient();
+    int clientStartingPort = getClientZmqPort({0}).squash(0);
    bool useReceiver = getUseReceiverFlag().squash(false);
    bool previouslyReceiverStreaming = false;
-    int startingPort = 0;
+    int rxStartingPort = 0;
    if (useReceiver) {
        previouslyReceiverStreaming = getRxZmqDataStream(pos).squash(true);
-        startingPort = getRxZmqPort({0}).squash(0);
+        rxStartingPort = getRxZmqPort({0}).squash(0);
    }
    pimpl->Parallel(&Module::setNumberofUDPInterfaces, pos, n);
    // ensure receiver zmq socket ports are multiplied by 2 (2 interfaces)
-    if (getUseReceiverFlag().squash(false) && size()) {
-        setRxZmqPort(startingPort, -1);
+    setClientZmqPort(clientStartingPort, -1);
+    if (getUseReceiverFlag().squash(false)) {
+        setRxZmqPort(rxStartingPort, -1);
    }
    // redo the zmq sockets if enabled
    if (previouslyClientStreaming) {
@ -1182,8 +1184,7 @@ Result<std::string> Detector::getRxHostname(Positions pos) const {
 }

 void Detector::setRxHostname(const std::string &receiver, Positions pos) {
-    auto host = pimpl->verifyUniqueRxHost(receiver, pos);
-    pimpl->Parallel(&Module::setReceiverHostname, pos, host.first, host.second,
+    pimpl->Parallel(&Module::setReceiverHostname, pos, receiver,
                    pimpl->getInitialChecks());
    updateRxRateCorrections();
 }
@ -1191,15 +1192,17 @@ void Detector::setRxHostname(const std::string &receiver, Positions pos) {
 void Detector::setRxHostname(const std::vector<std::string> &name) {
    // set all to same rx_hostname
    if (name.size() == 1) {
-        auto host = pimpl->verifyUniqueRxHost(name[0], {});
-        pimpl->Parallel(&Module::setReceiverHostname, {}, host.first,
-                        host.second, pimpl->getInitialChecks());
+        pimpl->Parallel(&Module::setReceiverHostname, {}, name[0],
+                        pimpl->getInitialChecks());
    } else {
-        auto hosts = pimpl->verifyUniqueRxHost(name);
+        if ((int)name.size() != size()) {
+            throw RuntimeError(
+                "Receiver hostnames size " + std::to_string(name.size()) +
+                " does not match detector size " + std::to_string(size()));
+        }
        // set each rx_hostname
        for (int idet = 0; idet < size(); ++idet) {
-            pimpl->Parallel(&Module::setReceiverHostname, {idet},
-                            hosts[idet].first, hosts[idet].second,
+            pimpl->Parallel(&Module::setReceiverHostname, {idet}, name[idet],
                            pimpl->getInitialChecks());
        }
    }
@ -1216,12 +1219,10 @@ void Detector::setRxPort(int port, int module_id) {
        for (auto &it : port_list) {
            it = port++;
        }
-        // no need to verify hostname-port combo as unique port(incremented)
        for (int idet = 0; idet < size(); ++idet) {
            pimpl->Parallel(&Module::setReceiverPort, {idet}, port_list[idet]);
        }
    } else {
-        pimpl->verifyUniqueRxHost(port, module_id);
        pimpl->Parallel(&Module::setReceiverPort, {module_id}, port);
    }
 }
@ -1627,7 +1628,7 @@ void Detector::setTop(bool value, Positions pos) {
    pimpl->Parallel(&Module::setTop, pos, value);
 }

-// Jungfrau/moench Specific
+// Jungfrau Specific
 Result<double> Detector::getChipVersion(Positions pos) const {
    return pimpl->Parallel(&Module::getChipVersion, pos);
 }
@ -1699,7 +1700,6 @@ void Detector::setStorageCellDelay(ns value, Positions pos) {
 std::vector<defs::gainMode> Detector::getGainModeList() const {
    switch (getDetectorType().squash()) {
    case defs::JUNGFRAU:
-    case defs::MOENCH:
        return std::vector<defs::gainMode>{
            defs::DYNAMIC, defs::FORCE_SWITCH_G1, defs::FORCE_SWITCH_G2,
            defs::FIX_G1,  defs::FIX_G2,          defs::FIX_G0};
@ -1991,7 +1991,7 @@ void Detector::setDigitalPulsing(bool value, Positions pos) {
    pimpl->Parallel(&Module::setDigitalPulsing, pos, value);
 }

-// CTB Specific
+// CTB/ Moench Specific

 Result<int> Detector::getNumberOfAnalogSamples(Positions pos) const {
    return pimpl->Parallel(&Module::getNumberOfAnalogSamples, pos);
@ -2329,6 +2329,8 @@ void Detector::startPattern(Positions pos) {
    pimpl->Parallel(&Module::startPattern, pos);
 }

+// Moench
+
 Result<std::map<std::string, std::string>>
 Detector::getAdditionalJsonHeader(Positions pos) const {
    return pimpl->Parallel(&Module::getAdditionalJsonHeader, pos);
@ -2461,12 +2463,10 @@ Result<int> Detector::getControlPort(Positions pos) const {
 }

 void Detector::setControlPort(int value, Positions pos) {
-    pimpl->verifyUniqueDetHost(value, pos);
    pimpl->Parallel(&Module::setControlPort, pos, value);
 }

 Result<int> Detector::getStopPort(Positions pos) const {
-    // not verifying unique stop port (control port is sufficient)
    return pimpl->Parallel(&Module::getStopPort, pos);
 }

--- a/slsDetectorSoftware/src/DetectorImpl.cpp
+++ b/slsDetectorSoftware/src/DetectorImpl.cpp
@ -279,14 +279,31 @@ void DetectorImpl::setHostname(const std::vector<std::string> &name) {
    }
 }

-void DetectorImpl::addModule(const std::string &name) {
-    LOG(logINFO) << "Adding module " << name;
-    auto host = verifyUniqueDetHost(name);
-    std::string hostname = host.first;
-    int port = host.second;
+void DetectorImpl::addModule(const std::string &hostname) {
+    LOG(logINFO) << "Adding module " << hostname;
+
+    int port = DEFAULT_TCP_CNTRL_PORTNO;
+    std::string host = hostname;
+    auto res = split(hostname, ':');
+    if (res.size() > 1) {
+        host = res[0];
+        port = StringTo<int>(res[1]);
+    }
+
+    if (host != "localhost") {
+        for (auto &module : modules) {
+            if (module->getHostname() == host) {
+                LOG(logWARNING)
+                    << "Module " << host << "already part of the Detector!"
+                    << std::endl
+                    << "Remove it before adding it back in a new position!";
+                return;
+            }
+        }
+    }

    // get type by connecting
-    detectorType type = Module::getTypeFromDetector(hostname, port);
+    detectorType type = Module::getTypeFromDetector(host, port);

    // gotthard cannot have more than 2 modules (50um=1, 25um=2
    if ((type == GOTTHARD || type == GOTTHARD2) && modules.size() > 2) {
@ -299,15 +316,15 @@ void DetectorImpl::addModule(const std::string &name) {
    shm()->totalNumberOfModules = modules.size();
    modules[pos]->setControlPort(port);
    modules[pos]->setStopPort(port + 1);
-    modules[pos]->setHostname(hostname, shm()->initialChecks);
+    modules[pos]->setHostname(host, shm()->initialChecks);

    // module type updated by now
    shm()->detType = Parallel(&Module::getDetectorType, {})
                         .tsquash("Inconsistent detector types.");
-    // for ctb
+    // for moench and ctb
    modules[pos]->updateNumberOfChannels();

-    // for eiger, jungfrau, moench, gotthard2
+    // for eiger, jungfrau, gotthard2
    modules[pos]->updateNumberofUDPInterfaces();

    // update zmq port in case numudpinterfaces changed
@ -401,7 +418,6 @@ void DetectorImpl::setGapPixelsinCallback(const bool enable) {
    if (enable) {
        switch (shm()->detType) {
        case JUNGFRAU:
-        case MOENCH:
            break;
        case EIGER:
            if (size() && modules[0]->getQuad()) {
@ -424,7 +440,6 @@ int DetectorImpl::getTransmissionDelay() const {
    bool eiger = false;
    switch (shm()->detType) {
    case JUNGFRAU:
-    case MOENCH:
    case MYTHEN3:
        break;
    case EIGER:
@ -468,7 +483,6 @@ void DetectorImpl::setTransmissionDelay(int step) {
    bool eiger = false;
    switch (shm()->detType) {
    case JUNGFRAU:
-    case MOENCH:
    case MYTHEN3:
        break;
    case EIGER:
@ -755,7 +769,7 @@ void DetectorImpl::readFrameFromReceiver() {
            int nDetActualPixelsY = nDetPixelsY;

            if (gapPixels) {
-                int n = InsertGapPixels(multiframe.get(), multigappixels,
+                int n = insertGapPixels(multiframe.get(), multigappixels,
                                        quadEnable, dynamicRange,
                                        nDetActualPixelsX, nDetActualPixelsY);
                callbackImage = multigappixels;
@ -794,7 +808,7 @@ void DetectorImpl::readFrameFromReceiver() {
    delete[] multigappixels;
 }

-int DetectorImpl::InsertGapPixels(char *image, char *&gpImage, bool quadEnable,
+int DetectorImpl::insertGapPixels(char *image, char *&gpImage, bool quadEnable,
                                  int dr, int &nPixelsx, int &nPixelsy) {

    LOG(logDEBUG) << "Insert Gap pixels:"
@ -870,10 +884,10 @@ int DetectorImpl::InsertGapPixels(char *image, char *&gpImage, bool quadEnable,
        nMod1TotPixelsx /= 2;
    }
    // eiger requires inter chip gap pixels are halved
-    // jungfrau/moench prefers same inter chip gap pixels as the boundary pixels
+    // jungfrau prefers same inter chip gap pixels as the boundary pixels
    int divisionValue = 2;
    slsDetectorDefs::detectorType detType = shm()->detType;
-    if (detType == JUNGFRAU || detType == MOENCH) {
+    if (detType == JUNGFRAU) {
        divisionValue = 1;
    }
    LOG(logDEBUG) << "Insert Gap pixels Calculations:\n\t"
@ -1242,43 +1256,104 @@ int DetectorImpl::acquire() {
    return OK;
 }

-void DetectorImpl::startAcquisition(bool blocking, std::vector<int> positions) {
-    // handle Mythen3 synchronization
-    if (shm()->detType == defs::MYTHEN3 && size() > 1) {
-        std::vector<int> master;
-        std::vector<int> slaves;
-        if (positions.empty() ||
-            (positions.size() == 1 && positions[0] == -1)) {
-            positions.resize(modules.size());
-            std::iota(begin(positions), end(positions), 0);
-        }
-        // could be all slaves in positions
-        slaves.reserve(positions.size());
-        auto is_master = Parallel(&Module::isMaster, positions);
-        for (size_t i : positions) {
-            if (is_master[i])
-                master.push_back(i);
-            else
-                slaves.push_back(i);
+bool DetectorImpl::handleSynchronization(Positions pos) {
+    bool handleSync = false;
+    // multi module m3 or multi module sync enabled jungfrau
+    if (size() > 1) {
+        switch (shm()->detType) {
+        case defs::MYTHEN3:
+        case defs::GOTTHARD2:
+        case defs::GOTTHARD:
+            handleSync = true;
+            break;
+        case defs::JUNGFRAU:
+            if (Parallel(&Module::getSynchronizationFromStopServer, pos)
+                    .tsquash("Inconsistent synchronization among modules")) {
+                handleSync = true;
+            }
+            break;
+        default:
+            break;
        }
+    }
+    return handleSync;
+}

+void DetectorImpl::getMasterSlaveList(std::vector<int> positions,
+                                      std::vector<int> &masters,
+                                      std::vector<int> &slaves) {
+    // expand positions list
+    if (positions.empty() || (positions.size() == 1 && positions[0] == -1)) {
+        positions.resize(modules.size());
+        std::iota(begin(positions), end(positions), 0);
+    }
+    // could be all slaves in positions
+    slaves.reserve(positions.size());
+    auto is_master = Parallel(&Module::isMaster, positions);
+    for (size_t i : positions) {
+        if (is_master[i])
+            masters.push_back(i);
+        else
+            slaves.push_back(i);
+    }
+}
+
+void DetectorImpl::startAcquisition(const bool blocking, Positions pos) {
+
+    // slaves first
+    if (handleSynchronization(pos)) {
+        std::vector<int> masters;
+        std::vector<int> slaves;
+        getMasterSlaveList(pos, masters, slaves);
        if (!slaves.empty()) {
            Parallel(&Module::startAcquisition, slaves);
        }
-        if (!master.empty()) {
-            if (blocking) {
-                Parallel(&Module::startAndReadAll, master);
-            } else {
-                Parallel(&Module::startAcquisition, master);
-            }
-        }
-    } else {
-        if (blocking) {
-            Parallel(&Module::startAndReadAll, positions);
-        } else {
-            Parallel(&Module::startAcquisition, positions);
+        if (!masters.empty()) {
+            Parallel((blocking ? &Module::startAndReadAll
+                               : &Module::startAcquisition),
+                     masters);
        }
    }
+    // all in parallel
+    else {
+        Parallel(
+            (blocking ? &Module::startAndReadAll : &Module::startAcquisition),
+            pos);
+    }
+}
+
+void DetectorImpl::sendSoftwareTrigger(const bool block, Positions pos) {
+    // slaves first
+    if (handleSynchronization(pos)) {
+        std::vector<int> masters;
+        std::vector<int> slaves;
+        getMasterSlaveList(pos, masters, slaves);
+        if (!slaves.empty())
+            Parallel(&Module::sendSoftwareTrigger, slaves, false);
+        if (!masters.empty())
+            Parallel(&Module::sendSoftwareTrigger, masters, block);
+    }
+    // all in parallel
+    else {
+        Parallel(&Module::sendSoftwareTrigger, pos, block);
+    }
+}
+
+void DetectorImpl::stopDetector(Positions pos) {
+    // masters first
+    if (handleSynchronization(pos)) {
+        std::vector<int> masters;
+        std::vector<int> slaves;
+        getMasterSlaveList(pos, masters, slaves);
+        if (!masters.empty())
+            Parallel(&Module::stopAcquisition, masters);
+        if (!slaves.empty())
+            Parallel(&Module::stopAcquisition, slaves);
+    }
+    // all in parallel
+    else {
+        Parallel(&Module::stopAcquisition, pos);
+    }
 }

 void DetectorImpl::printProgress(double progress) {
@ -1310,7 +1385,7 @@ void DetectorImpl::processData(bool receiver) {
                    if (fgetc(stdin) == 'q') {
                        LOG(logINFO)
                            << "Caught the command to stop acquisition";
-                        Parallel(&Module::stopAcquisition, {});
+                        stopDetector({});
                    }
                }
                // get and print progress
@ -1364,8 +1439,8 @@ std::vector<char> DetectorImpl::readProgrammingFile(const std::string &fname) {
    bool isPof = false;
    switch (shm()->detType) {
    case JUNGFRAU:
-    case MOENCH:
    case CHIPTESTBOARD:
+    case MOENCH:
        if (fname.find(".pof") == std::string::npos) {
            throw RuntimeError("Programming file must be a pof file.");
        }
@ -1383,7 +1458,8 @@ std::vector<char> DetectorImpl::readProgrammingFile(const std::string &fname) {
    default:
        throw RuntimeError(
            "Unknown detector type. Did the 'hostname' command execute "
-            "successfully? Or use update mode in the detector server side.");
+            "successfully? Or use update mode in the detector server "
+            "side.");
    }

    LOG(logINFO) << "This can take awhile. Please be patient.";
@ -1411,10 +1487,9 @@ std::vector<char> DetectorImpl::readProgrammingFile(const std::string &fname) {
    int dst = mkstemp(destfname); // create temporary file and open it in r/w
    if (dst == -1) {
        fclose(src);
-        throw RuntimeError(
-            std::string(
-                "Could not create destination file in /tmp for programming: ") +
-            destfname);
+        throw RuntimeError(std::string("Could not create destination file "
+                                       "in /tmp for programming: ") +
+                           destfname);
    }

    // convert src to dst rawbin
@ -1466,8 +1541,8 @@ std::vector<char> DetectorImpl::readProgrammingFile(const std::string &fname) {
        }
        // validate pof: read less than footer offset
        if (isPof && dstFilePos < pofFooterOfst) {
-            throw RuntimeError(
-                "Could not convert programming file. EOF before end of flash");
+            throw RuntimeError("Could not convert programming file. EOF "
+                               "before end of flash");
        }
    }
    if (fclose(src) != 0) {
@ -1503,7 +1578,6 @@ defs::xy DetectorImpl::getPortGeometry() const {
        portGeometry.x = modules[0]->getNumberofUDPInterfacesFromShm();
        break;
    case JUNGFRAU:
-    case MOENCH:
        portGeometry.y = modules[0]->getNumberofUDPInterfacesFromShm();
        break;
    default:
@ -1521,131 +1595,8 @@ defs::xy DetectorImpl::calculatePosition(int moduleIndex,
    return pos;
 }

-void DetectorImpl::verifyUniqueDetHost(const int port,
-                                       std::vector<int> positions) const {
-    // port for given positions
-    if (positions.empty() || (positions.size() == 1 && positions[0] == -1)) {
-        positions.resize(modules.size());
-        std::iota(begin(positions), end(positions), 0);
-    }
-    std::vector<std::pair<std::string, int>> hosts(size());
-    for (auto it : positions) {
-        hosts[it].second = port;
-    }
-    verifyUniqueHost(true, hosts);
-}
-
-void DetectorImpl::verifyUniqueRxHost(const int port,
-                                      const int moduleId) const {
-    std::vector<std::pair<std::string, int>> hosts(size());
-    hosts[moduleId].second = port;
-    verifyUniqueHost(false, hosts);
-}
-
-std::pair<std::string, int>
-DetectorImpl::verifyUniqueDetHost(const std::string &name) {
-    // extract port
-    // C++17 could be auto [hostname, port] = ParseHostPort(name);
-    auto res = ParseHostPort(name);
-    std::string hostname = res.first;
-    int port = res.second;
-    if (port == 0) {
-        port = DEFAULT_TCP_CNTRL_PORTNO;
-    }
-
-    int detSize = size();
-    // mod not yet added
-    std::vector<std::pair<std::string, int>> hosts(detSize + 1);
-    hosts[detSize].first = hostname;
-    hosts[detSize].second = port;
-
-    verifyUniqueHost(true, hosts);
-    return std::make_pair(hostname, port);
-}
-
-std::pair<std::string, int>
-DetectorImpl::verifyUniqueRxHost(const std::string &name,
-                                 std::vector<int> positions) const {
-    // no checks if setting to none
-    if (name == "none" || name.empty()) {
-        return make_pair(name, 0);
-    }
-    // extract port
-    // C++17 could be auto [hostname, port] = ParseHostPort(name);
-    auto res = ParseHostPort(name);
-    std::string hostname = res.first;
-    int port = res.second;
-
-    // hostname and port for given positions
-    if (positions.empty() || (positions.size() == 1 && positions[0] == -1)) {
-        positions.resize(modules.size());
-        std::iota(begin(positions), end(positions), 0);
-    }
-
-    std::vector<std::pair<std::string, int>> hosts(size());
-    for (auto it : positions) {
-        hosts[it].first = hostname;
-        hosts[it].second = port;
-    }
-
-    verifyUniqueHost(false, hosts);
-    return std::make_pair(hostname, port);
-}
-
-std::vector<std::pair<std::string, int>>
-DetectorImpl::verifyUniqueRxHost(const std::vector<std::string> &names) const {
-    if ((int)names.size() != size()) {
-        throw RuntimeError(
-            "Receiver hostnames size " + std::to_string(names.size()) +
-            " does not match detector size " + std::to_string(size()));
-    }
-
-    // extract ports
-    std::vector<std::pair<std::string, int>> hosts;
-    for (const auto &name : names) {
-        hosts.push_back(ParseHostPort(name));
-    }
-
-    verifyUniqueHost(false, hosts);
-    return hosts;
-}
-
-void DetectorImpl::verifyUniqueHost(
-    bool isDet, std::vector<std::pair<std::string, int>> &hosts) const {
-
-    // fill from shm if not provided
-    for (int i = 0; i != size(); ++i) {
-        if (hosts[i].first.empty()) {
-            hosts[i].first = (isDet ? modules[i]->getHostname()
-                                    : modules[i]->getReceiverHostname());
-        }
-        if (hosts[i].second == 0) {
-            hosts[i].second = (isDet ? modules[i]->getControlPort()
-                                     : modules[i]->getReceiverPort());
-        }
-    }
-
-    // remove the ones without a hostname
-    hosts.erase(std::remove_if(hosts.begin(), hosts.end(),
-                               [](const std::pair<std::string, int> &x) {
-                                   return (x.first == "none" ||
-                                           x.first.empty());
-                               }),
-                hosts.end());
-
-    // must be unique
-    if (hasDuplicates(hosts)) {
-        throw RuntimeError(
-            "Cannot set due to duplicate hostname-port number pairs.");
-    }
-
-    for (auto it : hosts) {
-        LOG(logDEBUG) << it.first << " " << it.second << std::endl;
-    }
-}
-
 defs::ROI DetectorImpl::getRxROI() const {
-    if (shm()->detType == CHIPTESTBOARD) {
+    if (shm()->detType == CHIPTESTBOARD || shm()->detType == MOENCH) {
        throw RuntimeError("RxRoi not implemented for this Detector");
    }
    if (modules.size() == 0) {
@ -1720,7 +1671,7 @@ defs::ROI DetectorImpl::getRxROI() const {
 }

 void DetectorImpl::setRxROI(const defs::ROI arg) {
-    if (shm()->detType == CHIPTESTBOARD) {
+    if (shm()->detType == CHIPTESTBOARD || shm()->detType == MOENCH) {
        throw RuntimeError("RxRoi not implemented for this Detector");
    }
    if (modules.size() == 0) {
--- a/slsDetectorSoftware/src/DetectorImpl.h
+++ b/slsDetectorSoftware/src/DetectorImpl.h
@ -278,7 +278,13 @@ class DetectorImpl : public virtual slsDetectorDefs {
    int acquire();

    /** also takes care of master and slave for multi module mythen */
-    void startAcquisition(bool blocking, std::vector<int> positions);
+    void startAcquisition(const bool blocking, Positions pos);
+
+    /** also takes care of master and slave for multi module mythen */
+    void sendSoftwareTrigger(const bool block, Positions pos);
+
+    /** also takes care of master and slave for multi module mythen */
+    void stopDetector(Positions pos);

    /**
     * Combines data from all readouts and gives it to the gui
@ -300,17 +306,6 @@ class DetectorImpl : public virtual slsDetectorDefs {
                              Positions pos = {});
    void setDefaultDac(defs::dacIndex index, int defaultValue,
                       defs::detectorSettings sett, Positions pos);
-
-    void verifyUniqueDetHost(const int port, std::vector<int> positions) const;
-    void verifyUniqueRxHost(const int port, const int moduleId) const;
-
-    std::pair<std::string, int> verifyUniqueDetHost(const std::string &name);
-    std::pair<std::string, int>
-    verifyUniqueRxHost(const std::string &name,
-                       std::vector<int> positions) const;
-    std::vector<std::pair<std::string, int>>
-    verifyUniqueRxHost(const std::vector<std::string> &names) const;
-
    defs::ROI getRxROI() const;
    void setRxROI(const defs::ROI arg);
    void clearRxROI();
@ -369,7 +364,7 @@ class DetectorImpl : public virtual slsDetectorDefs {
     */
    void readFrameFromReceiver();

-    /** [Eiger][Jungfrau][Moench]
+    /** [Eiger][Jungfrau]
     * add gap pixels to the imag
     * @param image pointer to image without gap pixels
     * @param gpImage poiner to image with gap pixels, if NULL, allocated
@ -379,9 +374,14 @@ class DetectorImpl : public virtual slsDetectorDefs {
     * @param nPixelsy number of pixels in Y axis (updated)
     * @returns total data bytes for updated image
     */
-    int InsertGapPixels(char *image, char *&gpImage, bool quadEnable, int dr,
+    int insertGapPixels(char *image, char *&gpImage, bool quadEnable, int dr,
                        int &nPixelsx, int &nPixelsy);

+    bool handleSynchronization(Positions pos);
+    void getMasterSlaveList(std::vector<int> positions,
+                            std::vector<int> &masters,
+                            std::vector<int> &slaves);
+
    void printProgress(double progress);

    void startProcessingThread(bool receiver);
@ -407,10 +407,6 @@ class DetectorImpl : public virtual slsDetectorDefs {
    defs::xy getPortGeometry() const;
    defs::xy calculatePosition(int moduleIndex, defs::xy geometry) const;

-    void
-    verifyUniqueHost(bool isDet,
-                     std::vector<std::pair<std::string, int>> &hosts) const;
-
    const int detectorIndex{0};
    SharedMemory<sharedDetector> shm{0, -1};
    SharedMemory<CtbConfig> ctb_shm{0, -1, CtbConfig::shm_tag()};
--- a/slsDetectorSoftware/src/HelpDacs.h
+++ b/slsDetectorSoftware/src/HelpDacs.h
@ -91,7 +91,7 @@ std::string GetHelpDac(std::string dac) {
    }
    if (dac == "vref_ds") {
        return std::string("[dac or mV value][(optional unit) mV] "
-                           "\n\t[Gotthard][Jungfrau][Moench] Dac for ??");
+                           "\n\t[Gotthard][Jungfrau] Dac for ??");
    }
    if (dac == "vcascn_pb") {
        return std::string(
@ -103,7 +103,7 @@ std::string GetHelpDac(std::string dac) {
    }
    if (dac == "vout_cm") {
        return std::string("[dac or mV value][(optional unit) mV] "
-                           "\n\t[Gotthard] Dac for ??");
+                           "\n\t[Gotthard] Dac for ??\n\t[Moench] Dac for 5");
    }
    if (dac == "vcasc_out") {
        return std::string(
@ -111,11 +111,11 @@ std::string GetHelpDac(std::string dac) {
    }
    if (dac == "vin_cm") {
        return std::string("[dac or mV value][(optional unit) mV] "
-                           "\n\t[Gotthard] Dac for ??");
+                           "\n\t[Gotthard] Dac for ??\n\t[Moench] Dac for 2");
    }
    if (dac == "vref_comp") {
        return std::string("[dac or mV value][(optional unit) mV] "
-                           "\n\t[Gotthard][Jungfrau][Moench] Dac for ??");
+                           "\n\t[Gotthard][Jungfrau] Dac for ??");
    }
    if (dac == "ib_test_c") {
        return std::string(
@ -129,7 +129,7 @@ std::string GetHelpDac(std::string dac) {
    if (dac == "vipre") {
        return std::string(
            "[dac or mV value][(optional unit) mV] \n\t[Mythen3] Dac for the "
-            "preamplifier's input transistor current.");
+            "preamplifier's input transistor current.\n\t[Moench] Dac for 1");
    }
    if (dac == "vdcsh") {
        return std::string(
@ -224,8 +224,7 @@ std::string GetHelpDac(std::string dac) {
    }
    if (dac == "vref_prech") {
        return std::string(
-            "[dac or mV value][(optional unit) mV] "
-            "\n\t[Gotthard2][Jungfrau][Moench] "
+            "[dac or mV value][(optional unit) mV] \n\t[Gotthard2][Jungfrau] "
            "Dac for reference votlage for precharing the preamplifier.");
    }
    if (dac == "vref_l_adc") {
@ -255,39 +254,44 @@ std::string GetHelpDac(std::string dac) {
            "common mode voltage of ADC DAC bank 2.");
    }
    if (dac == "vb_ds") {
-        return std::string("[dac or mV value][(optional unit) mV] "
-                           "\n\t[Jungfrau][Moench] Dac for ??");
+        return std::string(
+            "[dac or mV value][(optional unit) mV] \n\t[Jungfrau] Dac for ??");
    }
    if (dac == "vb_comp") {
-        return std::string("[dac or mV value][(optional unit) mV] "
-                           "\n\t[Jungfrau][Moench] Dac for ??");
+        return std::string(
+            "[dac or mV value][(optional unit) mV] \n\t[Jungfrau] Dac for ??");
    }
    if (dac == "vb_pixbuf") {
-        return std::string("[dac or mV value][(optional unit) mV] "
-                           "\n\t[Jungfrau][Moench] Dac for ??");
+        return std::string(
+            "[dac or mV value][(optional unit) mV] \n\t[Jungfrau] Dac for ??");
    }
    if (dac == "vin_com") {
-        return std::string("[dac or mV value][(optional unit) mV] "
-                           "\n\t[Jungfrau][Moench] Dac for ??");
+        return std::string(
+            "[dac or mV value][(optional unit) mV] \n\t[Jungfrau] Dac for ??");
    }
    if (dac == "vdd_prot") {
-        return std::string("[dac or mV value][(optional unit) mV] "
-                           "\n\t[Jungfrau][Moench] Dac for ??");
+        return std::string(
+            "[dac or mV value][(optional unit) mV] \n\t[Jungfrau] Dac for ??");
    }
    if (dac == "vbp_colbuf") {
-        return std::string("[dac or mV value][(optional unit) mV] \n");
+        return std::string(
+            "[dac or mV value][(optional unit) mV] \n\t[Moench] Dac for 0");
    }
    if (dac == "vb_sda") {
-        return std::string("[dac or mV value][(optional unit) mV] \n");
+        return std::string(
+            "[dac or mV value][(optional unit) mV] \n\t[Moench] Dac for 3");
    }
    if (dac == "vcasc_sfp") {
-        return std::string("[dac or mV value][(optional unit) mV] \n");
+        return std::string(
+            "[dac or mV value][(optional unit) mV] \n\t[Moench] Dac for 4");
    }
    if (dac == "vipre_cds") {
-        return std::string("[dac or mV value][(optional unit) mV] \n");
+        return std::string(
+            "[dac or mV value][(optional unit) mV] \n\t[Moench] Dac for 6");
    }
    if (dac == "ibias_sfp") {
-        return std::string("[dac or mV value][(optional unit) mV] \n");
+        return std::string(
+            "[dac or mV value][(optional unit) mV] \n\t[Moench] Dac for 7");
    }

    // clang-format off
--- a/slsDetectorSoftware/src/Module.cpp
+++ b/slsDetectorSoftware/src/Module.cpp
@ -92,12 +92,6 @@ int64_t Module::getFirmwareVersion() const {
    return sendToDetector<int64_t>(F_GET_FIRMWARE_VERSION);
 }

-int64_t
-Module::getFrontEndFirmwareVersion(const fpgaPosition fpgaPosition) const {
-    return sendToDetector<int64_t>(F_GET_FRONTEND_FIRMWARE_VERSION,
-                                   fpgaPosition);
-}
-
 std::string Module::getControlServerLongVersion() const {
    try {
        char retval[MAX_STR_LENGTH]{};
@ -180,7 +174,7 @@ slsDetectorDefs::detectorType Module::getDetectorType() const {
 }

 void Module::updateNumberOfChannels() {
-    if (shm()->detType == CHIPTESTBOARD) {
+    if (shm()->detType == CHIPTESTBOARD || shm()->detType == MOENCH) {
        std::array<int, 2> retvals{};
        sendToDetector(F_GET_NUM_CHANNELS, nullptr, retvals);
        shm()->nChan.x = retvals[0];
@ -544,8 +538,15 @@ bool Module::getSynchronization() const {
    return sendToDetector<int>(F_GET_SYNCHRONIZATION);
 }

+bool Module::getSynchronizationFromStopServer() const {
+    return sendToDetectorStop<int>(F_GET_SYNCHRONIZATION);
+}
+
 void Module::setSynchronization(const bool value) {
    sendToDetector(F_SET_SYNCHRONIZATION, static_cast<int>(value), nullptr);
+    // to deal with virtual servers as well
+    // (get sync from stop server during blocking acquisition)
+    sendToDetectorStop(F_SET_SYNCHRONIZATION, static_cast<int>(value), nullptr);
 }

 std::vector<int> Module::getBadChannels() const {
@ -1249,7 +1250,7 @@ std::string Module::printReceiverConfiguration() {
    os << "\n\nModule " << moduleIndex << "\nReceiver Hostname:\t"
       << getReceiverHostname();

-    if (shm()->detType == JUNGFRAU || shm()->detType == MOENCH) {
+    if (shm()->detType == JUNGFRAU) {
        os << "\nNumber of Interfaces:\t" << getNumberofUDPInterfacesFromShm()
           << "\nSelected Interface:\t" << getSelectedUDPInterface();
    }
@ -1259,15 +1260,14 @@ std::string Module::printReceiverConfiguration() {
       << getDestinationUDPIP() << "\nDestination UDP MAC:\t"
       << getDestinationUDPMAC();

-    if (shm()->detType == JUNGFRAU || shm()->detType == MOENCH) {
+    if (shm()->detType == JUNGFRAU) {
        os << "\nSource UDP IP2:\t" << getSourceUDPIP2()
           << "\nSource UDP MAC2:\t" << getSourceUDPMAC2()
           << "\nDestination UDP IP2:\t" << getDestinationUDPIP2()
           << "\nDestination UDP MAC2:\t" << getDestinationUDPMAC2();
    }
    os << "\nDestination UDP Port:\t" << getDestinationUDPPort();
-    if (shm()->detType == JUNGFRAU || shm()->detType == MOENCH ||
-        shm()->detType == EIGER) {
+    if (shm()->detType == JUNGFRAU || shm()->detType == EIGER) {
        os << "\nDestination UDP Port2:\t" << getDestinationUDPPort2();
    }
    os << "\n";
@ -1329,33 +1329,30 @@ std::string Module::getReceiverHostname() const {
    return std::string(shm()->rxHostname);
 }

-void Module::setReceiverHostname(const std::string &hostname, const int port,
+void Module::setReceiverHostname(const std::string &receiverIP,
                                 const bool initialChecks) {
-    {
-        std::ostringstream oss;
-        oss << "Setting up Receiver hostname with " << hostname;
-        if (port != 0) {
-            oss << " at port " << port;
-        }
-        LOG(logDEBUG1) << oss.str();
-    }
+    LOG(logDEBUG1) << "Setting up Receiver hostname with " << receiverIP;

    if (getRunStatus() == RUNNING) {
        throw RuntimeError("Cannot set receiver hostname. Acquisition already "
                           "running. Stop it first.");
    }

-    if (hostname == "none") {
+    if (receiverIP == "none") {
        memset(shm()->rxHostname, 0, MAX_STR_LENGTH);
        strcpy_safe(shm()->rxHostname, "none");
        shm()->useReceiverFlag = false;
        return;
    }

-    strcpy_safe(shm()->rxHostname, hostname.c_str());
-    if (port != 0) {
-        shm()->rxTCPPort = port;
+    // start updating
+    std::string host = receiverIP;
+    auto res = split(host, ':');
+    if (res.size() > 1) {
+        host = res[0];
+        shm()->rxTCPPort = std::stoi(res[1]);
    }
+    strcpy_safe(shm()->rxHostname, host.c_str());
    shm()->useReceiverFlag = true;

    try {
@ -1819,7 +1816,7 @@ void Module::setTop(bool value) {
    sendToDetector(F_SET_TOP, static_cast<int>(value), nullptr);
 }

-// Jungfrau/Moench Specific
+// Jungfrau Specific
 double Module::getChipVersion() const {
    return (sendToDetector<int>(F_GET_CHIP_VERSION)) / 10.00;
 }
@ -2331,7 +2328,7 @@ void Module::setDigitalPulsing(const bool enable) {
    sendToDetector(F_SET_DIGITAL_PULSING, static_cast<int>(enable), nullptr);
 }

-// CTB Specific
+// CTB / Moench Specific
 int Module::getNumberOfAnalogSamples() const {
    return sendToDetector<int>(F_GET_NUM_ANALOG_SAMPLES);
 }
@ -2566,6 +2563,8 @@ void Module::setPatternBitMask(uint64_t mask) {

 void Module::startPattern() { sendToDetector(F_START_PATTERN); }

+// Moench
+
 std::map<std::string, std::string> Module::getAdditionalJsonHeader() const {
    // TODO, refactor this function with a more robust sending.
    // Now assuming whitespace separated key value
@ -2658,8 +2657,8 @@ void Module::programFPGA(std::vector<char> buffer,
                         const bool forceDeleteNormalFile) {
    switch (shm()->detType) {
    case JUNGFRAU:
-    case MOENCH:
    case CHIPTESTBOARD:
+    case MOENCH:
        sendProgram(true, buffer, F_PROGRAM_FPGA, "Update Firmware", "",
                    forceDeleteNormalFile);
        break;
@ -2679,8 +2678,8 @@ void Module::updateDetectorServer(std::vector<char> buffer,
                                  const std::string &serverName) {
    switch (shm()->detType) {
    case JUNGFRAU:
-    case MOENCH:
    case CHIPTESTBOARD:
+    case MOENCH:
        sendProgram(true, buffer, F_UPDATE_DETECTOR_SERVER,
                    "Update Detector Server (no tftp)", serverName);
        break;
@ -2700,8 +2699,8 @@ void Module::updateDetectorServer(std::vector<char> buffer,
 void Module::updateKernel(std::vector<char> buffer) {
    switch (shm()->detType) {
    case JUNGFRAU:
-    case MOENCH:
    case CHIPTESTBOARD:
+    case MOENCH:
        sendProgram(true, buffer, F_UPDATE_KERNEL, "Update Kernel");
        break;
    case MYTHEN3:
--- a/slsDetectorSoftware/src/Module.h
+++ b/slsDetectorSoftware/src/Module.h
@ -90,7 +90,6 @@ class Module : public virtual slsDetectorDefs {
    void setHostname(const std::string &hostname, const bool initialChecks);

    int64_t getFirmwareVersion() const;
-    int64_t getFrontEndFirmwareVersion(const fpgaPosition fpgaPosition) const;
    std::string getControlServerLongVersion() const;
    std::string getStopServerLongVersion() const;
    void throwDeprecatedServerVersion() const;
@ -130,6 +129,7 @@ class Module : public virtual slsDetectorDefs {
    bool isMaster() const;
    void setMaster(const bool master);
    bool getSynchronization() const;
+    bool getSynchronizationFromStopServer() const;
    void setSynchronization(const bool value);
    std::vector<int> getBadChannels() const;
    void setBadChannels(std::vector<int> list);
@ -281,7 +281,7 @@ class Module : public virtual slsDetectorDefs {
     * ************************************************/
    bool getUseReceiverFlag() const;
    std::string getReceiverHostname() const;
-    void setReceiverHostname(const std::string &hostname, const int port,
+    void setReceiverHostname(const std::string &receiver,
                             const bool initialChecks);
    int getReceiverPort() const;
    int setReceiverPort(int port_number);
@ -390,7 +390,7 @@ class Module : public virtual slsDetectorDefs {

    /**************************************************
     *                                                *
-     *    Jungfrau/Moench Specific                    *
+     *    Jungfrau Specific                           *
     *                                                *
     * ************************************************/
    double getChipVersion() const;
@ -492,7 +492,7 @@ class Module : public virtual slsDetectorDefs {

    /**************************************************
     *                                                *
-     *    CTB  Specific                               *
+     *    CTB / Moench Specific                       *
     *                                                *
     * ************************************************/
    int getNumberOfAnalogSamples() const;
@ -503,6 +503,12 @@ class Module : public virtual slsDetectorDefs {
    void setADCEnableMask(uint32_t mask);
    uint32_t getTenGigaADCEnableMask() const;
    void setTenGigaADCEnableMask(uint32_t mask);
+
+    /**************************************************
+     *                                                *
+     *    CTB Specific                                *
+     *                                                *
+     * ************************************************/
    int getNumberOfDigitalSamples() const;
    void setNumberOfDigitalSamples(int value);
    readoutMode getReadoutMode() const;
--- a/slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp
@ -107,7 +107,7 @@ TEST_CASE("adcvpp", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH) {
        auto prev_val = det.getADCVpp(false);
        {
            std::ostringstream oss;
@ -132,14 +132,14 @@ TEST_CASE("adcvpp", "[.cmd]") {
    }
 }

-/* CTB Specific */
+/* CTB/ Moench Specific */

 TEST_CASE("samples", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH) {
        auto prev_asamples = det.getNumberOfAnalogSamples();
        Result<int> prev_dsamples = 0;
        if (det_type == defs::CHIPTESTBOARD) {
@ -186,7 +186,7 @@ TEST_CASE("asamples", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH) {
        auto prev_val = det.getNumberOfAnalogSamples();
        {
            std::ostringstream oss;
@ -216,7 +216,7 @@ TEST_CASE("adcclk", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH) {
        auto prev_val = det.getADCClock();
        {
            std::ostringstream oss;
@ -247,7 +247,7 @@ TEST_CASE("runclk", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH) {
        auto prev_val = det.getRUNClock();
        {
            std::ostringstream oss;
@ -277,7 +277,7 @@ TEST_CASE("syncclk", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::CHIPTESTBOARD) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH) {
        REQUIRE_NOTHROW(proxy.Call("syncclk", {}, -1, GET));
    } else {
        // clock index might work
@ -290,7 +290,7 @@ TEST_CASE("adcpipeline", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH) {
        auto prev_val = det.getADCPipeline();
        {
            std::ostringstream oss;
@ -325,7 +325,7 @@ TEST_CASE("v_limit", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH) {
        auto prev_val = det.getVoltage(defs::V_LIMIT);
        {
            std::ostringstream oss;
@ -363,7 +363,7 @@ TEST_CASE("adcenable", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH) {
        auto prev_val = det.getADCEnableMask();
        {
            std::ostringstream oss;
@ -393,7 +393,7 @@ TEST_CASE("adcenable10g", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH) {
        auto prev_val = det.getTenGigaADCEnableMask();
        {
            std::ostringstream oss;
--- a/slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp
@ -23,7 +23,7 @@ TEST_CASE("Setting and reading back Jungfrau dacs", "[.cmd][.dacs]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+    if (det_type == defs::JUNGFRAU) {
        SECTION("vb_comp") { test_dac(defs::VB_COMP, "vb_comp", 1220); }
        SECTION("vdd_prot") { test_dac(defs::VDD_PROT, "vdd_prot", 3000); }
        SECTION("vin_com") { test_dac(defs::VIN_COM, "vin_com", 1053); }
@ -102,7 +102,7 @@ TEST_CASE("selinterface", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+    if (det_type == defs::JUNGFRAU) {
        auto prev_val = det.getSelectedUDPInterface().tsquash(
            "inconsistent selected interface to test");
        {
@ -127,13 +127,13 @@ TEST_CASE("selinterface", "[.cmd]") {
    }
 }

-/* Jungfrau/moench Specific */
+/* Jungfrau Specific */

 TEST_CASE("temp_threshold", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+    if (det_type == defs::JUNGFRAU) {
        auto prev_val = det.getThresholdTemperature();
        {
            std::ostringstream oss;
@ -163,7 +163,7 @@ TEST_CASE("chipversion", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+    if (det_type == defs::JUNGFRAU) {
        REQUIRE_NOTHROW(proxy.Call("chipversion", {}, -1, GET));
    } else {
        REQUIRE_THROWS(proxy.Call("chipversion", {}, -1, GET));
@ -175,7 +175,7 @@ TEST_CASE("temp_control", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+    if (det_type == defs::JUNGFRAU) {
        auto prev_val = det.getTemperatureControl();
        {
            std::ostringstream oss;
@ -205,7 +205,7 @@ TEST_CASE("temp_event", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+    if (det_type == defs::JUNGFRAU) {
        {
            std::ostringstream oss;
            proxy.Call("temp_event", {"0"}, -1, PUT, oss);
@ -226,7 +226,7 @@ TEST_CASE("autocompdisable", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+    if (det_type == defs::JUNGFRAU) {
        auto prev_val = det.getAutoComparatorDisable();
        {
            std::ostringstream oss;
@ -256,7 +256,7 @@ TEST_CASE("compdisabletime", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if ((det_type == defs::JUNGFRAU || det_type == defs::MOENCH) &&
+    if (det_type == defs::JUNGFRAU &&
        det.getChipVersion().squash() * 10 == 11) {
        auto prev_val = det.getComparatorDisableTime();
        {
@ -416,7 +416,7 @@ TEST_CASE("gainmode", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+    if (det_type == defs::JUNGFRAU) {
        auto prev_val = det.getGainMode();
        {
            std::ostringstream oss;
@ -465,7 +465,7 @@ TEST_CASE("filtercells", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+    if (det_type == defs::JUNGFRAU) {
        // chip version 1.1
        if (det.getChipVersion().squash() * 10 == 11) {
            auto prev_val = det.getNumberOfFilterCells();
@ -510,7 +510,7 @@ TEST_CASE("sync", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+    if (det_type == defs::JUNGFRAU) {
        auto prev_val = det.getSynchronization().tsquash(
            "inconsistent synchronization to test");
        {
@ -523,6 +523,28 @@ TEST_CASE("sync", "[.cmd]") {
            proxy.Call("sync", {"1"}, -1, PUT, oss);
            REQUIRE(oss.str() == "sync 1\n");
        }
+        // setting to master or slave when synced
+        {
+            // get previous master
+            int prevMaster = 0;
+            auto previous = det.getMaster();
+            for (int i = 0; i != det.size(); ++i) {
+                if (previous[i] == 1) {
+                    prevMaster = i;
+                    break;
+                }
+            }
+            proxy.Call("master", {"1"}, 0, PUT);
+            proxy.Call("master", {"0"}, 0, PUT);
+            std::ostringstream oss;
+            proxy.Call("status", {}, -1, GET, oss);
+            REQUIRE(oss.str() != "status running\n");
+            // set all to slaves, and then master
+            for (int i = 0; i != det.size(); ++i) {
+                det.setMaster(0, {i});
+            }
+            det.setMaster(1, prevMaster);
+        }
        {
            std::ostringstream oss;
            proxy.Call("sync", {}, -1, GET, oss);
--- a/slsDetectorSoftware/tests/test-CmdProxy-moench.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-moench.cpp
@ -19,4 +19,94 @@ using test::PUT;

 /* dacs */

+TEST_CASE("Setting and reading back MOENCH dacs", "[.cmd][.dacs]") {
+    // vbp_colbuf, vipre, vin_cm", vb_sda, vcasc_sfp, vout_cm, vipre_cds,
+    // ibias_sfp
+
+    Detector det;
+    CmdProxy proxy(&det);
+    auto det_type = det.getDetectorType().squash();
+    if (det_type == defs::MOENCH) {
+        SECTION("vbp_colbuf") {
+            test_dac(defs::VBP_COLBUF, "vbp_colbuf", 1300);
+        }
+        SECTION("vipre") { test_dac(defs::VIPRE, "vipre", 1000); }
+        SECTION("vin_cm") { test_dac(defs::VIN_CM, "vin_cm", 1400); }
+        SECTION("vb_sda") { test_dac(defs::VB_SDA, "vb_sda", 680); }
+        SECTION("vcasc_sfp") { test_dac(defs::VCASC_SFP, "vcasc_sfp", 1428); }
+        SECTION("vout_cm") { test_dac(defs::VOUT_CM, "vout_cm", 1200); }
+        SECTION("vipre_cds") { test_dac(defs::VIPRE_CDS, "vipre_cds", 800); }
+        SECTION("ibias_sfp") { test_dac(defs::IBIAS_SFP, "ibias_sfp", 900); }
+
+        // eiger
+        REQUIRE_THROWS(proxy.Call("dac", {"vthreshold"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vsvp"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vsvn"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vtrim"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vrpreamp"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vrshaper"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vtgstv"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vcmp_ll"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vcmp_lr"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vcal"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vcmp_rl"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vcmp_rr"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"rxb_rb"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"rxb_lb"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vcp"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vcn"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vishaper"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"iodelay"}, -1, GET));
+        // jungfrau
+        REQUIRE_THROWS(proxy.Call("dac", {"vb_comp"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vdd_prot"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vin_com"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vref_prech"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vb_pixbuf"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vb_ds"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vref_ds"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vref_comp"}, -1, GET));
+        // gotthard
+        REQUIRE_THROWS(proxy.Call("dac", {"vref_ds"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vcascn_pb"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vcascp_pb"}, -1, GET));
+        // REQUIRE_THROWS(proxy.Call("dac", {"vout_cm"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vcasc_out"}, -1, GET));
+        // REQUIRE_THROWS(proxy.Call("dac", {"vin_cm"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vref_comp"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"ib_test_c"}, -1, GET));
+        // mythen3
+        REQUIRE_THROWS(proxy.Call("dac", {"vrpreamp"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vrshaper"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vrshaper_n"}, -1, GET));
+        // REQUIRE_THROWS(proxy.Call("dac", {"vipre"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vishaper"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vdcsh"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vth1"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vth2"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vth3"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vcal_n"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vcal_p"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vtrim"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vcassh"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vcas"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vicin"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vipre_out"}, -1, GET));
+        // gotthard2
+        REQUIRE_THROWS(proxy.Call("dac", {"vref_h_adc"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vb_comp_fe"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vb_comp_adc"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vcom_cds"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vref_rstore"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vb_opa_1st"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vref_comp_fe"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vcom_adc1"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vref_l_adc"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vref_cds"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vb_cs"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vb_opa_fd"}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("dac", {"vcom_adc2"}, -1, GET));
+    }
+}
+
 } // namespace sls
--- a/slsDetectorSoftware/tests/test-CmdProxy-pattern.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-pattern.cpp
@ -23,7 +23,8 @@ TEST_CASE("pattern", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+        det_type == defs::MYTHEN3) {
        // no proper test for put
        REQUIRE_THROWS(proxy.Call("pattern", {}, -1, GET));
    } else {
@ -35,7 +36,8 @@ TEST_CASE("savepattern", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+        det_type == defs::MYTHEN3) {
        REQUIRE_THROWS(
            proxy.Call("savepattern", {"/tmp/pattern.txt"}, -1, GET));
        if (det.size() == 1) {
@ -52,7 +54,7 @@ TEST_CASE("defaultpattern", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::MYTHEN3) {
+    if (det_type == defs::MOENCH || det_type == defs::MYTHEN3) {
        REQUIRE_THROWS(proxy.Call("defaultpattern", {}, -1, GET));
        REQUIRE_NOTHROW(proxy.Call("defaultpattern", {}, -1, PUT));
    } else {
@ -66,7 +68,7 @@ TEST_CASE("patioctrl", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH) {
        auto prev_val = det.getPatternIOControl();
        {
            std::ostringstream oss;
@ -96,7 +98,8 @@ TEST_CASE("patword", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+        det_type == defs::MYTHEN3) {
        int addr = 0x23;
        std::string saddr = ToStringHex(addr, 4);
        auto prev_val = det.getPatternWord(addr);
@ -131,7 +134,8 @@ TEST_CASE("patlimits", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+        det_type == defs::MYTHEN3) {
        auto prev_val = det.getPatternLoopAddresses(-1);
        {
            std::ostringstream oss;
@ -157,7 +161,8 @@ TEST_CASE("patloop", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+        det_type == defs::MYTHEN3) {
        for (int iLoop = 0; iLoop != MAX_PATTERN_LEVELS; ++iLoop) {
            // m3 only has 3 levels
            if (det_type == defs::MYTHEN3 && iLoop >= 3) {
@ -205,7 +210,8 @@ TEST_CASE("patnloop", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+        det_type == defs::MYTHEN3) {
        for (int iLoop = 0; iLoop != MAX_PATTERN_LEVELS; ++iLoop) {
            // m3 only has 3 levels
            if (det_type == defs::MYTHEN3 && iLoop >= 3) {
@ -250,7 +256,8 @@ TEST_CASE("patwait", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+        det_type == defs::MYTHEN3) {
        for (int iLoop = 0; iLoop != MAX_PATTERN_LEVELS; ++iLoop) {
            // m3 only has 3 levels
            if (det_type == defs::MYTHEN3 && iLoop >= 3) {
@ -295,7 +302,8 @@ TEST_CASE("patwaittime", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+        det_type == defs::MYTHEN3) {
        for (int iLoop = 0; iLoop != MAX_PATTERN_LEVELS; ++iLoop) {
            // m3 only has 3 levels
            if (det_type == defs::MYTHEN3 && iLoop >= 3) {
@ -340,7 +348,8 @@ TEST_CASE("patmask", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+        det_type == defs::MYTHEN3) {
        auto prev_val = det.getPatternMask();
        {
            std::ostringstream oss;
@ -365,7 +374,8 @@ TEST_CASE("patsetbit", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+        det_type == defs::MYTHEN3) {
        auto prev_val = det.getPatternBitMask();
        {
            std::ostringstream oss;
--- a/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp
@ -452,7 +452,7 @@ TEST_CASE("rx_roi", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH) {
        REQUIRE_THROWS(proxy.Call("rx_roi", {"5", "10"}, -1, PUT));
    } else {
        auto prev_val = det.getRxROI();
@ -514,7 +514,7 @@ TEST_CASE("rx_clearroi", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH) {
        REQUIRE_THROWS(proxy.Call("rx_clearroi", {}, -1, PUT));
    } else {
        auto prev_val = det.getRxROI();
@ -806,7 +806,7 @@ TEST_CASE("rx_zmqport", "[.cmd][.rx]") {
    auto det_type = det.getDetectorType().squash();
    if (det_type == defs::EIGER) {
        socketsperdetector *= 2;
-    } else if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+    } else if (det_type == defs::JUNGFRAU) {
        proxy.Call("numinterfaces", {"2"}, -1, PUT);
        socketsperdetector *= 2;
    }
@ -831,7 +831,7 @@ TEST_CASE("rx_zmqport", "[.cmd][.rx]") {
    for (int i = 0; i != det.size(); ++i) {
        det.setRxZmqPort(prev_val_zmqport[i], i);
    }
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+    if (det_type == defs::JUNGFRAU) {
        det.setNumberofUDPInterfaces(prev_val_numinterfaces);
    }
 }
@ -949,6 +949,8 @@ TEST_CASE("rx_dbitoffset", "[.cmd][.rx]") {
    }
 }

+/* Moench */
+
 TEST_CASE("rx_jsonaddheader", "[.cmd][.rx]") {
    Detector det;
    CmdProxy proxy(&det);
--- a/slsDetectorSoftware/tests/test-CmdProxy.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy.cpp
@ -116,8 +116,14 @@ TEST_CASE("detectorserverversion", "[.cmd]") {
 TEST_CASE("hardwareversion", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
-    REQUIRE_NOTHROW(proxy.Call("hardwareversion", {}, -1, GET));
-    REQUIRE_THROWS(proxy.Call("hardwareversion", {"0"}, -1, PUT));
+    auto det_type = det.getDetectorType().squash();
+    if (det_type != defs::EIGER) {
+        REQUIRE_NOTHROW(proxy.Call("hardwareversion", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("hardwareversion", {"0"}, -1, PUT));
+    } else {
+        REQUIRE_THROWS(proxy.Call("hardwareversion", {"0"}, -1, PUT));
+        REQUIRE_THROWS(proxy.Call("hardwareversion", {}, -1, GET));
+    }
 }

 TEST_CASE("kernelversion", "[.cmd]") {
@ -143,8 +149,7 @@ TEST_CASE("moduleid", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
    if (det_type == defs::GOTTHARD2 || det_type == defs::MYTHEN3 ||
-        det_type == defs::EIGER || det_type == defs::JUNGFRAU ||
-        det_type == defs::MOENCH) {
+        det_type == defs::EIGER || det_type == defs::JUNGFRAU) {
        REQUIRE_NOTHROW(proxy.Call("moduleid", {}, -1, GET));
    } else {
        REQUIRE_THROWS(proxy.Call("moduleid", {}, -1, GET));
@ -212,7 +217,6 @@ TEST_CASE("settings", "[.cmd]") {
    std::vector<std::string> sett;
    switch (det_type) {
    case defs::JUNGFRAU:
-    case defs::MOENCH:
        sett.push_back("gain0");
        sett.push_back("highgain0");
        break;
@ -228,6 +232,16 @@ TEST_CASE("settings", "[.cmd]") {
        sett.push_back("fixgain1");
        sett.push_back("fixgain2");
        break;
+    case defs::MOENCH:
+        sett.push_back("g1_hg");
+        sett.push_back("g1_lg");
+        sett.push_back("g2_hc_hg");
+        sett.push_back("g2_hc_lg");
+        sett.push_back("g2_lc_hg");
+        sett.push_back("g2_lc_lg");
+        sett.push_back("g4_hg");
+        sett.push_back("g4_lg");
+        break;
    case defs::MYTHEN3:
        sett.push_back("standard");
        sett.push_back("fast");
@ -511,9 +525,9 @@ TEST_CASE("gappixels", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    // test eiger(quad or full module only)
+    // test only for jungfrau and eiger(quad or full module only)
    bool gapPixelTest = false;
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH)
+    if (det_type == defs::JUNGFRAU)
        gapPixelTest = true;
    else if (det_type == defs::EIGER) {
        bool quad = det.getQuad().squash(false);
@ -560,17 +574,17 @@ TEST_CASE("fliprows", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    bool hw2 = false;
-    if ((det_type == defs::JUNGFRAU || det_type == defs::MOENCH) &&
+    bool jungfrauhw2 = false;
+    if (det_type == defs::JUNGFRAU &&
        ((det.getHardwareVersion().tsquash(
              "inconsistent serial number to test") == "2.0"))) {
-        hw2 = true;
+        jungfrauhw2 = true;
    }
-    if (det_type == defs::EIGER || hw2) {
+    if (det_type == defs::EIGER || jungfrauhw2) {
        auto previous = det.getFlipRows();
        auto previous_numudp = det.getNumberofUDPInterfaces().tsquash(
            "inconsistent number of udp interfaces to test");
-        if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+        if (det_type == defs::JUNGFRAU) {
            det.setNumberofUDPInterfaces(2);
        }
        std::ostringstream oss1, oss2, oss3;
@ -583,7 +597,7 @@ TEST_CASE("fliprows", "[.cmd]") {
        for (int i = 0; i != det.size(); ++i) {
            det.setFlipRows(previous[i], {i});
        }
-        if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+        if (det_type == defs::JUNGFRAU) {
            det.setNumberofUDPInterfaces(previous_numudp);
        }
    } else {
@ -597,10 +611,10 @@ TEST_CASE("master", "[.cmd]") {
    auto det_type = det.getDetectorType().squash();
    if (det_type == defs::EIGER || det_type == defs::MYTHEN3 ||
        det_type == defs::GOTTHARD || det_type == defs::GOTTHARD2 ||
-        det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+        det_type == defs::JUNGFRAU) {
        REQUIRE_NOTHROW(proxy.Call("master", {}, -1, GET));
        if (det_type == defs::EIGER || det_type == defs::GOTTHARD2 ||
-            det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+            det_type == defs::JUNGFRAU) {
            // get previous master
            int prevMaster = 0;
            {
@ -788,7 +802,7 @@ TEST_CASE("exptime", "[.cmd][.time]") {
        proxy.Call("exptime", {"1s"}, -1, PUT, oss);
        REQUIRE(oss.str() == "exptime 1s\n");
    }
-    if (det_type != defs::JUNGFRAU && det_type != defs::MOENCH) {
+    if (det_type != defs::JUNGFRAU) {
        {
            std::ostringstream oss;
            proxy.Call("exptime", {"0"}, -1, PUT, oss);
@ -894,6 +908,7 @@ TEST_CASE("delayl", "[.cmd]") {
    switch (det_type) {
    case defs::EIGER:
    case defs::CHIPTESTBOARD:
+    case defs::MOENCH:
    case defs::GOTTHARD2:
    case defs::MYTHEN3:
        REQUIRE_THROWS(proxy.Call("delayl", {}, -1, GET));
@ -911,6 +926,7 @@ TEST_CASE("periodl", "[.cmd]") {
    switch (det_type) {
    case defs::EIGER:
    case defs::CHIPTESTBOARD:
+    case defs::MOENCH:
    case defs::GOTTHARD2:
    case defs::MYTHEN3:
        REQUIRE_THROWS(proxy.Call("periodl", {}, -1, GET));
@ -1044,12 +1060,12 @@ TEST_CASE("readoutspeed", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
    if (det_type == defs::EIGER || det_type == defs::JUNGFRAU ||
-        det_type == defs::MOENCH || det_type == defs::GOTTHARD2) {
+        det_type == defs::GOTTHARD2) {
        auto prev_val = det.getReadoutSpeed();

-        // full speed for jungfrau/moench only works for new boards (chipv1.1 is
-        // with new board [hw1.0 and chipv1.0 not tested here])
-        if (((det_type == defs::JUNGFRAU || det_type == defs::MOENCH) &&
+        // full speed for jungfrau only works for new boards (chipv1.1 is with
+        // new board [hw1.0 and chipv1.0 not tested here])
+        if ((det_type == defs::JUNGFRAU &&
             det.getChipVersion().squash() * 10 == 11) ||
            (det_type == defs::EIGER)) {
            std::ostringstream oss1, oss2, oss3, oss4;
@ -1063,8 +1079,7 @@ TEST_CASE("readoutspeed", "[.cmd]") {
            REQUIRE(oss4.str() == "readoutspeed full_speed\n");
        }

-        if (det_type == defs::EIGER || det_type == defs::JUNGFRAU ||
-            det_type == defs::MOENCH) {
+        if (det_type == defs::EIGER || det_type == defs::JUNGFRAU) {
            {
                std::ostringstream oss1, oss2, oss3, oss4;
                proxy.Call("readoutspeed", {"1"}, -1, PUT, oss1);
@ -1130,7 +1145,7 @@ TEST_CASE("readoutspeedlist", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
    if (det_type == defs::GOTTHARD2 || det_type == defs::JUNGFRAU ||
-        det_type == defs::MOENCH || det_type == defs::EIGER) {
+        det_type == defs::EIGER) {
        REQUIRE_NOTHROW(proxy.Call("readoutspeedlist", {}, -1, GET));
        REQUIRE_THROWS(proxy.Call("readoutspeedlist", {}, -1, PUT));
    } else {
@ -1143,7 +1158,7 @@ TEST_CASE("adcphase", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
    if (det_type == defs::GOTTHARD || det_type == defs::JUNGFRAU ||
-        det_type == defs::MOENCH || det_type == defs::CHIPTESTBOARD) {
+        det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH) {
        if (det_type == defs::GOTTHARD) {
            std::ostringstream oss1;
            proxy.Call("adcphase", {"20"}, -1, PUT, oss1);
@ -1181,8 +1196,8 @@ TEST_CASE("maxadcphaseshift", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::CHIPTESTBOARD ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD ||
+        det_type == defs::MOENCH ||
        det_type == defs::MYTHEN3 ||   // only because clk index of 0 exists
        det_type == defs::GOTTHARD2) { // only because clk index of 0 exists
        REQUIRE_NOTHROW(proxy.Call("maxadcphaseshift", {}, -1, GET));
@ -1195,8 +1210,7 @@ TEST_CASE("dbitphase", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::CHIPTESTBOARD) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD) {
        auto prev_val = det.getDBITPhase();
        {
            std::ostringstream oss1, oss2;
@ -1225,8 +1239,7 @@ TEST_CASE("maxdbitphaseshift", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::CHIPTESTBOARD ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD ||
        det_type == defs::MYTHEN3 ||   // only because clk index of 0 exists
        det_type == defs::GOTTHARD2) { // only because clk index of 0 exists
        REQUIRE_NOTHROW(proxy.Call("maxdbitphaseshift", {}, -1, GET));
@ -1351,8 +1364,8 @@ TEST_CASE("highvoltage", "[.cmd]") {
        }
    }
    // range 0, 60 - 200
-    else if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-             det_type == defs::CHIPTESTBOARD) {
+    else if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD ||
+             det_type == defs::MOENCH) {
        REQUIRE_THROWS(proxy.Call("highvoltage", {"50"}, -1, PUT));
        {
            std::ostringstream oss1, oss2;
@ -1430,8 +1443,8 @@ TEST_CASE("powerchip", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::MYTHEN3 || det_type == defs::GOTTHARD2) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MYTHEN3 ||
+        det_type == defs::GOTTHARD2 || det_type == defs::MOENCH) {
        auto prev_val = det.getPowerChip();
        {
            std::ostringstream oss;
@ -1480,9 +1493,8 @@ TEST_CASE("imagetest", "[.cmd]") {
        for (int i = 0; i != det.size(); ++i) {
            det.setImageTestMode(prev_val[i], {i});
        }
-    } else if (det_type != defs::JUNGFRAU && det_type != defs::MOENCH &&
-               det_type != defs::EIGER) {
-        // wont fail for eiger and jungfrau/moench virtual servers
+    } else if (det_type != defs::JUNGFRAU && det_type != defs::EIGER) {
+        // wont fail for eiger and jungfrau virtual servers
        REQUIRE_THROWS(proxy.Call("imagetest", {}, -1, GET));
    }
 }
@ -1604,7 +1616,7 @@ TEST_CASE("filterresistor", "[.cmd]") {

    // only for chipv1.1
    bool chip11 = false;
-    if ((det_type == defs::JUNGFRAU || det_type == defs::MOENCH) &&
+    if (det_type == defs::JUNGFRAU &&
        det.getChipVersion().squash() * 10 == 11) {
        chip11 = true;
    }
@ -1695,15 +1707,14 @@ TEST_CASE("readnrows", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::EIGER || det_type == defs::JUNGFRAU ||
-        det_type == defs::MOENCH) {
-        bool hw2 = false;
-        if ((det_type == defs::JUNGFRAU || det_type == defs::MOENCH) &&
+    if (det_type == defs::EIGER || det_type == defs::JUNGFRAU) {
+        bool jungfrauhw2 = false;
+        if (det_type == defs::JUNGFRAU &&
            ((det.getHardwareVersion().tsquash(
                  "inconsistent hardware version number to test") == "2.0"))) {
-            hw2 = true;
+            jungfrauhw2 = true;
        }
-        if ((det_type == defs::JUNGFRAU || det_type == defs::MOENCH) && !hw2) {
+        if (det_type == defs::JUNGFRAU && !jungfrauhw2) {
            {
                std::ostringstream oss;
                proxy.Call("readnrows", {}, -1, GET, oss);
@ -1726,7 +1737,7 @@ TEST_CASE("readnrows", "[.cmd]") {
                proxy.Call("readnrows", {"16"}, -1, PUT, oss);
                REQUIRE(oss.str() == "readnrows 16\n");
            }
-            if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+            if (det_type == defs::JUNGFRAU) {
                REQUIRE_THROWS(proxy.Call("readnrows", {"7"}, -1, PUT));
                REQUIRE_THROWS(proxy.Call("readnrows", {"20"}, -1, PUT));
                REQUIRE_THROWS(proxy.Call("readnrows", {"44"}, -1, PUT));
@ -1748,8 +1759,7 @@ TEST_CASE("currentsource", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::GOTTHARD2 || det_type == defs::JUNGFRAU ||
-        det_type == defs::MOENCH) {
+    if (det_type == defs::GOTTHARD2 || det_type == defs::JUNGFRAU) {
        auto prev_val = det.getCurrentSource();

        if (det_type == defs::GOTTHARD2) {
@ -1773,7 +1783,7 @@ TEST_CASE("currentsource", "[.cmd]") {
            REQUIRE_THROWS(proxy.Call("currentsource",
                                      {"1", "fix", "42", "normal"}, -1, PUT));
        }
-        // jungfrau/moench
+        // jungfrau
        else {
            int chipVersion = det.getChipVersion().tsquash(
                                  "inconsistent chip versions to test") *
@ -1901,8 +1911,7 @@ TEST_CASE("temp_adc", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::GOTTHARD) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::GOTTHARD) {
        REQUIRE_NOTHROW(proxy.Call("temp_adc", {}, -1, GET));
        std::ostringstream oss;
        REQUIRE_NOTHROW(proxy.Call("temp_adc", {}, 0, GET, oss));
@ -1917,7 +1926,7 @@ TEST_CASE("temp_fpga", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type != defs::CHIPTESTBOARD) {
+    if (det_type != defs::MOENCH && det_type != defs::CHIPTESTBOARD) {
        REQUIRE_NOTHROW(proxy.Call("temp_fpga", {}, -1, GET));
        std::ostringstream oss;
        REQUIRE_NOTHROW(proxy.Call("temp_fpga", {}, 0, GET, oss));
@ -1974,7 +1983,7 @@ TEST_CASE("defaultdac", "[.cmd]") {
                det.setDefaultDac(it, prev_val[i], {i});
            }
        }
-        if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+        if (det_type == defs::JUNGFRAU) {
            std::vector<defs::dacIndex> daclist = {
                defs::VREF_PRECH, defs::VREF_DS, defs::VREF_COMP};
            for (auto it : daclist) {
@ -2014,7 +2023,7 @@ TEST_CASE("resetdacs", "[.cmd]") {
        REQUIRE_NOTHROW(proxy.Call("resetdacs", {}, -1, PUT));
        REQUIRE_NOTHROW(proxy.Call("resetdacs", {"hard"}, -1, PUT));

-        // settings should not change especially for jungfrau/moench and m3
+        // settings should not change especially for jungfrau and m3
        auto next_val = det.getSettings();
        for (int i = 0; i != det.size(); ++i) {
            REQUIRE(prev_val[i] == next_val[i]);
@ -2034,8 +2043,7 @@ TEST_CASE("trigger", "[.cmd]") {
    auto det_type = det.getDetectorType().squash();
    if (det_type == defs::MYTHEN3) {
        REQUIRE_NOTHROW(proxy.Call("trigger", {}, -1, PUT));
-    } else if (det_type == defs::EIGER || det_type == defs::JUNGFRAU ||
-               det_type == defs::MOENCH) {
+    } else if (det_type == defs::EIGER || det_type == defs::JUNGFRAU) {
        auto prev_timing =
            det.getTimingMode().tsquash("inconsistent timing mode in test");
        auto prev_frames =
@ -2075,8 +2083,7 @@ TEST_CASE("blockingtrigger", "[.cmd]") {
    CmdProxy proxy(&det);
    REQUIRE_THROWS(proxy.Call("blockingtrigger", {}, -1, GET));
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::EIGER || det_type == defs::JUNGFRAU ||
-        det_type == defs::MOENCH) {
+    if (det_type == defs::EIGER || det_type == defs::JUNGFRAU) {
        auto prev_timing =
            det.getTimingMode().tsquash("inconsistent timing mode in test");
        auto prev_frames =
@ -2327,7 +2334,6 @@ TEST_CASE("scan", "[.cmd]") {
        notImplementedInd = defs::VCASCP_PB;
        break;
    case defs::JUNGFRAU:
-    case defs::MOENCH:
        ind = defs::VB_COMP;
        notImplementedInd = defs::VSVP;
        break;
@ -2335,6 +2341,10 @@ TEST_CASE("scan", "[.cmd]") {
        ind = defs::VREF_DS;
        notImplementedInd = defs::VSVP;
        break;
+    case defs::MOENCH:
+        ind = defs::VBP_COLBUF;
+        notImplementedInd = defs::VSVP;
+        break;
    case defs::GOTTHARD2:
        ind = defs::VB_COMP_FE;
        notImplementedInd = defs::VSVP;
@ -2450,7 +2460,7 @@ TEST_CASE("numinterfaces", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+    if (det_type == defs::JUNGFRAU) {
        auto prev_val = det.getNumberofUDPInterfaces().tsquash(
            "inconsistent numinterfaces to test");
        {
@ -2505,9 +2515,8 @@ TEST_CASE("udp_dstlist", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::EIGER || det_type == defs::MYTHEN3 ||
-        det_type == defs::GOTTHARD2) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::EIGER ||
+        det_type == defs::MYTHEN3 || det_type == defs::GOTTHARD2) {
        REQUIRE_NOTHROW(proxy.Call("udp_dstlist", {}, 0, GET, std::cout, 0));
        REQUIRE_THROWS(proxy.Call(
            "udp_dstlist", {"ip=0.0.0.0", "mac=00:00:00:00:00:00", "port=1233"},
@ -2521,9 +2530,8 @@ TEST_CASE("udp_numdst", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::EIGER || det_type == defs::MYTHEN3 ||
-        det_type == defs::GOTTHARD2) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::EIGER ||
+        det_type == defs::MYTHEN3 || det_type == defs::GOTTHARD2) {
        REQUIRE_NOTHROW(proxy.Call("udp_numdst", {}, -1, GET));
    } else {
        REQUIRE_THROWS(proxy.Call("udp_numdst", {}, -1, GET));
@ -2542,8 +2550,8 @@ TEST_CASE("udp_firstdst", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::MYTHEN3 || det_type == defs::GOTTHARD2) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MYTHEN3 ||
+        det_type == defs::GOTTHARD2) {
        auto prev_val = det.getFirstUDPDestination();
        {
            std::ostringstream oss;
@ -2619,8 +2627,7 @@ TEST_CASE("udp_srcip2", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::GOTTHARD2) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::GOTTHARD2) {
        auto prev_val = det.getSourceUDPIP2();
        REQUIRE_THROWS(proxy.Call("udp_srcip2", {"0.0.0.0"}, -1, PUT));
        {
@ -2641,8 +2648,7 @@ TEST_CASE("udp_dstip2", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::GOTTHARD2) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::GOTTHARD2) {
        REQUIRE_THROWS(proxy.Call("udp_dstip2", {"0.0.0.0"}, -1, PUT));
    } else {
        REQUIRE_THROWS(proxy.Call("udp_dstip2", {}, -1, GET));
@ -2653,8 +2659,7 @@ TEST_CASE("udp_srcmac2", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::GOTTHARD2) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::GOTTHARD2) {
        auto prev_val = det.getSourceUDPMAC2();
        REQUIRE_THROWS(
            proxy.Call("udp_srcmac2", {"00:00:00:00:00:00"}, -1, PUT));
@ -2677,8 +2682,7 @@ TEST_CASE("udp_dstmac2", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::GOTTHARD2) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::GOTTHARD2) {
        REQUIRE_THROWS(
            proxy.Call("udp_dstmac2", {"00:00:00:00:00:00"}, -1, PUT));
    } else {
@ -2690,8 +2694,8 @@ TEST_CASE("udp_dstport2", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::GOTTHARD2 || det_type == defs::EIGER) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::GOTTHARD2 ||
+        det_type == defs::EIGER) {
        auto prev_val = det.getDestinationUDPPort2();
        {
            std::ostringstream oss;
@ -2726,7 +2730,7 @@ TEST_CASE("tengiga", "[.cmd]") {

    auto det_type = det.getDetectorType().squash();
    if (det_type == defs::EIGER || det_type == defs::CHIPTESTBOARD ||
-        det_type == defs::MYTHEN3) {
+        det_type == defs::MOENCH || det_type == defs::MYTHEN3) {
        auto tengiga = det.getTenGiga();
        det.setTenGiga(false);

@ -2749,8 +2753,7 @@ TEST_CASE("flowcontrol10g", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::EIGER || det_type == defs::JUNGFRAU ||
-        det_type == defs::MOENCH) {
+    if (det_type == defs::EIGER || det_type == defs::JUNGFRAU) {
        auto prev_val = det.getTenGigaFlowControl();
        {
            std::ostringstream oss;
@ -2780,11 +2783,10 @@ TEST_CASE("txdelay_frame", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
    if (det_type == defs::EIGER || det_type == defs::JUNGFRAU ||
-        det_type == defs::MOENCH || det_type == defs::MYTHEN3) {
+        det_type == defs::MYTHEN3) {
        auto prev_val = det.getTransmissionDelayFrame();
        auto val = 5000;
-        if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-            det_type == defs::MYTHEN3) {
+        if (det_type == defs::JUNGFRAU || det_type == defs::MYTHEN3) {
            val = 5;
        }
        std::string sval = std::to_string(val);
@ -2808,11 +2810,10 @@ TEST_CASE("txdelay", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
    if (det_type == defs::EIGER || det_type == defs::JUNGFRAU ||
-        det_type == defs::MOENCH || det_type == defs::MYTHEN3) {
+        det_type == defs::MYTHEN3) {

        // cannot get transmission delay with just one module
-        if ((det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-             det_type == defs::MYTHEN3) &&
+        if ((det_type == defs::JUNGFRAU || det_type == defs::MYTHEN3) &&
            (det.size() < 2)) {
            REQUIRE_THROWS(proxy.Call("txdelay", {}, -1, GET));
            int val = 5;
@ -2834,8 +2835,7 @@ TEST_CASE("txdelay", "[.cmd]") {
            }
            auto prev_frame = det.getTransmissionDelayFrame();
            auto val = 5000;
-            if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-                det_type == defs::MYTHEN3) {
+            if (det_type == defs::JUNGFRAU || det_type == defs::MYTHEN3) {
                val = 5;
            }
            std::string sval = std::to_string(val);
@ -2888,7 +2888,7 @@ TEST_CASE("zmqport", "[.cmd]") {
    int prev = 1;
    if (det_type == defs::EIGER) {
        socketsperdetector *= 2;
-    } else if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+    } else if (det_type == defs::JUNGFRAU) {
        prev = det.getNumberofUDPInterfaces().squash();
        det.setNumberofUDPInterfaces(2);
        socketsperdetector *= 2;
@ -2922,7 +2922,7 @@ TEST_CASE("zmqport", "[.cmd]") {
                                 std::to_string(port + i * socketsperdetector) +
                                 '\n');
    }
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
+    if (det_type == defs::JUNGFRAU) {
        det.setNumberofUDPInterfaces(prev);
    }
 }
@ -2976,8 +2976,8 @@ TEST_CASE("programfpga", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::JUNGFRAU ||
-        det_type == defs::MOENCH || det_type == defs::MYTHEN3 ||
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+        det_type == defs::JUNGFRAU || det_type == defs::MYTHEN3 ||
        det_type == defs::GOTTHARD2) {
        // TODO program a real board?
        /// afs/psi.ch/project/sls_det_firmware/jungfrau_firmware/cyclone_V/v0_8/Jungfrau_MCB.pof
@ -3008,8 +3008,8 @@ TEST_CASE("updatekernel", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3 ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD ||
+        det_type == defs::MOENCH || det_type == defs::MYTHEN3 ||
        det_type == defs::GOTTHARD2) {
        // TODO: send real server?
        // std::ostringstream oss;
@ -3027,8 +3027,8 @@ TEST_CASE("rebootcontroller", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3 ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD ||
+        det_type == defs::MOENCH || det_type == defs::MYTHEN3 ||
        det_type == defs::GOTTHARD2 || det_type == defs::GOTTHARD) {
        // TODO: reboot real server?
        // REQUIRE_NOTHROW(proxy.Call("rebootcontroller", {}, -1, PUT));
@ -3043,8 +3043,8 @@ TEST_CASE("update", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::CHIPTESTBOARD) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD ||
+        det_type == defs::MOENCH) {
        // TODO: update real server and firmware?
        // REQUIRE_NOTHROW(proxy.Call("update",
        // {"jungfrauDetectorServerv4.0.1.0", "pc13784",
@ -3087,8 +3087,8 @@ TEST_CASE("adcreg", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::CHIPTESTBOARD || det_type == defs::GOTTHARD) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD ||
+        det_type == defs::MOENCH || det_type == defs::GOTTHARD) {
        std::ostringstream oss;
        proxy.Call("adcreg", {"0x8", "0x3"}, -1, PUT, oss);
        REQUIRE(oss.str() == "adcreg [0x8, 0x3]\n");
@ -3172,8 +3172,8 @@ TEST_CASE("firmwaretest", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::CHIPTESTBOARD || det_type == defs::GOTTHARD ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD ||
+        det_type == defs::MOENCH || det_type == defs::GOTTHARD ||
        det_type == defs::MYTHEN3 || det_type == defs::GOTTHARD2) {
        std::ostringstream oss;
        proxy.Call("firmwaretest", {}, -1, PUT, oss);
@ -3189,8 +3189,8 @@ TEST_CASE("bustest", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::CHIPTESTBOARD || det_type == defs::GOTTHARD ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD ||
+        det_type == defs::MOENCH || det_type == defs::GOTTHARD ||
        det_type == defs::MYTHEN3 || det_type == defs::GOTTHARD2) {
        std::ostringstream oss;
        proxy.Call("bustest", {}, -1, PUT, oss);
@ -3229,8 +3229,8 @@ TEST_CASE("adcinvert", "[.cmd]") {
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();

-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::JUNGFRAU ||
-        det_type == defs::MOENCH) {
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+        det_type == defs::JUNGFRAU) {
        auto prev_val = det.getADCInvert();
        {
            std::ostringstream oss;
@ -3320,8 +3320,8 @@ TEST_CASE("framecounter", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3 ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD ||
+        det_type == defs::MOENCH || det_type == defs::MYTHEN3 ||
        det_type == defs::GOTTHARD2) {
        auto framecounter = det.getNumberOfFramesFromStart().squash();
        std::ostringstream oss;
@ -3339,8 +3339,8 @@ TEST_CASE("runtime", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3 ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD ||
+        det_type == defs::MOENCH || det_type == defs::MYTHEN3 ||
        det_type == defs::GOTTHARD2) {
        std::ostringstream oss;
        proxy.Call("runtime", {}, -1, GET, oss);
@ -3357,8 +3357,8 @@ TEST_CASE("frametime", "[.cmd]") {
    Detector det;
    CmdProxy proxy(&det);
    auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3 ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD ||
+        det_type == defs::MOENCH || det_type == defs::MYTHEN3 ||
        det_type == defs::GOTTHARD2) {
        std::ostringstream oss;
        proxy.Call("frametime", {}, -1, GET, oss);
--- a/slsReceiverSoftware/src/ClientInterface.cpp
+++ b/slsReceiverSoftware/src/ClientInterface.cpp
@ -349,10 +349,9 @@ int ClientInterface::setup_receiver(Interface &socket) {
                retvals[1] = r;
            }
        }
-
        impl()->setUDPPortNumber(arg.udp_dstport);
        impl()->setUDPPortNumber2(arg.udp_dstport2);
-        if (detType == JUNGFRAU || detType == MOENCH || detType == GOTTHARD2) {
+        if (detType == JUNGFRAU || detType == GOTTHARD2) {
            impl()->setNumberofUDPInterfaces(arg.udpInterfaces);
        }
        impl()->setUDPSocketBufferSize(0);
@ -367,8 +366,7 @@ int ClientInterface::setup_receiver(Interface &socket) {
            impl()->setNumberOfAdditionalStorageCells(
                arg.additionalStorageCells);
        }
-
-        if (detType == CHIPTESTBOARD) {
+        if (detType == MOENCH || detType == CHIPTESTBOARD) {
            impl()->setNumberofAnalogSamples(arg.analogSamples);
        }
        if (detType == CHIPTESTBOARD) {
@ -388,7 +386,7 @@ int ClientInterface::setup_receiver(Interface &socket) {
            impl()->setQuad(arg.quad == 0 ? false : true);
            impl()->setThresholdEnergy(arg.thresholdEnergyeV[0]);
        }
-        if (detType == EIGER || detType == JUNGFRAU || detType == MOENCH) {
+        if (detType == EIGER || detType == JUNGFRAU) {
            impl()->setReadNRows(arg.readNRows);
        }
        if (detType == MYTHEN3) {
@ -402,12 +400,14 @@ int ClientInterface::setup_receiver(Interface &socket) {
            impl()->setDynamicRange(arg.dynamicRange);
        }
        impl()->setTimingMode(arg.timMode);
-        if (detType == EIGER || detType == CHIPTESTBOARD ||
+        if (detType == EIGER || detType == MOENCH || detType == CHIPTESTBOARD ||
            detType == MYTHEN3) {
            impl()->setTenGigaEnable(arg.tenGiga);
        }
        if (detType == CHIPTESTBOARD) {
            impl()->setReadoutMode(arg.roMode);
+        }
+        if (detType == CHIPTESTBOARD || detType == MOENCH) {
            impl()->setADCEnableMask(arg.adcMask);
            impl()->setTenGigaADCEnableMask(arg.adc10gMask);
        }
@ -444,8 +444,8 @@ void ClientInterface::setDetectorType(detectorType arg) {
    case GOTTHARD:
    case EIGER:
    case CHIPTESTBOARD:
-    case JUNGFRAU:
    case MOENCH:
+    case JUNGFRAU:
    case MYTHEN3:
    case GOTTHARD2:
        break;
@ -564,7 +564,7 @@ int ClientInterface::set_burst_mode(Interface &socket) {
 int ClientInterface::set_num_analog_samples(Interface &socket) {
    auto value = socket.Receive<int>();
    LOG(logDEBUG1) << "Setting num analog samples to " << value;
-    if (detType != CHIPTESTBOARD) {
+    if (detType != CHIPTESTBOARD && detType != MOENCH) {
        functionNotImplemented();
    }
    try {
@ -912,7 +912,8 @@ int ClientInterface::get_overwrite(Interface &socket) {

 int ClientInterface::enable_tengiga(Interface &socket) {
    auto val = socket.Receive<int>();
-    if (detType != EIGER && detType != CHIPTESTBOARD && detType != MYTHEN3)
+    if (detType != EIGER && detType != CHIPTESTBOARD && detType != MOENCH &&
+        detType != MYTHEN3)
        functionNotImplemented();

    if (val >= 0) {
@ -1352,7 +1353,7 @@ int ClientInterface::set_read_n_rows(Interface &socket) {
    auto arg = socket.Receive<int>();
    if (arg >= 0) {
        verifyIdle(socket);
-        if (detType != EIGER && detType != JUNGFRAU && detType != MOENCH) {
+        if (detType != EIGER && detType != JUNGFRAU) {
            throw RuntimeError("Could not set number of rows. Not implemented "
                               "for this detector");
        }
@ -1435,7 +1436,7 @@ MacAddr ClientInterface::setUdpIp2(IpAddr arg) {
 int ClientInterface::set_udp_ip2(Interface &socket) {
    auto arg = socket.Receive<IpAddr>();
    verifyIdle(socket);
-    if (detType != JUNGFRAU && detType != MOENCH && detType != GOTTHARD2) {
+    if (detType != JUNGFRAU && detType != GOTTHARD2) {
        throw RuntimeError(
            "UDP Destination IP2 not implemented for this detector");
    }
@ -1454,8 +1455,7 @@ int ClientInterface::set_udp_port(Interface &socket) {
 int ClientInterface::set_udp_port2(Interface &socket) {
    auto arg = socket.Receive<int>();
    verifyIdle(socket);
-    if (detType != JUNGFRAU && detType != MOENCH && detType != EIGER &&
-        detType != GOTTHARD2) {
+    if (detType != JUNGFRAU && detType != EIGER && detType != GOTTHARD2) {
        throw RuntimeError(
            "UDP Destination Port2 not implemented for this detector");
    }
@ -1468,7 +1468,7 @@ int ClientInterface::set_num_interfaces(Interface &socket) {
    auto arg = socket.Receive<int>();
    arg = (arg > 1 ? 2 : 1);
    verifyIdle(socket);
-    if (detType != JUNGFRAU && detType != MOENCH && detType != GOTTHARD2) {
+    if (detType != JUNGFRAU && detType != GOTTHARD2) {
        throw RuntimeError(
            "Number of interfaces not implemented for this detector");
    }
@ -1728,7 +1728,7 @@ int ClientInterface::get_receiver_roi(Interface &socket) {

 int ClientInterface::set_receiver_roi(Interface &socket) {
    auto arg = socket.Receive<ROI>();
-    if (detType == CHIPTESTBOARD)
+    if (detType == CHIPTESTBOARD || detType == MOENCH)
        functionNotImplemented();
    LOG(logDEBUG1) << "Set Receiver ROI: " << ToString(arg);
    verifyIdle(socket);
@ -1744,7 +1744,7 @@ int ClientInterface::set_receiver_roi(Interface &socket) {

 int ClientInterface::set_receiver_roi_metadata(Interface &socket) {
    auto arg = socket.Receive<ROI>();
-    if (detType == CHIPTESTBOARD)
+    if (detType == CHIPTESTBOARD || detType == MOENCH)
        functionNotImplemented();
    LOG(logDEBUG1) << "Set Receiver ROI Metadata: " << ToString(arg);
    verifyIdle(socket);
--- a/slsReceiverSoftware/src/DataProcessor.cpp
+++ b/slsReceiverSoftware/src/DataProcessor.cpp
@ -480,6 +480,7 @@ void DataProcessor::PadMissingPackets(sls_receiver_header header, char *data) {
                memset(data + (pnum * dsize), 0xFF, dsize + 2);
            break;
        case CHIPTESTBOARD:
+        case MOENCH:
            if (pnum == (pperFrame - 1))
                memset(data + (pnum * dsize), 0xFF, corrected_dsize);
            else
--- a/slsReceiverSoftware/src/DataStreamer.cpp
+++ b/slsReceiverSoftware/src/DataStreamer.cpp
@ -56,6 +56,8 @@ void DataStreamer::SetAdditionalJsonHeader(
    isAdditionalJsonUpdated = true;
 }

+void DataStreamer::SetReceiverROI(ROI roi) { receiverRoi = roi; }
+
 void DataStreamer::ResetParametersforNewAcquisition(const std::string &fname) {
    StopRunning();
    startedFlag = false;
@ -249,6 +251,7 @@ int DataStreamer::SendDataHeader(sls_detector_header header, uint32_t size,
        isAdditionalJsonUpdated = false;
    }
    zHeader.addJsonHeader = localAdditionalJsonHeader;
+    zHeader.rx_roi = receiverRoi.getIntArray();

    return zmqSocket->SendHeader(index, zHeader);
 }
--- a/slsReceiverSoftware/src/DataStreamer.h
+++ b/slsReceiverSoftware/src/DataStreamer.h
@ -38,6 +38,7 @@ class DataStreamer : private virtual slsDetectorDefs, public ThreadObject {
    void SetNumberofTotalFrames(uint64_t value);
    void
    SetAdditionalJsonHeader(const std::map<std::string, std::string> &json);
+    void SetReceiverROI(ROI roi);

    void ResetParametersforNewAcquisition(const std::string &fname);
    /**
@ -92,6 +93,7 @@ class DataStreamer : private virtual slsDetectorDefs, public ThreadObject {
    uint64_t fileIndex{0};
    bool flipRows{false};
    std::map<std::string, std::string> additionalJsonHeader;
+    ROI receiverRoi{};

    /** Used by streamer thread to update local copy (reduce number of locks
     * during streaming) */
--- a/slsReceiverSoftware/src/GeneralData.h
+++ b/slsReceiverSoftware/src/GeneralData.h
@ -352,36 +352,6 @@ class JungfrauData : public GeneralData {
    };
 };

-class MoenchData : public GeneralData {
-
-  public:
-    MoenchData() {
-        detType = slsDetectorDefs::MOENCH;
-        headerSizeinPacket = sizeof(slsDetectorDefs::sls_detector_header);
-        dataSize = 6400;
-        packetSize = headerSizeinPacket + dataSize;
-        framesPerFile = MOENCH_MAX_FRAMES_PER_FILE;
-        fifoDepth = 1000;
-        standardheader = true;
-        maxRowsPerReadout = 400;
-        UpdateImageSize();
-    };
-
-    void SetNumberofInterfaces(const int n) {
-        numUDPInterfaces = n;
-        UpdateImageSize();
-    };
-
-  private:
-    void UpdateImageSize() {
-        nPixelsX = (400);
-        nPixelsY = (400) / numUDPInterfaces;
-        imageSize = int(nPixelsX * nPixelsY * GetPixelDepth());
-        packetsPerFrame = imageSize / dataSize;
-        udpSocketBufferSize = (1000 * 1024 * 1024) / numUDPInterfaces;
-    };
-};
-
 class Mythen3Data : public GeneralData {
  private:
    int ncounters{0};
@ -595,4 +565,68 @@ class ChipTestBoardData : public GeneralData {
    };
 };

+class MoenchData : public GeneralData {
+
+  private:
+    const int NUM_BYTES_PER_ANALOG_CHANNEL = 2;
+
+  public:
+    MoenchData() {
+        detType = slsDetectorDefs::MOENCH;
+        headerSizeinPacket = sizeof(slsDetectorDefs::sls_detector_header);
+        frameIndexMask = 0xFFFFFF;
+        framesPerFile = MOENCH_MAX_FRAMES_PER_FILE;
+        fifoDepth = 2500;
+        standardheader = true;
+        UpdateImageSize();
+    };
+
+    void SetNumberOfAnalogSamples(int n) {
+        nAnalogSamples = n;
+        UpdateImageSize();
+    };
+
+    void SetOneGigaAdcEnableMask(int n) {
+        adcEnableMaskOneGiga = n;
+        UpdateImageSize();
+    };
+
+    void SetTenGigaAdcEnableMask(int n) {
+        adcEnableMaskTenGiga = n;
+        UpdateImageSize();
+    };
+
+    void SetTenGigaEnable(bool tg) {
+        tengigaEnable = tg;
+        UpdateImageSize();
+    };
+
+  private:
+    void UpdateImageSize() {
+        uint32_t adcEnableMask =
+            (tengigaEnable ? adcEnableMaskTenGiga : adcEnableMaskOneGiga);
+
+        // count number of channels in x, each adc has 25 channels each
+        int nchanTop = __builtin_popcount(adcEnableMask & 0xF0F0F0F0) * 25;
+        int nchanBot = __builtin_popcount(adcEnableMask & 0x0F0F0F0F) * 25;
+        nPixelsX = nchanTop > 0 ? nchanTop : nchanBot;
+
+        // if both top and bottom adcs enabled, rows = 2
+        int nrows = 1;
+        if (nchanTop > 0 && nchanBot > 0) {
+            nrows = 2;
+        }
+        nPixelsY = nAnalogSamples / 25 * nrows;
+        LOG(logINFO) << "Number of Pixels: [" << nPixelsX << ", " << nPixelsY
+                     << "]";
+
+        dataSize = tengigaEnable ? 8144 : UDP_PACKET_DATA_BYTES;
+        packetSize = headerSizeinPacket + dataSize;
+        imageSize = nPixelsX * nPixelsY * NUM_BYTES_PER_ANALOG_CHANNEL;
+        packetsPerFrame = ceil((double)imageSize / (double)dataSize);
+
+        LOG(logDEBUG) << "Databytes: " << imageSize;
+    };
+};
+
 } // namespace sls
--- a/slsReceiverSoftware/src/Implementation.cpp
+++ b/slsReceiverSoftware/src/Implementation.cpp
@ -114,8 +114,8 @@ void Implementation::setDetectorType(const detectorType d) {
    case GOTTHARD:
    case EIGER:
    case JUNGFRAU:
-    case MOENCH:
    case CHIPTESTBOARD:
+    case MOENCH:
    case MYTHEN3:
    case GOTTHARD2:
        LOG(logINFO) << " ***** " << ToString(d) << " Receiver *****";
@ -139,12 +139,12 @@ void Implementation::setDetectorType(const detectorType d) {
    case JUNGFRAU:
        generalData = new JungfrauData();
        break;
-    case MOENCH:
-        generalData = new MoenchData();
-        break;
    case CHIPTESTBOARD:
        generalData = new ChipTestBoardData();
        break;
+    case MOENCH:
+        generalData = new MoenchData();
+        break;
    case MYTHEN3:
        generalData = new Mythen3Data();
        break;
@ -216,6 +216,8 @@ void Implementation::SetupDataStreamer(int i) {
    dataStreamer[i]->SetNumberofPorts(numPorts);
    dataStreamer[i]->SetQuadEnable(quadEnable);
    dataStreamer[i]->SetNumberofTotalFrames(numberOfTotalFrames);
+    dataStreamer[i]->SetReceiverROI(
+        portRois[i].completeRoi() ? GetMaxROIPerPort() : portRois[i]);
 }

 slsDetectorDefs::xy Implementation::getDetectorSize() const {
@ -226,11 +228,16 @@ const slsDetectorDefs::xy Implementation::GetPortGeometry() const {
    xy portGeometry{1, 1};
    if (generalData->detType == EIGER)
        portGeometry.x = generalData->numUDPInterfaces;
-    else if (generalData->detType == JUNGFRAU || generalData->detType == MOENCH)
+    else if (generalData->detType == JUNGFRAU)
        portGeometry.y = generalData->numUDPInterfaces;
    return portGeometry;
 }

+const slsDetectorDefs::ROI Implementation::GetMaxROIPerPort() const {
+    return slsDetectorDefs::ROI{0, (int)generalData->nPixelsX - 1, 0,
+                                (int)generalData->nPixelsY - 1};
+}
+
 void Implementation::setDetectorSize(const slsDetectorDefs::xy size) {
    xy portGeometry = GetPortGeometry();

@ -415,7 +422,7 @@ void Implementation::setReceiverROI(const slsDetectorDefs::ROI arg) {
                        portFullRoi.xmin += nPortDim.x;
                        portFullRoi.xmax += nPortDim.x;
                    }
-                    // top bottom (jungfrau or moench)
+                    // top bottom (jungfrau)
                    else {
                        portFullRoi.ymin += nPortDim.y;
                        portFullRoi.ymax += nPortDim.y;
@ -458,6 +465,10 @@ void Implementation::setReceiverROI(const slsDetectorDefs::ROI arg) {
        listener[i]->SetNoRoi(portRois[i].noRoi());
    for (size_t i = 0; i != dataProcessor.size(); ++i)
        dataProcessor[i]->SetReceiverROI(portRois[i]);
+    for (size_t i = 0; i != dataStreamer.size(); ++i) {
+        dataStreamer[i]->SetReceiverROI(
+            portRois[i].completeRoi() ? GetMaxROIPerPort() : portRois[i]);
+    }
    LOG(logINFO) << "receiver roi: " << ToString(receiverRoi);
    if (generalData->numUDPInterfaces == 2 &&
        generalData->detType != slsDetectorDefs::GOTTHARD2) {
@ -1132,7 +1143,7 @@ int Implementation::getUDPSocketBufferSize() const {

 void Implementation::setUDPSocketBufferSize(const int s) {
    size_t listSize = listener.size();
-    if ((generalData->detType == JUNGFRAU || generalData->detType == MOENCH ||
+    if ((generalData->detType == JUNGFRAU ||
         generalData->detType == GOTTHARD2) &&
        (int)listSize != generalData->numUDPInterfaces) {
        throw RuntimeError("Number of Interfaces " +
--- a/slsReceiverSoftware/src/Implementation.h
+++ b/slsReceiverSoftware/src/Implementation.h
@ -282,6 +282,7 @@ class Implementation : private virtual slsDetectorDefs {
    void SetupFifoStructure();

    const xy GetPortGeometry() const;
+    const ROI GetMaxROIPerPort() const;
    void ResetParametersforNewAcquisition();
    void CreateUDPSockets();
    void SetupWriter();
--- a/slsReceiverSoftware/src/Listener.cpp
+++ b/slsReceiverSoftware/src/Listener.cpp
@ -471,6 +471,7 @@ void Listener::CopyPacket(char *dst, char *src, uint32_t dataSize,
            memcpy(dst + dataSize - 2, &src[detHeaderSize], dataSize + 2);
        break;
    case CHIPTESTBOARD:
+    case MOENCH:
        if (pnum == (generalData->packetsPerFrame - 1))
            memcpy(dst + (pnum * dataSize), &src[detHeaderSize],
                   correctedDataSize);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dhanya Thattil	f761046bfc	updated docs and versions	2023-07-12 16:50:13 +02:00
Dhanya Thattil	1a859b83db	formatting	2023-07-12 16:06:31 +02:00
Dhanya Thattil	70bfc875a6	updating release notes	2023-07-11 17:02:27 +02:00
Dhanya Thattil	c0755308a4	updating release notes	2023-07-11 17:01:14 +02:00
Dhanya Thattil	ab5509e10c	updating release notes	2023-07-11 17:00:42 +02:00
Dhanya Thattil	004cb26646	updated firmware versions for 7.0.2	2023-07-10 12:21:19 +02:00
Dhanya Thattil	a4f47a5945	synced master status running when setting to slave (#747 ) * jf: unsync before setting master/slave and then sync (if it was set) to overcome master going into running state when making it a slave and synced * add tests for this condition * updated release notes, updated min fw version requirement for v1.0 boards	2023-05-25 11:04:05 +02:00
Dhanya Thattil	312f3f473d	fix that only master starts second and not all (for start acq), typo with pos and masters list (#743 )	2023-05-11 10:20:17 +02:00
Dhanya Thattil	5871086cd6	formatting	2023-05-08 17:04:04 +02:00
Dhanya Thattil	6a0fe823b3	enable fix g0 when in expert mode (when gain mode enabled and not just visible) (#736 )	2023-05-08 14:20:21 +02:00
Dhanya Thattil	5912aae53e	Rx roi zmq (#726 ) adding rx_roi also in the zmq header for external guis to put the "yellow box".. sending full roi instead of -1, and sending for each zmq port. "(multiple yellow boxes)".	2023-05-08 12:23:05 +02:00
Dhanya Thattil	8833ccf5cc	7.0.2.rc (#721 ) * row and column for jungfrau mixed up * multi module jungfrau sync must do slaves first then master for start acquisition and send software trigger, and master first and then slaves for stopacquisition * non blocking to slaves first and only then blocking/nonblocking to the master for sending software trigger(jungfrau multi mod sync) * fixed get/set timing jungfrau when sync enabled, getsync during blocking acquire (for trigger or stop) will get stuck as it should ask the stop server * switching between 1 and 2 interfaces did not set gui/client zmq port properly. Resulted in dummy streaming forever. fixed * formatting, refactoring: const & for positions, multi mod M3 stop first master first * adding missing cstdint for gcc 13 * Refactoring handle sync out, handling synchronization also for softwaretrigger for m3, for start/sync/stop for g2/g1 --------- Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>	2023-05-08 12:11:19 +02:00
Dhanya Thattil	77c558a7be	formatting	2023-03-24 12:54:55 +01:00
Dhanya Thattil	378fc301b8	updating client version, release version and project_version in CMakeLists.txt	2023-03-23 15:43:17 +01:00
Dhanya Thattil	87d6e16090	7.0.1 fix det server version (#702 ) * check server version before initial checks, catch old server version exception, get old server version as 64 bit and print it along with exception	2023-03-23 15:37:01 +01:00
Dhanya Thattil	2ef021041c	rx_arping sigchld (#701 ) * rx_arping pclose gave -1 due to sigchld being ignored, fixed with sig handler doing a wait	2023-03-23 13:58:40 +01:00
Dhanya Thattil	574127b5ac	fix hdf5 compilation using det spec fields in header (#700 ) * fix hdf5 compilation using det spec fields in header	2023-03-23 12:30:38 +01:00
				`@ -1 +0,0 @@`
				`../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer`
				`@ -1 +0,0 @@`
				`../slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer`
				`@ -1 +0,0 @@`
				`../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer`
				`@ -1 +0,0 @@`
				`../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer`
				`@ -1 +0,0 @@`
				`../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer`
				`@ -0,0 +1 @@`
				`../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.2`
				`@ -1 +0,0 @@`
				`../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer`
				`@ -1 +0,0 @@`
				`../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer`