wip print

.gitea/workflows/rh8-native.yml

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

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

.github/workflows/cmake.yml

@@ -1,4 +1,4 @@
-name: Native CMake Build
+name: CMake
 
 on: [push, pull_request]
 
@@ -14,16 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     name: Configure and build using cmake
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: 3.12
-          cache: 'pip'
-      - run: pip install pytest numpy
-
+      - uses: actions/checkout@v3
       - uses: awalsh128/cache-apt-pkgs-action@latest
         with:
-          packages: libhdf5-dev qtbase5-dev qt5-qmake libqt5svg5-dev libpng-dev libtiff-dev
+          packages: libhdf5-dev qtbase5-dev qt5-qmake libqt5svg5-dev
           version: 1.0
 
       - name: Configure CMake
@@ -33,15 +27,12 @@ jobs:
 
       - name: Build
         # Build your program with the given configuration
-        run: cmake --build ${{github.workspace}}/build -j4 --config ${{env.BUILD_TYPE}}
+        run: cmake --build ${{github.workspace}}/build -j2 --config ${{env.BUILD_TYPE}}
 
-      - name: C++ unit tests
+      - name: Test
         working-directory: ${{github.workspace}}/build
+        # Execute tests defined by the CMake configuration.
+        # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
         run: ctest -C ${{env.BUILD_TYPE}} -j1
 
-      - name: Python unit tests
-        working-directory: ${{github.workspace}}/build/bin
-        run: |
-          python -m pytest ${{github.workspace}}/python/tests
-
 

.github/workflows/conda_library.yaml

@@ -1,42 +0,0 @@
-name: Build slsdetlib
-
-on: [pull_request]
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [ubuntu-latest, ] # macos-12, windows-2019]
-        python-version: ["3.12",]
-
-    runs-on: ${{ matrix.platform }}
-
-    # The setup-miniconda action needs this to activate miniconda
-    defaults:
-      run:
-        shell: "bash -l {0}"
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Get conda
-        uses: conda-incubator/setup-miniconda@v3.0.4
-        with:
-          python-version: ${{ matrix.python-version }}
-          channels: conda-forge
-
-      - name: Prepare
-        run: conda install conda-build conda-verify pytest anaconda-client
-
-      - name: Disable upload
-        run: conda config --set anaconda_upload no
-
-      - name: Build
-        run: conda build conda-recipes/main-library --output-folder build_output
-
-      - name: Upload all Conda packages
-        uses: actions/upload-artifact@v4
-        with:
-          name: conda-packages
-          path: build_output/**  # Uploads all packages

.github/workflows/conda_python.yaml

@@ -1,42 +0,0 @@
-name: slsdet
-
-on: [pull_request]
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [ubuntu-latest, ] # macos-12, windows-2019]
-        python-version: ["3.12",]
-
-    runs-on: ${{ matrix.platform }}
-
-    # The setup-miniconda action needs this to activate miniconda
-    defaults:
-      run:
-        shell: "bash -l {0}"
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Get conda
-        uses: conda-incubator/setup-miniconda@v3.0.4
-        with:
-          python-version: ${{ matrix.python-version }}
-          channels: conda-forge
-
-      - name: Prepare
-        run: conda install conda-build conda-verify pytest anaconda-client
-
-      - name: Disable upload
-        run: conda config --set anaconda_upload no
-
-      - name: Build
-        run: conda build conda-recipes/python-client --output-folder build_output 
-
-      - name: Upload all Conda packages
-        uses: actions/upload-artifact@v4
-        with:
-          name: conda-packages
-          path: build_output/**  # Uploads all packages

CMakeFiles/cmake.check_cache

@@ -0,0 +1 @@
+# This file is generated by cmake for dependency checking of the CMakeCache.txt file

CMakeLists.txt

@@ -1,16 +1,8 @@
 # SPDX-License-Identifier: LGPL-3.0-or-other
 # Copyright (C) 2021 Contributors to the SLS Detector Package
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.14)
 project(slsDetectorPackage)
-
-# Read VERSION file into project version
-set(VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/VERSION")
-file(READ "${VERSION_FILE}" VERSION_CONTENT)
-string(STRIP "${VERSION_CONTENT}" PROJECT_VERSION_STRING)
-set(PROJECT_VERSION ${PROJECT_VERSION_STRING})
-
-# Pass it to the compiler
-add_compile_definitions(SLS_DET_VERSION="${PROJECT_VERSION}")
+set(PROJECT_VERSION 9.0.0)
 
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
 
@@ -21,7 +13,6 @@ if (${CMAKE_VERSION} VERSION_GREATER "3.24")
 endif()
 include(cmake/project_version.cmake)
 include(cmake/SlsAddFlag.cmake)
-include(cmake/helpers.cmake)
 
 
 
@@ -30,44 +21,20 @@ include(FetchContent)
 option(SLS_FETCH_ZMQ_FROM_GITHUB "Fetch zmq from github" OFF)
 option(SLS_FETCH_PYBIND11_FROM_GITHUB "Fetch pybind11 from github" OFF)
 
-
-
-# Allow FetchContent_Populate to be called with a single argument
-# otherwise deprecated warning is issued
-# Note: From cmake 3.28 we can pass EXCLUDE_FROM_ALL to FetchContent_Declare
-# and avoid direct use of Populate
-if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.30")
-    cmake_policy(SET CMP0169 OLD) 
-endif()
-
-# Patch libzmq to set minimum cmake version to 3.15 to avoid warnings
-# with newer cmake versions
-# 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
-    # using the bundled version
+    # using the bundled verison
     FetchContent_Declare(
         libzmq
         GIT_REPOSITORY https://github.com/zeromq/libzmq.git
-        GIT_TAG        v${SLS_LIBZMQ_VERSION}
-        PATCH_COMMAND ${CMAKE_COMMAND} -E chdir <SOURCE_DIR> patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/libs/libzmq/libzmq_cmake_version.patch
-        UPDATE_DISCONNECTED 1
+        GIT_TAG        v4.3.4
     )
 else()
     # Standard behaviour use libzmq included in this repo (libs/libzmq)
     FetchContent_Declare(
         libzmq
-        URL ${CMAKE_CURRENT_SOURCE_DIR}/libs/libzmq/libzmq-${SLS_LIBZMQ_VERSION}.tar.gz
+        URL ${CMAKE_CURRENT_SOURCE_DIR}/libs/libzmq/libzmq-4.3.4.tar.gz
         URL_HASH MD5=cc20b769ac10afa352e5ed2769bb23b3
-        PATCH_COMMAND ${CMAKE_COMMAND} -E chdir <SOURCE_DIR> patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/libs/libzmq/libzmq_cmake_version.patch
-        UPDATE_DISCONNECTED 1
     )
 endif()
 
@@ -79,11 +46,6 @@ set(ENABLE_CPACK OFF CACHE BOOL "")
 set(ENABLE_CLANG OFF CACHE BOOL "")
 set(ENABLE_CURVE OFF CACHE BOOL "")
 set(ENABLE_DRAFTS OFF CACHE BOOL "")
-set(ENABLE_PRECOMPILED OFF CACHE BOOL "")
-set(WITH_DOC OFF CACHE BOOL "")
-set(WITH_DOCS OFF CACHE BOOL "")
-
- 
 
 # Using GetProperties and Populate to be able to exclude zmq
 # from install (not possible with FetchContent_MakeAvailable(libzmq))
@@ -194,9 +156,11 @@ find_package(ClangFormat)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-default_build_type("Release")
-set_std_fs_lib()
-message(STATUS "Extra linking to fs lib:${STD_FS_LIB}")
+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()
+
 
 #Enable LTO if available
 include(CheckIPOSupported)
@@ -219,7 +183,7 @@ endif()
 # to control options for the libraries
 if(NOT TARGET slsProjectOptions)
     add_library(slsProjectOptions INTERFACE)
-   target_compile_features(slsProjectOptions INTERFACE cxx_std_17)
+    target_compile_features(slsProjectOptions INTERFACE cxx_std_11)
 endif()
 
 if (NOT TARGET slsProjectWarnings)
@@ -277,8 +241,8 @@ endif()
 if(SLS_USE_SANITIZER)
     target_compile_options(slsProjectOptions INTERFACE -fsanitize=address,undefined -fno-omit-frame-pointer)
     target_link_libraries(slsProjectOptions INTERFACE -fsanitize=address,undefined)
-    #target_compile_options(slsProjectOptions INTERFACE -fsanitize=thread -fno-omit-frame-pointer)
-    #target_link_libraries(slsProjectOptions INTERFACE -fsanitize=thread)
+    # target_compile_options(slsProjectOptions INTERFACE -fsanitize=thread)
+    # target_link_libraries(slsProjectOptions INTERFACE -fsanitize=thread)
 endif()
 
 
@@ -332,21 +296,19 @@ if (SLS_USE_INTEGRATION_TESTS)
 endif (SLS_USE_INTEGRATION_TESTS)
 
 if (SLS_USE_PYTHON)
-    find_package (Python 3.8 COMPONENTS Interpreter Development.Module REQUIRED)
-    set(PYBIND11_FINDPYTHON ON) # Needed for RH8
+    find_package (Python 3.6 COMPONENTS Interpreter Development)
     if(SLS_FETCH_PYBIND11_FROM_GITHUB)
         FetchContent_Declare(
             pybind11
             GIT_REPOSITORY https://github.com/pybind/pybind11
-            GIT_TAG        v2.13.6
+            GIT_TAG        v2.11.0
         )
 
     else()
-    # https://github.com/pybind/pybind11/releases
         FetchContent_Declare(
             pybind11
-            URL ${CMAKE_CURRENT_SOURCE_DIR}/libs/pybind11/v2.13.6.tar.gz
-            URL_HASH MD5=a04dead9c83edae6d84e2e343da7feeb
+            URL ${CMAKE_SOURCE_DIR}/libs/pybind11/v2.11.0.tar.gz
+            URL_HASH MD5=90c4946e87c64d8d8fc0ae4edf35d780
         )
     endif()
     FetchContent_MakeAvailable(pybind11)
@@ -358,15 +320,9 @@ if (SLS_USE_CTBGUI)
     add_subdirectory(pyctbgui)
 endif(SLS_USE_CTBGUI)
 
-# Workaround for file note being copied to build directory
-# when issuing a python -m build
-# TODO! Proper fix
-if(EXISTS ".clang-tidy")
-    configure_file(.clang-tidy  
+configure_file( .clang-tidy  
     ${CMAKE_BINARY_DIR}/.clang-tidy  
-    )
-endif()
-
+)
 
 if (SLS_BUILD_EXAMPLES)
     add_subdirectory(sample)

README.md

@@ -2,11 +2,7 @@
 Before building from source make sure that you have the [software wiki](https://slsdetectorgroup.github.io/devdoc/dependencies.html) installed. If installing using conda, conda will manage the dependencies. Avoid also installing packages with pip. 
 
 ## Documentaion
-Detailed documentation including installation can be found in the [software wiki](https://slsdetectorgroup.github.io/devdoc/index.html).
-
-Different releases can be found on the [official site](https://www.psi.ch/en/lxn/software-releases).
-
-Firmware compatiblity can be found in [firmware page](https://github.com/slsdetectorgroup/slsDetectorFirmware)
+Detailed documentation can be found in the [software wiki](https://slsdetectorgroup.github.io/devdoc/index.html) and on the [official site](https://www.psi.ch/en/detectors/software).
 
 ## Installation
 
@@ -46,20 +42,33 @@ conda search slsdet
 conda search slsdetgui
 ```
 
-## 2. Build from source
+### 2. Build from source
 
-### 2.1 Download Source Code from github
+##### 2.1 Download Source Code from github
 ```
 git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git --branch 7.0.0
 ```
 
-> **Note:** For v6.x.x of slsDetectorPackage and older, refer [pybind11 notes on cloning](#Pybind-and-Zeromq).
+**Pybind for Python**<br>
+* **v7.0.0+**:
+pybind11 packaged into 'libs/pybind'. No longer a submodule. No need for "recursive" or "submodule update".
+ 
+* **Older versions**:
+   pybind11 is a submodule. Must be cloned using "recursive" and updated when switching between versions using the following commands.
+
+```
+# clone using recursive to get pybind11 submodule
+git clone --recursive https://github.com/slsdetectorgroup/slsDetectorPackage.git
+
+# update submodule when switching between releases
+cd slsDetectorPackage
+git submodule update --init
+```
+
+##### 2.2 Build from source
 
 
-### 2.2 Build from source
-
-
-### Build using CMake
+###### Build using CMake
 
 ```
 # outside slsDetecorPackage folder
@@ -85,28 +94,26 @@ Instead of the cmake command, one can use ccmake to get a list of options to con
 ccmake ..
  
 # choose the options
-# first press [c] - configure (unil you see [g])
+# first press [c] - configure
 # then press [g] - generate
 ```
 
 |Example cmake options|Comment|
 |---|---|
 | -DSLS_USE_PYTHON=ON            | Python                                 |   
-| -DPython_FIND_VIRTUALENV=ONLY  | Python from only the conda env         | 
+| -DPython_FIND_VIRTUALENV=ONLY  | Python from only the conda environment |
+| -DZeroMQ_HINT=/usr/lib64       | Use system zmq instead                 |    
 | -DSLS_USE_GUI=ON               | GUI                                    |
-| -DSLS_USE_HDF5=ON              | HDF5                                   |
-| -DSLS_USE_SIMULATOR=ON         | Simulator                              |
 
-> **Note:** For v7.x.x of slsDetectorPackage and older, refer [zeromq notes for cmake option to hint library location](#Pybind-and-Zeromq).
 
-### Build using in-built cmk.sh script
+###### Build using in-built cmk.sh script
 
 ```
 The binaries are generated in slsDetectorPackage/build/bin directory.
 
-Usage: $0 [-b] [-c] [-d <HDF5 directory>] [-e] [-g] [-h] [-i]
-[-j <Number of threads>] [-k <CMake command>] [-l <Install directory>]
-[-m] [-n] [-p] [-r] [-s] [-t] [-u] [-z]
+Usage: ./cmk.sh [-b] [-c] [-d <HDF5 directory>] [e] [g] [-h] [i] [-j <Number of threads>] 
+[-k <CMake command>] [-l <Install directory>] [m] [n] [-p] [-q <Zmq hint directory>] 
+[r] [s] [t] [u] [z]  
 -[no option]: only make
 -b: Builds/Rebuilds CMake files normal mode
 -c: Clean
@@ -121,6 +128,7 @@ Usage: $0 [-b] [-c] [-d <HDF5 directory>] [-e] [-g] [-h] [-i]
 -m: Manuals
 -n: Manuals without compiling doxygen (only rst)
 -p: Builds/Rebuilds Python API
+-q: Zmq hint directory
 -r: Build/Rebuilds only receiver
 -s: Simulator
 -t: Build/Rebuilds only text client
@@ -137,14 +145,11 @@ Usage: $0 [-b] [-c] [-d <HDF5 directory>] [-e] [-g] [-h] [-i]
 # new build, python and compile in parallel:
 ./cmk.sh -cbpj5
 
-#For rebuilding only certain sections
-./cmk.sh -tg #only text client and gui
-./cmk.sh -r #only receiver
+#To use the system zmq (/usr/lib64) instead
+./cmk.sh -cbj5 -q /usr/lib64
 ```
 
-> **Note:** For v7.x.x of slsDetectorPackage and older, refer [zeromq notes for cmk script option to hint library location](#Pybind-and-Zeromq).
-
-### Build on old distributions
+###### Build on old distributions
 
 If your linux distribution doesn't come with a C++11 compiler (gcc>4.8) then 
 it's possible to install a newer gcc using conda and build the slsDetectorPackage
@@ -161,10 +166,7 @@ cmake ../slsDetectorPackage -DCMAKE_PREFIX_PATH=$CONDA_PREFIX
 make -j12
 ```
 
-> **Note:** For v7.x.x of slsDetectorPackage and older, refer [zeromq notes for dependencies for conda](#Pybind-and-Zeromq).
-
-
-### Build slsDetectorGui (Qt5)
+###### Build slsDetectorGui (Qt5)
 
 1. Using pre-built binary on conda
 ```
@@ -178,14 +180,7 @@ yum install qt5-qtbase-devel.x86_64
 yum install qt5-qtsvg-devel.x86_64 
 ```
 
-3. Using system installation on RHEL8
-```
-yum install qt5-qtbase-devel.x86_64
-yum install qt5-qtsvg-devel.x86_64 
-yum install expat-devel.x86_64
-```
-
-4. Using conda
+3. Using conda
 ```
 #Add channels for dependencies and our library
 conda config --add channels conda-forge
@@ -213,15 +208,13 @@ cd slsDetectorPackage
 ./cmk.sh -cbgj9
 ```
 
-> **Note:** For v7.x.x of slsDetectorPackage and older, refer [zeromq notes for dependencies for conda](#Pybind-and-Zeromq).
-
-### Build documentation from package
+###### Build documentation from package
 The documentation for the slsDetectorPackage is build using a combination 
 of Doxygen, Sphinx and Breathe. The easiest way to install the dependencies
 is to use conda 
 
 ```
-conda create -n myenv python=3.12 sphinx sphinx_rtd_theme breathe doxygen numpy
+conda create -n myenv python sphinx_rtd_theme breathe
 ```
 
 ```
@@ -235,47 +228,6 @@ make rst # rst only, saves time in case the API did not change
 ```
 
 
-
-## Pybind and Zeromq
-
-### Pybind11 for Python
-**v8.0.0+**:
-pybind11 is built
-* by default from tar file in repo (libs/pybind/v2.1x.0.tar.gz)
-* or use advanced option SLS_FETCH_PYBIND11_FROM_GITHUB [link].
-   * v9.0.0+: pybind11 (v2.13.6)
-   * v8.x.x : pybind11 (v2.11.0)
-
-**v7.x.x**:
-pybind11 packaged into ‘libs/pybind’. No longer a submodule. No need for “recursive” or “submodule update”.
-
-**Older versions**:
-pybind11 is a submodule. Must be cloned using “recursive” and updated when switching between versions using the following commands.
-
-```
-# Note: Only for v6.x.x versions and older
-
-# clone using recursive to get pybind11 submodule
-git clone --recursive https://github.com/slsdetectorgroup/slsDetectorPackage.git
-
-# update submodule when switching between releases
-cd slsDetectorPackage
-git submodule update --init
-```
-
-### Zeromq
-**v8.0.0+**:
-zeromq (v4.3.4) is built
-* by default from tar file in repo (libs/libzmq/libzmq-4.3.4.tar.gz)
-* or use advanced option SLS_FETCH_ZMQ_FROM_GITHUB [link].
-
-**v7.x.x and older**:
-zeromq-devel must be installed and one can hint its location using
-* cmake option:’-DZeroMQ_HINT=/usr/lib64’ or
-* option ‘-q’ in cmk.sh script: : ./cmk.sh -cbj5 -q /usr/lib64
-* ‘zeromq’ dependency added when installing using conda
-
-
 ## Support
     dhanya.thattil@psi.ch
     erik.frojdh@psi.ch

RELEASE.txt

@@ -39,6 +39,7 @@ This document describes the differences between vx.x.x and vx.0.2
     Jungfrau    9.0.0
     Mythen3     9.0.0
     Gotthard2   9.0.0
+    Gotthard    9.0.0
     Moench      9.0.0
   
 
@@ -65,8 +66,8 @@ This document describes the differences between vx.x.x and vx.0.2
 
     Eiger       02.10.2023 (v32)                    (updated in 7.0.3)
     
-    Jungfrau    20.09.2023 (v1.5, HW v1.0)          (updated in 8.0.0)
-                21.09.2023 (v2.5, HW v2.0)          (updated in 8.0.0)
+    Jungfrau    01.10.2024 (v1.6, HW v1.0)          (updated in 9.0.0)
+                01.10.2024 (v2.6, HW v2.0)          (updated in 9.0.0)
 
     Mythen3     11.10.2024 (v1.5)                   (updated in 9.0.0)
 
@@ -74,6 +75,9 @@ This document describes the differences between vx.x.x and vx.0.2
 
     Moench      26.10.2023 (v2.0)                   (updated in 9.0.0)
 
+    Gotthard    08.02.2018 (50um and 25um Master)
+                09.02.2018 (25 um Slave) 
+
 
     Detector Upgrade
     ----------------
@@ -86,6 +90,8 @@ This document describes the differences between vx.x.x and vx.0.2
     Gotthard2  via command <.rbf>
     Moench     via command <.pof>
 
+    Gotthard cannot be upgraded remotely  
+
     Except Eiger, 
         upgrade 
             Using command 'programfpga' or

VERSION

@@ -1 +0,0 @@
-0.0.0

cmake/FindClangFormat.cmake

@@ -25,9 +25,7 @@ mark_as_advanced(
     ClangFormat_BIN)
 
 if(ClangFormat_FOUND)
-    execute_process(COMMAND ${ClangFormat_BIN} --version
-                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                 OUTPUT_VARIABLE CLANG_VERSION_TEXT)
+    exec_program(${ClangFormat_BIN} ${CMAKE_CURRENT_SOURCE_DIR} ARGS --version 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

@@ -1,46 +0,0 @@
-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-recepie/build.sh

@@ -1,14 +1,10 @@
 # SPDX-License-Identifier: LGPL-3.0-or-other
 # Copyright (C) 2021 Contributors to the SLS Detector Package
 
-if [ ! -d "build" ]; then
-    mkdir build
-fi
-if [ ! -d "install" ]; then
-    mkdir install
-fi
+mkdir build
+mkdir install
 cd build
-cmake .. -G Ninja \
+cmake .. \
       -DCMAKE_PREFIX_PATH=$CONDA_PREFIX \
       -DCMAKE_INSTALL_PREFIX=install \
       -DSLS_USE_TEXTCLIENT=ON \
@@ -18,7 +14,7 @@ cmake .. -G Ninja \
       -DSLS_USE_TESTS=ON \
       -DSLS_USE_PYTHON=OFF \
       -DCMAKE_BUILD_TYPE=Release \
-      -DSLS_USE_HDF5=OFF \
+      -DSLS_USE_HDF5=OFF\
      
 NCORES=$(getconf _NPROCESSORS_ONLN)
 echo "Building using: ${NCORES} cores"

conda-recepie/build_pylib.sh

@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: LGPL-3.0-or-other
+# Copyright (C) 2021 Contributors to the SLS Detector Package
+
+echo "|<-------- starting python build"
+cd python
+${PYTHON} setup.py install

conda-recepie/conda_build_config.yaml

@@ -0,0 +1,7 @@
+python:
+    - 3.8
+    - 3.9
+    - 3.10
+    - 3.11 
+    - 3.12
+    

conda-recepie/copy_ctbgui.sh

@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-3.0-or-other
+# Copyright (C) 2021 Contributors to the SLS Detector Package
+mkdir $PREFIX/lib
+mkdir $PREFIX/bin
+mkdir $PREFIX/include
+
+
+
+cp build/bin/ctbGui $PREFIX/bin/.
+cp build/bin/libctbRootLib.so $PREFIX/lib/.
+

conda-recepie/copy_lib.sh

@@ -4,20 +4,18 @@
 mkdir -p $PREFIX/lib
 mkdir -p $PREFIX/bin
 mkdir -p $PREFIX/include/sls
+# mkdir $PREFIX/include/slsDetectorPackage
 
 #Shared and static libraries
 cp build/install/lib/* $PREFIX/lib/
 
 #Binaries
 cp build/install/bin/sls_detector_acquire $PREFIX/bin/.
-cp build/install/bin/sls_detector_acquire_zmq $PREFIX/bin/.
 cp build/install/bin/sls_detector_get $PREFIX/bin/.
 cp build/install/bin/sls_detector_put $PREFIX/bin/.
 cp build/install/bin/sls_detector_help $PREFIX/bin/.
-cp build/install/bin/sls_detector $PREFIX/bin/.
 cp build/install/bin/slsReceiver $PREFIX/bin/.
 cp build/install/bin/slsMultiReceiver $PREFIX/bin/.
-cp build/install/bin/slsFrameSynchronizer $PREFIX/bin/.
 
 
 cp build/install/include/sls/* $PREFIX/include/sls

conda-recepie/meta.yaml

@@ -0,0 +1,126 @@
+
+package:
+  name: sls_detector_software
+  version: {{ environ.get('GIT_DESCRIBE_TAG', '') }}
+
+source:
+  - path: ..
+
+build:
+  number: 0
+  binary_relocation: True
+  rpaths:
+    - lib/
+
+requirements:
+  build:
+    - {{ compiler('c') }}
+    - {{compiler('cxx')}}
+    - cmake
+    - qt 5.*
+    - xorg-libx11
+    - xorg-libice
+    - xorg-libxext
+    - xorg-libsm
+    - xorg-libxau
+    - xorg-libxrender
+    - xorg-libxfixes
+    - {{ cdt('mesa-libgl-devel') }}      # [linux]
+    - {{ cdt('mesa-libegl-devel') }}     # [linux]
+    - {{ cdt('mesa-dri-drivers') }}      # [linux]
+    - {{ cdt('libselinux') }}            # [linux]
+    - {{ cdt('libxdamage') }}            # [linux]
+    - {{ cdt('libxxf86vm') }}            # [linux]
+    - expat
+
+  host:
+    - libstdcxx-ng
+    - libgcc-ng
+    - xorg-libx11
+    - xorg-libice
+    - xorg-libxext
+    - xorg-libsm
+    - xorg-libxau
+    - xorg-libxrender
+    - xorg-libxfixes
+    - expat
+
+  run:
+    - libstdcxx-ng
+    - libgcc-ng 
+
+
+outputs:
+  - name: slsdetlib
+    script: copy_lib.sh
+
+    requirements:
+      build:
+        - {{ compiler('c') }}
+        - {{compiler('cxx')}}
+        - libstdcxx-ng
+        - libgcc-ng
+
+
+      run: 
+        - libstdcxx-ng
+        - libgcc-ng
+
+  - name: slsdet
+
+    script: build_pylib.sh
+
+    requirements:
+      build:
+        - python
+        - {{ compiler('c') }}
+        - {{compiler('cxx')}}
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
+        - setuptools
+        - pybind11=2.11
+
+      host:
+        - python
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
+        - pybind11=2.11
+
+
+      run:
+        - libstdcxx-ng
+        - libgcc-ng
+        - python
+        - numpy
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
+
+
+    test:
+      imports:
+        - slsdet
+
+  - name: slsdetgui
+    script: copy_gui.sh
+    requirements:
+
+      build:
+        - {{ compiler('c') }}
+        - {{compiler('cxx')}}
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
+
+      run:
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
+        - qt 5.*
+        - expat
+
+  - name: moenchzmq
+    script: copy_moench.sh
+    requirements:
+
+      build:
+        - {{ compiler('c') }}
+        - {{compiler('cxx')}}
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
+
+
+      run:
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
+        - expat

conda-recepie/run_test.sh

@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: LGPL-3.0-or-other
+# Copyright (C) 2021 Contributors to the SLS Detector Package
+ctest -j2

conda-recipes/main-library/conda_build_config.yaml

@@ -1,13 +0,0 @@
-
-c_compiler:
-  - gcc                        # [linux]
-
-c_stdlib:
-  - sysroot                    # [linux]
-
-cxx_compiler:
-  - gxx                        # [linux]
-
-
-c_stdlib_version:              # [linux]
-  - 2.17                       # [linux]

conda-recipes/main-library/meta.yaml

@@ -1,79 +0,0 @@
-source:
-  path: ../..
-
-{% set version = load_file_regex(load_file = 'VERSION', regex_pattern = '(\d+(?:\.\d+)*(?:[\+\w\.]+))').group(1) %}
-package:
-  name: sls_detector_software
-  version: {{ version }} 
-  
-build:
-  number: 0
-  binary_relocation: True
-  rpaths: 
-    - lib/
-
-requirements:
-  build:
-    - {{ compiler('c') }}
-    - {{ stdlib("c") }}
-    - {{ compiler('cxx') }}
-    - git
-    - cmake
-    - ninja
-    - qt 5.*
-
-  host:
-    - libstdcxx-ng
-    - libgcc-ng
-    - libgl-devel  # [linux]
-    - libtiff
-    - zlib
-    - expat
-  
-  run:
-    - libstdcxx-ng
-    - libgcc-ng 
-
-
-outputs:
-  - name: slsdetlib
-    script: copy_lib.sh
-
-    requirements:
-      build:
-        - {{ compiler('c') }}
-        - {{ stdlib("c") }}
-        - {{ compiler('cxx') }}
-
-      run: 
-        - libstdcxx-ng
-        - libgcc-ng
-
-
-  - name: slsdetgui
-    script: copy_gui.sh
-    requirements:
-
-      build:
-        - {{ compiler('c') }}
-        - {{compiler('cxx')}}
-        - {{ pin_subpackage('slsdetlib', exact=True) }}
-        
-
-      run:
-        - {{ pin_subpackage('slsdetlib', exact=True) }}
-        - qt 5.*
-
-
-  - name: moenchzmq
-    script: copy_moench.sh
-    requirements:
-
-      build:
-        - {{ compiler('c') }}
-        - {{compiler('cxx')}}
-        - {{ pin_subpackage('slsdetlib', exact=True) }}
-
-
-      run:
-        - {{ pin_subpackage('slsdetlib', exact=True) }}

conda-recipes/python-client/conda_build_config.yaml

@@ -1,16 +0,0 @@
-python:
-    - 3.11 
-    - 3.12
-    - 3.13
-
-c_compiler:
-  - gcc                        # [linux]
-
-c_stdlib:
-  - sysroot                    # [linux]
-
-cxx_compiler:
-  - gxx                        # [linux]
-
-c_stdlib_version:              # [linux]
-  - 2.17                       # [linux]

conda-recipes/python-client/meta.yaml

@@ -1,45 +0,0 @@
-source:
-  path: ../..
-
-{% set version = load_file_regex(load_file = 'VERSION', regex_pattern = '(\d+(?:\.\d+)*(?:[\+\w\.]+))').group(1) %}
-package:
-  name: slsdet
-  version: {{ version }} 
-
-build:
-  number: 0
-  script:
-    - unset CMAKE_GENERATOR && {{ PYTHON }} -m pip install . -vv  # [not win]
-
-requirements:
-  build:
-    - python {{python}}
-    - {{ compiler('c') }}
-    - {{ stdlib("c") }}
-    - {{ compiler('cxx') }}
-
-  host:
-    - cmake
-    - ninja
-    - python {{python}}
-    - pip
-    - scikit-build-core
-    - pybind11 >=2.13.0
-    - fmt
-    - zeromq
-    - nlohmann_json
-    - catch2
-
-  run:
-    - python {{python}}
-    - numpy
-
-
-test:
-  imports:
-    - slsdet
-
-
-about:
-  summary: An example project built with pybind11 and scikit-build.
-  # license_file: LICENSE

docs/CMakeLists.txt

@@ -40,7 +40,6 @@ set(SPHINX_SOURCE_FILES
   src/pydetector.rst
   src/pyenums.rst
   src/pyexamples.rst
-  src/pyPatternGenerator.rst
   src/servers.rst
   src/receiver_api.rst
   src/result.rst
@@ -54,18 +53,11 @@ 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
   src/udpconfig.rst
   src/udpdetspec.rst
-  src/fileformat.rst
-  src/slsreceiverheaderformat.rst
-  src/masterfileattributes.rst
-  src/binaryfileformat.rst
-  src/hdf5fileformat.rst
-  src/zmqjsonheaderformat.rst
 )
 
 foreach(filename ${SPHINX_SOURCE_FILES})

docs/conf.py.in

@@ -63,4 +63,4 @@ html_static_path = ['static']
 
 
 def setup(app):
-    app.add_css_file('css/extra.css')  # may also be an URL
+    app.add_stylesheet('css/extra.css')  # may also be an URL

docs/gen_server_doc.py.in

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

docs/src/binaryfileformat.rst

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

docs/src/commandline.rst

@@ -4,54 +4,11 @@ Command line interface
 Usage
 -------------
 
-The syntax is *'[detector index]-[module index]:[command]'*, where the indices are by default '0', when not specified.
-
-Module index
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Modules are indexed based on their order in the hostname command. They are used to configure a specific module within a detector and are followed by a ':' in syntax.
-
-    .. code-block::
-
-        # Applies to all modules of detector 0
-        sls_detector_put exptime 5s
-
-        # Applies to only the 4th module
-        sls_detector_put 3:exptime 5s
-
-
-Detector index
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-This index is useful when configuring multiple detectors from a single host. Each detector uses a unique shared memory identified by a detector index, derived again from the hostname command. It is followed by a '-'. 
-
-    .. code-block::
-
-        # For detector with index 2 in shared memory
-        sls_detector_put 2-hostname bchip133+bchip123+bchip456
-        
-        # Without '-', the detector index defaults to 0
-        sls_detector_put hostname bchip133+bchip123+bchip456
-
-        # Accessing all modules with detector index 2
-        sls_detector_put 2-exptime
-
-        # Starting acquisition only for detector with index 2
-        sls_detector_put 2-start
-
-        # Applies only to the 2nd detector, 4th module
-        sls_detector_put 1-3:exptime 5s
-
-
-Command Execution
-^^^^^^^^^^^^^^^^^^^^^^^
-Commands can be executed using:
-
-*   **sls_detector_put**: setting values
-*   **sls_detector_get**: getting values
-*   **sls_detector**: automatically infers based on the number of arguments.
-*   **sls_detector_help**: gets help on the specific command
-*   **sls_detector_acquire**: initiates acquisition with the detector. This command blocks until the entire acquisition process is completed.
+Commands can be used either with sls_detector_get or sls_detector_put
 
+.. code-block::
 
+    sls_detector_get vrf
 
 Help
 --------
@@ -68,19 +25,6 @@ Help
     sls_detector_get -h fpath
     sls_detector_help fpath
   
-    # list of deprecated commands
-    list deprecated
-
-
-Autocompletion
----------------
-
-bash_autocomplete.sh or zsh_autocomplete.sh must be sourced from the main package folder to enable auto completion of commands and arguments for the command line on that shell.
-
-.. code-block::
-
-    source bash_autocomplete.sh
-  
 
 Commands
 -----------

docs/src/dependencies.rst

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

docs/src/detector.rst

@@ -13,6 +13,7 @@ containing results from all modules. (:ref:`Result class<Result Class>`)
 
 Here are some :ref:`examples <Cplusplus Api Examples>` on how to use the API.
 
+.. _Cplusplus Api Examples:
 .. doxygenclass:: sls::Detector
    :members:
    :undoc-members:

docs/src/fileformat.rst

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

docs/src/firmware.rst

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

docs/src/gendoc.cpp

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

docs/src/hdf5fileformat.rst

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

docs/src/index.rst

@@ -12,7 +12,7 @@ Welcome to slsDetectorPackage's documentation!
     For further documentation, visit the official page: https://www.psi.ch/en/detectors/documentation
 
 .. toctree::
-    :maxdepth: 3
+    :maxdepth: 1
     :caption: Installation:
 
     installation
@@ -36,12 +36,10 @@ Welcome to slsDetectorPackage's documentation!
     pydetector
     pyenums
     pyexamples
-    pyPatternGenerator
-    pattern
 
 .. toctree::
     :caption: Command line
-    :maxdepth: 1
+    :maxdepth: 2
 
     commandline  
     quick_start_guide
@@ -81,25 +79,8 @@ Welcome to slsDetectorPackage's documentation!
     :caption: Receiver
     :maxdepth: 2
 
-    slsreceiver
     receivers
-    
-
-.. toctree::
-    :caption: Receiver Files
-    :maxdepth: 3
-
-    fileformat
-    slsreceiverheaderformat
-    masterfileattributes
-    binaryfileformat
-    hdf5fileformat
-
-.. toctree::
-    :caption: Receiver ZMQ Stream
-    :maxdepth: 2
-
-    zmqjsonheaderformat
+    slsreceiver
 
 .. toctree::
     :caption: Troubleshooting

docs/src/installation.rst

@@ -1,3 +1,8 @@
+.. warning ::
+    
+    Before building from source make sure that you have the 
+    :doc:`dependencies <../dependencies>` installed. If installing using conda, conda will 
+    manage the dependencies. Avoid also installing packages with pip. 
    
 
 .. _Installation:
@@ -6,47 +11,18 @@
 Installation
 ===============
 
-.. contents::
-   :local:
-   :depth: 2
-   :backlinks: top
-
-
-Overview
---------------
-
-The ``slsDetectorPackage`` provides core detector software implemented in C++, along with Python bindings packaged as the ``slsdet`` Python extension module. Choose the option that best fits your environment and use case.
-
-:ref:`conda pre-built binaries`: 
-Install pre-built binaries for the C++ client, receiver, GUI and the Python API (``slsdet``), simplifying setup across platforms.
-
-:ref:`pip`:
-Install only the Python extension module, either by downloading the pre-built library from PyPI or by building the extension locally from source. Available only from v9.2.0 onwards.
-
-:ref:`build from source`: 
-Compile the entire package yourself, including both the C++ core and the Python bindings, for maximum control and customization. However, make sure that you have the :doc:`dependencies <../dependencies>` installed. If installing using conda, conda will manage the dependencies. Avoid installing packages with pip and conda simultaneously.
-
-
-
-   
-.. _conda pre-built binaries:
-
-1. Install pre-built binaries using conda (Recommended)
---------------------------------------------------------
+Install binaries using conda
+-------------------------------
 
 Conda is not only useful to manage python environments but can also
 be used as a user space package manager. Dates in the tag (for eg. 2020.07.23.dev0) 
 are from the developer branch. Please use released tags for stability.
 
-We have four different packages available:
-    ==============     =============================================
-    Package             Description
-    ==============     =============================================
-    slsdetlib           shared libraries and command line utilities 
-    slsdetgui           GUI
-    slsdet              Python bindings
-    moenchzmq           moench
-    ==============     =============================================
+We have three different packages available:
+
+    * **slsdetlib** shared libraries and command line utilities 
+    * **slsdetgui** GUI
+    * **slsdet** Python bindings
 
 .. code-block:: bash
 
@@ -62,7 +38,7 @@ We have four different packages available:
 
     #ready to use
     sls_detector_get exptime
-    ...
+    etc ...
 
 
 .. code-block:: bash
@@ -74,33 +50,14 @@ We have four different packages available:
     conda search slsdet
     # gui
     conda search slsdetgui
-    # moench
-    conda search moenchzmq
 
 
-.. _pip:
-
-2. Pip
--------
-The Python extension module ``slsdet`` can be installed using pip. This is available from v9.2.0 onwards.
-
-.. code-block:: bash
-    
-    #Install the Python extension module from PyPI
-    pip install slsdet
-
-    # or install the python extension locally from source
-    git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git --branch 9.2.0
-    cd slsDetectorPackage
-    pip install .
 
 
-.. _build from source:
+Build from source
+-------------------
 
-3. Build from source
--------------------------
-
-3.1. Download Source Code from github
+1. Download Source Code from github
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. code-block:: bash
@@ -115,13 +72,11 @@ The Python extension module ``slsdet`` can be installed using pip. This is avail
 
 
 
-3.2. Build from Source
+2. Build from Source
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-One can either build using cmake or use the in-built cmk.sh script.
-
-3.2.1. Build using CMake
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Build using CMake
+^^^^^^^^^^^^^^^^^^^^^^
 
 .. code-block:: bash
 
@@ -148,7 +103,7 @@ Instead of the cmake command, one can use ccmake to get a list of options to con
     ccmake ..
  
     # choose the options
-    # first press [c] - configure (until you see [g])
+    # first press [c] - configure (maybe multiple times till you see [g])
     # then press [g] - generate
 
 
@@ -167,8 +122,8 @@ Example cmake options               Comment
     For v7.x.x of slsDetectorPackage and older, refer :ref:`zeromq notes for cmake option to hint library location. <zeromq for different slsDetectorPackage versions>` 
 
 
-3.2.2. Build using in-built cmk.sh script
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Build using in-built cmk.sh script
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
 .. code-block:: bash
@@ -217,8 +172,8 @@ Example cmake options               Comment
     For v7.x.x of slsDetectorPackage and older, refer :ref:`zeromq notes for cmk script option to hint library location. <zeromq for different slsDetectorPackage versions>` 
 
 
-3.3. Build on old distributions using conda
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Build on old distributions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 If your linux distribution doesn't come with a C++11 compiler (gcc>4.8) then 
 it's possible to install a newer gcc using conda and build the slsDetectorPackage
@@ -242,11 +197,10 @@ using this compiler
 
 
 
-3.4. Build slsDetectorGui (Qt5)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Build slsDetectorGui (Qt5)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 1. Using pre-built binary on conda
-
     .. code-block:: bash
 
         conda create -n myenv slsdetgui=7.0.0
@@ -254,22 +208,13 @@ using this compiler
 
 
 2. Using system installation on RHEL7
-
     .. code-block:: bash
 
         yum install qt5-qtbase-devel.x86_64
         yum install qt5-qtsvg-devel.x86_64 
 
-3. Using system installation on RHEL8
-
-    .. code-block:: bash
-
-        yum install qt5-qtbase-devel.x86_64
-        yum install qt5-qtsvg-devel.x86_64 
-        yum install expat-devel.x86_64
-
-4. Using conda
 
+3. Using conda
     .. code-block:: bash
 
         #Add channels for dependencies and our library
@@ -303,8 +248,8 @@ using this compiler
 
 
 
-3.5. Build this documentation
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Build this documentation
+^^^^^^^^^^^^^^^^^^^^^^^^
 
 The documentation for the slsDetectorPackage is build using a combination 
 of Doxygen, Sphinx and Breathe. The easiest way to install the dependencies
@@ -326,19 +271,17 @@ is to use conda
     make rst # rst only, saves time in case the API did not change
 
 
-4. Pybind and Zeromq
--------------------------
+Pybind and Zeromq
+^^^^^^^^^^^^^^^^^^^
 
 .. _pybind for different slsDetectorPackage versions:
 
 
-| **Pybind11 for Python**
+| **Pybind for Python**
 | v8.0.0+:
-|   pybind11 is built
-|   * by default from tar file in repo (libs/pybind/v2.1x.0.tar.gz) 
+|   pybind11 (v2.11.0) is built 
+|   * by default from tar file in repo (libs/pybind/v2.11.0.tar.gz) 
 |   * or use advanced option SLS_FETCH_PYBIND11_FROM_GITHUB [`link <https://github.com/pybind/pybind11>`__].
-|      * v9.0.0+: pybind11 (v2.13.6)
-|      * v8.x.x : pybind11 (v2.11.0)
 |
 | v7.x.x:
 |   pybind11 packaged into 'libs/pybind'. No longer a submodule. No need for "recursive" or "submodule update".
@@ -369,7 +312,7 @@ is to use conda
 |   * or use advanced option SLS_FETCH_ZMQ_FROM_GITHUB [`link <https://github.com/zeromq/libzmq.git>`__].
 |
 | v7.x.x and older:
-|   zeromq-devel must be installed and one can hint its location using
+|   zeromq must be installed and one can hint its location using
 |   * cmake option:'-DZeroMQ_HINT=/usr/lib64' or 
 |   * option '-q' in cmk.sh script: : ./cmk.sh -cbj5 -q /usr/lib64
 |   * 'zeromq' dependency added when installing using conda

docs/src/masterfileattributes.rst

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

docs/src/pattern.rst

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

docs/src/pyPatternGenerator.rst

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

docs/src/pygettingstarted.rst

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

docs/src/quick_start_guide.rst

@@ -128,10 +128,6 @@ For Multiple Modules
         # set file path
         fpath /tmp
 
-.. note ::   
-    The **hostname** and **detsize** command in a multi module system can affect the row and column values in the udp/zmq header. The modules are stacked row by row until they reach the y-axis limit set by detsize (if specified). Then, stacking continues in the next column and so on. 
-
-    
 Gui
 ----
 

docs/src/receivers.rst

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

docs/src/serverdefaults.rst

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

docs/src/servers.rst

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

docs/src/serverupgrade.rst

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

docs/src/slsreceiver.rst

@@ -1,55 +1,16 @@
-In-built Receiver   
+slsReceiver/ slsMultiReceiver
 ================================
 
+| One has to start the slsReceiver before loading config file or using any receiver commands (prefix: **rx_** )
 
-
-The receiver essentially listens to UDP data packets sent out by the detector. It's main features are:
-
-- **Listening**: Receives UDP data from the detector.
-- **Writing to File**: Optionally writes received data to disk.
-- **Streaming via ZMQ**: Optionally streams out the data using ZeroMQ.
-
-Each of these operations runs asynchronously and in parallel for each UDP port.
-
-
-.. note ::   
-
-    * Can be run on the same or different machine as the client.
-    * Can be configured by the client. (set file name/ discard policy, get progress etc.)
-    * Has to be started before the client runs any receiver specific command.
-
-
-Receiver Variants
------------------
-There are three main receiver types. How to start them is described :ref:`below<Starting up the Receiver>`.
-
-+----------------------+--------------------+-----------------------------------------+--------------------------------+
-| Receiver Type        | slsReceiver        | slsMultiReceiver                        |slsFrameSynchronizer            | 
-+======================+====================+=========================================+================================+
-| Modules Supported    | 1                  | Multiple                                | Multiple                       |
-+----------------------+--------------------+-----------------------------------------+--------------------------------+
-| Internal Architecture| Threads per porttt | Multiple child processes of slsReceiver | Multi-threading of slsReceiver |
-+----------------------+--------------------+-----------------------------------------+--------------------------------+
-| ZMQ Streaming        | Disabled by default| Disabled by default                     | Enabled, not optional          |
-+----------------------+--------------------+-----------------------------------------+--------------------------------+
-| ZMQ Synchronization  | No                 | No                                      | Yes, across ports              |
-+----------------------+--------------------+-----------------------------------------+--------------------------------+
-| Image Reconstruction | No                 | No                                      | No                             |
-+----------------------+--------------------+-----------------------------------------+--------------------------------+
-
-
-
-
-.. _Starting up the Receiver:
-
-Starting up the Receiver
--------------------------
 For a Single Module
     .. code-block:: bash  
 
-        slsReceiver # default port 1954
+        # default port 1954
+        slsReceiver
 
-        slsReceiver -t2012 # custom port 2012
+        # custom port 2012
+        slsReceiver -t2012
 
 
 For Multiple Modules
@@ -57,66 +18,57 @@ For Multiple Modules
 
         # each receiver (for each module) requires a unique tcp port (if all on same machine)
 
-        # option 1 (one for each module)
+        # using slsReceiver in multiple consoles
         slsReceiver
         slsReceiver -t1955
 
-        # option 2
+        # slsMultiReceiver [starting port] [number of receivers]
         slsMultiReceiver 2012 2
 
-        # option 3
-        slsFrameSynchronizer 2012 2
-
+        # slsMultiReceiver [starting port] [number of receivers] [print each frame header for debugging]
+        slsMultiReceiver 2012 2 1
 
 
 Client Commands 
 -----------------
 
-* Client commands to the receiver begin with **rx_** or **f_** (file commands).
+| One can remove **udp_dstmac** from the config file, as the slsReceiver fetches this from the **udp_ip**.
 
-* **rx_hostname** has to be the first command to the receiver so the client knows which receiver process to communicate with.
+| One can use "auto" for **udp_dstip** if one wants to use default ip of **rx_hostname**.
 
-* Can use 'auto' for **udp_dstip** if using 1GbE interface or the :ref:`virtual simulators<Virtual Detector Servers>`.
-
-
-To know more about detector receiver setup in the config file, please check out :ref:`the detector-receiver UDP configuration in the config file<detector udp header config>` and the :ref:`detector udp format<detector udp header>`.
-
-
-The following are the different ways to establish contact using **rx_hostname** command.
+| The first command to the receiver (**rx_** commands) should be **rx_hostname**. The following are the different ways to establish contact.
 
     .. code-block:: bash  
 
-        # ---single module---
-
-        # default receiver port at 1954
+        # default receiver tcp port (1954)
         rx_hostname xxx
 
         # custom receiver port
-        rx_hostname xxx:1957 # option 1
+        rx_hostname xxx:1957
 
-        rx_tcpport 1957  # option 2
+        # custom receiver port
+        rx_tcpport 1954
         rx_hostname xxx
 
+        # multi modules with custom ports
+        rx_hostname xxx:1955+xxx:1956+
         
-        # ---multi module---
         
-        # using increasing tcp ports
+        # multi modules using increasing tcp ports when using multi detector command
         rx_tcpport 1955
         rx_hostname xxx
 
-        # custom ports
-        rx_hostname xxx:1955+xxx:1958+ # option 1
-
-        0:rx_tcpport 1954 # option 2
+        # or specify multi modules with custom ports on same rxr pc
+        0:rx_tcpport 1954
         1:rx_tcpport 1955
         2:rx_tcpport 1956
         rx_hostname xxx
 
-        # custom ports on different receiver machines
+        # multi modules with custom ports on different rxr pc
         0:rx_tcpport 1954
         0:rx_hostname xxx
         1:rx_tcpport 1955
-        1:rx_hostname yyyrxr
+        1:rx_hostname yyy
 
 
 | Example commands:
@@ -139,32 +91,245 @@ The following are the different ways to establish contact using **rx_hostname**
         sls_detector_get -h rx_framescaught
 
 
-Example of a config file using in-built receiver
+ZMQ: Json Header Format
+------------------------
 
-.. code-block:: bash
 
-    # detector hostname
-    hostname bchip052+bchip053+
+**Change in field names from slsDetectorPackage v6.x.x to v7.0.0**
 
-    # udp destination port (receiver)
-    # sets increasing destination udp ports starting at 50004
-    udp_dstport 50004
+* detSpec1 <- bunchId
+* detSpec2 <- reserved
+* detSpec3 <- debug
+* detSpec4 <- roundRNumber
 
-    # udp destination ip (receiver)
-    0:udp_dstip 10.0.1.100
-    1:udp_dstip 10.0.2.100
 
-    # udp source ip (same subnet as udp_dstip)
-    0:udp_srcip 10.0.1.184
-    1:udp_srcip 10.0.2.184
+**Format**
 
-    # udp destination mac - not required (picked up from udp_dstip)
-    #udp_dstmac 22:47:d5:48:ad:ef
+    .. code-block:: bash 
 
-    # connects to receivers at increasing tcp port starting at 1954
-    rx_hostname mpc3434
-    # same as rx_hostname mpc3434:1954+mpc3434:1955+
+        {
+            "jsonversion": unsigned int,
+            "bitmode": unsigned int,
+            "fileIndex": unsigned long int,
+            "detshape": [
+                unsigned int,
+                unsigned int
+            ],
+            "shape": [
+                unsigned int,
+                unsigned int
+            ],
+            "size": unsigned int,
+            "acqIndex": unsigned long int,
+            "frameIndex": unsigned long int,
+            "progress": double,
+            "fname": string,
+            "data": unsigned int,
+            "completeImage": unsigned int,
 
+            "frameNumber": unsigned long long int,
+            "expLength": unsigned int,
+            "packetNumber": unsigned int,
+            "detSpec1": unsigned long int,
+            "timestamp": unsigned long int,
+            "modId": unsigned int,
+            "row": unsigned int,
+            "column": unsigned int,
+            "detSpec2": unsigned int,
+            "detSpec3": unsigned int,
+            "detSpec4": unsigned int,
+            "detType": unsigned int,
+            "version": unsigned int,
+            
+            "flipRows": unsigned int,
+            "quad": unsigned int,
+            "addJsonHeader": {
+                string : string
+            }
+        }
+
+   +--------------+----------------------------------------------+
+   |   Field      |       Description                            |
+   +--------------+----------------------------------------------+
+   | jsonversion  | Version of the json header.                  |
+   |              | Value at 4 for v6.x.x and v7.x.x             |
+   +--------------+----------------------------------------------+
+   | bitmode      | Bits per pixel [4|8|16|32]                   |
+   +--------------+----------------------------------------------+
+   | fileIndex    | Current file acquisition index               |
+   +--------------+----------------------------------------------+
+   | detshape     | Geometry of the entire detector              |
+   +--------------+----------------------------------------------+
+   | shape        | Geometry of the current port streamed out    |
+   +--------------+----------------------------------------------+
+   | size         | Size of image of current port in bytesout    |
+   +--------------+----------------------------------------------+
+   | acqIndex     | Frame number from the detector (redundant)   |
+   +--------------+----------------------------------------------+
+   | frameIndex   | Frame number of current acquisition          |
+   |              | (Starting at 0)                              |
+   +--------------+----------------------------------------------+
+   | progress     | Progress of current acquisition in %         |
+   +--------------+----------------------------------------------+
+   | fname        | Current file name                            |
+   +--------------+----------------------------------------------+
+   | data         | 1 if there is data following                 |
+   |              | 0 if dummy header                            |
+   +--------------+----------------------------------------------+
+   | completeImage| 1 if no missing packets for this frame       |
+   |              | in this port, else 0                         |
+   +--------------+----------------------------------------------+
+   | frameNumber  | Frame number                                 |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | expLength    | subframe number (32 bit eiger)               |
+   |              | or real time exposure time in 100ns (others) |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | packetNumber | Number of packets caught for that frame      |
+   +--------------+----------------------------------------------+
+   | detSpec1     | See :ref:`here<Detector Specific Fields>`    |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | timestamp    | Timestamp with 10 MHz clock                  |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | modId        | Module Id                                    |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | row          | Row number in detector                       |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | column       | Column number in detector                    |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | detSpec2     | See :ref:`here<Detector Specific Fields>`    |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | detSpec3     | See :ref:`here<Detector Specific Fields>`    |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | detSpec4     | See :ref:`here<Detector Specific Fields>`    |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | detType      | Detector type enum                           |
+   | detSpec3     | See :ref:`Detector enum<Detector Enum>`      |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | version      | Detector header version. At 2                |
+   |              | [From detector udp header]                   |
+   +--------------+----------------------------------------------+
+   | flipRows     | 1 if rows should be flipped.                 |
+   |              | Usually for Eiger bottom.                    |
+   +--------------+----------------------------------------------+
+   | quad         | 1 if its an Eiger quad.                      |
+   +--------------+----------------------------------------------+
+   | addJsonHeader| Optional custom parameters that is required  |
+   |              | for processing code.                         |
+   +--------------+----------------------------------------------+
+
+
+SLS Receiver Header Format
+--------------------------
+
+It is 112 bytes and consists of:
+    * 48 bytes of the SLS Detector Header (described in :ref:`the current detector header <detector udp header>`)
+    * 64 bytes of packet mask
+
+.. code-block:: cpp 
+    
+    typedef struct {
+        uint64_t frameNumber;
+        uint32_t expLength;
+        uint32_t packetNumber;
+        uint64_t detSpec1;
+        uint64_t timestamp;
+        uint16_t modId;
+        uint16_t row;
+        uint16_t column;
+        uint16_t detSpec2;
+        uint32_t detSpec3;
+        uint16_t detSpec4;
+        uint8_t detType;
+        uint8_t version;
+    } sls_detector_header;
+
+    struct sls_receiver_header {
+        sls_detector_header detHeader; /**< is the detector header */
+        sls_bitset packetsMask;        /**< is the packets caught bit mask */
+    };
+
+
+.. note :: 
+
+    | The packetNumber in the SLS Receiver Header will be modified to number of packets caught by receiver for that frame. For eg. Jungfrau will have 128 packets per frame. If it is less, then this is a partial frame due to missing packets.
+    
+    | Furthermore, the bit mask will specify which packets have been received.
+
+
+
+
+File format
+--------------
+
+Master file is in json format.
+
+The file name format is [fpath]/[fname]_dx_fy_[findex].raw, where x is module index and y is file index. **fname** is file name prefix and by default "run". **fpath** is '/' by default.
+
+
+Each acquisition will have an increasing acquisition index or findex (if file write enabled). This can be retrieved by using **findex** command. 
+
+
+Each acquisition can have multiple files (the file index number **y**), with **rx_framesperfile** being the maximum number of frames per file. The default varies for each detector type.
+
+
+Some file name examples:
+
+    .. code-block:: bash
+
+        # first file
+        path-to-file/run_d0_f0_0.raw
+
+        # second file after reaching max frames in first file
+        path-to-file/run_d0_f1_0.raw
+        
+        # second acquisition, first file
+        path-to-file/run_d0_f0_1.raw
+
+
+Each acquisition will create a master file that can be enabled/disabled using **fmaster**. This should have parameters relevant to the acquisition.
+
+
+**Binary file format**
+
+This is the default file format. 
+
+
+Each data file will consist of frames, each consisting of slsReceiver Header followed by data for 1 frame.
+
+
+Master file is of ASCII format and will also include the format of the slsReceiver Header.
+
+
+**HDF5 file formats**
+
+#. Compile the package with HDF5 option enabled
+
+    #. Using cmk script: ./cmk.sh -hj9 -d [path of hdf5 dir]
+
+    #. Enable using cmake **-DCMAKE_INSTALL_PREFIX=/path/to/hdf/installation** and **-DSLS_USE_HDF5=ON**
+
+#. Start Receiver process
+
+#. Load config file
+
+#. Set file format from client or in config file
+    .. code-block:: bash
+
+        sls_detector_put fformat hdf5
+
+
+| For multiple, modules, a virtual file linking all the modules is created. Both the data files and virtual files are linked in the master file.
 
 
 Performance 

docs/src/slsreceiverheaderformat.rst

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

docs/src/troubleshooting.rst

@@ -385,13 +385,13 @@ 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
+----------
 
-Mythen3
---------
 
-Detector status is waiting even in auto timing mode
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Check if the control board or the flat band cable is connected properly. If not, connect them properly and try again.
+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.
 
 
 Jungfrau

docs/src/udpconfig.rst

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

docs/src/udpheader.rst

@@ -3,7 +3,7 @@
 Format
 =======
 
-The UDP data format for the packets consist of a common header of 48 bytes for all detectors, followed by the data for that one packet.
+The UDP data format for the packets consist of a common header for all detectors, followed by the data for that one packet.
 
 
 Current Version
@@ -11,25 +11,6 @@ Current Version
 
 **v2.0 (slsDetectorPackage v7.0.0+)**
 
-.. code-block:: cpp 
-    
-    typedef struct {
-        uint64_t frameNumber;
-        uint32_t expLength;
-        uint32_t packetNumber;
-        uint64_t detSpec1;
-        uint64_t timestamp;
-        uint16_t modId;
-        uint16_t row;
-        uint16_t column;
-        uint16_t detSpec2;
-        uint32_t detSpec3;
-        uint16_t detSpec4;
-        uint8_t detType;
-        uint8_t version;
-    } sls_detector_header;
-
-
 .. table:: <---------------------------------------------------- 8 bytes per row --------------------------------------------->
     :align: center
     :widths: 30,30,30,15,15
@@ -73,17 +54,15 @@ Description
 
 * **modId**: module ID picked up from det_id_[detector type].txt on the detector cpu.
 
-* **row**: row position of the module in the detector system. It is calculated by the order of the module in hostname command, as well as the detsize command. The modules are stacked row by row until they reach the y-axis limit set by detsize (if specified). Then, stacking continues in the next column and so on.
+* **row**: row position of the module in the detector system. It is calculated by the order of the module in hostname command, as well as the detsize command.
 
-* **column**: column position of the module in the detector system.  It is calculated by the order of the module in hostname command, as well as the detsize command. The modules are stacked row by row until they reach the y-axis limit set by detsize (if specified). Then, stacking continues in the next column and so on.
+* **column**: column position of the module in the detector system.  It is calculated by the order of the module in hostname command, as well as the detsize command.
 
 * **detType**: detector type from enum of detectorType in the package.
 
 * **version**: current version of the detector header (0x2).
 
 
-.. _detector enum:
-
 Detector Enum
 --------------
 
@@ -92,14 +71,14 @@ Detector Enum
     ================    ========
     GENERIC             0
     EIGER               1
-    GOTTHARD*           2    
+    GOTTHARD            2    
     JUNGFRAU            3    
     CHIPTESTBOARD       4        
     MOENCH              5
     MYTHEN3             6
     GOTTHARD2           7    
     ================    ========
-    * deprecated since v10.0.0
+
 
 
 Previous Versions

docs/src/virtualserver.rst

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

docs/src/zmqjsonheaderformat.rst

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

examples/gotthard.config

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

libs/libzmq/libzmq_cmake_version.patch

@@ -1,18 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dd3d8eb9..c0187747 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,11 +1,8 @@
- # CMake build script for ZeroMQ
- project(ZeroMQ)
- 
--if(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)
--  cmake_minimum_required(VERSION 3.0.2)
--else()
--  cmake_minimum_required(VERSION 2.8.12)
--endif()
-+cmake_minimum_required(VERSION 3.15)
-+message(STATUS "Patched cmake version")
- 
- include(CheckIncludeFiles)
- include(CheckCCompilerFlag)

psi-pmodules/DetectorSoftware/slsDetectorPackage/files/variants

@@ -11,7 +11,4 @@ slsDetectorPackage/8.0.1_rh7 stable cmake/3.15.5 Qt/5.12.10
 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
 

pyctbgui/pyctbgui/services/ADC.py

@@ -14,8 +14,6 @@ from pyctbgui.utils.defines import Defines
 import pyctbgui.utils.pixelmap as pm
 from pyctbgui.utils.recordOrApplyPedestal import recordOrApplyPedestal
 
-from slsdet import detectorType
-
 if typing.TYPE_CHECKING:
     from pyctbgui.services import AcquisitionTab, PlotTab
 
@@ -32,7 +30,6 @@ class AdcTab(QtWidgets.QWidget):
         self.acquisitionTab: AcquisitionTab | None = None
         self.legend: LegendItem | None = None
         self.logger = logging.getLogger('AdcTab')
-        self.tengiga = True
 
     def setup_ui(self):
         self.plotTab = self.mainWindow.plotTab
@@ -46,12 +43,6 @@ class AdcTab(QtWidgets.QWidget):
         # subscribe to toggle legend
         self.plotTab.subscribeToggleLegend(self.updateLegend)
 
-        if self.det.type == detectorType.XILINX_CHIPTESTBOARD:
-            self.view.checkBoxADC0_15Inv.setDisabled(True)
-            self.view.checkBoxADC16_31Inv.setDisabled(True)
-            self.view.lineEditADCInversion.setDisabled(True)
-            self.view.labelADCInversion.setDisabled(True)
-
     def initializeAllAnalogPlots(self):
         self.mainWindow.plotAnalogWaveform = pg.plot()
         self.mainWindow.plotAnalogWaveform.addLegend(colCount=Defines.colCount)
@@ -76,7 +67,6 @@ class AdcTab(QtWidgets.QWidget):
 
     def connect_ui(self):
         for i in range(Defines.adc.count):
-            if self.det.type == detectorType.CHIPTESTBOARD:
             getattr(self.view, f"checkBoxADC{i}Inv").stateChanged.connect(partial(self.setADCInv, i))
             getattr(self.view, f"checkBoxADC{i}En").stateChanged.connect(partial(self.setADCEnable, i))
             getattr(self.view, f"checkBoxADC{i}Plot").stateChanged.connect(partial(self.setADCEnablePlot, i))
@@ -87,16 +77,14 @@ class AdcTab(QtWidgets.QWidget):
         self.view.checkBoxADC0_15Plot.stateChanged.connect(partial(self.setADCEnablePlotRange, 0, Defines.adc.half))
         self.view.checkBoxADC16_31Plot.stateChanged.connect(
             partial(self.setADCEnablePlotRange, Defines.adc.half, Defines.adc.count))
-        self.view.lineEditADCEnable.editingFinished.connect(self.setADCEnableReg)
-        if self.det.type == detectorType.CHIPTESTBOARD:
         self.view.checkBoxADC0_15Inv.stateChanged.connect(partial(self.setADCInvRange, 0, Defines.adc.half))
         self.view.checkBoxADC16_31Inv.stateChanged.connect(
             partial(self.setADCInvRange, Defines.adc.half, Defines.adc.count))
         self.view.lineEditADCInversion.editingFinished.connect(self.setADCInvReg)
+        self.view.lineEditADCEnable.editingFinished.connect(self.setADCEnableReg)
 
     def refresh(self):
         self.updateADCNames()
-        if self.det.type == detectorType.CHIPTESTBOARD:
         self.updateADCInv()
         self.updateADCEnable()
 
@@ -208,11 +196,9 @@ class AdcTab(QtWidgets.QWidget):
         return decoder.decode(analog_array, pm.moench04_analog())
 
     def getADCEnableReg(self):
-        if self.det.type == detectorType.CHIPTESTBOARD:
-            self.tengiga = self.det.tengiga
-        retval = self.det.adcenable10g
-        if not self.tengiga:
         retval = self.det.adcenable
+        if self.det.tengiga:
+            retval = self.det.adcenable10g
         self.view.lineEditADCEnable.editingFinished.disconnect()
         self.view.lineEditADCEnable.setText("0x{:08x}".format(retval))
         self.view.lineEditADCEnable.editingFinished.connect(self.setADCEnableReg)
@@ -221,8 +207,8 @@ class AdcTab(QtWidgets.QWidget):
     def setADCEnableReg(self):
         self.view.lineEditADCEnable.editingFinished.disconnect()
         try:
-            mask = int(self.view.lineEditADCEnable.text(), 16)
-            if self.tengiga:
+            mask = int(self.mainWindow.lineEditADCEnable.text(), 16)
+            if self.det.tengiga:
                 self.det.adcenable10g = mask
             else:
                 self.det.adcenable = mask
@@ -253,7 +239,7 @@ class AdcTab(QtWidgets.QWidget):
     def setADCEnable(self, i):
         checkBox = getattr(self.view, f"checkBoxADC{i}En")
         try:
-            if self.tengiga:
+            if self.det.tengiga:
                 enableMask = manipulate_bit(checkBox.isChecked(), self.det.adcenable10g, i)
                 self.det.adcenable10g = enableMask
             else:
@@ -279,7 +265,7 @@ class AdcTab(QtWidgets.QWidget):
         for i in range(start_nr, end_nr):
             mask = manipulate_bit(checkBox.isChecked(), mask, i)
         try:
-            if self.tengiga:
+            if self.det.tengiga:
                 self.det.adcenable10g = mask
             else:
                 self.det.adcenable = mask
@@ -358,7 +344,7 @@ class AdcTab(QtWidgets.QWidget):
     def setADCInvReg(self):
         self.view.lineEditADCInversion.editingFinished.disconnect()
         try:
-            self.det.adcinvert = int(self.view.lineEditADCInversion.text(), 16)
+            self.det.adcinvert = int(self.mainWindow.lineEditADCInversion.text(), 16)
         except Exception as e:
             QtWidgets.QMessageBox.warning(self.mainWindow, "ADC Inversion Fail", str(e), QtWidgets.QMessageBox.Ok)
             pass
@@ -409,12 +395,7 @@ class AdcTab(QtWidgets.QWidget):
         self.updateADCInv()
 
     def saveParameters(self) -> list[str]:
-        if self.det.type == detectorType.CHIPTESTBOARD:
         return [
             f"adcenable {self.view.lineEditADCEnable.text()}",
             f"adcinvert {self.view.lineEditADCInversion.text()}",
         ]
-        else:
-            return [
-                f"adcenable {self.view.lineEditADCEnable.text()}"
-            ]     

pyctbgui/pyctbgui/services/Acquisition.py

@@ -7,7 +7,7 @@ import zmq
 from PyQt5 import QtWidgets, uic
 import logging
 
-from slsdet import readoutMode, runStatus, detectorType
+from slsdet import readoutMode, runStatus
 from pyctbgui.utils.defines import Defines
 from pyctbgui.utils.numpyWriter.npy_writer import NumpyFileManager
 from pyctbgui.utils.numpyWriter.npz_writer import NpzFileWriter
@@ -49,31 +49,14 @@ class AcquisitionTab(QtWidgets.QWidget):
         self.adcTab = self.mainWindow.adcTab
         self.plotTab = self.mainWindow.plotTab
         self.toggleStartButton(False)
-        if self.det.type == detectorType.XILINX_CHIPTESTBOARD:
-            self.view.labelRunF.setDisabled(True)
-            self.view.labelADCF.setDisabled(True)
-            self.view.labelADCPhase.setDisabled(True)
-            self.view.labelADCPipeline.setDisabled(True)
-            self.view.labelDBITF.setDisabled(True)
-            self.view.labelDBITPhase.setDisabled(True)
-            self.view.labelDBITPipeline.setDisabled(True)
-            self.view.spinBoxRunF.setDisabled(True)
-            self.view.spinBoxADCF.setDisabled(True)
-            self.view.spinBoxADCPhase.setDisabled(True)
-            self.view.spinBoxADCPipeline.setDisabled(True)
-            self.view.spinBoxDBITF.setDisabled(True)
-            self.view.spinBoxDBITPhase.setDisabled(True)
-            self.view.spinBoxDBITPipeline.setDisabled(True)
 
     def connect_ui(self):
         # For Acquistions Tab
         self.view.comboBoxROMode.currentIndexChanged.connect(self.setReadOut)
+        self.view.spinBoxRunF.editingFinished.connect(self.setRunFrequency)
         self.view.spinBoxTransceiver.editingFinished.connect(self.setTransceiver)
         self.view.spinBoxAnalog.editingFinished.connect(self.setAnalog)
         self.view.spinBoxDigital.editingFinished.connect(self.setDigital)
-        
-        if self.det.type == detectorType.CHIPTESTBOARD:
-            self.view.spinBoxRunF.editingFinished.connect(self.setRunFrequency)
         self.view.spinBoxADCF.editingFinished.connect(self.setADCFrequency)
         self.view.spinBoxADCPhase.editingFinished.connect(self.setADCPhase)
         self.view.spinBoxADCPipeline.editingFinished.connect(self.setADCPipeline)
@@ -94,19 +77,16 @@ class AcquisitionTab(QtWidgets.QWidget):
 
     def refresh(self):
         self.getReadout()
+        self.getRunFrequency()
         self.getTransceiver()
         self.getAnalog()
         self.getDigital()
-
-        if self.det.type == detectorType.CHIPTESTBOARD:
-            self.getRunFrequency()
         self.getADCFrequency()
         self.getADCPhase()
         self.getADCPipeline()
         self.getDBITFrequency()
         self.getDBITPhase()
         self.getDBITPipeline()
-
         self.getFileWrite()
         self.getFileName()
         self.getFilePath()
@@ -717,7 +697,6 @@ class AcquisitionTab(QtWidgets.QWidget):
         self.socket.subscribe("")
 
     def saveParameters(self) -> list[str]:
-        if self.det.type == detectorType.CHIPTESTBOARD:
         return [
             f'romode {self.view.comboBoxROMode.currentText().lower()}',
             f'runclk {self.view.spinBoxRunF.value()}',
@@ -738,18 +717,3 @@ class AcquisitionTab(QtWidgets.QWidget):
             f'dsamples {self.view.spinBoxDigital.value()}',
             f'tsamples {self.view.spinBoxTransceiver.value()}',
         ]
-        else:
-            return [
-                f'romode {self.view.comboBoxROMode.currentText().lower()}',
-                f'fwrite {int(self.view.checkBoxFileWriteRaw.isChecked())}',
-                f'fname {self.view.lineEditFileName.text()}',
-                f'fpath {self.view.lineEditFilePath.text()}',
-                f'findex {self.view.spinBoxAcquisitionIndex.value()}',
-                f'frames {self.view.spinBoxFrames.value()}',
-                f'triggers {self.view.spinBoxTriggers.value()}',
-                f'period {self.view.spinBoxPeriod.value()} {self.view.comboBoxPeriod.currentText().lower()}',
-                f'asamples {self.view.spinBoxAnalog.value()}',
-                f'dsamples {self.view.spinBoxDigital.value()}',
-                f'tsamples {self.view.spinBoxTransceiver.value()}',
-            ] 
-

pyctbgui/pyctbgui/services/DACs.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from PyQt5 import QtWidgets, uic
 from pyctbgui.utils.defines import Defines
 
-from slsdet import dacIndex, detectorType
+from slsdet import dacIndex
 
 
 class DacTab(QtWidgets.QWidget):
@@ -19,14 +19,7 @@ class DacTab(QtWidgets.QWidget):
             dac = getattr(dacIndex, f"DAC_{i}")
             getattr(self.view, f"spinBoxDAC{i}").setValue(self.det.getDAC(dac)[0])
 
-        if self.det.type == detectorType.XILINX_CHIPTESTBOARD:
-            self.view.checkBoxHighVoltage.setDisabled(True)
-            self.view.spinBoxHighVoltage.setDisabled(True)
-            self.view.labelHighVoltage.setDisabled(True)
-            self.view.labelADCVppDacName.setDisabled(True)
-            self.view.labelADCVpp.setDisabled(True)
-            self.view.comboBoxADCVpp.setDisabled(True)
-        elif self.det.highvoltage == 0:
+        if self.det.highvoltage == 0:
             self.view.spinBoxHighVoltage.setDisabled(True)
             self.view.checkBoxHighVoltage.setChecked(False)
 
@@ -37,9 +30,7 @@ class DacTab(QtWidgets.QWidget):
             getattr(self.view, f"checkBoxDAC{i}").stateChanged.connect(partial(self.setDACTristate, i))
             getattr(self.view, f"checkBoxDAC{i}mV").stateChanged.connect(partial(self.getDAC, i))
 
-        if self.view.comboBoxADCVpp.isEnabled():
         self.view.comboBoxADCVpp.currentIndexChanged.connect(self.setADCVpp)
-        if self.view.checkBoxHighVoltage.isEnabled():
         self.view.spinBoxHighVoltage.editingFinished.connect(self.setHighVoltage)
         self.view.checkBoxHighVoltage.stateChanged.connect(self.setHighVoltage)
 
@@ -49,9 +40,7 @@ class DacTab(QtWidgets.QWidget):
             self.getDACTristate(i)
             self.getDAC(i)
 
-        if self.view.comboBoxADCVpp.isEnabled():
         self.getADCVpp()
-        if self.view.checkBoxHighVoltage.isEnabled():
         self.getHighVoltage()
 
     def updateDACNames(self):
@@ -176,8 +165,6 @@ class DacTab(QtWidgets.QWidget):
                 unit = " mV" if inMV else ""
                 commands.append(f"dac {i} {value}{unit}")
 
-        if self.view.comboBoxADCVpp.isEnabled():
         commands.append(f"adcvpp {self.view.comboBoxADCVpp.currentText()} mV")
-        if self.view.checkBoxHighVoltage.isEnabled():
         commands.append(f"highvoltage {self.view.spinBoxHighVoltage.value()}")
         return commands

pyctbgui/pyctbgui/services/Pattern.py

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

pyctbgui/pyctbgui/services/PowerSupplies.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from PyQt5 import QtWidgets, uic
 from pyctbgui.utils.defines import Defines
 
-from slsdet import dacIndex, detectorType
+from slsdet import dacIndex
 
 
 class PowerSuppliesTab(QtWidgets.QWidget):
@@ -18,7 +18,6 @@ class PowerSuppliesTab(QtWidgets.QWidget):
         self.updateVoltageNames()
         for i in Defines.powerSupplies:
             self.getVoltage(i)
-            if self.det.type == detectorType.CHIPTESTBOARD:
             self.getCurrent(i)
 
     def connect_ui(self):
@@ -39,12 +38,6 @@ class PowerSuppliesTab(QtWidgets.QWidget):
             if retval == 0:
                 checkBox.setChecked(False)
                 spinBox.setDisabled(True)
-            if self.det.type == detectorType.XILINX_CHIPTESTBOARD:
-                label = getattr(self.view, f"labelI{i}")
-                label.setDisabled(True)
-        if self.det.type == detectorType.XILINX_CHIPTESTBOARD:
-            self.view.spinBoxVChip.setDisabled(True)
-
 
     def updateVoltageNames(self):
         retval = self.det.getPowerNames()
@@ -63,9 +56,6 @@ class PowerSuppliesTab(QtWidgets.QWidget):
         spinBox.editingFinished.disconnect()
         checkBox.stateChanged.disconnect()
 
-        if self.det.type == detectorType.XILINX_CHIPTESTBOARD:
-            retval = self.det.getPower(voltageIndex)[0]
-        else:
         retval = self.det.getMeasuredPower(voltageIndex)[0]
         # spinBox.setValue(retval)
         if retval > 1:
@@ -79,7 +69,6 @@ class PowerSuppliesTab(QtWidgets.QWidget):
         spinBox.editingFinished.connect(partial(self.setVoltage, i))
         checkBox.stateChanged.connect(partial(self.setVoltage, i))
 
-        if self.det.type == detectorType.CHIPTESTBOARD:
         self.getVChip()
 
         # TODO: handle multiple events when pressing enter (twice)
@@ -102,7 +91,6 @@ class PowerSuppliesTab(QtWidgets.QWidget):
         # TODO: (properly) disconnecting and connecting to handle multiple events (out of focus and pressing enter).
         spinBox.editingFinished.connect(partial(self.setVoltage, i))
         self.getVoltage(i)
-        if self.det.type == detectorType.CHIPTESTBOARD:
         self.getCurrent(i)
 
     def getCurrent(self, i):

pyctbgui/pyctbgui/services/Signals.py

@@ -22,7 +22,6 @@ 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):
@@ -30,7 +29,6 @@ class SignalsTab(QtWidgets.QWidget):
         self.updateDigitalBitEnable()
         self.updateIOOut()
         self.getDBitOffset()
-        self.getDBitReorder()
 
     def connect_ui(self):
         for i in range(Defines.signals.count):
@@ -51,7 +49,6 @@ 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
@@ -90,79 +87,60 @@ class SignalsTab(QtWidgets.QWidget):
                 self.legend.addItem(plot, name)
 
     @recordOrApplyPedestal
-    def _processWaveformData(self, data, aSamples, dSamples, rx_dbitreorder, rx_dbitlist, isPlottedArray, romode,
+    def _processWaveformData(self, data, aSamples, dSamples, rx_dbitlist, isPlottedArray, rx_dbitoffset, romode,
                              nADCEnabled):
-        
-        #transform raw waveform data into a processed numpy array
-        #@param data:  raw waveform data
-    
-        start_digital_data = 0 
+        """
+        transform raw waveform data into a processed numpy array
+        @param data:  raw waveform data
+        """
+        dbitoffset = rx_dbitoffset
         if romode == 2:
-            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 
+            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))
-            bit_index = 0
-            for idx, i in enumerate(rx_dbitlist):
+        offset = 0
+        arr = []
+        for i in rx_dbitlist:
             # where numbits * numsamples is not a multiple of 8
-                if bit_index % 8 != 0:
-                    bit_index += (8 - (bit_index % 8))
+            if offset % 8 != 0:
+                offset += (8 - (offset % 8))
             if not isPlottedArray[i]:
-                    bit_index += nbitsPerDBit
-                    samples_per_bit[idx, :] = np.nan
-                    continue
+                offset += nbitsPerDBit
+                return None
+            waveform = np.zeros(dSamples)
             for iSample in range(dSamples):
                 # all samples for digital bit together from slsReceiver
-                    index = int(bit_index / 8)
-                    iBit = bit_index % 8
+                index = int(offset / 8)
+                iBit = offset % 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
-
-                    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() 
-
+                waveform[iSample] = bit
+                offset += 1
+            arr.append(waveform)
 
+        return np.array(arr)
 
     def processWaveformData(self, data, aSamples, dSamples):
-        
-        #view function
-        #plots processed waveform data
-        #data: raw waveform data
-        #dsamples: digital samples
-        #asamples: analog samples
-
-        self.refresh()
-        
+        """
+        view function
+        plots processed waveform data
+        data: raw waveform data
+        dsamples: digital samples
+        asamples: analog samples
+        """
         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_dbitreorder, self.rx_dbitlist, isPlottedArray,
-                                                  self.mainWindow.romode.value,
+        digital_array = self._processWaveformData(data, aSamples, dSamples, self.rx_dbitlist, isPlottedArray,
+                                                  self.rx_dbitoffset, self.mainWindow.romode.value,
                                                   self.mainWindow.nADCEnabled)
 
         irow = 0
         for idx, i in enumerate(self.rx_dbitlist):
             # bits enabled but not plotting
-            waveform = digital_array[idx, :]
-            if np.isnan(waveform[0]):
+            waveform = digital_array[idx]
+            if waveform is None:
                 continue
             self.mainWindow.digitalPlots[i].setData(waveform)
             plotName = getattr(self.view, f"labelBIT{i}").text()
@@ -173,10 +151,8 @@ 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)
@@ -384,25 +360,14 @@ 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/services/SlowADCs.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from PyQt5 import uic, QtWidgets
 
 from pyctbgui.utils.defines import Defines
-from slsdet import dacIndex, detectorType
+from slsdet import dacIndex
 
 
 class SlowAdcTab(QtWidgets.QWidget):
@@ -17,8 +17,7 @@ class SlowAdcTab(QtWidgets.QWidget):
         self.det = None
 
     def setup_ui(self):
-        if self.det.type == detectorType.XILINX_CHIPTESTBOARD:
-            self.view.pushButtonTemp.setDisabled(True)      
+        pass
 
     def connect_ui(self):
         for i in range(Defines.slowAdc.count):
@@ -29,7 +28,6 @@ class SlowAdcTab(QtWidgets.QWidget):
         self.updateSlowAdcNames()
         for i in range(Defines.slowAdc.count):
             self.updateSlowAdc(i)
-        if self.det.type == detectorType.CHIPTESTBOARD:
         self.updateTemperature()
 
     def updateSlowAdcNames(self):

pyctbgui/pyctbgui/ui/Dacs.ui

@@ -817,7 +817,7 @@ Only pressing enter on spinbox will set DAC (with this condition).</string>
      </widget>
     </item>
     <item row="18" column="0">
-     <widget class="QLabel" name="labelADCVppDacName">
+     <widget class="QLabel" name="label_125">
       <property name="text">
        <string>ADC_VPP</string>
       </property>

pyctbgui/pyctbgui/ui/acquisition.ui

@@ -118,7 +118,7 @@
      </widget>
     </item>
     <item row="1" column="4">
-     <widget class="QLabel" name="labelRunF">
+     <widget class="QLabel" name="label_70">
       <property name="text">
        <string>Run Clock Frequency (MHz):</string>
       </property>
@@ -218,7 +218,7 @@
    </property>
    <layout class="QGridLayout" name="gridLayout_6">
     <item row="2" column="3">
-     <widget class="QLabel" name="labelDBITF">
+     <widget class="QLabel" name="label_74">
       <property name="minimumSize">
        <size>
         <width>200</width>
@@ -231,7 +231,7 @@
      </widget>
     </item>
     <item row="2" column="0">
-     <widget class="QLabel" name="labelADCF">
+     <widget class="QLabel" name="label_71">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
         <horstretch>0</horstretch>
@@ -278,7 +278,7 @@
      </widget>
     </item>
     <item row="4" column="3">
-     <widget class="QLabel" name="labelDBITPipeline">
+     <widget class="QLabel" name="label_76">
       <property name="text">
        <string>DBIT Pipeline:</string>
       </property>
@@ -338,21 +338,21 @@
      </widget>
     </item>
     <item row="4" column="0">
-     <widget class="QLabel" name="labelADCPipeline">
+     <widget class="QLabel" name="label_73">
       <property name="text">
        <string>ADC Pipeline:</string>
       </property>
      </widget>
     </item>
     <item row="3" column="0">
-     <widget class="QLabel" name="labelADCPhase">
+     <widget class="QLabel" name="label_72">
       <property name="text">
        <string>ADC Clock Phase (a.u.):</string>
       </property>
      </widget>
     </item>
     <item row="3" column="3">
-     <widget class="QLabel" name="labelDBITPhase">
+     <widget class="QLabel" name="label_75">
       <property name="text">
        <string>DBIT Clock Phase (a.u.):</string>
       </property>

pyctbgui/pyctbgui/ui/adc.ui

@@ -19,7 +19,7 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <widget class="QFrame" name="frame_ADC">
+  <widget class="QFrame" name="frame_7">
    <property name="geometry">
     <rect>
      <x>0</x>
@@ -3142,7 +3142,7 @@
       </property>
       <layout class="QGridLayout" name="gridLayout_20">
        <item row="0" column="0">
-        <widget class="QLabel" name="labelADCInversion">
+        <widget class="QLabel" name="label_67">
          <property name="font">
           <font>
            <pointsize>10</pointsize>
@@ -3188,7 +3188,7 @@
         </widget>
        </item>
        <item row="0" column="3">
-        <widget class="QLabel" name="labelADCEnable">
+        <widget class="QLabel" name="label_68">
          <property name="font">
           <font>
            <pointsize>10</pointsize>

pyctbgui/pyctbgui/ui/signals.ui

@@ -6074,33 +6074,6 @@
        <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">
@@ -6113,36 +6086,6 @@
          </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">
@@ -6190,18 +6133,50 @@
          </property>
         </spacer>
        </item>
-       <item row="0" column="5">
-        <spacer name="horizontalSpacer_22">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
+       <item row="0" column="4">
+        <widget class="QSpinBox" name="spinBoxDBitOffset">
+         <property name="minimumSize">
           <size>
-           <width>40</width>
-           <height>20</height>
+           <width>150</width>
+           <height>32</height>
           </size>
          </property>
-        </spacer>
+         <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>
        </item>
       </layout>
      </widget>

pyctbgui/pyctbgui/ui/slowAdcs.ui

@@ -19,7 +19,7 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <widget class="QFrame" name="frame_slowadcs">
+  <widget class="QFrame" name="frame_4">
    <property name="geometry">
     <rect>
      <x>0</x>

pyproject.toml

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

python/CMakeLists.txt

@@ -20,14 +20,13 @@ target_link_libraries(_slsdet PUBLIC
 
 
 set_target_properties(_slsdet PROPERTIES
-                        LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/slsdet
+                        LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
                     )
 
 #Copy Python code 
 set( PYTHON_FILES
     slsdet/__init__.py
     slsdet/adcs.py
-    slsdet/bits.py
     slsdet/dacs.py
     slsdet/powers.py
     slsdet/decorators.py
@@ -38,8 +37,8 @@ set( PYTHON_FILES
     slsdet/enums.py
     slsdet/errors.py
     slsdet/gaincaps.py
+    slsdet/gotthard.py
     slsdet/pattern.py
-    slsdet/PatternGenerator.py
     slsdet/gotthard2.py
     slsdet/moench.py
     slsdet/proxy.py
@@ -50,6 +49,7 @@ set( PYTHON_FILES
     slsdet/temperature.py
     slsdet/lookup.py
     slsdet/utils.py
+
 )
 
 foreach(FILE ${PYTHON_FILES})
@@ -58,6 +58,7 @@ foreach(FILE ${PYTHON_FILES})
 
 endforeach(FILE ${PYTHON_FILES})
 
+
 configure_file( scripts/basic.py  
     ${CMAKE_BINARY_DIR}/basic.py 
 )
@@ -65,28 +66,12 @@ configure_file( scripts/test_virtual.py
     ${CMAKE_BINARY_DIR}/test_virtual.py 
 )
 
-configure_file(scripts/frameSynchronizerPullSocket.py 
-   ${CMAKE_BINARY_DIR}/bin/frameSynchronizerPullSocket.py COPYONLY)
-
-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/../VERSION  
-    ${CMAKE_BINARY_DIR}/bin/slsdet/VERSION
-)
 
 if(SLS_INSTALL_PYTHONEXT)
     install(TARGETS _slsdet
         EXPORT "${TARGETS_EXPORT_NAME}"
-        LIBRARY DESTINATION slsdet
-        COMPONENT python
-    )
-    install(
-        FILES ${PYTHON_FILES} 
-        DESTINATION slsdet
-        COMPONENT python
-        )
-    install(
-        FILES ../VERSION 
-        DESTINATION slsdet
-        COMPONENT python
+        LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/python
     )
 
+    install(FILES ${PYTHON_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/python/slsdet)
 endif()

python/scripts/compile_servers.py

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

python/scripts/frameSynchronizerPullSocket.py

@@ -1,19 +0,0 @@
-# SPDX-License-Identifier: LGPL-3.0-or-other
-# Copyright (C) 2021 Contributors to the SLS Detector Package
-# Script to get combined zmq packets from frame synchronizer using pull zmq sockets
-import json
-import zmq
-
-c = zmq.Context()
-s = c.socket(zmq.PULL)
-s.connect("tcp://127.0.0.1:5555")
-
-while True:
-     m = s.recv_multipart()
-     for p in m:
-         if p.startswith(b"{"):
-             print(p.decode().strip())
-         else:
-             print("binary")
-     print("--------")
-

python/scripts/generate_functions.py

@@ -123,9 +123,6 @@ def visit(node):
     if node.kind == cindex.CursorKind.CLASS_DECL:
         if node.displayname == "Detector":
             for child in node.get_children():
-                # Skip assignment operators
-                if child.kind == cindex.CursorKind.CXX_METHOD and child.spelling == "operator=":
-                    continue
                 if (
                     child.kind == cindex.CursorKind.CXX_METHOD
                     and child.access_specifier == cindex.AccessSpecifier.PUBLIC

python/setup.py

@@ -0,0 +1,73 @@
+# SPDX-License-Identifier: LGPL-3.0-or-other
+# Copyright (C) 2021 Contributors to the SLS Detector Package
+"""
+Setup file for slsdet
+Build upon the pybind11 example found here: https://github.com/pybind/python_example
+"""
+
+import os
+import sys
+from setuptools import setup, find_packages
+from pybind11.setup_helpers import Pybind11Extension, build_ext
+
+
+import subprocess
+def get_git_tag():
+    try:
+        return subprocess.check_output(['git', 'describe', '--tags', '--abbrev=0']).strip().decode('utf-8')
+    except subprocess.CalledProcessError:
+        return 'developer'
+__version__ = get_git_tag()
+
+
+def get_conda_path():
+    """
+    Keep this a function if we need some fancier logic later
+    """
+    print('Prefix: ', os.environ['CONDA_PREFIX'])
+    return os.environ['CONDA_PREFIX']
+
+
+#TODO migrate to CMake build or fetch files from cmake? 
+ext_modules = [
+    Pybind11Extension(
+        '_slsdet',
+        ['src/main.cpp',
+        'src/enums.cpp',
+        'src/current.cpp',
+        'src/detector.cpp',
+        'src/network.cpp',
+        'src/pattern.cpp',
+        'src/scan.cpp',
+        'src/duration.cpp',
+        'src/DurationWrapper.cpp',
+        'src/pedestal.cpp',
+        ]
+        
+        
+        ,
+        include_dirs=[
+            os.path.join(get_conda_path(), 'include'),
+
+        ],
+        libraries=['SlsDetector', 'SlsSupport', 'SlsReceiver'],
+        library_dirs=[
+            os.path.join(get_conda_path(), 'lib'),
+        ],
+        language='c++'
+    ),
+]
+
+setup(
+    name='slsdet',
+    version=__version__,
+    author='Erik Frojdh',
+    author_email='erik.frojdh@psi.ch',
+    url='https://github.com/slsdetectorgroup/slsDetectorPackage',
+    description='Detector API for SLS Detector Group detectors',
+    long_description='',
+    packages=find_packages(exclude=['contrib', 'docs', 'tests']),
+    ext_modules=ext_modules,
+    cmdclass={"build_ext": build_ext},
+    zip_safe=False,
+)

python/slsdet/PatternGenerator.py

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

python/slsdet/__init__.py

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

python/slsdet/bits.py

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

python/slsdet/ctb.py

@@ -4,7 +4,7 @@ from .detector import Detector, freeze
 from .utils import element_if_equal
 from .dacs import DetectorDacs, NamedDacs
 from .powers import DetectorPowers, NamedPowers
-from . import _slsdet
+import _slsdet
 dacIndex = _slsdet.slsDetectorDefs.dacIndex
 from .detector_property import DetectorProperty
 

python/slsdet/dacs.py

@@ -3,7 +3,7 @@
 from .detector_property import DetectorProperty
 from functools import partial
 import numpy as np
-from . import _slsdet
+import _slsdet
 from .detector import freeze
 dacIndex = _slsdet.slsDetectorDefs.dacIndex
 class Dac(DetectorProperty):

python/slsdet/detector.py

@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: LGPL-3.0-or-other
 # Copyright (C) 2021 Contributors to the SLS Detector Package
-from ._slsdet import CppDetectorApi
-from ._slsdet import slsDetectorDefs
-from ._slsdet import IpAddr, MacAddr
+from _slsdet import CppDetectorApi
+from _slsdet import slsDetectorDefs
+from _slsdet import IpAddr, MacAddr
 
 runStatus = slsDetectorDefs.runStatus
 timingMode = slsDetectorDefs.timingMode
@@ -15,7 +15,7 @@ defs = slsDetectorDefs
 
 from .utils import element_if_equal, all_equal, get_set_bits, list_to_bitmask
 from .utils import Geometry, to_geo, element, reduce_time, is_iterable, hostname_list
-from ._slsdet import xy
+from _slsdet import xy
 from .gaincaps import Mythen3GainCapsWrapper
 from . import utils as ut
 from .proxy import JsonProxy, SlowAdcProxy, ClkDivProxy, MaxPhaseProxy, ClkFreqProxy, PatLoopProxy, PatNLoopProxy, PatWaitProxy, PatWaitTimeProxy 
@@ -152,10 +152,6 @@ class Detector(CppDetectorApi):
         """Frees shared memory and sets hostname (or IP address) of all modules concatenated by + 
         Virtual servers can already use the port in hostname separated by ':' and ports incremented by 2 to accomodate the stop server as well.
         
-        Note
-        -----
-        The row and column values in the udp/zmq header are affected by the order in this command and the detsize command. The modules are stacked row by row until they reach the y-axis limit set by detsize (if specified). Then, stacking continues in the next column and so on. This only affects row and column in udp/zmq header.
-        
         Example
         -------
         >>> d.hostname = 'beb031+beb032+'
@@ -274,7 +270,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def serialnumber(self):
-        """Jungfrau][Mythen3][Gotthard2][CTB][Moench] Serial number of detector """
+        """Jungfrau][Gotthard][Mythen3][Gotthard2][CTB][Moench] Serial number of detector """
         return ut.lhex(self.getSerialNumber())
 
     @property
@@ -312,7 +308,7 @@ class Detector(CppDetectorApi):
         -----
         [Eiger] Options: 4, 8, 12, 16, 32. If set to 32, also sets clkdivider to 2 (quarter speed), else to 0 (full speed)\n
         [Mythen3] Options: 8, 16, 32 \n
-        [Jungfrau][Moench][Ctb][Mythen3][Gotthard2][Xilinx Ctb] 16
+        [Jungfrau][Moench][Gotthard][Ctb][Mythen3][Gotthard2][Xilinx Ctb] 16
         """
         return self.getDynamicRange()
 
@@ -372,6 +368,7 @@ class Detector(CppDetectorApi):
         
         [Eiger] Use threshold command to load settings
         [Jungfrau] GAIN0, HIGHGAIN0 \n
+        [Gotthard] DYNAMICGAIN, HIGHGAIN, LOWGAIN, MEDIUMGAIN, VERYHIGHGAIN \n
         [Gotthard2] DYNAMICGAIN, FIXGAIN1, FIXGAIN2 \n
         [Eiger] settings loaded from file found in settingspath
         [Moench] G1_HIGHGAIN, G1_LOWGAIN, G2_HIGHCAP_HIGHGAIN, G2_HIGHCAP_LOWGAIN, G2_LOWCAP_HIGHGAIN, G2_LOWCAP_LOWGAIN, G4_HIGHGAIN, G4_LOWGAIN
@@ -403,7 +400,7 @@ class Detector(CppDetectorApi):
     @element
     def framesl(self):
         """
-        [Jungfrau][Moench][Mythen3][Gotthard2][CTB][Xilinx CTB] Number of frames left in acquisition.\n
+        [Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB][Xilinx CTB] Number of frames left in acquisition.\n
 
         Note
         ----
@@ -634,7 +631,7 @@ class Detector(CppDetectorApi):
     @element
     def periodl(self):
         """
-        [Jungfrau][Moench][CTB][Mythen3][Gotthard2][Xilinx Ctb] Period left for current frame.
+        [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2][Xilinx Ctb] Period left for current frame.
 
         Note
         -----
@@ -656,7 +653,7 @@ class Detector(CppDetectorApi):
     @element
     def delay(self):
         """
-        [Jungfrau][Moench][CTB][Mythen3][Gotthard2][Xilinx Ctb] Delay after trigger, accepts either a value in seconds, DurationWrapper or datetime.timedelta
+        [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2][Xilinx Ctb] Delay after trigger, accepts either a value in seconds, DurationWrapper or datetime.timedelta
 
         :getter: always returns in seconds. To get in DurationWrapper, use getDelayAfterTrigger
 
@@ -698,7 +695,7 @@ class Detector(CppDetectorApi):
     @element
     def delayl(self):
         """
-        [Jungfrau][Moench][CTB][Mythen3][Gotthard2][Xilinx Ctb] Delay left after trigger during acquisition, accepts either a value in seconds, datetime.timedelta or DurationWrapper
+        [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2][Xilinx Ctb] Delay left after trigger during acquisition, accepts either a value in seconds, datetime.timedelta or DurationWrapper
 
         Note
         -----
@@ -1443,6 +1440,8 @@ class Detector(CppDetectorApi):
     @udp_srcip.setter
     def udp_srcip(self, ip):
         if ip == "auto":
+            if self.type == detectorType.GOTTHARD:
+                raise NotImplementedError('Auto for udp_srcip cannot be used for GotthardI')
             ip = socket.gethostbyname(self.hostname[0])        
         ip = ut.make_ip(ip)
         ut.set_using_dict(self.setSourceUDPIP, ip)
@@ -1523,6 +1522,7 @@ class Detector(CppDetectorApi):
 
         Note
         -----
+        [Gotthard] 0, 90, 110, 120, 150, 180, 200 \n
         [Eiger][Mythen3][Gotthard2] 0 - 200 \n
         [Jungfrau][Moench][Ctb] 0, 60 - 200
         """
@@ -1650,7 +1650,7 @@ class Detector(CppDetectorApi):
     def master(self):
         """
         [Eiger][Gotthard2][Jungfrau][Moench] Sets (half) module to master and other(s) to slaves.\n
-        [Gotthard2][Mythen3][Eiger][Jungfrau][Moench] Gets if the current (half) module is master.
+        [Gotthard][Gotthard2][Mythen3][Eiger][Jungfrau][Moench] Gets if the current (half) module is master.
         """
         return self.getMaster()
 
@@ -1908,7 +1908,7 @@ class Detector(CppDetectorApi):
 
     @property
     def adcreg(self):
-        """[Jungfrau][Moench][Ctb] Writes to an adc register 
+        """[Jungfrau][Moench][Ctb][Gotthard] Writes to an adc register 
 
         Note
         -----
@@ -1937,7 +1937,7 @@ class Detector(CppDetectorApi):
     @element
     def triggersl(self):
         """
-        [Jungfrau][Moench][Mythen3][Gotthard2][CTB][Xilinx CTB] Number of triggers left in acquisition.\n
+        [Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB][Xilinx CTB] Number of triggers left in acquisition.\n
         
         Note
         ----
@@ -2202,7 +2202,7 @@ class Detector(CppDetectorApi):
         Note
         -----
         Default: AUTO_TIMING \n
-        [Jungfrau][Moench][Ctb][Gotthard2][Xilinx Ctb] AUTO_TIMING, TRIGGER_EXPOSURE \n
+        [Jungfrau][Moench][Gotthard][Ctb][Gotthard2][Xilinx Ctb] AUTO_TIMING, TRIGGER_EXPOSURE \n
         [Mythen3] AUTO_TIMING, TRIGGER_EXPOSURE, GATED, TRIGGER_GATED \n
         [Eiger] AUTO_TIMING, TRIGGER_EXPOSURE, GATED, BURST_TRIGGER
         """
@@ -2259,7 +2259,7 @@ class Detector(CppDetectorApi):
     def type(self):
         """ Returns detector type. 
         Enum: detectorType
-        [EIGER, JUNGFRAU, MOENCH, MYTHEN3, GOTTHARD2, CHIPTESTBOARD]
+        [EIGER, JUNGFRAU, GOTTHARD, MOENCH, MYTHEN3, GOTTHARD2, CHIPTESTBOARD]
 
         :setter: Not implemented
         """
@@ -2566,7 +2566,7 @@ class Detector(CppDetectorApi):
 
         Note
         -----
-        By default, the on-chip gain switching is active during the entire exposure. This mode disables the on-chip gain switching comparator automatically and the duration is set using compdisabletime.\n
+        By default, the on-chip gain switching is active during the entire exposure. This mode disables the on-chip gain switching comparator automatically after 93.75% of exposure time (only for longer than 100us). The % is only for chipv1.0, the duration can be set for chipv1.1.\n
         Default is 0 or this mode disabled (comparator enabled throughout). 1 enables mode. 0 disables mode. 
         """
         return self.getAutoComparatorDisable()
@@ -2580,6 +2580,10 @@ class Detector(CppDetectorApi):
     def compdisabletime(self):
         """[Jungfrau] Time before end of exposure when comparator is disabled. 
 
+        Note
+        -----
+        It is only possible for chipv1.1.
+
         :getter: always returns in seconds. To get in DurationWrapper, use getComparatorDisableTime
 
         Example
@@ -2909,7 +2913,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def timing_info_decoder(self):
-        """[Jungfrau] [Jungfrau] Advanced Command and only for SWISSFEL and SHINE. Sets the bunch id or timing info decoder. Default is SWISSFEL. Only allowed for pcbv2.0.
+        """[Jungfrau] [Jungfrau] Advanced Command and only for SWISSFEL and SHINE. Sets the bunch id or timing info decoder. Default is SWISSFEL.
         Enum: timingInfoDecoder
         """
         return self.getTimingInfoDecoder()
@@ -3463,16 +3467,6 @@ 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):
@@ -3485,13 +3479,15 @@ class Detector(CppDetectorApi):
     @property
     @element
     def adcphase(self):
-        """[Jungfrau][Moench][CTB] Sets phase shift of ADC clock. 
+        """[Gotthard][Jungfrau][Moench][CTB] Sets phase shift of ADC clock. 
 
         Note
         -----
         [Jungfrau][Moench] Absolute phase shift. Changing Speed also resets adcphase to recommended defaults.\n
-        [Ctb] Absolute phase shift. Changing adcclk also resets adcphase and sets it to previous values.
+        [Ctb] Absolute phase shift. Changing adcclk also resets adcphase and sets it to previous values.\n
+        [Gotthard] Relative phase shift.
 
+        :getter: Not implemented for Gotthard
         """
         return self.getADCPhase()
 
@@ -3708,12 +3704,6 @@ class Detector(CppDetectorApi):
         """
         [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
         -------
         >>> d.patwaittime[0] = 5
@@ -3723,85 +3713,41 @@ class Detector(CppDetectorApi):
         0: 5
         1: 20
         2: 30
-        >>> # using timedelta (up to microseconds precision)
-        >>> from datetime import timedelta
-        >>> d.patwaittime[0] = timedelta(seconds=1, microseconds=3)
-        >>> 
-        >>> # using DurationWrapper to set in seconds
-        >>> from slsdet import DurationWrapper
-        >>> d.patwaittime[0] = DurationWrapper(1.2)
-        >>> 
-        >>> # using DurationWrapper to set in ns
-        >>> t = DurationWrapper()
-        >>> t.set_count(500)
-        >>> d.patwaittime = t
-        >>>
-        >>> # to get in clock cycles
-        >>> d.patwaittime
-        1000
-        >>> 
-        >>> d.getPatternWaitInterval(0)
-        sls::DurationWrapper(total_seconds: 1.23 count: 1230000000)
         """
         return PatWaitTimeProxy(self)
 
-
-    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. 
-
-        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
-        -------
-        >>> 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)
+    def patwaittime0(self):
+        """[Ctb][Mythen3][Xilinx Ctb] Wait 0 time in clock cycles."""
+        return self.getPatternWaitTime(0)
 
-        @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)
+    @patwaittime0.setter
+    def patwaittime0(self, nclk):
+        nclk = ut.merge_args(0, nclk)
+        ut.set_using_dict(self.setPatternWaitTime, *nclk)
 
-        patwaittime.__doc__ = docstring_template.format(level=level)
+    @property
+    @element
+    def patwaittime1(self):
+        """[Ctb][Mythen3][Xilinx Ctb] Wait 1 time in clock cycles."""
+        return self.getPatternWaitTime(1)
 
-        return patwaittime
+    @patwaittime1.setter
+    def patwaittime1(self, nclk):
+        nclk = ut.merge_args(1, nclk)
+        ut.set_using_dict(self.setPatternWaitTime, *nclk)
 
-    patwaittime0 = create_patwaittime_property(0)
-    patwaittime1 = create_patwaittime_property(1)
-    patwaittime2 = create_patwaittime_property(2)
+    @property
+    @element
+    def patwaittime2(self):
+        """[Ctb][Mythen3][Xilinx Ctb] Wait 2 time in clock cycles."""
+        return self.getPatternWaitTime(2)
+
+    @patwaittime2.setter
+    def patwaittime2(self, nclk):
+        nclk = ut.merge_args(2, nclk)
+        ut.set_using_dict(self.setPatternWaitTime, *nclk)
 
 
     @property
@@ -4092,6 +4038,27 @@ class Detector(CppDetectorApi):
         return ClkDivProxy(self)
 
 
+    """
+    ---------------------------<<<Gotthard specific>>>---------------------------
+    """
+
+    @property
+    def exptimel(self):
+        """[Gotthard] Exposure time left for current frame.
+        
+        :getter: always returns in seconds. To get in DurationWrapper, use getExptimeLeft
+        :setter: Not Implemented
+        
+        Example
+        -----------
+        >>> d.exptimel
+        181.23
+        >>> d.getExptimeLeft()
+        [sls::DurationWrapper(total_seconds: 181.23 count: 181230000000)]
+        """
+        t = self.getExptimeLeft()
+        return reduce_time(t)
+
 
     """
     ---------------------------<<<Mythen3 specific>>>---------------------------

python/slsdet/eiger.py

@@ -11,7 +11,7 @@ Created on Wed Dec  6 11:51:18 2017
 from .detector import Detector
 from .temperature import Temperature, DetectorTemperature
 from .dacs import DetectorDacs
-from . import _slsdet
+import _slsdet
 dacIndex = _slsdet.slsDetectorDefs.dacIndex
 from .detector_property import DetectorProperty
 

python/slsdet/enums.py

@@ -15,8 +15,8 @@ if dt === detectorType.EIGER:
 """
 
 
-from . import _slsdet
+import _slsdet
 for name, cls in _slsdet.slsDetectorDefs.__dict__.items():
     if isinstance(cls, type):
-        exec(f'{name} = _slsdet.{cls.__qualname__}')
+        exec(f'{name} = {cls.__module__}.{cls.__qualname__}')
 

python/slsdet/gaincaps.py

@@ -1,6 +1,6 @@
 
 
-from . import _slsdet
+import _slsdet
 gc = _slsdet.slsDetectorDefs.M3_GainCaps
 
 

python/slsdet/gotthard.py

@@ -0,0 +1,53 @@
+# SPDX-License-Identifier: LGPL-3.0-or-other
+# Copyright (C) 2021 Contributors to the SLS Detector Package
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+This file contains the specialization for the Moench detector
+"""
+
+
+from .detector import Detector, freeze
+from .dacs import DetectorDacs
+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/gotthard2.py

@@ -11,7 +11,7 @@ from .detector import Detector, freeze
 
 # from .adcs import Adc, DetectorAdcs
 from .dacs import DetectorDacs
-from . import _slsdet
+import _slsdet
 dacIndex = _slsdet.slsDetectorDefs.dacIndex
 from .detector_property import DetectorProperty
 

python/slsdet/jungfrau.py

@@ -11,7 +11,7 @@ from .detector import Detector, freeze
 
 # from .adcs import Adc, DetectorAdcs
 from .dacs import DetectorDacs
-from . import _slsdet
+import _slsdet
 dacIndex = _slsdet.slsDetectorDefs.dacIndex
 from .detector_property import DetectorProperty
 
@@ -24,7 +24,7 @@ class JungfrauDacs(DetectorDacs):
              ('vdd_prot',   dacIndex.VDD_PROT, 0, 4000,    3000),
              ('vin_com',    dacIndex.VIN_COM, 0, 4000,    1053),
              ('vref_prech', dacIndex.VREF_PRECH, 0, 4000,    1450),
-             ('vb_pixbuf', dacIndex.VB_PIXBUF, 0, 4000,     750),
+             ('vb_pixbuff', dacIndex.VB_PIXBUF, 0, 4000,     750),
              ('vb_ds',      dacIndex.VB_DS, 0, 4000,    1000),
              ('vref_ds',    dacIndex.VREF_DS, 0, 4000,     480),
              ('vref_comp',  dacIndex.VREF_COMP, 0, 4000,     420),

python/slsdet/moench.py

@@ -9,7 +9,7 @@ This file contains the specialization for the Moench detector
 
 from .detector import Detector, freeze
 from .dacs import DetectorDacs
-from . import _slsdet
+import _slsdet
 dacIndex = _slsdet.slsDetectorDefs.dacIndex
 from .detector_property import DetectorProperty
 

python/slsdet/mythen3.py

@@ -11,7 +11,7 @@ from .detector import Detector, freeze
 
 # from .adcs import Adc, DetectorAdcs
 from .dacs import DetectorDacs
-from . import _slsdet
+import _slsdet
 dacIndex = _slsdet.slsDetectorDefs.dacIndex
 gc_enums = _slsdet.slsDetectorDefs.M3_GainCaps
 from .detector_property import DetectorProperty

python/slsdet/pattern.py

@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: LGPL-3.0-or-other
 # Copyright (C) 2021 Contributors to the SLS Detector Package
-from . import _slsdet
+import _slsdet
 
-from ._slsdet import Pattern
+from _slsdet import Pattern
 
 
 class patternParameters(_slsdet.patternParameters):

python/slsdet/powers.py

@@ -3,7 +3,7 @@
 from .detector_property import DetectorProperty
 from functools import partial
 import numpy as np
-from . import _slsdet
+import _slsdet
 from .detector import freeze
 dacIndex = _slsdet.slsDetectorDefs.dacIndex
 class Power(DetectorProperty):

python/slsdet/proxy.py

@@ -3,7 +3,7 @@
 from .utils import element_if_equal
 from .enums import dacIndex
 from .defines import M3_MAX_PATTERN_LEVELS, MAX_PATTERN_LEVELS
-from ._slsdet import slsDetectorDefs
+from _slsdet import slsDetectorDefs
 detectorType = slsDetectorDefs.detectorType
 
 
@@ -275,13 +275,10 @@ class PatWaitTimeProxy:
         self.det = det
 
     def __getitem__(self, key):
-        return element_if_equal(self.det.getPatternWaitClocks(key))
+        return element_if_equal(self.det.getPatternWaitTime(key))
 
     def __setitem__(self, key, value):
-        if isinstance(value, (int, float)) and not isinstance(value, bool):
-            set_proxy_using_dict(self.det.setPatternWaitClocks, key, value)
-        else:
-            set_proxy_using_dict(self.det.setPatternWaitInterval, key, value)
+        set_proxy_using_dict(self.det.setPatternWaitTime, key, value)
 
     def __repr__(self):
         max_levels = MAX_PATTERN_LEVELS

python/slsdet/utils.py

@@ -6,7 +6,7 @@ but not directly used in controlling the detector
 """
 
 from collections import namedtuple
-from . import _slsdet  #C++ lib
+import _slsdet  #C++ lib
 import functools
 import datetime as dt
 import pathlib

python/src/detector.cpp

@@ -21,13 +21,11 @@ void init_det(py::module &m) {
     using sls::Positions;
     using sls::Result;
 
-    m.def("freeSharedMemory",
-          (void (*)(const int, const int)) & sls::freeSharedMemory,
-          py::arg() = 0, py::arg() = -1);
-
     py::class_<Detector> CppDetectorApi(m, "CppDetectorApi");
     CppDetectorApi.def(py::init<int>());
 
+    CppDetectorApi.def("freeSharedMemory",
+                       (void (Detector::*)()) & Detector::freeSharedMemory);
     CppDetectorApi.def("loadConfig",
                        (void (Detector::*)(const std::string &)) &
                            Detector::loadConfig,
@@ -1293,6 +1291,20 @@ void init_det(py::module &m) {
         (void (Detector::*)(defs::collectionMode, sls::Positions)) &
             Detector::setCollectionMode,
         py::arg(), py::arg() = Positions{});
+    CppDetectorApi.def("getROI",
+                       (Result<defs::ROI>(Detector::*)(sls::Positions) const) &
+                           Detector::getROI,
+                       py::arg() = Positions{});
+    CppDetectorApi.def("setROI",
+                       (void (Detector::*)(defs::ROI, int)) & Detector::setROI,
+                       py::arg(), py::arg());
+    CppDetectorApi.def(
+        "clearROI", (void (Detector::*)(sls::Positions)) & Detector::clearROI,
+        py::arg() = Positions{});
+    CppDetectorApi.def("getExptimeLeft",
+                       (Result<sls::ns>(Detector::*)(sls::Positions) const) &
+                           Detector::getExptimeLeft,
+                       py::arg() = Positions{});
     CppDetectorApi.def("getNumberOfBursts",
                        (Result<int64_t>(Detector::*)(sls::Positions) const) &
                            Detector::getNumberOfBursts,
@@ -1664,14 +1676,6 @@ 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,
@@ -1855,22 +1859,13 @@ void init_det(py::module &m) {
                            Detector::setPatternWaitAddr,
                        py::arg(), py::arg(), py::arg() = Positions{});
     CppDetectorApi.def(
-        "getPatternWaitClocks",
+        "getPatternWaitTime",
         (Result<uint64_t>(Detector::*)(int, sls::Positions) const) &
-            Detector::getPatternWaitClocks,
+            Detector::getPatternWaitTime,
         py::arg(), py::arg() = Positions{});
-    CppDetectorApi.def("setPatternWaitClocks",
+    CppDetectorApi.def("setPatternWaitTime",
                        (void (Detector::*)(int, uint64_t, sls::Positions)) &
-                           Detector::setPatternWaitClocks,
-                       py::arg(), py::arg(), py::arg() = Positions{});
-    CppDetectorApi.def(
-        "getPatternWaitInterval",
-        (Result<sls::ns>(Detector::*)(int, sls::Positions) const) &
-            Detector::getPatternWaitInterval,
-        py::arg(), py::arg() = Positions{});
-    CppDetectorApi.def("setPatternWaitInterval",
-                       (void (Detector::*)(int, sls::ns, sls::Positions)) &
-                           Detector::setPatternWaitInterval,
+                           Detector::setPatternWaitTime,
                        py::arg(), py::arg(), py::arg() = Positions{});
     CppDetectorApi.def("getPatternMask",
                        (Result<uint64_t>(Detector::*)(sls::Positions)) &

python/src/detector_in.cpp

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

python/src/duration.cpp

@@ -1,4 +1,3 @@
-#include <chrono>
 #include "py_headers.h"
 
 #include "DurationWrapper.h"
@@ -20,25 +19,4 @@ void init_duration(py::module &m) {
                << " count: " << self.count() << ")";
             return ss.str();
         });
-
-    m.def(
-        "test_return_DurationWrapper",
-        []() {
-            DurationWrapper t(1.3);
-            return t;
-        },
-        R"(
-          Test function to return a DurationWrapper object. Ensures that the automatic conversion in typecaster.h works.
-          )");
-
-    m.def(
-        "test_duration_to_ns",
-        [](const std::chrono::nanoseconds t) {
-            //Duration wrapper is used to be able to convert from time in python to chrono::nanoseconds
-            //return count to have something to test 
-            return t.count();
-        },
-        R"(
-          Test function convert DurationWrapper or number to chrono::ns. Ensures that the automatic conversion in typecaster.h works.
-          )"); // default value to test the default constructor
 }

python/src/enums.cpp

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