Eiger: add hardware version (#688)

* eiger: hardwareversion, fix firmware version unable to read version scenarios, check to see if febl, febr and beb have same fw version

* feb versions can be picked up only after feb initialization

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.1)
+set(PROJECT_VERSION 7.0.0)
 
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
 

RELEASE.txt

@@ -1,13 +1,21 @@
-SLS Detector Package Major Release 7.0.1 released on 24.03.2023
+SLS Detector Package Major Release 7.x.x released on xx.xx.2023
 ===============================================================
 
-This document describes the differences between v7.0.1 and v7.0.0   
+This document describes the differences between v7.x.x and v7.0.0   
 
 
 
     CONTENTS
     --------
-    1   Resolved Issues
+    1           New, Changed or Resolved Features
+        1.1     Compilation
+        1.2     Callback
+        1.3     Python
+        1.4     Client
+        1.5     Detector Server
+        1.6     Simulator
+        1.7     Receiver
+        1.8     Gui
     2           On-board Detector Server Compatibility
     3           Firmware Requirements
     4           Kernel Requirements
@@ -16,40 +24,17 @@ This document describes the differences between v7.0.1 and v7.0.0
 
 
 
-1 Resolved Issues
+1 New, Changed or Resolved Features
-=================
+=====================================
 
 
-    Receiver
+- moench being made compatible with jungfrau 2.0 boards (jungfrau structure, away from ctb)
-    --------
+- 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)
 
 
-    *   HDF5 Compilation
-        Compilation issues from 7.0.0 fixed.
-
-    
-    *   Arping error
-        Cmdline: rx_arping
-        API: setRxArping/ getRxArping
-        Even if arping was successful, it gave an error. Fixed.
-
-
-
-    Client
-    ------
-
-    
-    *   Detector Server Version from previous Releases
-        Hostname command would hang with 7.0.0 client if the detector server
-        was from a previous release (eg. 6.1.2). In this case, the user cannot
-        get the detector server version.
-        
-        Fixed that the hostname command will throw an exception about 
-        incompatible server with its version in the message. Now, the user can 
-        get the version number without having to telnet or ssh to the detector.
-        With this info, one can then update to matching client for that server
-        and start the detector updation process.
-
 
 2  On-board Detector Server Compatibility
 ==========================================
@@ -230,4 +215,3 @@ This document describes the differences between v7.0.1 and v7.0.0
 
         dhanya.thattil@psi.ch
         erik.frojdh@psi.ch
-

python/slsdet/detector.py

@@ -230,7 +230,8 @@ class Detector(CppDetectorApi):
     @element
     def hardwareversion(self):
         """
-        [Jungfrau][Gotthard2][Myhten3][Gotthard][Ctb][Moench] Hardware version of detector.
+        [Jungfrau][Moench][Gotthard2][Myhten3][Gotthard][Ctb] Hardware version of detector. \n
+        [Eiger] Hardware version of front FPGA on detector.
         """
         return self.getHardwareVersion()
 
@@ -305,7 +306,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][Gotthard][Ctb][Moench][Mythen3][Gotthard2] 16
+        [Jungfrau][Moench][Gotthard][Ctb][Mythen3][Gotthard2] 16
         """
         return self.getDynamicRange()
 
@@ -363,10 +364,9 @@ class Detector(CppDetectorApi):
         -----
         
         [Eiger] Use threshold command to load settings
-        [Jungfrau] GAIN0, HIGHGAIN0 \n
+        [Jungfrau][Moench] 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][Mythen3][Gotthard2][CTB][Moench] Number of frames left in acquisition.\n
+        [Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB] 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][Mythen3][Gotthard2][Moench][CTB] Number of frames from start run control.
+        [Jungfrau][Moench][Mythen3][Gotthard2][CTB] Number of frames from start run control.
 
         Note
         -----
@@ -436,12 +436,11 @@ class Detector(CppDetectorApi):
     @element
     def powerchip(self):
         """
-        [Jungfrau][Mythen3][Gotthard2][Moench] Power the chip. 
+        [Jungfrau][Moench][Mythen3][Gotthard2] Power the chip. 
 
         Note
         ----
-        [Moench] 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 temp_control enabled. Will configure chip (only chip v1.1).\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()
@@ -615,7 +614,7 @@ class Detector(CppDetectorApi):
     @element
     def periodl(self):
         """
-        [Gotthard][Jungfrau][CTB][Moench][Mythen3][Gotthard2] Period left for current frame.
+        [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2] Period left for current frame.
 
         Note
         -----
@@ -637,7 +636,7 @@ class Detector(CppDetectorApi):
     @element
     def delay(self):
         """
-        [Gotthard][Jungfrau][CTB][Moench][Mythen3][Gotthard2] Delay after trigger, accepts either a value in seconds, DurationWrapper or datetime.timedelta
+        [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2] Delay after trigger, accepts either a value in seconds, DurationWrapper or datetime.timedelta
 
         Note
         -----
@@ -682,7 +681,7 @@ class Detector(CppDetectorApi):
     @element
     def delayl(self):
         """
-        [Gotthard][Jungfrau][CTB][Moench][Mythen3][Gotthard2] Delay left after trigger during acquisition, accepts either a value in seconds, datetime.timedelta or DurationWrapper
+        [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2] Delay left after trigger during acquisition, accepts either a value in seconds, datetime.timedelta or DurationWrapper
 
         Note
         -----
@@ -741,7 +740,7 @@ class Detector(CppDetectorApi):
     @element
     def txdelay(self):
         """
-        [Eiger][Jungfrau][Mythen3] Set transmission delay for all modules in the detector using the step size provided.
+        [Eiger][Jungfrau][Moench][Mythen3] Set transmission delay for all modules in the detector using the step size provided.
         
         Note
         ----
@@ -749,7 +748,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][Mythen3] txdelay_frame to (num_modules * n_delay)\n\n
+        \t\t[Jungfrau][Moench][Mythen3] txdelay_frame to (num_modules * n_delay)\n\n
         Please refer txdelay_left, txdelay_right and txdelay_frame for details.
         """
         return self.getTransmissionDelay()
@@ -762,11 +761,11 @@ class Detector(CppDetectorApi):
     @element
     def txdelay_frame(self):
         """
-        [Eiger][Jungfrau][Mythen3] Transmission delay of first udp packet being streamed out of the module.\n
+        [Eiger][Jungfrau][Moench][Mythen3] Transmission delay of first udp packet being streamed out of the module.\n
 
         Note
         ----
-        [Jungfrau] [0-31] Each value represents 1 ms. \n 
+        [Jungfrau][Moench] [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.
         """
@@ -949,7 +948,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def numinterfaces(self):
-        """[Jungfrau][Gotthard2] Number of udp interfaces to stream data from detector. Default is 1.
+        """[Jungfrau][Moench][Gotthard2] Number of udp interfaces to stream data from detector. Default is 1.
         
         Note
         -----
@@ -1295,11 +1294,11 @@ class Detector(CppDetectorApi):
     @element
     def udp_dstip2(self):
         """
-        [Jungfrau][Gotthard2] Ip address of the receiver (destination) udp interface 2.
+        [Jungfrau][Moench][Gotthard2] Ip address of the receiver (destination) udp interface 2.
         
         Note
         ----
-        [Jungfrau] bottom half \n
+        [Jungfrau][Moench] 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. 
@@ -1348,13 +1347,13 @@ class Detector(CppDetectorApi):
     @element
     def udp_dstmac2(self):
         """
-        [Jungfrau][Gotthard2] Mac address of the receiver (destination) udp interface 2.
+        [Jungfrau][Moench][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] bottom half \n
+        [Jungfrau][Moench] bottom half \n
         [Gotthard2] veto debugging \n
         Use router mac if router between detector and receiver.
         
@@ -1399,11 +1398,11 @@ class Detector(CppDetectorApi):
     @element
     def udp_srcmac2(self):
         """
-        [Jungfrau][Gotthard2] Mac address of the receiver (source) udp interface 2. 
+        [Jungfrau][Moench][Gotthard2] Mac address of the receiver (source) udp interface 2. 
         
         Note
         ----
-        [Jungfrau] bottom half \n
+        [Jungfrau][Moench] bottom half \n
         [Gotthard2] veto debugging \n
         To set MACs for individual modules, use setSourceUDPMAC2. 
         
@@ -1449,11 +1448,11 @@ class Detector(CppDetectorApi):
     @element
     def udp_srcip2(self):
         """
-        [Jungfrau][Gotthard2] Ip address of the detector (source) udp interface 2. 
+        [Jungfrau][Moench][Gotthard2] Ip address of the detector (source) udp interface 2. 
         
         Note
         -----
-        [Jungfrau] bottom half \n
+        [Jungfrau][Moench] bottom half \n
         [Gotthard2] veto debugging \n
         Must be same subnet as destination udp ip2.\n
         To set IPs for individual modules, use setSourceUDPIP2. 
@@ -1499,7 +1498,7 @@ class Detector(CppDetectorApi):
         ----
         Default is 50002. \n
         [Eiger] right half \n
-        [Jungfrau] bottom half \n
+        [Jungfrau][Moench] 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.
@@ -1519,7 +1518,7 @@ class Detector(CppDetectorApi):
         -----
         [Gotthard] 0, 90, 110, 120, 150, 180, 200 \n
         [Eiger][Mythen3][Gotthard2] 0 - 200 \n
-        [Jungfrau][Ctb][Moench] 0, 60 - 200
+        [Jungfrau][Moench][Ctb] 0, 60 - 200
         """
         return self.getHighVoltage()
 
@@ -1642,8 +1641,8 @@ class Detector(CppDetectorApi):
     @element
     def master(self):
         """
-        [Eiger][Gotthard2][Jungfrau] Sets (half) module to master and other(s) to slaves.\n
+        [Eiger][Gotthard2][Jungfrau][Moench] Sets (half) module to master and other(s) to slaves.\n
-        [Gotthard][Gotthard2][Mythen3][Eiger][Jungfrau] Gets if the current (half) module is master.
+        [Gotthard][Gotthard2][Mythen3][Eiger][Jungfrau][Moench] Gets if the current (half) module is master.
         """
         return self.getMaster()
 
@@ -1655,7 +1654,7 @@ class Detector(CppDetectorApi):
     @element
     def sync(self):
         """
-        [Jungfrau] Enables or disables synchronization between modules.
+        [Jungfrau][Moench] Enables or disables synchronization between modules.
         """
         return self.getSynchronization()
 
@@ -1809,7 +1808,7 @@ class Detector(CppDetectorApi):
 
     @property
     def adcreg(self):
-        """[Jungfrau][Ctb][Moench][Gotthard] Writes to an adc register 
+        """[Jungfrau][Moench][Ctb][Gotthard] Writes to an adc register 
 
         Note
         -----
@@ -1822,7 +1821,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def adcinvert(self):
-        """[Ctb][Moench][Jungfrau] ADC Inversion Mask.
+        """[Ctb][Jungfrau][Moench] ADC Inversion Mask.
         
         Note
         -----
@@ -1838,7 +1837,7 @@ class Detector(CppDetectorApi):
     @element
     def triggersl(self):
         """
-        [Gotthard][Jungfrau][Mythen3][Gotthard2][CTB][Moench] Number of triggers left in acquisition.\n
+        [Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB] Number of triggers left in acquisition.\n
         
         Note
         ----
@@ -1851,7 +1850,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def frametime(self):
-        """[Jungfrau][Mythen3][Gotthard2][Moench][CTB] Timestamp at a frame start.
+        """[Jungfrau][Moench][Mythen3][Gotthard2][CTB] Timestamp at a frame start.
         
         Note
         ----
@@ -1892,14 +1891,22 @@ class Detector(CppDetectorApi):
     def versions(self):
         version_list = {'type': self.type,
                 'package': self.packageversion, 
-                'client': self.clientversion,
+                'client': self.clientversion}
-                'firmware': self.firmwareversion,
+                
-                'detectorserver': self.detectorserverversion,
+        if self.type == detectorType.EIGER:
-                'kernel': self.kernelversion}
+            version_list ['firmware (Beb)'] = self.firmwareversion
-        if self.type != detectorType.EIGER:
+            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
+
         if self.use_receiver:
             version_list ['receiver'] = self.rx_version
+
         return version_list
 
     @property
@@ -1967,10 +1974,10 @@ class Detector(CppDetectorApi):
         
         Note
         -----
-        [Jungfrau] FULL_SPEED, HALF_SPEED (Default), QUARTER_SPEED
+        [Jungfrau][Moench] FULL_SPEED, HALF_SPEED (Default), QUARTER_SPEED
         [Eiger] FULL_SPEED (Default), HALF_SPEED, QUARTER_SPEED
         [Gottthard2] G2_108MHZ (Default), G2_144MHZ
-        [Jungfrau] FULL_SPEED option only available from v2.0 boards and is recommended to set number of interfaces to 2.  \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.
         """
         return element_if_equal(self.getReadoutSpeed())
@@ -2056,7 +2063,7 @@ class Detector(CppDetectorApi):
         Note
         -----
         Default: AUTO_TIMING \n
-        [Jungfrau][Gotthard][Ctb][Moench][Gotthard2] AUTO_TIMING, TRIGGER_EXPOSURE \n
+        [Jungfrau][Moench][Gotthard][Ctb][Gotthard2] AUTO_TIMING, TRIGGER_EXPOSURE \n
         [Mythen3] AUTO_TIMING, TRIGGER_EXPOSURE, GATED, TRIGGER_GATED \n
         [Eiger] AUTO_TIMING, TRIGGER_EXPOSURE, GATED, BURST_TRIGGER
         """
@@ -2215,13 +2222,13 @@ class Detector(CppDetectorApi):
     def readnrows(self):
         """
         [Eiger] Number of rows to read out per half module starting from the centre.
-        [Jungfrau] Number of rows to read per module starting from the centre.
+        [Jungfrau][Moench] 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] Options: 8 - 512 (multiples of 8)
+        [Jungfrau][Moench] Options: 8 - 512 (multiples of 8)
         """
         return self.getReadNRows()
 
@@ -2312,7 +2319,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def tengiga(self):
-        """[Eiger][Ctb][Moench][Mythen3] 10GbE Enable."""
+        """[Eiger][Ctb][Mythen3] 10GbE Enable."""
         return self.getTenGiga()
 
     @tengiga.setter
@@ -2332,7 +2339,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def flowcontrol10g(self):
-        """[Eiger][Jungfrau] Enable or disable 10GbE Flow Control."""
+        """[Eiger][Jungfrau][Moench] Enable or disable 10GbE Flow Control."""
         return self.getTenGigaFlowControl()
 
     @flowcontrol10g.setter
@@ -2352,7 +2359,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def gappixels(self):
-        """[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. """
+        """[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. """
         return self.getRxAddGapPixels()
 
     @gappixels.setter
@@ -2408,7 +2415,7 @@ class Detector(CppDetectorApi):
     @element
     def chipversion(self):
         """
-        [Jungfrau] Chip version of module. Can be 1.0 or 1.1.
+        [Jungfrau][Moench] Chip version of module. Can be 1.0 or 1.1.
 
         Example
         -------
@@ -2421,7 +2428,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def autocompdisable(self):
-        """[Jungfrau] Enable or disable auto comparator disable mode. 
+        """[Jungfrau][Moench] Enable or disable auto comparator disable mode. 
 
         Note
         -----
@@ -2437,7 +2444,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def compdisabletime(self):
-        """[Jungfrau] Time before end of exposure when comparator is disabled. 
+        """[Jungfrau][Moench] Time before end of exposure when comparator is disabled. 
 
         Note
         -----
@@ -2483,7 +2490,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def runtime(self):
-        """[Jungfrau][Mythen3][Gotthard2][Moench][CTB] Time from detector start up.
+        """[Jungfrau][Moench][Mythen3][Gotthard2][CTB] Time from detector start up.
         
         Note
         -----
@@ -2576,7 +2583,7 @@ class Detector(CppDetectorApi):
     @element
     def temp_threshold(self):
         """
-        [Jungfrau] Threshold temperature in degrees. 
+        [Jungfrau][Moench] Threshold temperature in degrees. 
         
         Note
         -----
@@ -2593,7 +2600,7 @@ class Detector(CppDetectorApi):
     @element
     def temp_event(self):
         """
-        [Jungfrau] 1, if a temperature event occured. \n
+        [Jungfrau][Moench] 1, if a temperature event occured. \n
         
         Note
         ----
@@ -2621,7 +2628,7 @@ class Detector(CppDetectorApi):
     @element
     def temp_control(self):
         """
-        [Jungfrau] Temperature control enable. 
+        [Jungfrau][Moench] Temperature control enable. 
         
         Note
         -----
@@ -2638,7 +2645,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def selinterface(self):
-        """[Jungfrau] The udp interface to stream data from detector. 
+        """[Jungfrau][Moench] The udp interface to stream data from detector. 
         
         Note
         -----
@@ -2658,11 +2665,11 @@ class Detector(CppDetectorApi):
     @property
     def gainmode(self):
         """
-        [Jungfrau] Detector gain mode. Enum: gainMode
+        [Jungfrau][Moench] Detector gain mode. Enum: gainMode
         
         Note
         -----
-        [Jungfrau] DYNAMIC, FORCE_SWITCH_G1, FORCE_SWITCH_G2, FIX_G1, FIX_G2, FIX_G0 \n
+        [Jungfrau][Moench] 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())
@@ -2717,14 +2724,14 @@ class Detector(CppDetectorApi):
     @element
     def filterresistor(self):
         """
-        [Gotthard2][Jungfrau] Set filter resistor. Increasing values for increasing "
+        [Gotthard2][Jungfrau][Moench] Set filter resistor. Increasing values for increasing "
         "resistance.
         
         Note
         ----
         Advanced user command.
         [Gotthard2] Default is 0. Options: 0-3.
-        [Jungfrau] Default is 1. Options: 0-1.
+        [Jungfrau][Moench] Default is 1. Options: 0-1.
         """
         return self.getFilterResistor()
 
@@ -2736,11 +2743,11 @@ class Detector(CppDetectorApi):
     @element
     def filtercells(self):
         """
-        [Jungfrau] Set filter capacitor. 
+        [Jungfrau][Moench] Set filter capacitor. 
         
         Note
         ----
-        [Jungfrau] Options: 0-12. Default: 0. Advanced user command. Only for chipv1.1.
+        [Jungfrau][Moench] Options: 0-12. Default: 0. Advanced user command. Only for chipv1.1.
         """
         return self.getNumberOfFilterCells()
 
@@ -3076,7 +3083,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def adcenable(self):
-        """[Ctb][Moench] ADC Enable Mask for 1Gb. Enable for each 32 ADC channel."""
+        """[Ctb] ADC Enable Mask for 1Gb. Enable for each 32 ADC channel."""
         return self.getADCEnableMask()
 
     @adcenable.setter
@@ -3086,7 +3093,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def adcenable10g(self):
-        """[Ctb][Moench] ADC Enable Mask for 10Gb mode for each 32 ADC channel. 
+        """[Ctb] ADC Enable Mask for 10Gb mode for each 32 ADC channel. 
 
         Note
         -----
@@ -3103,7 +3110,6 @@ 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()
 
@@ -3114,7 +3120,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def runclk(self):
-        """[Ctb][Moench] Run clock in MHz."""
+        """[Ctb] Run clock in MHz."""
         return self.getRUNClock()
 
     @runclk.setter
@@ -3147,7 +3153,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def asamples(self):
-        """[Ctb][Moench] Number of analog samples expected. """
+        """[Ctb] Number of analog samples expected. """
         return element_if_equal(self.getNumberOfAnalogSamples())
 
     @asamples.setter
@@ -3167,7 +3173,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def dbitphase(self):
-        """[Ctb][Jungfrau] Phase shift of clock to latch digital bits. Absolute phase shift.
+        """[Ctb][Jungfrau][Moench] Phase shift of clock to latch digital bits. Absolute phase shift.
 
         Note
         -----
@@ -3219,7 +3225,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def maxdbitphaseshift(self):
-        """[CTB][Jungfrau] Absolute maximum Phase shift of of the clock to latch digital bits.
+        """[CTB][Jungfrau][Moench] Absolute maximum Phase shift of of the clock to latch digital bits.
         
         Note
         -----
@@ -3266,7 +3272,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def maxadcphaseshift(self):
-        """[Jungfrau][CTB][Moench] Absolute maximum Phase shift of ADC clock.
+        """[Jungfrau][Moench][CTB] Absolute maximum Phase shift of ADC clock.
         
         Note
         -----
@@ -3278,12 +3284,12 @@ class Detector(CppDetectorApi):
     @property
     @element
     def adcphase(self):
-        """[Gotthard][Jungfrau][CTB][Moench] Sets phase shift of ADC clock. 
+        """[Gotthard][Jungfrau][Moench][CTB] Sets phase shift of ADC clock. 
 
         Note
         -----
-        [Jungfrau] Absolute phase shift. Changing Speed also resets adcphase to recommended defaults.\n
+        [Jungfrau][Moench] 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
+        [Ctb] Absolute phase shift. Changing adcclk also resets adcphase and sets it to previous values.\n
         [Gotthard] Relative phase shift.
 
         :getter: Not implemented for Gotthard
@@ -3297,7 +3303,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def adcpipeline(self):
-        """[Ctb][Moench] Sets pipeline for ADC clock. """
+        """[Ctb] Sets pipeline for ADC clock. """
         return self.getADCPipeline()
 
     @adcpipeline.setter
@@ -3307,7 +3313,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def adcclk(self):
-        """[Ctb][Moench] Sets ADC clock frequency in MHz. """
+        """[Ctb] Sets ADC clock frequency in MHz. """
         return self.getADCClock()
 
     @adcclk.setter
@@ -3318,7 +3324,7 @@ class Detector(CppDetectorApi):
     @element
     def syncclk(self):
         """
-        [Ctb][Moench] Sync clock in MHz.
+        [Ctb] Sync clock in MHz.
         
         Note
         -----
@@ -3329,7 +3335,7 @@ class Detector(CppDetectorApi):
 
     @property
     def pattern(self):
-        """[Mythen3][Moench][Ctb] Loads ASCII pattern file directly to server (instead of executing line by line).
+        """[Mythen3][Ctb] Loads ASCII pattern file directly to server (instead of executing line by line).
         
         Note
         ----
@@ -3351,7 +3357,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patioctrl(self):
-        """[Ctb][Moench] 64 bit mask defining input (0) and output (1) signals.
+        """[Ctb] 64 bit mask defining input (0) and output (1) signals.
         
         Example
         --------
@@ -3368,7 +3374,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patlimits(self):
-        """[Ctb][Moench][Mythen3] Limits (start and stop address) of complete pattern.
+        """[Ctb][Mythen3] Limits (start and stop address) of complete pattern.
         
         Example
         ---------
@@ -3388,7 +3394,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patsetbit(self):
-        """[Ctb][Moench][Mythen3] Sets the mask applied to every pattern to the selected bits. 
+        """[Ctb][Mythen3] Sets the mask applied to every pattern to the selected bits. 
         
         Example
         --------
@@ -3405,7 +3411,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patmask(self):
-        """[Ctb][Moench][Mythen3] Selects the bits that will have a pattern mask applied to the selected patmask for every pattern.
+        """[Ctb][Mythen3] Selects the bits that will have a pattern mask applied to the selected patmask for every pattern.
         
         Example
         --------
@@ -3423,7 +3429,7 @@ class Detector(CppDetectorApi):
     # @element
     def patwait(self):
         """
-        [Ctb][Moench][Mythen3] Wait address of loop level provided.
+        [Ctb][Mythen3] Wait address of loop level provided.
         
         Example
         -------
@@ -3440,7 +3446,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patwait0(self):
-        """[Ctb][Moench][Mythen3] Wait 0 address.
+        """[Ctb][Mythen3] Wait 0 address.
                 
         Example
         --------
@@ -3460,7 +3466,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patwait1(self):
-        """[Ctb][Moench][Mythen3] Wait 1 address.
+        """[Ctb][Mythen3] Wait 1 address.
                 
         Example
         --------
@@ -3480,7 +3486,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patwait2(self):
-        """[Ctb][Moench][Mythen3] Wait 2 address.
+        """[Ctb][Mythen3] Wait 2 address.
                 
         Example
         --------
@@ -3500,7 +3506,7 @@ class Detector(CppDetectorApi):
     @property
     def patwaittime(self):
         """
-        [Ctb][Moench][Mythen3] Wait time in clock cycles of loop level provided.
+        [Ctb][Mythen3] Wait time in clock cycles of loop level provided.
         
         Example
         -------
@@ -3517,7 +3523,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patwaittime0(self):
-        """[Ctb][Moench][Mythen3] Wait 0 time in clock cycles."""
+        """[Ctb][Mythen3] Wait 0 time in clock cycles."""
         return self.getPatternWaitTime(0)
 
     @patwaittime0.setter
@@ -3528,7 +3534,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patwaittime1(self):
-        """[Ctb][Moench][Mythen3] Wait 1 time in clock cycles."""
+        """[Ctb][Mythen3] Wait 1 time in clock cycles."""
         return self.getPatternWaitTime(1)
 
     @patwaittime1.setter
@@ -3539,7 +3545,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patwaittime2(self):
-        """[Ctb][Moench][Mythen3] Wait 2 time in clock cycles."""
+        """[Ctb][Mythen3] Wait 2 time in clock cycles."""
         return self.getPatternWaitTime(2)
 
     @patwaittime2.setter
@@ -3551,7 +3557,7 @@ class Detector(CppDetectorApi):
     @property
     def patloop(self):
         """
-        [Ctb][Moench][Mythen3] Limits (start and stop address) of the loop provided.
+        [Ctb][Mythen3] Limits (start and stop address) of the loop provided.
         
         Example
         -------
@@ -3568,7 +3574,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patloop0(self):
-        """[Ctb][Moench][Mythen3] Limits (start and stop address) of loop 0.
+        """[Ctb][Mythen3] Limits (start and stop address) of loop 0.
         
         Example
         ---------
@@ -3588,7 +3594,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patloop1(self):
-        """[Ctb][Moench][Mythen3] Limits (start and stop address) of loop 1.
+        """[Ctb][Mythen3] Limits (start and stop address) of loop 1.
         
         Example
         ---------
@@ -3609,7 +3615,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patloop2(self):
-        """[Ctb][Moench][Mythen3] Limits (start and stop address) of loop 2.
+        """[Ctb][Mythen3] Limits (start and stop address) of loop 2.
         
         Example
         ---------
@@ -3631,7 +3637,7 @@ class Detector(CppDetectorApi):
     @property
     def patnloop(self):
         """
-        [Ctb][Moench][Mythen3] Number of cycles of the loop provided.
+        [Ctb][Mythen3] Number of cycles of the loop provided.
         
         Example
         -------
@@ -3648,7 +3654,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patnloop0(self):
-        """[Ctb][Moench][Mythen3] Number of cycles of loop 0."""
+        """[Ctb][Mythen3] Number of cycles of loop 0."""
         return self.getPatternLoopCycles(0)
 
     @patnloop0.setter
@@ -3659,7 +3665,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patnloop1(self):
-        """[Ctb][Moench][Mythen3] Number of cycles of loop 1."""
+        """[Ctb][Mythen3] Number of cycles of loop 1."""
         return self.getPatternLoopCycles(1)
 
     @patnloop1.setter
@@ -3670,7 +3676,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patnloop2(self):
-        """[Ctb][Moench][Mythen3] Number of cycles of loop 2."""
+        """[Ctb][Mythen3] Number of cycles of loop 2."""
         return self.getPatternLoopCycles(2)
 
     @patnloop2.setter
@@ -3741,7 +3747,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def v_limit(self):
-        """[Ctb][Moench] Soft limit for power supplies (ctb only) and DACS in mV."""
+        """[Ctb] Soft limit for power supplies (ctb only) and DACS in mV."""
         return self.getDAC(dacIndex.V_LIMIT, True)
 
     @v_limit.setter

python/src/detector.cpp

@@ -61,6 +61,11 @@ 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) &

python/src/enums.cpp

@@ -286,6 +286,11 @@ 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)

serverBin/ctbDetectorServer_developer

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

serverBin/eigerDetectorServer_developer

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

serverBin/gotthard2DetectorServer_developer

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

serverBin/gotthardDetectorServer_developer

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

serverBin/jungfrauDetectorServer_developer

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

serverBin/moenchDetectorServer_developer

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

serverBin/mythen3DetectorServer_developer

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

slsDetectorGui/include/qTabMeasurement.h

@@ -32,7 +32,6 @@ 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();
@@ -64,7 +63,6 @@ class qTabMeasurement : public QWidget, private Ui::TabMeasurementObject {
     void GetNumFrames();
     void GetNumTriggers();
     void GetNumBursts();
-    void GetNumSamples();
     void GetNumGates();
     void GetExposureTime();
     void GetAcquisitionPeriod();
@@ -96,7 +94,6 @@ class qTabMeasurement : public QWidget, private Ui::TabMeasurementObject {
     QString errPeriodTip;
     QPalette red;
     bool delayImplemented;
-    bool sampleImplemented;
     bool gateImplemented;
     bool startingFnumImplemented;
     bool isAcquisitionStopped{false};

slsDetectorGui/src/qDrawPlot.cpp

@@ -52,6 +52,7 @@ void qDrawPlot::SetupWidgetWindow() {
     detType = det->getDetectorType().squash();
     switch (detType) {
     case slsDetectorDefs::JUNGFRAU:
+    case slsDetectorDefs::MOENCH:
         pixelMask = ((1 << 14) - 1);
         gainMask = (3 << 14);
         gainOffset = 14;
@@ -1142,7 +1143,8 @@ void qDrawPlot::toDoublePixelData(double *dest, char *source, int size,
         break;
 
     case 16:
-        if (detType == slsDetectorDefs::JUNGFRAU ||
+        if (detType == slsDetectorDefs::MOENCH ||
+            detType == slsDetectorDefs::JUNGFRAU ||
             detType == slsDetectorDefs::GOTTHARD2) {
 
             // show gain plot

slsDetectorGui/src/qTabAdvanced.cpp

@@ -48,6 +48,10 @@ void qTabAdvanced::SetupWidgetWindow() {
         lblDiscardBits->setEnabled(true);
         spinDiscardBits->setEnabled(true);
         break;
+    case slsDetectorDefs::JUNGFRAU:
+        lblNumStoragecells->setEnabled(true);
+        spinNumStoragecells->setEnabled(true);
+        break;
     default:
         break;
     }

slsDetectorGui/src/qTabDataOutput.cpp

@@ -40,13 +40,11 @@ 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;

slsDetectorGui/src/qTabDeveloper.cpp

@@ -111,6 +111,7 @@ void qTabDeveloper::SetupWidgetWindow() {
             break;
 
         case slsDetectorDefs::JUNGFRAU:
+        case slsDetectorDefs::MOENCH:
             dacWidgets.push_back(
                 new qDacWidget(this, det, true,
                                "v vb comp: ", getSLSIndex(detType, tempid++)));
@@ -139,72 +140,6 @@ 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,
@@ -386,6 +321,7 @@ qTabDeveloper::getSLSIndex(slsDetectorDefs::detectorType detType, int index) {
         break;
 
     case slsDetectorDefs::JUNGFRAU:
+    case slsDetectorDefs::MOENCH:
         switch (index) {
         case 0:
             return slsDetectorDefs::VB_COMP;
@@ -411,30 +347,6 @@ 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:

slsDetectorGui/src/qTabMeasurement.cpp

@@ -35,7 +35,6 @@ void qTabMeasurement::SetupWidgetWindow() {
     // timer to update the progress bar
     progressTimer = new QTimer(this);
 
-    sampleImplemented = false;
     gateImplemented = false;
     delayImplemented = true;
     startingFnumImplemented = false;
@@ -47,18 +46,11 @@ 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);
@@ -66,6 +58,7 @@ void qTabMeasurement::SetupWidgetWindow() {
         startingFnumImplemented = true;
         break;
     case slsDetectorDefs::JUNGFRAU:
+    case slsDetectorDefs::MOENCH:
         lblNextFrameNumber->setEnabled(true);
         spinNextFrameNumber->setEnabled(true);
         startingFnumImplemented = true;
@@ -112,10 +105,6 @@ 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)));
@@ -198,16 +187,6 @@ 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());
@@ -510,31 +489,6 @@ 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,
@@ -1003,9 +957,6 @@ void qTabMeasurement::Refresh() {
         if (spinBurstPeriod->isEnabled()) {
             GetBurstPeriod();
         }
-        if (sampleImplemented) {
-            GetNumSamples();
-        }
         if (gateImplemented) {
             GetNumGates();
         }

slsDetectorGui/src/qTabPlot.cpp

@@ -62,6 +62,11 @@ 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;
     }
@@ -799,6 +804,9 @@ void qTabPlot::Refresh() {
             chkGainPlot->setEnabled(true);
             GetGapPixels();
             break;
+        case slsDetectorDefs::MOENCH:
+            chkGainPlot->setEnabled(true);
+            break;
         case slsDetectorDefs::GOTTHARD2:
             chkGainPlot1D->setEnabled(true);
             break;

slsDetectorGui/src/qTabSettings.cpp

@@ -92,7 +92,8 @@ void qTabSettings::SetupWidgetWindow() {
         comboDynamicRange->setEnabled(true);
         lblThreshold->setEnabled(true);
         spinThreshold->setEnabled(true);
-    } else if (detType == slsDetectorDefs::JUNGFRAU) {
+    } else if (detType == slsDetectorDefs::JUNGFRAU ||
+               detType == slsDetectorDefs::MOENCH) {
         lblSpinHV->show();
         spinHV->show();
         lblGainMode->setEnabled(true);
@@ -100,9 +101,6 @@ 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();

slsDetectorServers/eigerDetectorServer/FebControl.c

@@ -1742,6 +1742,7 @@ 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};
@@ -2206,6 +2207,51 @@ 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;

slsDetectorServers/eigerDetectorServer/FebControl.h

@@ -119,5 +119,7 @@ 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();

slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h

@@ -46,6 +46,10 @@
 #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)
 

slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c

@@ -123,18 +123,18 @@ void basictests() {
     int64_t sw_fw_apiversion = getFirmwareAPIVersion();
 
     LOG(logINFOBLUE,
-        ("**************************************************\n"
+        ("\n********************************************************\n"
-         "Detector IP Addr:\t\t 0x%x\n"
+         "Detector IP Addr         : 0x%x\n"
-         "Detector MAC Addr:\t\t 0x%llx\n"
+         "Detector MAC Addr        : 0x%llx\n"
 
-         "Firmware Version:\t\t %lld\n"
+         "Firmware (Beb) Version   : %lld\n"
-         "Software Version:\t\t %s\n"
+         "F/w-S/w API Version      : %lld\n"
-         "F/w-S/w API Version:\t\t %lld\n"
+         "Required Firmware Version: %d\n"
-         "Required Firmware Version:\t %d\n"
+         "Software Version         : %s\n"
          "********************************************************\n",
          (unsigned int)ipadd, (long long unsigned int)macadd,
-         (long long int)fwversion, swversion, (long long int)sw_fw_apiversion,
+         (long long int)fwversion,
-         REQUIRED_FIRMWARE_VERSION));
+         (long long int)sw_fw_apiversion, REQUIRED_FIRMWARE_VERSION, swversion));
 
     // 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%llx) is incompatible "
+                "This firmware-software api version (0x%lld) is incompatible "
                 "with the software's minimum required firmware version "
-                "(0x%llx).\nPlease update detector software to be compatible "
+                "(0x%lld).\nPlease update detector software to be compatible "
                 "with this firmware.\n",
                 (long long int)sw_fw_apiversion,
                 (long long int)REQUIRED_FIRMWARE_VERSION);
@@ -210,20 +210,70 @@ void getServerVersion(char *version) { strcpy(version, APIEIGER); }
 
 u_int64_t getFirmwareVersion() {
 #ifdef VIRTUAL
-    return 0;
+    return REQUIRED_FIRMWARE_VERSION;
 #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 0;
+    return REQUIRED_FIRMWARE_VERSION;
 #else
-    return (u_int64_t)Beb_GetFirmwareSoftwareAPIVersion();
+    return 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);
 }
@@ -355,6 +405,36 @@ 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();

slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h

@@ -5,6 +5,11 @@
 
 #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)

slsDetectorServers/moenchDetectorServer/CMakeLists.txt

@@ -8,35 +8,28 @@ 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/loadPattern.c         
+    ../slsDetectorServer/src/communication_funcs_UDP.c    
     ../slsDetectorServer/src/sharedMemory.c
     ../../slsSupportLib/src/md5.c
 )
 
-include_directories(
+target_include_directories(moenchDetectorServer_virtual
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
     ../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
+    PUBLIC MOENCHD VIRTUAL STOP_SERVER #TEST_MOD_GEOMETRY
 )
 
 target_link_libraries(moenchDetectorServer_virtual
     PUBLIC pthread rt slsProjectCSettings
-    m
 )
 
 set_target_properties(moenchDetectorServer_virtual PROPERTIES
@@ -44,7 +37,9 @@ set_target_properties(moenchDetectorServer_virtual PROPERTIES
 )
 
 install(TARGETS moenchDetectorServer_virtual
+    EXPORT "${TARGETS_EXPORT_NAME}"
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
 
-configure_file(DefaultPattern_moench.txt ${CMAKE_BINARY_DIR}/bin/DefaultPattern_moench.txt COPYONLY)
+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)

slsDetectorServers/moenchDetectorServer/DefaultPattern_moench.txt

@@ -1,301 +0,0 @@
-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

slsDetectorServers/moenchDetectorServer/Makefile

@@ -4,19 +4,18 @@ 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$(det_lib) -I$(current_dir)   #-DVERBOSEI #-DVERBOSE 
+CFLAGS		+=  -Wall -std=gnu99 -DMOENCHD  -DSTOP_SERVER -I$(main_inc) -I$(support_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)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
+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
 
 OBJS 	= 	$(SRCS:.c=.o) 
  
@@ -37,10 +36,10 @@ $(PROGS): $(OBJS)
 	mkdir -p $(DESTDIR) 
 	$(CC) -o $@ $^ $(CFLAGS)  $(LDLIBS)  
 	mv $(PROGS) $(DESTDIR)
-	cp DefaultPattern_moench.txt $(DESTDIR)
+	cp config_moench.txt $(DESTDIR)
+	cp detid_moench.txt $(DESTDIR)
 	rm *.gdb
-	rm $(main_src)*.o
+	rm $(main_src)*.o $(md5_dir)*.o
-	rm *.o  $(md5_dir)*.o
 
 clean:
 	rm -rf $(DESTDIR)/$(PROGS)  *.o *.gdb $(main_src)*.o $(md5_dir)*.o

slsDetectorServers/moenchDetectorServer/RegisterDefs.h

@@ -1,209 +1,131 @@
 // SPDX-License-Identifier: LGPL-3.0-or-other
 // Copyright (C) 2021 Contributors to the SLS Detector Package
 #pragma once
+// clang-format off
 
-/* Definitions for FPGA */
+/* Definitions for FPGA*/
 #define MEM_MAP_SHIFT 1
 
-/* FPGA Version RO register */
+/* FPGA Version register */
 #define FPGA_VERSION_REG                    (0x00 << MEM_MAP_SHIFT)
 
-#define FPGA_VERSION_BRD_RVSN_OFST  (0)
+#define FPGA_COMPILATION_DATE_OFST          (0)
-#define FPGA_VERSION_BRD_RVSN_MSK   (0x00FFFFFF << FPGA_VERSION_BRD_RVSN_OFST)
+#define FPGA_COMPILATION_DATE_MSK           (0x00FFFFFF << FPGA_COMPILATION_DATE_OFST)
-#define FPGA_VERSION_DTCTR_TYP_OFST (24)
+#define DETECTOR_TYPE_OFST                  (24)
-#define FPGA_VERSION_DTCTR_TYP_MSK  (0x000000FF << FPGA_VERSION_DTCTR_TYP_OFST)
+#define DETECTOR_TYPE_MSK                   (0x000000FF << DETECTOR_TYPE_OFST)
-#define FPGA_VERSION_DTCTR_TYP_MOENCH_VAL                                      \
-    ((0x5 << FPGA_VERSION_DTCTR_TYP_OFST) & FPGA_VERSION_DTCTR_TYP_MSK)
 
-/* Fix pattern RO register */
+/* Fix pattern register */
 #define FIX_PATT_REG                        (0x01 << MEM_MAP_SHIFT)
 
-#define FIX_PATT_VAL (0xACDC2016)
+#define FIX_PATT_VAL                        (0xACDC2014)
 
-/* Status RO register */
+/* Status register */
 #define STATUS_REG                          (0x02 << MEM_MAP_SHIFT)
 
-#define STATUS_RN_BSY_OFST            (0)
+#define RUN_BUSY_OFST                       (0)
-#define STATUS_RN_BSY_MSK             (0x00000001 << STATUS_RN_BSY_OFST)
+#define RUN_BUSY_MSK                        (0x00000001 << RUN_BUSY_OFST)
-#define STATUS_RDT_BSY_OFST           (1)
+#define WAITING_FOR_TRIGGER_OFST            (3)
-#define STATUS_RDT_BSY_MSK            (0x00000001 << STATUS_RDT_BSY_OFST)
+#define WAITING_FOR_TRIGGER_MSK             (0x00000001 << WAITING_FOR_TRIGGER_OFST)
-#define STATUS_ANY_FF_FLL_OFST        (2)
+#define DELAYBEFORE_OFST                    (4) // Not used in software
-#define STATUS_ANY_FF_FLL_MSK         (0x00000001 << STATUS_ANY_FF_FLL_OFST)
+#define DELAYBEFORE_MSK                     (0x00000001 << DELAYBEFORE_OFST) // Not used in software
-#define STATUS_WTNG_FR_TRGGR_OFST     (3)
+#define DELAYAFTER_OFST                     (5) // Not used in software
-#define STATUS_WTNG_FR_TRGGR_MSK      (0x00000001 << STATUS_WTNG_FR_TRGGR_OFST)
+#define DELAYAFTER_MSK                      (0x00000001 << DELAYAFTER_OFST) // Not used in software
-#define STATUS_DLY_BFR_OFST           (4)
+#define STOPPED_OFST                        (15)
-#define STATUS_DLY_BFR_MSK            (0x00000001 << STATUS_DLY_BFR_OFST)
+#define STOPPED_MSK                         (0x00000001 << STOPPED_OFST)
-#define STATUS_DLY_AFTR_OFST          (5)
+#define RUNMACHINE_BUSY_OFST                (17)
-#define STATUS_DLY_AFTR_MSK           (0x00000001 << STATUS_DLY_AFTR_OFST)
+#define RUNMACHINE_BUSY_MSK                 (0x00000001 << RUNMACHINE_BUSY_OFST)
-#define STATUS_EXPSNG_OFST            (6)
-#define STATUS_EXPSNG_MSK             (0x00000001 << STATUS_EXPSNG_OFST)
-#define STATUS_CNT_ENBL_OFST          (7)
-#define STATUS_CNT_ENBL_MSK           (0x00000001 << STATUS_CNT_ENBL_OFST)
-#define STATUS_SM_FF_FLL_OFST         (11)
-#define STATUS_SM_FF_FLL_MSK          (0x00000001 << STATUS_SM_FF_FLL_OFST)
-#define STATUS_STPPD_OFST             (15)
-#define STATUS_STPPD_MSK              (0x00000001 << STATUS_STPPD_OFST)
-#define STATUS_ALL_FF_EMPTY_OFST      (16)
-#define STATUS_ALL_FF_EMPTY_MSK       (0x00000001 << STATUS_ALL_FF_EMPTY_OFST)
-#define STATUS_CYCL_RN_BSY_OFST       (17)
-#define STATUS_CYCL_RN_BSY_MSK        (0x00000001 << STATUS_CYCL_RN_BSY_OFST)
-#define STATUS_FRM_RN_BSY_OFST        (18)
-#define STATUS_FRM_RN_BSY_MSK         (0x00000001 << STATUS_FRM_RN_BSY_OFST)
-#define STATUS_ADC_DESERON_OFST       (19)
-#define STATUS_ADC_DESERON_MSK        (0x00000001 << STATUS_ADC_DESERON_OFST)
-#define STATUS_PLL_RCNFG_BSY_OFST     (20)
-#define STATUS_PLL_RCNFG_BSY_MSK      (0x00000001 << STATUS_PLL_RCNFG_BSY_OFST)
-#define STATUS_DT_STRMNG_BSY_OFST     (21)
-#define STATUS_DT_STRMNG_BSY_MSK      (0x00000001 << STATUS_DT_STRMNG_BSY_OFST)
-#define STATUS_FRM_PCKR_BSY_OFST      (22)
-#define STATUS_FRM_PCKR_BSY_MSK       (0x00000001 << STATUS_FRM_PCKR_BSY_OFST)
-#define STATUS_PLL_PHS_DN_OFST        (23)
-#define STATUS_PLL_PHS_DN_MSK         (0x00000001 << STATUS_PLL_PHS_DN_OFST)
-#define STATUS_PT_CNTRL_STTS_OFF_OFST (24)
-#define STATUS_PT_CNTRL_STTS_OFF_MSK                                           \
-    (0x000000FF << STATUS_PT_CNTRL_STTS_OFF_OFST)
-#define STATUS_IDLE_MSK (0x677FF)
 
-/* Look at me RO register TODO */
+/* Look at me register */
-#define LOOK_AT_ME_REG (0x03 << MEM_MAP_SHIFT)
+#define LOOK_AT_ME_REG                      (0x03 << MEM_MAP_SHIFT) // Not used in firmware or software
 
-/* System Status RO register */
+/* System Status register */
-#define SYSTEM_STATUS_REG (0x04 << MEM_MAP_SHIFT)
+#define SYSTEM_STATUS_REG                   (0x04 << MEM_MAP_SHIFT) // Not used in software
 
-#define SYSTEM_STATUS_DDR3_CLBRTN_OK_OFST (0)
+#define DDR3_CAL_DONE_OFST                  (0) // Not used in software
-#define SYSTEM_STATUS_DDR3_CLBRTN_OK_MSK                                       \
+#define DDR3_CAL_DONE_MSK                   (0x00000001 << DDR3_CAL_DONE_OFST) // Not used in software
-    (0x00000001 << SYSTEM_STATUS_DDR3_CLBRTN_OK_OFST)
+#define DDR3_CAL_FAIL_OFST                  (1)         // Not used in software
-#define SYSTEM_STATUS_DDR3_CLBRTN_FL_OFST (1)
+#define DDR3_CAL_FAIL_MSK                   (0x00000001 << DDR3_CAL_FAIL_OFST) // Not used in software
-#define SYSTEM_STATUS_DDR3_CLBRTN_FL_MSK                                       \
+#define DDR3_INIT_DONE_OFST                 (2)        // Not used in software
-    (0x00000001 << SYSTEM_STATUS_DDR3_CLBRTN_FL_OFST)
+#define DDR3_INIT_DONE_MSK                  (0x00000001 << DDR3_INIT_DONE_OFST) // Not used in software
-#define SYSTEM_STATUS_DDR3_INT_DN_OFST (2)
+#define RECONFIG_PLL_LCK_OFST               (3)       // Not used in software
-#define SYSTEM_STATUS_DDR3_INT_DN_MSK                                          \
+#define RECONFIG_PLL_LCK_MSK                (0x00000001 << RECONFIG_PLL_LCK_OFST)               // Not used in software
-    (0x00000001 << SYSTEM_STATUS_DDR3_INT_DN_OFST)
+#define PLL_A_LCK_OFST                      (4)                            // Not used in software
-#define SYSTEM_STATUS_RCNFG_PLL_LCK_OFST (3)
+#define PLL_A_LCK_MSK                       (0x00000001 << PLL_A_LCK_OFST) // Not used in software
-#define SYSTEM_STATUS_RCNFG_PLL_LCK_MSK                                        \
+#define DD3_PLL_LCK_OFST                    (5)                            // Not used in software
-    (0x00000001 << SYSTEM_STATUS_RCNFG_PLL_LCK_OFST)
+#define DD3_PLL_LCK_MSK                     (0x00000001 << DD3_PLL_LCK_OFST) // Not used in software
-#define SYSTEM_STATUS_PLL_A_LCK_OFST (4)
-#define SYSTEM_STATUS_PLL_A_LCK_MSK  (0x00000001 << SYSTEM_STATUS_PLL_A_LCK_OFST)
 
-/* PLL Param (Reconfiguratble PLL Parameter) RO register TODO FIXME: Same as
+/* Module Control Board Serial Number Register */
- * PLL_PARAM_REG 0x50 */
+#define MOD_SERIAL_NUM_REG                  (0x0A << MEM_MAP_SHIFT)
-//#define PLL_PARAM_REG                       (0x05 << MEM_MAP_SHIFT)
 
-/* FIFO Data RO register TODO */
+#define HARDWARE_SERIAL_NUM_OFST            (0)
-#define FIFO_DATA_REG (0x06 << MEM_MAP_SHIFT)
+#define HARDWARE_SERIAL_NUM_MSK             (0x000000FF << HARDWARE_SERIAL_NUM_OFST)
+#define HARDWARE_VERSION_NUM_OFST           (16)
+#define HARDWARE_VERSION_NUM_MSK            (0x0000003F << HARDWARE_VERSION_NUM_OFST)
 
-#define FIFO_DATA_HRDWR_SRL_NMBR_OFST (0)
+/* API Version Register */
-#define FIFO_DATA_HRDWR_SRL_NMBR_MSK                                           \
-    (0x0000FFFF << FIFO_DATA_HRDWR_SRL_NMBR_OFST)
-//#define FIFO_DATA_WRD_OFST                  (16)
-//#define FIFO_DATA_WRD_MSK                   (0x0000FFFF << FIFO_DATA_WRD_OFST)
-
-/* FIFO Status RO register TODO */
-#define FIFO_STATUS_REG (0x07 << MEM_MAP_SHIFT)
-
-/* FIFO Empty RO register TODO */
-#define FIFO_EMPTY_REG           (0x08 << MEM_MAP_SHIFT)
-#define FIFO_EMPTY_ALL_EMPTY_MSK (0xFFFFFFFF)
-
-/* FIFO Full RO register TODO */
-#define FIFO_FULL_REG (0x09 << MEM_MAP_SHIFT)
-
-/* MCB Serial Number RO register */
-#define MOD_SERIAL_NUMBER_REG (0x0A << MEM_MAP_SHIFT)
-
-#define MOD_SERIAL_NUMBER_OFST      (0)
-#define MOD_SERIAL_NUMBER_MSK       (0x000000FF << MOD_SERIAL_NUMBER_OFST)
-#define MOD_SERIAL_NUMBER_VRSN_OFST (16)
-#define MOD_SERIAL_NUMBER_VRSN_MSK  (0x0000003F << MOD_SERIAL_NUMBER_VRSN_OFST)
-
-/* API Version RO register */
 #define API_VERSION_REG                     (0x0F << MEM_MAP_SHIFT)
 
 #define API_VERSION_OFST                    (0)
 #define API_VERSION_MSK                     (0x00FFFFFF << API_VERSION_OFST)
-#define API_VERSION_DTCTR_TYP_OFST (24)
+#define API_VERSION_DETECTOR_TYPE_OFST      (24) // Not used in software
-#define API_VERSION_DTCTR_TYP_MSK  (0x000000FF << API_VERSION_DTCTR_TYP_OFST)
+#define API_VERSION_DETECTOR_TYPE_MSK       (0x000000FF << API_VERSION_DETECTOR_TYPE_OFST) // Not used in software
 
-/* Time from Start 64 bit RO register. t = GCLK x 50 ns. Reset using
+/* Time from Start 64 bit register */
- * CONTROL_CRST. TODO */
 #define TIME_FROM_START_LSB_REG             (0x10 << MEM_MAP_SHIFT)
 #define TIME_FROM_START_MSB_REG             (0x11 << MEM_MAP_SHIFT)
 
-/* Delay Left 64 bit RO register. t = DLY x 50 ns. TODO */
+/* Get Delay 64 bit register */
-#define DELAY_LEFT_LSB_REG (0x12 << MEM_MAP_SHIFT)
+#define GET_DELAY_LSB_REG                   (0x12 << MEM_MAP_SHIFT) // different kind of delay
-#define DELAY_LEFT_MSB_REG (0x13 << MEM_MAP_SHIFT)
+#define GET_DELAY_MSB_REG                   (0x13 << MEM_MAP_SHIFT) // different kind of delay
 
-/* Triggers Left 64 bit RO register TODO */
+/* Get Triggers 64 bit register */
-#define CYCLES_LEFT_LSB_REG (0x14 << MEM_MAP_SHIFT)
+#define GET_CYCLES_LSB_REG                  (0x14 << MEM_MAP_SHIFT)
-#define CYCLES_LEFT_MSB_REG (0x15 << MEM_MAP_SHIFT)
+#define GET_CYCLES_MSB_REG                  (0x15 << MEM_MAP_SHIFT)
 
-/* Frames Left 64 bit RO register TODO */
+/* Get Frames 64 bit register */
-#define FRAMES_LEFT_LSB_REG (0x16 << MEM_MAP_SHIFT)
+#define GET_FRAMES_LSB_REG                  (0x16 << MEM_MAP_SHIFT)
-#define FRAMES_LEFT_MSB_REG (0x17 << MEM_MAP_SHIFT)
+#define GET_FRAMES_MSB_REG                  (0x17 << MEM_MAP_SHIFT)
 
-/* Period Left 64 bit RO register. t = T x 50 ns. TODO */
+/* Get Period 64 bit register tT = T x 50 ns */
-#define PERIOD_LEFT_LSB_REG (0x18 << MEM_MAP_SHIFT)
+#define GET_PERIOD_LSB_REG                  (0x18 << MEM_MAP_SHIFT)
-#define PERIOD_LEFT_MSB_REG (0x19 << MEM_MAP_SHIFT)
+#define GET_PERIOD_MSB_REG                  (0x19 << MEM_MAP_SHIFT)
 
-/* Exposure Time Left 64 bit RO register */
+/** Get Temperature Carlos, incorrectl as get gates */
-//#define EXPTIME_LEFT_LSB_REG                (0x1A << MEM_MAP_SHIFT) // Not
+#define GET_TEMPERATURE_TMP112_REG          (0x1c << MEM_MAP_SHIFT) // (after multiplying by 625) in 10ths of
-// used in FW #define EXPTIME_LEFT_MSB_REG                (0x1B <<
+                            // millidegrees of TMP112
-// MEM_MAP_SHIFT)
-//// Not used in FW
 
-/* Gates Left 64 bit RO register */
+#define TEMPERATURE_VALUE_BIT               (0)
-//#define GATES_LEFT_LSB_REG                  (0x1C << MEM_MAP_SHIFT) // Not
+#define TEMPERATURE_VALUE_MSK               (0x000007FF << TEMPERATURE_VALUE_BIT)
-// used in FW #define GATES_LEFT_MSB_REG                  (0x1D <<
+#define TEMPERATURE_POLARITY_BIT            (11)
-// MEM_MAP_SHIFT)
+#define TEMPERATURE_POLARITY_MSK            (0x00000001 << TEMPERATURE_POLARITY_BIT)
-//// Not used in FW
 
-/* Data In 64 bit RO register TODO */
+/* Config Status Register for chip 1.1 */
-#define DATA_IN_LSB_REG (0x1E << MEM_MAP_SHIFT)
+#define CONFIG_V11_STATUS_REG               (0x1D << MEM_MAP_SHIFT)
-#define DATA_IN_MSB_REG (0x1F << MEM_MAP_SHIFT)
 
-/* Pattern Out 64 bit RO register */
+#define CONFIG_V11_STATUS_FLTR_CLL_OFST         (0) 
-#define PATTERN_OUT_LSB_REG (0x20 << MEM_MAP_SHIFT)
+#define CONFIG_V11_STATUS_FLTR_CLL_MSK          (0x00000FFF << CONFIG_V11_STATUS_FLTR_CLL_OFST)
-#define PATTERN_OUT_MSB_REG (0x21 << MEM_MAP_SHIFT)
+// CSM mode = high current (100%), low current (16%)
+#define CONFIG_V11_STATUS_CRRNT_SRC_LOW_OFST    (19) 
+#define CONFIG_V11_STATUS_CRRNT_SRC_LOW_MSK     (0x00000001 << CONFIG_V11_STATUS_CRRNT_SRC_LOW_OFST)
+#define CONFIG_V11_STATUS_FLTR_RSSTR_SMLR_OFST  (21) 
+#define CONFIG_V11_STATUS_FLTR_RSSTR_SMLR_MSK   (0x00000001 << CONFIG_V11_STATUS_FLTR_RSSTR_SMLR_OFST)
+#define CONFIG_V11_STATUS_AUTO_MODE_OVRRD_OFST  (23) 
+#define CONFIG_V11_STATUS_AUTO_MODE_OVRRD_MSK   (0x00000001 << CONFIG_V11_STATUS_AUTO_MODE_OVRRD_OFST)
 
-/* Frame number of next acquisition register (64 bit register) */
+/* Get Frames from Start 64 bit register (frames from last reset using
-#define NEXT_FRAME_NUMB_LOCAL_LSB_REG (0x22 << MEM_MAP_SHIFT)
+ * CONTROL_CRST) */
-#define NEXT_FRAME_NUMB_LOCAL_MSB_REG (0x23 << MEM_MAP_SHIFT)
+#define FRAMES_FROM_START_LSB_REG           (0x22 << MEM_MAP_SHIFT)
+#define FRAMES_FROM_START_MSB_REG           (0x23 << MEM_MAP_SHIFT)
 
-/* Frames From Start PG 64 bit RO register. Reset using CONTROL_CRST. TODO */
+/* Get Starting Frame Number */
-#define FRAMES_FROM_START_PG_LSB_REG (0x24 << MEM_MAP_SHIFT)
+#define GET_FRAME_NUMBER_LSB_REG            (0x24 << MEM_MAP_SHIFT)
-#define FRAMES_FROM_START_PG_MSB_REG (0x25 << MEM_MAP_SHIFT)
+#define GET_FRAME_NUMBER_MSB_REG            (0x25 << MEM_MAP_SHIFT)
 
-/* Start Frame Time (Measurement Time) 64 bit register (timestamp at a frame
+/* Measurement Time 64 bit register (timestamp at a frame start until reset)*/
- * start until reset) TODO */
 #define START_FRAME_TIME_LSB_REG            (0x26 << MEM_MAP_SHIFT)
 #define START_FRAME_TIME_MSB_REG            (0x27 << MEM_MAP_SHIFT)
 
-/* Power Status RO register */
+/* SPI (Serial Peripheral Interface) Register */
-#define POWER_STATUS_REG (0x29 << MEM_MAP_SHIFT)
-
-#define POWER_STATUS_ALRT_OFST (27)
-#define POWER_STATUS_ALRT_MSK  (0x0000001F << POWER_STATUS_ALRT_OFST)
-
-/* DAC Value Out RO register */
-//#define DAC_VAL_OUT_REG                     (0x2A << MEM_MAP_SHIFT)
-
-/* Slow ADC SPI Value RO register */
-#define ADC_SPI_SLOW_VAL_REG (0x2B << MEM_MAP_SHIFT)
-
-/* FIFO Digital In Status RO register */
-#define FIFO_DIN_STATUS_REG            (0x3B << MEM_MAP_SHIFT)
-#define FIFO_DIN_STATUS_FIFO_FULL_OFST (30)
-#define FIFO_DIN_STATUS_FIFO_FULL_MSK                                          \
-    (0x00000001 << FIFO_DIN_STATUS_FIFO_FULL_OFST)
-#define FIFO_DIN_STATUS_FIFO_EMPTY_OFST (31)
-#define FIFO_DIN_STATUS_FIFO_EMPTY_MSK                                         \
-    (0x00000001 << FIFO_DIN_STATUS_FIFO_EMPTY_OFST)
-
-/* FIFO Digital In 64 bit RO register */
-#define FIFO_DIN_LSB_REG (0x3C << MEM_MAP_SHIFT)
-#define FIFO_DIN_MSB_REG (0x3D << MEM_MAP_SHIFT)
-
-/* SPI (Serial Peripheral Interface) DAC, HV RW register */
 #define SPI_REG                             (0x40 << MEM_MAP_SHIFT)
 
 #define SPI_DAC_SRL_DGTL_OTPT_OFST          (0)
@@ -219,7 +141,7 @@
 #define SPI_HV_SRL_CS_OTPT_OFST             (10)
 #define SPI_HV_SRL_CS_OTPT_MSK              (0x00000001 << SPI_HV_SRL_CS_OTPT_OFST)
 
-/* ADC SPI (Serial Peripheral Interface) RW register */
+/* ADC SPI (Serial Peripheral Interface) Register */
 #define ADC_SPI_REG                         (0x41 << MEM_MAP_SHIFT)
 
 #define ADC_SPI_SRL_CLK_OTPT_OFST           (0)
@@ -228,415 +150,318 @@
 #define ADC_SPI_SRL_DT_OTPT_MSK             (0x00000001 << ADC_SPI_SRL_DT_OTPT_OFST)
 #define ADC_SPI_SRL_CS_OTPT_OFST            (2)
 #define ADC_SPI_SRL_CS_OTPT_MSK             (0x0000000F << ADC_SPI_SRL_CS_OTPT_OFST)
-#define ADC_SPI_SLOW_SRL_DT_OFST  (8)
-#define ADC_SPI_SLOW_SRL_DT_MSK   (0x00000001 << ADC_SPI_SLOW_SRL_DT_OFST)
-#define ADC_SPI_SLOW_SRL_CLK_OFST (9)
-#define ADC_SPI_SLOW_SRL_CLK_MSK  (0x00000001 << ADC_SPI_SLOW_SRL_CLK_OFST)
-#define ADC_SPI_SLOW_SRL_CNV_OFST (10)
-#define ADC_SPI_SLOW_SRL_CNV_MSK  (0x00000001 << ADC_SPI_SLOW_SRL_CNV_OFST)
 
-/* ADC Offset RW register */
+/* ADC offset Register */
-#define ADC_OFFSET_REG (0x42 << MEM_MAP_SHIFT)
+#define ADC_OFST_REG                        (0x42 << MEM_MAP_SHIFT)
 
-#define ADC_OFFSET_ADC_PPLN_OFST (0)
+/* ADC Port Invert Register */
-#define ADC_OFFSET_ADC_PPLN_MSK  (0x000000FF << ADC_OFFSET_ADC_PPLN_OFST)
-#define ADC_OFFSET_DBT_PPLN_OFST (16)
-#define ADC_OFFSET_DBT_PPLN_MSK  (0x000000FF << ADC_OFFSET_DBT_PPLN_OFST)
-
-/* ADC Port Invert RW register */
 #define ADC_PORT_INVERT_REG                 (0x43 << MEM_MAP_SHIFT)
 
-#define ADC_PORT_INVERT_0_INPT_OFST (0)
+#define ADC_PORT_INVERT_ADC_0_OFST          (0)
-#define ADC_PORT_INVERT_0_INPT_MSK  (0x000000FF << ADC_PORT_INVERT_0_INPT_OFST)
+#define ADC_PORT_INVERT_ADC_0_MSK           (0x000000FF << ADC_PORT_INVERT_ADC_0_OFST)
-#define ADC_PORT_INVERT_1_INPT_OFST (8)
+#define ADC_PORT_INVERT_ADC_1_OFST          (8)
-#define ADC_PORT_INVERT_1_INPT_MSK  (0x000000FF << ADC_PORT_INVERT_1_INPT_OFST)
+#define ADC_PORT_INVERT_ADC_1_MSK           (0x000000FF << ADC_PORT_INVERT_ADC_1_OFST)
-#define ADC_PORT_INVERT_2_INPT_OFST (16)
+#define ADC_PORT_INVERT_ADC_2_OFST          (16)
-#define ADC_PORT_INVERT_2_INPT_MSK  (0x000000FF << ADC_PORT_INVERT_2_INPT_OFST)
+#define ADC_PORT_INVERT_ADC_2_MSK           (0x000000FF << ADC_PORT_INVERT_ADC_2_OFST)
-#define ADC_PORT_INVERT_3_INPT_OFST (24)
+#define ADC_PORT_INVERT_ADC_3_OFST          (24)
-#define ADC_PORT_INVERT_3_INPT_MSK  (0x000000FF << ADC_PORT_INVERT_3_INPT_OFST)
+#define ADC_PORT_INVERT_ADC_3_MSK           (0x000000FF << ADC_PORT_INVERT_ADC_3_OFST)
 
-/* Dummy RW register */
+/** Read N Rows Register */
-#define DUMMY_REG (0x44 << MEM_MAP_SHIFT)
+#define READ_N_ROWS_REG                     (0x44 << MEM_MAP_SHIFT)
 
-#define DUMMY_FIFO_CHNNL_SLCT_OFST    (0)
+#define READ_N_ROWS_NUM_ROWS_OFST           (0)
-#define DUMMY_FIFO_CHNNL_SLCT_MSK     (0x0000003F << DUMMY_FIFO_CHNNL_SLCT_OFST)
+#define READ_N_ROWS_NUM_ROWS_MSK            (0x0000003F << READ_N_ROWS_NUM_ROWS_OFST)
-#define DUMMY_ANLG_FIFO_RD_STRBE_OFST (8)
+#define READ_N_ROWS_ENBL_OFST               (7)
-#define DUMMY_ANLG_FIFO_RD_STRBE_MSK                                           \
+#define READ_N_ROWS_ENBL_MSK                (0x00000001 << READ_N_ROWS_ENBL_OFST)
-    (0x00000001 << DUMMY_ANLG_FIFO_RD_STRBE_OFST)
-#define DUMMY_DGTL_FIFO_RD_STRBE_OFST (9)
-#define DUMMY_DGTL_FIFO_RD_STRBE_MSK                                           \
-    (0x00000001 << DUMMY_DGTL_FIFO_RD_STRBE_OFST)
 
-/* Receiver IP Address RW register */
-#define RX_IP_REG (0x45 << MEM_MAP_SHIFT)
 
-/* UDP Port RW register */
+/* Configuration Register */
-#define UDP_PORT_REG (0x46 << MEM_MAP_SHIFT)
-
-#define UDP_PORT_RX_OFST (0)
-#define UDP_PORT_RX_MSK  (0x0000FFFF << UDP_PORT_RX_OFST)
-#define UDP_PORT_TX_OFST (16)
-#define UDP_PORT_TX_MSK  (0x0000FFFF << UDP_PORT_TX_OFST)
-
-/* Receiver Mac Address 64 bit RW register */
-#define RX_MAC_LSB_REG (0x47 << MEM_MAP_SHIFT)
-#define RX_MAC_MSB_REG (0x48 << MEM_MAP_SHIFT)
-
-#define RX_MAC_LSB_OFST (0)
-#define RX_MAC_LSB_MSK  (0xFFFFFFFF << RX_MAC_LSB_OFST)
-#define RX_MAC_MSB_OFST (0)
-#define RX_MAC_MSB_MSK  (0x0000FFFF << RX_MAC_MSB_OFST)
-
-/* Detector/ Transmitter Mac Address 64 bit RW register */
-#define TX_MAC_LSB_REG (0x49 << MEM_MAP_SHIFT)
-#define TX_MAC_MSB_REG (0x4A << MEM_MAP_SHIFT)
-
-#define TX_MAC_LSB_OFST (0)
-#define TX_MAC_LSB_MSK  (0xFFFFFFFF << TX_MAC_LSB_OFST)
-#define TX_MAC_MSB_OFST (0)
-#define TX_MAC_MSB_MSK  (0x0000FFFF << TX_MAC_MSB_OFST)
-
-/* Detector/ Transmitter IP Address RW register */
-#define TX_IP_REG (0x4B << MEM_MAP_SHIFT)
-
-/* Detector/ Transmitter IP Checksum RW register */
-#define TX_IP_CHECKSUM_REG (0x4C << MEM_MAP_SHIFT)
-
-#define TX_IP_CHECKSUM_OFST (0)
-#define TX_IP_CHECKSUM_MSK  (0x0000FFFF << TX_IP_CHECKSUM_OFST)
-
-/* Configuration RW register */
 #define CONFIG_REG                          (0x4D << MEM_MAP_SHIFT)
 
-#define CONFIG_LED_DSBL_OFST        (0) // Not used in firmware or software
+// readout timer (from chip) to stabilize (esp in burst acquisition mode) tRDT =
-#define CONFIG_LED_DSBL_MSK         (0x00000001 << CONFIG_LED_DSBL_OFST)
+// (RDT + 1) * 25ns
-#define CONFIG_DSBL_ANLG_OTPT_OFST  (8)
+#define CONFIG_RDT_TMR_OFST                 (0)
-#define CONFIG_DSBL_ANLG_OTPT_MSK   (0x00000001 << CONFIG_DSBL_ANLG_OTPT_OFST)
+#define CONFIG_RDT_TMR_MSK                  (0x0000FFFF << CONFIG_RDT_TMR_OFST)
-#define CONFIG_ENBLE_DGTL_OTPT_OFST (9)
+// if 0, outer is the primary interface
-#define CONFIG_ENBLE_DGTL_OTPT_MSK  (0x00000001 << CONFIG_ENBLE_DGTL_OTPT_OFST)
+// bottom via port 0 (outer)
-#define CONFIG_GB10_SND_UDP_OFST    (12)
+#define CONFIG_OPRTN_MDE_2_X_10GbE_OFST     (16)
-#define CONFIG_GB10_SND_UDP_MSK     (0x00000001 << CONFIG_GB10_SND_UDP_OFST)
+#define CONFIG_OPRTN_MDE_2_X_10GbE_MSK      (0x00000001 << CONFIG_OPRTN_MDE_2_X_10GbE_OFST) 
+#define CONFIG_INNR_PRIMRY_INTRFCE_OFST     (17)
+#define CONFIG_INNR_PRIMRY_INTRFCE_MSK      (0x00000001 << CONFIG_INNR_PRIMRY_INTRFCE_OFST)
+#define CONFIG_READOUT_SPEED_OFST           (20)
+#define CONFIG_READOUT_SPEED_MSK            (0x00000003 << CONFIG_READOUT_SPEED_OFST)
+#define CONFIG_QUARTER_SPEED_10MHZ_VAL      ((0x0 << CONFIG_READOUT_SPEED_OFST) & CONFIG_READOUT_SPEED_MSK)
+#define CONFIG_HALF_SPEED_20MHZ_VAL         ((0x1 << CONFIG_READOUT_SPEED_OFST) & CONFIG_READOUT_SPEED_MSK)
+#define CONFIG_FULL_SPEED_40MHZ_VAL         ((0x2 << CONFIG_READOUT_SPEED_OFST) & CONFIG_READOUT_SPEED_MSK)
+#define CONFIG_TDMA_ENABLE_OFST             (24)
+#define CONFIG_TDMA_ENABLE_MSK              (0x00000001 << CONFIG_TDMA_ENABLE_OFST)
+#define CONFIG_TDMA_TIMESLOT_OFST           (25) // 1ms
+#define CONFIG_TDMA_TIMESLOT_MSK            (0x0000001F << CONFIG_TDMA_TIMESLOT_OFST)
+#define CONFIG_BOTTOM_INVERT_STREAM_OFST    (30)
+#define CONFIG_BOTTOM_INVERT_STREAM_MSK     (0x00000001 << CONFIG_BOTTOM_INVERT_STREAM_OFST)
+#define CONFIG_ETHRNT_FLW_CNTRL_OFST        (31)
+#define CONFIG_ETHRNT_FLW_CNTRL_MSK         (0x00000001 << CONFIG_ETHRNT_FLW_CNTRL_OFST)
 
-/* External Signal RW register */
+/* External Signal Register */
 #define EXT_SIGNAL_REG                      (0x4E << MEM_MAP_SHIFT)
 
 #define EXT_SIGNAL_OFST                     (0)
 #define EXT_SIGNAL_MSK                      (0x00000001 << EXT_SIGNAL_OFST)
-#define EXT_SIGNAL_AUTO_VAL  ((0x0 << EXT_SIGNAL_OFST) & EXT_SIGNAL_MSK)
+#define EXT_SYNC_OFST                       (4)
-#define EXT_SIGNAL_TRGGR_VAL ((0x1 << EXT_SIGNAL_OFST) & EXT_SIGNAL_MSK)
+#define EXT_SYNC_MSK                        (0x00000001 << EXT_SYNC_OFST)
 
-/* Control RW register */
+/* Control Register */
 #define CONTROL_REG                         (0x4F << MEM_MAP_SHIFT)
 
-#define CONTROL_STRT_ACQSTN_OFST (0)
+#define CONTROL_START_ACQ_OFST              (0)
-#define CONTROL_STRT_ACQSTN_MSK  (0x00000001 << CONTROL_STRT_ACQSTN_OFST)
+#define CONTROL_START_ACQ_MSK               (0x00000001 << CONTROL_START_ACQ_OFST)
-#define CONTROL_STP_ACQSTN_OFST  (1)
+#define CONTROL_STOP_ACQ_OFST               (1)
-#define CONTROL_STP_ACQSTN_MSK   (0x00000001 << CONTROL_STP_ACQSTN_OFST)
+#define CONTROL_STOP_ACQ_MSK                (0x00000001 << CONTROL_STOP_ACQ_OFST)
-//#define CONTROL_STRT_FF_TST_OFST            (2)
+#define CONTROL_SOFTWARE_TRIGGER_OFST       (2)
-//#define CONTROL_STRT_FF_TST_MSK             (0x00000001 <<
+#define CONTROL_SOFTWARE_TRIGGER_MSK        (0x00000001 << CONTROL_SOFTWARE_TRIGGER_OFST)
-// CONTROL_STRT_FF_TST_OFST) #define CONTROL_STP_FF_TST_OFST             (3)
+#define CONTROL_CORE_RST_OFST               (10)
-//#define CONTROL_STP_FF_TST_MSK              (0x00000001 <<
+#define CONTROL_CORE_RST_MSK                (0x00000001 << CONTROL_CORE_RST_OFST)
-// CONTROL_STP_FF_TST_OFST) #define CONTROL_STRT_RDT_OFST               (4)
+#define CONTROL_PERIPHERAL_RST_OFST         (11) // DDR3 HMem Ctrlr, GBE, Temp
-//#define CONTROL_STRT_RDT_MSK                (0x00000001 <<
+#define CONTROL_PERIPHERAL_RST_MSK          (0x00000001 << CONTROL_PERIPHERAL_RST_OFST) // DDR3 HMem Ctrlr, GBE, Temp
-// CONTROL_STRT_RDT_OFST) #define CONTROL_STP_RDT_OFST                (5)
+#define CONTROL_DDR3_MEM_RST_OFST           (12) // only PHY, not DDR3 PLL ,Not used in software
-// #define CONTROL_STP_RDT_MSK                 (0x00000001 <<
+#define CONTROL_DDR3_MEM_RST_MSK            (0x00000001 << CONTROL_DDR3_MEM_RST_OFST) // only PHY, not DDR3 PLL ,Not used in software
-// CONTROL_STP_RDT_OFST)
+#define CONTROL_ACQ_FIFO_CLR_OFST           (14)
-#define CONTROL_STRT_EXPSR_OFST (6)
+#define CONTROL_ACQ_FIFO_CLR_MSK            (0x00000001 << CONTROL_ACQ_FIFO_CLR_OFST)
-#define CONTROL_STRT_EXPSR_MSK  (0x00000001 << CONTROL_STRT_EXPSR_OFST)
+#define CONTROL_MASTER_OFST                 (15)
-//#define CONTROL_STP_EXPSR_OFST              (7)
+#define CONTROL_MASTER_MSK                  (0x00000001 << CONTROL_MASTER_OFST)
-//#define CONTROL_STP_EXPSR_MSK               (0x00000001 <<
+#define CONTROL_RX_ADDTNL_ENDPTS_NUM_OFST   (20)
-// CONTROL_STP_RDT_OFST) #define CONTROL_STRT_TRN_OFST               (8) #define
+#define CONTROL_RX_ADDTNL_ENDPTS_NUM_MSK    (0x0000003F << CONTROL_RX_ADDTNL_ENDPTS_NUM_OFST)
-// CONTROL_STRT_TRN_MSK                (0x00000001 << CONTROL_STRT_RDT_OFST)
+#define CONTROL_RX_ENDPTS_START_OFST        (26)
-//#define CONTROL_STP_TRN_OFST                (9)
+#define CONTROL_RX_ENDPTS_START_MSK         (0x0000003F << CONTROL_RX_ENDPTS_START_OFST)
-//#define CONTROL_STP_TRN_MSK                 (0x00000001 <<
-// CONTROL_STP_RDT_OFST)
-#define CONTROL_CRE_RST_OFST    (10)
-#define CONTROL_CRE_RST_MSK     (0x00000001 << CONTROL_CRE_RST_OFST)
-#define CONTROL_PRPHRL_RST_OFST (11) // Only GBE10?
-#define CONTROL_PRPHRL_RST_MSK  (0x00000001 << CONTROL_PRPHRL_RST_OFST)
-#define CONTROL_MMRY_RST_OFST   (12)
-#define CONTROL_MMRY_RST_MSK    (0x00000001 << CONTROL_MMRY_RST_OFST)
-//#define CONTROL_PLL_RCNFG_WR_OFST           (13)
-//#define CONTROL_PLL_RCNFG_WR_MSK            (0x00000001 <<
-// CONTROL_PLL_RCNFG_WR_OFST)
-#define CONTROL_SND_10GB_PCKT_OFST   (14)
-#define CONTROL_SND_10GB_PCKT_MSK    (0x00000001 << CONTROL_SND_10GB_PCKT_OFST)
-#define CONTROL_CLR_ACQSTN_FIFO_OFST (15)
-#define CONTROL_CLR_ACQSTN_FIFO_MSK  (0x00000001 << CONTROL_CLR_ACQSTN_FIFO_OFST)
 
-/* Reconfiguratble PLL Paramater RW register */
+/* Reconfiguratble PLL Paramater Register */
 #define PLL_PARAM_REG                       (0x50 << MEM_MAP_SHIFT)
 
-/* Reconfiguratble PLL Control RW regiser */
+/* Reconfiguratble PLL Control Regiser */
 #define PLL_CNTRL_REG                       (0x51 << MEM_MAP_SHIFT)
 
-#define PLL_CNTRL_RCNFG_PRMTR_RST_OFST (0)
+#define PLL_CNTRL_RCNFG_PRMTR_RST_OFST      (0) // parameter reset
-#define PLL_CNTRL_RCNFG_PRMTR_RST_MSK                                          \
+#define PLL_CNTRL_RCNFG_PRMTR_RST_MSK       (0x00000001 << PLL_CNTRL_RCNFG_PRMTR_RST_OFST) // parameter reset
-    (0x00000001 << PLL_CNTRL_RCNFG_PRMTR_RST_OFST)
 #define PLL_CNTRL_WR_PRMTR_OFST             (2)
 #define PLL_CNTRL_WR_PRMTR_MSK              (0x00000001 << PLL_CNTRL_WR_PRMTR_OFST)
 #define PLL_CNTRL_PLL_RST_OFST              (3)
 #define PLL_CNTRL_PLL_RST_MSK               (0x00000001 << PLL_CNTRL_PLL_RST_OFST)
+#define PLL_CNTRL_DBIT_WR_PRMTR_OFST        (5)
+#define PLL_CNTRL_DBIT_WR_PRMTR_MSK         (0x00000001 << PLL_CNTRL_DBIT_WR_PRMTR_OFST)
 #define PLL_CNTRL_ADDR_OFST                 (16)
 #define PLL_CNTRL_ADDR_MSK                  (0x0000003F << PLL_CNTRL_ADDR_OFST)
 
-/* Pattern Control RW register */
+/* Config Register for chip 1.1 */
-#define PATTERN_CNTRL_REG (0x52 << MEM_MAP_SHIFT)
+#define CONFIG_V11_REG                      (0x58 << MEM_MAP_SHIFT)
 
-#define PATTERN_CNTRL_WR_OFST   (0)
+#define CONFIG_V11_FLTR_CLL_OFST            (0) 
-#define PATTERN_CNTRL_WR_MSK    (0x00000001 << PATTERN_CNTRL_WR_OFST)
+#define CONFIG_V11_FLTR_CLL_MSK             (0x00000FFF << CONFIG_V11_FLTR_CLL_OFST)
-#define PATTERN_CNTRL_RD_OFST   (1)
+// CSM mode = high current (100%), low current (16%)
-#define PATTERN_CNTRL_RD_MSK    (0x00000001 << PATTERN_CNTRL_RD_OFST)
+#define CONFIG_V11_CRRNT_SRC_LOW_OFST       (19) 
-#define PATTERN_CNTRL_ADDR_OFST (16)
+#define CONFIG_V11_CRRNT_SRC_LOW_MSK        (0x00000001 << CONFIG_V11_CRRNT_SRC_LOW_OFST)
-#define PATTERN_CNTRL_ADDR_MSK  (0x00001FFF << PATTERN_CNTRL_ADDR_OFST)
+#define CONFIG_V11_FLTR_RSSTR_SMLR_OFST     (21) 
+#define CONFIG_V11_FLTR_RSSTR_SMLR_MSK      (0x00000001 << CONFIG_V11_FLTR_RSSTR_SMLR_OFST)
+#define CONFIG_V11_AUTO_MODE_OVRRD_OFST     (23) 
+#define CONFIG_V11_AUTO_MODE_OVRRD_MSK      (0x00000001 << CONFIG_V11_AUTO_MODE_OVRRD_OFST)
 
-/* Pattern Limit RW regiser */
+/* Sample Register */
-#define PATTERN_LIMIT_REG (0x53 << MEM_MAP_SHIFT)
+#define SAMPLE_REG                          (0x59 << MEM_MAP_SHIFT)
 
-#define PATTERN_LIMIT_STRT_OFST (0)
+#define SAMPLE_ADC_SAMPLE_SEL_OFST          (0)
-#define PATTERN_LIMIT_STRT_MSK  (0x00001FFF << PATTERN_LIMIT_STRT_OFST)
+#define SAMPLE_ADC_SAMPLE_SEL_MSK           (0x00000007 << SAMPLE_ADC_SAMPLE_SEL_OFST)
-#define PATTERN_LIMIT_STP_OFST  (16)
+#define SAMPLE_ADC_SAMPLE_0_VAL             ((0x0 << SAMPLE_ADC_SAMPLE_SEL_OFST) & SAMPLE_ADC_SAMPLE_SEL_MSK)
-#define PATTERN_LIMIT_STP_MSK   (0x00001FFF << PATTERN_LIMIT_STP_OFST)
+#define SAMPLE_ADC_SAMPLE_1_VAL             ((0x1 << SAMPLE_ADC_SAMPLE_SEL_OFST) & SAMPLE_ADC_SAMPLE_SEL_MSK)
+#define SAMPLE_ADC_SAMPLE_2_VAL             ((0x2 << SAMPLE_ADC_SAMPLE_SEL_OFST) & SAMPLE_ADC_SAMPLE_SEL_MSK)
+#define SAMPLE_ADC_SAMPLE_3_VAL             ((0x3 << SAMPLE_ADC_SAMPLE_SEL_OFST) & SAMPLE_ADC_SAMPLE_SEL_MSK)
+#define SAMPLE_ADC_SAMPLE_4_VAL             ((0x4 << SAMPLE_ADC_SAMPLE_SEL_OFST) & SAMPLE_ADC_SAMPLE_SEL_MSK)
+#define SAMPLE_ADC_SAMPLE_5_VAL             ((0x5 << SAMPLE_ADC_SAMPLE_SEL_OFST) & SAMPLE_ADC_SAMPLE_SEL_MSK)
+#define SAMPLE_ADC_SAMPLE_6_VAL             ((0x6 << SAMPLE_ADC_SAMPLE_SEL_OFST) & SAMPLE_ADC_SAMPLE_SEL_MSK)
+#define SAMPLE_ADC_SAMPLE_7_VAL             ((0x7 << SAMPLE_ADC_SAMPLE_SEL_OFST) & SAMPLE_ADC_SAMPLE_SEL_MSK)
+// Decimation = ADF + 1
+#define SAMPLE_ADC_DECMT_FACTOR_OFST        (4)
+#define SAMPLE_ADC_DECMT_FACTOR_MSK         (0x00000007 << SAMPLE_ADC_DECMT_FACTOR_OFST)
+#define SAMPLE_ADC_DECMT_FACTOR_0_VAL       ((0x0 << SAMPLE_ADC_DECMT_FACTOR_OFST) & SAMPLE_ADC_DECMT_FACTOR_MSK)
+#define SAMPLE_ADC_DECMT_FACTOR_1_VAL       ((0x1 << SAMPLE_ADC_DECMT_FACTOR_OFST) & SAMPLE_ADC_DECMT_FACTOR_MSK)
+#define SAMPLE_ADC_DECMT_FACTOR_2_VAL       ((0x2 << SAMPLE_ADC_DECMT_FACTOR_OFST) & SAMPLE_ADC_DECMT_FACTOR_MSK)
+#define SAMPLE_ADC_DECMT_FACTOR_3_VAL       ((0x3 << SAMPLE_ADC_DECMT_FACTOR_OFST) & SAMPLE_ADC_DECMT_FACTOR_MSK)
+#define SAMPLE_ADC_DECMT_FACTOR_4_VAL       ((0x4 << SAMPLE_ADC_DECMT_FACTOR_OFST) & SAMPLE_ADC_DECMT_FACTOR_MSK)
+#define SAMPLE_ADC_DECMT_FACTOR_5_VAL       ((0x5 << SAMPLE_ADC_DECMT_FACTOR_OFST) & SAMPLE_ADC_DECMT_FACTOR_MSK)
+#define SAMPLE_ADC_DECMT_FACTOR_6_VAL       ((0x6 << SAMPLE_ADC_DECMT_FACTOR_OFST) & SAMPLE_ADC_DECMT_FACTOR_MSK)
+#define SAMPLE_ADC_DECMT_FACTOR_7_VAL       ((0x7 << SAMPLE_ADC_DECMT_FACTOR_OFST) & SAMPLE_ADC_DECMT_FACTOR_MSK)
 
-/* Pattern Loop 0 Address RW regiser */
+#define SAMPLE_DGTL_SAMPLE_SEL_OFST         (8)
-#define PATTERN_LOOP_0_ADDR_REG (0x54 << MEM_MAP_SHIFT)
+#define SAMPLE_DGTL_SAMPLE_SEL_MSK          (0x0000000F << SAMPLE_DGTL_SAMPLE_SEL_OFST)
+#define SAMPLE_DGTL_SAMPLE_0_VAL            ((0x0 << SAMPLE_DGTL_SAMPLE_SEL_OFST) & SAMPLE_DGTL_SAMPLE_SEL_MSK)
+#define SAMPLE_DGTL_SAMPLE_1_VAL            ((0x1 << SAMPLE_DGTL_SAMPLE_SEL_OFST) & SAMPLE_DGTL_SAMPLE_SEL_MSK)
+#define SAMPLE_DGTL_SAMPLE_2_VAL            ((0x2 << SAMPLE_DGTL_SAMPLE_SEL_OFST) & SAMPLE_DGTL_SAMPLE_SEL_MSK)
+#define SAMPLE_DGTL_SAMPLE_3_VAL            ((0x3 << SAMPLE_DGTL_SAMPLE_SEL_OFST) & SAMPLE_DGTL_SAMPLE_SEL_MSK)
+#define SAMPLE_DGTL_SAMPLE_4_VAL            ((0x4 << SAMPLE_DGTL_SAMPLE_SEL_OFST) & SAMPLE_DGTL_SAMPLE_SEL_MSK)
+#define SAMPLE_DGTL_SAMPLE_5_VAL            ((0x5 << SAMPLE_DGTL_SAMPLE_SEL_OFST) & SAMPLE_DGTL_SAMPLE_SEL_MSK)
+#define SAMPLE_DGTL_SAMPLE_6_VAL            ((0x6 << SAMPLE_DGTL_SAMPLE_SEL_OFST) & SAMPLE_DGTL_SAMPLE_SEL_MSK)
+#define SAMPLE_DGTL_SAMPLE_7_VAL            ((0x7 << SAMPLE_DGTL_SAMPLE_SEL_OFST) & SAMPLE_DGTL_SAMPLE_SEL_MSK)
+#define SAMPLE_DGTL_SAMPLE_8_VAL            ((0x8 << SAMPLE_DGTL_SAMPLE_SEL_OFST) & SAMPLE_DGTL_SAMPLE_SEL_MSK)
+#define SAMPLE_DGTL_SAMPLE_9_VAL            ((0x9 << SAMPLE_DGTL_SAMPLE_SEL_OFST) & SAMPLE_DGTL_SAMPLE_SEL_MSK)
+#define SAMPLE_DGTL_SAMPLE_10_VAL           ((0xa << SAMPLE_DGTL_SAMPLE_SEL_OFST) & SAMPLE_DGTL_SAMPLE_SEL_MSK)
+#define SAMPLE_DGTL_SAMPLE_11_VAL           ((0xb << SAMPLE_DGTL_SAMPLE_SEL_OFST) & SAMPLE_DGTL_SAMPLE_SEL_MSK)
+#define SAMPLE_DGTL_SAMPLE_12_VAL           ((0xc << SAMPLE_DGTL_SAMPLE_SEL_OFST) & SAMPLE_DGTL_SAMPLE_SEL_MSK)
+#define SAMPLE_DGTL_SAMPLE_13_VAL           ((0xd << SAMPLE_DGTL_SAMPLE_SEL_OFST) & SAMPLE_DGTL_SAMPLE_SEL_MSK)
+#define SAMPLE_DGTL_SAMPLE_14_VAL           ((0xe << SAMPLE_DGTL_SAMPLE_SEL_OFST) & SAMPLE_DGTL_SAMPLE_SEL_MSK)
+#define SAMPLE_DGTL_SAMPLE_15_VAL           ((0xf << SAMPLE_DGTL_SAMPLE_SEL_OFST) & SAMPLE_DGTL_SAMPLE_SEL_MSK)
 
-#define PATTERN_LOOP_0_ADDR_STRT_OFST (0)
+#define SAMPLE_DGTL_DECMT_FACTOR_OFST       (12)
-#define PATTERN_LOOP_0_ADDR_STRT_MSK                                           \
+#define SAMPLE_DGTL_DECMT_FACTOR_MSK        (0x00000003 << SAMPLE_DGTL_DECMT_FACTOR_OFST)
-    (0x00001FFF << PATTERN_LOOP_0_ADDR_STRT_OFST)
+#define SAMPLE_DECMT_FACTOR_FULL_VAL        ((0x0 << SAMPLE_DGTL_DECMT_FACTOR_OFST) & SAMPLE_DGTL_DECMT_FACTOR_MSK)
-#define PATTERN_LOOP_0_ADDR_STP_OFST (16)
+#define SAMPLE_DECMT_FACTOR_HALF_VAL        ((0x1 << SAMPLE_DGTL_DECMT_FACTOR_OFST) & SAMPLE_DGTL_DECMT_FACTOR_MSK)
-#define PATTERN_LOOP_0_ADDR_STP_MSK  (0x00001FFF << PATTERN_LOOP_0_ADDR_STP_OFST)
+#define SAMPLE_DECMT_FACTOR_QUARTER_VAL     ((0x2 << SAMPLE_DGTL_DECMT_FACTOR_OFST) & SAMPLE_DGTL_DECMT_FACTOR_MSK)
 
-/* Pattern Loop 0 Iteration RW regiser */
+/** Current Source Column 0 (0 - 31)) */
-#define PATTERN_LOOP_0_ITERATION_REG (0x55 << MEM_MAP_SHIFT)
+#define CRRNT_SRC_COL_LSB_REG               (0x5A << MEM_MAP_SHIFT)
 
-/* Pattern Loop 1 Address RW regiser */
+/** Current Source Column 1 (32 - 63) */
-#define PATTERN_LOOP_1_ADDR_REG (0x56 << MEM_MAP_SHIFT)
+#define CRRNT_SRC_COL_MSB_REG               (0x5B << MEM_MAP_SHIFT)
 
-#define PATTERN_LOOP_1_ADDR_STRT_OFST (0)
+/** Vref Comp Mod Register */
-#define PATTERN_LOOP_1_ADDR_STRT_MSK                                           \
+#define EXT_DAQ_CTRL_REG                    (0x5C << MEM_MAP_SHIFT)
-    (0x00001FFF << PATTERN_LOOP_1_ADDR_STRT_OFST)
-#define PATTERN_LOOP_1_ADDR_STP_OFST (16)
-#define PATTERN_LOOP_1_ADDR_STP_MSK  (0x00001FFF << PATTERN_LOOP_1_ADDR_STP_OFST)
 
-/* Pattern Loop 1 Iteration RW regiser */
+#define EXT_DAQ_CTRL_VREF_COMP_OFST         (0)
-#define PATTERN_LOOP_1_ITERATION_REG (0x57 << MEM_MAP_SHIFT)
+#define EXT_DAQ_CTRL_VREF_COMP_MSK          (0x00000FFF << EXT_DAQ_CTRL_VREF_COMP_OFST)
+#define EXT_DAQ_CTRL_CMP_LGC_ENBL_OFST      (15)
+#define EXT_DAQ_CTRL_CMP_LGC_ENBL_MSK       (0x00000001 << EXT_DAQ_CTRL_CMP_LGC_ENBL_OFST)
+#define EXT_DAQ_CTRL_INPT_DETECT_OFST       (16)
+#define EXT_DAQ_CTRL_INPT_DETECT_MSK        (0x00000007 << EXT_DAQ_CTRL_INPT_DETECT_OFST)
+#define EXT_DAQ_CTRL_INPT_DETECT_ENBL_OFST  (19)
+#define EXT_DAQ_CTRL_INPT_DETECT_ENBL_MSK   (0x00000001 << EXT_DAQ_CTRL_INPT_DETECT_ENBL_OFST)
 
-/* Pattern Loop 2 Address RW regiser */
+/** DAQ Register */
-#define PATTERN_LOOP_2_ADDR_REG (0x58 << MEM_MAP_SHIFT)
+#define DAQ_REG                             (0x5D << MEM_MAP_SHIFT)
 
-#define PATTERN_LOOP_2_ADDR_STRT_OFST (0)
+// dynamic gain (default)
-#define PATTERN_LOOP_2_ADDR_STRT_MSK                                           \
+#define DAQ_HIGH_GAIN_OFST                  (0)
-    (0x00001FFF << PATTERN_LOOP_2_ADDR_STRT_OFST)
+#define DAQ_HIGH_GAIN_MSK                   (0x00000001 << DAQ_HIGH_GAIN_OFST)
-#define PATTERN_LOOP_2_ADDR_STP_OFST (16)
+#define DAQ_FIX_GAIN_OFST                   (1)
-#define PATTERN_LOOP_2_ADDR_STP_MSK  (0x00001FFF << PATTERN_LOOP_2_ADDR_STP_OFST)
+#define DAQ_FIX_GAIN_MSK                    (0x00000003 << DAQ_FIX_GAIN_OFST)
+#define DAQ_FIX_GAIN_STG_1_VAL              ((0x1 << DAQ_FIX_GAIN_OFST) & DAQ_FIX_GAIN_MSK)
+#define DAQ_FIX_GAIN_STG_2_VAL              ((0x3 << DAQ_FIX_GAIN_OFST) & DAQ_FIX_GAIN_MSK)
+#define DAQ_CMP_RST_OFST                    (4)
+#define DAQ_CMP_RST_MSK                     (0x00000001 << DAQ_CMP_RST_OFST)
+#define DAQ_CHIP11_VRSN_OFST                (7)
+#define DAQ_CHIP11_VRSN_MSK                 (0x00000001 << DAQ_CHIP11_VRSN_OFST)
+#define DAQ_FRCE_SWTCH_GAIN_OFST            (12)
+#define DAQ_FRCE_SWTCH_GAIN_MSK             (0x00000003 << DAQ_FRCE_SWTCH_GAIN_OFST)
+#define DAQ_FRCE_GAIN_STG_0_VAL             ((0x0 << DAQ_FRCE_SWTCH_GAIN_OFST) & DAQ_FRCE_SWTCH_GAIN_MSK)
+#define DAQ_FRCE_GAIN_STG_1_VAL             ((0x1 << DAQ_FRCE_SWTCH_GAIN_OFST) & DAQ_FRCE_SWTCH_GAIN_MSK)
+#define DAQ_FRCE_GAIN_STG_2_VAL             ((0x3 << DAQ_FRCE_SWTCH_GAIN_OFST) & DAQ_FRCE_SWTCH_GAIN_MSK)
+#define DAQ_ELCTRN_CLLCTN_MDE_OFST          (14)
+#define DAQ_ELCTRN_CLLCTN_MDE_MSK           (0x00000001 << DAQ_ELCTRN_CLLCTN_MDE_OFST)
+#define DAQ_G2_CNNT_OFST                    (15)
+#define DAQ_G2_CNNT_MSK                     (0x00000001 << DAQ_G2_CNNT_OFST)
+#define DAQ_CRRNT_SRC_ENBL_OFST             (16)
+#define DAQ_CRRNT_SRC_ENBL_MSK              (0x00000001 << DAQ_CRRNT_SRC_ENBL_OFST)
+#define DAQ_CRRNT_SRC_CLMN_FIX_OFST         (17)
+#define DAQ_CRRNT_SRC_CLMN_FIX_MSK          (0x00000001 << DAQ_CRRNT_SRC_CLMN_FIX_OFST)
+#define DAQ_CRRNT_SRC_CLMN_SLCT_OFST        (20)
+#define DAQ_CRRNT_SRC_CLMN_SLCT_MSK         (0x0000003F << DAQ_CRRNT_SRC_CLMN_SLCT_OFST)
+#define DAQ_GAIN_MODE_MASK                  (DAQ_FRCE_SWTCH_GAIN_MSK | DAQ_FIX_GAIN_MSK | DAQ_CMP_RST_MSK)
 
-/* Pattern Loop 2 Iteration RW regiser */
+/** Chip Power Register */
-#define PATTERN_LOOP_2_ITERATION_REG (0x59 << MEM_MAP_SHIFT)
+#define CHIP_POWER_REG                      (0x5E << MEM_MAP_SHIFT)
 
-/* Pattern Wait 0 RW regiser */
+#define CHIP_POWER_ENABLE_OFST              (0)
-#define PATTERN_WAIT_0_ADDR_REG (0x5A << MEM_MAP_SHIFT)
+#define CHIP_POWER_ENABLE_MSK               (0x00000001 << CHIP_POWER_ENABLE_OFST)
+#define CHIP_POWER_STATUS_OFST              (1)
+#define CHIP_POWER_STATUS_MSK               (0x00000001 << CHIP_POWER_STATUS_OFST)
 
-#define PATTERN_WAIT_0_ADDR_OFST (0)
+/** Temperature Control Register */
-#define PATTERN_WAIT_0_ADDR_MSK  (0x00001FFF << PATTERN_WAIT_0_ADDR_OFST)
+#define TEMP_CTRL_REG                       (0x5F << MEM_MAP_SHIFT)
-// FIXME: is mask 3FF
 
-/* Pattern Wait 1 RW regiser */
+#define TEMP_CTRL_PROTCT_THRSHLD_OFST       (0)
-#define PATTERN_WAIT_1_ADDR_REG (0x5B << MEM_MAP_SHIFT)
+#define TEMP_CTRL_PROTCT_THRSHLD_MSK        (0x000007FF << TEMP_CTRL_PROTCT_THRSHLD_OFST)
+#define TEMP_CTRL_PROTCT_ENABLE_OFST        (16)
+#define TEMP_CTRL_PROTCT_ENABLE_MSK         (0x00000001 << TEMP_CTRL_PROTCT_ENABLE_OFST)
+// set when temp higher than over threshold, write 1 to clear it
+#define TEMP_CTRL_OVR_TMP_EVNT_OFST         (31)
+#define TEMP_CTRL_OVR_TMP_EVNT_MSK          (0x00000001 << TEMP_CTRL_OVR_TMP_EVNT_OFST)
 
-#define PATTERN_WAIT_1_ADDR_OFST (0)
+/* Set Delay 64 bit register */
-#define PATTERN_WAIT_1_ADDR_MSK  (0x00001FFF << PATTERN_WAIT_1_ADDR_OFST)
+#define SET_DELAY_LSB_REG                   (0x60 << MEM_MAP_SHIFT) // different kind of delay
+#define SET_DELAY_MSB_REG                   (0x61 << MEM_MAP_SHIFT) // different kind of delay
 
-/* Pattern Wait 2 RW regiser */
+/* Set Triggers 64 bit register */
-#define PATTERN_WAIT_2_ADDR_REG (0x5C << MEM_MAP_SHIFT)
+#define SET_CYCLES_LSB_REG                  (0x62 << MEM_MAP_SHIFT)
+#define SET_CYCLES_MSB_REG                  (0x63 << MEM_MAP_SHIFT)
 
-#define PATTERN_WAIT_2_ADDR_OFST (0)
+/* Set Frames 64 bit register */
-#define PATTERN_WAIT_2_ADDR_MSK  (0x00001FFF << PATTERN_WAIT_2_ADDR_OFST)
+#define SET_FRAMES_LSB_REG                  (0x64 << MEM_MAP_SHIFT)
+#define SET_FRAMES_MSB_REG                  (0x65 << MEM_MAP_SHIFT)
 
-/* Samples RW register */
+/* Set Period 64 bit register tT = T x 50 ns */
-#define SAMPLES_REG (0x5D << MEM_MAP_SHIFT)
+#define SET_PERIOD_LSB_REG                  (0x66 << MEM_MAP_SHIFT)
+#define SET_PERIOD_MSB_REG                  (0x67 << MEM_MAP_SHIFT)
 
-#define SAMPLES_DIGITAL_OFST (0)
+/* Set Exptime 64 bit register eEXP = Exp x 25 ns */
-#define SAMPLES_DIGITAL_MSK  (0x0000FFFF << SAMPLES_DIGITAL_OFST)
+#define SET_EXPTIME_LSB_REG                 (0x68 << MEM_MAP_SHIFT)
-#define SAMPLES_ANALOG_OFST  (16)
+#define SET_EXPTIME_MSB_REG                 (0x69 << MEM_MAP_SHIFT)
-#define SAMPLES_ANALOG_MSK   (0x0000FFFF << SAMPLES_ANALOG_OFST)
 
-/** Power RW register */
+/* Starting Frame number 64 bit register */
-#define POWER_REG (0x5E << MEM_MAP_SHIFT)
+#define FRAME_NUMBER_LSB_REG                (0x6A << MEM_MAP_SHIFT)
+#define FRAME_NUMBER_MSB_REG                (0x6B << MEM_MAP_SHIFT)
 
-#define POWER_CHIP_OFST             (16)
+/* Comparator disable time (chipv1.1) 32 bit register tT = T x 25 ns
-#define POWER_CHIP_MSK              (0x00000001 << POWER_CHIP_OFST)
+Time before end of exposure when comparator is disabled */
-#define POWER_HV_INTERNAL_SLCT_OFST (31)
+#define COMP_DSBLE_TIME_REG                  (0x6C << MEM_MAP_SHIFT)
-#define POWER_HV_INTERNAL_SLCT_MSK  (0x00000001 << POWER_HV_INTERNAL_SLCT_OFST)
 
-/* Number of Words RW register TODO */
-#define NUMBER_OF_WORDS_REG (0x5F << MEM_MAP_SHIFT)
 
-/* Delay 64 bit RW register. t = DLY x 50 ns. */
+/* Trigger Delay 32 bit register */
-#define DELAY_LSB_REG (0x60 << MEM_MAP_SHIFT)
+#define SET_TRIGGER_DELAY_LSB_REG           (0x70 << MEM_MAP_SHIFT)
-#define DELAY_MSB_REG (0x61 << MEM_MAP_SHIFT)
+#define SET_TRIGGER_DELAY_MSB_REG           (0x71 << MEM_MAP_SHIFT)
 
-/* Triggers 64 bit RW register */
+/** Module row coordinates */
-#define CYCLES_LSB_REG (0x62 << MEM_MAP_SHIFT)
+#define COORD_ROW_REG                       (0x7C << MEM_MAP_SHIFT)
-#define CYCLES_MSB_REG (0x63 << MEM_MAP_SHIFT)
 
-/* Frames 64 bit RW register */
+#define COORD_ROW_OUTER_OFST                (0)
-#define FRAMES_LSB_REG (0x64 << MEM_MAP_SHIFT)
+#define COORD_ROW_OUTER_MSK                 (0x0000FFFF << COORD_ROW_OUTER_OFST)
-#define FRAMES_MSB_REG (0x65 << MEM_MAP_SHIFT)
+#define COORD_ROW_INNER_OFST                (16)
+#define COORD_ROW_INNER_MSK                 (0x0000FFFF << COORD_ROW_INNER_OFST)
 
-/* Period 64 bit RW register */
+/** Module column coordinates */
-#define PERIOD_LSB_REG (0x66 << MEM_MAP_SHIFT)
+#define COORD_COL_REG                       (0x7D << MEM_MAP_SHIFT)
-#define PERIOD_MSB_REG (0x67 << MEM_MAP_SHIFT)
 
-/* Period 64 bit RW register */
+#define COORD_COL_OUTER_OFST                (0)
-//#define EXPTIME_LSB_REG    			    (0x68 << MEM_MAP_SHIFT) //
+#define COORD_COL_OUTER_MSK                 (0x0000FFFF << COORD_COL_OUTER_OFST)
-// Not used in FW #define EXPTIME_MSB_REG    			    (0x69 <<
+#define COORD_COL_INNER_OFST                (16)
-// MEM_MAP_SHIFT)                 // Not used in FW
+#define COORD_COL_INNER_MSK                 (0x0000FFFF << COORD_COL_INNER_OFST)
 
-/* Gates 64 bit RW register */
+/** Module ID coordinates */
-//#define GATES_LSB_REG                      (0x6A << MEM_MAP_SHIFT) // Not used
+#define MOD_ID_REG                          (0x7E << MEM_MAP_SHIFT)
-// in FW #define GATES_MSB_REG                      (0x6B << MEM_MAP_SHIFT) //
-// Not used in FW
 
-/* Pattern IO Control 64 bit RW regiser
+#define MOD_ID_OFST                         (0)
- * Each bit configured as output(1)/ input(0) */
+#define MOD_ID_MSK                          (0x0000FFFF << MOD_ID_OFST)
-#define PATTERN_IO_CNTRL_LSB_REG (0x6C << MEM_MAP_SHIFT)
-#define PATTERN_IO_CNTRL_MSB_REG (0x6D << MEM_MAP_SHIFT)
 
-/* Pattern IO Clock Control 64 bit RW regiser
+/* ADC 0 Deserializer Control */
- * When bit n enabled (1), clocked output for DIO[n] (T run clock)
+#define ADC_DSRLZR_0_REG                    (0xF0 << MEM_MAP_SHIFT)
- * When bit n disabled (0), Dio[n] driven by its pattern output */
+#define ADC_DSRLZR_0_RFRSH_ALGNMNT_OFST     (31) /* Refresh alignment */
-#define PATTERN_IO_CLK_CNTRL_LSB_REG (0x6E << MEM_MAP_SHIFT)
+#define ADC_DSRLZR_0_RFRSH_ALGNMNT_MSK      (0x00000001 << ADC_DSRLZR_0_RFRSH_ALGNMNT_OFST)
-#define PATTERN_IO_CLK_CNTRL_MSB_REG (0x6F << MEM_MAP_SHIFT)
 
-/* Pattern In 64 bit RW register */
+/* ADC 0 Deserializer Control */
-#define PATTERN_IN_LSB_REG (0x70 << MEM_MAP_SHIFT)
+#define ADC_DSRLZR_1_REG                    (0xF1 << MEM_MAP_SHIFT)
-#define PATTERN_IN_MSB_REG (0x71 << MEM_MAP_SHIFT)
+#define ADC_DSRLZR_1_RFRSH_ALGNMNT_OFST     (31)
+#define ADC_DSRLZR_1_RFRSH_ALGNMNT_MSK      (0x00000001 << ADC_DSRLZR_1_RFRSH_ALGNMNT_OFST)
 
-/* Pattern Wait Timer 0 64 bit RW register. t = PWT1 x T run clock */
+/* ADC 0 Deserializer Control */
-#define PATTERN_WAIT_TIMER_0_LSB_REG (0x72 << MEM_MAP_SHIFT)
+#define ADC_DSRLZR_2_REG                    (0xF2 << MEM_MAP_SHIFT)
-#define PATTERN_WAIT_TIMER_0_MSB_REG (0x73 << MEM_MAP_SHIFT)
+#define ADC_DSRLZR_2_RFRSH_ALGNMNT_OFST     (31)
+#define ADC_DSRLZR_2_RFRSH_ALGNMNT_MSK      (0x00000001 << ADC_DSRLZR_2_RFRSH_ALGNMNT_OFST)
 
-/* Pattern Wait Timer 1 64 bit RW register. t = PWT2 x T run clock */
+/* ADC 0 Deserializer Control */
-#define PATTERN_WAIT_TIMER_1_LSB_REG (0x74 << MEM_MAP_SHIFT)
+#define ADC_DSRLZR_3_REG                    (0xF3 << MEM_MAP_SHIFT)
-#define PATTERN_WAIT_TIMER_1_MSB_REG (0x75 << MEM_MAP_SHIFT)
+#define ADC_DSRLZR_3_RFRSH_ALGNMNT_OFST     (31)
-
+#define ADC_DSRLZR_3_RFRSH_ALGNMNT_MSK      (0x00000001 << ADC_DSRLZR_3_RFRSH_ALGNMNT_OFST)
-/* Pattern Wait Timer 2 64 bit RW register. t = PWT3 x T run clock */
-#define PATTERN_WAIT_TIMER_2_LSB_REG (0x76 << MEM_MAP_SHIFT)
-#define PATTERN_WAIT_TIMER_2_MSB_REG (0x77 << MEM_MAP_SHIFT)
-
-/* Readout enable RW register */
-#define READOUT_10G_ENABLE_REG (0x79 << MEM_MAP_SHIFT)
-
-#define READOUT_10G_ENABLE_ANLG_OFST (0)
-#define READOUT_10G_ENABLE_ANLG_MSK  (0x000000FF << READOUT_10G_ENABLE_ANLG_OFST)
-#define READOUT_10G_ENABLE_DGTL_OFST (8)
-#define READOUT_10G_ENABLE_DGTL_MSK  (0x00000001 << READOUT_10G_ENABLE_DGTL_OFST)
-
-/* Digital Bit External Trigger RW register */
-#define DBIT_EXT_TRG_REG                                                       \
-    (0x7B << MEM_MAP_SHIFT) // Not used in firmware or software
-
-#define DBIT_EXT_TRG_SRC_OFST      (0)
-#define DBIT_EXT_TRG_SRC_MSK       (0x0000003F << DBIT_EXT_TRG_SRC_OFST)
-#define DBIT_EXT_TRG_OPRTN_MD_OFST (16)
-#define DBIT_EXT_TRG_OPRTN_MD_MSK  (0x00000001 << DBIT_EXT_TRG_OPRTN_MD_OFST)
-
-/* Pin Delay 0 RW register */
-#define OUTPUT_DELAY_0_REG                                                     \
-    (0x7C << MEM_MAP_SHIFT) // Not used in firmware or software
-
-#define OUTPUT_DELAY_0_OTPT_STTNG_STEPS (25)
-#define OUTPUT_DELAY_0_OTPT_STTNG_OFST                                         \
-    (0) // t = OTPT_STTNG * 25 ps, max for Cyclone V = 775 ps
-#define OUTPUT_DELAY_0_OTPT_STTNG_MSK                                          \
-    (0x0000001F << OUTPUT_DELAY_0_OTPT_STTNG_OFST)
-// 1: load dynamic output settings, 0: trigger start of dynamic output delay
-// configuration pn falling edge of ODT (output delay trigger) bit
-#define OUTPUT_DELAY_0_OTPT_TRGGR_OFST (31)
-#define OUTPUT_DELAY_0_OTPT_TRGGR_MSK                                          \
-    (0x00000001 << OUTPUT_DELAY_0_OTPT_TRGGR_OFST)
-#define OUTPUT_DELAY_0_OTPT_TRGGR_LD_VAL   (1)
-#define OUTPUT_DELAY_0_OTPT_TRGGR_STRT_VAL (0)
-
-/* Pin Delay 1 RW register
- * Each bit configured as enable for dynamic output delay configuration */
-#define PIN_DELAY_1_REG                                                        \
-    (0x7D << MEM_MAP_SHIFT) // Not used in firmware or software
-
-/** Pattern Mask 64 bit RW regiser */
-#define PATTERN_MASK_LSB_REG (0x80 << MEM_MAP_SHIFT)
-#define PATTERN_MASK_MSB_REG (0x81 << MEM_MAP_SHIFT)
-
-/** Pattern Set 64 bit RW regiser */
-#define PATTERN_SET_LSB_REG (0x82 << MEM_MAP_SHIFT)
-#define PATTERN_SET_MSB_REG (0x83 << MEM_MAP_SHIFT)
-
-/* Pattern Loop 3 Address RW regiser */
-#define PATTERN_LOOP_3_ADDR_REG (0x84 << MEM_MAP_SHIFT)
-
-#define PATTERN_LOOP_3_ADDR_STRT_OFST (0)
-#define PATTERN_LOOP_3_ADDR_STRT_MSK                                           \
-    (0x00001FFF << PATTERN_LOOP_3_ADDR_STRT_OFST)
-#define PATTERN_LOOP_3_ADDR_STP_OFST (16)
-#define PATTERN_LOOP_3_ADDR_STP_MSK  (0x00001FFF << PATTERN_LOOP_3_ADDR_STP_OFST)
-
-/* Pattern Loop 3 Iteration RW regiser */
-#define PATTERN_LOOP_3_ITERATION_REG (0x85 << MEM_MAP_SHIFT)
-
-/* Pattern Loop 4 Address RW regiser */
-#define PATTERN_LOOP_4_ADDR_REG (0x86 << MEM_MAP_SHIFT)
-
-#define PATTERN_LOOP_4_ADDR_STRT_OFST (0)
-#define PATTERN_LOOP_4_ADDR_STRT_MSK                                           \
-    (0x00001FFF << PATTERN_LOOP_4_ADDR_STRT_OFST)
-#define PATTERN_LOOP_4_ADDR_STP_OFST (16)
-#define PATTERN_LOOP_4_ADDR_STP_MSK  (0x00001FFF << PATTERN_LOOP_4_ADDR_STP_OFST)
-
-/* Pattern Loop 4 Iteration RW regiser */
-#define PATTERN_LOOP_4_ITERATION_REG (0x87 << MEM_MAP_SHIFT)
-
-/* Pattern Loop 5 Address RW regiser */
-#define PATTERN_LOOP_5_ADDR_REG (0x88 << MEM_MAP_SHIFT)
-
-#define PATTERN_LOOP_5_ADDR_STRT_OFST (0)
-#define PATTERN_LOOP_5_ADDR_STRT_MSK                                           \
-    (0x00001FFF << PATTERN_LOOP_5_ADDR_STRT_OFST)
-#define PATTERN_LOOP_5_ADDR_STP_OFST (16)
-#define PATTERN_LOOP_5_ADDR_STP_MSK  (0x00001FFF << PATTERN_LOOP_5_ADDR_STP_OFST)
-
-/* Pattern Loop 5 Iteration RW regiser */
-#define PATTERN_LOOP_5_ITERATION_REG (0x89 << MEM_MAP_SHIFT)
-
-/* Pattern Wait 3 RW regiser */
-#define PATTERN_WAIT_3_ADDR_REG (0x8A << MEM_MAP_SHIFT)
-
-#define PATTERN_WAIT_3_ADDR_OFST (0)
-#define PATTERN_WAIT_3_ADDR_MSK  (0x00001FFF << PATTERN_WAIT_3_ADDR_OFST)
-
-/* Pattern Wait 4 RW regiser */
-#define PATTERN_WAIT_4_ADDR_REG (0x8B << MEM_MAP_SHIFT)
-
-#define PATTERN_WAIT_4_ADDR_OFST (0)
-#define PATTERN_WAIT_4_ADDR_MSK  (0x00001FFF << PATTERN_WAIT_4_ADDR_OFST)
-
-/* Pattern Wait 5 RW regiser */
-#define PATTERN_WAIT_5_ADDR_REG (0x8C << MEM_MAP_SHIFT)
-
-#define PATTERN_WAIT_5_ADDR_OFST (0)
-#define PATTERN_WAIT_5_ADDR_MSK  (0x00001FFF << PATTERN_WAIT_5_ADDR_OFST)
-
-/* Pattern Wait Timer 3 64 bit RW register. t = PWT1 x T run clock */
-#define PATTERN_WAIT_TIMER_3_LSB_REG (0x8D << MEM_MAP_SHIFT)
-#define PATTERN_WAIT_TIMER_3_MSB_REG (0x8E << MEM_MAP_SHIFT)
-
-/* Pattern Wait Timer 4 64 bit RW register. t = PWT1 x T run clock */
-#define PATTERN_WAIT_TIMER_4_LSB_REG (0x8F << MEM_MAP_SHIFT)
-#define PATTERN_WAIT_TIMER_4_MSB_REG (0x90 << MEM_MAP_SHIFT)
-
-/* Pattern Wait Timer 5 64 bit RW register. t = PWT1 x T run clock */
-#define PATTERN_WAIT_TIMER_5_LSB_REG (0x91 << MEM_MAP_SHIFT)
-#define PATTERN_WAIT_TIMER_5_MSB_REG (0x92 << MEM_MAP_SHIFT)
 
 /* Round Robin  */
-#define RXR_ENDPOINT_START_REG (0x1000 << MEM_MAP_SHIFT)
+#define RXR_ENDPOINTS_MAX                   (64)
+#define RXR_ENDPOINT_OUTER_START_REG        (0x1000 << MEM_MAP_SHIFT)
+#define RXR_ENDPOINT_INNER_START_REG        (0x2000 << MEM_MAP_SHIFT)
+
+#define RXR_ENDPOINT_OFST                   (0x10 << MEM_MAP_SHIFT)
+
+// clang-format on

slsDetectorServers/moenchDetectorServer/bin/DefaultPattern_moench.txt

@@ -1,301 +0,0 @@
-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

slsDetectorServers/moenchDetectorServer/config_moench.txt

@@ -0,0 +1,4 @@
+
+
+#chip version       version (multiplied by 10)
+chipversion         11

slsDetectorServers/moenchDetectorServer/detid_moench.txt

@@ -0,0 +1 @@
+1234

slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h

@@ -4,18 +4,140 @@
 #include "RegisterDefs.h"
 #include "sls/sls_detector_defs.h"
 
-#define MIN_REQRD_VRSN_T_RD_API 0x180314
+#define REQRD_FRMWRE_VRSN_BOARD2 0x221130 // 1.0 pcb (version = 010)
-#define REQRD_FRMWR_VRSN        0x221205
+#define REQRD_FRMWRE_VRSN        0x221130 // 2.0 pcb (version = 011)
 
-#define NUM_HARDWARE_VERSIONS (1)
+#define NUM_HARDWARE_VERSIONS (2)
 #define HARDWARE_VERSION_NUMBERS                                               \
-    { 0x1 }
+    { 0x2, 0x3 }
 #define HARDWARE_VERSION_NAMES                                                 \
-    { "1.0" }
+    { "1.0", "2.0" }
 
+#define ID_FILE            ("detid_moench.txt")
+#define CONFIG_FILE        ("config_moench.txt")
 #define LINKED_SERVER_NAME "moenchDetectorServer"
 
-#define CTRL_SRVR_INIT_TIME_US (2 * 1000 * 1000)
+#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)
 
 /* Struct Definitions */
 typedef struct udp_header_struct {
@@ -45,111 +167,44 @@ typedef struct udp_header_struct {
 #define UDP_IP_HEADER_LENGTH_BYTES (28)
 
 /* Enums */
+enum ADCINDEX { TEMP_FPGA, TEMP_ADC };
 enum DACINDEX {
-    MO_VBP_COLBUF,
+    J_VB_COMP,
-    MO_VIPRE,
+    J_VDD_PROT,
-    MO_VIN_CM,
+    J_VIN_COM,
-    MO_VB_SDA,
+    J_VREF_PRECH,
-    MO_VCASC_SFP,
+    J_VB_PIXBUF,
-    MO_VOUT_CM,
+    J_VB_DS,
-    MO_VIPRE_CDS,
+    J_VREF_DS,
-    MO_IBIAS_SFP
+    J_VREF_COMP
 };
 #define DAC_NAMES                                                              \
-    "vbp_colbuf", "vipre", "vin_cm", "vb_sda", "vcasc_sfp", "vout_cm",         \
+    "vb_comp", "vdd_prot", "vin_com", "vref_prech", "vb_pixbuf", "vb_ds",      \
-        "vipre_cds", "ibias_sfp"
+        "vref_ds", "vref_comp"
+
 #define DEFAULT_DAC_VALS                                                       \
     {                                                                          \
-        1300, /* MO_VBP_COLBUF */                                              \
+        1220, /* J_VB_COMP */                                                  \
-        1000, /* MO_VIPRE */                                                   \
+        3000, /* J_VDD_PROT */                                                 \
-        1400, /* MO_VIN_CM */                                                  \
+        1053, /* J_VIN_COM */                                                  \
-        680,  /* MO_VB_SDA */                                                  \
+        1450, /* J_VREF_PRECH */                                               \
-        1428, /* MO_VCASC_SFP */                                               \
+        750,  /* J_VB_PIXBUF */                                                \
-        1200, /* MO_VOUT_CM */                                                 \
+        1000, /* J_VB_DS */                                                    \
-        800,  /* MO_VIPRE_CDS */                                               \
+        480,  /* J_VREF_DS */                                                  \
-        900   /* MO_IBIAS_SFP */                                               \
+        420   /* J_VREF_COMP */                                                \
     };
 
-enum CLKINDEX { RUN_CLK, ADC_CLK, SYNC_CLK, DBIT_CLK, NUM_CLOCKS };
+enum MASTERINDEX { MASTER_HARDWARE, OW_MASTER, OW_SLAVE };
-#define CLK_NAMES "run", "adc", "sync", "dbit"
+#define MASTER_NAMES "hardware", "master", "slave"
 
-/* Hardware Definitions */
+#define NUMSETTINGS     (2)
-#define NCHAN               (32)
+#define NSPECIALDACS    (3)
-#define NCHIP               (1)
+#define SPECIALDACINDEX {J_VREF_PRECH, J_VREF_DS, J_VREF_COMP};
-#define NDAC                (8)
+#define SPECIAL_DEFAULT_DYNAMIC_GAIN_VALS                                      \
-#define DYNAMIC_RANGE       (16)
+    { 1450, 480, 420 }
-#define NUM_BYTES_PER_PIXEL (DYNAMIC_RANGE / 8)
+#define SPECIAL_DEFAULT_DYNAMICHG0_GAIN_VALS                                   \
-#define CLK_FREQ            (156.25) /* MHz */
+    { 1550, 450, 620 }
-#define NSAMPLES_PER_ROW    (25)
-#define NCHANS_PER_ADC      (25)
 
-/** Default Parameters */
+enum NETWORKINDEX { TXN_FRAME, FLOWCTRL_10G };
-#define DEFAULT_PATTERN_FILE          ("DefaultPattern_moench.txt")
+enum CLKINDEX { RUN_CLK, ADC_CLK, DBIT_CLK, NUM_CLOCKS };
-#define DEFAULT_STARTING_FRAME_NUMBER (1)
+#define CLK_NAMES "run", "adc", "dbit"
-#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)

slsDetectorServers/slsDetectorServer/include/ALTERA_PLL.h

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

slsDetectorServers/slsDetectorServer/include/loadPattern.h

@@ -6,7 +6,7 @@
 #include "clogger.h"
 
 void initializePatternAddresses();
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#ifdef CHIPTESTBOARDD
 #ifdef VIRTUAL
 void initializePatternWord();
 #endif

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(CHIPTESTBOARDD) ||     \
+#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(MOENCHD) ||            \
-    defined(MOENCHD)
+    defined(CHIPTESTBOARDD)
 #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(CHIPTESTBOARDD) ||   \
+#elif defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(MOENCHD) ||          \
-    defined(MOENCHD)
+    defined(CHIPTESTBOARDD)
 #include "blackfin.h"
 #endif
 
@@ -61,15 +61,16 @@ typedef struct udpStruct_s {
 int isInitCheckDone();
 int getInitResult(char **mess);
 void basictests();
-#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) ||     \
+#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(MOENCHD) ||            \
-    defined(MOENCHD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
+    defined(CHIPTESTBOARDD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
 int checkType();
 int testFpga();
 int testBus();
 #endif
 
 #if defined(GOTTHARDD) ||                                                      \
-    ((defined(EIGERD) || defined(JUNGFRAUD)) && defined(VIRTUAL))
+    ((defined(EIGERD) || defined(JUNGFRAUD) || defined(MOENCHD)) &&            \
+     defined(VIRTUAL))
 void setTestImageMode(int ival);
 int getTestImageMode();
 #endif
@@ -77,19 +78,24 @@ 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(CHIPTESTBOARDD) || defined(MOENCHD)
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD)
 u_int16_t getHardwareSerialNumber();
 #endif
-#if defined(JUNGFRAUD) || defined(GOTTHARD2D) || defined(MYTHEN3D) ||          \
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARD2D) ||           \
-    defined(GOTTHARDD)
+    defined(MYTHEN3D) || defined(GOTTHARDD)
 int isHardwareVersion_1_0();
 #endif
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(MOENCHD)
 int getChipVersion();
 void setChipVersion(int version);
 #endif
@@ -98,7 +104,7 @@ u_int32_t getDetectorNumber();
 #endif
 
 #if defined(GOTTHARD2D) || defined(EIGERD) || defined(MYTHEN3D) ||             \
-    defined(JUNGFRAUD)
+    defined(JUNGFRAUD) || defined(MOENCHD)
 int getModuleId(int *ret, char *mess);
 int updateModuleId();
 #ifndef EIGERD
@@ -125,7 +131,7 @@ void checkVirtual9MFlag();
 void allocateDetectorStructureMemory();
 #endif
 void setupDetector();
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#if defined(CHIPTESTBOARDD)
 int updateDatabytesandAllocateRAM();
 void updateDataBytes();
 #endif
@@ -141,7 +147,8 @@ void setASICDefaults();
 #ifdef MYTHEN3D
 void setADIFDefaults();
 #endif
-#if defined(GOTTHARD2D) || defined(EIGERD) || defined(JUNGFRAUD)
+#if defined(GOTTHARD2D) || defined(EIGERD) || defined(JUNGFRAUD) ||            \
+    defined(MOENCHD)
 int readConfigFile();
 #endif
 #if defined(GOTTHARDD) || defined(GOTTHARD2D) || defined(EIGERD) ||            \
@@ -157,14 +164,13 @@ void resetToHardwareSettings();
 int writeRegister(uint32_t offset, uint32_t data);
 int readRegister(uint32_t offset, uint32_t *retval);
 #elif GOTTHARDD
-uint32_t
+uint32_t writeRegister16And32(uint32_t offset,
-writeRegister16And32(uint32_t offset,
+                              uint32_t data); // FIXME its not there in ctb
-                     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(CHIPTESTBOARDD) || defined(MOENCHD) ||       \
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD) ||       \
     defined(MYTHEN3D) || defined(GOTTHARD2D)
 void cleanFifos();
 void resetCore();
@@ -189,11 +195,11 @@ int getDynamicRange(int *retval);
 int setROI(ROI arg);
 ROI getROI();
 #endif
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(MOENCHD)
 void setADCInvertRegister(uint32_t val);
 uint32_t getADCInvertRegister();
 #endif
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#if defined(CHIPTESTBOARDD)
 int setADCEnableMask(uint32_t mask);
 uint32_t getADCEnableMask();
 void setADCEnableMask_10G(uint32_t mask);
@@ -221,11 +227,11 @@ int getReadoutMode();
 #endif
 
 // parameters - timer
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD)
 int selectStoragecellStart(int pos);
 int getMaxStoragecellStart();
 #endif
-#if defined(JUNGFRAUD) || defined(EIGERD) || defined(MOENCHD) ||               \
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(EIGERD) ||               \
     defined(CHIPTESTBOARDD)
 int setNextFrameNumber(uint64_t value);
 int getNextFrameNumber(uint64_t *value);
@@ -265,13 +271,13 @@ int64_t getSubDeadTime();
 int64_t getMeasuredPeriod();
 int64_t getMeasuredSubPeriod();
 #endif
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD)
 void setNumAdditionalStorageCells(int val);
 int getNumAdditionalStorageCells();
 int setStorageCellDelay(int64_t val);
 int64_t getStorageCellDelay();
 #endif
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#if defined(CHIPTESTBOARDD)
 int setNumAnalogSamples(int val);
 int getNumAnalogSamples();
 #endif
@@ -286,8 +292,8 @@ uint32_t getCounterMask();
 void updatePacketizing();
 #endif
 
-#if defined(JUNGFRAUD) || defined(GOTTHARDD) || defined(CHIPTESTBOARDD) ||     \
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARDD) ||            \
-    defined(MOENCHD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
+    defined(CHIPTESTBOARDD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
 int setDelayAfterTrigger(int64_t val);
 int64_t getDelayAfterTrigger();
 int64_t getNumFramesLeft();
@@ -301,7 +307,7 @@ int64_t getNumBurstsLeft();
 #ifdef GOTTHARDD
 int64_t getExpTimeLeft();
 #endif
-#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD) ||       \
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD) ||       \
     defined(MYTHEN3D) || defined(GOTTHARD2D)
 int64_t getFramesFromStart();
 int64_t getActualTime();
@@ -312,7 +318,7 @@ int64_t getMeasurementTime();
 #if defined(MYTHEN3D) || defined(EIGERD)
 void getModule(sls_detector_module *myMod);
 #endif
-#if (!defined(CHIPTESTBOARDD)) && (!defined(MOENCHD)) && (!defined(GOTTHARD2D))
+#if (!defined(CHIPTESTBOARDD)) && (!defined(GOTTHARD2D))
 int setModule(sls_detector_module myMod, char *mess);
 #endif
 
@@ -328,7 +334,7 @@ int getAllTrimbits();
 enum detectorSettings setSettings(enum detectorSettings sett);
 #endif
 enum detectorSettings getSettings();
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(MOENCHD)
 enum gainMode getGainMode();
 void setGainMode(enum gainMode mode);
 #endif
@@ -357,7 +363,7 @@ void setDAC(enum DACINDEX ind, int val, int mV);
 #endif
 int getDAC(enum DACINDEX ind, int mV);
 int getMaxDacSteps();
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#if defined(CHIPTESTBOARDD)
 int dacToVoltage(int dac);
 int checkVLimitCompliant(int mV);
 int checkVLimitDacCompliant(int dac);
@@ -380,14 +386,15 @@ void powerOff();
 
 #if defined(MYTHEN3D) || defined(GOTTHARD2D)
 int getADC(enum ADCINDEX ind, int *value);
-#elif !defined(MOENCHD)
+#else
 int getADC(enum ADCINDEX ind);
 #endif
 
 int setHighVoltage(int val);
 
 // parameters - timing, extsig
-#if defined(EIGERD) || defined(GOTTHARD2D) || defined(JUNGFRAUD)
+#if defined(EIGERD) || defined(GOTTHARD2D) || defined(JUNGFRAUD) ||            \
+    defined(MOENCHD)
 int setMaster(enum MASTERINDEX m);
 #endif
 #ifdef EIGERD
@@ -395,11 +402,11 @@ int setTop(enum TOPINDEX t);
 int isTop(int *retval);
 #endif
 #if defined(MYTHEN3D) || defined(EIGERD) || defined(GOTTHARDD) ||              \
-    defined(GOTTHARD2D) || defined(JUNGFRAUD)
+    defined(GOTTHARD2D) || defined(JUNGFRAUD) || defined(MOENCHD)
 int isMaster(int *retval);
 #endif
 
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(MOENCHD)
 int getSynchronization();
 void setSynchronization(int enable);
 #endif
@@ -430,29 +437,30 @@ int getExtSignal(int signalIndex);
 #ifdef GOTTHARDD
 void calcChecksum(mac_conf *mac, int sourceip, int destip);
 #endif
-#if defined(JUNGFRAUD) || defined(GOTTHARD2D)
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARD2D)
 void setNumberofUDPInterfaces(int val);
 #endif
 int getNumberofUDPInterfaces();
 
-#if defined(JUNGFRAUD) || defined(EIGERD) || defined(MYTHEN3D) ||              \
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(EIGERD) ||               \
-    defined(GOTTHARD2D)
+    defined(MYTHEN3D) || defined(GOTTHARD2D)
 int getNumberofDestinations(int *retval);
 int setNumberofDestinations(int value);
 #endif
-#if defined(JUNGFRAUD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(MYTHEN3D) ||             \
+    defined(GOTTHARD2D)
 int getFirstUDPDestination();
 void setFirstUDPDestination(int value);
 #endif
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(MOENCHD)
 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(GOTTHARD2D) || defined(MYTHEN3D) ||          \
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARD2D) ||           \
-    defined(CHIPTESTBOARDD) || defined(MOENCHD)
+    defined(MYTHEN3D) || defined(CHIPTESTBOARDD)
 void calcChecksum(udp_header *udp);
 #endif
 #ifdef GOTTHARDD
@@ -471,22 +479,15 @@ int getInterruptSubframe();
 int setReadNRows(int value);
 int getReadNRows();
 #endif
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD) || defined(EIGERD) ||          \
+#if defined(CHIPTESTBOARDD) || defined(EIGERD) || defined(MYTHEN3D)
-    defined(MYTHEN3D)
 int enableTenGigabitEthernet(int val);
 #endif
 
 // very detector specific
 
-// moench specific - powerchip
+// chip test board specific - configure frequency, phase, pll,
-#ifdef MOENCHD
-int powerChip(int on);
-int setAnalogOnlyReadout();
-#endif
-
-// chip test board or moench specific - configure frequency, phase, pll,
 // flashing firmware
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#if defined(CHIPTESTBOARDD)
 int setPhase(enum CLKINDEX ind, int val, int degrees);
 int getPhase(enum CLKINDEX ind, int degrees);
 int getMaxPhase(enum CLKINDEX ind);
@@ -505,9 +506,9 @@ int setLEDEnable(int enable);
 void setDigitalIODelay(uint64_t pinMask, int delay);
 #endif
 
-// jungfrau specific - powerchip, autocompdisable, clockdiv, asictimer, clock,
+// jungfrau/moench specific - powerchip, autocompdisable, clockdiv, asictimer,
-// pll, flashing firmware
+// clock, pll, flashing firmware
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(MOENCHD)
 int setReadNRows(int value);
 int getReadNRows();
 void initReadoutConfiguration();
@@ -517,7 +518,9 @@ 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);
@@ -637,11 +640,12 @@ int setBadChannels(int numChannels, int *channelList);
 int *getBadChannels(int *numChannels);
 #endif
 
-#if defined(JUNGFRAUD) || defined(EIGERD)
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(EIGERD)
 int getTenGigaFlowControl();
 int setTenGigaFlowControl(int value);
 #endif
-#if defined(JUNGFRAUD) || defined(EIGERD) || defined(MYTHEN3D)
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(EIGERD) ||               \
+    defined(MYTHEN3D)
 int getTransmissionDelayFrame();
 int setTransmissionDelayFrame(int value);
 #endif
@@ -661,14 +665,14 @@ int stopStateMachine();
 #ifdef MYTHEN3D
 int softwareTrigger();
 #endif
-#if defined(EIGERD) || defined(JUNGFRAUD)
+#if defined(EIGERD) || defined(JUNGFRAUD) || defined(MOENCHD)
 int softwareTrigger(int block);
 #endif
 #if defined(EIGERD) || defined(MYTHEN3D)
 int startReadOut();
 #endif
 enum runStatus getRunStatus();
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#if defined(CHIPTESTBOARDD)
 void readFrames(int *ret, char *mess);
 #endif
 #ifdef EIGERD
@@ -676,7 +680,7 @@ void waitForAcquisitionEnd(int *ret, char *mess);
 #else
 void waitForAcquisitionEnd();
 #endif
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#if defined(CHIPTESTBOARDD)
 void readandSendUDPFrames(int *ret, char *mess);
 void unsetFifoReadStrobes();
 void readSample(int ns);
@@ -685,8 +689,8 @@ int checkFifoForEndOfAcquisition();
 int readFrameFromFifo();
 #endif
 
-#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) ||     \
+#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(MOENCHD) ||            \
-    defined(MOENCHD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
+    defined(CHIPTESTBOARDD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
 u_int32_t runBusy();
 #endif
 
@@ -697,7 +701,7 @@ u_int32_t runState(enum TLogLevel lev);
 // common
 int calculateDataBytes();
 int getTotalNumberOfChannels();
-#if defined(MOENCHD) || defined(CHIPTESTBOARDD)
+#if defined(CHIPTESTBOARDD)
 void getNumberOfChannels(int *nchanx, int *nchany);
 #endif
 int getNumberOfChips();

slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h

@@ -306,3 +306,4 @@ int get_module(int);
 int get_synchronization(int);
 int set_synchronization(int);
 int get_hardware_version(int);
+int get_frontend_firmware_version(int);

slsDetectorServers/slsDetectorServer/src/AD9257.c

@@ -300,7 +300,7 @@ void AD9257_Configure() {
                                          AD9257_CLK_CH_IFCO_MSK);
 
     // vref
-#if defined(GOTTHARDD) || defined(MOENCHD)
+#ifdef GOTTHARDD
     LOG(logINFO, ("\tVref default at 2.0\n"));
     AD9257_SetVrefVoltage(AD9257_VREF_DEFAULT_VAL, 0);
 #else

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;
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(MOENCHD)
 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;
 
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(MOENCHD)
 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;
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(MOENCHD)
     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;
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(MOENCHD)
     if (clkIndex == ALTERA_PLL_Cntrl_DBIT_ClkIndex) {
         useSecondWR = 1;
     }

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) {
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(MOENCHD)
         *ret = OK;
-        LOG(logWARNING,
+        LOG(logWARNING, ("Could not find detid file to set module id. "
-            ("Could not find detid_jungfrau.txt to set module id\n"));
+                         "Continuing without.\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(CHIPTESTBOARDD) || defined(MOENCHD) ||       \
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD) ||       \
     defined(GOTTHARDD)
     // delete every line with DetectorServer in /etc/inittab
     strcpy(cmd, "sed -i '/DetectorServer/d' /etc/inittab");

slsDetectorServers/slsDetectorServer/src/loadPattern.c

@@ -13,7 +13,7 @@
 extern enum TLogLevel trimmingPrint;
 #endif
 
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#ifdef CHIPTESTBOARDD
 #ifdef VIRTUAL
 uint64_t virtual_pattern[MAX_PATTERN_LENGTH];
 #endif
@@ -40,7 +40,7 @@ void initializePatternAddresses() {
     }
 }
 
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#ifdef CHIPTESTBOARDD
 #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 moench, ctb ( same as executing pattern word)
+    // cannot validate for 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,

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] \n"
+            "[Eiger][Jungfrau][Gotthard][Gotthard2][Moench] \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(JUNGFRAUD) || defined(MOENCHD)
             LOG(logINFO, ("Ignoring config file\n"));
             ignoreConfigFileFlag = 1;
 #else

slsDetectorSoftware/include/sls/Detector.h

@@ -78,18 +78,22 @@ 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][Gotthard][Mythen3][Gotthard2][CTB][Moench] */
+    /* [Jungfrau][Moench][Gotthard][Mythen3][Gotthard2][CTB] */
     Result<int64_t> getSerialNumber(Positions pos = {}) const;
 
-    /** [Eiger][Gotthard2][Mythen3][Jungfrau] 6 bit value (ideally unique) that
+    /** [Eiger][Gotthard2][Mythen3][Jungfrau][Moench] 6 bit value (ideally
-     * is streamed out in the UDP header of the detector.*/
+     * 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;
@@ -122,14 +126,12 @@ class Detector {
     /** list of possible settings for this detector */
     std::vector<defs::detectorSettings> getSettingsList() const;
 
-    /** [Jungfrau][Gotthard][Gotthard2][Mythen3] */
+    /** [Jungfrau][Moench][Gotthard][Gotthard2][Mythen3] */
     Result<defs::detectorSettings> getSettings(Positions pos = {}) const;
 
-    /** [Jungfrau] GAIN0, HIGHGAIN0 \n [Gotthard] DYNAMICGAIN, HIGHGAIN,
+    /** [Jungfrau][Moench] GAIN0, HIGHGAIN0 \n [Gotthard] DYNAMICGAIN, HIGHGAIN,
      * LOWGAIN, MEDIUMGAIN, VERYHIGHGAIN \n [Gotthard2] DYNAMICGAIN,
-     * FIXGAIN1, FIXGAIN2 \n [Moench] G1_HIGHGAIN, G1_LOWGAIN,
+     * FIXGAIN1, FIXGAIN2 \n [Mythen3] STANDARD, FAST,
-     * 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
      */
@@ -179,38 +181,39 @@ class Detector {
      * files exist in corresponding trim folders */
     void setTrimEnergies(std::vector<int> energies, Positions pos = {});
 
-    /**[Eiger][Jungfrau] */
+    /**[Eiger][Jungfrau][Moench] */
     bool getGapPixelsinCallback() const;
 
     /**
-     * [Eiger][Jungfrau]
+     * [Eiger][Jungfrau][Moench]
      * 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] */
+    /** [Eiger][Jungfrau][Moench] */
     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] flips rows in the detector
+     * parameter to flip rows in gui \n[Jungfrau][Moench] flips rows in the
-     * itself.  For bottom module and number of interfaces must be set to 2.
+     * detector itself.  For bottom module and number of interfaces must be set
-     * slsReceiver and slsDetectorGui does not handle.slsReceiver and
+     * 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] via stop server **/
+    /** [Eiger][Mythen3][Gotthard1][Gotthard2][Jungfrau][Moench] via stop server
+     * **/
     Result<bool> getMaster(Positions pos = {}) const;
 
-    /** [Eiger][Gotthard2][Jungfrau] Set (half) module to master and the
+    /** [Eiger][Gotthard2][Jungfrau][Moench] Set (half) module to master and the
      * other(s) to slaves */
     void setMaster(bool value, int pos);
 
-    /** [Jungfrau] **/
+    /** [Jungfrau][Moench] **/
     Result<bool> getSynchronization(Positions pos = {}) const;
 
-    /** [Jungfrau]  */
+    /** [Jungfrau][Moench]  */
     void setSynchronization(bool value);
 
     /** [Gotthard2][Mythen3] */
@@ -285,11 +288,11 @@ class Detector {
 
     void setNumberOfTriggers(int64_t value);
 
-    /** [Gotthard][Jungfrau][Eiger][CTB][Moench][Gotthard2]  \n
+    /** [Gotthard][Jungfrau][Moench][Eiger][CTB][Gotthard2]  \n
      * [Mythen3] use function with gate index **/
     Result<ns> getExptime(Positions pos = {}) const;
 
-    /** [Gotthard][Jungfrau][Eiger][CTB][Moench][Gotthard2]  \n
+    /** [Gotthard][Jungfrau][Moench][Eiger][CTB][Gotthard2]  \n
      * [Mythen3] sets exptime for all gate signals. To specify gate index, use
      * function with gate index **/
     void setExptime(ns t, Positions pos = {});
@@ -298,25 +301,25 @@ class Detector {
 
     void setPeriod(ns t, Positions pos = {});
 
-    /** [Gotthard][Jungfrau][CTB][Moench][Mythen3][Gotthard2] */
+    /** [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2] */
     Result<ns> getDelayAfterTrigger(Positions pos = {}) const;
 
-    /** [Gotthard][Jungfrau][CTB][Moench][Mythen3][Gotthard2] */
+    /** [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2] */
     void setDelayAfterTrigger(ns value, Positions pos = {});
 
-    /** [Gotthard][Jungfrau][CTB][Moench][Mythen3]
+    /** [Gotthard][Jungfrau][Moench][CTB][Mythen3]
      * [Gotthard2] only in continuous auto mode */
     Result<int64_t> getNumberOfFramesLeft(Positions pos = {}) const;
 
-    /** [Gotthard][Jungfrau][CTB][Moench][Mythen3]
+    /** [Gotthard][Jungfrau][Moench][CTB][Mythen3]
      * Only when external trigger used */
     Result<int64_t> getNumberOfTriggersLeft(Positions pos = {}) const;
 
-    /** [Gotthard][Jungfrau][CTB][Moench][Mythen3][Gotthard2]
+    /** [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2]
      * [Gotthard2] only in continuous mode */
     Result<ns> getPeriodLeft(Positions pos = {}) const;
 
-    /** [Gotthard][Jungfrau][CTB][Moench][Mythen3]
+    /** [Gotthard][Jungfrau][Moench][CTB][Mythen3]
      * [Gotthard2] only in continuous mode */
     Result<ns> getDelayAfterTriggerLeft(Positions pos = {}) const;
 
@@ -325,7 +328,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][Gotthard][Ctb][Moench][Mythen3][Gotthard2] 16
+     * [Jungfrau][Moench][Gotthard][Ctb][Mythen3][Gotthard2] 16
      */
     void setDynamicRange(int value);
 
@@ -335,7 +338,7 @@ class Detector {
     Result<defs::timingMode> getTimingMode(Positions pos = {}) const;
 
     /**
-     * [Gotthard][Jungfrau][Gotthard][CTB][Moench][Gotthard2] Options:
+     * [Gotthard][Jungfrau][Moench][Gotthard][CTB][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
@@ -345,64 +348,62 @@ class Detector {
     /** list of possible timing modes for this detector */
     std::vector<defs::timingMode> getTimingModeList() const;
 
-    /** [Eiger][Jungfrau][Gotthard2] */
+    /** [Eiger][Jungfrau][Moench][Gotthard2] */
     Result<defs::speedLevel> getReadoutSpeed(Positions pos = {}) const;
 
-    /** [Eiger][Jungfrau][Gotthard2]
+    /** [Eiger][Jungfrau][Moench][Gotthard2]
-     * [Jungfrau] Options: FULL_SPEED, HALF_SPEED (Default), QUARTER_SPEED \n
+     * [Jungfrau][Moench] Options: FULL_SPEED, HALF_SPEED (Default),
-     * [Eiger] Options: FULL_SPEED (Default), HALF_SPEED, QUARTER_SPEED \n
+     * QUARTER_SPEED \n [Eiger] Options: FULL_SPEED (Default), HALF_SPEED,
-     * [Gotthard2] Options: G2_108MHZ (Default), G2_144MHZ \n
+     * QUARTER_SPEED \n [Gotthard2] Options: G2_108MHZ (Default), G2_144MHZ \n
-     * [Jungfrau] FULL_SPEED option only available from v2.0 boards and is
+     * [Jungfrau][Moench] FULL_SPEED option only available from v2.0 boards and
-     * recommended to set number of interfaces to 2. \n Also overwrites adcphase
+     * is recommended to set number of interfaces to 2. \n Also overwrites
-     * to recommended default.
+     * 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][CTB][Moench] */
+    /** [Jungfrau][Moench][CTB] */
     Result<int> getADCPhase(Positions pos = {}) const;
 
-    /** [Gotthard][Jungfrau][CTB][Moench]
+    /** [Gotthard][Jungfrau][Moench][CTB]
-     * [Jungfrau] Absolute phase shift. Changing Speed also resets adcphase to
+     * [Jungfrau][Moench] Absolute phase shift. Changing Speed also resets
-     * recommended defaults. \n
+     * adcphase to recommended defaults. \n [Ctb] Absolute phase shift. Changing
-     * [Ctb][Moench] Absolute phase shift. Changing adcclk also resets adcphase
+     * adcclk also resets adcphase and sets it to previous values. \n [Gotthard]
-     * and sets it to previous values. \n
+     * Relative phase shift
-     * [Gotthard] Relative phase shift
      */
     void setADCPhase(int value, Positions pos = {});
 
-    /** [Jungfrau][CTB][Moench] */
+    /** [Jungfrau][Moench][CTB] */
     Result<int> getMaxADCPhaseShift(Positions pos = {}) const;
 
-    /** [Gotthard][Jungfrau][CTB][Moench] */
+    /** [Gotthard][Jungfrau][Moench][CTB] */
     Result<int> getADCPhaseInDegrees(Positions pos = {}) const;
 
-    /** [Gotthard][Jungfrau][CTB][Moench]
+    /** [Gotthard][Jungfrau][Moench][CTB]
-     * [Jungfrau] Absolute phase shift. Changing Speed also resets adcphase to
+     * [Jungfrau][Moench] Absolute phase shift. Changing Speed also resets
-     * recommended defaults. \n
+     * adcphase to recommended defaults. \n [Ctb] Absolute phase shift. Changing
-     * [Ctb][Moench] Absolute phase shift. Changing adcclk also resets adcphase
+     * adcclk also resets adcphase and sets it to previous values. \n [Gotthard]
-     * and sets it to previous values. \n
+     * Relative phase shift
-     * [Gotthard] Relative phase shift
      */
     void setADCPhaseInDegrees(int value, Positions pos = {});
 
-    /** [CTB][Jungfrau] */
+    /** [CTB][Jungfrau][Moench] */
     Result<int> getDBITPhase(Positions pos = {}) const;
 
-    /** [CTB][Jungfrau] Absolute phase shift \n
+    /** [CTB][Jungfrau][Moench] Absolute phase shift \n
      * [CTB] changing dbitclk also resets dbitphase and sets to previous values.
      */
     void setDBITPhase(int value, Positions pos = {});
 
-    /** [CTB][Jungfrau] */
+    /** [CTB][Jungfrau][Moench] */
     Result<int> getMaxDBITPhaseShift(Positions pos = {}) const;
 
-    /** [CTB][Jungfrau] */
+    /** [CTB][Jungfrau][Moench] */
     Result<int> getDBITPhaseInDegrees(Positions pos = {}) const;
 
-    /** [CTB][Jungfrau] Absolute phase shift \n
+    /** [CTB][Jungfrau][Moench] Absolute phase shift \n
      * [CTB] changing dbitclk also resets dbitphase and sets to previous values.
      */
     void setDBITPhaseInDegrees(int value, Positions pos = {});
@@ -435,18 +436,18 @@ class Detector {
 
     /**
      * [Gotthard] Options: 0, 90, 110, 120, 150, 180, 200
-     * [Jungfrau][CTB][Moench] Options: 0, 60 - 200
+     * [Jungfrau][Moench][CTB] Options: 0, 60 - 200
      * [Eiger][Mythen3][Gotthard2] Options: 0 - 200
      */
     void setHighVoltage(int value, Positions pos = {});
 
-    /** [Jungfrau][Mythen3][Gotthard2][Moench] */
+    /** [Jungfrau][Moench][Mythen3][Gotthard2] */
     Result<bool> getPowerChip(Positions pos = {}) const;
 
-    /** [Jungfrau][Mythen3][Gotthard2][Moench] Power the chip. \n
+    /** [Jungfrau][Moench][Mythen3][Gotthard2] Power the chip. \n
-     * [Moench] Default is disabled. \n
+     *  Default is disabled. \n
-     * [Jungfrau] Default is disabled. Get will return power status. Can be off
+     * [Jungfrau][Moench] Default is disabled. Get will return power status. Can
-     * if temperature event occured (temperature over temp_threshold with
+     * 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.
@@ -458,8 +459,8 @@ class Detector {
 
     /** [Gotthard] If 1, adds channel intensity with precalculated values.
      * Default is 0 \n
-     * [Eiger][Jungfrau] Only for virtual servers, if 1, pixels are saturated.
+     * [Eiger][Jungfrau][Moench] Only for virtual servers, if 1, pixels are
-     * If 0, increasing intensity */
+     * saturated. If 0, increasing intensity */
     void setImageTestMode(const int value, Positions pos = {});
 
     /** gets list of temperature indices for this detector */
@@ -469,7 +470,7 @@ class Detector {
      * (Degrees)
      * [Mythen3][Gotthard2] Options: TEMPERATURE_FPGA
      * [Gotthard] Options: TEMPERATURE_ADC, TEMPERATURE_FPGA \n
-     * [Jungfrau] Options: TEMPERATURE_ADC, TEMPERATURE_FPGA \n
+     * [Jungfrau][Moench] 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
@@ -486,11 +487,11 @@ class Detector {
     void setDefaultDac(defs::dacIndex index, int defaultValue,
                        Positions pos = {});
 
-    /** [Jungfrau][Mythen3] */
+    /** [Jungfrau][Moench][Mythen3] */
     Result<int> getDefaultDac(defs::dacIndex index, defs::detectorSettings sett,
                               Positions pos = {});
 
-    /** [Jungfrau][Mythen3] */
+    /** [Jungfrau][Moench][Mythen3] */
     void setDefaultDac(defs::dacIndex index, int defaultValue,
                        defs::detectorSettings sett, Positions pos = {});
 
@@ -539,20 +540,21 @@ class Detector {
      * mode.*/
     void setParallelMode(bool value, Positions pos = {});
 
-    /** [Gotthard2][Jungfrau] */
+    /** [Gotthard2][Jungfrau][Moench] */
     Result<int> getFilterResistor(Positions pos = {}) const;
 
-    /** [Gotthard2][Jungfrau] Set filter resistor. Increasing values for
+    /** [Gotthard2][Jungfrau][Moench] Set filter resistor. Increasing values for
      * increasing resistance.\n[Gotthard2] Options: [0|1|2|3]. Default is
-     * 0.\n[Jungfrau] Options: [0|1]. Default is 1.*/
+     * 0.\n[Jungfrau][Moench] Options: [0|1]. Default is 1.*/
     void setFilterResistor(int value, Positions pos = {});
 
-    /** [Gotthard2][Jungfrau] */
+    /** [Gotthard2][Jungfrau][Moench] */
     Result<defs::currentSrcParameters>
     getCurrentSource(Positions pos = {}) const;
 
-    /** [Gotthard2][Jungfrau] Please refer documentation on currentSrcParameters
+    /** [Gotthard2][Jungfrau][Moench] Please refer documentation on
-     * (sls_detector_defs.h) on the structure and its members */
+     * currentSrcParameters (sls_detector_defs.h) on the structure and its
+     * members */
     void setCurrentSource(defs::currentSrcParameters par, Positions pos = {});
 
     /** [CTB][Gotthard2] */
@@ -561,14 +563,14 @@ class Detector {
     /** [CTB] Options: 0-255 \n [Gotthard2] Options: 0-7 */
     void setDBITPipeline(int value, Positions pos = {});
 
-    /** [Eiger][Jungfrau] */
+    /** [Eiger][Jungfrau][Moench] */
     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] Number of rows per module
+     * dynamic range and 10Gbe enabled. \n[Jungfrau][Moench] Number of rows per
-     * starting from the centre. Options: 8 - 512, must be multiples of 8.
+     * module starting from the centre. Options: 8 - 512, must be multiples
-     * Default is 512.
+     * of 8. Default is 512.
      */
     void setReadNRows(const int lines, Positions pos = {});
 
@@ -647,10 +649,9 @@ class Detector {
      * different frame numbers for different modules.*/
     void setNextFrameNumber(uint64_t value, Positions pos = {});
 
-    /** [Eiger][Mythen3][Jungfrau] Sends an internal software trigger to the
+    /** [Eiger][Mythen3][Jungfrau][Moench] Sends an internal software trigger to
-     * detector block true if command blocks till frames are sent out from that
+     * the detector block true if command blocks till frames are sent out from
-     * trigger
+     * that trigger [Eiger][Jungfrau][Moench] Block can be true
-     * [Eiger][Jungfrau] Block can be true
      */
     void sendSoftwareTrigger(const bool block = false, Positions pos = {});
 
@@ -676,23 +677,23 @@ class Detector {
      *                                                 *
      * ************************************************/
 
-    /** [Jungfrau][Gotthard2][Eiger] */
+    /** [Jungfrau][Moench][Gotthard2][Eiger] */
     Result<int> getNumberofUDPInterfaces(Positions pos = {}) const;
 
-    /** [Jungfrau][Gotthard2]  Number of udp interfaces to stream data from
+    /** [Jungfrau][Moench][Gotthard2]  Number of udp interfaces to stream data
-     * detector. Default is 1. \n Also enables second interface in receiver for
+     * from detector. Default is 1. \n Also enables second interface in receiver
-     * listening (Writes a file per interface if writing enabled). \n Also
+     * 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] */
+    /** [Jungfrau][Moench] */
     Result<int> getSelectedUDPInterface(Positions pos = {}) const;
 
     /**
-     * [Jungfrau]
+     * [Jungfrau][Moench]
      * Effective only when number of interfaces is 1.
      * Options: 0 (outer, default), 1(inner)] //TODO: enum?
      */
@@ -706,11 +707,11 @@ class Detector {
      */
     void setSourceUDPIP(const IpAddr ip, Positions pos = {});
 
-    /** [Jungfrau] bottom half [Gotthard2] veto debugging */
+    /** [Jungfrau][Moench] bottom half [Gotthard2] veto debugging */
     Result<IpAddr> getSourceUDPIP2(Positions pos = {}) const;
 
-    /** [Jungfrau] bottom half [Gotthard2] veto debugging. \n The source UDP IP
+    /** [Jungfrau][Moench] bottom half [Gotthard2] veto debugging. \n The source
-     * must be in the same subnet of the destination UDP IP2 */
+     * 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;
@@ -721,10 +722,10 @@ class Detector {
      */
     void setSourceUDPMAC(const MacAddr mac, Positions pos = {});
 
-    /** [Jungfrau] bottom half [Gotthard2] veto debugging */
+    /** [Jungfrau][Moench] bottom half [Gotthard2] veto debugging */
     Result<MacAddr> getSourceUDPMAC2(Positions pos = {}) const;
 
-    /** [Jungfrau] bottom half [Gotthard2] veto debugging */
+    /** [Jungfrau][Moench] bottom half [Gotthard2] veto debugging */
     void setSourceUDPMAC2(const MacAddr mac, Positions pos = {});
 
     Result<UdpDestination> getDestinationUDPList(const uint32_t entry,
@@ -732,16 +733,16 @@ class Detector {
 
     void setDestinationUDPList(const UdpDestination, const int module_id);
 
-    /** [Jungfrau][Eiger][Mythen3][Gotthard2] */
+    /** [Jungfrau][Moench][Eiger][Mythen3][Gotthard2] */
     Result<int> getNumberofUDPDestinations(Positions pos = {}) const;
 
     void clearUDPDestinations(Positions pos = {});
 
-    /** [Jungfrau][Mythen3][Gotthard2] */
+    /** [Jungfrau][Moench][Mythen3][Gotthard2] */
     Result<int> getFirstUDPDestination(Positions pos = {}) const;
 
-    /**[Jungfrau][Gotthard2] Options 0-31 (or number of udp destinations)\n
+    /**[Jungfrau][Moench][Gotthard2] Options 0-31 (or number of udp
-     * [Mythen3] Options 0-63 (or number of udp destinations)
+     * destinations)\n [Mythen3] Options 0-63 (or number of udp destinations)
      */
     void setFirstUDPDestination(const int value, Positions pos = {});
 
@@ -750,10 +751,10 @@ class Detector {
     /** IP of the interface in receiver that the detector sends data to */
     void setDestinationUDPIP(const IpAddr ip, Positions pos = {});
 
-    /** [Jungfrau] bottom half \n [Gotthard2] veto debugging */
+    /** [Jungfrau][Moench] bottom half \n [Gotthard2] veto debugging */
     Result<IpAddr> getDestinationUDPIP2(Positions pos = {}) const;
 
-    /** [Jungfrau] bottom half \n [Gotthard2] veto debugging */
+    /** [Jungfrau][Moench] bottom half \n [Gotthard2] veto debugging */
     void setDestinationUDPIP2(const IpAddr ip, Positions pos = {});
 
     Result<MacAddr> getDestinationUDPMAC(Positions pos = {}) const;
@@ -765,14 +766,15 @@ class Detector {
      */
     void setDestinationUDPMAC(const MacAddr mac, Positions pos = {});
 
-    /** [Jungfrau] bottom half \n [Gotthard2] veto debugging */
+    /** [Jungfrau][Moench] bottom half \n [Gotthard2] veto debugging */
     Result<MacAddr> getDestinationUDPMAC2(Positions pos = {}) const;
 
-    /* [Jungfrau][Gotthard2] Mac address of the receiver (destination) udp
+    /* [Jungfrau][Moench][Gotthard2] Mac address of the receiver (destination)
-     * interface 2. \n Not mandatory to set as udp_dstip2 retrieves it from
+     * 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] bottom half \n [Gotthard2] veto debugging \n
+     * slsReceiver). \n [Jungfrau][Moench] bottom half \n [Gotthard2] veto
-     * Use router mac address if router in between detector and receiver.
+     * debugging \n Use router mac address if router in between detector and
+     * receiver.
      */
     void setDestinationUDPMAC2(const MacAddr mac, Positions pos = {});
 
@@ -782,12 +784,13 @@ class Detector {
      * calculated (incremented by 1 if no 2nd interface) */
     void setDestinationUDPPort(int port, int module_id = -1);
 
-    /** [Eiger] right port[Jungfrau] bottom half [Gotthard2] veto debugging */
+    /** [Eiger] right port[Jungfrau][Moench] bottom half [Gotthard2] veto
+     * debugging */
     Result<int> getDestinationUDPPort2(Positions pos = {}) const;
 
-    /** [Eiger] right port[Jungfrau] bottom half [Gotthard2] veto debugging \n
+    /** [Eiger] right port[Jungfrau][Moench] bottom half [Gotthard2] veto
-     * Default is 50002. \n If module_id is -1, ports for each module is
+     * debugging \n Default is 50002. \n If module_id is -1, ports for each
-     * calculated (incremented by 1 if no 2nd interface)*/
+     * 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
@@ -802,27 +805,28 @@ class Detector {
 
     Result<std::string> printRxConfiguration(Positions pos = {}) const;
 
-    /** [Eiger][CTB][Moench][Mythen3] */
+    /** [Eiger][CTB][Mythen3] */
     Result<bool> getTenGiga(Positions pos = {}) const;
 
-    /** [Eiger][CTB][Moench][Mythen3] */
+    /** [Eiger][CTB][Mythen3] */
     void setTenGiga(bool value, Positions pos = {});
 
-    /** [Eiger][Jungfrau] */
+    /** [Eiger][Jungfrau][Moench] */
     Result<bool> getTenGigaFlowControl(Positions pos = {}) const;
 
-    /** [Eiger][Jungfrau] */
+    /** [Eiger][Jungfrau][Moench] */
     void setTenGigaFlowControl(bool enable, Positions pos = {});
 
-    /** [Eiger][Jungfrau][Mythen3] */
+    /** [Eiger][Jungfrau][Moench][Mythen3] */
     Result<int> getTransmissionDelayFrame(Positions pos = {}) const;
 
     /**
-     * Eiger][Jungfrau][Mythen3] Transmission delay of first udp packet being
+     * Eiger][Jungfrau][Moench][Mythen3] Transmission delay of first udp packet
-     * streamed out of the module.\n[Jungfrau] [0-31] Each value represents 1
+     * being streamed out of the module.\n[Jungfrau][Moench] [0-31] Each value
-     * ms\n[Eiger] Additional delay to txndelay_left and txndelay_right. Each
+     * represents 1 ms\n[Eiger] Additional delay to txndelay_left and
-     * value represents 10ns. Typical value is 50000.\n[Mythen3] [0-16777215]
+     * txndelay_right. Each value represents 10ns. Typical value is
-     * Each value represents 8 ns (125 MHz clock), max is 134 ms.
+     * 50000.\n[Mythen3] [0-16777215] Each value represents 8 ns (125 MHz
+     * clock), max is 134 ms.
      */
     void setTransmissionDelayFrame(int value, Positions pos = {});
 
@@ -847,16 +851,16 @@ class Detector {
      */
     void setTransmissionDelayRight(int value, Positions pos = {});
 
-    /** [Eiger][Jungfrau] */
+    /** [Eiger][Jungfrau][Moench] */
     int getTransmissionDelay() const;
 
     /**
-     * [Eiger][Jungfrau][Mythen3] Set transmission delay for all modules in the
+     * [Eiger][Jungfrau][Moench][Mythen3] Set transmission delay for all modules
-     * detector using the step size provided.Sets up \n\t\t[Eiger] txdelay_left
+     * in the detector using the step size provided.Sets up \n\t\t[Eiger]
-     * to (2 * mod_index * n_delay), \n\t\t[Eiger] txdelay_right to ((2 *
+     * txdelay_left to (2 * mod_index * n_delay), \n\t\t[Eiger] txdelay_right to
-     * mod_index + 1) * n_delay) and \n\t\t[Eiger] txdelay_frame to (2
+     * ((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) \n\t\t[Jungfrau][Moench][Mythen3] txdelay_frame
-     * (num_modules * n_delay) \nfor every module.
+     * to (num_modules * n_delay) \nfor every module.
      */
     void setTransmissionDelay(int step);
 
@@ -1238,22 +1242,22 @@ class Detector {
 
     ///@}
 
-    /** @name Jungfrau Specific */
+    /** @name Jungfrau/Moench Specific */
     ///@{
     /**************************************************
      *                                                *
-     *    Jungfrau Specific                           *
+     *    Jungfrau/Moench Specific                           *
      *                                                *
      * ************************************************/
 
-    /** [Jungfrau] */
+    /** [Jungfrau][Moench] */
     Result<double> getChipVersion(Positions pos = {}) const;
 
-    /** [Jungfrau] */
+    /** [Jungfrau][Moench] */
     Result<int> getThresholdTemperature(Positions pos = {}) const;
 
     /**
-     * [Jungfrau]Set threshold temperature in degrees.
+     * [Jungfrau][Moench]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
@@ -1262,23 +1266,23 @@ class Detector {
      */
     void setThresholdTemperature(int temp, Positions pos = {});
 
-    /** [Jungfrau] */
+    /** [Jungfrau][Moench] */
     Result<bool> getTemperatureControl(Positions pos = {}) const;
 
-    /** [Jungfrau]  refer to setThresholdTemperature
+    /** [Jungfrau][Moench]  refer to setThresholdTemperature
      * Default is disabled */
     void setTemperatureControl(bool enable, Positions pos = {});
 
-    /** [Jungfrau] refer to setThresdholdTemperature */
+    /** [Jungfrau][Moench] refer to setThresdholdTemperature */
     Result<int> getTemperatureEvent(Positions pos = {}) const;
 
-    /** [Jungfrau] refer to setThresdholdTemperature */
+    /** [Jungfrau][Moench] refer to setThresdholdTemperature */
     void resetTemperatureEvent(Positions pos = {});
 
-    /** [Jungfrau] */
+    /** [Jungfrau][Moench] */
     Result<bool> getAutoComparatorDisable(Positions pos = {}) const;
 
-    /** [Jungfrau] Advanced
+    /** [Jungfrau][Moench] 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
@@ -1290,11 +1294,11 @@ class Detector {
      */
     void setAutoComparatorDisable(bool value, Positions pos = {});
 
-    /** [Jungfrau] */
+    /** [Jungfrau][Moench] */
     Result<ns> getComparatorDisableTime(Positions pos = {}) const;
 
-    /** [Jungfrau] Time before end of exposure when comparator is disabled. It
+    /** [Jungfrau][Moench] Time before end of exposure when comparator is
-     * is only possible for chipv1.1.*/
+     * disabled. It is only possible for chipv1.1.*/
     void setComparatorDisableTime(ns t, Positions pos = {});
 
     /** [Jungfrau] Advanced TODO naming */
@@ -1308,37 +1312,37 @@ class Detector {
     /** [Jungfrau] Advanced */
     Result<int> getStorageCellStart(Positions pos = {}) const;
 
-    /** [Jungfrau] Advanced. Sets the storage cell storing the first acquisition
+    /** [Jungfrau] Advanced. Sets the storage cell storing the first
-     * of the series. Options: 0-max. max is 15 (default) for chipv1.0 and 3
+     * acquisition of the series. Options: 0-max. max is 15 (default) for
-     * (default) for chipv1.1.
+     * 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
+    /** [Jungfrau] Advanced \n Additional time delay between 2
-     * exposures in burst mode. \n Options: (0-1638375 ns (resolution of 25ns)\n
+     * consecutive exposures in burst mode. \n Options: (0-1638375 ns
-     * Only applicable for chipv1.0.
+     * (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]*/
+    /** [Jungfrau][Moench]*/
     Result<defs::gainMode> getGainMode(Positions pos = {}) const;
 
-    /** [Jungfrau] Options: DYNAMIC, FORCE_SWITCH_G1, FORCE_SWITCH_G2,
+    /** [Jungfrau][Moench] 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] Advanced */
+    /** [Jungfrau][Moench] Advanced */
     Result<int> getNumberOfFilterCells(Positions pos = {}) const;
 
-    /** [Jungfrau] Advanced Options[0-12], only for chip v1.1
+    /** [Jungfrau][Moench] Advanced Options[0-12], only for chip v1.1
      */
     void setNumberOfFilterCells(int cell, Positions pos = {});
 
@@ -1570,69 +1574,68 @@ class Detector {
 
     ///@}
 
-    /** @name CTB / Moench Specific */
+    /** @name CTB Specific */
     ///@{
     /**************************************************
      *                                                *
-     *    CTB / Moench Specific                       *
+     *    CTB Specific                                *
      *                                                *
      * ************************************************/
-    /** [CTB][Moench] */
+    /** [CTB] */
     Result<int> getNumberOfAnalogSamples(Positions pos = {}) const;
 
-    /** [CTB][Moench] */
+    /** [CTB] */
     void setNumberOfAnalogSamples(int value, Positions pos = {});
 
-    /** [CTB][Moench] */
+    /** [CTB] */
     Result<int> getADCClock(Positions pos = {}) const;
 
-    /** [CTB][Moench] */
+    /** [CTB] */
     void setADCClock(int value_in_MHz, Positions pos = {});
 
-    /** [CTB][Moench] */
+    /** [CTB] */
     Result<int> getRUNClock(Positions pos = {}) const;
 
-    /** [CTB][Moench] */
+    /** [CTB] */
     void setRUNClock(int value_in_MHz, Positions pos = {});
 
-    /** [CTB][Moench]  in MHZ */
+    /** [CTB]  in MHZ */
     Result<int> getSYNCClock(Positions pos = {}) const;
 
-    /** [CTB][Moench] */
+    /** [CTB] */
     Result<int> getADCPipeline(Positions pos = {}) const;
 
-    /** [CTB][Moench] */
+    /** [CTB] */
     void setADCPipeline(int value, Positions pos = {});
 
-    /** [CTB][Moench] */
+    /** [CTB] */
     Result<int> getVoltage(defs::dacIndex index, Positions pos = {}) const;
 
     /**
-     * [CTB][Moench] mV
+     * [CTB] 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][Moench] Options: [0- 4] or [1V, 1.14V, 1.33V, 1.6V, 2V]
+     * [CTB] Options: [0- 4] or [1V, 1.14V, 1.33V, 1.6V, 2V]
      */
     Result<int> getADCVpp(bool mV = false, Positions pos = {}) const;
 
-    /** [CTB][Moench] */
+    /** [CTB] */
     void setADCVpp(int value, bool mV = false, Positions pos = {});
 
-    /** [CTB][Moench] */
+    /** [CTB] */
     Result<uint32_t> getADCEnableMask(Positions pos = {}) const;
 
-    /** [CTB][Moench] */
+    /** [CTB] */
     void setADCEnableMask(uint32_t mask, Positions pos = {});
 
-    /** [CTB][Moench] */
+    /** [CTB] */
     Result<uint32_t> getTenGigaADCEnableMask(Positions pos = {}) const;
 
-    /** [CTB][Moench] If any of a consecutive 4 bits are enabled, the "
+    /** [CTB] If any of a consecutive 4 bits are enabled, the "
         "complete 4 bits are enabled */
     void setTenGigaADCEnableMask(uint32_t mask, Positions pos = {});
     ///@}
@@ -1734,78 +1737,78 @@ class Detector {
      *                                                *
      * ************************************************/
 
-    /** [CTB][Moench][Mythen3]  Loads ASCII pattern file directly to server
+    /** [CTB][Mythen3]  Loads ASCII pattern file directly to server
      * (instead of executing line by line)*/
     void setPattern(const std::string &fname, Positions pos = {});
 
-    /** [CTB][Moench][Mythen3]  Loads pattern parameters structure directly to
+    /** [CTB][Mythen3]  Loads pattern parameters structure directly to
      * server */
     void setPattern(const Pattern &pat, Positions pos = {});
 
-    /** [CTB][Moench][Mythen3] [Ctb][Moench][Mythen3] Saves pattern to file
+    /** [CTB][Mythen3] [Ctb][Mythen3] Saves pattern to file
-     * (ascii). \n [Ctb][Moench] Also executes pattern.*/
+     * (ascii). \n [Ctb] Also executes pattern.*/
     void savePattern(const std::string &fname);
 
-    /** [Mythen3][Moench] Loads and runs default pattern */
+    /** [Mythen3] Loads and runs default pattern */
     void loadDefaultPattern(Positions pos = {});
 
-    /** [CTB][Moench] */
+    /** [CTB] */
     Result<uint64_t> getPatternIOControl(Positions pos = {}) const;
 
-    /** [CTB][Moench] */
+    /** [CTB] */
     void setPatternIOControl(uint64_t word, Positions pos = {});
 
-    /** [CTB][Moench][Mythen3] same as executing for ctb and moench */
+    /** [CTB][Mythen3] same as executing for ctb */
     Result<uint64_t> getPatternWord(int addr, Positions pos = {});
 
-    /** [CTB][Moench] Caution: If word is  -1  reads the addr (same as
+    /** [CTB] Caution: If word is  -1  reads the addr (same as
      * executing the pattern)
      * [Mythen3] */
     void setPatternWord(int addr, uint64_t word, Positions pos = {});
 
-    /**[CTB][Moench][Mythen3] Options: level: -1 (complete pattern) and 0-2
+    /**[CTB][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][Moench][Mythen3] Options: level: -1 (complete pattern) and 0-2
+    /** [CTB][Mythen3] Options: level: -1 (complete pattern) and 0-2
      * levels */
     void setPatternLoopAddresses(int level, int start, int stop,
                                  Positions pos = {});
 
-    /**[CTB][Moench][Mythen3] Options: level: -1 (complete pattern) and 0-2
+    /**[CTB][Mythen3] Options: level: -1 (complete pattern) and 0-2
      * levels  */
     Result<int> getPatternLoopCycles(int level, Positions pos = {}) const;
 
-    /** [CTB][Moench][Mythen3] n: 0-2, level: -1 (complete pattern) and 0-2
+    /** [CTB][Mythen3] n: 0-2, level: -1 (complete pattern) and 0-2
      * levels */
     void setPatternLoopCycles(int level, int n, Positions pos = {});
 
-    /**[CTB][Moench][Mythen3] */
+    /**[CTB][Mythen3] */
     Result<int> getPatternWaitAddr(int level, Positions pos = {}) const;
 
-    /** [CTB][Moench][Mythen3] Options: level 0-2 */
+    /** [CTB][Mythen3] Options: level 0-2 */
     void setPatternWaitAddr(int level, int addr, Positions pos = {});
 
-    /** [CTB][Moench][Mythen3]  */
+    /** [CTB][Mythen3]  */
     Result<uint64_t> getPatternWaitTime(int level, Positions pos = {}) const;
 
-    /** [CTB][Moench][Mythen3] Options: level 0-2 */
+    /** [CTB][Mythen3] Options: level 0-2 */
     void setPatternWaitTime(int level, uint64_t t, Positions pos = {});
 
-    /** [CTB][Moench][Mythen3] */
+    /** [CTB][Mythen3] */
     Result<uint64_t> getPatternMask(Positions pos = {});
 
-    /** [CTB][Moench][Mythen3] Selects the bits that will have a pattern mask
+    /** [CTB][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][Moench][Mythen3]  */
+    /** [CTB][Mythen3]  */
     Result<uint64_t> getPatternBitMask(Positions pos = {}) const;
 
-    /** [CTB][Moench][Mythen3] Sets the mask applied to every pattern to the
+    /** [CTB][Mythen3] Sets the mask applied to every pattern to the
      * selected bits */
     void setPatternBitMask(uint64_t mask, Positions pos = {});
 
@@ -1813,19 +1816,18 @@ class Detector {
     void startPattern(Positions pos = {});
     ///@}
 
-    /** @name Moench specific */
+    /** @name Json Header specific */
     ///@{
     /**************************************************
      *                                                *
-     *    Moench specific                             *
+     *    Json Header specific                        *
      *                                                *
      * ************************************************/
 
-    /** [Moench] */
     Result<std::map<std::string, std::string>>
     getAdditionalJsonHeader(Positions pos = {}) const;
 
-    /** [Moench] If empty, reset additional json header. Default is empty. Max
+    /**  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 */
@@ -1833,11 +1835,9 @@ 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][Gotthard][CTB][Moench][Mythen3][Gotthard2]
+    /**  [Jungfrau][Moench][Gotthard][CTB][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][CTB][Moench] fname is a pof file (full
+     * programming continued.[Jungfrau][Moench][CTB] 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][CTB][Moench]  Advanced user Function!  */
+    /** [Jungfrau][Moench][CTB]  Advanced user Function!  */
     void resetFPGA(Positions pos = {});
 
-    /** [Jungfrau][Eiger][Ctb][Moench][Mythen3][Gotthard2] Copies detector
+    /** [Jungfrau][Moench][Eiger][Ctb][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][Ctb][Moench] Also deletes old server binary and
+     * Eiger).\n[Jungfrau][Moench][Ctb] 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][Ctb][Moench][Mythen3][Gotthard2] \n
+    /** [Jungfrau][Moench][Ctb][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][Gotthard][CTB][Moench][Mythen3][Gotthard2] Advanced user
+    /** [Jungfrau][Moench][Gotthard][CTB][Mythen3][Gotthard2] Advanced user
      * Function! */
     void rebootController(Positions pos = {});
 
     /**
-     * Advanced user Function!\n [Jungfrau][Gotthard][CTB][Moench] Updates the
+     * Advanced user Function!\n [Jungfrau][Moench][Gotthard][CTB] 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][Mythen3][Gotthard2][CTB][Moench] Advanced user
+    /** [Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB] Advanced user
      * Function! */
     void executeFirmwareTest(Positions pos = {});
 
-    /** [Gotthard][Jungfrau][Mythen3][Gotthard2][CTB][Moench] Advanced user
+    /** [Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB] Advanced user
      * Function! Writes different values in a R/W register and confirms the
      * writes to check bus */
     void executeBusTest(Positions pos = {});
 
-    /** [Gotthard][Jungfrau][CTB][Moench] Advanced user Function! not possible
+    /** [Gotthard][Jungfrau][Moench][CTB] 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][Moench][Jungfrau] Advanced user Function! */
+    /** [CTB][Jungfrau][Moench] Advanced user Function! */
     Result<uint32_t> getADCInvert(Positions pos = {}) const;
 
-    /** [CTB][Moench][Jungfrau] Advanced user Function! \n
+    /** [CTB][Jungfrau][Moench] Advanced user Function! \n
-    [Jungfrau] Inversions on top of default mask */
+    [Jungfrau][Moench] 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][Mythen3][CTB][Moench]
+    /** [Jungfrau][Moench][Mythen3][CTB]
      * [Gotthard2] only in continuous mode */
     Result<int64_t> getNumberOfFramesFromStart(Positions pos = {}) const;
 
-    /** [Jungfrau][Mythen3][CTB][Moench] Get time from detector start
+    /** [Jungfrau][Moench][Mythen3][CTB] Get time from detector start
      * [Gotthard2] not in burst and auto mode */
     Result<ns> getActualTime(Positions pos = {}) const;
 
-    /** [Jungfrau][Mythen3][CTB][Moench] Get timestamp at a frame start
+    /** [Jungfrau][Moench][Mythen3][CTB] Get timestamp at a frame start
      * [Gotthard2] not in burst and auto mode */
     Result<ns> getMeasurementTime(Positions pos = {}) const;
 

slsDetectorSoftware/src/CmdProxy.cpp

@@ -280,19 +280,29 @@ std::string CmdProxy::Versions(int action) {
         os << "\nType            : " << OutString(det->getDetectorType())
            << "\nRelease         : " << det->getPackageVersion() << std::hex
            << "\nClient          : " << det->getClientVersion();
-        os << "\nFirmware : ";
+
         if (eiger) {
-            os << OutString(t);
+            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}));
         } else {
-            os << OutStringHex(t);
+            os << "\nFirmware        : "
+               << OutStringHex(
+                      det->getFirmwareVersion(std::vector<int>{det_id}));
         }
+
         os << "\nServer          : "
            << OutString(det->getDetectorServerVersion(std::vector<int>{det_id}))
            << "\nKernel          : "
-           << OutString(det->getKernelVersion({std::vector<int>{det_id}}));
+           << OutString(det->getKernelVersion({std::vector<int>{det_id}}))
-        if (!eiger)
+           << "\nHardware        : "
-            os << "\nHardware : "
            << OutString(det->getHardwareVersion(std::vector<int>{det_id}));
+
         if (det->getUseReceiverFlag().squash(true)) {
             os << "\nReceiver        : "
                << OutString(det->getReceiverVersion(std::vector<int>{det_id}));
@@ -516,7 +526,8 @@ std::string CmdProxy::GapPixels(int action) {
     std::ostringstream os;
     os << cmd << ' ';
     if (action == defs::HELP_ACTION) {
-        os << "[0, 1]\n\t[Eiger][Jungfrau] Include Gap pixels in client data "
+        os << "[0, 1]\n\t[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 0. "
            << '\n';
@@ -606,8 +617,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][Gotthard][Gotthard2]["
+                  "ns|us|ms|s]\n\t[Eiger][Jungfrau][Moench][Gotthard]["
-                  "Moench][Ctb] Exposure time"
+                  "Gotthard2][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."
@@ -691,9 +702,10 @@ 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] Readout "
+              "quarter_speed]\n\t\t[Eiger][Jungfrau][Moench] Readout "
               "speed of chip.\n\t\t[Eiger] Default speed is full_speed."
-              "\n\t\t[Jungfrau] Default speed is half_speed. full_speed "
+              "\n\t\t[Jungfrau][Moench] 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 "
@@ -702,7 +714,7 @@ std::string CmdProxy::ReadoutSpeed(int action) {
            << '\n';
     } else {
         defs::detectorType type = det->getDetectorType().squash();
-        if (type == defs::CHIPTESTBOARD || type == defs::MOENCH) {
+        if (type == defs::CHIPTESTBOARD) {
             throw RuntimeError(
                 "ReadoutSpeed not implemented. Did you mean runclk?");
         }
@@ -731,10 +743,11 @@ std::string CmdProxy::Adcphase(int action) {
     os << cmd << ' ';
     if (action == defs::HELP_ACTION) {
         os << "[n_value] "
-              "[(optional)deg]\n\t[Jungfrau][Ctb][Moench][Gotthard] "
+              "[(optional)deg]\n\t[Jungfrau][Moench][Ctb][Gotthard] "
-              "Phase shift of ADC clock. \n\t[Jungfrau] Absolute phase shift. "
+              "Phase shift of ADC clock. \n\t[Jungfrau][Moench] Absolute phase "
+              "shift. "
               "If deg used, then shift in degrees. Changing Speed also resets "
-              "adcphase to recommended defaults.\n\t[Ctb][Moench] Absolute "
+              "adcphase to recommended defaults.\n\t[Ctb] 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"
@@ -787,7 +800,8 @@ 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] Phase shift of "
+        os << "[n_value] [(optional)deg]\n\t[Ctb][Jungfrau][Moench] 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."
@@ -1024,7 +1038,8 @@ 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] Disable or enable current "
+              "chipv1.1)normal|low]\n\t\t[Jungfrau][Moench] 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'."
@@ -1273,7 +1288,7 @@ std::string CmdProxy::ResetDacs(int action) {
     os << cmd << ' ';
     if (action == defs::HELP_ACTION) {
         os << "[(optional) hard] "
-              "\n\t[Eiger][Jungfrau][Gotthard][Moench][Gotthard2]["
+              "\n\t[Eiger][Jungfrau][Moench][Gotthard][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."
@@ -1304,7 +1319,8 @@ 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][Mythen3] When settings is "
+              "that dac to this value.\n\t[Jungfrau][Moench][Mythen3] When "
+              "settings is "
               "provided, it sets the default value only for that setting"
            << '\n';
     } else if (action == defs::GET_ACTION) {
@@ -1447,10 +1463,12 @@ std::string CmdProxy::Trigger(int action) {
     os << cmd << ' ';
     if (action == defs::HELP_ACTION) {
         if (cmd == "trigger") {
-            os << "\n\t[Eiger][Mythen3][Jungfrau] Sends software trigger "
+            os << "\n\t[Eiger][Mythen3][Jungfrau][Moench] Sends software "
+                  "trigger "
                   "signal to detector";
         } else if (cmd == "blockingtrigger") {
-            os << "\n\t[Eiger][Jungfrau] Sends software trigger signal to "
+            os << "\n\t[Eiger][Jungfrau][Moench] Sends software trigger signal "
+                  "to "
                   "detector and blocks till the frames are sent out for that "
                   "trigger.";
         } else {
@@ -1554,7 +1572,8 @@ 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][Mythen3][Gotthard2] where round robin is "
+              "[Eiger][Jungfrau][Moench][Mythen3][Gotthard2] where round robin "
+              "is "
               "implemented. If 'auto' used, then ip is set to ip of "
               "rx_hostname."
            << '\n';
@@ -1634,9 +1653,10 @@ 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][Gotthard2] Ip address of the "
+        os << "[x.x.x.x] or auto\n\t[Jungfrau][Moench][Gotthard2] Ip address "
+              "of the "
               "detector (source) udp interface 2. Must be same subnet as "
-              "destination udp ip2.\n\t [Jungfrau] top half or inner "
+              "destination udp ip2.\n\t [Jungfrau][Moench] 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."
@@ -1707,9 +1727,10 @@ 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][Gotthard2] Ip address of the "
+        os << "[x.x.x.x] or auto\n\t[Jungfrau][Moench][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] bottom half "
+              "is set to ip of rx_hostname.\n\t[Jungfrau][Moench] bottom half "
               "\n\t[Gotthard2] veto debugging. "
            << '\n';
     } else if (action == defs::GET_ACTION) {
@@ -1743,12 +1764,13 @@ std::string CmdProxy::TransmissionDelay(int action) {
     std::ostringstream os;
     os << cmd << ' ';
     if (action == defs::HELP_ACTION) {
-        os << "[n_delay]\n\t[Eiger][Jungfrau][Mythen3] Set transmission delay "
+        os << "[n_delay]\n\t[Eiger][Jungfrau][Moench][Mythen3] Set "
+              "transmission delay "
               "for all modules in the detector using the step size "
               "provided.Sets up \n\t\t[Eiger] txdelay_left to (2 * mod_index * "
               "n_delay), \n\t\t[Eiger] txdelay_right to ((2 * mod_index + 1) * "
               "n_delay) and \n\t\t[Eiger] txdelay_frame to (2 *num_modules * "
-              "n_delay)  \n\t\t[Jungfrau][Mythen3] txdelay_frame to "
+              "n_delay)  \n\t\t[Jungfrau][Moench][Mythen3] txdelay_frame to "
               "(num_modules * n_delay)  \nfor every module."
            << '\n';
     } else if (action == defs::GET_ACTION) {
@@ -2090,7 +2112,8 @@ std::string CmdProxy::TemperatureEvent(int action) {
     std::ostringstream os;
     os << cmd << ' ';
     if (action == defs::HELP_ACTION) {
-        os << "[0]\n\t[Jungfrau] 1, if a temperature event occured. To clear "
+        os << "[0]\n\t[Jungfrau][Moench] 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 "
@@ -2584,14 +2607,14 @@ std::string CmdProxy::GainCaps(int action) {
     return os.str();
 }
 
-/* CTB / Moench Specific */
+/* CTB 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\t[Moench] Number of samples (analog only)"
+              "digitial) expected.\n"
            << '\n';
     } else if (action == defs::GET_ACTION) {
         if (!args.empty()) {
@@ -2633,7 +2656,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][Moench] Vpp of "
+        os << "[dac or mV value][(optional unit) mV] \n\t[Ctb] Vpp of "
               "ADC.\n\t 0 -> 1V ; 1 -> 1.14V ; 2 -> 1.33V ; 3 -> 1.6V ; 4 -> "
               "2V. \n\tAdvanced User function!\n"
            << '\n';
@@ -2775,7 +2798,7 @@ std::string CmdProxy::Pattern(int action) {
     std::ostringstream os;
     os << cmd << ' ';
     if (action == defs::HELP_ACTION) {
-        os << "[fname]\n\t[Mythen3][Moench][Ctb] Loads ASCII pattern file "
+        os << "[fname]\n\t[Mythen3][Ctb] Loads ASCII pattern file "
               "directly to server (instead of executing line by line)"
            << '\n';
     } else if (action == defs::GET_ACTION) {
@@ -2796,8 +2819,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][Moench][Mythen3] 64 "
+        os << "[step or address] [64 bit mask]\n\t[Ctb][Mythen3] 64 "
-              "bit pattern at address of pattern memory.\n\t[Ctb][Moench] read "
+              "bit pattern at address of pattern memory.\n\t[Ctb] read "
               "is same as executing pattern"
            << '\n';
     } else if (action == defs::GET_ACTION) {
@@ -2856,11 +2879,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][Moench][Mythen3] Limits "
+            os << "[start addr] [stop addr] \n\t[Ctb][Mythen3] Limits "
                   "of complete pattern."
                << '\n';
         } else if (cmd == "patloop") {
-            os << "[0-6] [start addr] [stop addr] \n\t[Ctb][Moench][Mythen3] "
+            os << "[0-6] [start addr] [stop addr] \n\t[Ctb][Mythen3] "
                   "Limits of the loop level provided."
                << "\n\t[Mythen3] Level options: 0-3 only." << '\n';
         } else {
@@ -2901,7 +2924,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][Moench][Mythen3] Number of "
+            os << "[0-6] [n_cycles] \n\t[Ctb][Mythen3] Number of "
                   "cycles of "
                   "the loop level provided."
                << "\n\t[Mythen3] Level options: 0-3 only." << '\n';
@@ -2937,7 +2960,7 @@ std::string CmdProxy::PatternWaitAddress(int action) {
     os << cmd << ' ';
     if (action == defs::HELP_ACTION) {
         if (cmd == "patwait") {
-            os << "[0-6] [addr] \n\t[Ctb][Moench][Mythen3] Wait address for "
+            os << "[0-6] [addr] \n\t[Ctb][Mythen3] Wait address for "
                   "loop level provided."
                << "\n\t[Mythen3] Level options: 0-3 only.";
         } else {
@@ -2973,7 +2996,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][Moench][Mythen3] Wait time in clock "
+            os << "[0-6] [n_clk] \n\t[Ctb][Mythen3] Wait time in clock "
                   "cycles for the loop provided."
                << "\n\t[Mythen3] Level options: 0-3 only." << '\n';
         } else {
@@ -3000,8 +3023,6 @@ std::string CmdProxy::PatternWaitTime(int action) {
     return os.str();
 }
 
-/* Moench */
-
 std::string CmdProxy::AdditionalJsonHeader(int action) {
     std::ostringstream os;
     os << cmd << ' ';
@@ -3084,8 +3105,9 @@ 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][Ctb]["
+              "path)][(opitonal)--force-delete-normal-file]\n\t[Jungfrau]["
-              "Moench] Programs FPGA from pof file (full path). Then, detector "
+              "Moench][Ctb] "
+              "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 "
@@ -3119,11 +3141,11 @@ std::string CmdProxy::UpdateDetectorServer(int action) {
     os << cmd << ' ';
     if (action == defs::HELP_ACTION) {
         os << "[server_name  with full "
-              "path]\n\t[Jungfrau][Eiger][Ctb][Moench][Mythen3][Gotthard2] "
+              "path]\n\t[Jungfrau][Moench][Eiger][Ctb][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][Ctb][Moench]Also changes respawn server "
+              "Eiger).\n\t[Jungfrau][Moench][Ctb]Also changes respawn server "
               "to the link, which is effective after a reboot."
            << '\n';
     } else if (action == defs::GET_ACTION) {
@@ -3145,7 +3167,7 @@ std::string CmdProxy::UpdateKernel(int action) {
     os << cmd << ' ';
     if (action == defs::HELP_ACTION) {
         os << "[kernel_name with full "
-              "path]\n\t[Jungfrau][Ctb][Moench][Mythen3][Gotthard2] Advanced "
+              "path]\n\t[Jungfrau][Moench][Ctb][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."
@@ -3170,7 +3192,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][Gotthard][CTB][Moench] Updates the "
+              "tftp.\n\t\t[Jungfrau][Moench][Gotthard][CTB] 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 "
@@ -3232,7 +3254,7 @@ std::string CmdProxy::AdcRegister(int action) {
     std::ostringstream os;
     os << cmd << ' ';
     if (action == defs::HELP_ACTION) {
-        os << "[address] [value]\n\t[Jungfrau][Ctb][Moench][Gotthard] Writes "
+        os << "[address] [value]\n\t[Jungfrau][Moench][Ctb][Gotthard] Writes "
               "to an adc register in hex. Advanced user Function!"
            << '\n';
     } else if (action == defs::GET_ACTION) {

slsDetectorSoftware/src/CmdProxy.h

@@ -1244,7 +1244,8 @@ class CmdProxy {
 
     GET_COMMAND(hardwareversion, getHardwareVersion,
                 "\n\t[Jungfrau][Gotthard2][Myhten3][Gotthard][Ctb][Moench] "
-                "Hardware version of detector.");
+                "Hardware version of detector. \n\t[Eiger] Hardware version of "
+                "front FPGA on detector.");
 
     GET_COMMAND(
         kernelversion, getKernelVersion,
@@ -1253,11 +1254,12 @@ class CmdProxy {
     GET_COMMAND(rx_version, getReceiverVersion, "\n\tReceiver version");
 
     GET_COMMAND_HEX(serialnumber, getSerialNumber,
-                    "\n\t[Jungfrau][Gotthard][Mythen3][Gotthard2][CTB][Moench]"
+                    "\n\t[Jungfrau][Moench][Gotthard][Mythen3][Gotthard2][CTB]"
                     "Serial number of detector.");
 
-    GET_COMMAND(moduleid, getModuleId,
+    GET_COMMAND(
-                "\n\t[Gotthard2][Eiger][Mythen3][Jungfrau] 16 bit value "
+        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.");
 
@@ -1279,12 +1281,10 @@ 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] - [ gain0 | highgain0]"
+        "\n\t[Jungfrau][Moench] - [ 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,21 +1302,23 @@ 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] flips "
+        "to stream as json parameter to flip rows in gui "
+        "\n\t[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.");
 
-    INTEGER_COMMAND_VEC_ID_GET(
+    INTEGER_COMMAND_VEC_ID_GET(master, getMaster, setMaster, StringTo<int>,
-        master, getMaster, setMaster, StringTo<int>,
+                               "[0, 1]\n\t[Eiger][Gotthard2][Jungfrau][Moench] "
-        "[0, 1]\n\t[Eiger][Gotthard2][Jungfrau] Sets (half) module to master "
+                               "Sets (half) module to master "
                                "and other(s) to "
-        "slaves.\n\t[Gotthard][Gotthard2][Mythen3][Eiger][Jungfrau] Gets if "
+                               "slaves.\n\t[Gotthard][Gotthard2][Mythen3]["
+                               "Eiger][Jungfrau][Moench] Gets if "
                                "the current (half) module is master.");
 
-    INTEGER_COMMAND_SET_NOID_GET_ID(sync, getSynchronization,
+    INTEGER_COMMAND_SET_NOID_GET_ID(
-                                    setSynchronization, StringTo<int>,
+        sync, getSynchronization, setSynchronization, StringTo<int>,
-                                    "[0, 1]\n\t[Jungfrau] Enables or disables "
+        "[0, 1]\n\t[Jungfrau][Moench] Enables or disables "
         "synchronization between modules.");
 
     /* acquisition parameters */
@@ -1337,28 +1339,29 @@ class CmdProxy {
         period, getPeriod, setPeriod,
         "[duration] [(optional unit) ns|us|ms|s]\n\tPeriod between frames");
 
-    TIME_COMMAND(delay, getDelayAfterTrigger, setDelayAfterTrigger,
+    TIME_COMMAND(
+        delay, getDelayAfterTrigger, setDelayAfterTrigger,
         "[duration] [(optional unit) "
-                 "ns|us|ms|s]\n\t[Jungfrau][Gotthard][Mythen3][Gotthard2][Ctb]["
+        "ns|us|ms|s]\n\t[Jungfrau][Moench][Gotthard][Mythen3][Gotthard2][Ctb]["
         "Moench] Delay after trigger");
 
     GET_COMMAND(framesl, getNumberOfFramesLeft,
-                "\n\t[Gotthard][Jungfrau][Mythen3][Gotthard2][CTB][Moench] "
+                "\n\t[Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB] "
                 "Number of frames left in acquisition."
                 "\n\t[Gotthard2] only in continuous auto mode.");
 
     GET_COMMAND(triggersl, getNumberOfTriggersLeft,
-                "\n\t[Gotthard][Jungfrau][Mythen3][Gotthard2][CTB][Moench] "
+                "\n\t[Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB] "
                 "Number of triggers left in acquisition. Only when external "
                 "trigger used.");
 
     TIME_GET_COMMAND(delayl, getDelayAfterTriggerLeft,
-                     "\n\t[Gotthard][Jungfrau][Mythen3][Gotthard2][CTB][Moench]"
+                     "\n\t[Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB]"
                      " DelayLeft Delay Left in Acquisition."
                      "\n\t[Gotthard2] only in continuous mode.");
 
     TIME_GET_COMMAND(periodl, getPeriodLeft,
-                     "\n\t[Gotthard][Jungfrau][CTB][Moench][Mythen3][Gotthard2]"
+                     "\n\t[Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2]"
                      " Period left for current frame."
                      "\n\t[Gotthard2] only in continuous mode.");
 
@@ -1369,7 +1372,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][Gotthard][Ctb][Moench][Mythen3][Gotthard2] 16");
+        "[Jungfrau][Moench][Gotthard][Ctb][Mythen3][Gotthard2] 16");
 
     GET_COMMAND_NOID(drlist, getDynamicRangeList,
                      "\n\tGets the list of dynamic ranges for this detector.");
@@ -1378,7 +1381,7 @@ class CmdProxy {
         timing, getTimingMode, setTimingMode,
         StringTo<slsDetectorDefs::timingMode>,
         "[auto|trigger|gating|burst_trigger]\n\tTiming Mode of "
-        "detector.\n\t[Jungfrau][Gotthard][Ctb][Moench][Gotthard2] "
+        "detector.\n\t[Jungfrau][Moench][Gotthard][Ctb][Gotthard2] "
         "[auto|trigger]\n\t[Mythen3] "
         "[auto|trigger|gating|trigger_gating]\n\t[Eiger] "
         "[auto|trigger|gating|burst_trigger]");
@@ -1391,11 +1394,12 @@ class CmdProxy {
         "\n\tList of readout speed levels implemented for this detector.");
 
     GET_COMMAND(maxadcphaseshift, getMaxADCPhaseShift,
-                "\n\t[Jungfrau][CTB][Moench] Absolute maximum Phase shift of "
+                "\n\t[Jungfrau][Moench][CTB] Absolute maximum Phase shift of "
                 "ADC clock.");
 
-    GET_COMMAND(maxdbitphaseshift, getMaxDBITPhaseShift,
+    GET_COMMAND(
-                "\n\t[CTB][Jungfrau] Absolute maximum Phase shift of of the "
+        maxdbitphaseshift, getMaxDBITPhaseShift,
+        "\n\t[CTB][Jungfrau][Moench] Absolute maximum Phase shift of of the "
         "clock to latch digital bits.");
 
     INTEGER_COMMAND_VEC_ID(highvoltage, getHighVoltage, setHighVoltage,
@@ -1403,12 +1407,12 @@ class CmdProxy {
                            "[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][Ctb][Moench] [0|60-200]");
+                           "\n\t[Jungfrau][Moench][Ctb] [0|60-200]");
 
     INTEGER_COMMAND_VEC_ID(
         powerchip, getPowerChip, setPowerChip, StringTo<int>,
-        "[0, 1]\n\t[Jungfrau][Mythen3][Gotthard2][Moench] Power "
+        "[0, 1]\n\t[Jungfrau][Moench][Mythen3][Gotthard2] Power "
-        "the chip. \n\t[Moench] Default is 0. \n\t[Jungfrau] Default is 0. Get "
+        "the chip. \n\t[Jungfrau][Moench] 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] "
@@ -1419,7 +1423,8 @@ 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] Only for Virtual servers. If 0, each pixel "
+        "\n\t[Eiger][Jungfrau][Moench] Only for Virtual servers. If 0, each "
+        "pixel "
         "intensity incremented by 1. If 1, all pixels almost saturated.");
 
     INTEGER_COMMAND_VEC_ID(
@@ -1433,9 +1438,10 @@ class CmdProxy {
 
     INTEGER_COMMAND_VEC_ID(
         filterresistor, getFilterResistor, setFilterResistor, StringTo<int>,
-        "[value] [Gotthard2][Jungfrau] Set filter resistor. Increasing values "
+        "[value] [Gotthard2][Jungfrau][Moench] Set filter resistor. Increasing "
+        "values "
         "for increasing resistance.\n\t[Gotthard2] Options: [0|1|2|3]. Default "
-        "is 0.\n\t[Jungfrau] Options: [0|1]. Default is 1.");
+        "is 0.\n\t[Jungfrau][Moench] Options: [0|1]. Default is 1.");
 
     INTEGER_COMMAND_VEC_ID(dbitpipeline, getDBITPipeline, setDBITPipeline,
                            StringTo<int>,
@@ -1450,19 +1456,22 @@ 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.");
+        "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.");
 
     /** temperature */
     GET_COMMAND_NOID(
         templist, getTemperatureList,
         "\n\tList of temperature commands implemented for this detector.");
 
-    GET_IND_COMMAND(temp_adc, getTemperature, slsDetectorDefs::TEMPERATURE_ADC,
+    GET_IND_COMMAND(
-                    " °C", "[n_value]\n\t[Jungfrau][Gotthard] ADC Temperature");
+        temp_adc, getTemperature, slsDetectorDefs::TEMPERATURE_ADC, " °C",
+        "[n_value]\n\t[Jungfrau][Moench][Gotthard] ADC Temperature");
 
     GET_IND_COMMAND(temp_fpga, getTemperature,
                     slsDetectorDefs::TEMPERATURE_FPGA, " °C",
-                    "[n_value]\n\t[Eiger][Jungfrau][Gotthard][Mythen3]["
+                    "[n_value]\n\t[Eiger][Jungfrau][Moench][Gotthard][Mythen3]["
                     "Gotthard2] FPGA Temperature");
 
     GET_IND_COMMAND(temp_fpgaext, getTemperature,
@@ -1596,7 +1605,7 @@ class CmdProxy {
     INTEGER_COMMAND_VEC_ID(
         numinterfaces, getNumberofUDPInterfaces, setNumberofUDPInterfaces,
         StringTo<int>,
-        "[1, 2]\n\t[Jungfrau] Number of udp interfaces to stream "
+        "[1, 2]\n\t[Jungfrau][Moench] 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 "
@@ -1605,12 +1614,14 @@ class CmdProxy {
     INTEGER_COMMAND_VEC_ID(
         selinterface, getSelectedUDPInterface, selectUDPInterface,
         StringTo<int>,
-        "[0, 1]\n\t[Jungfrau] The udp interface to stream data from detector. "
+        "[0, 1]\n\t[Jungfrau][Moench] 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][Eiger][Mythen3][Gotthard2] One can enter upto 32 (64 "
+        "\n\t[Jungfrau][Moench][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");
 
@@ -1621,7 +1632,8 @@ class CmdProxy {
         udp_firstdst, getFirstUDPDestination, setFirstUDPDestination,
         StringTo<int>,
         "\n[0 - 31 (or number of udp "
-        "destinations)]\n\t[Jungfrau][Gotthard2]\n[0-63]\n\t[Mythen3]\n\n\t "
+        "destinations)]\n\t[Jungfrau][Moench][Gotthard2]\n[0-63]\n\t[Mythen3]"
+        "\n\n\t "
         "One can set which is the first destination that the detector will "
         "stream images out from in a round robin fashion. The entry must not "
         "have been empty. Default: 0");
@@ -1632,9 +1644,9 @@ 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,
+    INTEGER_COMMAND_VEC_ID(
-                           MacAddr,
+        udp_srcmac2, getSourceUDPMAC2, setSourceUDPMAC2, MacAddr,
-                           "[x:x:x:x:x:x]\n\t[Jungfrau] Mac address of the top "
+        "[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(
@@ -1647,10 +1659,12 @@ class CmdProxy {
 
     INTEGER_COMMAND_VEC_ID(
         udp_dstmac2, getDestinationUDPMAC2, setDestinationUDPMAC2, MacAddr,
-        "[x:x:x:x:x:x]\n\t[Jungfrau] Mac address of the receiver (destination) "
+        "[x:x:x:x:x:x]\n\t[Jungfrau][Moench] 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] top half or inner interface \n\t "
+        "slsReceiver). \n\t [Jungfrau][Moench] top half or inner interface "
+        "\n\t "
         "[Gotthard2] veto debugging. Use router mac if router between detector "
         "and receiver.");
 
@@ -1664,10 +1678,10 @@ class CmdProxy {
     INTEGER_COMMAND_VEC_ID_GET(
         udp_dstport2, getDestinationUDPPort2, setDestinationUDPPort2,
         StringTo<int>,
-        "[n]\n\t[Jungfrau][Eiger][Gotthard2] Port number of the "
+        "[n]\n\t[Jungfrau][Moench][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] top half or inner interface "
+        "(incremented by 2) \n\t[Jungfrau][Moench] top half or inner interface "
         "\n\t[Eiger] "
         "right half \n\t[Gotthard2] veto debugging");
 
@@ -1686,19 +1700,21 @@ class CmdProxy {
     GET_COMMAND(rx_printconfig, printRxConfiguration,
                 "\n\tPrints the receiver configuration.");
 
-    INTEGER_COMMAND_VEC_ID(
+    INTEGER_COMMAND_VEC_ID(tengiga, getTenGiga, setTenGiga, StringTo<int>,
-        tengiga, getTenGiga, setTenGiga, StringTo<int>,
+                           "[0, 1]\n\t[Eiger][Ctb][Mythen3] 10GbE Enable.");
-        "[0, 1]\n\t[Eiger][Ctb][Moench][Mythen3] 10GbE Enable.");
 
-    INTEGER_COMMAND_VEC_ID(flowcontrol10g, getTenGigaFlowControl,
+    INTEGER_COMMAND_VEC_ID(
-                           setTenGigaFlowControl, StringTo<int>,
+        flowcontrol10g, getTenGigaFlowControl, setTenGigaFlowControl,
-                           "[0, 1]\n\t[Eiger][Jungfrau] 10GbE Flow Control.");
+        StringTo<int>,
+        "[0, 1]\n\t[Eiger][Jungfrau][Moench] 10GbE Flow Control.");
 
     INTEGER_COMMAND_VEC_ID(
         txdelay_frame, getTransmissionDelayFrame, setTransmissionDelayFrame,
         StringTo<int>,
-        "[n_delay]\n\t[Eiger][Jungfrau][Mythen3] Transmission delay of first "
+        "[n_delay]\n\t[Eiger][Jungfrau][Moench][Mythen3] Transmission delay of "
-        "udp packet being streamed out of the module.\n\t[Jungfrau] [0-31] "
+        "first "
+        "udp packet being streamed out of the module.\n\t[Jungfrau][Moench] "
+        "[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 "
@@ -1941,13 +1957,15 @@ class CmdProxy {
 
     /* Jungfrau Specific */
 
-    GET_COMMAND(chipversion, getChipVersion,
+    GET_COMMAND(
-                "\n\t[Jungfrau] Returns chip version. Can be 1.0 or 1.1");
+        chipversion, getChipVersion,
+        "\n\t[Jungfrau][Moench] 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] Threshold temperature in degrees. "
+        "[n_temp (in degrees)]\n\t[Jungfrau][Moench] 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 "
@@ -1956,7 +1974,7 @@ class CmdProxy {
     INTEGER_COMMAND_VEC_ID(
         temp_control, getTemperatureControl, setTemperatureControl,
         StringTo<int>,
-        "[0, 1]\n\t[Jungfrau] Temperature control enable. Default is 0 "
+        "[0, 1]\n\t[Jungfrau][Moench] 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 "
@@ -1966,7 +1984,8 @@ class CmdProxy {
     INTEGER_COMMAND_VEC_ID(
         autocompdisable, getAutoComparatorDisable, setAutoComparatorDisable,
         StringTo<int>,
-        "[0, 1]\n\t[Jungfrau] Auto comparator disable mode. By default, the "
+        "[0, 1]\n\t[Jungfrau][Moench] 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 "
@@ -1975,9 +1994,9 @@ class CmdProxy {
         "disabled(comparator enabled throughout). 1 enables mode. 0 disables "
         "mode. ");
 
-    TIME_COMMAND(compdisabletime, getComparatorDisableTime,
+    TIME_COMMAND(
-                 setComparatorDisableTime,
+        compdisabletime, getComparatorDisableTime, setComparatorDisableTime,
-                 "[duration] [(optional unit) ns|us|ms|s]\n\t[Jungfrau] Time "
+        "[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.");
 
@@ -1985,9 +2004,8 @@ class CmdProxy {
         extrastoragecells, getNumberOfAdditionalStorageCells,
         setNumberOfAdditionalStorageCells, StringTo<int>,
         "[0-15]\n\t[Jungfrau] Only for chipv1.0. Number of additional storage "
-        "cells. Default is "
+        "cells. Default is 0. For advanced users only. \n\tThe #images = "
-        "0. For advanced users only. \n\tThe #images = #frames x #triggers x "
+        "#frames x #triggers x (#extrastoragecells + 1).");
-        "(#extrastoragecells + 1).");
 
     INTEGER_COMMAND_VEC_ID(
         storagecell_start, getStorageCellStart, setStorageCellStart,
@@ -1996,12 +2014,11 @@ class CmdProxy {
         "of the series. max is 15 (default) for chipv1.0 and 3 (default) for "
         "chipv1.1. For advanced users only.");
 
-    TIME_COMMAND(
+    TIME_COMMAND(storagecell_delay, getStorageCellDelay, setStorageCellDelay,
-        storagecell_delay, getStorageCellDelay, setStorageCellDelay,
+                 "[duration (0-1638375 ns)] [(optional unit) "
-        "[duration (0-1638375 ns)] [(optional unit) ns|us|ms|s]\n\t[Jungfrau] "
+                 "ns|us|ms|s]\n\t[Jungfrau] Additional time delay between 2 "
-        "Additional time delay between 2 consecutive exposures in burst mode "
+                 "consecutive exposures in burst mode (resolution of 25ns). "
-        "(resolution of 25ns). Only applicable for chipv1.0. For advanced "
+                 "Only applicable for chipv1.0. For advanced users only.");
-        "users only.");
 
     INTEGER_COMMAND_VEC_ID(
         gainmode, getGainMode, setGainMode, StringTo<slsDetectorDefs::gainMode>,
@@ -2009,9 +2026,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,
+    INTEGER_COMMAND_VEC_ID(
-                           setNumberOfFilterCells, StringTo<int>,
+        filtercells, getNumberOfFilterCells, setNumberOfFilterCells,
-                           "[0-12]\n\t[Jungfrau] Set Filter Cell. Only for "
+        StringTo<int>,
+        "[0-12]\n\t[Jungfrau][Moench] Set Filter Cell. Only for "
         "chipv1.1. Advanced user Command");
 
     /* Gotthard Specific */
@@ -2094,36 +2112,36 @@ class CmdProxy {
     INTEGER_COMMAND_VEC_ID(
         asamples, getNumberOfAnalogSamples, setNumberOfAnalogSamples,
         StringTo<int>,
-        "[n_samples]\n\t[CTB][Moench] Number of analog samples expected.");
+        "[n_samples]\n\t[CTB] Number of analog samples expected.");
 
     INTEGER_COMMAND_VEC_ID(
         adcclk, getADCClock, setADCClock, StringTo<int>,
-        "[n_clk in MHz]\n\t[Ctb][Moench] ADC clock frequency in MHz.");
+        "[n_clk in MHz]\n\t[Ctb] ADC clock frequency in MHz.");
 
     INTEGER_COMMAND_VEC_ID(runclk, getRUNClock, setRUNClock, StringTo<int>,
-                           "[n_clk in MHz]\n\t[Ctb][Moench] Run clock in MHz.");
+                           "[n_clk in MHz]\n\t[Ctb] Run clock in MHz.");
 
     GET_COMMAND(syncclk, getSYNCClock,
-                "[n_clk in MHz]\n\t[Ctb][Moench] Sync clock in MHz.");
+                "[n_clk in MHz]\n\t[Ctb] Sync clock in MHz.");
 
-    INTEGER_COMMAND_VEC_ID(
+    INTEGER_COMMAND_VEC_ID(adcpipeline, getADCPipeline, setADCPipeline,
-        adcpipeline, getADCPipeline, setADCPipeline, StringTo<int>,
+                           StringTo<int>,
-        "[n_value]\n\t[Ctb][Moench] Pipeline for ADC clock.");
+                           "[n_value]\n\t[Ctb] Pipeline for ADC clock.");
 
     INTEGER_IND_COMMAND(v_limit, getVoltage, setVoltage, StringTo<int>,
                         defs::V_LIMIT,
-                        "[n_value]\n\t[Ctb][Moench] Soft limit for power "
+                        "[n_value]\n\t[Ctb] Soft limit for power "
                         "supplies (ctb only) and DACS in mV.");
 
     INTEGER_COMMAND_HEX(adcenable, getADCEnableMask, setADCEnableMask,
                         StringTo<uint32_t>,
-                        "[bitmask]\n\t[Ctb][Moench] ADC Enable Mask for 1Gb "
+                        "[bitmask]\n\t[Ctb] ADC Enable Mask for 1Gb "
                         "Enable for each 32 ADC channel.");
 
     INTEGER_COMMAND_HEX(
         adcenable10g, getTenGigaADCEnableMask, setTenGigaADCEnableMask,
         StringTo<uint32_t>,
-        "[bitmask]\n\t[Ctb][Moench] ADC Enable Mask for 10Gb mode for each 32 "
+        "[bitmask]\n\t[Ctb] 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.");
 
@@ -2224,28 +2242,28 @@ class CmdProxy {
 
     EXECUTE_SET_COMMAND_NOID_1ARG(
         savepattern, savePattern,
-        "[fname]\n\t[Ctb][Moench][Mythen3] Saves pattern to file (ascii). "
+        "[fname]\n\t[Ctb][Mythen3] Saves pattern to file (ascii). "
-        "\n\t[Ctb][Moench] Also executes pattern.");
+        "\n\t[Ctb] Also executes pattern.");
 
     EXECUTE_SET_COMMAND(
         defaultpattern, loadDefaultPattern,
-        "\n\t[Mythen3][Moench] Loads and runs default pattern in pattern "
+        "\n\t[Mythen3] 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][Moench] 64 bit mask "
+                                "[64 bit mask]\n\t[Ctb] 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][Moench][Mythen3] Selects the bits that will "
+        "[64 bit mask]\n\t[Ctb][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][Moench][Mythen3] Sets the mask applied to "
+        "[64 bit mask]\n\t[Ctb][Mythen3] Sets the mask applied to "
         "every pattern to the selected bits.");
 
     EXECUTE_SET_COMMAND(patternstart, startPattern,
@@ -2255,10 +2273,10 @@ class CmdProxy {
     /* Advanced */
 
     EXECUTE_SET_COMMAND(resetfpga, resetFPGA,
-                        "\n\t[Jungfrau][Ctb][Moench] Reset FPGA.");
+                        "\n\t[Jungfrau][Moench][Ctb] Reset FPGA.");
 
     EXECUTE_SET_COMMAND(rebootcontroller, rebootController,
-                        "\n\t[Jungfrau][Ctb][Moench][Gotthard][Mythen3]["
+                        "\n\t[Jungfrau][Moench][Ctb][Gotthard][Mythen3]["
                         "Gotthard2] Reboot controller of detector.");
 
     INTEGER_COMMAND_VEC_ID(
@@ -2269,18 +2287,18 @@ class CmdProxy {
 
     EXECUTE_SET_COMMAND(
         firmwaretest, executeFirmwareTest,
-        "\n\t[Jungfrau][Gotthard][Mythen3][Gotthard2][Ctb][Moench] Firmware "
+        "\n\t[Jungfrau][Moench][Gotthard][Mythen3][Gotthard2][Ctb] Firmware "
         "test, ie. reads a read fixed pattern from a register.");
 
     EXECUTE_SET_COMMAND(
         bustest, executeBusTest,
-        "\n\t[Jungfrau][Gotthard][Mythen3][Gotthard2][Ctb][Moench] Bus test, "
+        "\n\t[Jungfrau][Moench][Gotthard][Mythen3][Gotthard2][Ctb] 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][Moench][Jungfrau] ADC Inversion "
+        "[bitmask]\n\t[Ctb][Jungfrau][Moench] ADC Inversion "
         "Mask.\n\t[Jungfrau][Moench] Inversions on top of the default mask.");
 
     /* Insignificant */
@@ -2305,19 +2323,19 @@ class CmdProxy {
         "\n\tClient IP Address that last communicated with the detector.");
 
     GET_COMMAND(framecounter, getNumberOfFramesFromStart,
-                "\n\t[Jungfrau][Mythen3][Gotthard2][Moench][CTB] "
+                "\n\t[Jungfrau][Moench][Mythen3][Gotthard2][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][Mythen3][Gotthard2][Moench]["
+                     "ns|us|ms|s]\n\t[Jungfrau][Moench][Mythen3][Gotthard2]["
                      "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][Mythen3][Gotthard2][Moench]["
+                     "ns|us|ms|s]\n\t[Jungfrau][Moench][Mythen3][Gotthard2]["
                      "CTB] Timestamp at a frame start."
                      "\n\t[Gotthard2] not in burst and auto mode.");
 };

slsDetectorSoftware/src/Detector.cpp

@@ -124,6 +124,13 @@ 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);
 }
@@ -183,17 +190,12 @@ 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};
@@ -505,6 +507,7 @@ 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:
@@ -627,6 +630,7 @@ 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};
@@ -665,6 +669,7 @@ 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) {
@@ -692,6 +697,7 @@ 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};
@@ -709,10 +715,6 @@ 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));
@@ -942,7 +944,8 @@ Result<int> Detector::getNumberofUDPInterfaces(Positions pos) const {
 }
 
 void Detector::setNumberofUDPInterfaces(int n, Positions pos) {
-    if (getDetectorType().squash() != defs::JUNGFRAU) {
+    auto detType = getDetectorType().squash();
+    if (detType != defs::JUNGFRAU && detType != defs::MOENCH) {
         throw RuntimeError(
             "Cannot set number of udp interfaces for this detector.");
     }
@@ -1623,7 +1626,7 @@ void Detector::setTop(bool value, Positions pos) {
     pimpl->Parallel(&Module::setTop, pos, value);
 }
 
-// Jungfrau Specific
+// Jungfrau/moench Specific
 Result<double> Detector::getChipVersion(Positions pos) const {
     return pimpl->Parallel(&Module::getChipVersion, pos);
 }
@@ -1695,6 +1698,7 @@ 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};
@@ -1986,7 +1990,7 @@ void Detector::setDigitalPulsing(bool value, Positions pos) {
     pimpl->Parallel(&Module::setDigitalPulsing, pos, value);
 }
 
-// CTB/ Moench Specific
+// CTB Specific
 
 Result<int> Detector::getNumberOfAnalogSamples(Positions pos) const {
     return pimpl->Parallel(&Module::getNumberOfAnalogSamples, pos);
@@ -2324,8 +2328,6 @@ 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);

slsDetectorSoftware/src/DetectorImpl.cpp

@@ -321,10 +321,10 @@ void DetectorImpl::addModule(const std::string &hostname) {
     // module type updated by now
     shm()->detType = Parallel(&Module::getDetectorType, {})
                          .tsquash("Inconsistent detector types.");
-    // for moench and ctb
+    // for ctb
     modules[pos]->updateNumberOfChannels();
 
-    // for eiger, jungfrau, gotthard2
+    // for eiger, jungfrau, moench, gotthard2
     modules[pos]->updateNumberofUDPInterfaces();
 
     // update zmq port in case numudpinterfaces changed
@@ -418,6 +418,7 @@ void DetectorImpl::setGapPixelsinCallback(const bool enable) {
     if (enable) {
         switch (shm()->detType) {
         case JUNGFRAU:
+        case MOENCH:
             break;
         case EIGER:
             if (size() && modules[0]->getQuad()) {
@@ -440,6 +441,7 @@ int DetectorImpl::getTransmissionDelay() const {
     bool eiger = false;
     switch (shm()->detType) {
     case JUNGFRAU:
+    case MOENCH:
     case MYTHEN3:
         break;
     case EIGER:
@@ -483,6 +485,7 @@ void DetectorImpl::setTransmissionDelay(int step) {
     bool eiger = false;
     switch (shm()->detType) {
     case JUNGFRAU:
+    case MOENCH:
     case MYTHEN3:
         break;
     case EIGER:
@@ -884,10 +887,10 @@ int DetectorImpl::InsertGapPixels(char *image, char *&gpImage, bool quadEnable,
         nMod1TotPixelsx /= 2;
     }
     // eiger requires inter chip gap pixels are halved
-    // jungfrau prefers same inter chip gap pixels as the boundary pixels
+    // jungfrau/moench prefers same inter chip gap pixels as the boundary pixels
     int divisionValue = 2;
     slsDetectorDefs::detectorType detType = shm()->detType;
-    if (detType == JUNGFRAU) {
+    if (detType == JUNGFRAU || detType == MOENCH) {
         divisionValue = 1;
     }
     LOG(logDEBUG) << "Insert Gap pixels Calculations:\n\t"
@@ -1378,8 +1381,8 @@ std::vector<char> DetectorImpl::readProgrammingFile(const std::string &fname) {
     bool isPof = false;
     switch (shm()->detType) {
     case JUNGFRAU:
-    case CHIPTESTBOARD:
     case MOENCH:
+    case CHIPTESTBOARD:
         if (fname.find(".pof") == std::string::npos) {
             throw RuntimeError("Programming file must be a pof file.");
         }
@@ -1517,6 +1520,7 @@ defs::xy DetectorImpl::getPortGeometry() const {
         portGeometry.x = modules[0]->getNumberofUDPInterfacesFromShm();
         break;
     case JUNGFRAU:
+    case MOENCH:
         portGeometry.y = modules[0]->getNumberofUDPInterfacesFromShm();
         break;
     default:
@@ -1535,7 +1539,7 @@ defs::xy DetectorImpl::calculatePosition(int moduleIndex,
 }
 
 defs::ROI DetectorImpl::getRxROI() const {
-    if (shm()->detType == CHIPTESTBOARD || shm()->detType == MOENCH) {
+    if (shm()->detType == CHIPTESTBOARD) {
         throw RuntimeError("RxRoi not implemented for this Detector");
     }
     if (modules.size() == 0) {
@@ -1610,7 +1614,7 @@ defs::ROI DetectorImpl::getRxROI() const {
 }
 
 void DetectorImpl::setRxROI(const defs::ROI arg) {
-    if (shm()->detType == CHIPTESTBOARD || shm()->detType == MOENCH) {
+    if (shm()->detType == CHIPTESTBOARD) {
         throw RuntimeError("RxRoi not implemented for this Detector");
     }
     if (modules.size() == 0) {

slsDetectorSoftware/src/DetectorImpl.h

@@ -358,7 +358,7 @@ class DetectorImpl : public virtual slsDetectorDefs {
      */
     void readFrameFromReceiver();
 
-    /** [Eiger][Jungfrau]
+    /** [Eiger][Jungfrau][Moench]
      * 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

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] Dac for ??");
+                           "\n\t[Gotthard][Jungfrau][Moench] 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[Moench] Dac for 5");
+                           "\n\t[Gotthard] Dac for ??");
     }
     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[Moench] Dac for 2");
+                           "\n\t[Gotthard] Dac for ??");
     }
     if (dac == "vref_comp") {
         return std::string("[dac or mV value][(optional unit) mV] "
-                           "\n\t[Gotthard][Jungfrau] Dac for ??");
+                           "\n\t[Gotthard][Jungfrau][Moench] 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.\n\t[Moench] Dac for 1");
+            "preamplifier's input transistor current.");
     }
     if (dac == "vdcsh") {
         return std::string(
@@ -224,7 +224,8 @@ std::string GetHelpDac(std::string dac) {
     }
     if (dac == "vref_prech") {
         return std::string(
-            "[dac or mV value][(optional unit) mV] \n\t[Gotthard2][Jungfrau] "
+            "[dac or mV value][(optional unit) mV] "
+            "\n\t[Gotthard2][Jungfrau][Moench] "
             "Dac for reference votlage for precharing the preamplifier.");
     }
     if (dac == "vref_l_adc") {
@@ -254,44 +255,39 @@ std::string GetHelpDac(std::string dac) {
             "common mode voltage of ADC DAC bank 2.");
     }
     if (dac == "vb_ds") {
-        return std::string(
+        return std::string("[dac or mV value][(optional unit) mV] "
-            "[dac or mV value][(optional unit) mV] \n\t[Jungfrau] Dac for ??");
+                           "\n\t[Jungfrau][Moench] Dac for ??");
     }
     if (dac == "vb_comp") {
-        return std::string(
+        return std::string("[dac or mV value][(optional unit) mV] "
-            "[dac or mV value][(optional unit) mV] \n\t[Jungfrau] Dac for ??");
+                           "\n\t[Jungfrau][Moench] Dac for ??");
     }
     if (dac == "vb_pixbuf") {
-        return std::string(
+        return std::string("[dac or mV value][(optional unit) mV] "
-            "[dac or mV value][(optional unit) mV] \n\t[Jungfrau] Dac for ??");
+                           "\n\t[Jungfrau][Moench] Dac for ??");
     }
     if (dac == "vin_com") {
-        return std::string(
+        return std::string("[dac or mV value][(optional unit) mV] "
-            "[dac or mV value][(optional unit) mV] \n\t[Jungfrau] Dac for ??");
+                           "\n\t[Jungfrau][Moench] Dac for ??");
     }
     if (dac == "vdd_prot") {
-        return std::string(
+        return std::string("[dac or mV value][(optional unit) mV] "
-            "[dac or mV value][(optional unit) mV] \n\t[Jungfrau] Dac for ??");
+                           "\n\t[Jungfrau][Moench] Dac for ??");
     }
     if (dac == "vbp_colbuf") {
-        return std::string(
+        return std::string("[dac or mV value][(optional unit) mV] \n");
-            "[dac or mV value][(optional unit) mV] \n\t[Moench] Dac for 0");
     }
     if (dac == "vb_sda") {
-        return std::string(
+        return std::string("[dac or mV value][(optional unit) mV] \n");
-            "[dac or mV value][(optional unit) mV] \n\t[Moench] Dac for 3");
     }
     if (dac == "vcasc_sfp") {
-        return std::string(
+        return std::string("[dac or mV value][(optional unit) mV] \n");
-            "[dac or mV value][(optional unit) mV] \n\t[Moench] Dac for 4");
     }
     if (dac == "vipre_cds") {
-        return std::string(
+        return std::string("[dac or mV value][(optional unit) mV] \n");
-            "[dac or mV value][(optional unit) mV] \n\t[Moench] Dac for 6");
     }
     if (dac == "ibias_sfp") {
-        return std::string(
+        return std::string("[dac or mV value][(optional unit) mV] \n");
-            "[dac or mV value][(optional unit) mV] \n\t[Moench] Dac for 7");
     }
 
     // clang-format off

slsDetectorSoftware/src/Module.cpp

@@ -73,8 +73,8 @@ void Module::setHostname(const std::string &hostname,
     auto client = DetectorSocket(shm()->hostname, shm()->controlPort);
     client.close();
     try {
-        checkDetectorVersionCompatibility();
         initialDetectorServerChecks();
+        checkDetectorVersionCompatibility();
         LOG(logINFO) << "Module Version Compatibility - Success";
     } catch (const RuntimeError &e) {
         if (!initialChecks) {
@@ -92,29 +92,16 @@ 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]{};
     sendToDetector(F_GET_SERVER_VERSION, nullptr, retval);
     return retval;
-    }
-    // throw with old server version (sends 8 bytes)
-    catch (RuntimeError &e) {
-        std::string emsg = std::string(e.what());
-        if (emsg.find(F_GET_SERVER_VERSION) && emsg.find("8 bytes")) {
-            throwDeprecatedServerVersion();
-        }
-        throw;
-    }
-}
-
-void Module::throwDeprecatedServerVersion() const {
-    uint64_t res = sendToDetectorStop<int64_t>(F_GET_SERVER_VERSION);
-    std::cout << std::endl;
-    std::ostringstream os;
-    os << "Detector Server (Control) version (0x" << std::hex << res
-       << ") is incompatible with this client. Please update detector server!";
-    throw RuntimeError(os.str());
 }
 
 std::string Module::getStopServerLongVersion() const {
@@ -174,7 +161,7 @@ slsDetectorDefs::detectorType Module::getDetectorType() const {
 }
 
 void Module::updateNumberOfChannels() {
-    if (shm()->detType == CHIPTESTBOARD || shm()->detType == MOENCH) {
+    if (shm()->detType == CHIPTESTBOARD) {
         std::array<int, 2> retvals{};
         sendToDetector(F_GET_NUM_CHANNELS, nullptr, retvals);
         shm()->nChan.x = retvals[0];
@@ -1243,7 +1230,7 @@ std::string Module::printReceiverConfiguration() {
     os << "\n\nModule " << moduleIndex << "\nReceiver Hostname:\t"
        << getReceiverHostname();
 
-    if (shm()->detType == JUNGFRAU) {
+    if (shm()->detType == JUNGFRAU || shm()->detType == MOENCH) {
         os << "\nNumber of Interfaces:\t" << getNumberofUDPInterfacesFromShm()
            << "\nSelected Interface:\t" << getSelectedUDPInterface();
     }
@@ -1253,14 +1240,15 @@ std::string Module::printReceiverConfiguration() {
        << getDestinationUDPIP() << "\nDestination UDP MAC:\t"
        << getDestinationUDPMAC();
 
-    if (shm()->detType == JUNGFRAU) {
+    if (shm()->detType == JUNGFRAU || shm()->detType == MOENCH) {
         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 == EIGER) {
+    if (shm()->detType == JUNGFRAU || shm()->detType == MOENCH ||
+        shm()->detType == EIGER) {
         os << "\nDestination UDP Port2:\t" << getDestinationUDPPort2();
     }
     os << "\n";
@@ -1809,7 +1797,7 @@ void Module::setTop(bool value) {
     sendToDetector(F_SET_TOP, static_cast<int>(value), nullptr);
 }
 
-// Jungfrau Specific
+// Jungfrau/Moench Specific
 double Module::getChipVersion() const {
     return (sendToDetector<int>(F_GET_CHIP_VERSION)) / 10.00;
 }
@@ -2321,7 +2309,7 @@ void Module::setDigitalPulsing(const bool enable) {
     sendToDetector(F_SET_DIGITAL_PULSING, static_cast<int>(enable), nullptr);
 }
 
-// CTB / Moench Specific
+// CTB Specific
 int Module::getNumberOfAnalogSamples() const {
     return sendToDetector<int>(F_GET_NUM_ANALOG_SAMPLES);
 }
@@ -2556,8 +2544,6 @@ 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
@@ -2650,8 +2636,8 @@ void Module::programFPGA(std::vector<char> buffer,
                          const bool forceDeleteNormalFile) {
     switch (shm()->detType) {
     case JUNGFRAU:
-    case CHIPTESTBOARD:
     case MOENCH:
+    case CHIPTESTBOARD:
         sendProgram(true, buffer, F_PROGRAM_FPGA, "Update Firmware", "",
                     forceDeleteNormalFile);
         break;
@@ -2671,8 +2657,8 @@ void Module::updateDetectorServer(std::vector<char> buffer,
                                   const std::string &serverName) {
     switch (shm()->detType) {
     case JUNGFRAU:
-    case CHIPTESTBOARD:
     case MOENCH:
+    case CHIPTESTBOARD:
         sendProgram(true, buffer, F_UPDATE_DETECTOR_SERVER,
                     "Update Detector Server (no tftp)", serverName);
         break;
@@ -2692,8 +2678,8 @@ void Module::updateDetectorServer(std::vector<char> buffer,
 void Module::updateKernel(std::vector<char> buffer) {
     switch (shm()->detType) {
     case JUNGFRAU:
-    case CHIPTESTBOARD:
     case MOENCH:
+    case CHIPTESTBOARD:
         sendProgram(true, buffer, F_UPDATE_KERNEL, "Update Kernel");
         break;
     case MYTHEN3:

slsDetectorSoftware/src/Module.h

@@ -90,9 +90,9 @@ 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;
     std::string getDetectorServerVersion() const;
     std::string getHardwareVersion() const;
     std::string getKernelVersion() const;
@@ -389,7 +389,7 @@ class Module : public virtual slsDetectorDefs {
 
     /**************************************************
      *                                                *
-     *    Jungfrau Specific                           *
+     *    Jungfrau/Moench Specific                    *
      *                                                *
      * ************************************************/
     double getChipVersion() const;
@@ -491,7 +491,7 @@ class Module : public virtual slsDetectorDefs {
 
     /**************************************************
      *                                                *
-     *    CTB / Moench Specific                       *
+     *    CTB  Specific                               *
      *                                                *
      * ************************************************/
     int getNumberOfAnalogSamples() const;
@@ -502,12 +502,6 @@ 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;

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 || det_type == defs::MOENCH) {
+    if (det_type == defs::CHIPTESTBOARD) {
         auto prev_val = det.getADCVpp(false);
         {
             std::ostringstream oss;
@@ -132,14 +132,14 @@ TEST_CASE("adcvpp", "[.cmd]") {
     }
 }
 
-/* CTB/ Moench Specific */
+/* CTB Specific */
 
 TEST_CASE("samples", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
 
-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH) {
+    if (det_type == defs::CHIPTESTBOARD) {
         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 || det_type == defs::MOENCH) {
+    if (det_type == defs::CHIPTESTBOARD) {
         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 || det_type == defs::MOENCH) {
+    if (det_type == defs::CHIPTESTBOARD) {
         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 || det_type == defs::MOENCH) {
+    if (det_type == defs::CHIPTESTBOARD) {
         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 || det_type == defs::MOENCH) {
+    if (det_type == defs::CHIPTESTBOARD) {
         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 || det_type == defs::MOENCH) {
+    if (det_type == defs::CHIPTESTBOARD) {
         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 || det_type == defs::MOENCH) {
+    if (det_type == defs::CHIPTESTBOARD) {
         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 || det_type == defs::MOENCH) {
+    if (det_type == defs::CHIPTESTBOARD) {
         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 || det_type == defs::MOENCH) {
+    if (det_type == defs::CHIPTESTBOARD) {
         auto prev_val = det.getTenGigaADCEnableMask();
         {
             std::ostringstream oss;

slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp

@@ -23,7 +23,7 @@ TEST_CASE("Setting and reading back Jungfrau dacs", "[.cmd][.dacs]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
         SECTION("vb_comp") { test_dac(defs::VB_COMP, "vb_comp", 1220); }
         SECTION("vdd_prot") { test_dac(defs::VDD_PROT, "vdd_prot", 3000); }
         SECTION("vin_com") { test_dac(defs::VIN_COM, "vin_com", 1053); }
@@ -102,7 +102,7 @@ TEST_CASE("selinterface", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
         auto prev_val = det.getSelectedUDPInterface().tsquash(
             "inconsistent selected interface to test");
         {
@@ -127,13 +127,13 @@ TEST_CASE("selinterface", "[.cmd]") {
     }
 }
 
-/* Jungfrau Specific */
+/* Jungfrau/moench Specific */
 
 TEST_CASE("temp_threshold", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
         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) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
         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) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
         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) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
         {
             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) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
         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 &&
+    if ((det_type == defs::JUNGFRAU || det_type == defs::MOENCH) &&
         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) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
         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) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
         // 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) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
         auto prev_val = det.getSynchronization().tsquash(
             "inconsistent synchronization to test");
         {

slsDetectorSoftware/tests/test-CmdProxy-moench.cpp

@@ -19,94 +19,4 @@ 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

slsDetectorSoftware/tests/test-CmdProxy-pattern.cpp

@@ -23,8 +23,7 @@ TEST_CASE("pattern", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
-        det_type == defs::MYTHEN3) {
         // no proper test for put
         REQUIRE_THROWS(proxy.Call("pattern", {}, -1, GET));
     } else {
@@ -36,8 +35,7 @@ TEST_CASE("savepattern", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
-        det_type == defs::MYTHEN3) {
         REQUIRE_THROWS(
             proxy.Call("savepattern", {"/tmp/pattern.txt"}, -1, GET));
         if (det.size() == 1) {
@@ -54,7 +52,7 @@ TEST_CASE("defaultpattern", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::MOENCH || det_type == defs::MYTHEN3) {
+    if (det_type == defs::MYTHEN3) {
         REQUIRE_THROWS(proxy.Call("defaultpattern", {}, -1, GET));
         REQUIRE_NOTHROW(proxy.Call("defaultpattern", {}, -1, PUT));
     } else {
@@ -68,7 +66,7 @@ TEST_CASE("patioctrl", "[.cmd]") {
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
 
-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH) {
+    if (det_type == defs::CHIPTESTBOARD) {
         auto prev_val = det.getPatternIOControl();
         {
             std::ostringstream oss;
@@ -98,8 +96,7 @@ TEST_CASE("patword", "[.cmd]") {
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
 
-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
-        det_type == defs::MYTHEN3) {
         int addr = 0x23;
         std::string saddr = ToStringHex(addr, 4);
         auto prev_val = det.getPatternWord(addr);
@@ -134,8 +131,7 @@ TEST_CASE("patlimits", "[.cmd]") {
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
 
-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
-        det_type == defs::MYTHEN3) {
         auto prev_val = det.getPatternLoopAddresses(-1);
         {
             std::ostringstream oss;
@@ -161,8 +157,7 @@ TEST_CASE("patloop", "[.cmd]") {
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
 
-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
-        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) {
@@ -210,8 +205,7 @@ TEST_CASE("patnloop", "[.cmd]") {
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
 
-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
-        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) {
@@ -256,8 +250,7 @@ TEST_CASE("patwait", "[.cmd]") {
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
 
-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
-        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) {
@@ -302,8 +295,7 @@ TEST_CASE("patwaittime", "[.cmd]") {
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
 
-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
-        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) {
@@ -348,8 +340,7 @@ TEST_CASE("patmask", "[.cmd]") {
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
 
-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
-        det_type == defs::MYTHEN3) {
         auto prev_val = det.getPatternMask();
         {
             std::ostringstream oss;
@@ -374,8 +365,7 @@ TEST_CASE("patsetbit", "[.cmd]") {
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
 
-    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH ||
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3) {
-        det_type == defs::MYTHEN3) {
         auto prev_val = det.getPatternBitMask();
         {
             std::ostringstream oss;

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 || det_type == defs::MOENCH) {
+    if (det_type == defs::CHIPTESTBOARD) {
         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 || det_type == defs::MOENCH) {
+    if (det_type == defs::CHIPTESTBOARD) {
         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) {
+    } else if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
         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) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
         det.setNumberofUDPInterfaces(prev_val_numinterfaces);
     }
 }
@@ -949,8 +949,6 @@ TEST_CASE("rx_dbitoffset", "[.cmd][.rx]") {
     }
 }
 
-/* Moench */
-
 TEST_CASE("rx_jsonaddheader", "[.cmd][.rx]") {
     Detector det;
     CmdProxy proxy(&det);

slsDetectorSoftware/tests/test-CmdProxy.cpp

@@ -116,14 +116,8 @@ TEST_CASE("detectorserverversion", "[.cmd]") {
 TEST_CASE("hardwareversion", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
-    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]") {
@@ -149,7 +143,8 @@ 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::EIGER || det_type == defs::JUNGFRAU ||
+        det_type == defs::MOENCH) {
         REQUIRE_NOTHROW(proxy.Call("moduleid", {}, -1, GET));
     } else {
         REQUIRE_THROWS(proxy.Call("moduleid", {}, -1, GET));
@@ -217,6 +212,7 @@ 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;
@@ -232,16 +228,6 @@ 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");
@@ -525,9 +511,9 @@ TEST_CASE("gappixels", "[.cmd]") {
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
 
-    // test only for jungfrau and eiger(quad or full module only)
+    // test eiger(quad or full module only)
     bool gapPixelTest = false;
-    if (det_type == defs::JUNGFRAU)
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH)
         gapPixelTest = true;
     else if (det_type == defs::EIGER) {
         bool quad = det.getQuad().squash(false);
@@ -574,17 +560,17 @@ TEST_CASE("fliprows", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    bool jungfrauhw2 = false;
+    bool hw2 = false;
-    if (det_type == defs::JUNGFRAU &&
+    if ((det_type == defs::JUNGFRAU || det_type == defs::MOENCH) &&
         ((det.getHardwareVersion().tsquash(
               "inconsistent serial number to test") == "2.0"))) {
-        jungfrauhw2 = true;
+        hw2 = true;
     }
-    if (det_type == defs::EIGER || jungfrauhw2) {
+    if (det_type == defs::EIGER || hw2) {
         auto previous = det.getFlipRows();
         auto previous_numudp = det.getNumberofUDPInterfaces().tsquash(
             "inconsistent number of udp interfaces to test");
-        if (det_type == defs::JUNGFRAU) {
+        if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
             det.setNumberofUDPInterfaces(2);
         }
         std::ostringstream oss1, oss2, oss3;
@@ -597,7 +583,7 @@ TEST_CASE("fliprows", "[.cmd]") {
         for (int i = 0; i != det.size(); ++i) {
             det.setFlipRows(previous[i], {i});
         }
-        if (det_type == defs::JUNGFRAU) {
+        if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
             det.setNumberofUDPInterfaces(previous_numudp);
         }
     } else {
@@ -611,10 +597,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::JUNGFRAU || det_type == defs::MOENCH) {
         REQUIRE_NOTHROW(proxy.Call("master", {}, -1, GET));
         if (det_type == defs::EIGER || det_type == defs::GOTTHARD2 ||
-            det_type == defs::JUNGFRAU) {
+            det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
             // get previous master
             int prevMaster = 0;
             {
@@ -802,7 +788,7 @@ TEST_CASE("exptime", "[.cmd][.time]") {
         proxy.Call("exptime", {"1s"}, -1, PUT, oss);
         REQUIRE(oss.str() == "exptime 1s\n");
     }
-    if (det_type != defs::JUNGFRAU) {
+    if (det_type != defs::JUNGFRAU && det_type != defs::MOENCH) {
         {
             std::ostringstream oss;
             proxy.Call("exptime", {"0"}, -1, PUT, oss);
@@ -908,7 +894,6 @@ 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));
@@ -926,7 +911,6 @@ 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));
@@ -1060,12 +1044,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::GOTTHARD2) {
+        det_type == defs::MOENCH || det_type == defs::GOTTHARD2) {
         auto prev_val = det.getReadoutSpeed();
 
-        // full speed for jungfrau only works for new boards (chipv1.1 is with
+        // full speed for jungfrau/moench only works for new boards (chipv1.1 is
-        // new board [hw1.0 and chipv1.0 not tested here])
+        // with new board [hw1.0 and chipv1.0 not tested here])
-        if ((det_type == defs::JUNGFRAU &&
+        if (((det_type == defs::JUNGFRAU || det_type == defs::MOENCH) &&
              det.getChipVersion().squash() * 10 == 11) ||
             (det_type == defs::EIGER)) {
             std::ostringstream oss1, oss2, oss3, oss4;
@@ -1079,7 +1063,8 @@ TEST_CASE("readoutspeed", "[.cmd]") {
             REQUIRE(oss4.str() == "readoutspeed full_speed\n");
         }
 
-        if (det_type == defs::EIGER || det_type == defs::JUNGFRAU) {
+        if (det_type == defs::EIGER || det_type == defs::JUNGFRAU ||
+            det_type == defs::MOENCH) {
             {
                 std::ostringstream oss1, oss2, oss3, oss4;
                 proxy.Call("readoutspeed", {"1"}, -1, PUT, oss1);
@@ -1145,7 +1130,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::EIGER) {
+        det_type == defs::MOENCH || det_type == defs::EIGER) {
         REQUIRE_NOTHROW(proxy.Call("readoutspeedlist", {}, -1, GET));
         REQUIRE_THROWS(proxy.Call("readoutspeedlist", {}, -1, PUT));
     } else {
@@ -1158,7 +1143,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::CHIPTESTBOARD || det_type == defs::MOENCH) {
+        det_type == defs::MOENCH || det_type == defs::CHIPTESTBOARD) {
         if (det_type == defs::GOTTHARD) {
             std::ostringstream oss1;
             proxy.Call("adcphase", {"20"}, -1, PUT, oss1);
@@ -1196,8 +1181,8 @@ TEST_CASE("maxadcphaseshift", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::MOENCH ||
+        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("maxadcphaseshift", {}, -1, GET));
@@ -1210,7 +1195,8 @@ TEST_CASE("dbitphase", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
+        det_type == defs::CHIPTESTBOARD) {
         auto prev_val = det.getDBITPhase();
         {
             std::ostringstream oss1, oss2;
@@ -1239,7 +1225,8 @@ TEST_CASE("maxdbitphaseshift", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
+        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));
@@ -1364,8 +1351,8 @@ TEST_CASE("highvoltage", "[.cmd]") {
         }
     }
     // range 0, 60 - 200
-    else if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD ||
+    else if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-             det_type == defs::MOENCH) {
+             det_type == defs::CHIPTESTBOARD) {
         REQUIRE_THROWS(proxy.Call("highvoltage", {"50"}, -1, PUT));
         {
             std::ostringstream oss1, oss2;
@@ -1443,8 +1430,8 @@ TEST_CASE("powerchip", "[.cmd]") {
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
 
-    if (det_type == defs::JUNGFRAU || det_type == defs::MYTHEN3 ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::GOTTHARD2 || det_type == defs::MOENCH) {
+        det_type == defs::MYTHEN3 || det_type == defs::GOTTHARD2) {
         auto prev_val = det.getPowerChip();
         {
             std::ostringstream oss;
@@ -1493,8 +1480,9 @@ 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::EIGER) {
+    } else if (det_type != defs::JUNGFRAU && det_type != defs::MOENCH &&
-        // wont fail for eiger and jungfrau virtual servers
+               det_type != defs::EIGER) {
+        // wont fail for eiger and jungfrau/moench virtual servers
         REQUIRE_THROWS(proxy.Call("imagetest", {}, -1, GET));
     }
 }
@@ -1616,7 +1604,7 @@ TEST_CASE("filterresistor", "[.cmd]") {
 
     // only for chipv1.1
     bool chip11 = false;
-    if (det_type == defs::JUNGFRAU &&
+    if ((det_type == defs::JUNGFRAU || det_type == defs::MOENCH) &&
         det.getChipVersion().squash() * 10 == 11) {
         chip11 = true;
     }
@@ -1707,14 +1695,15 @@ TEST_CASE("readnrows", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::EIGER || det_type == defs::JUNGFRAU) {
+    if (det_type == defs::EIGER || det_type == defs::JUNGFRAU ||
-        bool jungfrauhw2 = false;
+        det_type == defs::MOENCH) {
-        if (det_type == defs::JUNGFRAU &&
+        bool hw2 = false;
+        if ((det_type == defs::JUNGFRAU || det_type == defs::MOENCH) &&
             ((det.getHardwareVersion().tsquash(
                   "inconsistent hardware version number to test") == "2.0"))) {
-            jungfrauhw2 = true;
+            hw2 = true;
         }
-        if (det_type == defs::JUNGFRAU && !jungfrauhw2) {
+        if ((det_type == defs::JUNGFRAU || det_type == defs::MOENCH) && !hw2) {
             {
                 std::ostringstream oss;
                 proxy.Call("readnrows", {}, -1, GET, oss);
@@ -1737,7 +1726,7 @@ TEST_CASE("readnrows", "[.cmd]") {
                 proxy.Call("readnrows", {"16"}, -1, PUT, oss);
                 REQUIRE(oss.str() == "readnrows 16\n");
             }
-            if (det_type == defs::JUNGFRAU) {
+            if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
                 REQUIRE_THROWS(proxy.Call("readnrows", {"7"}, -1, PUT));
                 REQUIRE_THROWS(proxy.Call("readnrows", {"20"}, -1, PUT));
                 REQUIRE_THROWS(proxy.Call("readnrows", {"44"}, -1, PUT));
@@ -1759,7 +1748,8 @@ TEST_CASE("currentsource", "[.cmd]") {
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
 
-    if (det_type == defs::GOTTHARD2 || det_type == defs::JUNGFRAU) {
+    if (det_type == defs::GOTTHARD2 || det_type == defs::JUNGFRAU ||
+        det_type == defs::MOENCH) {
         auto prev_val = det.getCurrentSource();
 
         if (det_type == defs::GOTTHARD2) {
@@ -1783,7 +1773,7 @@ TEST_CASE("currentsource", "[.cmd]") {
             REQUIRE_THROWS(proxy.Call("currentsource",
                                       {"1", "fix", "42", "normal"}, -1, PUT));
         }
-        // jungfrau
+        // jungfrau/moench
         else {
             int chipVersion = det.getChipVersion().tsquash(
                                   "inconsistent chip versions to test") *
@@ -1911,7 +1901,8 @@ TEST_CASE("temp_adc", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::GOTTHARD) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
+        det_type == defs::GOTTHARD) {
         REQUIRE_NOTHROW(proxy.Call("temp_adc", {}, -1, GET));
         std::ostringstream oss;
         REQUIRE_NOTHROW(proxy.Call("temp_adc", {}, 0, GET, oss));
@@ -1926,7 +1917,7 @@ TEST_CASE("temp_fpga", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type != defs::MOENCH && det_type != defs::CHIPTESTBOARD) {
+    if (det_type != defs::CHIPTESTBOARD) {
         REQUIRE_NOTHROW(proxy.Call("temp_fpga", {}, -1, GET));
         std::ostringstream oss;
         REQUIRE_NOTHROW(proxy.Call("temp_fpga", {}, 0, GET, oss));
@@ -1983,7 +1974,7 @@ TEST_CASE("defaultdac", "[.cmd]") {
                 det.setDefaultDac(it, prev_val[i], {i});
             }
         }
-        if (det_type == defs::JUNGFRAU) {
+        if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
             std::vector<defs::dacIndex> daclist = {
                 defs::VREF_PRECH, defs::VREF_DS, defs::VREF_COMP};
             for (auto it : daclist) {
@@ -2023,7 +2014,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 and m3
+        // settings should not change especially for jungfrau/moench and m3
         auto next_val = det.getSettings();
         for (int i = 0; i != det.size(); ++i) {
             REQUIRE(prev_val[i] == next_val[i]);
@@ -2043,7 +2034,8 @@ 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) {
+    } else if (det_type == defs::EIGER || det_type == defs::JUNGFRAU ||
+               det_type == defs::MOENCH) {
         auto prev_timing =
             det.getTimingMode().tsquash("inconsistent timing mode in test");
         auto prev_frames =
@@ -2083,7 +2075,8 @@ 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) {
+    if (det_type == defs::EIGER || det_type == defs::JUNGFRAU ||
+        det_type == defs::MOENCH) {
         auto prev_timing =
             det.getTimingMode().tsquash("inconsistent timing mode in test");
         auto prev_frames =
@@ -2334,6 +2327,7 @@ TEST_CASE("scan", "[.cmd]") {
         notImplementedInd = defs::VCASCP_PB;
         break;
     case defs::JUNGFRAU:
+    case defs::MOENCH:
         ind = defs::VB_COMP;
         notImplementedInd = defs::VSVP;
         break;
@@ -2341,10 +2335,6 @@ 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;
@@ -2460,7 +2450,7 @@ TEST_CASE("numinterfaces", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
         auto prev_val = det.getNumberofUDPInterfaces().tsquash(
             "inconsistent numinterfaces to test");
         {
@@ -2515,8 +2505,9 @@ TEST_CASE("udp_dstlist", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::EIGER ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::MYTHEN3 || det_type == defs::GOTTHARD2) {
+        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"},
@@ -2530,8 +2521,9 @@ TEST_CASE("udp_numdst", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::EIGER ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::MYTHEN3 || det_type == defs::GOTTHARD2) {
+        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));
@@ -2550,8 +2542,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::MYTHEN3 ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::GOTTHARD2) {
+        det_type == defs::MYTHEN3 || det_type == defs::GOTTHARD2) {
         auto prev_val = det.getFirstUDPDestination();
         {
             std::ostringstream oss;
@@ -2627,7 +2619,8 @@ TEST_CASE("udp_srcip2", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::GOTTHARD2) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
+        det_type == defs::GOTTHARD2) {
         auto prev_val = det.getSourceUDPIP2();
         REQUIRE_THROWS(proxy.Call("udp_srcip2", {"0.0.0.0"}, -1, PUT));
         {
@@ -2648,7 +2641,8 @@ TEST_CASE("udp_dstip2", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::GOTTHARD2) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
+        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));
@@ -2659,7 +2653,8 @@ TEST_CASE("udp_srcmac2", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::GOTTHARD2) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
+        det_type == defs::GOTTHARD2) {
         auto prev_val = det.getSourceUDPMAC2();
         REQUIRE_THROWS(
             proxy.Call("udp_srcmac2", {"00:00:00:00:00:00"}, -1, PUT));
@@ -2682,7 +2677,8 @@ TEST_CASE("udp_dstmac2", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
-    if (det_type == defs::JUNGFRAU || det_type == defs::GOTTHARD2) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
+        det_type == defs::GOTTHARD2) {
         REQUIRE_THROWS(
             proxy.Call("udp_dstmac2", {"00:00:00:00:00:00"}, -1, PUT));
     } else {
@@ -2694,8 +2690,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::GOTTHARD2 ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::EIGER) {
+        det_type == defs::GOTTHARD2 || det_type == defs::EIGER) {
         auto prev_val = det.getDestinationUDPPort2();
         {
             std::ostringstream oss;
@@ -2730,7 +2726,7 @@ TEST_CASE("tengiga", "[.cmd]") {
 
     auto det_type = det.getDetectorType().squash();
     if (det_type == defs::EIGER || det_type == defs::CHIPTESTBOARD ||
-        det_type == defs::MOENCH || det_type == defs::MYTHEN3) {
+        det_type == defs::MYTHEN3) {
         auto tengiga = det.getTenGiga();
         det.setTenGiga(false);
 
@@ -2753,7 +2749,8 @@ TEST_CASE("flowcontrol10g", "[.cmd]") {
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
 
-    if (det_type == defs::EIGER || det_type == defs::JUNGFRAU) {
+    if (det_type == defs::EIGER || det_type == defs::JUNGFRAU ||
+        det_type == defs::MOENCH) {
         auto prev_val = det.getTenGigaFlowControl();
         {
             std::ostringstream oss;
@@ -2783,10 +2780,11 @@ 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::MYTHEN3) {
+        det_type == defs::MOENCH || det_type == defs::MYTHEN3) {
         auto prev_val = det.getTransmissionDelayFrame();
         auto val = 5000;
-        if (det_type == defs::JUNGFRAU || det_type == defs::MYTHEN3) {
+        if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
+            det_type == defs::MYTHEN3) {
             val = 5;
         }
         std::string sval = std::to_string(val);
@@ -2810,10 +2808,11 @@ 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::MYTHEN3) {
+        det_type == defs::MOENCH || det_type == defs::MYTHEN3) {
 
         // cannot get transmission delay with just one module
-        if ((det_type == defs::JUNGFRAU || det_type == defs::MYTHEN3) &&
+        if ((det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
+             det_type == defs::MYTHEN3) &&
             (det.size() < 2)) {
             REQUIRE_THROWS(proxy.Call("txdelay", {}, -1, GET));
             int val = 5;
@@ -2835,7 +2834,8 @@ TEST_CASE("txdelay", "[.cmd]") {
             }
             auto prev_frame = det.getTransmissionDelayFrame();
             auto val = 5000;
-            if (det_type == defs::JUNGFRAU || det_type == defs::MYTHEN3) {
+            if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
+                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) {
+    } else if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
         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) {
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) {
         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::MOENCH ||
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::JUNGFRAU ||
-        det_type == defs::JUNGFRAU || det_type == defs::MYTHEN3 ||
+        det_type == defs::MOENCH || 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::CHIPTESTBOARD ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::MOENCH || det_type == defs::MYTHEN3 ||
+        det_type == defs::CHIPTESTBOARD || 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::CHIPTESTBOARD ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::MOENCH || det_type == defs::MYTHEN3 ||
+        det_type == defs::CHIPTESTBOARD || 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::CHIPTESTBOARD ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::MOENCH) {
+        det_type == defs::CHIPTESTBOARD) {
         // 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::CHIPTESTBOARD ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::MOENCH || det_type == defs::GOTTHARD) {
+        det_type == defs::CHIPTESTBOARD || 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::CHIPTESTBOARD ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::MOENCH || det_type == defs::GOTTHARD ||
+        det_type == defs::CHIPTESTBOARD || 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::CHIPTESTBOARD ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::MOENCH || det_type == defs::GOTTHARD ||
+        det_type == defs::CHIPTESTBOARD || 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::MOENCH ||
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::JUNGFRAU ||
-        det_type == defs::JUNGFRAU) {
+        det_type == defs::MOENCH) {
         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::CHIPTESTBOARD ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::MOENCH || det_type == defs::MYTHEN3 ||
+        det_type == defs::CHIPTESTBOARD || 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::CHIPTESTBOARD ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::MOENCH || det_type == defs::MYTHEN3 ||
+        det_type == defs::CHIPTESTBOARD || 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::CHIPTESTBOARD ||
+    if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH ||
-        det_type == defs::MOENCH || det_type == defs::MYTHEN3 ||
+        det_type == defs::CHIPTESTBOARD || det_type == defs::MYTHEN3 ||
         det_type == defs::GOTTHARD2) {
         std::ostringstream oss;
         proxy.Call("frametime", {}, -1, GET, oss);

slsReceiverSoftware/src/Arping.cpp

@@ -5,9 +5,9 @@
 
 #include <chrono>
 #include <signal.h>
-#include <sys/wait.h>
 #include <thread>
 #include <unistd.h>
+#include<sys/wait.h>
 
 namespace sls {
 
@@ -17,7 +17,9 @@ namespace sls {
 #define gettid() syscall(SYS_gettid)
 #endif
 
-void func(int signum) { wait(NULL); }
+void func(int signum) {
+    wait(NULL);
+}
 
 Arping::Arping() {}
 
@@ -120,8 +122,7 @@ std::string Arping::ExecuteCommands() {
         FILE *sysFile = popen(cmd.c_str(), "r");
         if (sysFile == NULL) {
             std::ostringstream os;
-            os << "Could not Arping (" << cmd << " ) : Popen fail ("
+            os << "Could not Arping (" << cmd << " ) : Popen fail (" << strerror(errno) << ')';
-               << strerror(errno) << ')';
             return os.str();
         }
 

slsReceiverSoftware/src/ClientInterface.cpp

@@ -349,9 +349,10 @@ int ClientInterface::setup_receiver(Interface &socket) {
                 retvals[1] = r;
             }
         }
+
         impl()->setUDPPortNumber(arg.udp_dstport);
         impl()->setUDPPortNumber2(arg.udp_dstport2);
-        if (detType == JUNGFRAU || detType == GOTTHARD2) {
+        if (detType == JUNGFRAU || detType == MOENCH || detType == GOTTHARD2) {
             impl()->setNumberofUDPInterfaces(arg.udpInterfaces);
         }
         impl()->setUDPSocketBufferSize(0);
@@ -366,7 +367,8 @@ int ClientInterface::setup_receiver(Interface &socket) {
             impl()->setNumberOfAdditionalStorageCells(
                 arg.additionalStorageCells);
         }
-        if (detType == MOENCH || detType == CHIPTESTBOARD) {
+
+        if (detType == CHIPTESTBOARD) {
             impl()->setNumberofAnalogSamples(arg.analogSamples);
         }
         if (detType == CHIPTESTBOARD) {
@@ -386,7 +388,7 @@ int ClientInterface::setup_receiver(Interface &socket) {
             impl()->setQuad(arg.quad == 0 ? false : true);
             impl()->setThresholdEnergy(arg.thresholdEnergyeV[0]);
         }
-        if (detType == EIGER || detType == JUNGFRAU) {
+        if (detType == EIGER || detType == JUNGFRAU || detType == MOENCH) {
             impl()->setReadNRows(arg.readNRows);
         }
         if (detType == MYTHEN3) {
@@ -400,14 +402,12 @@ int ClientInterface::setup_receiver(Interface &socket) {
             impl()->setDynamicRange(arg.dynamicRange);
         }
         impl()->setTimingMode(arg.timMode);
-        if (detType == EIGER || detType == MOENCH || detType == CHIPTESTBOARD ||
+        if (detType == EIGER || 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 MOENCH:
     case JUNGFRAU:
+    case MOENCH:
     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 && detType != MOENCH) {
+    if (detType != CHIPTESTBOARD) {
         functionNotImplemented();
     }
     try {
@@ -912,8 +912,7 @@ int ClientInterface::get_overwrite(Interface &socket) {
 
 int ClientInterface::enable_tengiga(Interface &socket) {
     auto val = socket.Receive<int>();
-    if (detType != EIGER && detType != CHIPTESTBOARD && detType != MOENCH &&
+    if (detType != EIGER && detType != CHIPTESTBOARD && detType != MYTHEN3)
-        detType != MYTHEN3)
         functionNotImplemented();
 
     if (val >= 0) {
@@ -1353,7 +1352,7 @@ int ClientInterface::set_read_n_rows(Interface &socket) {
     auto arg = socket.Receive<int>();
     if (arg >= 0) {
         verifyIdle(socket);
-        if (detType != EIGER && detType != JUNGFRAU) {
+        if (detType != EIGER && detType != JUNGFRAU && detType != MOENCH) {
             throw RuntimeError("Could not set number of rows. Not implemented "
                                "for this detector");
         }
@@ -1436,7 +1435,7 @@ MacAddr ClientInterface::setUdpIp2(IpAddr arg) {
 int ClientInterface::set_udp_ip2(Interface &socket) {
     auto arg = socket.Receive<IpAddr>();
     verifyIdle(socket);
-    if (detType != JUNGFRAU && detType != GOTTHARD2) {
+    if (detType != JUNGFRAU && detType != MOENCH && detType != GOTTHARD2) {
         throw RuntimeError(
             "UDP Destination IP2 not implemented for this detector");
     }
@@ -1455,7 +1454,8 @@ 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 != EIGER && detType != GOTTHARD2) {
+    if (detType != JUNGFRAU && detType != MOENCH && 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 != GOTTHARD2) {
+    if (detType != JUNGFRAU && detType != MOENCH && 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 || detType == MOENCH)
+    if (detType == CHIPTESTBOARD)
         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 || detType == MOENCH)
+    if (detType == CHIPTESTBOARD)
         functionNotImplemented();
     LOG(logDEBUG1) << "Set Receiver ROI Metadata: " << ToString(arg);
     verifyIdle(socket);

slsReceiverSoftware/src/DataProcessor.cpp

@@ -480,7 +480,6 @@ 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

slsReceiverSoftware/src/GeneralData.h

@@ -352,6 +352,36 @@ 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};
@@ -565,68 +595,4 @@ 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

slsReceiverSoftware/src/Implementation.cpp

@@ -114,8 +114,8 @@ void Implementation::setDetectorType(const detectorType d) {
     case GOTTHARD:
     case EIGER:
     case JUNGFRAU:
-    case CHIPTESTBOARD:
     case MOENCH:
+    case CHIPTESTBOARD:
     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 CHIPTESTBOARD:
-        generalData = new ChipTestBoardData();
-        break;
     case MOENCH:
         generalData = new MoenchData();
         break;
+    case CHIPTESTBOARD:
+        generalData = new ChipTestBoardData();
+        break;
     case MYTHEN3:
         generalData = new Mythen3Data();
         break;
@@ -226,7 +226,7 @@ const slsDetectorDefs::xy Implementation::GetPortGeometry() const {
     xy portGeometry{1, 1};
     if (generalData->detType == EIGER)
         portGeometry.x = generalData->numUDPInterfaces;
-    else if (generalData->detType == JUNGFRAU)
+    else if (generalData->detType == JUNGFRAU || generalData->detType == MOENCH)
         portGeometry.y = generalData->numUDPInterfaces;
     return portGeometry;
 }
@@ -415,7 +415,7 @@ void Implementation::setReceiverROI(const slsDetectorDefs::ROI arg) {
                         portFullRoi.xmin += nPortDim.x;
                         portFullRoi.xmax += nPortDim.x;
                     }
-                    // top bottom (jungfrau)
+                    // top bottom (jungfrau or moench)
                     else {
                         portFullRoi.ymin += nPortDim.y;
                         portFullRoi.ymax += nPortDim.y;
@@ -1132,7 +1132,7 @@ int Implementation::getUDPSocketBufferSize() const {
 
 void Implementation::setUDPSocketBufferSize(const int s) {
     size_t listSize = listener.size();
-    if ((generalData->detType == JUNGFRAU ||
+    if ((generalData->detType == JUNGFRAU || generalData->detType == MOENCH ||
          generalData->detType == GOTTHARD2) &&
         (int)listSize != generalData->numUDPInterfaces) {
         throw RuntimeError("Number of Interfaces " +

slsReceiverSoftware/src/Listener.cpp

@@ -471,7 +471,6 @@ 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);

slsReceiverSoftware/src/MasterAttributes.cpp

@@ -16,6 +16,9 @@ void MasterAttributes::GetBinaryAttributes(
     case slsDetectorDefs::JUNGFRAU:
         GetJungfrauBinaryAttributes(w);
         break;
+    case slsDetectorDefs::MOENCH:
+        GetMoenchBinaryAttributes(w);
+        break;
     case slsDetectorDefs::EIGER:
         GetEigerBinaryAttributes(w);
         break;
@@ -25,9 +28,6 @@ void MasterAttributes::GetBinaryAttributes(
     case slsDetectorDefs::GOTTHARD2:
         GetGotthard2BinaryAttributes(w);
         break;
-    case slsDetectorDefs::MOENCH:
-        GetMoenchBinaryAttributes(w);
-        break;
     case slsDetectorDefs::CHIPTESTBOARD:
         GetCtbBinaryAttributes(w);
         break;
@@ -48,6 +48,9 @@ void MasterAttributes::WriteHDF5Attributes(H5::H5File *fd, H5::Group *group) {
     case slsDetectorDefs::JUNGFRAU:
         WriteJungfrauHDF5Attributes(fd, group);
         break;
+    case slsDetectorDefs::MOENCH:
+        WriteMoenchHDF5Attributes(fd, group);
+        break;
     case slsDetectorDefs::EIGER:
         WriteEigerHDF5Attributes(fd, group);
         break;
@@ -57,9 +60,6 @@ void MasterAttributes::WriteHDF5Attributes(H5::H5File *fd, H5::Group *group) {
     case slsDetectorDefs::GOTTHARD2:
         WriteGotthard2HDF5Attributes(fd, group);
         break;
-    case slsDetectorDefs::MOENCH:
-        WriteMoenchHDF5Attributes(fd, group);
-        break;
     case slsDetectorDefs::CHIPTESTBOARD:
         WriteCtbHDF5Attributes(fd, group);
         break;
@@ -622,6 +622,28 @@ void MasterAttributes::WriteJungfrauHDF5Attributes(H5::H5File *fd,
 }
 #endif
 
+void MasterAttributes::GetMoenchBinaryAttributes(
+    rapidjson::PrettyWriter<rapidjson::StringBuffer> *w) {
+    w->Key("Exptime");
+    w->String(ToString(exptime).c_str());
+    w->Key("Period");
+    w->String(ToString(period).c_str());
+    w->Key("Number of UDP Interfaces");
+    w->Uint(numUDPInterfaces);
+    w->Key("Number of rows");
+    w->Uint(readNRows);
+}
+
+#ifdef HDF5C
+void MasterAttributes::WriteMoenchHDF5Attributes(H5::H5File *fd,
+                                                  H5::Group *group) {
+    MasterAttributes::WriteHDF5Exptime(fd, group);
+    MasterAttributes::WriteHDF5Period(fd, group);
+    MasterAttributes::WriteHDF5NumUDPInterfaces(fd, group);
+    MasterAttributes::WriteHDF5ReadNRows(fd, group);
+}
+#endif
+
 void MasterAttributes::GetEigerBinaryAttributes(
     rapidjson::PrettyWriter<rapidjson::StringBuffer> *w) {
     w->Key("Dynamic Range");
@@ -719,31 +741,6 @@ void MasterAttributes::WriteGotthard2HDF5Attributes(H5::H5File *fd,
 }
 #endif
 
-void MasterAttributes::GetMoenchBinaryAttributes(
-    rapidjson::PrettyWriter<rapidjson::StringBuffer> *w) {
-    w->Key("Exptime");
-    w->String(ToString(exptime).c_str());
-    w->Key("Period");
-    w->String(ToString(period).c_str());
-    w->Key("Ten Giga");
-    w->Uint(tenGiga);
-    w->Key("ADC Mask");
-    w->String(ToStringHex(adcmask).c_str());
-    w->Key("Analog Samples");
-    w->Uint(analogSamples);
-}
-
-#ifdef HDF5C
-void MasterAttributes::WriteMoenchHDF5Attributes(H5::H5File *fd,
-                                                 H5::Group *group) {
-    MasterAttributes::WriteHDF5Exptime(fd, group);
-    MasterAttributes::WriteHDF5Period(fd, group);
-    MasterAttributes::WriteHDF5TenGiga(fd, group);
-    MasterAttributes::WriteHDF5AdcMask(fd, group);
-    MasterAttributes::WriteHDF5AnalogSamples(fd, group);
-}
-#endif
-
 void MasterAttributes::GetCtbBinaryAttributes(
     rapidjson::PrettyWriter<rapidjson::StringBuffer> *w) {
     w->Key("Exptime");

slsReceiverSoftware/src/receiver_defs.h

@@ -24,9 +24,9 @@ namespace sls {
 
 #define MAX_FRAMES_PER_FILE           20000
 #define SHORT_MAX_FRAMES_PER_FILE     100000
-#define MOENCH_MAX_FRAMES_PER_FILE    100000
 #define EIGER_MAX_FRAMES_PER_FILE     10000
 #define JFRAU_MAX_FRAMES_PER_FILE     10000
+#define MOENCH_MAX_FRAMES_PER_FILE    10000
 #define CTB_MAX_FRAMES_PER_FILE       20000
 #define MYTHEN3_MAX_FRAMES_PER_FILE   10000
 #define GOTTHARD2_MAX_FRAMES_PER_FILE 20000

slsSupportLib/include/sls/sls_detector_defs.h

@@ -48,7 +48,7 @@
 #define SLS_DETECTOR_HEADER_VERSION      0x2
 #define SLS_DETECTOR_JSON_HEADER_VERSION 0x4
 
-// ctb/ moench 1g udp (read from fifo)
+// ctb 1g udp (read from fifo)
 #define UDP_PACKET_DATA_BYTES (1344)
 
 /** maximum trim en */
@@ -404,7 +404,7 @@ typedef struct {
     enum clockIndex { ADC_CLOCK, DBIT_CLOCK, RUN_CLOCK, SYNC_CLOCK };
 
     /**
-     * read out mode (ctb, moench)
+     * read out mode (ctb)
      */
     enum readoutMode { ANALOG_ONLY, DIGITAL_ONLY, ANALOG_AND_DIGITAL };
 
@@ -445,6 +445,11 @@ typedef struct {
 
     enum portPosition { LEFT, RIGHT, TOP, BOTTOM };
 
+    /**
+     * eiger fpga position
+     */
+    enum fpgaPosition { FRONT_LEFT, FRONT_RIGHT };
+
 #ifdef __cplusplus
     enum class streamingInterface {
 #else
@@ -632,6 +637,13 @@ struct detParameters {
             nChipY = 1;
             nDacs = 8;
             break;
+        case slsDetectorDefs::detectorType::MOENCH:
+            nChanX = 400;
+            nChanY = 400;
+            nChipX = 1;
+            nChipY = 1;
+            nDacs = 8;
+            break;
         case slsDetectorDefs::detectorType::JUNGFRAU:
             nChanX = 256;
             nChanY = 256;
@@ -646,13 +658,6 @@ struct detParameters {
             nChipY = 1;
             nDacs = 24;
             break;
-        case slsDetectorDefs::detectorType::MOENCH:
-            nChanX = 32;
-            nChanY = 1;
-            nChipX = 1;
-            nChipY = 1;
-            nDacs = 8;
-            break;
         case slsDetectorDefs::detectorType::EIGER:
             nChanX = 256;
             nChanY = 256;

slsSupportLib/include/sls/sls_detector_funcs.h

@@ -276,6 +276,7 @@ enum detFuncs {
     F_GET_SYNCHRONIZATION,
     F_SET_SYNCHRONIZATION,
     F_GET_HARDWARE_VERSION,
+    F_GET_FRONTEND_FIRMWARE_VERSION,
 
     NUM_DET_FUNCTIONS,
     RECEIVER_ENUM_START = 512, /**< detector function should not exceed this
@@ -655,6 +656,7 @@ const char* getFunctionNameFromEnum(enum detFuncs func) {
     case F_GET_SYNCHRONIZATION:             return "F_GET_SYNCHRONIZATION";
     case F_SET_SYNCHRONIZATION:             return "F_SET_SYNCHRONIZATION";
     case F_GET_HARDWARE_VERSION:            return "F_GET_HARDWARE_VERSION";
+    case F_GET_FRONTEND_FIRMWARE_VERSION:   return "F_GET_FRONTEND_FIRMWARE_VERSION";
 
     case NUM_DET_FUNCTIONS:              	return "NUM_DET_FUNCTIONS";
     case RECEIVER_ENUM_START:				return "RECEIVER_ENUM_START";

slsSupportLib/include/sls/versionAPI.h

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