9.2.0.rc (#1232)

* Python module is now built using scikit-build-core: Dev/scikitbuild #1164
* slsdet is available on PyPI from this release onwards
* Fixed broken import in typecaster.h #1181
* Dev/automate version number #1193
* Dev/automate version part2 #1209
* 9111: added expat to host section to fix conda #1216
* fix for gotthard.py to import slsdet properly
* added slsFramesynchronizer to conda copy_lib.sh
* version of release
* update version of client
* removed cmake <=3.28 that was added in 9.1.11 (main_library in meta.yaml in conda-recipes)
* added slsFrameSynchronizer binary to conda
* added numpy dependency to toml
* added documentation for pip in installation

Detailed Commits:
* skeleton pyproject.toml
* moved compiled extension into slsdet
* WIP
* WI{
* separated the recipes
* restored comments, cleanup
* cleaned meta yaml
* added back some python versions
* conda build of main library
* fixed typo
* removed conda build pin
* added zlib
* added workflow for python lib
* patching libzmq and cleaned up cmake
* removed compiler version
* switched patch tool
* reverted to scikit-build in pyproject.toml
* added sls_detector bin
* added sync, renamed action
* update cmake<=3.28 in conda build requirements
* Fixed broken import in typecaster.h (#1181)
- Fixed the broken import _slsdet --> slsdet._slsdet caused by a previous upgrade
- added tests that exercises the conversion from python to C++ and from C++ to python
- Python unit tests now run in CI (!)
* removed 3.28 restriction on cmake in meta.yaml
* from #1216 to 9.1.1.rc that got lost in merge from develoepr, added expat to host section to fix conda build
* back with the cmake restriction
* fixing gotthard1 import
* version number automated for python build
* mistakenly set version back to 0.0.0
* updated github workflow scripts to support automatic version numbering with environment variable
* managed to load VERSION file in yaml file - simplifies things
* saving changes in git workflow failed
* got typo in github workflow
* updatet regex pattern to support postfix
* normalized version to PEP 440 specification in update_version.py
* bug did not support version 0.0.0
* added regex pattern matching to version in toml file
* version now supports . before postfix
* updates api version based on version file & converted shell script files to python
* updated all makefiles
* adresses review comments
* updated release version and the api lib version
* raise an exception if the pull socket python script had errors at startup (for eg if pyzmq was not installed)
* cmake<=3.28 not required anymore
* updated documentation for pip installation as well
* 920/add numpy  (#1226)
* added numpy dependency
* aded build specifications for python version and platform
* release notes
---------
Co-authored-by: froejdh_e <erik.frojdh@psi.ch>
Co-authored-by: Fröjd Lars Erik <froejdh_e@pcmoench03.psi.ch>
Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
Co-authored-by: mazzol_a <mazzol_a@pc17378.psi.ch>
Co-authored-by: AliceMazzoleni99 <alice.mazzoleni@psi.ch>

.github/workflows/conda_python.yaml

@@ -33,7 +33,7 @@ jobs:
         run: conda config --set anaconda_upload no
 
       - name: Build
-        run: conda build conda-recipes/python-client --output-folder build_output
+        run: conda build conda-recipes/python-client --output-folder build_output 
 
       - name: Upload all Conda packages
         uses: actions/upload-artifact@v4

RELEASE.txt

@@ -1,21 +1,13 @@
-SLS Detector Package Major Release x.x.x released on xx.xx.202x
-===============================================================
+SLS Detector Package Minor Release 9.2.0 released on 02.06.2025
+==================================================================
 
-This document describes the differences between vx.x.x and vx.0.2   
+This document describes the differences between v9.2.0 and v9.1.1
 
 
 
     CONTENTS
     --------
-    1           New, Changed or Resolved Features
-        1.1     Compilation
-        1.2     Callback
-        1.3     Python
-        1.4     Client
-        1.5     Detector Server
-        1.6     Simulator
-        1.7     Receiver
-        1.8     Gui
+    1           New or Changed Features
     2           On-board Detector Server Compatibility
     3           Firmware Requirements
     4           Kernel Requirements
@@ -24,11 +16,22 @@ This document describes the differences between vx.x.x and vx.0.2
 
 
 
-1 New, Changed or Resolved Features
-=====================================
+1 New or Changed Features
+=========================
 
 
- 
+    Python
+    ------
+
+
+    *   Python module is now built using scikit-build-core
+    
+
+    *   slsdet is available on PyPI from this release onwards
+
+
+    *   Updated documentation on python module installation
+
 
 
 2  On-board Detector Server Compatibility
@@ -36,9 +39,10 @@ This document describes the differences between vx.x.x and vx.0.2
 
 
     Eiger       9.0.0
-    Jungfrau    9.0.0
-    Mythen3     9.0.0
+    Jungfrau    9.1.0
+    Mythen3     9.1.1
     Gotthard2   9.0.0
+    Gotthard    9.0.0
     Moench      9.0.0
   
 
@@ -65,14 +69,17 @@ This document describes the differences between vx.x.x and vx.0.2
 
     Eiger       02.10.2023 (v32)                    (updated in 7.0.3)
     
-    Jungfrau    20.09.2023 (v1.5, HW v1.0)          (updated in 8.0.0)
-                21.09.2023 (v2.5, HW v2.0)          (updated in 8.0.0)
+    Jungfrau    09.02.2025 (v1.6, HW v1.0)          (updated in 9.1.0)
+                08.02.2025 (v2.6, HW v2.0)          (updated in 9.1.0)
 
-    Mythen3     11.10.2024 (v1.5)                   (updated in 9.0.0)
+    Mythen3     13.11.2024 (v2.0)                   (updated in 9.0.0)
 
     Gotthard2   03.10.2024 (v1.0)                   (updated in 9.0.0)
 
-    Moench      26.10.2023 (v2.0)                   (updated in 9.0.0)
+    Moench      26.10.2023 (v2.0)                   (updated in 8.0.2)
+
+    Gotthard    08.02.2018 (50um and 25um Master)
+                09.02.2018 (25 um Slave) 
 
 
     Detector Upgrade
@@ -86,6 +93,8 @@ This document describes the differences between vx.x.x and vx.0.2
     Gotthard2  via command <.rbf>
     Moench     via command <.pof>
 
+    Gotthard cannot be upgraded remotely  
+
     Except Eiger, 
         upgrade 
             Using command 'programfpga' or
@@ -206,3 +215,4 @@ This document describes the differences between vx.x.x and vx.0.2
 
         dhanya.thattil@psi.ch
         erik.frojdh@psi.ch
+        alice.mazzoleni@psi.ch

VERSION

@@ -1 +1 @@
-0.0.0
+9.2.0

conda-recipes/main-library/meta.yaml

@@ -1,11 +1,11 @@
-package:
-  name: sls_detector_software
-  version: 2025.3.19
-
-
 source:
   path: ../..
 
+{% set version = load_file_regex(load_file = 'VERSION', regex_pattern = '(\d+(?:\.\d+)*(?:[\+\w\.]+))').group(1) %}
+package:
+  name: sls_detector_software
+  version: {{ version }} 
+  
 build:
   number: 0
   binary_relocation: True
@@ -28,6 +28,7 @@ requirements:
     - libgl-devel  # [linux]
     - libtiff
     - zlib
+    - expat
 
   run:
     - libstdcxx-ng
@@ -49,8 +50,6 @@ outputs:
         - libgcc-ng
 
 
-
-
   - name: slsdetgui
     script: copy_gui.sh
     requirements:

conda-recipes/python-client/meta.yaml

@@ -1,10 +1,11 @@
-package:
-  name: slsdet
-  version: 2025.3.19 #TODO! how to not duplicate this?
-
 source:
   path: ../..
 
+{% set version = load_file_regex(load_file = 'VERSION', regex_pattern = '(\d+(?:\.\d+)*(?:[\+\w\.]+))').group(1) %}
+package:
+  name: slsdet
+  version: {{ version }} 
+
 build:
   number: 0
   script:
@@ -17,7 +18,6 @@ requirements:
     - {{ stdlib("c") }}
     - {{ compiler('cxx') }}
 
-
   host:
     - cmake
     - ninja

docs/CMakeLists.txt

@@ -40,7 +40,6 @@ set(SPHINX_SOURCE_FILES
   src/pydetector.rst
   src/pyenums.rst
   src/pyexamples.rst
-  src/pyPatternGenerator.rst
   src/servers.rst
   src/receiver_api.rst
   src/result.rst
@@ -54,7 +53,6 @@ set(SPHINX_SOURCE_FILES
   src/serverdefaults.rst
   src/quick_start_guide.rst
   src/troubleshooting.rst
-  src/pattern.rst
   src/receivers.rst
   src/slsreceiver.rst
   src/udpheader.rst

docs/gen_server_doc.py.in

@@ -21,7 +21,7 @@ print('\n\n\n\n SERVER CSV')
 
 src = Path('@CMAKE_SOURCE_DIR@')/'slsDetectorServers/'
 detectors = ['Mythen3', 'Gotthard2', 'Eiger', 
-            'Jungfrau', 'Moench', 'Ctb']
+            'Jungfrau', 'Moench', 'Gotthard', 'Ctb']
 
 
 for det in detectors:

docs/src/binaryfileformat.rst

@@ -320,6 +320,61 @@ Moench
         }
     }
 
+Gotthard I
+^^^^^^^^^^^
+
+.. code-block:: text
+
+    {
+        "Version": 7.2,
+        "Timestamp": "Wed Nov 13 15:16:19 2024",
+        "Detector Type": "Gotthard",
+        "Timing Mode": "auto",
+        "Geometry": {
+            "x": 1,
+            "y": 1
+        },
+        "Image Size in bytes": 2560,
+        "Pixels": {
+            "x": 1280,
+            "y": 1
+        },
+        "Max Frames Per File": 20000,
+        "Frame Discard Policy": "nodiscard",
+        "Frame Padding": 1,
+        "Scan Parameters": "[disabled]",
+        "Total Frames": 1,
+        "Receiver Roi": {
+            "xmin": 4294967295,
+            "xmax": 4294967295,
+            "ymin": 4294967295,
+            "ymax": 4294967295
+        },
+        "Exptime": "1.00001ms",
+        "Period": "1s",
+        "Detector Roi": {
+            "xmin": 4294967295,
+            "xmax": 4294967295
+        },
+        "Frames in File": 1,
+        "Frame Header Format": {
+            "Frame Number": "8 bytes",
+            "SubFrame Number/ExpLength": "4 bytes",
+            "Packet Number": "4 bytes",
+            "Bunch ID": "8 bytes",
+            "Timestamp": "8 bytes",
+            "Module Id": "2 bytes",
+            "Row": "2 bytes",
+            "Column": "2 bytes",
+            "Reserved": "2 bytes",
+            "Debug": "4 bytes",
+            "Round Robin Number": "2 bytes",
+            "Detector Type": "1 byte",
+            "Header Version": "1 byte",
+            "Packets Caught Mask": "64 bytes"
+        }
+    }
+
 Chip Test Board
 ^^^^^^^^^^^^^^^
 

docs/src/firmware.rst

@@ -131,6 +131,42 @@ Program from console
 
 
 
+Gotthard I
+-----------
+
+Download 
+^^^^^^^^^^^^^
+- detector server corresponding to package in slsDetectorPackage/serverBin
+
+- `pof files <https://github.com/slsdetectorgroup/slsDetectorFirmware>`__
+
+
+.. _firmware upgrade using blaster for blackfin:
+
+Upgrade
+^^^^^^^^
+.. warning ::
+    | Gotthard firmware cannot be upgraded remotely and requires the use of USB-Blaster.
+    | It is generally updated by us.
+
+#. Download `Altera Quartus software or Quartus programmer <https://fpgasoftware.intel.com/20.1/?edition=standard&platform=linux&product=qprogrammer#tabs-4>`__.
+   
+
+#. Start Quartus programmer, click on Hardware Setup. In the "Currently selected hardware" window, select USB-Blaster.
+
+#. In the Mode combo box, select "Active Serial Programming".
+
+#. Plug the end of your USB-Blaster with the adaptor provided to the connector 'AS config' on the Gotthard board.
+
+#. Click on 'Add file'. Select programming (pof) file provided by us.
+
+#. Check "Program/Configure" and "Verify". Push the start button. Wait until the programming process is finished.
+
+#. In case of error messages, check the polarity of cable (that pin1 corresponds) and that the correct programming connector is selected.
+
+#. Reboot the detector.
+
+
 Mythen III
 -----------
 
@@ -360,3 +396,7 @@ How to get back mtd3 drive remotely (udpating kernel)
             more /proc/mtd # verify mtd3 is listed
             
 
+Last Resort using USB Blaster
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If none of these steps work, the last resort might be physically upgrading the firmware using a USB blaster, which also requires opening up the detector. Instructions for all the blackfin detectors are the same as the one for :ref:`gotthard firmware upgrade <firmware upgrade using blaster for blackfin>`.

docs/src/index.rst

@@ -36,8 +36,6 @@ Welcome to slsDetectorPackage's documentation!
     pydetector
     pyenums
     pyexamples
-    pyPatternGenerator
-    pattern
 
 .. toctree::
     :caption: Command line
@@ -81,8 +79,9 @@ Welcome to slsDetectorPackage's documentation!
     :caption: Receiver
     :maxdepth: 2
 
-    receivers
     slsreceiver
+    receivers
+    
 
 .. toctree::
     :caption: Receiver Files

docs/src/installation.rst

@@ -6,18 +6,33 @@
 Installation
 ===============
 
-One can either install pre-built binaries using conda or build from source.
+.. contents::
+   :local:
+   :depth: 2
+   :backlinks: top
+
+
+Overview
+--------------
+
+The ``slsDetectorPackage`` provides core detector software implemented in C++, along with Python bindings packaged as the ``slsdet`` Python extension module. Choose the option that best fits your environment and use case.
+
+:ref:`conda pre-built binaries`: 
+Install pre-built binaries for the C++ client, receiver, GUI and the Python API (``slsdet``), simplifying setup across platforms.
+
+:ref:`pip`:
+Install only the Python extension module, either by downloading the pre-built library from PyPI or by building the extension locally from source. Available only from v9.2.0 onwards.
+
+:ref:`build from source`: 
+Compile the entire package yourself, including both the C++ core and the Python bindings, for maximum control and customization. However, make sure that you have the :doc:`dependencies <../dependencies>` installed. If installing using conda, conda will manage the dependencies. Avoid installing packages with pip and conda simultaneously.
+
+
 
-.. warning ::
-    
-    Before building from source make sure that you have the 
-    :doc:`dependencies <../dependencies>` installed. If installing using conda, conda will 
-    manage the dependencies. Avoid also installing packages with pip. 
    
+.. _conda pre-built binaries:
 
-
-Install binaries using conda
-----------------------------------
+1. Install pre-built binaries using conda (Recommended)
+--------------------------------------------------------
 
 Conda is not only useful to manage python environments but can also
 be used as a user space package manager. Dates in the tag (for eg. 2020.07.23.dev0) 
@@ -63,12 +78,29 @@ We have four different packages available:
     conda search moenchzmq
 
 
+.. _pip:
+
+2. Pip
+-------
+The Python extension module ``slsdet`` can be installed using pip. This is available from v9.2.0 onwards.
+
+.. code-block:: bash
+    
+    #Install the Python extension module from PyPI
+    pip install slsdet
+
+    # or install the python extension locally from source
+    git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git --branch 9.2.0
+    cd slsDetectorPackage
+    pip install .
 
 
-Build from source
-----------------------
+.. _build from source:
 
-1. Download Source Code from github
+3. Build from source
+-------------------------
+
+3.1. Download Source Code from github
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. code-block:: bash
@@ -83,12 +115,12 @@ Build from source
 
 
 
-2. Build from Source
+3.2. Build from Source
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 One can either build using cmake or use the in-built cmk.sh script.
 
-Build using CMake
+3.2.1. Build using CMake
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. code-block:: bash
@@ -135,7 +167,7 @@ Example cmake options               Comment
     For v7.x.x of slsDetectorPackage and older, refer :ref:`zeromq notes for cmake option to hint library location. <zeromq for different slsDetectorPackage versions>` 
 
 
-Build using in-built cmk.sh script
+3.2.2. Build using in-built cmk.sh script
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
@@ -185,8 +217,8 @@ Build using in-built cmk.sh script
     For v7.x.x of slsDetectorPackage and older, refer :ref:`zeromq notes for cmk script option to hint library location. <zeromq for different slsDetectorPackage versions>` 
 
 
-Build on old distributions
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3.3. Build on old distributions using conda
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 If your linux distribution doesn't come with a C++11 compiler (gcc>4.8) then 
 it's possible to install a newer gcc using conda and build the slsDetectorPackage
@@ -210,7 +242,7 @@ using this compiler
 
 
 
-Build slsDetectorGui (Qt5)
+3.4. Build slsDetectorGui (Qt5)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 1. Using pre-built binary on conda
@@ -271,7 +303,7 @@ Build slsDetectorGui (Qt5)
 
 
 
-Build this documentation
+3.5. Build this documentation
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The documentation for the slsDetectorPackage is build using a combination 
@@ -294,8 +326,8 @@ is to use conda
     make rst # rst only, saves time in case the API did not change
 
 
-Pybind and Zeromq
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4. Pybind and Zeromq
+-------------------------
 
 .. _pybind for different slsDetectorPackage versions:
 

docs/src/masterfileattributes.rst

@@ -288,6 +288,56 @@ Moench
    | Frame Header Format   | Expected frame header format for the data files |
    +-----------------------+-------------------------------------------------+
 
+Gotthard I
+^^^^^^^^^^^
+
+   +-----------------------+-------------------------------------------------+
+   | **Key**               | **Description**                                 |
+   +-----------------------+-------------------------------------------------+
+   | Version               | Version of the master file                      |
+   |                       | Current value:8.0                               |
+   +-----------------------+-------------------------------------------------+
+   | Timestamp             | Timestamp of creation of master file            |
+   +-----------------------+-------------------------------------------------+
+   | Detector Type         | Detector type                                   |
+   +-----------------------+-------------------------------------------------+
+   | Timing Mode           | Timing Mode                                     |
+   +-----------------------+-------------------------------------------------+
+   | Geometry              | Number of UDP ports in x and y dimension for    |
+   |                       | complete detector                               |
+   +-----------------------+-------------------------------------------------+
+   | Image Size in bytes   | Image size in bytes per UDP port                |
+   +-----------------------+-------------------------------------------------+
+   | Pixels                | Number of pixels in x and y dimension           |
+   |                       | per UDP port                                    |
+   +-----------------------+-------------------------------------------------+
+   | Max Frames Per File   | Maximum frames per file                         |
+   +-----------------------+-------------------------------------------------+
+   | Frame Discard Policy  | Receiever Frame discard policy                  |
+   |                       | for partial frames                              |
+   +-----------------------+-------------------------------------------------+
+   | Frame Padding         | Receiver Frame padding enable                   |
+   |                       | for partial frames                              |
+   +-----------------------+-------------------------------------------------+
+   | Scan Parameters       | Scanning mode on detector                       |
+   +-----------------------+-------------------------------------------------+
+   | Total Frames          | Total number of frames and triggers expected    |
+   +-----------------------+-------------------------------------------------+
+   | Receiver Roi          | Receiver ROI in file including xmax and ymax    |
+   +-----------------------+-------------------------------------------------+
+   | Exptime               | Exposure time                                   |
+   +-----------------------+-------------------------------------------------+
+   | Period                | Period between frames                           |
+   +-----------------------+-------------------------------------------------+
+   | Detector Roi          | Roi in detector restricted to an ADC.           |
+   |                       | Includes xmax                                   |
+   +-----------------------+-------------------------------------------------+
+   | Burst Mode            | Burst mode of detector                          |
+   +-----------------------+-------------------------------------------------+
+   | Frames in File        | Number of frames written to file by Receiver 0  |
+   +-----------------------+-------------------------------------------------+
+   | Frame Header Format   | Expected frame header format for the data files |
+   +-----------------------+-------------------------------------------------+
 
 Chip Test Board
 ^^^^^^^^^^^^^^^

docs/src/pattern.rst

@@ -1,122 +0,0 @@
-Pattern
-========================
-
-This is a test and development feature implemented only for Ctb, Xilinx_Ctb and Mythen3.
-
-A pattern is a sequence of 64-bit words which is executed using a clock on the FPGA. Each of the 64 bits is connected to a pin or internal signal of the FPGA. The purpose of a pattern is to provide a way to change these 64 signals with precise timing. Commands run by the detector server could manipulate the same signals as the pattern, but they cannot enforce a change in a specific clock cycle.
-
-**Usage**
-
-A pattern is written to memory on the FPGA using the patword command.
-
-.. code-block::
-
-   patword 0x0000 0x000000000000000A
-   patword 0x0001 0x000000000000000B
-   patword 0x0002 0x000000000000000C
-   patword 0x0003 0x000000000000000D
-   patword 0x0004 0x000000000000000E
-
-The example above writes a five-word pattern into FPGA memory. The first argument is the memory address, the second argument is the content to be written into this address. Before executing a pattern one has to set the address limits of the pattern:
-
-.. code-block::
-
-   patlimits 0x0000 0x0004
-
-This instructs the firmware to execute the commands from address 0 to 4 (including 0 and 4). The execution can be started from the pyctbgui or with the commands
-
-.. code-block::
-
-   start [Ctb, Xilinx_Ctb]
-   patternstart [Mythen3]
-
-The maximal number of patword addresses is 8192. However, it is possible to extend the length of the pattern sequence using loops and wait commands. Loops can be configured with the following commands:
-
-.. code-block::
-
-   patloop 0 0x0001 0x0003
-   patnloop 0 7
-
-The first argument of both commands is the ID of the loop. Ctb and Xilinx_Ctb can have 6 loops (ID 0-5), Mythen3 can have 4 loop definitions. The commands above configure the loop with ID 0 to run 7 times and jump from the patword with address 3 to the patword with address 1. Important: If patnloop is set to 1, the addresses 0x1-0x3 will execute exactly once; if it is set to 0, the pattern addresses will be skipped.
-
-The same idea is used to introduce wait times. The example below causes the patword at address 0x0002 to be active for 9 clock cycles before the execution continues.
-
-.. code-block::
-
-   patwait 0 0x0002
-   patwaittime 0 9
-
-Waits can be placed inside a loop and loops can be nested.
-
-**patioctrl**
-
-The function of each bit in the sequence of 64-bit words depends on the connected detector and firmware version. Some of the 64 bits might connect directly to pads of a chip. The patioctrl command is used to configure the direction of some of these signals (not all of them !! See tables below). Signals where the corresponding bit in the argument of patioctrl is set to 1 will be driven from the FPGA.
-
-**patsetbit and patmask**
-
-The functions patsetbit and patmask can be used to ignore a specific bit of the pattern.
-Example:
-
-.. code-block::
-
-   patmask 0x0101
-   patsetbit 0x0001
-
-Patmask configures bit 0 and 8 of the pattern to be set to their value in patsetbit. These bits will be ignored during pattern execution and will always be 0 (bit 8) and 1 (bit 0).
-
-The mappings of bit positions in the pattern word to signals/pads of the FPGA are listed below for the three detector types where patterns are used. In the case of the two CTB's, connections of the signals to actual pads of a chip depend on the layout of the used detector adapter board. Therefore, each type of detector adapter board adds an additional mapping layer.
-
-**CTB Pattern Bit Mapping**
-
-.. table:: 
-
-   +----+---+------+----+----------+-------------------+----------------+
-   | 63 | 62| 61-57| 56 |  55-48   |  47-32            |  31-0          |
-   +----+---+------+----+----------+-------------------+----------------+
-   |  A |  D|  --- |  T | EXTIO    | DO, stream source | DIO            |
-   +----+---+------+----+----------+-------------------+----------------+
-
-DIO: Driving the 32 FPGA pins corresponding to the lowest 32 bits of the patioctrl command. If bits in patioctrl are 0, the same bit positions in DIO will switch to input pins and connect to dbit sampling. Additionally, some of these 32 bits have an automatic override by detector-specific statemachines which is active whenever one of these statemachines is running (currently bits 7,8,11,14 and 20).
-
-DO: Directly connected to 16 FPGA pins. Output only. Not influenced by patioctrl. Also connected to bit 47-32 in all Ctb dbit samples. All of them can be used as dbit sample trigger. In addition, every bit of DO can be selected as trigger for sending out a udp packet with samples to the receiver.
-
-EXTIO: Similar to DIO, but not used as input to the fpga. With the corresponding patioctrl bits set to 0 these pins will switch to a high impedance mode and be ignored by the firmware.
-
-T: trigger output
-
-D: enable signal for digital sampling
-
-A: adc enable
-
-**Xilinx_CTB Pattern Bit Mapping**
-
-.. table:: 
-
-   +-------+----------------+
-   | 63-32 |  31-0          |
-   +-------+----------------+
-   |  ---  | DIO            |
-   +-------+----------------+
-
-DIO: Driving the 32 FPGA pins corresponding to the lowest 32 bits of the patioctrl command. If bits in patioctrl are 0, the same bit positions in DIO will switch to input pins and connect to dbit sampling. Additionally, some of these 32 bits have an automatic override by detector-specific statemachines which is active whenever these sm's are running (currently bits 7,8,11,14 and 20).
-
-
-**Mythen3 Pattern Bit Mapping**
-
-.. table:: 
-
-   +-------+--------+-------+--------+------------+----------+----------+-----+-----+
-   | 63-33 |  32    | 31-25 |  24    | 23         |  22      | 21       | 20  | 19  |
-   +-------+--------+-------+--------+------------+----------+----------+-----+-----+
-   |  ---  | signARD|  ---  | CHSclk |  cnt_rst   |  sto_rst | STATLOAD | STO | SIN |
-   +-------+--------+-------+--------+------------+----------+----------+-----+-----+
-
-.. table:: 
-
-   +---------+-----+-------+-------+----+-------+---------+--------+
-   | 18      | 17  | 16-14 | 13    | 12 | 11    | 10      | 9-0    |
-   +---------+-----+-------+-------+----+-------+---------+--------+
-   | SR_MODE | clk | EN    | PULSE | RD | CHSIN | ANAMode | TBLOAD |
-   +---------+-----+-------+-------+----+-------+---------+--------+
-
-For Mythen3 the pattern word only connects to output pins of the FPGA when the pattern is running. Afterwards the signals will switch back to other logic in the FPGA. Both CTB's hold the last executed pattern word until a new pattern is started.

docs/src/pyPatternGenerator.rst

@@ -1,34 +0,0 @@
-PatternGenerator
-=====================================================
-
-Python class to generate patterns for the Chip Test Board.
-
-.. code-block:: python
-
-    from slsdet import PatternGenerator
-
-    p = PatternGenerator()
-    p.SB(5)
-    p.PW()
-    p.SB(8,9)
-    p.PW()
-    p.CB(5)
-
-Created a pattern like this:
-
-.. code-block:: bash
-
-    patword 0x0000 0x0000000000000020
-    patword 0x0001 0x0000000000000320
-    patword 0x0002 0x0000000000000300
-    patioctrl 0x0000000000000000
-    patlimits 0x0000 0x0002
-    ...
-
-.. py:currentmodule:: slsdet
-
-.. autoclass:: PatternGenerator
-    :members:  
-    :undoc-members:
-    :show-inheritance:
-    :inherited-members:

docs/src/receivers.rst

@@ -1,25 +1,25 @@
-Receivers
+Custom Receiver
 =================
 
-Receiver processes can be run on same or different machines as the client, receives the data from the detector (via UDP packets).
-When using the slsReceiver/ slsMultiReceiver, they can be further configured by the client control software (via TCP/IP) to set file name, file path, progress of acquisition etc.
+The receiver essentially listens to UDP data packets sent out by the detector.
+
+To know more about detector receiver setup in the config file, please check out :ref:`the detector-receiver UDP configuration in the config file<detector udp header config>` and the :ref:`detector udp format<detector udp header>`.
 
 
-To know more about detector receiver configuration, please check out :ref:`detector udp header and udp commands in the config file <detector udp header>`
+| Please note the following when using a custom receiver:
 
-Custom Receiver
-----------------
+* **udp_dstmac** must be configured in the config file. This parameter is not required when using an in-built receiver.
 
-| When using  custom receiver with our package, ensure that **udp_dstmac** is also configured in the config file. This parameter is not required when using slsReceiver.
+* Cannot use "auto" for **udp_dstip**.
 
-| Cannot use "auto" for **udp_dstip**.
+* No **rx_** commands in the config file. These commands are for configuring the slsReceiver.
 
-| Also ensure that there are no **rx_** commands in the config file. These commands are for configuring the slsReceiver.
+
+
+The main difference is the lack of **rx_** commands or file commands (eg. **f**write, **f**path) and the **udp_dstmac** is required in config file.
 
 Example of a custom receiver config file
 
-* The main difference is the lack of **rx_** commands or file commands (eg. fwrite, fpath) and the udp_dstmac is required in config file.
-
 .. code-block:: bash
 
     # detector hostname

docs/src/serverdefaults.rst

@@ -89,3 +89,18 @@ DACS
    :widths: 35, 35
    :header-rows: 1
 
+Gotthard
+-------------
+
+.. csv-table:: Default values
+   :file: gotthard.csv
+   :widths: 35, 35
+   :header-rows: 1
+
+DACS
+^^^^^^^^^^^^^
+
+.. csv-table:: Gotthard DACS
+   :file: gotthard-dacs.csv
+   :widths: 35, 35
+   :header-rows: 1

docs/src/servers.rst

@@ -27,11 +27,12 @@ Arguments
          -p, --port <port>        : TCP communication port with client. 
          -g, --nomodule           : [Mythen3][Gotthard2] 
                                     Generic or No Module mode. Skips detector type checks. 
+         -f, --phaseshift <value> : [Gotthard] only. Sets phase shift. 
          -d, --devel              : Developer mode. Skips firmware checks. 
          -u, --update             : Update mode. Skips firmware checks and initial detector setup. 
-         -i, --ignore-config      : [Eiger][Jungfrau][Gotthard2][Moench] 
+         -i, --ignore-config      : [Eiger][Jungfrau][Gotthard][Gotthard2][Moench] 
                                     Ignore config file. 
-         -m, --master <master>    : [Eiger][Mythen3][Gotthard2] 
+         -m, --master <master>    : [Eiger][Mythen3][Gotthard][Gotthard2] 
                                     Set Master to 0 or 1. Precedence over config file. Only for virtual servers except Eiger. 
          -t, --top <top>          : [Eiger] Set Top to 0 or 1. Precedence over config file. 
          -s, --stopserver         : Stop server. Do not use as it is created by control server 
@@ -64,7 +65,7 @@ One can start the on-board detector server automatically upon powering on the bo
          /home/root/executables/eigerDetectorServer &> /dev/null &
          exit 0
 
-   Jungfrau | Moench | CTB
+   Jungfrau | Moench | CTB | Gotthard I
       .. code-block:: bash
 
          # Edit inittab on board

docs/src/serverupgrade.rst

@@ -1,4 +1,5 @@
 .. _Detector Server Upgrade:
+
 Upgrade
 ========
 

docs/src/slsreceiver.rst

@@ -1,16 +1,55 @@
-slsReceiver/ slsMultiReceiver
+In-built Receiver   
 ================================
 
-| One has to start the slsReceiver before loading config file or using any receiver commands (prefix: **rx_** )
 
+
+The receiver essentially listens to UDP data packets sent out by the detector. It's main features are:
+
+- **Listening**: Receives UDP data from the detector.
+- **Writing to File**: Optionally writes received data to disk.
+- **Streaming via ZMQ**: Optionally streams out the data using ZeroMQ.
+
+Each of these operations runs asynchronously and in parallel for each UDP port.
+
+
+.. note ::   
+
+    * Can be run on the same or different machine as the client.
+    * Can be configured by the client. (set file name/ discard policy, get progress etc.)
+    * Has to be started before the client runs any receiver specific command.
+
+
+Receiver Variants
+-----------------
+There are three main receiver types. How to start them is described :ref:`below<Starting up the Receiver>`.
+
++----------------------+--------------------+-----------------------------------------+--------------------------------+
+| Receiver Type        | slsReceiver        | slsMultiReceiver                        |slsFrameSynchronizer            | 
++======================+====================+=========================================+================================+
+| Modules Supported    | 1                  | Multiple                                | Multiple                       |
++----------------------+--------------------+-----------------------------------------+--------------------------------+
+| Internal Architecture| Threads per porttt | Multiple child processes of slsReceiver | Multi-threading of slsReceiver |
++----------------------+--------------------+-----------------------------------------+--------------------------------+
+| ZMQ Streaming        | Disabled by default| Disabled by default                     | Enabled, not optional          |
++----------------------+--------------------+-----------------------------------------+--------------------------------+
+| ZMQ Synchronization  | No                 | No                                      | Yes, across ports              |
++----------------------+--------------------+-----------------------------------------+--------------------------------+
+| Image Reconstruction | No                 | No                                      | No                             |
++----------------------+--------------------+-----------------------------------------+--------------------------------+
+
+
+
+
+.. _Starting up the Receiver:
+
+Starting up the Receiver
+-------------------------
 For a Single Module
     .. code-block:: bash  
+        
+        slsReceiver # default port 1954
 
-        # default port 1954
-        slsReceiver
-
-        # custom port 2012
-        slsReceiver -t2012
+        slsReceiver -t2012 # custom port 2012
 
 
 For Multiple Modules
@@ -18,57 +57,66 @@ For Multiple Modules
 
         # each receiver (for each module) requires a unique tcp port (if all on same machine)
 
-        # using slsReceiver in multiple consoles
+        # option 1 (one for each module)
         slsReceiver
         slsReceiver -t1955
 
-        # slsMultiReceiver [starting port] [number of receivers]
+        # option 2
         slsMultiReceiver 2012 2
 
-        # slsMultiReceiver [starting port] [number of receivers] [print each frame header for debugging]
-        slsMultiReceiver 2012 2 1
+        # option 3
+        slsFrameSynchronizer 2012 2
+
 
 
 Client Commands 
 -----------------
 
-| One can remove **udp_dstmac** from the config file, as the slsReceiver fetches this from the **udp_ip**.
+* Client commands to the receiver begin with **rx_** or **f_** (file commands).
 
-| One can use "auto" for **udp_dstip** if one wants to use default ip of **rx_hostname**.
+* **rx_hostname** has to be the first command to the receiver so the client knows which receiver process to communicate with.
 
-| The first command to the receiver (**rx_** commands) should be **rx_hostname**. The following are the different ways to establish contact.
+* Can use 'auto' for **udp_dstip** if using 1GbE interface or the :ref:`virtual simulators<Virtual Detector Servers>`.
+
+
+To know more about detector receiver setup in the config file, please check out :ref:`the detector-receiver UDP configuration in the config file<detector udp header config>` and the :ref:`detector udp format<detector udp header>`.
+
+
+The following are the different ways to establish contact using **rx_hostname** command.
 
     .. code-block:: bash  
 
-        # default receiver tcp port (1954)
+        # ---single module---
+
+        # default receiver port at 1954
+        rx_hostname xxx
+       
+        # custom receiver port
+        rx_hostname xxx:1957 # option 1
+       
+        rx_tcpport 1957  # option 2
         rx_hostname xxx
 
-        # custom receiver port
-        rx_hostname xxx:1957
 
-        # custom receiver port
-        rx_tcpport 1954
-        rx_hostname xxx
+        # ---multi module---
 
-        # multi modules with custom ports
-        rx_hostname xxx:1955+xxx:1956+
-        
-        
-        # multi modules using increasing tcp ports when using multi detector command
+        # using increasing tcp ports
         rx_tcpport 1955
         rx_hostname xxx
 
-        # or specify multi modules with custom ports on same rxr pc
-        0:rx_tcpport 1954
+        # custom ports
+        rx_hostname xxx:1955+xxx:1958+ # option 1
+
+        0:rx_tcpport 1954 # option 2
         1:rx_tcpport 1955
         2:rx_tcpport 1956
         rx_hostname xxx
 
-        # multi modules with custom ports on different rxr pc
+        # custom ports on different receiver machines
         0:rx_tcpport 1954
         0:rx_hostname xxx
         1:rx_tcpport 1955
-        1:rx_hostname yyy
+        1:rx_hostname yyyrxr
 
 
 | Example commands:
@@ -91,6 +139,32 @@ Client Commands
         sls_detector_get -h rx_framescaught
 
 
+Example of a config file using in-built receiver
+
+.. code-block:: bash
+
+    # detector hostname
+    hostname bchip052+bchip053+
+
+    # udp destination port (receiver)
+    # sets increasing destination udp ports starting at 50004
+    udp_dstport 50004
+
+    # udp destination ip (receiver)
+    0:udp_dstip 10.0.1.100
+    1:udp_dstip 10.0.2.100
+
+    # udp source ip (same subnet as udp_dstip)
+    0:udp_srcip 10.0.1.184
+    1:udp_srcip 10.0.2.184
+
+    # udp destination mac - not required (picked up from udp_dstip)
+    #udp_dstmac 22:47:d5:48:ad:ef
+
+    # connects to receivers at increasing tcp port starting at 1954
+    rx_hostname mpc3434
+    # same as rx_hostname mpc3434:1954+mpc3434:1955+
+
 
 
 Performance 

docs/src/troubleshooting.rst

@@ -385,6 +385,14 @@ Cannot get data without a module attached
 You cannot get data without a module attached as a specific pin is floating. Attach module to get data.
 
 
+Gotthard
+----------
+
+
+Missing first frame or next frame after a delay
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Connect the data link from the Module directly to receiver pc or to a private network.
+
 
 Mythen3
 --------

docs/src/udpconfig.rst

@@ -1,4 +1,4 @@
-.. _detector udp header:
+.. _detector udp header config:
 
 
 Config file

docs/src/udpheader.rst

@@ -92,14 +92,14 @@ Detector Enum
     ================    ========
     GENERIC             0
     EIGER               1
-    GOTTHARD*           2    
+    GOTTHARD            2    
     JUNGFRAU            3    
     CHIPTESTBOARD       4        
     MOENCH              5
     MYTHEN3             6
     GOTTHARD2           7    
     ================    ========
-    * deprecated since v10.0.0
+
 
 
 Previous Versions

docs/src/virtualserver.rst

@@ -1,4 +1,5 @@
 .. _Virtual Detector Servers:
+
 Simulators
 ===========
 
@@ -22,6 +23,7 @@ Binaries
 
         eigerDetectorServer_virtual
         jungfrauDetectorServer_virtual
+        gotthardDetectorServer_virtual
         gotthard2DetectorServer_virtual
         mythen3DetectorServer_virtual
         moenchDetectorServer_virtual

examples/gotthard.config

@@ -0,0 +1,12 @@
+# detector hostname
+hostname bchip007
+
+# receiver pc hostname of 1Gb IP of the machine
+rx_hostname my_receiver_hostname
+
+# output directory
+fpath  /bigRAID/datadir_gotthard/rec_test_data
+
+# high voltage
+highvoltage 120
+

psi-pmodules/DetectorSoftware/slsDetectorPackage/files/variants

@@ -12,6 +12,5 @@ slsDetectorPackage/8.0.1_rh8 stable cmake/3.15.5 Qt/5.12.10
 slsDetectorPackage/8.0.2_rh7 stable cmake/3.15.5 Qt/5.12.10
 slsDetectorPackage/8.0.2_rh8 stable cmake/3.15.5 Qt/5.12.10
 slsDetectorPackage/9.0.0_rh8 stable cmake/3.15.5 Qt/5.12.10
-slsDetectorPackage/9.1.0_rh8 stable cmake/3.15.5 Qt/5.12.10
 
 

pyctbgui/pyctbgui/services/Pattern.py

@@ -10,7 +10,6 @@ from matplotlib.backends.backend_qt5agg import NavigationToolbar2QT as Navigatio
 from pyctbgui.utils.defines import Defines
 from pyctbgui.utils.plotPattern import PlotPattern
 
-from slsdet import DurationWrapper
 
 class PatternTab(QtWidgets.QWidget):
 
@@ -62,10 +61,7 @@ class PatternTab(QtWidgets.QWidget):
             getattr(self.view, f"lineEditLoop{i}Wait").editingFinished.connect(partial(self.setPatLoopWaitAddress, i))
             getattr(self.view,
                     f"spinBoxLoop{i}Repetition").editingFinished.connect(partial(self.setPatLoopRepetition, i))
-            getattr(self.view, f"doubleSpinBoxLoop{i}WaitClocks").editingFinished.connect(partial(self.setPatLoopWaitClocks, i))
-            getattr(self.view, f"spinBoxLoop{i}WaitInterval").editingFinished.connect(partial(self.setPatLoopWaitInterval, i))
-            getattr(self.view, f"comboBoxLoop{i}WaitInterval").currentIndexChanged.connect(partial(self.setPatLoopWaitInterval, i))
-        self.view.toolButtonTogglePageWaitTime.clicked.connect(self.setTogglePageWaitTime)
+            getattr(self.view, f"spinBoxLoop{i}WaitTime").editingFinished.connect(partial(self.setPatLoopWaitTime, i))
         self.view.pushButtonCompiler.clicked.connect(self.setCompiler)
         self.view.pushButtonUncompiled.clicked.connect(self.setUncompiledPatternFile)
         self.view.pushButtonPatternFile.clicked.connect(self.setPatternFile)
@@ -95,8 +91,7 @@ class PatternTab(QtWidgets.QWidget):
             self.getPatLoopStartStopAddress(i)
             self.getPatLoopWaitAddress(i)
             self.getPatLoopRepetition(i)
-            self.getPatLoopWaitClocks(i)
-            self.getPatLoopWaitInterval(i)
+            self.getPatLoopWaitTime(i)
 
     # Pattern Tab functions
 
@@ -187,67 +182,17 @@ class PatternTab(QtWidgets.QWidget):
         self.det.patnloop[level] = spinBox.value()
         self.getPatLoopRepetition(level)
 
-    def getPatLoopWaitClocks(self, level):
+    def getPatLoopWaitTime(self, level):
         retval = self.det.patwaittime[level]
-        spinBox = getattr(self.view, f"doubleSpinBoxLoop{level}WaitClocks")
+        spinBox = getattr(self.view, f"spinBoxLoop{level}WaitTime")
         spinBox.editingFinished.disconnect()
         spinBox.setValue(retval)
-        spinBox.editingFinished.connect(partial(self.setPatLoopWaitClocks, level))
-
-    def setPatLoopWaitClocks(self, level):
-        spinBox = getattr(self.view, f"doubleSpinBoxLoop{level}WaitClocks")
-        self.det.patwaittime[level] = int(spinBox.value())
-        self.getPatLoopWaitClocks(level)
-
-    def getPatLoopWaitInterval(self, level):
-        retval = self.det.getPatternWaitInterval(level)[0].count()
-        spinBox = getattr(self.view, f"spinBoxLoop{level}WaitInterval")
-        comboBox = getattr(self.view, f"comboBoxLoop{level}WaitInterval")
-        spinBox.editingFinished.disconnect()
-        comboBox.currentIndexChanged.disconnect()
-        # Converting to right time unit for period
-        if retval >= 1e9:
-            comboBox.setCurrentIndex(0)
-            spinBox.setValue(retval / 1e9)
-        elif retval >= 1e6:
-            comboBox.setCurrentIndex(1)
-            spinBox.setValue(retval / 1e6)
-        elif retval >= 1e3:
-            comboBox.setCurrentIndex(2)
-            spinBox.setValue(retval / 1e3)
-        else:
-            comboBox.setCurrentIndex(3)
-            spinBox.setValue(retval)
-        spinBox.editingFinished.connect(partial(self.setPatLoopWaitInterval, level))
-        comboBox.currentIndexChanged.connect(partial(self.setPatLoopWaitInterval, level))
-
-    def setPatLoopWaitInterval(self, level):
-        spinBox = getattr(self.view, f"spinBoxLoop{level}WaitInterval")
-        comboBox = getattr(self.view, f"comboBoxLoop{level}WaitInterval")
-        value = spinBox.value()
-        if comboBox.currentIndex() == 0:
-            value *= 1e9
-        elif comboBox.currentIndex() == 1:
-            value *= 1e6
-        elif  comboBox.currentIndex() == 2:
-            value *= 1e3
-        t = DurationWrapper()
-        t.set_count(int(value))
-        self.det.patwaittime[level] =  t    
-        self.getPatLoopWaitInterval(level)
-
-    def setTogglePageWaitTime(self):
-        if self.view.stackedWidgetWaitTime.currentIndex() == 0:
-            self.view.stackedWidgetWaitTime.setCurrentIndex(1)
-            self.view.labelWaitTime.setText("Time")
-            for i in range(Defines.pattern.loops_count):
-                self.getPatLoopWaitInterval(i)
-        else:
-            self.view.stackedWidgetWaitTime.setCurrentIndex(0)
-            self.view.labelWaitTime.setText("Clocks")
-            for i in range(Defines.pattern.loops_count):
-                self.getPatLoopWaitClocks(i)
+        spinBox.editingFinished.connect(partial(self.setPatLoopWaitTime, level))
 
+    def setPatLoopWaitTime(self, level):
+        spinBox = getattr(self.view, f"spinBoxLoop{level}WaitTime")
+        self.det.patwaittime[level] = spinBox.value()
+        self.getPatLoopWaitTime(level)
 
     def setCompiler(self):
         response = QtWidgets.QFileDialog.getOpenFileName(
@@ -505,7 +450,7 @@ class PatternTab(QtWidgets.QWidget):
                             f"{getattr(self.view, f'lineEditLoop{i}Stop').text()}")
 
             commands.append(f"patwait {i} {getattr(self.view, f'lineEditLoop{i}Wait').text()}")
-            commands.append(f"patwaittime {i} {getattr(self.view, f'doubleSpinBoxLoop{i}WaitClocks').text()}")
+            commands.append(f"patwaittime {i} {getattr(self.view, f'spinBoxLoop{i}WaitTime').text()}")
         commands.append(f"patlimits {self.view.lineEditStartAddress.text()}, {self.view.lineEditStopAddress.text()}")
         # commands.append(f"patfname {self.view.lineEditPatternFile.text()}")
         return commands

pyproject.toml

@@ -1,27 +1,37 @@
+[tool.scikit-build.metadata.version]
+provider = "scikit_build_core.metadata.regex"
+input = "VERSION"
+regex = '^(?P<version>\d+(?:\.\d+)*(?:[\.\+\w]+)?)$'
+result = "{version}" 
+
 [build-system]
-requires = ["scikit-build-core>=0.10", "pybind11", "numpy"]
+requires = [ "scikit-build-core>=0.10", "pybind11", "numpy",]
 build-backend = "scikit_build_core.build"
 
 [project]
 name = "slsdet"
-version = "2025.3.19"
-
+dynamic = ["version"]
+dependencies = [
+    "numpy", 
+]
 
 [tool.cibuildwheel]
 before-all = "uname -a"
+build = "cp{311,312,313}-manylinux_x86_64"
 
-[tool.scikit-build]
-build.verbose = true
-cmake.build-type = "Release"
-install.components = ["python"]
+[tool.scikit-build.build]
+verbose = true
 
+[tool.scikit-build.cmake]
+build-type = "Release"
+
+[tool.scikit-build.install]
+components = [ "python",]
 
 [tool.scikit-build.cmake.define]
-#Only build the control software and python ext
 SLS_USE_RECEIVER = "OFF"
 SLS_USE_RECEIVER_BINARIES = "OFF"
 SLS_USE_TEXTCLIENT = "OFF"
 SLS_BUILD_SHARED_LIBRARIES = "OFF"
-
 SLS_USE_PYTHON = "ON"
-SLS_INSTALL_PYTHONEXT = "ON"
+SLS_INSTALL_PYTHONEXT = "ON"

python/CMakeLists.txt

@@ -27,7 +27,6 @@ set_target_properties(_slsdet PROPERTIES
 set( PYTHON_FILES
     slsdet/__init__.py
     slsdet/adcs.py
-    slsdet/bits.py
     slsdet/dacs.py
     slsdet/powers.py
     slsdet/decorators.py
@@ -38,8 +37,8 @@ set( PYTHON_FILES
     slsdet/enums.py
     slsdet/errors.py
     slsdet/gaincaps.py
+    slsdet/gotthard.py
     slsdet/pattern.py
-    slsdet/PatternGenerator.py
     slsdet/gotthard2.py
     slsdet/moench.py
     slsdet/proxy.py
@@ -65,6 +64,10 @@ configure_file( scripts/test_virtual.py
     ${CMAKE_BINARY_DIR}/test_virtual.py 
 )
 
+configure_file(scripts/frameSynchronizerPullSocket.py 
+    ${CMAKE_BINARY_DIR}/bin/frameSynchronizerPullSocket.py COPYONLY)
+
+
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/../VERSION  
     ${CMAKE_BINARY_DIR}/bin/slsdet/VERSION
 )
@@ -86,4 +89,4 @@ if(SLS_INSTALL_PYTHONEXT)
         COMPONENT python
         )
 
-endif()
+endif()

python/scripts/compile_servers.py

@@ -55,6 +55,7 @@ servers = [
 #     "jungfrauDetectorServer",
       "mythen3DetectorServer",
 #     "gotthard2DetectorServer",
+#     "gotthardDetectorServer",
 #     "ctbDetectorServer",
 #     "moenchDetectorServer",
 ]

python/slsdet/PatternGenerator.py

@@ -1,226 +0,0 @@
-from . import Detector, Pattern
-from .bits import setbit, clearbit
-import textwrap
-from pathlib import Path
-
-
-class PatternGenerator:
-    """
-    Class to generate a pattern for the SLS detector. Intents to as closely as possible 
-    mimic the old pattern generation in the C code.
-    """
-    def __init__(self):
-        self.pattern = Pattern()
-        self.iaddr = 0
-
-    def SB(self, *bits):
-        """
-        Set one or several bits. Change will take affect with the next PW.
-        """
-        for bit in bits:
-            self.pattern.word[self.iaddr] = setbit(bit, self.pattern.word[self.iaddr])
-        return self.pattern.word[self.iaddr]
- 
-    def CB(self, *bits):
-        """
-        Clear one or several bits. Change will take affect with the next PW.
-        """
-        for bit in bits:
-            self.pattern.word[self.iaddr] = clearbit(bit, self.pattern.word[self.iaddr])
-        return self.pattern.word[self.iaddr]
-    
-
-    def _pw(self, verbose = False):
-        if verbose:
-            print(f'{self.iaddr:#06x} {self.pattern.word[self.iaddr]:#018x}') 
-        
-        #Limits are inclusive so we need to increment the address before writing the next word
-        self.pattern.limits[1] = self.iaddr
-        self.iaddr += 1
-        self.pattern.word[self.iaddr] = self.pattern.word[self.iaddr-1]
-
-    def PW(self, x = 1, verbose = False):
-        for i in range(x):
-            self._pw(verbose)
-            
-    # def REPEAT(self, x, verbose = False):
-    #     for i in range(x):
-    #         self._pw(verbose)
-
-    # def PW2(self, verbose = 0):
-    #     self.REPEAT(2, verbose)
-
-
-    def CLOCKS(self, bit, times = 1, length = 1, verbose = False):
-        """
-        clocks "bit" n "times", every half clock is long "length"
-        length is optional, default value is 1
-        """
-        for i in range(0, times):
-            self.SB(bit); self.PW(length, verbose)
-            self.CB(bit); self.PW(length, verbose)
-
-    def CLOCK(self, bit, length = 1, verbose = 0):
-        self.CLOCKS(bit, 1, length ,verbose)
-
-    def serializer(self, value, serInBit, clkBit, nbits, msbfirst = True, length = 1):
-        """serializer(value,serInBit,clkBit,nbits,msbfirst=1,length=1)
-        Produces the .pat file needed to serialize a word into a shift register.
-        value: value to be serialized
-        serInBit: control bit corresponding to serial in 
-        clkBit: control bit corresponding to the clock 
-        nbits: number of bits of the target register to load
-        msbfirst: if 1 pushes in the MSB first (default), 
-        if 0 pushes in the LSB first
-        length: length of all the PWs in the pattern
-        It produces no output because it modifies directly the members of the class pat via SB and CB"""
-        
-        c = value
-        self.CB(serInBit, clkBit)
-        self.PW(length) #generate initial line with clk and serIn to 0
-        
-        start = 0
-        stop = nbits
-        step = 1
-
-        if msbfirst:
-            start = nbits - 1
-            stop = -1
-            step =- 1 #reverts loop if msb has to be pushed in first
-
-        for i in range(start, stop, step):
-            if c & (1<<i): 
-                self.SB(serInBit)
-                self.PW(length)
-            else:
-                self.CB(serInBit)
-                self.PW(length)
-            self.SB(clkBit)
-            self.PW(length)
-            self.CB(clkBit)
-            self.PW(length)
-
-        self.CB(serInBit, clkBit)
-        self.PW(length) #generate final line with clk and serIn to 0   
-
-
-    #NOT IMPLEMENTED YET
-    #TODO! What should setstop do? Or can we remove it? 
-    #def setstop():    
-    #
-
-    def setoutput(self, bit):
-       self.pattern.ioctrl = setbit(bit, self.pattern.ioctrl)
-    
-    def setinput(self, bit):
-       self.pattern.ioctrl= clearbit(bit, self.pattern.ioctrl)
-    
-    #TODO! What should setclk do? Or can we remove it?
-    # def setclk(bit):
-    #    self.clkctrl=self.setbit(bit,self.clkctrl)
-
-    def setinputs(self, *args):
-       for i in args:
-          self.setinput(i)
-
-    def setoutputs(self, *args):
-      for i in args:
-         self.setoutput(i)
-        
-    #def setclks(self, *args):
-    #    for i in args:
-    #        self.setclk(i)
-
-    def setnloop(self, i, reps):
-        self.pattern.nloop[i] = reps
-
-    def setstartloop(self, i):
-        """
-        Set startloop[i] to the current address.
-        """
-        self.pattern.startloop[i] = self.iaddr
-
-    def setstoploop(self, i):
-        """
-        Set stoploop[i] to the current address.
-        """
-        self.pattern.stoploop[i] = self.iaddr
-        
-
-    def setstart(self):
-        """
-        Set start of pattern to the current address.
-        """
-        self.pattern.limits[0]=self.iaddr
-
-
-    def setstop(self,l):
-        """
-        Set stop of pattern to the current address.
-        """
-        self.pattern.limits[1] = self.iaddr
-
-        
-    def setwaitpoint(self, i):
-        """
-        Set wait[i] to the current address.
-        """
-        self.pattern.wait[i] = self.iaddr
-
-
-    def setwaittime(self, i, t):
-        """
-        Set waittime[i] to t.
-        """
-        self.pattern.waittime[i] = t
-
-
-    def setwait(self, i, t):
-        """
-        Set wait[i] to the current address and waittime[i] to t.
-        """
-        self.setwait(i)
-        self.setwaittime(i, t)
-
-    
-    def __repr__(self):
-        return textwrap.dedent(f"""\
-                            PatternBuilder:
-                                patlimits: {self.pattern.limits}
-                                startloop: {self.pattern.startloop}
-                                stoploop: {self.pattern.stoploop}
-                                nloop: {self.pattern.nloop}
-                                wait: {self.pattern.wait}
-                                waittime: {self.pattern.waittime}""")
-
-    def __str__(self):
-        return self.pattern.str()
-    
-    def print(self):
-        print(self)
-
-    def save(self, fname):
-        """Save pattern to text file"""
-        fname = str(fname) #Accept also Path objects, but C++ code needs a string
-        self.pattern.save(fname)
-
-    def load(self, fname):
-        """Load pattern from text file"""
-        fname = str(fname) #Accept also Path objects, but C++ code needs a string
-        n = self.pattern.load(fname)
-
-        #If the firs and only word is 0 we assume an empty pattern
-        if n == 1 and self.pattern.word[0] == 0:
-            n = 0
-        self.iaddr = n
-
-        #To make PW work as expected we need to set 1+last word to the last word
-        if n > 0:
-            self.pattern.word[n] = self.pattern.word[n-1]
-
-        
-    def send_to_detector(self, det):
-        """
-        Load the pattern into the detector.
-        """
-        det.setPattern(self.pattern)

python/slsdet/__init__.py

@@ -9,10 +9,10 @@ from .detector import Detector
 from .jungfrau import Jungfrau
 from .mythen3 import Mythen3
 from .gotthard2 import Gotthard2
+from .gotthard import Gotthard
 from .moench import Moench
 from .pattern import Pattern, patternParameters
 from .gaincaps import Mythen3GainCapsWrapper
-from .PatternGenerator import PatternGenerator
 
 from . import _slsdet
 xy = _slsdet.xy

python/slsdet/bits.py

@@ -1,31 +0,0 @@
-import numpy as np
-
-
-def setbit(bit, word):
-    if isinstance(word, np.generic):
-        mask = word.dtype.type(1)
-        mask = mask << bit
-    else:
-        mask = 1 << bit
-    return word | mask
-
-
-def setbit_arr(bit, arr):
-    arr |= arr.dtype.type(1 << bit)
-
-
-def clearbit(bit, word):
-    """
-    Clear the bit at position bit in word.
-    Two paths to avoid converting the types.  
-    """
-    if isinstance(word, np.generic):
-        mask = word.dtype.type(1)
-        mask = ~(mask << bit)
-    else:
-        mask = ~(1 << bit)
-    return word & mask
-
-
-def clearbit_arr(bit, arr):
-    arr &= arr.dtype.type(~(1 << bit))

python/slsdet/detector.py

@@ -274,7 +274,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def serialnumber(self):
-        """Jungfrau][Mythen3][Gotthard2][CTB][Moench] Serial number of detector """
+        """Jungfrau][Gotthard][Mythen3][Gotthard2][CTB][Moench] Serial number of detector """
         return ut.lhex(self.getSerialNumber())
 
     @property
@@ -312,7 +312,7 @@ class Detector(CppDetectorApi):
         -----
         [Eiger] Options: 4, 8, 12, 16, 32. If set to 32, also sets clkdivider to 2 (quarter speed), else to 0 (full speed)\n
         [Mythen3] Options: 8, 16, 32 \n
-        [Jungfrau][Moench][Ctb][Mythen3][Gotthard2][Xilinx Ctb] 16
+        [Jungfrau][Moench][Gotthard][Ctb][Mythen3][Gotthard2][Xilinx Ctb] 16
         """
         return self.getDynamicRange()
 
@@ -372,6 +372,7 @@ class Detector(CppDetectorApi):
         
         [Eiger] Use threshold command to load settings
         [Jungfrau] GAIN0, HIGHGAIN0 \n
+        [Gotthard] DYNAMICGAIN, HIGHGAIN, LOWGAIN, MEDIUMGAIN, VERYHIGHGAIN \n
         [Gotthard2] DYNAMICGAIN, FIXGAIN1, FIXGAIN2 \n
         [Eiger] settings loaded from file found in settingspath
         [Moench] G1_HIGHGAIN, G1_LOWGAIN, G2_HIGHCAP_HIGHGAIN, G2_HIGHCAP_LOWGAIN, G2_LOWCAP_HIGHGAIN, G2_LOWCAP_LOWGAIN, G4_HIGHGAIN, G4_LOWGAIN
@@ -403,7 +404,7 @@ class Detector(CppDetectorApi):
     @element
     def framesl(self):
         """
-        [Jungfrau][Moench][Mythen3][Gotthard2][CTB][Xilinx CTB] Number of frames left in acquisition.\n
+        [Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB][Xilinx CTB] Number of frames left in acquisition.\n
 
         Note
         ----
@@ -634,7 +635,7 @@ class Detector(CppDetectorApi):
     @element
     def periodl(self):
         """
-        [Jungfrau][Moench][CTB][Mythen3][Gotthard2][Xilinx Ctb] Period left for current frame.
+        [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2][Xilinx Ctb] Period left for current frame.
 
         Note
         -----
@@ -656,7 +657,7 @@ class Detector(CppDetectorApi):
     @element
     def delay(self):
         """
-        [Jungfrau][Moench][CTB][Mythen3][Gotthard2][Xilinx Ctb] Delay after trigger, accepts either a value in seconds, DurationWrapper or datetime.timedelta
+        [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2][Xilinx Ctb] Delay after trigger, accepts either a value in seconds, DurationWrapper or datetime.timedelta
 
         :getter: always returns in seconds. To get in DurationWrapper, use getDelayAfterTrigger
 
@@ -698,7 +699,7 @@ class Detector(CppDetectorApi):
     @element
     def delayl(self):
         """
-        [Jungfrau][Moench][CTB][Mythen3][Gotthard2][Xilinx Ctb] Delay left after trigger during acquisition, accepts either a value in seconds, datetime.timedelta or DurationWrapper
+        [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2][Xilinx Ctb] Delay left after trigger during acquisition, accepts either a value in seconds, datetime.timedelta or DurationWrapper
 
         Note
         -----
@@ -1443,6 +1444,8 @@ class Detector(CppDetectorApi):
     @udp_srcip.setter
     def udp_srcip(self, ip):
         if ip == "auto":
+            if self.type == detectorType.GOTTHARD:
+                raise NotImplementedError('Auto for udp_srcip cannot be used for GotthardI')
             ip = socket.gethostbyname(self.hostname[0])        
         ip = ut.make_ip(ip)
         ut.set_using_dict(self.setSourceUDPIP, ip)
@@ -1523,6 +1526,7 @@ class Detector(CppDetectorApi):
 
         Note
         -----
+        [Gotthard] 0, 90, 110, 120, 150, 180, 200 \n
         [Eiger][Mythen3][Gotthard2] 0 - 200 \n
         [Jungfrau][Moench][Ctb] 0, 60 - 200
         """
@@ -1650,7 +1654,7 @@ class Detector(CppDetectorApi):
     def master(self):
         """
         [Eiger][Gotthard2][Jungfrau][Moench] Sets (half) module to master and other(s) to slaves.\n
-        [Gotthard2][Mythen3][Eiger][Jungfrau][Moench] 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()
 
@@ -1908,7 +1912,7 @@ class Detector(CppDetectorApi):
 
     @property
     def adcreg(self):
-        """[Jungfrau][Moench][Ctb] Writes to an adc register 
+        """[Jungfrau][Moench][Ctb][Gotthard] Writes to an adc register 
 
         Note
         -----
@@ -1937,7 +1941,7 @@ class Detector(CppDetectorApi):
     @element
     def triggersl(self):
         """
-        [Jungfrau][Moench][Mythen3][Gotthard2][CTB][Xilinx CTB] Number of triggers left in acquisition.\n
+        [Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB][Xilinx CTB] Number of triggers left in acquisition.\n
         
         Note
         ----
@@ -2202,7 +2206,7 @@ class Detector(CppDetectorApi):
         Note
         -----
         Default: AUTO_TIMING \n
-        [Jungfrau][Moench][Ctb][Gotthard2][Xilinx Ctb] AUTO_TIMING, TRIGGER_EXPOSURE \n
+        [Jungfrau][Moench][Gotthard][Ctb][Gotthard2][Xilinx Ctb] AUTO_TIMING, TRIGGER_EXPOSURE \n
         [Mythen3] AUTO_TIMING, TRIGGER_EXPOSURE, GATED, TRIGGER_GATED \n
         [Eiger] AUTO_TIMING, TRIGGER_EXPOSURE, GATED, BURST_TRIGGER
         """
@@ -2259,7 +2263,7 @@ class Detector(CppDetectorApi):
     def type(self):
         """ Returns detector type. 
         Enum: detectorType
-        [EIGER, JUNGFRAU, MOENCH, MYTHEN3, GOTTHARD2, CHIPTESTBOARD]
+        [EIGER, JUNGFRAU, GOTTHARD, MOENCH, MYTHEN3, GOTTHARD2, CHIPTESTBOARD]
 
         :setter: Not implemented
         """
@@ -3475,13 +3479,15 @@ class Detector(CppDetectorApi):
     @property
     @element
     def adcphase(self):
-        """[Jungfrau][Moench][CTB] Sets phase shift of ADC clock. 
+        """[Gotthard][Jungfrau][Moench][CTB] Sets phase shift of ADC clock. 
 
         Note
         -----
         [Jungfrau][Moench] Absolute phase shift. Changing Speed also resets adcphase to recommended defaults.\n
-        [Ctb] Absolute phase shift. Changing adcclk also resets adcphase and sets it to previous values.
+        [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
         """
         return self.getADCPhase()
 
@@ -3696,13 +3702,7 @@ class Detector(CppDetectorApi):
     @property
     def patwaittime(self):
         """
-        [Ctb][Mythen3][Xilinx Ctb] Wait time in clock cycles of loop level provided. 
-
-        Info
-        ----
-
-        :getter: Always return in clock cycles. To get in DurationWrapper, use getPatternWaitInterval
-        :setter: Accepts either a value in clock cycles or a time unit (timedelta, DurationWrapper)
+        [Ctb][Mythen3][Xilinx Ctb] Wait time in clock cycles of loop level provided.
         
         Example
         -------
@@ -3713,85 +3713,41 @@ class Detector(CppDetectorApi):
         0: 5
         1: 20
         2: 30
-        >>> # using timedelta (up to microseconds precision)
-        >>> from datetime import timedelta
-        >>> d.patwaittime[0] = timedelta(seconds=1, microseconds=3)
-        >>> 
-        >>> # using DurationWrapper to set in seconds
-        >>> from slsdet import DurationWrapper
-        >>> d.patwaittime[0] = DurationWrapper(1.2)
-        >>> 
-        >>> # using DurationWrapper to set in ns
-        >>> t = DurationWrapper()
-        >>> t.set_count(500)
-        >>> d.patwaittime = t
-        >>>
-        >>> # to get in clock cycles
-        >>> d.patwaittime
-        1000
-        >>> 
-        >>> d.getPatternWaitInterval(0)
-        sls::DurationWrapper(total_seconds: 1.23 count: 1230000000)
         """
         return PatWaitTimeProxy(self)
 
+    @property
+    @element
+    def patwaittime0(self):
+        """[Ctb][Mythen3][Xilinx Ctb] Wait 0 time in clock cycles."""
+        return self.getPatternWaitTime(0)
 
-    def create_patwaittime_property(level):
-        docstring_template ="""
-        Deprecated command. Use patwaittime instead.
-        [Ctb][Mythen3][Xilinx Ctb] Wait time in clock cycles of loop level {level} provided. 
+    @patwaittime0.setter
+    def patwaittime0(self, nclk):
+        nclk = ut.merge_args(0, nclk)
+        ut.set_using_dict(self.setPatternWaitTime, *nclk)
 
-        Info
-        ----
+    @property
+    @element
+    def patwaittime1(self):
+        """[Ctb][Mythen3][Xilinx Ctb] Wait 1 time in clock cycles."""
+        return self.getPatternWaitTime(1)
 
-        :getter: Always return in clock cycles. To get in DurationWrapper, use getPatternWaitInterval
-        :setter: Accepts either a value in clock cycles or a time unit (timedelta, DurationWrapper)
-        
-        Example
-        -------
-        >>> d.patwaittime{level} = 5
-        >>> d.patwaittime{level}
-        5
-        >>> # using timedelta (up to microseconds precision)
-        >>> from datetime import timedelta
-        >>> d.patwaittime{level} = timedelta(seconds=1, microseconds=3)
-        >>> 
-        >>> # using DurationWrapper to set in seconds
-        >>> from slsdet import DurationWrapper
-        >>> d.patwaittime{level} = DurationWrapper(1.2)
-        >>> 
-        >>> # using DurationWrapper to set in ns
-        >>> t = DurationWrapper()
-        >>> t.set_count(500)
-        >>> d.patwaittime{level} = t
-        >>>
-        >>> # to get in clock cycles
-        >>> d.patwaittime{level}
-        1000
-        >>> 
-        >>> d.getPatternWaitInterval(level)
-        sls::DurationWrapper(total_seconds: 1.23 count: 1230000000)
-        """
-        @property
-        @element
-        def patwaittime(self):
-            return self.getPatternWaitClocks(level)
+    @patwaittime1.setter
+    def patwaittime1(self, nclk):
+        nclk = ut.merge_args(1, nclk)
+        ut.set_using_dict(self.setPatternWaitTime, *nclk)
 
-        @patwaittime.setter
-        def patwaittime(self, value):
-            if isinstance(value, (int, float)) and not isinstance(value, bool):
-                nclk = ut.merge_args(level, value)
-                ut.set_using_dict(self.setPatternWaitClocks, level, *nclk)
-            else:
-                ut.set_time_using_dict(self.setPatternWaitInterval, level, value)
-        
-        patwaittime.__doc__ = docstring_template.format(level=level)
+    @property
+    @element
+    def patwaittime2(self):
+        """[Ctb][Mythen3][Xilinx Ctb] Wait 2 time in clock cycles."""
+        return self.getPatternWaitTime(2)
 
-        return patwaittime
-    
-    patwaittime0 = create_patwaittime_property(0)
-    patwaittime1 = create_patwaittime_property(1)
-    patwaittime2 = create_patwaittime_property(2)
+    @patwaittime2.setter
+    def patwaittime2(self, nclk):
+        nclk = ut.merge_args(2, nclk)
+        ut.set_using_dict(self.setPatternWaitTime, *nclk)
 
 
     @property
@@ -4082,6 +4038,27 @@ class Detector(CppDetectorApi):
         return ClkDivProxy(self)
 
 
+    """
+    ---------------------------<<<Gotthard specific>>>---------------------------
+    """
+
+    @property
+    def exptimel(self):
+        """[Gotthard] Exposure time left for current frame.
+        
+        :getter: always returns in seconds. To get in DurationWrapper, use getExptimeLeft
+        :setter: Not Implemented
+        
+        Example
+        -----------
+        >>> d.exptimel
+        181.23
+        >>> d.getExptimeLeft()
+        [sls::DurationWrapper(total_seconds: 181.23 count: 181230000000)]
+        """
+        t = self.getExptimeLeft()
+        return reduce_time(t)
+
 
     """
     ---------------------------<<<Mythen3 specific>>>---------------------------

python/slsdet/gotthard.py

@@ -0,0 +1,53 @@
+# SPDX-License-Identifier: LGPL-3.0-or-other
+# Copyright (C) 2021 Contributors to the SLS Detector Package
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+This file contains the specialization for the Moench detector
+"""
+
+
+from .detector import Detector, freeze
+from .dacs import DetectorDacs
+from . import _slsdet
+dacIndex = _slsdet.slsDetectorDefs.dacIndex
+from .detector_property import DetectorProperty
+
+# @freeze
+
+# vref_ds, vcascn_pb, vcascp_pb, vout_cm, vcasc_out, vin_cm, vref_comp, ib_test_c
+class GotthardDacs(DetectorDacs):
+    _dacs = [('vref_ds',     dacIndex.VREF_DS,    0, 4000,   660),
+             ('vcascn_pb',   dacIndex.VCASCN_PB,  0, 4000,   650),
+             ('vcascp_pb,',  dacIndex.VCASCP_PB,  0, 4000,  1480),
+             ('vout_cm',     dacIndex.VOUT_CM,    0, 4000,  1520),
+             ('vcasc_out',   dacIndex.VCASC_OUT,  0, 4000,  1320),
+             ('vin_cm',      dacIndex.VIN_CM,     0, 4000,  1350),
+             ('vref_comp',   dacIndex.VREF_COMP,  0, 4000,   350),
+             ('ib_test_c',   dacIndex.IB_TESTC,   0, 4000,   2001),
+            ]
+    _dacnames = [_d[0] for _d in _dacs]
+
+#vthreshold??
+
+
+@freeze
+class Gotthard(Detector):
+    """
+    Subclassing Detector to set up correct dacs and detector specific 
+    functions. 
+    """
+    _detector_dynamic_range = [16]
+
+
+    _settings = ['standard', 'highgain', 'lowgain', 'veryhighgain', 'verylowgain']
+    """available settings for Eiger, note almost always standard"""
+
+    def __init__(self, id=0):
+        super().__init__(id)
+        self._frozen = False 
+        self._dacs = GotthardDacs(self)
+    
+    @property
+    def dacs(self):
+        return self._dacs

python/slsdet/proxy.py

@@ -275,13 +275,10 @@ class PatWaitTimeProxy:
         self.det = det
 
     def __getitem__(self, key):
-        return element_if_equal(self.det.getPatternWaitClocks(key))
+        return element_if_equal(self.det.getPatternWaitTime(key))
 
     def __setitem__(self, key, value):
-        if isinstance(value, (int, float)) and not isinstance(value, bool):
-            set_proxy_using_dict(self.det.setPatternWaitClocks, key, value)
-        else:
-            set_proxy_using_dict(self.det.setPatternWaitInterval, key, value)
+        set_proxy_using_dict(self.det.setPatternWaitTime, key, value)
 
     def __repr__(self):
         max_levels = MAX_PATTERN_LEVELS

python/src/detector.cpp

@@ -1293,6 +1293,20 @@ void init_det(py::module &m) {
         (void (Detector::*)(defs::collectionMode, sls::Positions)) &
             Detector::setCollectionMode,
         py::arg(), py::arg() = Positions{});
+    CppDetectorApi.def("getROI",
+                       (Result<defs::ROI>(Detector::*)(sls::Positions) const) &
+                           Detector::getROI,
+                       py::arg() = Positions{});
+    CppDetectorApi.def("setROI",
+                       (void (Detector::*)(defs::ROI, int)) & Detector::setROI,
+                       py::arg(), py::arg());
+    CppDetectorApi.def(
+        "clearROI", (void (Detector::*)(sls::Positions)) & Detector::clearROI,
+        py::arg() = Positions{});
+    CppDetectorApi.def("getExptimeLeft",
+                       (Result<sls::ns>(Detector::*)(sls::Positions) const) &
+                           Detector::getExptimeLeft,
+                       py::arg() = Positions{});
     CppDetectorApi.def("getNumberOfBursts",
                        (Result<int64_t>(Detector::*)(sls::Positions) const) &
                            Detector::getNumberOfBursts,
@@ -1847,22 +1861,13 @@ void init_det(py::module &m) {
                            Detector::setPatternWaitAddr,
                        py::arg(), py::arg(), py::arg() = Positions{});
     CppDetectorApi.def(
-        "getPatternWaitClocks",
+        "getPatternWaitTime",
         (Result<uint64_t>(Detector::*)(int, sls::Positions) const) &
-            Detector::getPatternWaitClocks,
+            Detector::getPatternWaitTime,
         py::arg(), py::arg() = Positions{});
-    CppDetectorApi.def("setPatternWaitClocks",
+    CppDetectorApi.def("setPatternWaitTime",
                        (void (Detector::*)(int, uint64_t, sls::Positions)) &
-                           Detector::setPatternWaitClocks,
-                       py::arg(), py::arg(), py::arg() = Positions{});
-    CppDetectorApi.def(
-        "getPatternWaitInterval",
-        (Result<sls::ns>(Detector::*)(int, sls::Positions) const) &
-            Detector::getPatternWaitInterval,
-        py::arg(), py::arg() = Positions{});
-    CppDetectorApi.def("setPatternWaitInterval",
-                       (void (Detector::*)(int, sls::ns, sls::Positions)) &
-                           Detector::setPatternWaitInterval,
+                           Detector::setPatternWaitTime,
                        py::arg(), py::arg(), py::arg() = Positions{});
     CppDetectorApi.def("getPatternMask",
                        (Result<uint64_t>(Detector::*)(sls::Positions)) &

python/src/enums.cpp

@@ -121,9 +121,13 @@ void init_enums(py::module &m) {
         .value("VTHRESHOLD", slsDetectorDefs::dacIndex::VTHRESHOLD)
         .value("IO_DELAY", slsDetectorDefs::dacIndex::IO_DELAY)
         .value("VREF_DS", slsDetectorDefs::dacIndex::VREF_DS)
+        .value("VCASCN_PB", slsDetectorDefs::dacIndex::VCASCN_PB)
+        .value("VCASCP_PB", slsDetectorDefs::dacIndex::VCASCP_PB)
         .value("VOUT_CM", slsDetectorDefs::dacIndex::VOUT_CM)
+        .value("VCASC_OUT", slsDetectorDefs::dacIndex::VCASC_OUT)
         .value("VIN_CM", slsDetectorDefs::dacIndex::VIN_CM)
         .value("VREF_COMP", slsDetectorDefs::dacIndex::VREF_COMP)
+        .value("IB_TESTC", slsDetectorDefs::dacIndex::IB_TESTC)
         .value("VB_COMP", slsDetectorDefs::dacIndex::VB_COMP)
         .value("VDD_PROT", slsDetectorDefs::dacIndex::VDD_PROT)
         .value("VIN_COM", slsDetectorDefs::dacIndex::VIN_COM)

python/src/pattern.cpp

@@ -20,10 +20,8 @@ void init_pattern(py::module &m) {
     });
 
     py::class_<sls::Pattern> Pattern(m, "Pattern");
-    Pattern.def(py::init())
-    .def("load", &sls::Pattern::load)
-    .def("save", &sls::Pattern::save)
-    .def("str", &sls::Pattern::str)
-    .def("data", (pat * (sls::Pattern::*)()) & sls::Pattern::data,
+    Pattern.def(py::init());
+    Pattern.def("load", &sls::Pattern::load);
+    Pattern.def("data", (pat * (sls::Pattern::*)()) & sls::Pattern::data,
                 py::return_value_policy::reference);
 }

python/tests/test_PatternGenerator.py

@@ -1,152 +0,0 @@
-import pytest 
-from slsdet import PatternGenerator
-
-
-def apply_detconf(p):
-    """
-    Hacky workaround to apply detConf_mh02 to a pattern
-    """
-    DACMON = 0
-    cnt_en_3 = 1
-    pulse_counter_en = 2
-    cnt_en_1 = 3
-    par_load = 4
-    pulse_mux_ctr = 5
-    reset_cnt = 6
-    reset_periphery = 7
-    config_load = 8
-    cnt_en_0 = 9
-    tbl = 10
-    clk_ext = 11
-    trimbit_load_reg = 12
-    store = 13
-    data_in = 14
-    en_pll_clk = 15
-    cnt_en_2 = 16
-    DACINT = 17
-    data_out_slow = 18 #IN
-    COMP2_MON = 19 #IN
-    start_read = 20
-    dac_store = 21
-    CNT3_MON = 22 #IN
-    EN_PIX_DIG_MON = 23
-    clk_sel = 24
-    BUSY = 25 #IN
-    COMP3_MON = 26 #IN
-    CNT2_MON = 27 #IN
-
-    dbit_ena=62 #FIFO LATCH
-    adc_ena=63  #ADC ENABLE
-
-    #FPGA input/ouutputs
-    p.setoutput(DACMON)
-    p.setoutput(cnt_en_3)
-    p.setoutput(pulse_counter_en)
-    p.setoutput(cnt_en_1)
-    p.setoutput(par_load)
-    p.setoutput(pulse_mux_ctr)
-    p.setoutput(reset_cnt)
-    p.setoutput(reset_periphery)
-    p.setoutput(cnt_en_0)
-    p.setoutput(tbl)
-    p.setoutput(clk_ext)
-    p.setoutput(config_load)
-    p.setoutput(trimbit_load_reg)
-    p.setoutput(store)
-    p.setoutput(data_in)
-    p.setoutput(en_pll_clk)
-    p.setoutput(cnt_en_2)
-    p.setoutput(DACINT)
-    p.setinput(data_out_slow)
-    p.setinput(COMP2_MON)
-    p.setoutput(start_read)
-    p.setoutput(dac_store)
-    p.setinput(CNT3_MON)
-    p.setoutput(EN_PIX_DIG_MON)
-    p.setoutput(clk_sel)
-    p.setinput(BUSY)
-    p.setinput(COMP3_MON)
-    p.setinput(CNT2_MON)
-
-    #system signals
-    p.setoutput(adc_ena)
-    # FIFO LATCH
-    p.setoutput(dbit_ena)
-    return p    
-
-
-
-
-
-def test_first_two_PW():
-    p = PatternGenerator()
-
-    #The pattern is created with a single empty word
-    assert p.pattern.limits[0] == 0
-    assert p.pattern.limits[1] == 0
-
-    p.SB(8)
-    p.PW()
-
-    #When doing the first PW the empty word is overwritten
-    assert p.pattern.limits[0] == 0
-    assert p.pattern.limits[1] == 0
-    assert p.pattern.word[0] == 256
-
-    p.SB(9)
-    p.PW()
-
-    #When doing the second PW we add a new word
-    assert p.pattern.limits[0] == 0
-    assert p.pattern.limits[1] == 1
-    assert p.pattern.word[0] == 256
-    assert p.pattern.word[1] == 768
-
-def test_simple_pattern():
-    """
-    Using enable pll pattern for MH02
-    """
-    en_pll_clk = 15
-    p = PatternGenerator()
-    p = apply_detconf(p)
-    p.SB(en_pll_clk)
-    p.PW()
-    p.PW() 
-
-    lines = str(p).split("\n")
-
-    enable_pll_pattern = [
-        "patword 0x0000 0x0000000000008000",
-        "patword 0x0001 0x0000000000008000",
-        "patioctrl 0xc000000001b3ffff",
-        "patlimits 0x0000 0x0001",
-        "patloop 0 0x1fff 0x1fff",
-        "patnloop 0 0",
-        "patloop 1 0x1fff 0x1fff",
-        "patnloop 1 0",
-        "patloop 2 0x1fff 0x1fff",
-        "patnloop 2 0",
-        "patloop 3 0x1fff 0x1fff",
-        "patnloop 3 0",
-        "patloop 4 0x1fff 0x1fff",
-        "patnloop 4 0",
-        "patloop 5 0x1fff 0x1fff",
-        "patnloop 5 0",
-        "patwait 0 0x1fff",
-        "patwaittime 0 0",
-        "patwait 1 0x1fff",
-        "patwaittime 1 0",
-        "patwait 2 0x1fff",
-        "patwaittime 2 0",
-        "patwait 3 0x1fff",
-        "patwaittime 3 0",
-        "patwait 4 0x1fff",
-        "patwaittime 4 0",
-        "patwait 5 0x1fff",
-        "patwaittime 5 0",
-    ]
-
-    assert len(lines) == len(enable_pll_pattern)
-
-    for i, line in enumerate(lines):
-        assert line == enable_pll_pattern[i]

python/tests/test_bits.py

@@ -1,50 +0,0 @@
-from slsdet.bits import clearbit, clearbit_arr, setbit, setbit_arr
-import numpy as np
-
-
-def test_clearbit_on_python_int():
-    val = 5  # 0b101
-    r = clearbit(0, val)
-    assert r == 4
-    assert val == 5
-
-def test_setbit_on_python_int():
-    val = 5  # 0b101
-    r = setbit(1, val)
-    assert r == 7
-    assert val == 5
-
-
-def test_setbit_doesnt_change_type():
-    word = np.int32(5)
-    ret = setbit(0, word)
-    assert isinstance(ret, np.int32)
-
-
-def test_clearbit_doesnt_change_type():
-    word = np.uint8(5)
-    ret = clearbit(0, word)
-    assert isinstance(ret, np.uint8)
-
-
-
-def test_setbit_on_array_element():
-    arr = np.zeros(10, dtype=np.uint64)
-    arr[5] = setbit(0, arr[5])
-    arr[5] = setbit(1, arr[5])
-    arr[5] = setbit(4, arr[5])
-    assert arr[4] == 0
-    assert arr[5] == 19  # 0b10011
-    assert arr[6] == 0
-
-
-def test_setbit_arr():
-    arr = np.zeros(10, dtype=np.int32)
-    setbit_arr(3, arr[3:9])
-    assert all(arr == np.array((0, 0, 0, 8, 8, 8, 8, 8, 8, 0), dtype=np.int32))
-
-
-def test_clearbit_arr():
-    arr = np.array((5, 5, 5), dtype=np.int8)
-    clearbit_arr(0, arr)
-    assert all(arr == (4, 4, 4))

serverBin/ctbDetectorServer_developer

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

serverBin/ctbDetectorServerv9.1.0

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

serverBin/eigerDetectorServer_developer

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

serverBin/eigerDetectorServerv9.0.0

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

serverBin/gotthard2DetectorServer_developer

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

serverBin/gotthard2DetectorServerv9.0.0

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

serverBin/gotthardDetectorServer_developer

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

serverBin/gotthardDetectorServerv9.0.0

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

serverBin/jungfrauDetectorServer_developer

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

serverBin/jungfrauDetectorServerv9.1.0

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

serverBin/moenchDetectorServer_developer

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

serverBin/moenchDetectorServerv9.0.0

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

serverBin/mythen3DetectorServer_developer

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

serverBin/mythen3DetectorServerv9.1.1

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

serverBin/xilinx_ctbDetectorServer_developer

@@ -1 +0,0 @@
-../slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer

serverBin/xilinx_ctbDetectorServerv9.1.0

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

slsDetectorCalibration/dataStructures/gotthardDoubleModuleDataNew.h

@@ -0,0 +1,155 @@
+// SPDX-License-Identifier: LGPL-3.0-or-other
+// Copyright (C) 2021 Contributors to the SLS Detector Package
+#ifndef GOTTHARD2MODULEDATANEW_H
+#define GOTTHARD2MODULEDATANEW_H
+#include "gotthardModuleDataNew.h"
+
+class gotthardDoubleModuleDataNew : public slsDetectorData<uint16_t> {
+
+  private:
+    const int nModules;
+    const int offset;
+    int iframe;
+
+  public:
+    /**
+ Implements the slsReceiverData structure for the gotthard read out by a module
+ i.e. using the slsReceiver (1x1280 pixels, 2 packets 1286 large etc.) \param c
+ crosstalk parameter for the output buffer
+
+     */
+
+    gotthardDoubleModuleDataNew(int off = 24 * 2, int nmod = 2)
+        : slsDetectorData<uint16_t>(1280 * nmod, 1, nmod * (1280 * 2 + off)),
+          nModules(nmod), offset(off), iframe(0) {
+
+#ifdef BCHIP074_BCHIP075
+        cout << "This is a bchip074-bchip075 system " << endl;
+#endif
+
+        uint16_t **dMask;
+        int **dMap;
+        int ix, iy;
+        int ypixels = 1;
+        int xpixels = 1280 * nmod;
+        int imod, ipix;
+        dMask = new uint16_t *[1];
+        dMap = new int *[1];
+        dMap[0] = new int[1280 * nmod];
+        dMask[0] = new uint16_t[1280 * nmod];
+
+        for (int ix = 0; ix < xpixels; ix++) {
+            imod = ix % 2;
+            if (imod == 0)
+                ipix = ix / 2;
+            else
+                ipix = 1280 - 1 - ix / 2;
+            if (imod == 0)
+                dMap[0][ix] = ipix * 2 + offset;
+            else
+                dMap[0][ix] = 1280 * 2 + 2 * offset +
+                              ipix * 2; // dataSize-2-ix;//+2*offset;
+            // dMap[0][ix] = 2*ipix+offset*(imod+1)+1280*2*imod;
+            dMask[0][ix] = 0x0;
+#ifdef BCHIP074_BCHIP075
+            int ibad = ix / 2 + 1280 * imod;
+            if ((ibad >= 128 * 4 && ibad < 128 * 5) ||
+                (ibad >= 9 * 128 && ibad < 10 * 128) ||
+                (ibad >= (1280 + 128 * 4) && ibad < ibad >= (1280 + 128 * 6)))
+                dataROIMask[0][ix] = 0;
+#endif
+        }
+
+        setDataMap(dMap);
+        setDataMask(dMask);
+    };
+
+    /**
+
+       Returns the frame number for the given dataset.
+       \param buff pointer to the dataset
+       \returns frame number
+
+     */
+
+    int getFrameNumber(char *buff) {
+        if (offset >= sizeof(sls_detector_header))
+            return ((sls_detector_header *)buff)->frameNumber;
+        return iframe;
+    }; //*((int*)(buff+5))&0xffffff;};
+
+    /**
+ gets the packets number (last packet is labelled with 0 and is replaced with
+ 40) \param buff pointer to the memory \returns packet number
+
+     */
+
+    int getPacketNumber(char *buff) {
+        if (offset >= sizeof(sls_detector_header))
+            return ((sls_detector_header *)buff)->packetNumber;
+    };
+
+    /**
+
+       Loops over a memory slot until a complete frame is found (i.e. all
+       packets 0 to nPackets, same frame number). purely virtual func \param
+       data pointer to the memory to be analyzed \param ndata reference to the
+       amount of data found for the frame, in case the frame is incomplete at
+       the end of the memory slot \param dsize size of the memory slot to be
+       analyzed \returns pointer to the beginning of the last good frame (might
+       be incomplete if ndata smaller than dataSize), or NULL if no frame is
+       found
+
+    */
+    virtual char *findNextFrame(char *data, int &ndata, int dsize) {
+        if (dsize < dataSize)
+            ndata = dsize;
+        else
+            ndata = dataSize;
+        return data;
+    }
+
+    virtual char *readNextFrame(ifstream &filebin) {
+        int ff = -1, np = -1;
+        return readNextFrame(filebin, ff, np);
+    };
+
+    virtual char *readNextFrame(ifstream &filebin, int &ff) {
+        int np = -1;
+        return readNextFrame(filebin, ff, np);
+    };
+
+    virtual char *readNextFrame(ifstream &filebin, int &ff, int &np) {
+        char *data = new char[dataSize];
+        char *d = readNextFrame(filebin, ff, np, data);
+        if (d == NULL) {
+            delete[] data;
+            data = NULL;
+        }
+        return data;
+    }
+
+    virtual char *readNextFrame(ifstream &filebin, int &ff, int &np,
+                                char *data) {
+        char *retval = 0;
+        int nd;
+        int fnum = -1;
+        np = 0;
+        int pn;
+
+        //  cout << dataSize << endl;
+        if (ff >= 0)
+            fnum = ff;
+
+        if (filebin.is_open()) {
+            if (filebin.read(data, dataSize)) {
+                ff = getFrameNumber(data);
+                np = getPacketNumber(data);
+                return data;
+            }
+        }
+        return NULL;
+    };
+};
+
+#endif

slsDetectorCalibration/dataStructures/gotthardShortModuleData.h

@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: LGPL-3.0-or-other
+// Copyright (C) 2021 Contributors to the SLS Detector Package
+#ifndef GOTTHARDSHORTMODULEDATA_H
+#define GOTTHARDSHORTMODULEDATA_H
+#include "slsReceiverData.h"
+
+class gotthardShortModuleData : public slsReceiverData<uint16_t> {
+  public:
+    /**
+ Implements the slsReceiverData structure for the gotthard short read out by a
+ module i.e. using the slsReceiver (1x256 pixels, 1 packet 256 large etc.)
+ \param c crosstalk parameter for the output buffer
+
+     */
+
+    gotthardShortModuleData(double c = 0)
+        : slsReceiverData<uint16_t>(xpixels, ypixels, npackets, buffersize),
+          xtalk(c) {
+
+        uint16_t **dMask;
+        int **dMap;
+        int ix, iy;
+        int offset = 2;
+
+        dMask = new uint16_t *[ypixels];
+        dMap = new int *[ypixels];
+        for (int i = 0; i < ypixels; i++) {
+            dMap[i] = new int[xpixels];
+            dMask[i] = new uint16_t[xpixels];
+        }
+
+        for (ix = 0; ix < ypixels; ++ix)
+            for (iy = 0; iy < xpixels; ++iy)
+                dMask[ix][iy] = 0x0;
+
+        for (ix = 0; ix < ypixels; ++ix)
+            for (iy = 0; iy < xpixels; ++iy) {
+                dMap[ix][iy] = offset;
+                offset++;
+            }
+
+        setDataMap(dMap);
+        setDataMask(dMask);
+    };
+
+    /**
+
+       Returns the frame number for the given dataset.
+       \param buff pointer to the dataset
+       \returns frame number
+
+     */
+
+    int getFrameNumber(char *buff) { return (*(int *)buff); };
+
+    /**
+ gets the packets number (last packet is labelled with 0 and is replaced with
+ 40) \param buff pointer to the memory \returns packet number
+
+     */
+
+    int getPacketNumber(char *buff) { return 1; };
+
+    /**
+returns the pixel value as double correcting for the output buffer crosstalk
+ \param data pointer to the memory
+ \param ix coordinate in the x direction
+ \param iy coordinate in the y direction
+ \returns channel value as double
+
+     */
+    double getValue(char *data, int ix, int iy = 0) {
+        // check how it is for gotthard
+        if (xtalk == 0)
+            return slsDetectorData<uint16_t>::getValue(data, ix, iy);
+        else
+            return slsDetectorData<uint16_t>::getValue(data, ix, iy) -
+                   xtalk *
+                       slsDetectorData<uint16_t>::getValue(data, ix - 1, iy);
+    };
+
+    /** sets the output buffer crosstalk correction parameter
+  \param c output buffer crosstalk correction parameter to be set
+  \returns current value for the output buffer crosstalk correction parameter
+
+     */
+    double setXTalk(double c) {
+        xtalk = c;
+        return xtalk;
+    }
+
+    /** gets the output buffer crosstalk parameter
+  \returns current value for the output buffer crosstalk correction parameter
+     */
+    double getXTalk() { return xtalk; }
+
+  private:
+    double xtalk; /**<output buffer crosstalk correction parameter */
+    const static int xpixels = 256;
+    const static int ypixels = 1;
+    const static int npackets = 1;
+    const static int buffersize = 518;
+};
+
+#endif

slsDetectorGui/forms/form_tab_advanced.ui

@@ -72,7 +72,7 @@
       <enum>QTabWidget::North</enum>
      </property>
      <property name="currentIndex">
-      <number>2</number>
+      <number>3</number>
      </property>
      <property name="elideMode">
       <enum>Qt::ElideLeft</enum>
@@ -178,6 +178,309 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="tab_roi">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
+      <property name="font">
+       <font>
+        <family>Cantarell</family>
+        <pointsize>10</pointsize>
+       </font>
+      </property>
+      <attribute name="title">
+       <string>Region of Interest</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_4">
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_2">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="font">
+          <font>
+           <family>Cantarell</family>
+           <pointsize>10</pointsize>
+          </font>
+         </property>
+         <property name="text">
+          <string>X Min:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="8">
+        <widget class="QPushButton" name="btnClearRoi">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>35</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>35</height>
+          </size>
+         </property>
+         <property name="font">
+          <font>
+           <family>Cantarell</family>
+           <pointsize>10</pointsize>
+          </font>
+         </property>
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Clear ROI at detector level&lt;/p&gt;&lt;p&gt;#clearroi#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string>Clear ROI </string>
+         </property>
+         <property name="icon">
+          <iconset resource="../include/icons.qrc">
+           <normaloff>:/icons/images/erase.png</normaloff>:/icons/images/erase.png</iconset>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QSpinBox" name="spinXmin">
+         <property name="minimumSize">
+          <size>
+           <width>120</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>120</width>
+           <height>25</height>
+          </size>
+         </property>
+         <property name="font">
+          <font>
+           <family>Cantarell</family>
+           <pointsize>10</pointsize>
+          </font>
+         </property>
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set ROI at detector level&lt;/p&gt;&lt;p&gt;#roi#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="minimum">
+          <number>-1</number>
+         </property>
+         <property name="maximum">
+          <number>1279</number>
+         </property>
+         <property name="value">
+          <number>-1</number>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="7">
+        <spacer name="horizontalSpacer_5">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="1" column="3">
+        <widget class="QLabel" name="label_3">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="font">
+          <font>
+           <family>Cantarell</family>
+           <pointsize>10</pointsize>
+          </font>
+         </property>
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set ROI at detector level&lt;/p&gt;&lt;p&gt;#roi#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string>X Max:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="2">
+        <spacer name="horizontalSpacer_4">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="1" column="4">
+        <widget class="QSpinBox" name="spinXmax">
+         <property name="minimumSize">
+          <size>
+           <width>120</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>120</width>
+           <height>25</height>
+          </size>
+         </property>
+         <property name="font">
+          <font>
+           <family>Cantarell</family>
+           <pointsize>10</pointsize>
+          </font>
+         </property>
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set ROI at detector level&lt;/p&gt;&lt;p&gt;#roi#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="minimum">
+          <number>-1</number>
+         </property>
+         <property name="maximum">
+          <number>1279</number>
+         </property>
+         <property name="value">
+          <number>-1</number>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0">
+        <widget class="QLabel" name="label">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="font">
+          <font>
+           <family>Cantarell</family>
+           <pointsize>10</pointsize>
+          </font>
+         </property>
+         <property name="text">
+          <string>Readout: </string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="3">
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="1" column="6">
+        <widget class="QPushButton" name="btnSetRoi">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>35</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>35</height>
+          </size>
+         </property>
+         <property name="font">
+          <font>
+           <family>Cantarell</family>
+           <pointsize>10</pointsize>
+          </font>
+         </property>
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set ROI at detector level&lt;/p&gt;&lt;p&gt;#roi#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string>Set ROI </string>
+         </property>
+         <property name="icon">
+          <iconset resource="../include/icons.qrc">
+           <normaloff>:/icons/images/refresh.png</normaloff>:/icons/images/refresh.png</iconset>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="5">
+        <spacer name="horizontalSpacer_6">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="0" column="1" colspan="4">
+        <widget class="QComboBox" name="comboReadout">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>160</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>25</height>
+          </size>
+         </property>
+         <property name="font">
+          <font>
+           <family>Cantarell</family>
+           <pointsize>10</pointsize>
+          </font>
+         </property>
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select readout to set ROI at detector level&lt;/p&gt;&lt;p&gt;#roi#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="tab_network">
       <property name="font">
        <font>
@@ -1935,6 +2238,11 @@ Exposure Time of a sub frame. Only for Eiger in 32 bit mode
  </widget>
  <tabstops>
   <tabstop>spinSetAllTrimbits</tabstop>
+  <tabstop>comboReadout</tabstop>
+  <tabstop>spinXmin</tabstop>
+  <tabstop>spinXmax</tabstop>
+  <tabstop>btnSetRoi</tabstop>
+  <tabstop>btnClearRoi</tabstop>
   <tabstop>comboDetector</tabstop>
   <tabstop>spinControlPort</tabstop>
   <tabstop>spinStopPort</tabstop>

slsDetectorGui/forms/form_tab_settings.ui

@@ -38,10 +38,13 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="4" column="5">
-    <widget class="QSpinBox" name="spinThreshold2">
-     <property name="enabled">
-      <bool>false</bool>
+   <item row="1" column="2" colspan="3">
+    <widget class="QComboBox" name="comboHV">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
      </property>
      <property name="minimumSize">
       <size>
@@ -62,42 +65,115 @@
       </font>
      </property>
      <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Threshold energy of 2nd counter&lt;/p&gt;&lt;p&gt;#threshold#&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;High Voltage&lt;/p&gt;&lt;p&gt; #highvoltage#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
-     <property name="keyboardTracking">
-      <bool>false</bool>
+     <item>
+      <property name="text">
+       <string>0</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>90</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>110</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>120</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>150</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>180</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>200</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="lblSettings">
+     <property name="enabled">
+      <bool>true</bool>
      </property>
-     <property name="suffix">
-      <string> eV</string>
+     <property name="minimumSize">
+      <size>
+       <width>110</width>
+       <height>0</height>
+      </size>
      </property>
-     <property name="minimum">
-      <number>-100000</number>
+     <property name="maximumSize">
+      <size>
+       <width>110</width>
+       <height>16777215</height>
+      </size>
      </property>
-     <property name="maximum">
-      <number>100000</number>
+     <property name="font">
+      <font>
+       <family>Cantarell</family>
+       <pointsize>10</pointsize>
+      </font>
      </property>
-     <property name="singleStep">
-      <number>100</number>
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Settings of the detector. &lt;/p&gt;&lt;p&gt; #settings#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
-     <property name="value">
-      <number>-1</number>
+     <property name="text">
+      <string>Settings:</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="9">
-    <spacer name="horizontalSpacer_4">
+   <item row="1" column="0">
+    <widget class="QLabel" name="lblComboHV">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="font">
+      <font>
+       <family>Cantarell</family>
+       <pointsize>10</pointsize>
+      </font>
+     </property>
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;High Voltage&lt;/p&gt;&lt;p&gt; #highvoltage#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>High Voltage: </string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="2">
+    <spacer name="verticalSpacer">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>40</width>
+       <width>20</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="6" column="4">
+   <item row="7" column="4">
     <widget class="QCheckBox" name="chkCounter3">
      <property name="enabled">
       <bool>false</bool>
@@ -125,7 +201,29 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="7">
+   <item row="2" column="0">
+    <widget class="QLabel" name="lblSpinHV">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="font">
+      <font>
+       <family>Cantarell</family>
+       <pointsize>10</pointsize>
+      </font>
+     </property>
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;High Voltage. Range: 60 - 200V. Swich off high voltage by setting to 0.&lt;/p&gt;&lt;p&gt;-1 corresponds to different values from detectors.&lt;/p&gt;&lt;p&gt;#highvoltage#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>High Voltage: </string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="7">
     <spacer name="horizontalSpacer_3">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -141,7 +239,97 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="2" colspan="3">
+   <item row="7" column="2">
+    <widget class="QCheckBox" name="chkCounter1">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>50</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <family>Cantarell</family>
+       <pointsize>10</pointsize>
+      </font>
+     </property>
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable 1st counter&lt;/p&gt;&lt;p&gt;#counters#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>1</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0">
+    <widget class="QLabel" name="lblThreshold">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>110</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>110</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <family>Cantarell</family>
+       <pointsize>10</pointsize>
+      </font>
+     </property>
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Threshold energy. The trim energy values need to be loaded first using &amp;quot;trimen&amp;quot;&lt;/p&gt;&lt;p&gt;#threshold#&lt;/p&gt;&lt;p&gt;#trimen#&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>Threshold:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0">
+    <widget class="QLabel" name="lblDynamicRange">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>110</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>110</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <family>Cantarell</family>
+       <pointsize>10</pointsize>
+      </font>
+     </property>
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dynamic Range of pixel/channel of detector&lt;/p&gt;&lt;p&gt;#dr#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>Dynamic Range:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2" colspan="3">
     <widget class="QSpinBox" name="spinHV">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -181,8 +369,8 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="2">
-    <widget class="QCheckBox" name="chkCounter1">
+   <item row="7" column="3">
+    <widget class="QCheckBox" name="chkCounter2">
      <property name="enabled">
       <bool>false</bool>
      </property>
@@ -199,222 +387,17 @@
       </font>
      </property>
      <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable 1st counter&lt;/p&gt;&lt;p&gt;#counters#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable 2nd counter&lt;/p&gt;&lt;p&gt;#counters#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
-      <string>1</string>
+      <string>2</string>
      </property>
      <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="7" column="2">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="0" column="0">
-    <spacer name="horizontalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="4" column="6">
-    <widget class="QSpinBox" name="spinThreshold3">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>140</width>
-       <height>25</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>140</width>
-       <height>25</height>
-      </size>
-     </property>
-     <property name="font">
-      <font>
-       <family>Cantarell</family>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Threshold energy of 3rd counter&lt;/p&gt;&lt;p&gt;#threshold#&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="keyboardTracking">
-      <bool>false</bool>
-     </property>
-     <property name="suffix">
-      <string> eV</string>
-     </property>
-     <property name="minimum">
-      <number>-100000</number>
-     </property>
-     <property name="maximum">
-      <number>100000</number>
-     </property>
-     <property name="singleStep">
-      <number>100</number>
-     </property>
-     <property name="value">
-      <number>-1</number>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="2" colspan="3">
-    <widget class="QSpinBox" name="spinThreshold">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>140</width>
-       <height>25</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>140</width>
-       <height>25</height>
-      </size>
-     </property>
-     <property name="font">
-      <font>
-       <family>Cantarell</family>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Threshold energy. The trim energy values need to be loaded first using &amp;quot;trimen&amp;quot;&lt;/p&gt;&lt;p&gt;#threshold#&lt;/p&gt;&lt;p&gt;#trimen#&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="keyboardTracking">
-      <bool>false</bool>
-     </property>
-     <property name="suffix">
-      <string> eV</string>
-     </property>
-     <property name="minimum">
-      <number>-100000</number>
-     </property>
-     <property name="maximum">
-      <number>100000</number>
-     </property>
-     <property name="singleStep">
-      <number>100</number>
-     </property>
-     <property name="value">
-      <number>-1</number>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="2" colspan="3">
-    <widget class="QComboBox" name="comboDynamicRange">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>25</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>140</width>
-       <height>25</height>
-      </size>
-     </property>
-     <property name="font">
-      <font>
-       <family>Cantarell</family>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dynamic Range of pixel/channel of detector&lt;/p&gt;&lt;p&gt;#dr#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <item>
-      <property name="text">
-       <string>1.67772e+07</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>65535</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>4095</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>255</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>7</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="6" column="0">
-    <widget class="QLabel" name="lblCounter">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>110</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>110</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="font">
-      <font>
-       <family>Cantarell</family>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable counters&lt;/p&gt;&lt;p&gt;#counters#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="text">
-      <string>Counters:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2" colspan="3">
+   <item row="3" column="2" colspan="3">
     <widget class="QComboBox" name="comboSettings">
      <property name="enabled">
       <bool>true</bool>
@@ -559,7 +542,7 @@
      </item>
     </widget>
    </item>
-   <item row="4" column="8">
+   <item row="5" column="8">
     <widget class="QPushButton" name="btnSetThreshold">
      <property name="enabled">
       <bool>true</bool>
@@ -643,7 +626,130 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="2" colspan="3">
+   <item row="4" column="0">
+    <widget class="QLabel" name="lblGainMode">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>110</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>110</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <family>Cantarell</family>
+       <pointsize>10</pointsize>
+      </font>
+     </property>
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gain Mode of the detector&lt;/p&gt;&lt;p&gt;#gainmode#&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Fix G0 is to be used with utmost caution. Can damage the detector!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>Gain Mode:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="2" colspan="3">
+    <widget class="QSpinBox" name="spinThreshold">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>140</width>
+       <height>25</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>140</width>
+       <height>25</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <family>Cantarell</family>
+       <pointsize>10</pointsize>
+      </font>
+     </property>
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Threshold energy. The trim energy values need to be loaded first using &amp;quot;trimen&amp;quot;&lt;/p&gt;&lt;p&gt;#threshold#&lt;/p&gt;&lt;p&gt;#trimen#&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="keyboardTracking">
+      <bool>false</bool>
+     </property>
+     <property name="suffix">
+      <string> eV</string>
+     </property>
+     <property name="minimum">
+      <number>-100000</number>
+     </property>
+     <property name="maximum">
+      <number>100000</number>
+     </property>
+     <property name="singleStep">
+      <number>100</number>
+     </property>
+     <property name="value">
+      <number>-1</number>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="5">
+    <widget class="QSpinBox" name="spinThreshold2">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>140</width>
+       <height>25</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>140</width>
+       <height>25</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <family>Cantarell</family>
+       <pointsize>10</pointsize>
+      </font>
+     </property>
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Threshold energy of 2nd counter&lt;/p&gt;&lt;p&gt;#threshold#&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="keyboardTracking">
+      <bool>false</bool>
+     </property>
+     <property name="suffix">
+      <string> eV</string>
+     </property>
+     <property name="minimum">
+      <number>-100000</number>
+     </property>
+     <property name="maximum">
+      <number>100000</number>
+     </property>
+     <property name="singleStep">
+      <number>100</number>
+     </property>
+     <property name="value">
+      <number>-1</number>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="2" colspan="3">
     <widget class="QComboBox" name="comboGainMode">
      <property name="enabled">
       <bool>false</bool>
@@ -707,15 +813,21 @@
      </item>
     </widget>
    </item>
-   <item row="6" column="3">
-    <widget class="QCheckBox" name="chkCounter2">
+   <item row="5" column="6">
+    <widget class="QSpinBox" name="spinThreshold3">
      <property name="enabled">
       <bool>false</bool>
      </property>
+     <property name="minimumSize">
+      <size>
+       <width>140</width>
+       <height>25</height>
+      </size>
+     </property>
      <property name="maximumSize">
       <size>
-       <width>50</width>
-       <height>16777215</height>
+       <width>140</width>
+       <height>25</height>
       </size>
      </property>
      <property name="font">
@@ -725,31 +837,43 @@
       </font>
      </property>
      <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable 2nd counter&lt;/p&gt;&lt;p&gt;#counters#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Threshold energy of 3rd counter&lt;/p&gt;&lt;p&gt;#threshold#&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
-     <property name="text">
-      <string>2</string>
+     <property name="keyboardTracking">
+      <bool>false</bool>
      </property>
-     <property name="checked">
-      <bool>true</bool>
+     <property name="suffix">
+      <string> eV</string>
+     </property>
+     <property name="minimum">
+      <number>-100000</number>
+     </property>
+     <property name="maximum">
+      <number>100000</number>
+     </property>
+     <property name="singleStep">
+      <number>100</number>
+     </property>
+     <property name="value">
+      <number>-1</number>
      </property>
     </widget>
    </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="lblDynamicRange">
+   <item row="6" column="2" colspan="3">
+    <widget class="QComboBox" name="comboDynamicRange">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="minimumSize">
       <size>
-       <width>110</width>
-       <height>0</height>
+       <width>0</width>
+       <height>25</height>
       </size>
      </property>
      <property name="maximumSize">
       <size>
-       <width>110</width>
-       <height>16777215</height>
+       <width>140</width>
+       <height>25</height>
       </size>
      </property>
      <property name="font">
@@ -761,43 +885,34 @@
      <property name="toolTip">
       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dynamic Range of pixel/channel of detector&lt;/p&gt;&lt;p&gt;#dr#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
-     <property name="text">
-      <string>Dynamic Range:</string>
-     </property>
+     <item>
+      <property name="text">
+       <string>1.67772e+07</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>65535</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>4095</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>255</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>7</string>
+      </property>
+     </item>
     </widget>
    </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="lblSettings">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>110</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>110</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="font">
-      <font>
-       <family>Cantarell</family>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Settings of the detector. &lt;/p&gt;&lt;p&gt; #settings#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="text">
-      <string>Settings:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
+   <item row="3" column="1">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -813,8 +928,21 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="lblThreshold">
+   <item row="0" column="0">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="7" column="0">
+    <widget class="QLabel" name="lblCounter">
      <property name="enabled">
       <bool>false</bool>
      </property>
@@ -837,69 +965,30 @@
       </font>
      </property>
      <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Threshold energy. The trim energy values need to be loaded first using &amp;quot;trimen&amp;quot;&lt;/p&gt;&lt;p&gt;#threshold#&lt;/p&gt;&lt;p&gt;#trimen#&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable counters&lt;/p&gt;&lt;p&gt;#counters#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
-      <string>Threshold:</string>
+      <string>Counters:</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="lblGainMode">
-     <property name="enabled">
-      <bool>false</bool>
+   <item row="5" column="9">
+    <spacer name="horizontalSpacer_4">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
-     <property name="minimumSize">
+     <property name="sizeHint" stdset="0">
       <size>
-       <width>110</width>
-       <height>0</height>
+       <width>40</width>
+       <height>20</height>
       </size>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>110</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="font">
-      <font>
-       <family>Cantarell</family>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gain Mode of the detector&lt;/p&gt;&lt;p&gt;#gainmode#&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Fix G0 is to be used with utmost caution. Can damage the detector!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="text">
-      <string>Gain Mode:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="lblSpinHV">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="font">
-      <font>
-       <family>Cantarell</family>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;High Voltage. Range: 60 - 200V. Swich off high voltage by setting to 0.&lt;/p&gt;&lt;p&gt;-1 corresponds to different values from detectors.&lt;/p&gt;&lt;p&gt;#highvoltage#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="text">
-      <string>High Voltage: </string>
-     </property>
-    </widget>
+    </spacer>
    </item>
   </layout>
  </widget>
  <tabstops>
+  <tabstop>comboHV</tabstop>
   <tabstop>spinHV</tabstop>
   <tabstop>comboSettings</tabstop>
   <tabstop>comboGainMode</tabstop>

slsDetectorGui/include/qTabAdvanced.h

@@ -38,6 +38,9 @@ class qTabAdvanced : public QWidget, private Ui::TabAdvancedObject {
     void SetRxrUDPMAC(bool force = false);
     void ForceSetRxrUDPMAC();
     void SetRxrZMQPort(int port);
+    void GetROI();
+    void ClearROI();
+    void SetROI();
     void SetAllTrimbits();
     void SetNumStoragecells(int value);
     void SetSubExposureTime();

slsDetectorGui/src/qDetectorMain.cpp

@@ -192,6 +192,7 @@ void qDetectorMain::SetUpDetector(const std::string &config_file, int multiID) {
         actionLoadTrimbits->setEnabled(true);
         actionSaveTrimbits->setEnabled(true);
         break;
+    case slsDetectorDefs::GOTTHARD:
     case slsDetectorDefs::JUNGFRAU:
     case slsDetectorDefs::MOENCH:
     case slsDetectorDefs::GOTTHARD2:
@@ -404,12 +405,12 @@ void qDetectorMain::ExecuteUtilities(QAction *action) {
 
 void qDetectorMain::ExecuteHelp(QAction *action) {
     if (action == actionAbout) {
-        LOG(logDEBUG) << "About Common GUI for Jungfrau, Eiger, Mythen3, "
-                         "Gotthard2 and Moench detectors";
+        LOG(logINFO) << "About Common GUI for Jungfrau, Eiger, Mythen3, "
+                        "Gotthard, Gotthard2 and Moench detectors";
 
-        std::string packageVersion = "unknown";
+        std::string clientVersion = "unknown";
         try {
-            packageVersion = det->getPackageVersion();
+            clientVersion = det->getClientVersion();
         }
         CATCH_DISPLAY("Could not get client version.",
                       "qDetectorMain::ExecuteHelp")
@@ -418,12 +419,12 @@ void qDetectorMain::ExecuteHelp(QAction *action) {
             qDefs::INFORMATION,
             "<p style=\"font-family:verdana;\">"
 
-            "<b>SLS Detector Package:  v" +
-                packageVersion +
+            "<b>SLS Detector Client version:  " +
+                clientVersion +
                 "</b><br><br>"
 
                 "Common GUI to control the SLS Detectors: "
-                "Jungfrau, Eiger, Mythen3, Gotthard2 and "
+                "Jungfrau, Eiger, Mythen3, Gotthard, Gotthard2 and "
                 "Moench.<br><br>"
 
                 "It can be operated in parallel with the command "

slsDetectorGui/src/qDrawPlot.cpp

@@ -83,7 +83,9 @@ void qDrawPlot::SetupWidgetWindow() {
         fileSaveName = "Image";
     }
 
-    gotthard25 = (detType == slsDetectorDefs::GOTTHARD2 && det->size() == 2);
+    gotthard25 = ((detType == slsDetectorDefs::GOTTHARD2 ||
+                   detType == slsDetectorDefs::GOTTHARD) &&
+                  det->size() == 2);
 
     SetupPlots();
     SetDataCallBack(true);

slsDetectorGui/src/qTabAdvanced.cpp

@@ -28,6 +28,9 @@ void qTabAdvanced::SetupWidgetWindow() {
         spinSubDeadTime->setEnabled(true);
         comboSubDeadTimeUnit->setEnabled(true);
         break;
+    case slsDetectorDefs::GOTTHARD:
+        tab_roi->setEnabled(true);
+        break;
     case slsDetectorDefs::MYTHEN3:
         tab_trimming->setEnabled(true);
         lblDiscardBits->setEnabled(true);
@@ -111,6 +114,14 @@ void qTabAdvanced::Initialization() {
     connect(spinRxrZMQPort, SIGNAL(valueChanged(int)), this,
             SLOT(SetRxrZMQPort(int)));
 
+    // roi
+    if (tab_roi->isEnabled()) {
+        connect(comboReadout, SIGNAL(currentIndexChanged(int)), this,
+                SLOT(GetROI()));
+        connect(btnSetRoi, SIGNAL(clicked()), this, SLOT(SetROI()));
+        connect(btnClearRoi, SIGNAL(clicked()), this, SLOT(ClearROI()));
+    }
+
     // storage cells
     if (lblNumStoragecells->isEnabled()) {
         connect(spinNumStoragecells, SIGNAL(valueChanged(int)), this,
@@ -162,16 +173,23 @@ void qTabAdvanced::PopulateDetectors() {
     LOG(logDEBUG) << "Populating detectors";
     disconnect(comboDetector, SIGNAL(currentIndexChanged(int)), this,
                SLOT(SetDetector()));
+    disconnect(comboReadout, SIGNAL(currentIndexChanged(int)), this,
+               SLOT(GetROI()));
 
     comboDetector->clear();
+    comboReadout->clear();
     auto res = det->getHostname();
     for (auto &it : res) {
         comboDetector->addItem(QString(it.c_str()));
+        comboReadout->addItem(QString(it.c_str()));
     }
     comboDetector->setCurrentIndex(0);
+    comboReadout->setCurrentIndex(0);
 
     connect(comboDetector, SIGNAL(currentIndexChanged(int)), this,
             SLOT(SetDetector()));
+    connect(comboReadout, SIGNAL(currentIndexChanged(int)), this,
+            SLOT(GetROI()));
 }
 
 void qTabAdvanced::GetControlPort() {
@@ -552,6 +570,40 @@ void qTabAdvanced::SetRxrZMQPort(int port) {
                  &qTabAdvanced::GetRxrZMQPort)
 }
 
+void qTabAdvanced::GetROI() {
+    LOG(logDEBUG) << "Getting ROI";
+    try {
+        slsDetectorDefs::ROI roi =
+            det->getROI({comboReadout->currentIndex()})[0];
+        spinXmin->setValue(roi.xmin);
+        spinXmax->setValue(roi.xmax);
+    }
+    CATCH_DISPLAY("Could not get ROI.", "qTabAdvanced::GetROI")
+}
+
+void qTabAdvanced::ClearROI() {
+    LOG(logINFO) << "Clearing ROI";
+    spinXmin->setValue(-1);
+    spinXmax->setValue(-1);
+    SetROI();
+    LOG(logDEBUG) << "ROIs cleared";
+}
+
+void qTabAdvanced::SetROI() {
+
+    slsDetectorDefs::ROI roi(spinXmin->value(), spinXmax->value());
+
+    // set roi
+    LOG(logINFO) << "Setting ROI: [" << roi.xmin << ", " << roi.xmax << "]";
+    try {
+        det->setROI(roi, {comboReadout->currentIndex()});
+    }
+    CATCH_DISPLAY("Could not set these ROIs.", "qTabAdvanced::SetROI")
+
+    // update corrected list
+    GetROI();
+}
+
 void qTabAdvanced::GetAllTrimbits() {
     LOG(logDEBUG) << "Getting all trimbits value";
     disconnect(spinSetAllTrimbits, SIGNAL(valueChanged(int)), this,
@@ -779,6 +831,11 @@ void qTabAdvanced::Refresh() {
     // update all network widgets
     SetDetector();
 
+    // roi
+    if (tab_roi->isEnabled()) {
+        GetROI();
+    }
+
     // storage cells
     if (lblNumStoragecells->isEnabled()) {
         GetNumStoragecells();

slsDetectorGui/src/qTabDeveloper.cpp

@@ -34,6 +34,15 @@ void qTabDeveloper::SetupWidgetWindow() {
                     new qDacWidget(this, det, false, sls::ToString(it), it));
             }
             break;
+        case slsDetectorDefs::GOTTHARD:
+            ind = slsDetectorDefs::TEMPERATURE_ADC;
+            adcWidgets.push_back(
+                new qDacWidget(this, det, false, sls::ToString(ind), ind));
+            ind = slsDetectorDefs::TEMPERATURE_FPGA;
+            adcWidgets.push_back(
+                new qDacWidget(this, det, false, sls::ToString(ind), ind));
+            break;
+
         case slsDetectorDefs::JUNGFRAU:
             ind = slsDetectorDefs::TEMPERATURE_ADC;
             adcWidgets.push_back(

slsDetectorGui/src/qTabPlot.cpp

@@ -47,6 +47,7 @@ void qTabPlot::SetupWidgetWindow() {
     // enabling according to det type
     is1d = false;
     switch (det->getDetectorType().squash()) {
+    case slsDetectorDefs::GOTTHARD:
     case slsDetectorDefs::MYTHEN3:
         is1d = true;
         break;

slsDetectorGui/src/qTabSettings.cpp

@@ -18,6 +18,8 @@ qTabSettings::qTabSettings(QWidget *parent, Detector *detector)
 qTabSettings::~qTabSettings() {}
 
 void qTabSettings::SetupWidgetWindow() {
+    comboHV->hide();
+    lblComboHV->hide();
     lblSpinHV->hide();
     spinHV->hide();
     hvmin = HV_MIN;
@@ -98,6 +100,9 @@ void qTabSettings::SetupWidgetWindow() {
     } else if (detType == slsDetectorDefs::MOENCH) {
         lblSpinHV->show();
         spinHV->show();
+    } else if (detType == slsDetectorDefs::GOTTHARD) {
+        comboHV->show();
+        lblComboHV->show();
     } else if (detType == slsDetectorDefs::GOTTHARD2) {
         lblSpinHV->show();
         spinHV->show();
@@ -184,6 +189,8 @@ void qTabSettings::ShowFixG0(bool expertMode) {
 
 void qTabSettings::Initialization() {
     // High voltage
+    connect(comboHV, SIGNAL(currentIndexChanged(int)), this,
+            SLOT(SetHighVoltage()));
     connect(spinHV, SIGNAL(valueChanged(int)), this, SLOT(SetHighVoltage()));
 
     // Settings
@@ -224,10 +231,12 @@ void qTabSettings::Initialization() {
 
 void qTabSettings::GetHighVoltage() {
     // not enabled for eiger
-    if (!spinHV->isVisible())
+    if (!comboHV->isVisible() && !spinHV->isVisible())
         return;
     LOG(logDEBUG) << "Getting High Voltage";
     disconnect(spinHV, SIGNAL(valueChanged(int)), this, SLOT(SetHighVoltage()));
+    disconnect(comboHV, SIGNAL(currentIndexChanged(int)), this,
+               SLOT(SetHighVoltage()));
     try {
         Result<int> retvals = det->getHighVoltage();
 
@@ -249,19 +258,55 @@ void qTabSettings::GetHighVoltage() {
                 master_retvals.tsquash("Inconsistent values for high voltage.");
         }
 
-        if (retval != 0 && retval < hvmin && retval > HV_MAX) {
-            throw RuntimeError(std::string("Unknown High Voltage: ") +
-                               std::to_string(retval));
+        // spinHV
+        if (spinHV->isVisible()) {
+            if (retval != 0 && retval < hvmin && retval > HV_MAX) {
+                throw RuntimeError(std::string("Unknown High Voltage: ") +
+                                   std::to_string(retval));
+            }
+            spinHV->setValue(retval);
+        }
+        // combo HV
+        else {
+            switch (retval) {
+            case 0:
+                comboHV->setCurrentIndex(HV_0);
+                break;
+            case 90:
+                comboHV->setCurrentIndex(HV_90);
+                break;
+            case 110:
+                comboHV->setCurrentIndex(HV_110);
+                break;
+            case 120:
+                comboHV->setCurrentIndex(HV_120);
+                break;
+            case 150:
+                comboHV->setCurrentIndex(HV_150);
+                break;
+            case 180:
+                comboHV->setCurrentIndex(HV_180);
+                break;
+            case 200:
+                comboHV->setCurrentIndex(HV_200);
+                break;
+            default:
+                throw RuntimeError(std::string("Unknown High Voltage: ") +
+                                   std::to_string(retval));
+            }
         }
-        spinHV->setValue(retval);
     }
     CATCH_DISPLAY("Could not get high voltage.", "qTabSettings::GetHighVoltage")
     connect(spinHV, SIGNAL(valueChanged(int)), this, SLOT(SetHighVoltage()));
+    connect(comboHV, SIGNAL(currentIndexChanged(int)), this,
+            SLOT(SetHighVoltage()));
 }
 
 void qTabSettings::SetHighVoltage() {
-    int val = spinHV->value();
+    int val = (comboHV->isVisible() ? comboHV->currentText().toInt()
+                                    : spinHV->value());
     LOG(logINFO) << "Setting high voltage:" << val;
+
     try {
         det->setHighVoltage(val);
     }

slsDetectorServers/CMakeLists.txt

@@ -13,6 +13,7 @@ install(TARGETS slsProjectCSettings
 add_subdirectory(ctbDetectorServer)
 add_subdirectory(xilinx_ctbDetectorServer)
 add_subdirectory(eigerDetectorServer)
+add_subdirectory(gotthardDetectorServer)
 add_subdirectory(jungfrauDetectorServer)
 add_subdirectory(mythen3DetectorServer)
 add_subdirectory(gotthard2DetectorServer)

slsDetectorServers/compileAllServers.sh

@@ -1,16 +1,20 @@
 # SPDX-License-Identifier: LGPL-3.0-or-other
 # Copyright (C) 2021 Contributors to the SLS Detector Package
 
-# empty branch = developer branch in updateAPIVersion.sh
-branch=""
 det_list=("ctbDetectorServer  
+	gotthardDetectorServer  
 	gotthard2DetectorServer 
 	jungfrauDetectorServer 
 	mythen3DetectorServer 
 	moenchDetectorServer
-	xilinx_ctbDetectorServer" 
+	xilinx_ctbDetectorServer"
 	)
-usage="\nUsage: compileAllServers.sh [server|all(opt)] [branch(opt)]. \n\tNo arguments mean all servers with 'developer' branch. \n\tNo 'branch' input means 'developer branch'"
+usage="\nUsage: compileAllServers.sh [server|all(opt)] [update_api(opt)]. \n\tNo arguments mean all servers with 'developer' branch. \n\tupdate_api if true updates the api to version in VERSION file"
+
+update_api=true
+target=version
+
+
 
 # arguments
 if [ $# -eq 0 ]; then
@@ -34,15 +38,12 @@ elif [ $# -eq 1 ] || [ $# -eq 2 ]; then
 		declare -a det=("${1}")
 		#echo "Compiling only $1"
 	fi
-	# branch
+
 	if [ $# -eq 2 ]; then
-		# arg in list
-		if [[ $det_list == *$2* ]]; then
-			echo -e "Invalid argument 2: $2. $usage"
-			return 1
+		update_api=$2
+		if not $update_api ; then
+			target=clean
 		fi
-		branch+=$2
-		#echo "with branch $branch"
 	fi
 else
 	echo -e "Too many arguments.$usage"
@@ -53,6 +54,9 @@ declare -a deterror=("OK" "OK" "OK" "OK" "OK" "OK")
 
 echo -e "list is ${det[@]}"
 
+if $update_api; then
+	echo "updating api to $(cat ../VERSION)"
+fi
 # compile each server
 idet=0
 for i in ${det[@]}
@@ -62,14 +66,13 @@ do
 	echo -e "Compiling $dir [$file]"
 	cd $dir
 	make clean
-	if make version API_BRANCH=$branch; then
+	if make $target; then
 		deterror[$idet]="OK"
 	else
 		deterror[$idet]="FAIL"
 	fi
 	mv bin/$dir bin/$file
 	git add -f bin/$file
-	cp bin/$file /tftpboot/
 	cd ..
 	echo -e "\n\n"
 	((++idet))

slsDetectorServers/compileAllServers_noAPIUpdate.sh

@@ -1,86 +0,0 @@
-# SPDX-License-Identifier: LGPL-3.0-or-other
-# Copyright (C) 2021 Contributors to the SLS Detector Package
-
-# empty branch = developer branch in updateAPIVersion.sh
-branch=""
-det_list=("ctbDetectorServer" 
-	"gotthard2DetectorServer"
-	"jungfrauDetectorServer"
-	"mythen3DetectorServer"
-	"moenchDetectorServer"
-	"xilinx_ctbDetectorServer"
-	)
-usage="\nUsage: compileAllServers.sh [server|all(opt)] [branch(opt)]. \n\tNo arguments mean all servers with 'developer' branch. \n\tNo 'branch' input means 'developer branch'"
-
-# arguments
-if [ $# -eq 0 ]; then
-	# no argument, all servers
-	declare -a det=${det_list[@]}
-	echo "Compiling all servers"
-elif [ $# -eq 1 ] || [ $# -eq 2 ]; then
-	# 'all' servers
-	if [[ $1 == "all" ]]; then
-		declare -a det=${det_list[@]}
-		echo "Compiling all servers"
-	else
-		# only one server
-		# arg not in list
-		if [[ $det_list != *$1* ]]; then
-			echo -e "Invalid argument 1: $1. $usage"
-			return -1
-		fi
-		declare -a det=("${1}")
-		#echo "Compiling only $1"
-	fi
-	# branch
-	if [ $# -eq 2 ]; then
-		# arg in list
-		if [[ $det_list == *$2* ]]; then
-			echo -e "Invalid argument 2: $2. $usage"
-			return -1
-		fi
-		branch+=$2
-		#echo "with branch $branch"
-	fi
-else
-	echo -e "Too many arguments.$usage"
-	return -1
-fi
-
-declare -a deterror=("OK" "OK" "OK" "OK" "OK" "OK")
-
-echo -e "list is ${det[@]}"
-
-# compile each server
-idet=0
-for i in ${det[@]}
-do
-	dir=$i
-	file="${i}_developer"
-	echo -e "Compiling $dir [$file]"
-	cd $dir
-	make clean
-	if make API_BRANCH=$branch; then
-		deterror[$idet]="OK"
-	else
-		deterror[$idet]="FAIL"
-	fi
-	mv bin/$dir bin/$file
-	git add -f bin/$file
-	cp bin/$file /tftpboot/
-	cd ..
-	echo -e "\n\n"
-	((++idet))
-done
-
-echo -e "Results:"
-idet=0
-for i in ${det[@]}
-do
-	printf "%s\t\t= %s\n" "$i" "${deterror[$idet]}"
-	((++idet))
-done
-	
-
-
-

slsDetectorServers/compileEigerServer.sh

@@ -3,21 +3,31 @@
 deterror="OK"
 dir="eigerDetectorServer"
 file="${dir}_developer"
-branch=""
+
+usage="\nUsage: compileAllServers.sh [update_api(opt)]. \n\t update_api if true updates the api to version in VERSION file"
+
+update_api=true
+target=version
 
 # arguments
 if [ $# -eq 1 ]; then
-	branch+=$1
-	#echo "with branch $branch"
+	update_api=$1
+	if not $update_api ; then
+		target=clean
+		
+	fi
 elif [ ! $# -eq 0 ]; then
-	echo -e "Only one optional argument allowed for branch."
+	echo -e "Only one optional argument allowed for update_api."
 	return -1
 fi
 
+if $update_api; then
+	echo "updating api to $(cat ../VERSION)"
+fi
+
 echo -e "Compiling $dir [$file]"
 cd $dir
-make clean
-if make version API_BRANCH=$branch; then
+if make $target; then
 	deterror="OK"
 else
 	deterror="FAIL"
@@ -25,7 +35,6 @@ fi
 
 mv bin/$dir bin/$file
 git add -f bin/$file
-cp bin/$file /tftpboot/
 cd ..
 echo -e "\n\n"
 printf "Result:\t\t= %s\n"  "${deterror}"

slsDetectorServers/ctbDetectorServer/Makefile

@@ -25,11 +25,10 @@ version: clean versioning $(PROGS)
 
 boot: $(OBJS) 
 
-version_branch=$(API_BRANCH)
 version_name=APICTB
 version_path=slsDetectorServers/ctbDetectorServer
 versioning: 
-	cd ../../ && echo $(PWD) && echo `tput setaf 6; ./updateAPIVersion.sh $(version_name) $(version_path) $(version_branch);  tput sgr0;`
+	cd ../../ && echo $(PWD) && echo `tput setaf 6; python updateAPIVersion.py $(version_name) $(version_path);  tput sgr0;`
 
 
 $(PROGS): $(OBJS)

slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c

@@ -1095,17 +1095,26 @@ int setNumTransceiverSamples(int val) {
 int getNumTransceiverSamples() { return ntSamples; }
 
 int setExpTime(int64_t val) {
-    setPatternWaitInterval(0, val);
+    if (val < 0) {
+        LOG(logERROR, ("Invalid exptime: %lld ns\n", (long long int)val));
+        return FAIL;
+    }
+    LOG(logINFO, ("Setting exptime %lld ns\n", (long long int)val));
+    val *= (1E-3 * clkFrequency[RUN_CLK]);
+    setPatternWaitTime(0, val);
 
     // validate for tolerance
     int64_t retval = getExpTime();
+    val /= (1E-3 * clkFrequency[RUN_CLK]);
     if (val != retval) {
         return FAIL;
     }
     return OK;
 }
 
-int64_t getExpTime() { return getPatternWaitInterval(0); }
+int64_t getExpTime() {
+    return getPatternWaitTime(0) / (1E-3 * clkFrequency[RUN_CLK]);
+}
 
 int setPeriod(int64_t val) {
     if (val < 0) {

slsDetectorServers/eigerDetectorServer/Makefile

@@ -25,11 +25,10 @@ version: clean versioning $(PROGS) #hv9m_blackfin_server
 	
 boot: $(OBJS) 
 
-version_branch=$(API_BRANCH)
 version_name=APIEIGER
 version_path=slsDetectorServers/eigerDetectorServer
 versioning: 
-	cd ../../ && echo $(PWD) && echo `tput setaf 6; ./updateAPIVersion.sh $(version_name) $(version_path) $(version_branch);  tput sgr0;`
+	cd ../../ && echo $(PWD) && echo `tput setaf 6; python updateAPIVersion.py $(version_name) $(version_path);  tput sgr0;`
 
 
 $(PROGS):  $(OBJS)

slsDetectorServers/gotthard2DetectorServer/Makefile

@@ -24,11 +24,10 @@ version: clean versioning $(PROGS)
 
 boot: $(OBJS) 
 
-version_branch=$(API_BRANCH)
 version_name=APIGOTTHARD2
 version_path=slsDetectorServers/gotthard2DetectorServer
 versioning: 
-	cd ../../ && echo $(PWD) && echo `tput setaf 6; ./updateAPIVersion.sh $(version_name) $(version_path) $(version_branch);  tput sgr0;`
+	cd ../../ && echo $(PWD) && echo `tput setaf 6; python updateAPIVersion.py $(version_name) $(version_path);  tput sgr0;`
 
 
 $(PROGS): $(OBJS)

slsDetectorServers/gotthardDetectorServer/.target-makefrag

@@ -0,0 +1 @@
+AXIS_BUILDTYPE ?= cris-axis-linux-gnu

slsDetectorServers/gotthardDetectorServer/CMakeLists.txt

@@ -0,0 +1,45 @@
+# SPDX-License-Identifier: LGPL-3.0-or-other
+# Copyright (C) 2021 Contributors to the SLS Detector Package
+add_executable(gotthardDetectorServer_virtual
+    slsDetectorFunctionList.c
+    ../slsDetectorServer/src/slsDetectorServer.c
+    ../slsDetectorServer/src/slsDetectorServer_funcs.c
+    ../slsDetectorServer/src/communication_funcs.c
+    ../slsDetectorServer/src/blackfin.c
+    ../slsDetectorServer/src/AD9252.c
+    ../slsDetectorServer/src/AD9257.c  
+    ../slsDetectorServer/src/LTC2620.c         
+    ../slsDetectorServer/src/common.c
+    ../slsDetectorServer/src/commonServerFunctions.c    
+    ../slsDetectorServer/src/programViaBlackfin.c
+    ../slsDetectorServer/src/communication_funcs_UDP.c    
+    ../slsDetectorServer/src/sharedMemory.c
+    ../../slsSupportLib/src/md5.c
+)
+
+include_directories(
+    ../slsDetectorServer/include
+    ../../slsSupportLib/include
+)
+
+target_include_directories(gotthardDetectorServer_virtual
+    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_compile_definitions(gotthardDetectorServer_virtual
+    PUBLIC GOTTHARDD VIRTUAL STOP_SERVER
+)
+
+target_link_libraries(gotthardDetectorServer_virtual
+    PUBLIC pthread rt slsProjectCSettings
+) 
+
+set_target_properties(gotthardDetectorServer_virtual PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
+
+install(TARGETS gotthardDetectorServer_virtual
+    RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+
+configure_file(config_gotthard.txt ${CMAKE_BINARY_DIR}/bin/config_gotthard.txt COPYONLY)

slsDetectorServers/gotthardDetectorServer/Makefile

@@ -0,0 +1,48 @@
+# SPDX-License-Identifier: LGPL-3.0-or-other
+# Copyright (C) 2021 Contributors to the SLS Detector Package
+current_dir = $(shell pwd)
+main_inc = ../slsDetectorServer/include/
+main_src = ../slsDetectorServer/src/
+support_lib = ../../slsSupportLib/include/
+md5_dir = ../../slsSupportLib/src/
+
+CROSS  		= bfin-uclinux-
+CC    		= $(CROSS)gcc
+CFLAGS		+=  -Wall -std=gnu99 -DGOTTHARDD  -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir)  #-DVERBOSEI #-DVERBOSE 
+LDLIBS		+= 	-lm -lrt -pthread  
+PROGS		= 	gotthardDetectorServer 
+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)AD9252.c $(main_src)AD9257.c $(main_src)LTC2620.c $(main_src)programViaBlackfin.c $(main_src)common.c $(main_src)commonServerFunctions.c $(main_src)/sharedMemory.c $(md5_dir)md5.c
+OBJS 		= 	$(SRCS:.c=.o) 
+
+all: clean $(PROGS)
+version: clean versioning $(PROGS)
+
+boot: $(OBJS)
+
+version_branch=$(API_BRANCH)
+version_name=APIGOTTHARD
+version_path=slsDetectorServers/gotthardDetectorServer
+versioning: 
+	cd ../../ && echo $(PWD) && echo `tput setaf 6; python updateAPIVersion.py $(version_name) $(version_path);  tput sgr0;`
+
+	
+$(PROGS): $(OBJS) 
+#	echo $(OBJS)
+	mkdir -p $(DESTDIR) 
+	$(CC) -o $@ $^ $(CFLAGS)   $(LDLIBS)
+	mv $(PROGS) $(DESTDIR)
+	cp config_gotthard.txt $(DESTDIR)
+	rm *.gdb
+	rm $(main_src)*.o $(md5_dir)*.o
+
+clean:
+	rm -rf $(DESTDIR)/$(PROGS) *.o *.gdb $(main_src)*.o $(md5_dir)*.o
+
+
+
+
+

slsDetectorServers/gotthardDetectorServer/RegisterDefs.h

@@ -0,0 +1,394 @@
+// SPDX-License-Identifier: LGPL-3.0-or-other
+// Copyright (C) 2021 Contributors to the SLS Detector Package
+#pragma once
+
+/* Definitions for FPGA*/
+#define MEM_MAP_SHIFT (11)
+
+/** Gain register */
+#define GAIN_REG (0x10 << MEM_MAP_SHIFT)
+
+#define GAIN_CONFGAIN_OFST (0)
+#define GAIN_CONFGAIN_MSK  (0x000000FF << GAIN_CONFGAIN_OFST)
+#define GAIN_CONFGAIN_HGH_GAIN_VAL                                             \
+    ((0x0 << GAIN_CONFGAIN_OFST) & GAIN_CONFGAIN_MSK)
+#define GAIN_CONFGAIN_DYNMC_GAIN_VAL                                           \
+    ((0x8 << GAIN_CONFGAIN_OFST) & GAIN_CONFGAIN_MSK)
+#define GAIN_CONFGAIN_LW_GAIN_VAL                                              \
+    ((0x6 << GAIN_CONFGAIN_OFST) & GAIN_CONFGAIN_MSK)
+#define GAIN_CONFGAIN_MDM_GAIN_VAL                                             \
+    ((0x2 << GAIN_CONFGAIN_OFST) & GAIN_CONFGAIN_MSK)
+#define GAIN_CONFGAIN_VRY_HGH_GAIN_VAL                                         \
+    ((0x1 << GAIN_CONFGAIN_OFST) & GAIN_CONFGAIN_MSK)
+
+/** Flow Control register */
+// #define FLOW_CONTROL_REG                (0x11 << MEM_MAP_SHIFT)
+
+/** Flow Status register */
+// #define FLOW_STATUS_REG                 (0x12 << MEM_MAP_SHIFT)
+
+/** Frame register */
+// #define FRAME_REG                       (0x13 << MEM_MAP_SHIFT)
+
+/** Multi Purpose register */
+#define MULTI_PURPOSE_REG (0x14 << MEM_MAP_SHIFT)
+
+#define PHS_STP_OFST            (0)
+#define PHS_STP_MSK             (0x00000001 << PHS_STP_OFST)
+#define RST_CNTR_OFST           (2)
+#define RST_CNTR_MSK            (0x00000001 << RST_CNTR_OFST)
+#define SW1_OFST                (5)
+#define SW1_MSK                 (0x00000001 << SW1_OFST)
+#define WRT_BCK_OFST            (6)
+#define WRT_BCK_MSK             (0x00000001 << WRT_BCK_OFST)
+#define RST_OFST                (7)
+#define RST_MSK                 (0x00000001 << RST_OFST)
+#define PLL_CLK_SL_OFST         (8)
+#define PLL_CLK_SL_MSK          (0x00000007 << PLL_CLK_SL_OFST)
+#define PLL_CLK_SL_MSTR_VAL     ((0x1 << PLL_CLK_SL_OFST) & PLL_CLK_SL_MSK)
+#define PLL_CLK_SL_MSTR_ADC_VAL ((0x2 << PLL_CLK_SL_OFST) & PLL_CLK_SL_MSK)
+#define PLL_CLK_SL_SLV_VAL      ((0x3 << PLL_CLK_SL_OFST) & PLL_CLK_SL_MSK)
+#define PLL_CLK_SL_SLV_ADC_VAL  ((0x4 << PLL_CLK_SL_OFST) & PLL_CLK_SL_MSK)
+#define ENT_RSTN_OFST           (11)
+#define ENT_RSTN_MSK            (0x00000001 << ENT_RSTN_OFST)
+#define INT_RSTN_OFST           (12)
+#define INT_RSTN_MSK            (0x00000001 << INT_RSTN_OFST)
+#define DGTL_TST_OFST           (14)
+#define DGTL_TST_MSK            (0x00000001 << DGTL_TST_OFST)
+#define CHNG_AT_PWR_ON_OFST     (15) // Not used in SW
+#define CHNG_AT_PWR_ON_MSK      (0x00000001 << CHNG_AT_PWR_ON_OFST) // Not used in SW
+#define RST_TO_SW1_DLY_OFST     (16)
+#define RST_TO_SW1_DLY_MSK      (0x0000000F << RST_TO_SW1_DLY_OFST)
+#define STRT_ACQ_DLY_OFST       (20)
+#define STRT_ACQ_DLY_MSK        (0x0000000F << STRT_ACQ_DLY_OFST)
+
+/** DAQ register */
+#define DAQ_REG (0x15 << MEM_MAP_SHIFT)
+
+#define DAQ_TKN_TMNG_OFST (0)
+#define DAQ_TKN_TMNG_MSK  (0x0000FFFF << DAQ_TKN_TMNG_OFST)
+#define DAQ_TKN_TMNG_BRD_RVSN_1_VAL                                            \
+    ((0x1f16 << DAQ_TKN_TMNG_OFST) & DAQ_TKN_TMNG_MSK)
+#define DAQ_TKN_TMNG_BRD_RVSN_2_VAL                                            \
+    ((0x1f10 << DAQ_TKN_TMNG_OFST) & DAQ_TKN_TMNG_MSK)
+#define DAQ_PCKT_LNGTH_OFST (16)
+#define DAQ_PCKT_LNGTH_MSK  (0x0000FFFF << DAQ_PCKT_LNGTH_OFST)
+#define DAQ_PCKT_LNGTH_NO_ROI_VAL                                              \
+    ((0x0013f << DAQ_PCKT_LNGTH_OFST) & DAQ_PCKT_LNGTH_MSK)
+#define DAQ_PCKT_LNGTH_ROI_VAL                                                 \
+    ((0x0007f << DAQ_PCKT_LNGTH_OFST) & DAQ_PCKT_LNGTH_MSK)
+
+/** Time From Start register */
+// #define TIME_FROM_START_REG             (0x16 << MEM_MAP_SHIFT)
+
+/** DAC Control register */
+#define SPI_REG (0x17 << MEM_MAP_SHIFT)
+
+#define SPI_DAC_SRL_CS_OTPT_OFST   (0)
+#define SPI_DAC_SRL_CS_OTPT_MSK    (0x00000001 << SPI_DAC_SRL_CS_OTPT_OFST)
+#define SPI_DAC_SRL_CLK_OTPT_OFST  (1)
+#define SPI_DAC_SRL_CLK_OTPT_MSK   (0x00000001 << SPI_DAC_SRL_CLK_OTPT_OFST)
+#define SPI_DAC_SRL_DGTL_OTPT_OFST (2)
+#define SPI_DAC_SRL_DGTL_OTPT_MSK  (0x00000001 << SPI_DAC_SRL_DGTL_OTPT_OFST)
+
+/** ADC SPI register */
+#define ADC_SPI_REG (0x18 << MEM_MAP_SHIFT)
+
+#define ADC_SPI_SRL_CLK_OTPT_OFST (0)
+#define ADC_SPI_SRL_CLK_OTPT_MSK  (0x00000001 << ADC_SPI_SRL_CLK_OTPT_OFST)
+#define ADC_SPI_SRL_DT_OTPT_OFST  (1)
+#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   (0x0000001F << ADC_SPI_SRL_CS_OTPT_OFST)
+
+/** ADC Sync register */
+#define ADC_SYNC_REG (0x19 << MEM_MAP_SHIFT)
+
+#define ADC_SYNC_ENET_STRT_DLY_OFST (0)
+#define ADC_SYNC_ENET_STRT_DLY_MSK  (0x0000000F << ADC_SYNC_ENET_STRT_DLY_OFST)
+#define ADC_SYNC_ENET_STRT_DLY_VAL                                             \
+    ((0x4 << ADC_SYNC_ENET_STRT_DLY_OFST) & ADC_SYNC_ENET_STRT_DLY_MSK)
+#define ADC_SYNC_TKN1_HGH_DLY_OFST (4)
+#define ADC_SYNC_TKN1_HGH_DLY_MSK  (0x0000000F << ADC_SYNC_TKN1_HGH_DLY_OFST)
+#define ADC_SYNC_TKN1_HGH_DLY_VAL                                              \
+    ((0x1 << ADC_SYNC_TKN1_HGH_DLY_OFST) & ADC_SYNC_TKN1_HGH_DLY_MSK)
+#define ADC_SYNC_TKN2_HGH_DLY_OFST (8)
+#define ADC_SYNC_TKN2_HGH_DLY_MSK  (0x0000000F << ADC_SYNC_TKN2_HGH_DLY_OFST)
+#define ADC_SYNC_TKN2_HGH_DLY_VAL                                              \
+    ((0x2 << ADC_SYNC_TKN2_HGH_DLY_OFST) & ADC_SYNC_TKN2_HGH_DLY_MSK)
+#define ADC_SYNC_TKN1_LOW_DLY_OFST (12)
+#define ADC_SYNC_TKN1_LOW_DLY_MSK  (0x0000000F << ADC_SYNC_TKN1_LOW_DLY_OFST)
+#define ADC_SYNC_TKN1_LOW_DLY_VAL                                              \
+    ((0x2 << ADC_SYNC_TKN1_LOW_DLY_OFST) & ADC_SYNC_TKN1_LOW_DLY_MSK)
+#define ADC_SYNC_TKN2_LOW_DLY_OFST (16)
+#define ADC_SYNC_TKN2_LOW_DLY_MSK  (0x0000000F << ADC_SYNC_TKN2_LOW_DLY_OFST)
+#define ADC_SYNC_TKN2_LOW_DLY_VAL                                              \
+    ((0x3 << ADC_SYNC_TKN2_LOW_DLY_OFST) & ADC_SYNC_TKN2_LOW_DLY_MSK)
+// 0x32214
+#define ADC_SYNC_TKN_VAL                                                       \
+    (ADC_SYNC_ENET_STRT_DLY_VAL | ADC_SYNC_TKN1_HGH_DLY_VAL |                  \
+     ADC_SYNC_TKN2_HGH_DLY_VAL | ADC_SYNC_TKN1_LOW_DLY_VAL |                   \
+     ADC_SYNC_TKN2_LOW_DLY_VAL)
+#define ADC_SYNC_CLEAN_FIFOS_OFST (20)
+#define ADC_SYNC_CLEAN_FIFOS_MSK  (0x00000001 << ADC_SYNC_CLEAN_FIFOS_OFST)
+#define ADC_SYNC_ENET_DELAY_OFST  (24)
+#define ADC_SYNC_ENET_DELAY_MSK   (0x000000FF << ADC_SYNC_ENET_DELAY_OFST)
+#define ADC_SYNC_ENET_DELAY_NO_ROI_VAL                                         \
+    ((0x88 << ADC_SYNC_ENET_DELAY_OFST) & ADC_SYNC_ENET_DELAY_MSK)
+#define ADC_SYNC_ENET_DELAY_ROI_VAL                                            \
+    ((0x1b << ADC_SYNC_ENET_DELAY_OFST) & ADC_SYNC_ENET_DELAY_MSK)
+
+/** Time From Start register */
+// #define MU_TIME_REG                     (0x1a << MEM_MAP_SHIFT)
+
+/** Temperatre SPI In register */
+#define TEMP_SPI_IN_REG (0x1b << MEM_MAP_SHIFT)
+
+#define TEMP_SPI_IN_T1_CLK_OFST (0)
+#define TEMP_SPI_IN_T1_CLK_MSK  (0x00000001 << TEMP_SPI_IN_T1_CLK_OFST)
+#define TEMP_SPI_IN_T1_CS_OFST  (1)
+#define TEMP_SPI_IN_T1_CS_MSK   (0x00000001 << TEMP_SPI_IN_T1_CS_OFST)
+#define TEMP_SPI_IN_T2_CLK_OFST (2)
+#define TEMP_SPI_IN_T2_CLK_MSK  (0x00000001 << TEMP_SPI_IN_T2_CLK_OFST)
+#define TEMP_SPI_IN_T2_CS_OFST  (3)
+#define TEMP_SPI_IN_T2_CS_MSK   (0x00000001 << TEMP_SPI_IN_T2_CS_OFST)
+#define TEMP_SPI_IN_IDLE_MSK                                                   \
+    (TEMP_SPI_IN_T1_CS_MSK | TEMP_SPI_IN_T2_CS_MSK | TEMP_SPI_IN_T1_CLK_MSK |  \
+     TEMP_SPI_IN_T2_CLK_MSK)
+
+/** Temperatre SPI Out register */
+#define TEMP_SPI_OUT_REG (0x1c << MEM_MAP_SHIFT)
+
+#define TEMP_SPI_OUT_T1_DT_OFST (0)
+#define TEMP_SPI_OUT_T1_DT_MSK  (0x00000001 << TEMP_SPI_OUT_T1_DT_OFST)
+#define TEMP_SPI_OUT_T2_DT_OFST (1)
+#define TEMP_SPI_OUT_T2_DT_MSK  (0x00000001 << TEMP_SPI_OUT_T2_DT_OFST)
+
+/** TSE Configure register */
+#define TSE_CONF_REG (0x1d << MEM_MAP_SHIFT)
+
+/** SPI Configure register */
+#define ENET_CONF_REG (0x1e << MEM_MAP_SHIFT)
+
+/** Write TSE Shadow register */
+// #define WRITE_TSE_SHADOW_REG            (0x1f << MEM_MAP_SHIFT)
+
+/** High Voltage register */
+#define HV_REG (0x20 << MEM_MAP_SHIFT)
+
+#define HV_ENBL_OFST   (0)
+#define HV_ENBL_MSK    (0x00000001 << HV_ENBL_OFST)
+#define HV_SEL_OFST    (1)
+#define HV_SEL_MSK     (0x00000007 << HV_SEL_OFST)
+#define HV_SEL_90_VAL  ((0x0 << HV_SEL_OFST) & HV_SEL_MSK)
+#define HV_SEL_110_VAL ((0x1 << HV_SEL_OFST) & HV_SEL_MSK)
+#define HV_SEL_120_VAL ((0x2 << HV_SEL_OFST) & HV_SEL_MSK)
+#define HV_SEL_150_VAL ((0x3 << HV_SEL_OFST) & HV_SEL_MSK)
+#define HV_SEL_180_VAL ((0x4 << HV_SEL_OFST) & HV_SEL_MSK)
+#define HV_SEL_200_VAL ((0x5 << HV_SEL_OFST) & HV_SEL_MSK)
+
+/** Dummy register */
+#define DUMMY_REG (0x21 << MEM_MAP_SHIFT)
+
+/** Firmware Version register */
+#define FPGA_VERSION_REG (0x22 << MEM_MAP_SHIFT)
+
+#define FPGA_VERSION_OFST (0)
+#define FPGA_VERSION_MSK                                                       \
+    (0x00FFFFFF << FPGA_VERSION_OFST) // to get in format yymmdd
+
+/* Fix Pattern register */
+#define FIX_PATT_REG (0x23 << MEM_MAP_SHIFT)
+
+#define FIX_PATT_VAL (0xACDC1980)
+
+/** 16 bit Control register */
+#define CONTROL_REG (0x24 << MEM_MAP_SHIFT)
+
+#define CONTROL_STRT_ACQ_OFST    (0)
+#define CONTROL_STRT_ACQ_MSK     (0x00000001 << CONTROL_STRT_ACQ_OFST)
+#define CONTROL_STP_ACQ_OFST     (1)
+#define CONTROL_STP_ACQ_MSK      (0x00000001 << CONTROL_STP_ACQ_OFST)
+#define CONTROL_STRT_FF_TST_OFST (2) // Not used in FW & SW
+#define CONTROL_STRT_FF_TST_MSK  (0x00000001 << CONTROL_STRT_FF_TST_OFST)
+#define CONTROL_STP_FF_TST_OFST  (3) // Not used in FW & SW
+#define CONTROL_STP_FF_TST_MSK   (0x00000001 << CONTROL_STP_FF_TST_OFST)
+#define CONTROL_STRT_RDT_OFST    (4)
+#define CONTROL_STRT_RDT_MSK     (0x00000001 << CONTROL_STRT_RDT_OFST)
+#define CONTROL_STP_RDT_OFST     (5)
+#define CONTROL_STP_RDT_MSK      (0x00000001 << CONTROL_STP_RDT_OFST)
+#define CONTROL_STRT_EXPSR_OFST  (6)
+#define CONTROL_STRT_EXPSR_MSK   (0x00000001 << CONTROL_STRT_EXPSR_OFST)
+#define CONTROL_STP_EXPSR_OFST   (7)
+#define CONTROL_STP_EXPSR_MSK    (0x00000001 << CONTROL_STP_EXPSR_OFST)
+#define CONTROL_STRT_TRN_OFST    (8)
+#define CONTROL_STRT_TRN_MSK     (0x00000001 << CONTROL_STRT_TRN_OFST)
+#define CONTROL_STP_TRN_OFST     (9)
+#define CONTROL_STP_TRN_MSK      (0x00000001 << CONTROL_STP_TRN_OFST)
+#define CONTROL_SYNC_RST_OFST    (10)
+#define CONTROL_SYNC_RST_MSK     (0x00000001 << CONTROL_SYNC_RST_OFST)
+
+/** Status register */
+#define STATUS_REG (0x25 << MEM_MAP_SHIFT)
+
+#define STATUS_RN_BSY_OFST        (0)
+#define STATUS_RN_BSY_MSK         (0x00000001 << STATUS_RN_BSY_OFST)
+#define STATUS_RDT_BSY_OFST       (1)
+#define STATUS_RDT_BSY_MSK        (0x00000001 << STATUS_RDT_BSY_OFST)
+#define STATUS_WTNG_FR_TRGGR_OFST (3)
+#define STATUS_WTNG_FR_TRGGR_MSK  (0x00000001 << STATUS_WTNG_FR_TRGGR_OFST)
+#define STATUS_DLY_BFR_OFST       (4)
+#define STATUS_DLY_BFR_MSK        (0x00000001 << STATUS_DLY_BFR_OFST)
+#define STATUS_DLY_AFTR_OFST      (5)
+#define STATUS_DLY_AFTR_MSK       (0x00000001 << STATUS_DLY_AFTR_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_RD_STT_OFST        (8)
+#define STATUS_RD_STT_MSK         (0x00000007 << STATUS_RD_STT_OFST)
+#define STATUS_RN_STT_OFST        (12)
+#define STATUS_RN_STT_MSK         (0x00000007 << STATUS_RN_STT_OFST)
+#define STATUS_SM_FF_FLL_OFST     (15)
+#define STATUS_SM_FF_FLL_MSK      (0x00000001 << STATUS_SM_FF_FLL_OFST)
+#define STATUS_ALL_FF_EMPTY_OFST  (11)
+#define STATUS_ALL_FF_EMPTY_MSK   (0x00000001 << STATUS_ALL_FF_EMPTY_OFST)
+#define STATUS_RN_MSHN_BSY_OFST   (17)
+#define STATUS_RN_MSHN_BSY_MSK    (0x00000001 << STATUS_RN_MSHN_BSY_OFST)
+#define STATUS_RD_MSHN_BSY_OFST   (18)
+#define STATUS_RD_MSHN_BSY_MSK    (0x00000001 << STATUS_RD_MSHN_BSY_OFST)
+#define STATUS_RN_FNSHD_OFST      (20)
+#define STATUS_RN_FNSHD_MSK       (0x00000001 << STATUS_RN_FNSHD_OFST)
+#define STATUS_IDLE_MSK           (0x0000FFFF << 0)
+
+/** Config register */
+#define CONFIG_REG (0x26 << MEM_MAP_SHIFT)
+
+#define CONFIG_SLAVE_OFST       (0) // Not used in FW & SW
+#define CONFIG_SLAVE_MSK        (0x00000001 << CONFIG_SLAVE_OFST)
+#define CONFIG_MASTER_OFST      (1) // Not used in FW & SW
+#define CONFIG_MASTER_MSK       (0x00000001 << CONFIG_MASTER_OFST)
+#define CONFIG_TM_GT_ENBL_OFST  (2) // Not used in FW & SW
+#define CONFIG_TM_GT_ENBL_MSK   (0x00000001 << CONFIG_TM_GT_ENBL_OFST)
+#define CONFIG_CPU_RDT_OFST     (12)
+#define CONFIG_CPU_RDT_MSK      (0x00000001 << CONFIG_CPU_RDT_OFST)
+#define CONFIG_CNTNS_RDT_OFST   (23) // Not used in FW & SW
+#define CONFIG_CNTNS_RDT_MSK    (0x00000001 << CONFIG_CNTNS_RDT_OFST)
+#define CONFIG_ACCMLT_CNTS_OFST (24) // Not used in FW & SW
+#define CONFIG_ACCMLT_CNTS_MSK  (0x00000001 << CONFIG_ACCMLT_CNTS_OFST)
+
+/** External Signal register */
+#define EXT_SIGNAL_REG (0x27 << MEM_MAP_SHIFT)
+
+#define EXT_SIGNAL_OFST              (0)
+#define EXT_SIGNAL_MSK               (0x00000007 << EXT_SIGNAL_OFST)
+#define EXT_SIGNAL_OFF_VAL           ((0x0 << EXT_SIGNAL_OFST) & EXT_SIGNAL_MSK)
+#define EXT_SIGNAL_TRGGR_IN_RSNG_VAL ((0x3 << EXT_SIGNAL_OFST) & EXT_SIGNAL_MSK)
+#define EXT_SIGNAL_TRGGR_IN_FLLNG_VAL                                          \
+    ((0x4 << EXT_SIGNAL_OFST) & EXT_SIGNAL_MSK)
+
+/** Look at me register */
+// #define LOOK_AT_ME_REG                  (0x28 << MEM_MAP_SHIFT)
+
+/** FPGA SVN register */
+// #define FPGA_SVN_REG                    (0x29 << MEM_MAP_SHIFT)
+
+/** Chip of Interest register */
+#define CHIP_OF_INTRST_REG (0x2a << MEM_MAP_SHIFT)
+
+#define CHIP_OF_INTRST_ADC_SEL_OFST    (0)
+#define CHIP_OF_INTRST_ADC_SEL_MSK     (0x0000001F << CHIP_OF_INTRST_ADC_SEL_OFST)
+#define CHIP_OF_INTRST_NUM_CHNNLS_OFST (16)
+#define CHIP_OF_INTRST_NUM_CHNNLS_MSK                                          \
+    (0x0000FFFF << CHIP_OF_INTRST_NUM_CHNNLS_OFST)
+
+/** Out MUX register */
+// #define OUT_MUX_REG                     (0x2b << MEM_MAP_SHIFT)
+
+/** Board Version register */
+#define BOARD_REVISION_REG (0x2c << MEM_MAP_SHIFT)
+
+#define BOARD_REVISION_OFST (0)
+#define BOARD_REVISION_MSK  (0x0000FFFF << BOARD_REVISION_OFST)
+#define DETECTOR_TYPE_OFST  (16)
+#define DETECTOR_TYPE_MSK   (0x0000000F << DETECTOR_TYPE_OFST)
+// #define DETECTOR_TYPE_GOTTHARD_VAL          (??)
+#define DETECTOR_TYPE_MOENCH_VAL (2)
+
+/** Memory Test register */
+// #define MEMORY_TEST_REG                 (0x2d << MEM_MAP_SHIFT)
+
+/** Hit Threshold register */
+// #define HIT_THRESHOLD_REG               (0x2e << MEM_MAP_SHIFT)
+
+/** Hit Count register */
+// #define HIT_COUNT_REG                   (0x2f << MEM_MAP_SHIFT)
+
+/* 16 bit Fifo Data register */
+#define FIFO_DATA_REG (0x50 << MEM_MAP_SHIFT) // Not used in FW and SW (16bit)
+
+/** Dacs Set 1 register */
+// #define DACS_SET_1_REG                  (0x65 << MEM_MAP_SHIFT)
+
+/** Dacs Set 2 register */
+// #define DACS_SET_2_REG                  (0x66 << MEM_MAP_SHIFT)
+
+/** Dacs Set 3 register */
+// #define DACS_SET_3_REG                  (0x67 << MEM_MAP_SHIFT)
+
+/* Set Delay 64 bit register */
+#define SET_DELAY_LSB_REG (0x68 << MEM_MAP_SHIFT)
+#define SET_DELAY_MSB_REG (0x69 << MEM_MAP_SHIFT)
+
+/* Get Delay 64 bit register */
+#define GET_DELAY_LSB_REG (0x6a << MEM_MAP_SHIFT)
+#define GET_DELAY_MSB_REG (0x6b << MEM_MAP_SHIFT)
+
+/* Set Triggers 64 bit register */
+#define SET_TRAINS_LSB_REG (0x6c << MEM_MAP_SHIFT)
+#define SET_TRAINS_MSB_REG (0x6d << MEM_MAP_SHIFT)
+
+/* Get Triggers 64 bit register */
+#define GET_TRAINS_LSB_REG (0x6e << MEM_MAP_SHIFT)
+#define GET_TRAINS_MSB_REG (0x6f << MEM_MAP_SHIFT)
+
+/* Set Frames 64 bit register */
+#define SET_FRAMES_LSB_REG (0x70 << MEM_MAP_SHIFT)
+#define SET_FRAMES_MSB_REG (0x71 << MEM_MAP_SHIFT)
+
+/* Get Frames 64 bit register */
+#define GET_FRAMES_LSB_REG (0x72 << MEM_MAP_SHIFT)
+#define GET_FRAMES_MSB_REG (0x73 << MEM_MAP_SHIFT)
+
+/* Set Period 64 bit register */
+#define SET_PERIOD_LSB_REG (0x74 << MEM_MAP_SHIFT)
+#define SET_PERIOD_MSB_REG (0x75 << MEM_MAP_SHIFT)
+
+/* Get Period 64 bit register */
+#define GET_PERIOD_LSB_REG (0x76 << MEM_MAP_SHIFT)
+#define GET_PERIOD_MSB_REG (0x77 << MEM_MAP_SHIFT)
+
+/* Set Exptime 64 bit register */
+#define SET_EXPTIME_LSB_REG (0x78 << MEM_MAP_SHIFT)
+#define SET_EXPTIME_MSB_REG (0x79 << MEM_MAP_SHIFT)
+
+/* Get Exptime 64 bit register */
+#define GET_EXPTIME_LSB_REG (0x7a << MEM_MAP_SHIFT)
+#define GET_EXPTIME_MSB_REG (0x7b << MEM_MAP_SHIFT)
+
+/* Set Gates 64 bit register */
+// #define SET_GATES_LSB_REG               (0x7c << MEM_MAP_SHIFT)
+// #define SET_GATES_MSB_REG               (0x7d << MEM_MAP_SHIFT)
+
+/* Set Gates 64 bit register */
+// #define GET_GATES_LSB_REG               (0x7e << MEM_MAP_SHIFT)
+// #define GET_GATES_MSB_REG               (0x7f << MEM_MAP_SHIFT)
+
+/* Dark Image starting address */
+#define DARK_IMAGE_REG (0x81 << MEM_MAP_SHIFT)
+
+/* Gain Image starting address */
+#define GAIN_IMAGE_REG (0x82 << MEM_MAP_SHIFT)
+
+/* Counter Block Memory starting address */
+#define COUNTER_MEMORY_REG (0x85 << MEM_MAP_SHIFT)

slsDetectorServers/gotthardDetectorServer/bin/config_gotthard.txt

@@ -0,0 +1,23 @@
+#masterflags (no_master, is_master, is_slave)
+masterflags no_master
+
+#master default delay 
+masterdefaultdelay 70
+
+#patternphase 
+patternphase 0
+
+#adcphase 
+adcphase 0
+
+#slave pattern phase
+slavepatternphase 0
+
+#slave adc phase 
+slaveadcphase 0
+
+#rst to sw1 delay
+rsttosw1delay 2
+
+#start acquisition delay
+startacqdelay 1

slsDetectorServers/gotthardDetectorServer/config_gotthard.txt

@@ -0,0 +1,23 @@
+#masterflags (no_master, is_master, is_slave)
+masterflags no_master
+
+#master default delay 
+masterdefaultdelay 70
+
+#patternphase 
+patternphase 0
+
+#adcphase 
+adcphase 0
+
+#slave pattern phase
+slavepatternphase 0
+
+#slave adc phase 
+slaveadcphase 0
+
+#rst to sw1 delay
+rsttosw1delay 2
+
+#start acquisition delay
+startacqdelay 1

slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h

@@ -0,0 +1,159 @@
+// SPDX-License-Identifier: LGPL-3.0-or-other
+// Copyright (C) 2021 Contributors to the SLS Detector Package
+#pragma once
+#include "sls/sls_detector_defs.h"
+#include <stdlib.h>
+
+#define NUM_HARDWARE_VERSIONS (2)
+#define HARDWARE_VERSION_NUMBERS                                               \
+    { 0x1, 0x2 }
+#define HARDWARE_VERSION_NAMES                                                 \
+    { "1.0", "2.0" }
+
+#define LINKED_SERVER_NAME "gotthardDetectorServer"
+
+#ifdef VIRTUAL
+#define CTRL_SRVR_INIT_TIME_US (2 * 1000 * 1000)
+#else
+#define CTRL_SRVR_INIT_TIME_US (300 * 1000)
+#endif
+
+/* Enums */
+enum ADCINDEX { TEMP_FPGA, TEMP_ADC };
+enum DACINDEX {
+    G_VREF_DS,
+    G_VCASCN_PB,
+    G_VCASCP_PB,
+    G_VOUT_CM,
+    G_VCASC_OUT,
+    G_VIN_CM,
+    G_VREF_COMP,
+    G_IB_TESTC
+};
+enum CLKINDEX { ADC_CLK, NUM_CLOCKS };
+#define CLK_NAMES "adc"
+
+#define DAC_NAMES                                                              \
+    "vref_ds", "vcascn_pb", "vcascp_pb", "vout_cm", "vcasc_out", "vin_cm",     \
+        "vref_comp", "ib_testc"
+
+#define DEFAULT_DAC_VALS                                                       \
+    {                                                                          \
+        660,  /* G_VREF_DS */                                                  \
+        650,  /* G_VCASCN_PB */                                                \
+        1480, /* G_VCASCP_PB */                                                \
+        1520, /* G_VOUT_CM */                                                  \
+        1320, /* G_VCASC_OUT */                                                \
+        1350, /* G_VIN_CM */                                                   \
+        350,  /* G_VREF_COMP */                                                \
+        2001  /* G_IB_TESTC */                                                 \
+    };
+
+/* for 25 um */
+#define CONFIG_FILE "config_gotthard.txt"
+
+/* Hardware Definitions */
+#define NCHAN              (128)
+#define NCHIP              (10)
+#define NDAC               (8)
+#define NCHIPS_PER_ADC     (2)
+#define NCHAN_PER_ADC      (256)
+#define DYNAMIC_RANGE      (16)
+#define NUM_BITS_PER_PIXEL (DYNAMIC_RANGE / 8)
+#define DATA_BYTES         (NCHIP * NCHAN * NUM_BITS_PER_PIXEL)
+#define CLK_FREQ           (32007729) // Hz
+#define MAX_EXT_SIGNALS    (1)
+
+/** Firmware Definitions */
+#define IP_PACKET_SIZE_NO_ROI                                                  \
+    (NCHIP * (NCHAN / 2) * 2 + 14 + 20) // 2 packets, so divide by 2
+#define IP_PACKET_SIZE_ROI (NCHIPS_PER_ADC * NCHAN * 2 + 14 + 20)
+
+#define UDP_PACKETSIZE_NO_ROI                                                  \
+    (NCHIP * (NCHAN / 2) * 2 + 4 + 8 + 2) // 2 packets, so divide by 2
+#define UDP_PACKETSIZE_ROI (NCHIPS_PER_ADC * NCHAN * 2 + 4 + 8 + 2)
+
+/** Default Parameters */
+#define DEFAULT_NUM_FRAMES   (1)
+#define DEFAULT_NUM_CYCLES   (1)
+#define DEFAULT_EXPTIME      (1 * 1000 * 1000)        // 1 ms
+#define DEFAULT_PERIOD       (1 * 1000 * 1000 * 1000) // 1 s
+#define DEFAULT_DELAY        (0)
+#define DEFAULT_SETTINGS     (DYNAMICGAIN)
+#define DEFAULT_TIMING_MODE  (AUTO_TIMING)
+#define DEFAULT_TRIGGER_MODE (TRIGGER_IN_RISING_EDGE)
+#define DEFAULT_HIGH_VOLTAGE (0)
+#define DEFAULT_PHASE_SHIFT  (120)
+#define DEFAULT_TX_UDP_PORT  (0xE185)
+
+#define DAC_MIN_MV (0)
+#define DAC_MAX_MV (2500)
+
+/** ENEt conf structs */
+typedef struct mac_header_struct {
+    u_int8_t mac_dest_mac2;
+    u_int8_t mac_dest_mac1;
+    u_int8_t mac_dummy1;
+    u_int8_t mac_dummy2;
+    u_int8_t mac_dest_mac6;
+    u_int8_t mac_dest_mac5;
+    u_int8_t mac_dest_mac4;
+    u_int8_t mac_dest_mac3;
+    u_int8_t mac_src_mac4;
+    u_int8_t mac_src_mac3;
+    u_int8_t mac_src_mac2;
+    u_int8_t mac_src_mac1;
+    u_int16_t mac_ether_type;
+    u_int8_t mac_src_mac6;
+    u_int8_t mac_src_mac5;
+} mac_header;
+
+typedef struct ip_header_struct {
+    u_int16_t ip_len;
+    u_int8_t ip_tos;
+    u_int8_t ip_ihl : 4, ip_ver : 4;
+    u_int16_t ip_offset : 13, ip_flag : 3;
+    u_int16_t ip_ident;
+    u_int16_t ip_chksum;
+    u_int8_t ip_protocol;
+    u_int8_t ip_ttl;
+    u_int32_t ip_sourceip;
+    u_int32_t ip_destip;
+} ip_header;
+
+typedef struct udp_header_struct {
+    u_int16_t udp_destport;
+    u_int16_t udp_srcport;
+    u_int16_t udp_chksum;
+    u_int16_t udp_len;
+} udp_header;
+
+typedef struct mac_conf_struct {
+    mac_header mac;
+    ip_header ip;
+    udp_header udp;
+    u_int32_t npack;
+    u_int32_t lpack;
+    u_int32_t npad;
+    u_int32_t cdone;
+} mac_conf;
+
+typedef struct tse_conf_struct {
+    u_int32_t rev; // 0x0
+    u_int32_t scratch;
+    u_int32_t command_config;
+    u_int32_t mac_0; // 0x3
+    u_int32_t mac_1;
+    u_int32_t frm_length;
+    u_int32_t pause_quant;
+    u_int32_t rx_section_empty; // 0x7
+    u_int32_t rx_section_full;
+    u_int32_t tx_section_empty;
+    u_int32_t tx_section_full;
+    u_int32_t rx_almost_empty; // 0xB
+    u_int32_t rx_almost_full;
+    u_int32_t tx_almost_empty;
+    u_int32_t tx_almost_full;
+    u_int32_t mdio_addr0; // 0xF
+    u_int32_t mdio_addr1;
+} tse_conf;

slsDetectorServers/jungfrauDetectorServer/Makefile

@@ -24,11 +24,10 @@ version: clean versioning $(PROGS)
 
 boot: $(OBJS) 
 
-version_branch=$(API_BRANCH)
 version_name=APIJUNGFRAU
 version_path=slsDetectorServers/jungfrauDetectorServer
 versioning: 
-	cd ../../ && echo $(PWD) && echo `tput setaf 6; ./updateAPIVersion.sh $(version_name) $(version_path) $(version_branch);  tput sgr0;`
+	cd ../../ && echo $(PWD) && echo `tput setaf 6; python updateAPIVersion.py $(version_name) $(version_path);  tput sgr0;`
 
 
 $(PROGS): $(OBJS)

slsDetectorServers/moenchDetectorServer/Makefile

@@ -24,11 +24,10 @@ version: clean versioning $(PROGS)
 
 boot: $(OBJS) 
 
-version_branch=$(API_BRANCH)
 version_name=APIMOENCH
 version_path=slsDetectorServers/moenchDetectorServer
 versioning: 
-	cd ../../ && echo $(PWD) && echo `tput setaf 6; ./updateAPIVersion.sh $(version_name) $(version_path) $(version_branch);  tput sgr0;`
+	cd ../../ && echo $(PWD) && echo `tput setaf 6; python updateAPIVersion.py $(version_name) $(version_path);  tput sgr0;`
 
 
 $(PROGS): $(OBJS)

slsDetectorServers/mythen3DetectorServer/Makefile

@@ -25,11 +25,10 @@ version: clean versioning $(PROGS)
 
 boot: $(OBJS) 
 
-version_branch=$(API_BRANCH)
 version_name=APIMYTHEN3
 version_path=slsDetectorServers/mythen3DetectorServer
 versioning: 
-	cd ../../ && echo $(PWD) && echo `tput setaf 6; ./updateAPIVersion.sh $(version_name) $(version_path) $(version_branch);  tput sgr0;`
+	cd ../../ && echo $(PWD) && echo `tput setaf 6; python updateAPIVersion.py $(version_name) $(version_path);  tput sgr0;`
 
 
 $(PROGS): $(OBJS)