fix the master hdf5 file for m3. it used to fail because it could not set exptiem and gate delay arrays

* added numpy dependency
* added build specifications for python version and platform

.gitea/workflows/rh8-native.yml

@@ -0,0 +1,29 @@
+name: Build on RHEL8
+
+on:
+  push:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: "ubuntu-latest"
+    container:
+      image: gitea.psi.ch/detectors/rhel8-detectors-dev
+    steps:
+      - name: Clone repository
+        run: |
+          echo Cloning ${{ github.ref_name }}
+          git clone https://${{secrets.GITHUB_TOKEN}}@gitea.psi.ch/${{ github.repository }}.git --branch=${{ github.ref_name }} .
+
+      - name: Build library 
+        run: |
+            mkdir build && cd build
+            cmake .. -DSLS_USE_PYTHON=ON -DSLS_USE_TESTS=ON 
+            make -j 2 
+
+      - name: C++ unit tests
+        working-directory: ${{gitea.workspace}}/build
+        run: ctest

.gitea/workflows/rh9-native.yml

@@ -0,0 +1,27 @@
+name: Build on RHEL9
+
+on:
+  push:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: "ubuntu-latest"
+    container:
+      image: gitea.psi.ch/detectors/rhel9-detectors-dev
+    steps:
+      - uses: actions/checkout@v4
+
+
+      - name: Build library 
+        run: |
+            mkdir build && cd build
+            cmake .. -DSLS_USE_PYTHON=ON -DSLS_USE_TESTS=ON
+            make -j 2 
+
+      - name: C++ unit tests
+        working-directory: ${{gitea.workspace}}/build
+        run: ctest

CMakeLists.txt

@@ -21,6 +21,7 @@ if (${CMAKE_VERSION} VERSION_GREATER "3.24")
 endif()
 include(cmake/project_version.cmake)
 include(cmake/SlsAddFlag.cmake)
+include(cmake/helpers.cmake)
 
 
 
@@ -44,6 +45,10 @@ endif()
 # Patch is applied in the FetchContent_Declare
 set(SLS_LIBZMQ_VERSION "4.3.4")
 
+find_program(PATCH_EXECUTABLE patch)
+if(NOT PATCH_EXECUTABLE)
+    message(FATAL_ERROR "The 'patch' tool is required for patching lib zeromq. Please install it.")
+endif()
 
 if(SLS_FETCH_ZMQ_FROM_GITHUB)
     # Opt in to pull down a zmq version from github instead of
@@ -189,11 +194,9 @@ find_package(ClangFormat)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  message(STATUS "No build type selected, default to Release")
-  set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type (default Release)" FORCE)
-endif()
-
+default_build_type("Release")
+set_std_fs_lib()
+message(STATUS "Extra linking to fs lib:${STD_FS_LIB}")
 
 #Enable LTO if available
 include(CheckIPOSupported)
@@ -216,7 +219,7 @@ endif()
 # to control options for the libraries
 if(NOT TARGET slsProjectOptions)
     add_library(slsProjectOptions INTERFACE)
-   target_compile_features(slsProjectOptions INTERFACE cxx_std_11)
+   target_compile_features(slsProjectOptions INTERFACE cxx_std_17)
 endif()
 
 if (NOT TARGET slsProjectWarnings)
@@ -329,7 +332,8 @@ if (SLS_USE_INTEGRATION_TESTS)
 endif (SLS_USE_INTEGRATION_TESTS)
 
 if (SLS_USE_PYTHON)
-    find_package (Python 3.8 COMPONENTS Interpreter Development)
+    find_package (Python 3.8 COMPONENTS Interpreter Development.Module REQUIRED)
+    set(PYBIND11_FINDPYTHON ON) # Needed for RH8
     if(SLS_FETCH_PYBIND11_FROM_GITHUB)
         FetchContent_Declare(
             pybind11

RELEASE.txt

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

VERSION

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

cmake/FindClangFormat.cmake

@@ -25,7 +25,9 @@ mark_as_advanced(
     ClangFormat_BIN)
 
 if(ClangFormat_FOUND)
-    exec_program(${ClangFormat_BIN} ${CMAKE_CURRENT_SOURCE_DIR} ARGS --version OUTPUT_VARIABLE CLANG_VERSION_TEXT)
+    execute_process(COMMAND ${ClangFormat_BIN} --version
+                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                 OUTPUT_VARIABLE CLANG_VERSION_TEXT)
     string(REGEX MATCH "([0-9]+)\\.[0-9]+\\.[0-9]+" CLANG_VERSION ${CLANG_VERSION_TEXT})
     if((${CLANG_VERSION} GREATER "9") OR (${CLANG_VERSION} EQUAL "9"))
         # A CMake script to find all source files and setup clang-format targets for them

cmake/helpers.cmake

@@ -0,0 +1,46 @@
+function(default_build_type val)
+if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+  message(STATUS "No build type selected, default to Release")
+  set(CMAKE_BUILD_TYPE ${val} CACHE STRING "Build type (default ${val})" FORCE)
+endif()
+endfunction()
+
+function(set_std_fs_lib)
+# from pybind11
+# Check if we need to add -lstdc++fs or -lc++fs or nothing
+if(DEFINED CMAKE_CXX_STANDARD AND CMAKE_CXX_STANDARD LESS 17)
+  set(STD_FS_NO_LIB_NEEDED TRUE)
+elseif(MSVC)
+  set(STD_FS_NO_LIB_NEEDED TRUE)
+else()
+  file(
+    WRITE ${CMAKE_CURRENT_BINARY_DIR}/main.cpp
+    "#include <filesystem>\nint main(int argc, char ** argv) {\n  std::filesystem::path p(argv[0]);\n  return p.string().length();\n}"
+  )
+  try_compile(
+    STD_FS_NO_LIB_NEEDED ${CMAKE_CURRENT_BINARY_DIR}
+    SOURCES ${CMAKE_CURRENT_BINARY_DIR}/main.cpp
+    COMPILE_DEFINITIONS -std=c++17)
+  try_compile(
+    STD_FS_NEEDS_STDCXXFS ${CMAKE_CURRENT_BINARY_DIR}
+    SOURCES ${CMAKE_CURRENT_BINARY_DIR}/main.cpp
+    COMPILE_DEFINITIONS -std=c++17
+    LINK_LIBRARIES stdc++fs)
+  try_compile(
+    STD_FS_NEEDS_CXXFS ${CMAKE_CURRENT_BINARY_DIR}
+    SOURCES ${CMAKE_CURRENT_BINARY_DIR}/main.cpp
+    COMPILE_DEFINITIONS -std=c++17
+    LINK_LIBRARIES c++fs)
+endif()
+
+if(${STD_FS_NEEDS_STDCXXFS})
+  set(STD_FS_LIB stdc++fs PARENT_SCOPE)
+elseif(${STD_FS_NEEDS_CXXFS})
+  set(STD_FS_LIB c++fs PARENT_SCOPE)
+elseif(${STD_FS_NO_LIB_NEEDED})
+  set(STD_FS_LIB "" PARENT_SCOPE)
+else()
+  message(WARNING "Unknown C++17 compiler - not passing -lstdc++fs")
+  set(STD_FS_LIB "")
+endif()
+endfunction()

conda-recipes/main-library/meta.yaml

@@ -29,7 +29,7 @@ requirements:
     - libtiff
     - zlib
     - expat
-
+  
   run:
     - libstdcxx-ng
     - libgcc-ng 
@@ -58,6 +58,7 @@ outputs:
         - {{ compiler('c') }}
         - {{compiler('cxx')}}
         - {{ pin_subpackage('slsdetlib', exact=True) }}
+        
 
       run:
         - {{ pin_subpackage('slsdetlib', exact=True) }}

docs/CMakeLists.txt

@@ -40,6 +40,7 @@ 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
@@ -53,6 +54,7 @@ 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', 'Gotthard', 'Ctb']
+            'Jungfrau', 'Moench', 'Ctb']
 
 
 for det in detectors:

docs/src/binaryfileformat.rst

@@ -320,61 +320,6 @@ 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
 ^^^^^^^^^^^^^^^
 
@@ -414,6 +359,7 @@ Chip Test Board
         "Digital Flag": 0,
         "Digital Samples": 1000,
         "Dbit Offset": 0,
+        "Dbit Reorder": 1, 
         "Dbit Bitset": 0,
         "Transceiver Mask": "0x3",
         "Transceiver Flag": 0,

docs/src/firmware.rst

@@ -131,42 +131,6 @@ 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
 -----------
 
@@ -396,7 +360,3 @@ 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,6 +36,8 @@ Welcome to slsDetectorPackage's documentation!
     pydetector
     pyenums
     pyexamples
+    pyPatternGenerator
+    pattern
 
 .. toctree::
     :caption: Command line

docs/src/masterfileattributes.rst

@@ -288,56 +288,6 @@ 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
 ^^^^^^^^^^^^^^^
@@ -395,6 +345,9 @@ Chip Test Board
    +-----------------------+-------------------------------------------------+
    | Dbit Offset           | Digital offset of valid data in bytes           |
    +-----------------------+-------------------------------------------------+
+   | Dbit Reorder          | Reorder such that it groups each signal (0-63)  |
+   |                       | from all the different samples together         |                 
+   +-----------------------+-------------------------------------------------+
    | Dbit Bitset           | Digital 64 bit mask of bits enabled in receiver |
    +-----------------------+-------------------------------------------------+
    | Transceiver Mask      | Mask of channels enabled in Transceiver         |

docs/src/pattern.rst

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

@@ -0,0 +1,34 @@
+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/serverdefaults.rst

@@ -89,18 +89,3 @@ 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,12 +27,11 @@ 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][Gotthard][Gotthard2][Moench] 
+         -i, --ignore-config      : [Eiger][Jungfrau][Gotthard2][Moench] 
                                     Ignore config file. 
-         -m, --master <master>    : [Eiger][Mythen3][Gotthard][Gotthard2] 
+         -m, --master <master>    : [Eiger][Mythen3][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 
@@ -65,7 +64,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 | Gotthard I
+   Jungfrau | Moench | CTB
       .. code-block:: bash
 
          # Edit inittab on board

docs/src/troubleshooting.rst

@@ -385,14 +385,6 @@ 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/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

@@ -23,7 +23,6 @@ Binaries
 
         eigerDetectorServer_virtual
         jungfrauDetectorServer_virtual
-        gotthardDetectorServer_virtual
         gotthard2DetectorServer_virtual
         mythen3DetectorServer_virtual
         moenchDetectorServer_virtual

examples/gotthard.config

@@ -1,12 +0,0 @@
-# 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,5 +12,6 @@ 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
+slsDetectorPackage/9.1.1_rh8 stable cmake/3.15.5 Qt/5.12.10
+slsDetectorPackage/9.2.0_rh8 stable cmake/3.15.5 Qt/5.12.10

pyctbgui/pyctbgui/services/Pattern.py

@@ -10,6 +10,7 @@ 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):
 
@@ -61,7 +62,10 @@ 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"spinBoxLoop{i}WaitTime").editingFinished.connect(partial(self.setPatLoopWaitTime, 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)
         self.view.pushButtonCompiler.clicked.connect(self.setCompiler)
         self.view.pushButtonUncompiled.clicked.connect(self.setUncompiledPatternFile)
         self.view.pushButtonPatternFile.clicked.connect(self.setPatternFile)
@@ -91,7 +95,8 @@ class PatternTab(QtWidgets.QWidget):
             self.getPatLoopStartStopAddress(i)
             self.getPatLoopWaitAddress(i)
             self.getPatLoopRepetition(i)
-            self.getPatLoopWaitTime(i)
+            self.getPatLoopWaitClocks(i)
+            self.getPatLoopWaitInterval(i)
 
     # Pattern Tab functions
 
@@ -182,17 +187,67 @@ class PatternTab(QtWidgets.QWidget):
         self.det.patnloop[level] = spinBox.value()
         self.getPatLoopRepetition(level)
 
-    def getPatLoopWaitTime(self, level):
+    def getPatLoopWaitClocks(self, level):
         retval = self.det.patwaittime[level]
-        spinBox = getattr(self.view, f"spinBoxLoop{level}WaitTime")
+        spinBox = getattr(self.view, f"doubleSpinBoxLoop{level}WaitClocks")
         spinBox.editingFinished.disconnect()
         spinBox.setValue(retval)
-        spinBox.editingFinished.connect(partial(self.setPatLoopWaitTime, level))
+        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)
 
-    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(
@@ -450,7 +505,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'spinBoxLoop{i}WaitTime').text()}")
+            commands.append(f"patwaittime {i} {getattr(self.view, f'doubleSpinBoxLoop{i}WaitClocks').text()}")
         commands.append(f"patlimits {self.view.lineEditStartAddress.text()}, {self.view.lineEditStopAddress.text()}")
         # commands.append(f"patfname {self.view.lineEditPatternFile.text()}")
         return commands

pyctbgui/pyctbgui/services/Signals.py

@@ -22,6 +22,7 @@ class SignalsTab(QtWidgets.QWidget):
         self.plotTab = None
         self.legend: LegendItem | None = None
         self.rx_dbitoffset = None
+        self.rx_dbitreorder = None
         self.rx_dbitlist = None
 
     def refresh(self):
@@ -29,6 +30,7 @@ class SignalsTab(QtWidgets.QWidget):
         self.updateDigitalBitEnable()
         self.updateIOOut()
         self.getDBitOffset()
+        self.getDBitReorder()
 
     def connect_ui(self):
         for i in range(Defines.signals.count):
@@ -49,6 +51,7 @@ class SignalsTab(QtWidgets.QWidget):
             partial(self.setIOOutRange, Defines.signals.half, Defines.signals.count))
         self.view.lineEditPatIOCtrl.editingFinished.connect(self.setIOOutReg)
         self.view.spinBoxDBitOffset.editingFinished.connect(self.setDbitOffset)
+        self.view.checkBoxDBitReorder.stateChanged.connect(self.setDbitReorder)
 
     def setup_ui(self):
         self.plotTab = self.mainWindow.plotTab
@@ -87,60 +90,79 @@ class SignalsTab(QtWidgets.QWidget):
                 self.legend.addItem(plot, name)
 
     @recordOrApplyPedestal
-    def _processWaveformData(self, data, aSamples, dSamples, rx_dbitlist, isPlottedArray, rx_dbitoffset, romode,
+    def _processWaveformData(self, data, aSamples, dSamples, rx_dbitreorder, rx_dbitlist, isPlottedArray, romode,
                              nADCEnabled):
-        """
-        transform raw waveform data into a processed numpy array
-        @param data:  raw waveform data
-        """
-        dbitoffset = rx_dbitoffset
+        
+        #transform raw waveform data into a processed numpy array
+        #@param data:  raw waveform data
+    
+        start_digital_data = 0 
         if romode == 2:
-            dbitoffset += nADCEnabled * 2 * aSamples
-        digital_array = np.array(np.frombuffer(data, offset=dbitoffset, dtype=np.uint8))
-        nbitsPerDBit = dSamples
-        if nbitsPerDBit % 8 != 0:
-            nbitsPerDBit += (8 - (dSamples % 8))
-        offset = 0
-        arr = []
-        for i in rx_dbitlist:
-            # where numbits * numsamples is not a multiple of 8
-            if offset % 8 != 0:
-                offset += (8 - (offset % 8))
-            if not isPlottedArray[i]:
-                offset += nbitsPerDBit
-                return None
-            waveform = np.zeros(dSamples)
-            for iSample in range(dSamples):
-                # all samples for digital bit together from slsReceiver
-                index = int(offset / 8)
-                iBit = offset % 8
-                bit = (digital_array[index] >> iBit) & 1
-                waveform[iSample] = bit
-                offset += 1
-            arr.append(waveform)
+            start_digital_data += nADCEnabled * 2 * aSamples
+        digital_array = np.array(np.frombuffer(data, offset=start_digital_data, dtype=np.uint8)) 
+        if rx_dbitreorder:
+            samples_per_bit = np.empty((len(rx_dbitlist), dSamples), dtype=np.uint8) #stored per row all the corresponding signals of all samples 
+            nbitsPerDBit = dSamples
+            if nbitsPerDBit % 8 != 0:
+                nbitsPerDBit += (8 - (dSamples % 8))
+            bit_index = 0
+            for idx, i in enumerate(rx_dbitlist):
+                # where numbits * numsamples is not a multiple of 8
+                if bit_index % 8 != 0:
+                    bit_index += (8 - (bit_index % 8))
+                if not isPlottedArray[i]:
+                    bit_index += nbitsPerDBit
+                    samples_per_bit[idx, :] = np.nan
+                    continue
+                for iSample in range(dSamples):
+                    # all samples for digital bit together from slsReceiver
+                    index = int(bit_index / 8)
+                    iBit = bit_index % 8
+                    bit = (digital_array[index] >> iBit) & 1
+                    samples_per_bit[idx,iSample] = bit
+                    bit_index += 1
+            return samples_per_bit
+        else: 
+            nbitsPerSample = len(rx_dbitlist) if len(rx_dbitlist) % 8 == 0 else len(rx_dbitlist) + (8 - (len(rx_dbitlist) % 8))
+            bits_per_sample = np.empty((dSamples, len(rx_dbitlist)), dtype=np.uint8) #store per row all selected bits of a sample
+            for iSample in range(dSamples): 
+                bit_index = nbitsPerSample * iSample
+                for idx, i in enumerate(rx_dbitlist): 
+                    if not isPlottedArray[i]:
+                        bit_index += 1
+                        bits_per_sample[iSample, idx] = np.nan
 
-        return np.array(arr)
+                    index = int(bit_index/8)
+                    iBit = idx % 8
+                    bit = (digital_array[index] >> iBit) & 1
+                    bits_per_sample[iSample, idx] = bit
+                    bit_index += 1
+            return bits_per_sample.T.copy() 
 
+
+                
     def processWaveformData(self, data, aSamples, dSamples):
-        """
-        view function
-        plots processed waveform data
-        data: raw waveform data
-        dsamples: digital samples
-        asamples: analog samples
-        """
+        
+        #view function
+        #plots processed waveform data
+        #data: raw waveform data
+        #dsamples: digital samples
+        #asamples: analog samples
+
+        self.refresh()
+        
         waveforms = {}
         isPlottedArray = {i: getattr(self.view, f"checkBoxBIT{i}Plot").isChecked() for i in self.rx_dbitlist}
 
-        digital_array = self._processWaveformData(data, aSamples, dSamples, self.rx_dbitlist, isPlottedArray,
-                                                  self.rx_dbitoffset, self.mainWindow.romode.value,
+        digital_array = self._processWaveformData(data, aSamples, dSamples, self.rx_dbitreorder, self.rx_dbitlist, isPlottedArray,
+                                                  self.mainWindow.romode.value,
                                                   self.mainWindow.nADCEnabled)
 
         irow = 0
-        for idx, i in enumerate(self.rx_dbitlist):
+        for idx, i in enumerate(self.rx_dbitlist): 
             # bits enabled but not plotting
-            waveform = digital_array[idx]
-            if waveform is None:
+            waveform = digital_array[idx, :]
+            if np.isnan(waveform[0]):
                 continue
             self.mainWindow.digitalPlots[i].setData(waveform)
             plotName = getattr(self.view, f"labelBIT{i}").text()
@@ -151,8 +173,10 @@ class SignalsTab(QtWidgets.QWidget):
                 irow += 1
             else:
                 self.mainWindow.digitalPlots[i].setY(0)
+            
         return waveforms
 
+
     def initializeAllDigitalPlots(self):
         self.mainWindow.plotDigitalWaveform = pg.plot()
         self.mainWindow.plotDigitalWaveform.addLegend(colCount=Defines.colCount)
@@ -360,14 +384,25 @@ class SignalsTab(QtWidgets.QWidget):
         self.view.spinBoxDBitOffset.setValue(self.rx_dbitoffset)
         self.view.spinBoxDBitOffset.editingFinished.connect(self.setDbitOffset)
 
+    def getDBitReorder(self):
+        self.view.checkBoxDBitReorder.stateChanged.disconnect()
+        self.rx_dbitreorder = self.det.rx_dbitreorder
+        self.view.checkBoxDBitReorder.setChecked(self.rx_dbitreorder)
+        self.view.checkBoxDBitReorder.stateChanged.connect(self.setDbitReorder)
+
+
     def setDbitOffset(self):
         self.det.rx_dbitoffset = self.view.spinBoxDBitOffset.value()
 
+    def setDbitReorder(self):
+        self.det.rx_dbitreorder = self.view.checkBoxDBitReorder.isChecked()
+
     def saveParameters(self) -> list:
         commands = []
         dblist = [str(i) for i in range(Defines.signals.count) if getattr(self.view, f"checkBoxBIT{i}DB").isChecked()]
         if len(dblist) > 0:
             commands.append(f"rx_dbitlist {', '.join(dblist)}")
         commands.append(f"rx_dbitoffset {self.view.spinBoxDBitOffset.value()}")
+        commands.append(f"rx_dbitreorder {self.view.checkBoxDBitReorder.isChecked()}")
         commands.append(f"patioctrl {self.view.lineEditPatIOCtrl.text()}")
         return commands

pyctbgui/pyctbgui/ui/signals.ui

@@ -6074,6 +6074,33 @@
        <enum>QFrame::Raised</enum>
       </property>
       <layout class="QGridLayout" name="gridLayout_17">
+       <item row="0" column="4">
+        <widget class="QSpinBox" name="spinBoxDBitOffset">
+         <property name="minimumSize">
+          <size>
+           <width>150</width>
+           <height>32</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>150</width>
+           <height>32</height>
+          </size>
+         </property>
+         <property name="font">
+          <font>
+           <pointsize>10</pointsize>
+          </font>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">background-color: rgb(255, 255, 255);</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
        <item row="0" column="3">
         <widget class="QLabel" name="label_66">
          <property name="font">
@@ -6086,6 +6113,36 @@
          </property>
         </widget>
        </item>
+       <item row="0" column="6">
+        <widget class="QCheckBox" name="checkBoxDBitReorder">
+         <property name="font">
+          <font>
+           <pointsize>10</pointsize>
+          </font>
+         </property>
+         <property name="text">
+          <string>DBit Reorder</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_48">
+         <property name="minimumSize">
+          <size>
+           <width>50</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="font">
+          <font>
+           <pointsize>10</pointsize>
+          </font>
+         </property>
+         <property name="text">
+          <string>IO Control Register:</string>
+         </property>
+        </widget>
+       </item>
        <item row="0" column="1">
         <widget class="QLineEdit" name="lineEditPatIOCtrl">
          <property name="sizePolicy">
@@ -6133,50 +6190,18 @@
          </property>
         </spacer>
        </item>
-       <item row="0" column="4">
-        <widget class="QSpinBox" name="spinBoxDBitOffset">
-         <property name="minimumSize">
+       <item row="0" column="5">
+        <spacer name="horizontalSpacer_22">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
           <size>
-           <width>150</width>
-           <height>32</height>
+           <width>40</width>
+           <height>20</height>
           </size>
          </property>
-         <property name="maximumSize">
-          <size>
-           <width>150</width>
-           <height>32</height>
-          </size>
-         </property>
-         <property name="font">
-          <font>
-           <pointsize>10</pointsize>
-          </font>
-         </property>
-         <property name="styleSheet">
-          <string notr="true">background-color: rgb(255, 255, 255);</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="label_48">
-         <property name="minimumSize">
-          <size>
-           <width>50</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="font">
-          <font>
-           <pointsize>10</pointsize>
-          </font>
-         </property>
-         <property name="text">
-          <string>IO Control Register:</string>
-         </property>
-        </widget>
+        </spacer>
        </item>
       </layout>
      </widget>

python/CMakeLists.txt

@@ -27,6 +27,7 @@ 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
@@ -37,8 +38,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,8 +66,7 @@ configure_file( scripts/test_virtual.py
 )
 
 configure_file(scripts/frameSynchronizerPullSocket.py 
-    ${CMAKE_BINARY_DIR}/bin/frameSynchronizerPullSocket.py COPYONLY)
-
+   ${CMAKE_BINARY_DIR}/bin/frameSynchronizerPullSocket.py COPYONLY)
 
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/../VERSION  
     ${CMAKE_BINARY_DIR}/bin/slsdet/VERSION
@@ -89,4 +89,4 @@ if(SLS_INSTALL_PYTHONEXT)
         COMPONENT python
         )
 
-endif()
+endif()

python/scripts/compile_servers.py

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

python/slsdet/PatternGenerator.py

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

@@ -0,0 +1,31 @@
+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][Gotthard][Mythen3][Gotthard2][CTB][Moench] Serial number of detector """
+        """Jungfrau][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][Gotthard][Ctb][Mythen3][Gotthard2][Xilinx Ctb] 16
+        [Jungfrau][Moench][Ctb][Mythen3][Gotthard2][Xilinx Ctb] 16
         """
         return self.getDynamicRange()
 
@@ -372,7 +372,6 @@ 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
@@ -404,7 +403,7 @@ class Detector(CppDetectorApi):
     @element
     def framesl(self):
         """
-        [Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB][Xilinx CTB] Number of frames left in acquisition.\n
+        [Jungfrau][Moench][Mythen3][Gotthard2][CTB][Xilinx CTB] Number of frames left in acquisition.\n
 
         Note
         ----
@@ -635,7 +634,7 @@ class Detector(CppDetectorApi):
     @element
     def periodl(self):
         """
-        [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2][Xilinx Ctb] Period left for current frame.
+        [Jungfrau][Moench][CTB][Mythen3][Gotthard2][Xilinx Ctb] Period left for current frame.
 
         Note
         -----
@@ -657,7 +656,7 @@ class Detector(CppDetectorApi):
     @element
     def delay(self):
         """
-        [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2][Xilinx Ctb] Delay after trigger, accepts either a value in seconds, DurationWrapper or datetime.timedelta
+        [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
 
@@ -699,7 +698,7 @@ class Detector(CppDetectorApi):
     @element
     def delayl(self):
         """
-        [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2][Xilinx Ctb] Delay left after trigger during acquisition, accepts either a value in seconds, datetime.timedelta or DurationWrapper
+        [Jungfrau][Moench][CTB][Mythen3][Gotthard2][Xilinx Ctb] Delay left after trigger during acquisition, accepts either a value in seconds, datetime.timedelta or DurationWrapper
 
         Note
         -----
@@ -1444,8 +1443,6 @@ 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)
@@ -1526,7 +1523,6 @@ 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
         """
@@ -1654,7 +1650,7 @@ class Detector(CppDetectorApi):
     def master(self):
         """
         [Eiger][Gotthard2][Jungfrau][Moench] Sets (half) module to master and other(s) to slaves.\n
-        [Gotthard][Gotthard2][Mythen3][Eiger][Jungfrau][Moench] Gets if the current (half) module is master.
+        [Gotthard2][Mythen3][Eiger][Jungfrau][Moench] Gets if the current (half) module is master.
         """
         return self.getMaster()
 
@@ -1912,7 +1908,7 @@ class Detector(CppDetectorApi):
 
     @property
     def adcreg(self):
-        """[Jungfrau][Moench][Ctb][Gotthard] Writes to an adc register 
+        """[Jungfrau][Moench][Ctb] Writes to an adc register 
 
         Note
         -----
@@ -1941,7 +1937,7 @@ class Detector(CppDetectorApi):
     @element
     def triggersl(self):
         """
-        [Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB][Xilinx CTB] Number of triggers left in acquisition.\n
+        [Jungfrau][Moench][Mythen3][Gotthard2][CTB][Xilinx CTB] Number of triggers left in acquisition.\n
         
         Note
         ----
@@ -2206,7 +2202,7 @@ class Detector(CppDetectorApi):
         Note
         -----
         Default: AUTO_TIMING \n
-        [Jungfrau][Moench][Gotthard][Ctb][Gotthard2][Xilinx Ctb] AUTO_TIMING, TRIGGER_EXPOSURE \n
+        [Jungfrau][Moench][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
         """
@@ -2263,7 +2259,7 @@ class Detector(CppDetectorApi):
     def type(self):
         """ Returns detector type. 
         Enum: detectorType
-        [EIGER, JUNGFRAU, GOTTHARD, MOENCH, MYTHEN3, GOTTHARD2, CHIPTESTBOARD]
+        [EIGER, JUNGFRAU, MOENCH, MYTHEN3, GOTTHARD2, CHIPTESTBOARD]
 
         :setter: Not implemented
         """
@@ -3467,6 +3463,16 @@ class Detector(CppDetectorApi):
     def rx_dbitoffset(self, value):
         ut.set_using_dict(self.setRxDbitOffset, value)
 
+    @property
+    @element
+    def rx_dbitreorder(self):
+        """[Ctb] Reorder digital data to group together all samples per signal. Default is 1. Setting to 0 means 'do not reorder' and to keep what the board spits out, which is that all signals in a sample are grouped together."""
+        return self.getRxDbitReorder()
+
+    @rx_dbitreorder.setter
+    def rx_dbitreorder(self, value):
+        ut.set_using_dict(self.setRxDbitReorder, value)
+
     @property
     @element
     def maxadcphaseshift(self):
@@ -3479,15 +3485,13 @@ class Detector(CppDetectorApi):
     @property
     @element
     def adcphase(self):
-        """[Gotthard][Jungfrau][Moench][CTB] Sets phase shift of ADC clock. 
+        """[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.\n
-        [Gotthard] Relative phase shift.
+        [Ctb] Absolute phase shift. Changing adcclk also resets adcphase and sets it to previous values.
 
-        :getter: Not implemented for Gotthard
         """
         return self.getADCPhase()
 
@@ -3702,7 +3706,13 @@ class Detector(CppDetectorApi):
     @property
     def patwaittime(self):
         """
-        [Ctb][Mythen3][Xilinx Ctb] Wait time in clock cycles of loop level provided.
+        [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)
         
         Example
         -------
@@ -3713,41 +3723,85 @@ 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)
 
-    @patwaittime0.setter
-    def patwaittime0(self, nclk):
-        nclk = ut.merge_args(0, nclk)
-        ut.set_using_dict(self.setPatternWaitTime, *nclk)
+    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. 
 
-    @property
-    @element
-    def patwaittime1(self):
-        """[Ctb][Mythen3][Xilinx Ctb] Wait 1 time in clock cycles."""
-        return self.getPatternWaitTime(1)
+        Info
+        ----
 
-    @patwaittime1.setter
-    def patwaittime1(self, nclk):
-        nclk = ut.merge_args(1, nclk)
-        ut.set_using_dict(self.setPatternWaitTime, *nclk)
+        :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)
 
-    @property
-    @element
-    def patwaittime2(self):
-        """[Ctb][Mythen3][Xilinx Ctb] Wait 2 time in clock cycles."""
-        return self.getPatternWaitTime(2)
+        @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)
 
-    @patwaittime2.setter
-    def patwaittime2(self, nclk):
-        nclk = ut.merge_args(2, nclk)
-        ut.set_using_dict(self.setPatternWaitTime, *nclk)
+        return patwaittime
+    
+    patwaittime0 = create_patwaittime_property(0)
+    patwaittime1 = create_patwaittime_property(1)
+    patwaittime2 = create_patwaittime_property(2)
 
 
     @property
@@ -4038,27 +4092,6 @@ 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

@@ -1,53 +0,0 @@
-# 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,10 +275,13 @@ class PatWaitTimeProxy:
         self.det = det
 
     def __getitem__(self, key):
-        return element_if_equal(self.det.getPatternWaitTime(key))
+        return element_if_equal(self.det.getPatternWaitClocks(key))
 
     def __setitem__(self, key, value):
-        set_proxy_using_dict(self.det.setPatternWaitTime, 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)
 
     def __repr__(self):
         max_levels = MAX_PATTERN_LEVELS

python/src/detector.cpp

@@ -1293,20 +1293,6 @@ 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,
@@ -1678,6 +1664,14 @@ void init_det(py::module &m) {
                        (void (Detector::*)(int, sls::Positions)) &
                            Detector::setRxDbitOffset,
                        py::arg(), py::arg() = Positions{});
+    CppDetectorApi.def("getRxDbitReorder",
+                       (Result<bool>(Detector::*)(sls::Positions) const) &
+                           Detector::getRxDbitReorder,
+                       py::arg() = Positions{});
+    CppDetectorApi.def("setRxDbitReorder",
+                       (void (Detector::*)(bool, sls::Positions)) &
+                           Detector::setRxDbitReorder,
+                       py::arg(), py::arg() = Positions{});
     CppDetectorApi.def("setDigitalIODelay",
                        (void (Detector::*)(uint64_t, int, sls::Positions)) &
                            Detector::setDigitalIODelay,
@@ -1861,13 +1855,22 @@ void init_det(py::module &m) {
                            Detector::setPatternWaitAddr,
                        py::arg(), py::arg(), py::arg() = Positions{});
     CppDetectorApi.def(
-        "getPatternWaitTime",
+        "getPatternWaitClocks",
         (Result<uint64_t>(Detector::*)(int, sls::Positions) const) &
-            Detector::getPatternWaitTime,
+            Detector::getPatternWaitClocks,
         py::arg(), py::arg() = Positions{});
-    CppDetectorApi.def("setPatternWaitTime",
+    CppDetectorApi.def("setPatternWaitClocks",
                        (void (Detector::*)(int, uint64_t, sls::Positions)) &
-                           Detector::setPatternWaitTime,
+                           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,
                        py::arg(), py::arg(), py::arg() = Positions{});
     CppDetectorApi.def("getPatternMask",
                        (Result<uint64_t>(Detector::*)(sls::Positions)) &

python/src/enums.cpp

@@ -121,13 +121,9 @@ 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,8 +20,10 @@ void init_pattern(py::module &m) {
     });
 
     py::class_<sls::Pattern> Pattern(m, "Pattern");
-    Pattern.def(py::init());
-    Pattern.def("load", &sls::Pattern::load);
-    Pattern.def("data", (pat * (sls::Pattern::*)()) & sls::Pattern::data,
+    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,
                 py::return_value_policy::reference);
 }

python/tests/test_PatternGenerator.py

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

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

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

serverBin/ctbDetectorServerv9.1.0

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

serverBin/eigerDetectorServer_developer

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

serverBin/eigerDetectorServerv9.0.0

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

serverBin/gotthard2DetectorServer_developer

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

serverBin/gotthard2DetectorServerv9.0.0

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

serverBin/gotthardDetectorServer_developer

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

serverBin/gotthardDetectorServerv9.0.0

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

serverBin/jungfrauDetectorServer_developer

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

serverBin/jungfrauDetectorServerv9.1.0

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

serverBin/moenchDetectorServer_developer

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

serverBin/moenchDetectorServerv9.0.0

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

serverBin/mythen3DetectorServer_developer

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

serverBin/mythen3DetectorServerv9.1.1

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

serverBin/xilinx_ctbDetectorServer_developer

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

serverBin/xilinx_ctbDetectorServerv9.1.0

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

slsDetectorCalibration/dataStructures/gotthardDoubleModuleDataNew.h

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

@@ -1,105 +0,0 @@
-// 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>3</number>
+      <number>2</number>
      </property>
      <property name="elideMode">
       <enum>Qt::ElideLeft</enum>
@@ -178,309 +178,6 @@
        </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>
@@ -2238,11 +1935,6 @@ 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,87 +38,21 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <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>
-       <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;High Voltage&lt;/p&gt;&lt;p&gt; #highvoltage#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <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">
+   <item row="4" column="5">
+    <widget class="QSpinBox" name="spinThreshold2">
      <property name="enabled">
-      <bool>true</bool>
+      <bool>false</bool>
      </property>
      <property name="minimumSize">
       <size>
-       <width>110</width>
-       <height>0</height>
+       <width>140</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">
@@ -128,52 +62,42 @@
       </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>
+      <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="text">
-      <string>Settings:</string>
+     <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="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">
+   <item row="4" column="9">
+    <spacer name="horizontalSpacer_4">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Expanding</enum>
+      <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>20</width>
+       <width>40</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="7" column="4">
+   <item row="6" column="4">
     <widget class="QCheckBox" name="chkCounter3">
      <property name="enabled">
       <bool>false</bool>
@@ -201,29 +125,7 @@
      </property>
     </widget>
    </item>
-   <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">
+   <item row="4" column="7">
     <spacer name="horizontalSpacer_3">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -239,97 +141,7 @@
      </property>
     </spacer>
    </item>
-   <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">
+   <item row="1" column="2" colspan="3">
     <widget class="QSpinBox" name="spinHV">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -369,8 +181,8 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="3">
-    <widget class="QCheckBox" name="chkCounter2">
+   <item row="6" column="2">
+    <widget class="QCheckBox" name="chkCounter1">
      <property name="enabled">
       <bool>false</bool>
      </property>
@@ -387,17 +199,222 @@
       </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;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>2</string>
+      <string>1</string>
      </property>
      <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="3" column="2" colspan="3">
+   <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">
     <widget class="QComboBox" name="comboSettings">
      <property name="enabled">
       <bool>true</bool>
@@ -542,7 +559,7 @@
      </item>
     </widget>
    </item>
-   <item row="5" column="8">
+   <item row="4" column="8">
     <widget class="QPushButton" name="btnSetThreshold">
      <property name="enabled">
       <bool>true</bool>
@@ -626,130 +643,7 @@
      </property>
     </widget>
    </item>
-   <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">
+   <item row="3" column="2" colspan="3">
     <widget class="QComboBox" name="comboGainMode">
      <property name="enabled">
       <bool>false</bool>
@@ -813,21 +707,15 @@
      </item>
     </widget>
    </item>
-   <item row="5" column="6">
-    <widget class="QSpinBox" name="spinThreshold3">
+   <item row="6" column="3">
+    <widget class="QCheckBox" name="chkCounter2">
      <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>
+       <width>50</width>
+       <height>16777215</height>
       </size>
      </property>
      <property name="font">
@@ -837,112 +725,18 @@
       </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>
+      <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="keyboardTracking">
-      <bool>false</bool>
+     <property name="text">
+      <string>2</string>
      </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 name="checked">
+      <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="6" 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="3" column="1">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</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="7" column="0">
-    <widget class="QLabel" name="lblCounter">
+   <item row="5" column="0">
+    <widget class="QLabel" name="lblDynamicRange">
      <property name="enabled">
       <bool>false</bool>
      </property>
@@ -965,30 +759,147 @@
       </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>
+      <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>Counters:</string>
+      <string>Dynamic Range:</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="9">
-    <spacer name="horizontalSpacer_4">
+   <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">
+    <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>40</width>
+       <width>20</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
+   <item row="4" 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="3" 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="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>
+   </item>
   </layout>
  </widget>
  <tabstops>
-  <tabstop>comboHV</tabstop>
   <tabstop>spinHV</tabstop>
   <tabstop>comboSettings</tabstop>
   <tabstop>comboGainMode</tabstop>

slsDetectorGui/include/qTabAdvanced.h

@@ -38,9 +38,6 @@ 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,7 +192,6 @@ 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:
@@ -405,12 +404,12 @@ void qDetectorMain::ExecuteUtilities(QAction *action) {
 
 void qDetectorMain::ExecuteHelp(QAction *action) {
     if (action == actionAbout) {
-        LOG(logINFO) << "About Common GUI for Jungfrau, Eiger, Mythen3, "
-                        "Gotthard, Gotthard2 and Moench detectors";
+        LOG(logDEBUG) << "About Common GUI for Jungfrau, Eiger, Mythen3, "
+                         "Gotthard2 and Moench detectors";
 
-        std::string clientVersion = "unknown";
+        std::string packageVersion = "unknown";
         try {
-            clientVersion = det->getClientVersion();
+            packageVersion = det->getPackageVersion();
         }
         CATCH_DISPLAY("Could not get client version.",
                       "qDetectorMain::ExecuteHelp")
@@ -419,12 +418,12 @@ void qDetectorMain::ExecuteHelp(QAction *action) {
             qDefs::INFORMATION,
             "<p style=\"font-family:verdana;\">"
 
-            "<b>SLS Detector Client version:  " +
-                clientVersion +
+            "<b>SLS Detector Package:  v" +
+                packageVersion +
                 "</b><br><br>"
 
                 "Common GUI to control the SLS Detectors: "
-                "Jungfrau, Eiger, Mythen3, Gotthard, Gotthard2 and "
+                "Jungfrau, Eiger, Mythen3, Gotthard2 and "
                 "Moench.<br><br>"
 
                 "It can be operated in parallel with the command "

slsDetectorGui/src/qDrawPlot.cpp

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

slsDetectorGui/src/qTabAdvanced.cpp

@@ -28,9 +28,6 @@ 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);
@@ -114,14 +111,6 @@ 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,
@@ -173,23 +162,16 @@ 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() {
@@ -570,40 +552,6 @@ 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,
@@ -831,11 +779,6 @@ 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,15 +34,6 @@ 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,7 +47,6 @@ 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,8 +18,6 @@ qTabSettings::qTabSettings(QWidget *parent, Detector *detector)
 qTabSettings::~qTabSettings() {}
 
 void qTabSettings::SetupWidgetWindow() {
-    comboHV->hide();
-    lblComboHV->hide();
     lblSpinHV->hide();
     spinHV->hide();
     hvmin = HV_MIN;
@@ -100,9 +98,6 @@ 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();
@@ -189,8 +184,6 @@ 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
@@ -231,12 +224,10 @@ void qTabSettings::Initialization() {
 
 void qTabSettings::GetHighVoltage() {
     // not enabled for eiger
-    if (!comboHV->isVisible() && !spinHV->isVisible())
+    if (!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();
 
@@ -258,55 +249,19 @@ void qTabSettings::GetHighVoltage() {
                 master_retvals.tsquash("Inconsistent values for high voltage.");
         }
 
-        // 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));
-            }
+        if (retval != 0 && retval < hvmin && retval > HV_MAX) {
+            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 = (comboHV->isVisible() ? comboHV->currentText().toInt()
-                                    : spinHV->value());
+    int val = spinHV->value();
     LOG(logINFO) << "Setting high voltage:" << val;
-
     try {
         det->setHighVoltage(val);
     }

slsDetectorServers/CMakeLists.txt

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

@@ -2,7 +2,6 @@
 # Copyright (C) 2021 Contributors to the SLS Detector Package
 
 det_list=("ctbDetectorServer  
-	gotthardDetectorServer  
 	gotthard2DetectorServer 
 	jungfrauDetectorServer 
 	mythen3DetectorServer 

slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c

@@ -15,6 +15,8 @@
 #include "loadPattern.h"
 
 #include <netinet/in.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h> // usleep
 #ifdef VIRTUAL
@@ -92,6 +94,10 @@ void basictests() {
     LOG(logINFOBLUE, ("********* Chip Test Board Virtual Server *********\n"));
 #else
     LOG(logINFOBLUE, ("************* Chip Test Board Server *************\n"));
+    initError = enableBlackfinAMCExternalAccessExtension(initErrorMessage);
+    if (initError == FAIL) {
+        return;
+    }
     initError = defineGPIOpins(initErrorMessage);
     if (initError == FAIL) {
         return;
@@ -437,6 +443,32 @@ uint32_t getDetectorIP() {
     return res;
 }
 
+int enableBlackfinAMCExternalAccessExtension(char *mess) {
+    unsigned int value;
+    const char *file_path = BFIN_AMC_ACCESS_EXTENSION_FNAME;
+    FILE *file = fopen(file_path, "r");
+    if (!file) {
+        strcpy(mess, "Failed to enable blackfin AMC access extension. Could "
+                     "not read EBIU_AMBCTL1\n");
+        LOG(logERROR, (mess));
+        return FAIL;
+    }
+    fscanf(file, "%x", &value);
+    fclose(file);
+
+    value |= BFIN_AMC_ACCESS_EXTENSION_ENA_VAL;
+    file = fopen(file_path, "w");
+    if (!file) {
+        strcpy(mess, "Failed to enable blackfin AMC access extension. Could "
+                     "not write EBIU_AMBCTL1\n");
+        LOG(logERROR, (mess));
+        return FAIL;
+    }
+    fprintf(file, "0x%x", value);
+    fclose(file);
+    return OK;
+}
+
 /* initialization */
 
 void initControlServer() {
@@ -1095,26 +1127,17 @@ int setNumTransceiverSamples(int val) {
 int getNumTransceiverSamples() { return ntSamples; }
 
 int setExpTime(int64_t 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);
+    setPatternWaitInterval(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 getPatternWaitTime(0) / (1E-3 * clkFrequency[RUN_CLK]);
-}
+int64_t getExpTime() { return getPatternWaitInterval(0); }
 
 int setPeriod(int64_t val) {
     if (val < 0) {
@@ -2267,11 +2290,23 @@ void *start_timer(void *arg) {
     int packetsPerFrame = ceil((double)imageSize / (double)dataSize);
 
     // Generate Data
-    char imageData[imageSize];
+    char *imageData = (char *)malloc(imageSize);
     memset(imageData, 0, imageSize);
+
+    if (imageData == NULL) {
+        LOG(logERROR, ("Can not allocate image Data RAM."
+                       "Probable cause: Memory Leak.\n"));
+        return NULL;
+    }
+    /*
     for (int i = 0; i < imageSize; i += sizeof(uint16_t)) {
         *((uint16_t *)(imageData + i)) = i;
     }
+    */
+
+    for (int i = 0; i < imageSize; i += 2 * sizeof(uint64_t)) {
+        *((uint64_t *)(imageData + i)) = 0xffffffffffffffff;
+    }
 
     // Send data
     uint64_t frameNr = 0;
@@ -2328,6 +2363,8 @@ void *start_timer(void *arg) {
         setNextFrameNumber(frameNr + numFrames);
     }
 
+    free(imageData);
+
     closeUDPSocket(0);
 
     sharedMemory_setStatus(IDLE);

slsDetectorServers/gotthardDetectorServer/.target-makefrag

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

slsDetectorServers/gotthardDetectorServer/CMakeLists.txt

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

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

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

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

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

@@ -1,159 +0,0 @@
-// 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/slsDetectorServer/include/AD9252.h

@@ -1,32 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-or-other
-// Copyright (C) 2021 Contributors to the SLS Detector Package
-#pragma once
-
-#include <inttypes.h>
-
-/**
- * Set Defines
- * @param reg spi register
- * @param cmsk chip select mask
- * @param clkmsk clock output mask
- * @param dmsk digital output mask
- * @param dofst digital output offset
- */
-void AD9252_SetDefines(uint32_t reg, uint32_t cmsk, uint32_t clkmsk,
-                       uint32_t dmsk, int dofst);
-
-/**
- * Disable SPI
- */
-void AD9252_Disable();
-
-/**
- * Set SPI reg value
- * @param codata value to be set
- */
-void AD9252_Set(int addr, int val);
-
-/**
- * Configure
- */
-void AD9252_Configure();

slsDetectorServers/slsDetectorServer/include/blackfin.h

@@ -5,6 +5,23 @@
 #include <inttypes.h>
 #include <sys/types.h>
 
+/** enable support for ARDY signal on interface to FPGA
+ * needed to properly translate avalon_mm_waitrequest in the CTB firmware
+ * https://www.analog.com/media/en/dsp-documentation/processor-manuals/bf537_hwr_Rev3.2.pdf
+ * page 274
+ * */
+#define BFIN_EBIU_AMBCTL1_B2_ARDY_ENA_OFST (0)
+#define BFIN_EBIU_AMBCTL1_B2_ARDY_ENA_MSK                                      \
+    (1 << BFIN_EBIU_AMBCTL1_B2_ARDY_ENA_OFST)
+#define BFIN_EBIU_AMBCTL1_B2_ARDY_POL_OFST (1)
+#define BFIN_EBIU_AMBCTL1_B2_ARDY_POL_MSK                                      \
+    (1 << BFIN_EBIU_AMBCTL1_B2_ARDY_POL_OFST)
+
+#define BFIN_AMC_ACCESS_EXTENSION_ENA_VAL                                      \
+    (BFIN_EBIU_AMBCTL1_B2_ARDY_ENA_MSK | BFIN_EBIU_AMBCTL1_B2_ARDY_POL_MSK)
+#define BFIN_AMC_ACCESS_EXTENSION_FNAME                                        \
+    "/sys/kernel/debug/blackfin/ebiu_amc/EBIU_AMBCTL1"
+
 /** I2C defines */
 #define I2C_CLOCK_MHZ (131.25)
 

slsDetectorServers/slsDetectorServer/include/loadPattern.h

@@ -27,10 +27,15 @@ int getPatternWaitAddress(int level);
 int validate_setPatternWaitAddresses(char *message, int level, int addr);
 void setPatternWaitAddress(int level, int addr);
 
-int validate_getPatternWaitTime(char *message, int level, uint64_t *waittime);
-uint64_t getPatternWaitTime(int level);
-int validate_setPatternWaitTime(char *message, int level, uint64_t waittime);
-void setPatternWaitTime(int level, uint64_t t);
+int validate_getPatternWaitClocksAndInterval(char *message, int level,
+                                             uint64_t *waittime, int clocks);
+uint64_t getPatternWaitClocks(int level);
+uint64_t getPatternWaitInterval(int level);
+
+int validate_setPatternWaitClocksAndInterval(char *message, int level,
+                                             uint64_t waittime, int clocks);
+void setPatternWaitClocks(int level, uint64_t t);
+void setPatternWaitInterval(int level, uint64_t t);
 
 int validate_getPatternLoopCycles(char *message, int level, int *numLoops);
 int getPatternLoopCycles(int level);

slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h

@@ -2,27 +2,17 @@
 // Copyright (C) 2021 Contributors to the SLS Detector Package
 #include "sls/sls_detector_defs.h"
 #include "slsDetectorServer_defs.h" // DAC_INDEX, ADC_INDEX, also include RegisterDefs.h
-#ifdef GOTTHARDD
-#include "AD9252.h"  // old board compatibility
-#include "clogger.h" // runState(enum TLogLevel)
-#endif
-#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(MOENCHD) ||            \
-    defined(CHIPTESTBOARDD)
+
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD)
 #include "AD9257.h" // commonServerFunctions.h, blackfin.h, ansi.h
 #endif
 
-#if defined(MYTHEN3D) || defined(GOTTHARD2D)
-#include "programViaNios.h"
-#elif defined(CHIPTESTBOARDD) || defined(JUNGFRAUD) || defined(MOENCHD) ||     \
-    defined(GOTTHARDD)
-#include "programViaBlackfin.h"
-#endif
-
 #if defined(MYTHEN3D) || defined(GOTTHARD2D)
 #include "nios.h"
-#elif defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(MOENCHD) ||          \
-    defined(CHIPTESTBOARDD)
+#include "programViaNios.h"
+#elif defined(CHIPTESTBOARDD) || defined(JUNGFRAUD) || defined(MOENCHD)
 #include "blackfin.h"
+#include "programViaBlackfin.h"
 #endif
 
 #ifdef ARMPROCESSOR
@@ -76,8 +66,7 @@ int testBus();
 #endif
 #endif
 
-#if defined(GOTTHARDD) ||                                                      \
-    ((defined(EIGERD) || defined(JUNGFRAUD) || defined(MOENCHD)) &&            \
+#if ((defined(EIGERD) || defined(JUNGFRAUD) || defined(MOENCHD)) &&            \
      defined(VIRTUAL))
 void setTestImageMode(int ival);
 int getTestImageMode();
@@ -102,7 +91,7 @@ u_int16_t getHardwareVersionNumber();
 u_int16_t getHardwareSerialNumber();
 #endif
 #if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARD2D) ||           \
-    defined(MYTHEN3D) || defined(GOTTHARDD)
+    defined(MYTHEN3D)
 int isHardwareVersion_1_0();
 #endif
 #if defined(JUNGFRAUD)
@@ -124,6 +113,10 @@ void setModuleId(int modid);
 u_int64_t getDetectorMAC();
 u_int32_t getDetectorIP();
 
+#if defined(CHIPTESTBOARDD)
+int enableBlackfinAMCExternalAccessExtension(char *mess);
+#endif
+
 // initialization
 void initControlServer();
 void initStopServer();
@@ -162,8 +155,7 @@ void setADIFDefaults();
 #if defined(GOTTHARD2D) || defined(EIGERD) || defined(JUNGFRAUD)
 int readConfigFile();
 #endif
-#if defined(GOTTHARDD) || defined(GOTTHARD2D) || defined(EIGERD) ||            \
-    defined(MYTHEN3D)
+#if defined(GOTTHARD2D) || defined(EIGERD) || defined(MYTHEN3D)
 int checkCommandLineConfiguration();
 #endif
 #ifdef EIGERD
@@ -177,9 +169,6 @@ int readRegister(uint32_t offset, uint32_t *retval);
 int setBit(const uint32_t addr, const int nBit, int validate);
 int clearBit(const uint32_t addr, const int nBit, int validate);
 int getBit(const uint32_t addr, const int nBit, int *retval);
-#elif GOTTHARDD
-void writeRegister16And32(uint32_t offset, uint32_t data);
-uint32_t readRegister16And32(uint32_t offset);
 #endif
 
 // firmware functions (resets)
@@ -197,32 +186,19 @@ int isChipConfigured();
 int powerChip(int on, char *mess);
 int getPowerChip();
 int configureChip(char *mess);
+int readConfigFile(char *mess, char *fileName, char *fileType);
+int resetChip(char *mess);
 #endif
 #if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD) ||       \
     defined(MYTHEN3D) || defined(GOTTHARD2D)
 void cleanFifos();
 void resetCore();
 void resetPeripheral();
-#elif GOTTHARDD
-void setPhaseShiftOnce();
-void setPhaseShift(int numphaseshift);
-void cleanFifos();
-void setADCSyncRegister();
-void setDAQRegister();
-void setChipOfInterestRegister(int adc);
-void setROIADC(int adc);
-void setGbitReadout();
-int readConfigFile();
-void setMasterSlaveConfiguration();
 #endif
 
 // parameters - dr, roi
 int setDynamicRange(int dr);
 int getDynamicRange(int *retval);
-#ifdef GOTTHARDD
-int setROI(ROI arg);
-ROI getROI();
-#endif
 #if defined(JUNGFRAUD) || defined(MOENCHD)
 void setADCInvertRegister(uint32_t val);
 uint32_t getADCInvertRegister();
@@ -334,9 +310,8 @@ void updatePacketizing();
 int64_t getNumFramesLeft();
 int64_t getNumTriggersLeft();
 #endif
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARDD) ||            \
-    defined(CHIPTESTBOARDD) || defined(MYTHEN3D) || defined(GOTTHARD2D) ||     \
-    defined(XILINX_CHIPTESTBOARDD)
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD) ||       \
+    defined(MYTHEN3D) || defined(GOTTHARD2D) || defined(XILINX_CHIPTESTBOARDD)
 int setDelayAfterTrigger(int64_t val);
 int64_t getDelayAfterTrigger();
 int64_t getDelayAfterTriggerLeft();
@@ -345,9 +320,6 @@ int64_t getPeriodLeft();
 #ifdef GOTTHARD2D
 int64_t getNumBurstsLeft();
 #endif
-#ifdef GOTTHARDD
-int64_t getExpTimeLeft();
-#endif
 #if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD) ||       \
     defined(MYTHEN3D) || defined(GOTTHARD2D) || defined(XILINX_CHIPTESTBOARDD)
 int64_t getFramesFromStart();
@@ -460,8 +432,8 @@ int setMaster(enum MASTERINDEX m);
 int setTop(enum TOPINDEX t);
 int isTop(int *retval);
 #endif
-#if defined(MYTHEN3D) || defined(EIGERD) || defined(GOTTHARDD) ||              \
-    defined(GOTTHARD2D) || defined(JUNGFRAUD) || defined(MOENCHD)
+#if defined(MYTHEN3D) || defined(EIGERD) || defined(GOTTHARD2D) ||             \
+    defined(JUNGFRAUD) || defined(MOENCHD)
 int isMaster(int *retval);
 #endif
 
@@ -487,15 +459,12 @@ int setAnalogPulsing(int enable);
 int setNegativePolarity(int enable);
 int setDACS(int *dacs);
 #endif
-#if defined(GOTTHARDD) || defined(MYTHEN3D)
+#if defined(MYTHEN3D)
 void setExtSignal(int signalIndex, enum externalSignalFlag mode);
 int getExtSignal(int signalIndex);
 #endif
 
 // configure mac
-#ifdef GOTTHARDD
-void calcChecksum(mac_conf *mac, int sourceip, int destip);
-#endif
 #if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARD2D)
 void setNumberofUDPInterfaces(int val);
 #endif
@@ -523,9 +492,6 @@ void setupHeader(int iRxEntry, enum interfaceType type, uint32_t destip,
     defined(XILINX_CHIPTESTBOARDD)
 void calcChecksum(udp_header *udp);
 #endif
-#ifdef GOTTHARDD
-int getAdcConfigured();
-#endif
 
 int configureMAC();
 int setDetectorPosition(int pos[]);
@@ -639,10 +605,6 @@ int getActivate(int *retval);
 int getDataStream(enum portPosition port, int *retval);
 int setDataStream(enum portPosition port, int enable);
 
-// gotthard specific - adc phase
-#elif GOTTHARDD
-int setPhase(enum CLKINDEX ind, int val, int degrees);
-
 #elif MYTHEN3D
 int checkDetectorType(char *mess);
 int powerChip(int on);
@@ -742,8 +704,7 @@ int softwareTrigger();
 #if defined(EIGERD) || defined(JUNGFRAUD) || defined(MOENCHD)
 int softwareTrigger(int block);
 #endif
-#if defined(EIGERD) || defined(MYTHEN3D) || defined(CHIPTESTBOARDD) ||         \
-    defined(XILINX_CHIPTESTBOARDD)
+#if defined(EIGERD) || defined(MYTHEN3D) || defined(CHIPTESTBOARDD)
 int startReadOut();
 #endif
 enum runStatus getRunStatus();
@@ -762,16 +723,11 @@ int checkFifoForEndOfAcquisition();
 int readFrameFromFifo();
 #endif
 
-#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(MOENCHD) ||            \
-    defined(CHIPTESTBOARDD) || defined(MYTHEN3D) || defined(GOTTHARD2D) ||     \
-    defined(XILINX_CHIPTESTBOARDD)
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD) ||       \
+    defined(MYTHEN3D) || defined(GOTTHARD2D) || defined(XILINX_CHIPTESTBOARDD)
 u_int32_t runBusy();
 #endif
 
-#ifdef GOTTHARDD
-u_int32_t runState(enum TLogLevel lev);
-#endif
-
 // common
 int calculateDataBytes();
 int getTotalNumberOfChannels();

slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h

@@ -104,7 +104,7 @@ int set_pattern_word(int);
 int set_pattern_loop_addresses(int);
 int set_pattern_loop_cycles(int);
 int set_pattern_wait_addr(int);
-int set_pattern_wait_time(int);
+int set_pattern_wait_clocks(int);
 int set_pattern_mask(int);
 int get_pattern_mask(int);
 int set_pattern_bit_mask(int);
@@ -336,3 +336,5 @@ int get_timing_info_decoder(int);
 int set_timing_info_decoder(int);
 int get_collection_mode(int);
 int set_collection_mode(int);
+int get_pattern_wait_interval(int);
+int set_pattern_wait_interval(int);

slsDetectorServers/slsDetectorServer/src/AD9252.c

@@ -1,212 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-or-other
-// Copyright (C) 2021 Contributors to the SLS Detector Package
-#include "AD9252.h"
-#include "blackfin.h"
-#include "clogger.h"
-#include "commonServerFunctions.h" // blackfin.h, ansi.h
-
-/* AD9252 ADC DEFINES */
-#define AD9252_ADC_NUMBITS (24)
-
-// default value is 0xF
-#define AD9252_DEV_IND_2_REG (0x04)
-#define AD9252_CHAN_H_OFST   (0)
-#define AD9252_CHAN_H_MSK    (0x00000001 << AD9252_CHAN_H_OFST)
-#define AD9252_CHAN_G_OFST   (1)
-#define AD9252_CHAN_G_MSK    (0x00000001 << AD9252_CHAN_G_OFST)
-#define AD9252_CHAN_F_OFST   (2)
-#define AD9252_CHAN_F_MSK    (0x00000001 << AD9252_CHAN_F_OFST)
-#define AD9252_CHAN_E_OFST   (3)
-#define AD9252_CHAN_E_MSK    (0x00000001 << AD9252_CHAN_E_OFST)
-
-// default value is 0x0F
-#define AD9252_DEV_IND_1_REG    (0x05)
-#define AD9252_CHAN_D_OFST      (0)
-#define AD9252_CHAN_D_MSK       (0x00000001 << AD9252_CHAN_D_OFST)
-#define AD9252_CHAN_C_OFST      (1)
-#define AD9252_CHAN_C_MSK       (0x00000001 << AD9252_CHAN_C_OFST)
-#define AD9252_CHAN_B_OFST      (2)
-#define AD9252_CHAN_B_MSK       (0x00000001 << AD9252_CHAN_B_OFST)
-#define AD9252_CHAN_A_OFST      (3)
-#define AD9252_CHAN_A_MSK       (0x00000001 << AD9252_CHAN_A_OFST)
-#define AD9252_CLK_CH_DCO_OFST  (4)
-#define AD9252_CLK_CH_DCO_MSK   (0x00000001 << AD9252_CLK_CH_DCO_OFST)
-#define AD9252_CLK_CH_IFCO_OFST (5)
-#define AD9252_CLK_CH_IFCO_MSK  (0x00000001 << AD9252_CLK_CH_IFCO_OFST)
-
-// default value is 0x00
-#define AD9252_POWER_MODE_REG      (0x08)
-#define AD9252_POWER_INTERNAL_OFST (0)
-#define AD9252_POWER_INTERNAL_MSK  (0x00000007 << AD9252_POWER_INTERNAL_OFST)
-#define AD9252_INT_CHIP_RUN_VAL                                                \
-    ((0x0 << AD9252_POWER_INTERNAL_OFST) & AD9252_POWER_INTERNAL_MSK)
-#define AD9252_INT_FULL_PWR_DWN_VAL                                            \
-    ((0x1 << AD9252_POWER_INTERNAL_OFST) & AD9252_POWER_INTERNAL_MSK)
-#define AD9252_INT_STANDBY_VAL                                                 \
-    ((0x2 << AD9252_POWER_INTERNAL_OFST) & AD9252_POWER_INTERNAL_MSK)
-#define AD9252_INT_RESET_VAL                                                   \
-    ((0x3 << AD9252_POWER_INTERNAL_OFST) & AD9252_POWER_INTERNAL_MSK)
-
-// default value is 0x0
-#define AD9252_TEST_MODE_REG (0x0D)
-#define AD9252_OUT_TEST_OFST (0)
-#define AD9252_OUT_TEST_MSK  (0x0000000F << AD9252_OUT_TEST_OFST)
-#define AD9252_TST_OFF_VAL   ((0x0 << AD9252_OUT_TEST_OFST) & AD9252_OUT_TEST_MSK)
-#define AD9252_TST_MDSCL_SHRT_VAL                                              \
-    ((0x1 << AD9252_OUT_TEST_OFST) & AD9252_OUT_TEST_MSK)
-#define AD9252_TST_PSTV_FS_VAL                                                 \
-    ((0x2 << AD9252_OUT_TEST_OFST) & AD9252_OUT_TEST_MSK)
-#define AD9252_TST_NGTV_FS_VAL                                                 \
-    ((0x3 << AD9252_OUT_TEST_OFST) & AD9252_OUT_TEST_MSK)
-#define AD9252_TST_ALTRNTNG_CHKRBRD_VAL                                        \
-    ((0x4 << AD9252_OUT_TEST_OFST) & AD9252_OUT_TEST_MSK)
-#define AD9252_TST_PN_23_SQNC_VAL                                              \
-    ((0x5 << AD9252_OUT_TEST_OFST) & AD9252_OUT_TEST_MSK)
-#define AD9252_TST_PN_9_SQNC__VAL                                              \
-    ((0x6 << AD9252_OUT_TEST_OFST) & AD9252_OUT_TEST_MSK)
-#define AD9252_TST_1_0_WRD_TGGL_VAL                                            \
-    ((0x7 << AD9252_OUT_TEST_OFST) & AD9252_OUT_TEST_MSK)
-#define AD9252_TST_USR_INPT_VAL                                                \
-    ((0x8 << AD9252_OUT_TEST_OFST) & AD9252_OUT_TEST_MSK)
-#define AD9252_TST_1_0_BT_TGGL_VAL                                             \
-    ((0x9 << AD9252_OUT_TEST_OFST) & AD9252_OUT_TEST_MSK)
-#define AD9252_TST_1_x_SYNC_VAL                                                \
-    ((0xa << AD9252_OUT_TEST_OFST) & AD9252_OUT_TEST_MSK)
-#define AD9252_TST_1_BIT_HGH_VAL                                               \
-    ((0xb << AD9252_OUT_TEST_OFST) & AD9252_OUT_TEST_MSK)
-#define AD9252_TST_MXD_BT_FRQ_VAL                                              \
-    ((0xc << AD9252_OUT_TEST_OFST) & AD9252_OUT_TEST_MSK)
-#define AD9252_TST_RST_SHRT_GN_OFST (4)
-#define AD9252_TST_RST_SHRT_GN_MSK  (0x00000001 << AD9252_TST_RST_SHRT_GN_OFST)
-#define AD9252_TST_RST_LNG_GN_OFST  (5)
-#define AD9252_TST_RST_LNG_GN_MSK   (0x00000001 << AD9252_TST_RST_LNG_GN_OFST)
-#define AD9252_USER_IN_MODE_OFST    (6)
-#define AD9252_USER_IN_MODE_MSK     (0x00000003 << AD9252_USER_IN_MODE_OFST)
-#define AD9252_USR_IN_SNGL_VAL                                                 \
-    ((0x0 << AD9252_USER_IN_MODE_OFST) & AD9252_USER_IN_MODE_MSK)
-#define AD9252_USR_IN_ALTRNT_VAL                                               \
-    ((0x1 << AD9252_USER_IN_MODE_OFST) & AD9252_USER_IN_MODE_MSK)
-#define AD9252_USR_IN_SNGL_ONC_VAL                                             \
-    ((0x2 << AD9252_USER_IN_MODE_OFST) & AD9252_USER_IN_MODE_MSK)
-#define AD9252_USR_IN_ALTRNT_ONC_VAL                                           \
-    ((0x3 << AD9252_USER_IN_MODE_OFST) & AD9252_USER_IN_MODE_MSK)
-
-// default value is 0x00
-#define AD9252_OUT_MODE_REG    (0x14)
-#define AD9252_OUT_FORMAT_OFST (0)
-#define AD9252_OUT_FORMAT_MSK  (0x00000003 << AD9252_OUT_FORMAT_OFST)
-#define AD9252_OUT_BINARY_OFST_VAL                                             \
-    ((0x0 << AD9252_OUT_FORMAT_OFST) & AD9252_OUT_FORMAT_MSK)
-#define AD9252_OUT_TWOS_COMPL_VAL                                              \
-    ((0x1 << AD9252_OUT_FORMAT_OFST) & AD9252_OUT_FORMAT_MSK)
-#define AD9252_OUT_OTPT_INVRT_OFST (2)
-#define AD9252_OUT_OTPT_INVRT_MSK  (0x00000001 << AD9252_OUT_OTPT_INVRT_OFST)
-#define AD9252_OUT_LVDS_OPT_OFST   (6)
-#define AD9252_OUT_LVDS_OPT_MSK    (0x00000001 << AD9252_OUT_LVDS_OPT_OFST)
-#define AD9252_OUT_LVDS_ANSI_VAL                                               \
-    ((0x0 << AD9252_OUT_LVDS_OPT_OFST) & AD9252_OUT_LVDS_OPT_MSK)
-#define AD9252_OUT_LVDS_IEEE_VAL                                               \
-    ((0x1 << AD9252_OUT_LVDS_OPT_OFST) & AD9252_OUT_LVDS_OPT_MSK)
-
-// default value is 0x3
-#define AD9252_OUT_PHASE_REG (0x16)
-#define AD9252_OUT_CLK_OFST  (0)
-#define AD9252_OUT_CLK_MSK   (0x0000000F << AD9252_OUT_CLK_OFST)
-#define AD9252_OUT_CLK_0_VAL ((0x0 << AD9252_OUT_CLK_OFST) & AD9252_OUT_CLK_MSK)
-#define AD9252_OUT_CLK_60_VAL                                                  \
-    ((0x1 << AD9252_OUT_CLK_OFST) & AD9252_OUT_CLK_MSK)
-#define AD9252_OUT_CLK_120_VAL                                                 \
-    ((0x2 << AD9252_OUT_CLK_OFST) & AD9252_OUT_CLK_MSK)
-#define AD9252_OUT_CLK_180_VAL                                                 \
-    ((0x3 << AD9252_OUT_CLK_OFST) & AD9252_OUT_CLK_MSK)
-#define AD9252_OUT_CLK_300_VAL                                                 \
-    ((0x5 << AD9252_OUT_CLK_OFST) & AD9252_OUT_CLK_MSK)
-#define AD9252_OUT_CLK_360_VAL                                                 \
-    ((0x6 << AD9252_OUT_CLK_OFST) & AD9252_OUT_CLK_MSK)
-#define AD9252_OUT_CLK_480_VAL                                                 \
-    ((0x8 << AD9252_OUT_CLK_OFST) & AD9252_OUT_CLK_MSK)
-#define AD9252_OUT_CLK_540_VAL                                                 \
-    ((0x9 << AD9252_OUT_CLK_OFST) & AD9252_OUT_CLK_MSK)
-#define AD9252_OUT_CLK_600_VAL                                                 \
-    ((0xa << AD9252_OUT_CLK_OFST) & AD9252_OUT_CLK_MSK)
-#define AD9252_OUT_CLK_660_VAL                                                 \
-    ((0xb << AD9252_OUT_CLK_OFST) & AD9252_OUT_CLK_MSK) // 0xb - 0xf is 660
-
-// defines from the fpga
-uint32_t AD9252_Reg = 0x0;
-uint32_t AD9252_CsMask = 0x0;
-uint32_t AD9252_ClkMask = 0x0;
-uint32_t AD9252_DigMask = 0x0;
-int AD9252_DigOffset = 0x0;
-
-void AD9252_SetDefines(uint32_t reg, uint32_t cmsk, uint32_t clkmsk,
-                       uint32_t dmsk, int dofst) {
-    AD9252_Reg = reg;
-    AD9252_CsMask = cmsk;
-    AD9252_ClkMask = clkmsk;
-    AD9252_DigMask = dmsk;
-    AD9252_DigOffset = dofst;
-}
-
-void AD9252_Disable() {
-    bus_w(AD9252_Reg, (bus_r(AD9252_Reg) | AD9252_CsMask | AD9252_ClkMask) &
-                          ~(AD9252_DigMask));
-}
-
-void AD9252_Set(int addr, int val) {
-
-    u_int32_t codata;
-    codata = val + (addr << 8);
-    LOG(logINFO,
-        ("\tSetting ADC SPI Register. Wrote 0x%04x at 0x%04x\n", val, addr));
-    serializeToSPI(AD9252_Reg, codata, AD9252_CsMask, AD9252_ADC_NUMBITS,
-                   AD9252_ClkMask, AD9252_DigMask, AD9252_DigOffset, 0);
-}
-
-void AD9252_Configure() {
-    LOG(logINFOBLUE, ("Configuring ADC9252:\n"));
-
-    // power mode reset
-    LOG(logINFO, ("\tPower mode reset\n"));
-    AD9252_Set(AD9252_POWER_MODE_REG, AD9252_INT_RESET_VAL);
-
-    // power mode chip run
-    LOG(logINFO, ("\tPower mode chip run\n"));
-    AD9252_Set(AD9252_POWER_MODE_REG, AD9252_INT_CHIP_RUN_VAL);
-
-    // binary offset
-    LOG(logINFO, ("\tBinary offset\n"));
-    AD9252_Set(AD9252_OUT_MODE_REG, AD9252_OUT_BINARY_OFST_VAL);
-
-    // output clock phase
-#ifdef GOTTHARDD
-    LOG(logINFO, ("\tOutput clock phase is at default: 180\n"));
-#else
-    LOG(logINFO, ("\tOutput clock phase: 60\n"));
-    AD9257_Set(AD9257_OUT_PHASE_REG, AD9257_OUT_CLK_60_VAL);
-#endif
-
-    // lvds-iee reduced , binary offset
-    LOG(logINFO, ("\tLvds-iee reduced, binary offset\n"));
-    AD9252_Set(AD9252_OUT_MODE_REG, AD9252_OUT_LVDS_IEEE_VAL);
-
-    // all devices on chip to receive next command
-    LOG(logINFO, ("\tAll devices on chip to receive next command\n"));
-    AD9252_Set(AD9252_DEV_IND_2_REG, AD9252_CHAN_H_MSK | AD9252_CHAN_G_MSK |
-                                         AD9252_CHAN_F_MSK | AD9252_CHAN_E_MSK);
-    AD9252_Set(AD9252_DEV_IND_1_REG, AD9252_CHAN_D_MSK | AD9252_CHAN_C_MSK |
-                                         AD9252_CHAN_B_MSK | AD9252_CHAN_A_MSK |
-                                         AD9252_CLK_CH_DCO_MSK |
-                                         AD9252_CLK_CH_IFCO_MSK);
-
-    // no test mode
-    LOG(logINFO, ("\tNo test mode\n"));
-    AD9252_Set(AD9252_TEST_MODE_REG, AD9252_TST_OFF_VAL);
-
-#ifdef TESTADC
-    LOG(logINFOBLUE, ("Putting ADC in Test Mode!\n");
-    // mixed bit frequency test mode
-    LOG(logINFO, ("\tMixed bit frequency test mode\n"));
-    AD9252_Set(AD9252_TEST_MODE_REG, AD9252_TST_MXD_BT_FRQ_VAL);
-#endif
-}

slsDetectorServers/slsDetectorServer/src/AD9257.c

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

slsDetectorServers/slsDetectorServer/src/common.c

@@ -504,8 +504,7 @@ int setupDetectorServer(char *mess, char *sname) {
 
     // blackfin boards (respawn) (only kept for backwards compatibility)
 #ifndef VIRTUAL
-#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD) ||       \
-    defined(GOTTHARDD)
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD)
     // delete every line with DetectorServer in /etc/inittab
     strcpy(cmd, "sed -i '/DetectorServer/d' /etc/inittab");
     if (executeCommand(cmd, retvals, logDEBUG1) == FAIL) {

slsDetectorServers/slsDetectorServer/src/loadPattern.c

@@ -11,6 +11,10 @@
 
 #ifdef MYTHEN3D
 extern enum TLogLevel trimmingPrint;
+extern uint32_t clkDivider[];
+#endif
+#ifdef CHIPTESTBOARDD
+extern uint32_t clkFrequency[];
 #endif
 
 #if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD)
@@ -317,7 +321,8 @@ void setPatternWaitAddress(int level, int addr) {
     }
 }
 
-int validate_getPatternWaitTime(char *message, int level, uint64_t *waittime) {
+int validate_getPatternWaitClocksAndInterval(char *message, int level,
+                                             uint64_t *waittime, int clocks) {
     // validate input
     if (level < 0 || level >= MAX_LEVELS) {
         sprintf(message,
@@ -326,11 +331,15 @@ int validate_getPatternWaitTime(char *message, int level, uint64_t *waittime) {
         LOG(logERROR, (message));
         return FAIL;
     }
-    *waittime = getPatternWaitTime(level);
+    if (clocks) {
+        *waittime = getPatternWaitClocks(level);
+    } else {
+        *waittime = getPatternWaitInterval(level);
+    }
     return OK;
 }
 
-uint64_t getPatternWaitTime(int level) {
+uint64_t getPatternWaitClocks(int level) {
     switch (level) {
     case 0:
         return getU64BitReg(PATTERN_WAIT_TIMER_0_LSB_REG,
@@ -357,7 +366,25 @@ uint64_t getPatternWaitTime(int level) {
     }
 }
 
-int validate_setPatternWaitTime(char *message, int level, uint64_t waittime) {
+uint64_t getPatternWaitInterval(int level) {
+    uint64_t numClocks = getPatternWaitClocks(level);
+    int runclk = 0;
+#ifdef CHIPTESTBOARDD
+    runclk = clkFrequency[RUN_CLK];
+#elif XILINX_CHIPTESTBOARDD
+    runclk = RUN_CLK;
+#elif MYTHEN3D
+    runclk = clkDivider[SYSTEM_C0];
+#endif
+    if (runclk == 0) {
+        LOG(logERROR, ("runclk is 0. Cannot divide by 0. Returning -1.\n"));
+        return -1;
+    }
+    return numClocks / (1E-3 * runclk);
+}
+
+int validate_setPatternWaitClocksAndInterval(char *message, int level,
+                                             uint64_t waittime, int clocks) {
     // validate input
     if (level < 0 || level >= MAX_LEVELS) {
         sprintf(message,
@@ -367,12 +394,21 @@ int validate_setPatternWaitTime(char *message, int level, uint64_t waittime) {
         return FAIL;
     }
 
-    setPatternWaitTime(level, waittime);
+    uint64_t retval = 0;
+    if (clocks) {
+        setPatternWaitClocks(level, waittime);
+        // validate result
+        retval = getPatternWaitClocks(level);
+        LOG(logDEBUG1, ("Pattern wait time in clocks (level:%d) retval: %d\n",
+                        level, (long long int)retval));
+    } else {
+        setPatternWaitInterval(level, waittime);
+        // validate result
+        retval = getPatternWaitInterval(level);
+        LOG(logDEBUG1, ("Pattern wait time (level:%d) retval: %d\n", level,
+                        (long long int)retval));
+    }
 
-    // validate result
-    uint64_t retval = getPatternWaitTime(level);
-    LOG(logDEBUG1, ("Pattern wait time (level:%d) retval: %d\n", level,
-                    (long long int)retval));
     int ret = OK;
     char mode[128];
     memset(mode, 0, sizeof(mode));
@@ -381,13 +417,13 @@ int validate_setPatternWaitTime(char *message, int level, uint64_t waittime) {
     return ret;
 }
 
-void setPatternWaitTime(int level, uint64_t t) {
+void setPatternWaitClocks(int level, uint64_t t) {
 #ifdef MYTHEN3D
     LOG(trimmingPrint,
 #else
     LOG(logINFO,
 #endif
-        ("Setting Pattern Wait Time (level:%d) :%lld\n", level,
+        ("Setting Pattern Wait Time in clocks (level:%d) :%lld\n", level,
          (long long int)t));
     switch (level) {
     case 0:
@@ -421,6 +457,26 @@ void setPatternWaitTime(int level, uint64_t t) {
     }
 }
 
+void setPatternWaitInterval(int level, uint64_t t) {
+#ifdef MYTHEN3D
+    LOG(trimmingPrint,
+#else
+    LOG(logINFO,
+#endif
+        ("Setting Pattern Wait Time (level:%d) :%lld ns\n", level,
+         (long long int)t));
+    int runclk = 0;
+#ifdef CHIPTESTBOARDD
+    runclk = clkFrequency[RUN_CLK];
+#elif XILINX_CHIPTESTBOARDD
+    runclk = RUN_CLK;
+#elif MYTHEN3D
+        runclk = clkDivider[SYSTEM_C0];
+#endif
+    uint64_t numClocks = t * (1E-3 * runclk);
+    setPatternWaitClocks(level, numClocks);
+}
+
 int validate_getPatternLoopCycles(char *message, int level, int *numLoops) {
     // validate input
     if (level < 0 || level >= MAX_LEVELS) {
@@ -797,7 +853,7 @@ int loadPattern(char *message, enum TLogLevel printLevel,
         }
     }
     // iocontrol
-#if !defined(MYTHEN3D) && !defined(XILINX_CHIPTESTBOARDD) // TODO
+#if !defined(MYTHEN3D)
     if (ret == OK) {
         ret = validate_writePatternIOControl(message, pat->ioctrl);
     }
@@ -830,7 +886,8 @@ int loadPattern(char *message, enum TLogLevel printLevel,
             }
 
             // wait time
-            ret = validate_setPatternWaitTime(message, i, pat->waittime[i]);
+            ret = validate_setPatternWaitClocksAndInterval(message, i,
+                                                           pat->waittime[i], 1);
             if (ret == FAIL) {
                 break;
             }
@@ -857,7 +914,7 @@ int getPattern(char *message, patternParameters *pat) {
         pat->word[i] = retval64;
     }
     // iocontrol
-#if !defined(MYTHEN3D) && !defined(XILINX_CHIPTESTBOARDD) // TODO
+#if !defined(MYTHEN3D)
     if (ret == OK) {
         validate_readPatternIOControl();
     }
@@ -894,7 +951,8 @@ int getPattern(char *message, patternParameters *pat) {
             pat->wait[i] = retval1;
 
             // wait time
-            ret = validate_getPatternWaitTime(message, i, &retval64);
+            ret = validate_getPatternWaitClocksAndInterval(message, i,
+                                                           &retval64, 1);
             if (ret == FAIL) {
                 break;
             }
@@ -993,12 +1051,12 @@ int loadPatternFile(char *patFname, char *errMessage) {
         }
 
         // patioctrl
-#if !defined(MYTHEN3D) && !defined(XILINX_CHIPTESTBOARDD) // TODO
+#if !defined(MYTHEN3D) // TODO
         if (!strncmp(line, "patioctrl", strlen("patioctrl"))) {
             uint64_t arg = 0;
 
             // cannot scan values
-#ifdef VIRTUAL
+#if defined(VIRTUAL) || defined(XILINX_CHIPTESTBOARDD)
             if (sscanf(line, "%s 0x%lx", command, &arg) != 2) {
 #else
             if (sscanf(line, "%s 0x%llx", command, &arg) != 2) {
@@ -1095,7 +1153,8 @@ int loadPatternFile(char *patFname, char *errMessage) {
                 break;
             }
 
-            if (validate_setPatternWaitTime(temp, level, waittime) == FAIL) {
+            if (validate_setPatternWaitClocksAndInterval(temp, level, waittime,
+                                                         1) == FAIL) {
                 break;
             }
         }