Rosenblatt transform works

.gitea/workflows/rh8-local.yml

@@ -1,33 +0,0 @@
-name: Build on local RHEL8
-
-on:
-  push:
-    branches:
-      - developer
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: "detectors-software-RH8"
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build library 
-        run: |
-            source /home/gitea_runner/.bashrc
-            conda activate det
-            mkdir build && cd build
-            conda activate det
-            cmake .. -DSLS_USE_PYTHON=ON
-            make -j 2 
-            cd ../pyctbgui
-            make
-
-      - name: Deploy to NFS update server
-        if: gitea.ref == 'refs/heads/developer'
-        run: |
-            sftp -r gitea_runner@mpc2935:/slsDetectorSoftware/RH8 <<< $'put build/bin'
-            sftp -r gitea_runner@mpc2935:/slsDetectorSoftware/RH8 <<< $'put pyctbgui'

.gitea/workflows/rh8-native.yml

@@ -21,9 +21,9 @@ jobs:
       - name: Build library 
         run: |
             mkdir build && cd build
-            cmake .. -DSLS_USE_PYTHON=ON -DSLS_USE_TESTS=ON -DSLS_USE_SIMULATOR=ON
+            cmake .. -DSLS_USE_PYTHON=ON -DSLS_USE_TESTS=ON 
             make -j 2 
 
       - name: C++ unit tests
         working-directory: ${{gitea.workspace}}/build
-        run: ctest -j1  --rerun-failed --output-on-failure
+        run: ctest

.gitea/workflows/rh9-local.yml

@@ -1,30 +0,0 @@
-name: Build on local RHEL9
-
-on:
-  push:
-    branches:
-      - developer
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: "detectors-software-RH9"
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build library 
-        run: |
-            mkdir build && cd build
-            cmake  -DSLS_USE_PYTHON=ON -DPython_EXECUTABLE=/usr/bin/python3.13 -DPython_INCLUDE_DIR=/usr/include/python3.13 -DPython_LIBRARY=/usr/lib64/libpython3.13.so ..
-            make -j 2 
-            cd ../pyctbgui
-            make
-
-      - name: Deploy to NFS update server
-        if: gitea.ref == 'refs/heads/developer'
-        run: |
-            sftp -r gitea_runner@mpc2935:/slsDetectorSoftware/RH9 <<< $'put build/bin'
-            sftp -r gitea_runner@mpc2935:/slsDetectorSoftware/RH9 <<< $'put pyctbgui'

.gitea/workflows/rh9-native.yml

@@ -19,9 +19,9 @@ jobs:
       - name: Build library 
         run: |
             mkdir build && cd build
-            cmake .. -DSLS_USE_PYTHON=ON -DSLS_USE_TESTS=ON  -DSLS_USE_SIMULATOR=ON
+            cmake .. -DSLS_USE_PYTHON=ON -DSLS_USE_TESTS=ON
             make -j 2 
 
       - name: C++ unit tests
         working-directory: ${{gitea.workspace}}/build
-        run: ctest -j1  --rerun-failed --output-on-failure
+        run: ctest

.github/workflows/build_wheel.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build wheels
-        run: pipx run cibuildwheel==3.2.1
+        run: pipx run cibuildwheel==2.23.0
 
       - uses: actions/upload-artifact@v4
         with:

.github/workflows/cmake.yaml

@@ -19,7 +19,7 @@ jobs:
         with:
           python-version: 3.12
           cache: 'pip'
-      - run: pip install pytest numpy colorama
+      - run: pip install pytest numpy
 
       - uses: awalsh128/cache-apt-pkgs-action@latest
         with:
@@ -37,7 +37,7 @@ jobs:
 
       - name: C++ unit tests
         working-directory: ${{github.workspace}}/build
-        run: ctest -C ${{env.BUILD_TYPE}} -j1 --rerun-failed --output-on-failure
+        run: ctest -C ${{env.BUILD_TYPE}} -j1
 
       - name: Python unit tests
         working-directory: ${{github.workspace}}/build/bin

CMakeLists.txt

@@ -24,15 +24,6 @@ include(cmake/SlsAddFlag.cmake)
 include(cmake/helpers.cmake)
 
 
-find_package(Threads REQUIRED)
-
-# POSIX threads are required for the moment but we use CMake to find them
-# Once migrated to std::thread this can be removed
-if(NOT CMAKE_USE_PTHREADS_INIT)
-    message(FATAL_ERROR "A POSIX threads (pthread) implementation is required, but was not found.")
-endif()
-
-
 option(SLS_USE_SYSTEM_ZMQ "Use system installed libzmq" OFF)
 
 # Using FetchContent to get libzmq
@@ -341,9 +332,6 @@ if (NOT TARGET slsProjectCSettings)
                                                 -Wno-format-truncation
                                     )
     sls_disable_c_warning("-Wstringop-truncation")
-    target_link_libraries(slsProjectCSettings INTERFACE
-        Threads::Threads
-    )
 endif()
 
 

RELEASE.txt

@@ -1,7 +1,7 @@
 SLS Detector Package Major Release x.x.x released on xx.xx.202x
 ===============================================================
 
-This document describes the differences between vx.x.x and v10.0.0  
+This document describes the differences between vx.x.x and vx.0.2   
 
 
 
@@ -35,10 +35,6 @@ instead of the one included in our repo.
 
 Experimental support for building the detector client (including python bindings) on macOS
 
-``rx_dbitlist`` keeps the order of the passed bit list 
-
-Marked unused functions readDataFile/writeDataFile deprecated in file_utils.h
-
 2  On-board Detector Server Compatibility
 ==========================================
 

conda-recipes/main-library/build.sh

@@ -19,7 +19,6 @@ cmake .. -G Ninja \
       -DSLS_USE_PYTHON=OFF \
       -DCMAKE_BUILD_TYPE=Release \
       -DSLS_USE_HDF5=OFF \
-      -DSLS_USE_SYSTEM_ZMQ=ON \
      
 NCORES=$(getconf _NPROCESSORS_ONLN)
 echo "Building using: ${NCORES} cores"

conda-recipes/main-library/meta.yaml

@@ -29,7 +29,6 @@ requirements:
     - libtiff
     - zlib
     - expat
-    - zeromq
   
   run:
     - libstdcxx-ng

conda-recipes/python-client/conda_build_config.yaml

@@ -2,8 +2,6 @@ python:
     - 3.11 
     - 3.12
     - 3.13
-    - 3.14
-
 
 c_compiler:
   - gcc                        # [linux]
@@ -15,4 +13,4 @@ cxx_compiler:
   - gxx                        # [linux]
 
 c_stdlib_version:              # [linux]
-  - 2.17                       # [linux]
+  - 2.17                       # [linux]

conda-recipes/python-client/meta.yaml

@@ -9,11 +9,11 @@ package:
 build:
   number: 0
   script:
-    - unset CMAKE_GENERATOR && {{ PYTHON }} -m pip install . -vv --config-settings=cmake.define.SLS_USE_SYSTEM_ZMQ=ON # [not win]
+    - unset CMAKE_GENERATOR && {{ PYTHON }} -m pip install . -vv  # [not win]
 
 requirements:
   build:
-    - python 
+    - python {{python}}
     - {{ compiler('c') }}
     - {{ stdlib("c") }}
     - {{ compiler('cxx') }}
@@ -21,7 +21,7 @@ requirements:
   host:
     - cmake
     - ninja
-    - python 
+    - python {{python}}
     - pip
     - scikit-build-core
     - pybind11 >=2.13.0
@@ -31,7 +31,7 @@ requirements:
     - catch2
 
   run:
-    - python 
+    - python {{python}}
     - numpy
 
 

docs/src/pyexamples.rst

@@ -50,12 +50,6 @@ datetime.timedelta, DurationWrapper or by setting the time in seconds.
     >>> d.getExptime()
     [sls::DurationWrapper(total_seconds: 181.23 count: 181230000000)]
 
-    # In C++ it is possible to use chrono literals to set time more easily
-    # d.setExptime(7ms). However, this is not possible due to pythons syntax.
-    # instead we can create a unit that we use for conversion.
-    >>> ms = dt.timedelta(milliseconds = 1)
-    >>> d.exptime = 7.5*ms
-
 
 
 ------------------------------------

examples/rawdata.config

@@ -5,18 +5,18 @@ nsigma 5
 gainfile none
 detectorMode counting
 threshold 0
-pedestalfile none
+pedestalfile /mnt/sls_det_storage/moench_data/testNewFW20230714/cu_half_speed_d0_f0_4.raw
 nframes 0
 xMin 0
 xMax 400
 yMin 0
 yMax 400
-outdir ./
+outdir /mnt/sls_det_storage/moench_data/testNewFW20230714/clustNew/
-indir ./
+indir /mnt/sls_det_storage/moench_data/testNewFW20230714/
 flist none
-fformat none
+fformat cu_half_speed_d0_f0_4
 runmin 0
-runmax -1
+runmax 0
 readnrows 400
 eMin 0
 eMax 16000

pyproject.toml

@@ -17,7 +17,7 @@ dependencies = [
 
 [tool.cibuildwheel]
 before-all = "uname -a"
-build = "cp{311,312,313,314}-manylinux_x86_64"
+build = "cp{311,312,313}-manylinux_x86_64"
 
 [tool.scikit-build.build]
 verbose = true

python/slsdet/detector.py

@@ -24,7 +24,6 @@ import datetime as dt
 
 from functools import wraps
 from collections import namedtuple
-from collections.abc import Sequence
 import socket
 import numpy as np
 
@@ -302,46 +301,6 @@ class Detector(CppDetectorApi):
     def rx_arping(self, value):
         ut.set_using_dict(self.setRxArping, value)
 
-    @property
-    def rx_roi(self): 
-        """Gets the list of ROIs configured in the receiver. 
-
-        Note
-        -----
-        Each ROI is represented as a tuple of (x_start, y_start, x_end, y_end). \n
-        If no ROIs are configured, returns [[-1,-1,-1,-1]].
-        """
-        return self.getRxROI() #vector of Roi structs how represented? 
-    
-    @rx_roi.setter
-    def rx_roi(self, rois):
-        """
-        Sets the list of ROIs in the receiver.
-        Can only set multiple ROIs at multi module level without gap pixels. If more than 1 ROI per
-        UDP port, it will throw. Setting number of udp interfaces will clear the
-        roi. Cannot be set for CTB or Xilinx CTB.  
-
-        Note
-        -----
-        Each ROI should be represented as a sequence of 4 ints (x_start, y_start, x_end, y_end). \n
-        For mythen3 or gotthard2 pass a sequence of 2 ints (x_start, x_end) \n
-        For multiple ROI's pass a sequence of sequence \n
-        Example: [[0, 100, 50, 100], [260, 270, 50,100]] \n
-        """
-        # TODO: maybe better to accept py::object in setRxROI and handle there? 
-        if not isinstance(rois, Sequence):
-            raise TypeError(
-            "setRxROI failed: expected a tuple/list of ints x_min, x_max, y_min, y_max "
-            "or a sequence of such."
-        )
-        if(not isinstance(rois[0], Sequence)): 
-            self.setRxROI([rois])
-        else:
-            self.setRxROI(rois)
-
-    def rx_clearroi(self): 
-        """Clears all the ROIs configured in the receiver."""
-        self.clearRxROI()
 
     @property
     @element

python/src/detector.cpp

@@ -942,7 +942,6 @@ void init_det(py::module &m) {
                        (void (Detector::*)(const std::vector<defs::ROI> &)) &
                            Detector::setRxROI,
                        py::arg());
-
     CppDetectorApi.def("clearRxROI",
                        (void (Detector::*)()) & Detector::clearRxROI);
     CppDetectorApi.def(

python/src/typecaster.h

@@ -1,12 +1,11 @@
 // SPDX-License-Identifier: LGPL-3.0-or-other
 // Copyright (C) 2021 Contributors to the SLS Detector Package
 #pragma once
-#include <datetime.h>
 #include <pybind11/pybind11.h>
+#include <datetime.h>
 
-#include "DurationWrapper.h"
 #include "sls/Result.h"
-#include "sls/sls_detector_defs.h"
+#include "DurationWrapper.h"
 
 namespace py = pybind11;
 namespace pybind11 {
@@ -15,130 +14,84 @@ template <typename Type, typename Alloc>
 struct type_caster<sls::Result<Type, Alloc>>
     : list_caster<sls::Result<Type, Alloc>, Type> {};
 
+
 // Based on the typecaster in pybind11/chrono.h
 template <> struct type_caster<std::chrono::nanoseconds> {
-  public:
+    public:
-    PYBIND11_TYPE_CASTER(std::chrono::nanoseconds,
+        PYBIND11_TYPE_CASTER(std::chrono::nanoseconds, const_name("DurationWrapper"));
-                         const_name("DurationWrapper"));
 
-    // signed 25 bits required by the standard.
+        // signed 25 bits required by the standard.
-    using days = std::chrono::duration<int_least32_t, std::ratio<86400>>;
+        using days = std::chrono::duration<int_least32_t, std::ratio<86400>>;
 
-    /**
+        /**
-     * Conversion part 1 (Python->C++): convert a PyObject into
+         * Conversion part 1 (Python->C++): convert a PyObject into std::chrono::nanoseconds
-     * std::chrono::nanoseconds try datetime.timedelta, floats and our
+         * try datetime.timedelta, floats and our DurationWrapper wrapper
-     * DurationWrapper wrapper
+         */
-     */
 
-    bool load(handle src, bool) {
+        bool load(handle src, bool) {
-        using namespace std::chrono;
+            using namespace std::chrono;
 
-        // Lazy initialise the PyDateTime import
+            // Lazy initialise the PyDateTime import
-        if (!PyDateTimeAPI) {
+            if (!PyDateTimeAPI) {
-            PyDateTime_IMPORT;
+                PyDateTime_IMPORT;
-        }
+            }
 
-        if (!src) {
+            if (!src) {
-            return false;
-        }
-        // If invoked with datetime.delta object, same as in chrono.h
-        if (PyDelta_Check(src.ptr())) {
-            value = duration_cast<nanoseconds>(
-                days(PyDateTime_DELTA_GET_DAYS(src.ptr())) +
-                seconds(PyDateTime_DELTA_GET_SECONDS(src.ptr())) +
-                microseconds(PyDateTime_DELTA_GET_MICROSECONDS(src.ptr()))
-
-            );
-            return true;
-        }
-        // If invoked with a float we assume it is seconds and convert, same as
-        // in chrono.h
-        if (PyFloat_Check(src.ptr())) {
-            value = duration_cast<nanoseconds>(
-                duration<double>(PyFloat_AsDouble(src.ptr())));
-            return true;
-        }
-        // If invoked with an int we assume it is nanoseconds and convert, same
-        // as in chrono.h
-        if (PyLong_Check(src.ptr())) {
-            value = duration_cast<nanoseconds>(
-                duration<int64_t>(PyLong_AsLongLong(src.ptr())));
-            return true;
-        }
-
-        // Lastly if we were actually called with a DurationWrapper object we
-        // get the number of nanoseconds and create a std::chrono::nanoseconds
-        // from it
-        py::object py_cls =
-            py::module::import("slsdet._slsdet").attr("DurationWrapper");
-        if (py::isinstance(src, py_cls)) {
-            sls::DurationWrapper *cls = src.cast<sls::DurationWrapper *>();
-            value = nanoseconds(cls->count());
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Conversion part 2 (C++ -> Python)
-     * import the module to get a handle to the wrapped class
-     * Default construct an object of (wrapped) DurationWrapper
-     * set the count from chrono::nanoseconds and return
-     */
-    static handle cast(std::chrono::nanoseconds src,
-                       return_value_policy /* policy */, handle /* parent */) {
-        py::object py_cls =
-            py::module::import("slsdet._slsdet").attr("DurationWrapper");
-        py::object *obj = new py::object;
-        *obj = py_cls();
-        sls::DurationWrapper *dur = obj->cast<sls::DurationWrapper *>();
-        dur->set_count(src.count());
-        return *obj;
-    }
-};
-
-// Type caster for sls::defs::ROI from tuple
-template <> struct type_caster<sls::defs::ROI> {
-    PYBIND11_TYPE_CASTER(sls::defs::ROI, _("Sequence[int, int, int, int] or "
-                                           "Sequence[int, int]"));
-
-    // convert c++ ROI to python tuple
-    static handle cast(const sls::defs::ROI &roi, return_value_policy, handle) {
-        return py::make_tuple(roi.xmin, roi.xmax, roi.ymin, roi.ymax).release();
-    }
-
-    // convert from python to c++ ROI
-    bool load(handle roi, bool /*allow implicit conversion*/) {
-
-        // accept tuple, list, numpy array any sequence
-        py::sequence seq;
-        try {
-            seq = py::reinterpret_borrow<py::sequence>(roi);
-        } catch (...) {
-            return false;
-        }
-
-        if (seq.size() != 4 && seq.size() != 2)
-            return false;
-        // Check if each element is an int
-        for (auto item : seq) {
-            if (!py::isinstance<py::int_>(item)) {
                 return false;
             }
+            // If invoked with datetime.delta object, same as in chrono.h
+            if (PyDelta_Check(src.ptr())) {
+                value = duration_cast<nanoseconds>(
+                    days(PyDateTime_DELTA_GET_DAYS(src.ptr())) +
+                    seconds(PyDateTime_DELTA_GET_SECONDS(src.ptr())) +
+                    microseconds(PyDateTime_DELTA_GET_MICROSECONDS(src.ptr()))
+                    
+                );
+                return true;
+            }
+            // If invoked with a float we assume it is seconds and convert, same as in chrono.h
+            if (PyFloat_Check(src.ptr())) {
+                value = duration_cast<nanoseconds>(duration<double>(PyFloat_AsDouble(src.ptr())));
+                return true;
+            }
+            // If invoked with an int we assume it is nanoseconds and convert, same as in chrono.h
+            if (PyLong_Check(src.ptr())) {
+                value = duration_cast<nanoseconds>(duration<int64_t>(PyLong_AsLongLong(src.ptr())));
+                return true;
+            }
+
+
+            // Lastly if we were actually called with a DurationWrapper object we get
+            // the number of nanoseconds and create a std::chrono::nanoseconds from it
+            py::object py_cls = py::module::import("slsdet._slsdet").attr("DurationWrapper");
+            if (py::isinstance(src, py_cls)){
+                sls::DurationWrapper *cls = src.cast<sls::DurationWrapper *>();
+                value = nanoseconds(cls->count());
+                return true;
+            }
+            
+            
+            return false;
+
         }
 
-        value.xmin = seq[0].cast<int>();
+        /**
-        value.xmax = seq[1].cast<int>();
+         * Conversion part 2 (C++ -> Python)
-
+         * import the module to get a handle to the wrapped class
-        if (seq.size() == 4) {
+         * Default construct an object of (wrapped) DurationWrapper
-            value.ymin = seq[2].cast<int>();
+         * set the count from chrono::nanoseconds and return
-            value.ymax = seq[3].cast<int>();
+         */
+        static handle cast(std::chrono::nanoseconds src, return_value_policy /* policy */, handle /* parent */) {
+            py::object py_cls = py::module::import("slsdet._slsdet").attr("DurationWrapper");
+            py::object* obj = new py::object;
+            *obj = py_cls();
+            sls::DurationWrapper *dur = obj->cast<sls::DurationWrapper *>();
+            dur->set_count(src.count());
+            return *obj;
         }
+    };
+
 
-        return true;
-    }
-};
 
 } // namespace detail
 } // namespace pybind11

python/tests/conftest.py

@@ -1,85 +0,0 @@
-import pytest
-import sys
-import traceback
-
-from pathlib import Path
-
-current_dir = Path(__file__).resolve().parents[2]
-
-scripts_dir = current_dir / "tests" / "scripts"
-
-sys.path.append(str(scripts_dir))
-
-print(sys.path)
-
-from utils_for_test import (
-    Log,
-    LogLevel,
-    cleanup,
-    startReceiver,
-    startDetectorVirtualServer,
-    loadConfig, 
-    loadBasicSettings,
-)
-
-def pytest_addoption(parser):
-    parser.addoption(
-        "--with-detector-simulators", action="store_true", default=False, help="Run tests that require detector simulators"
-    )
-
-def pytest_configure(config):
-    config.addinivalue_line("markers", "withdetectorsimulators: mark test as needing detector simulators to run")
-
-def pytest_collection_modifyitems(config, items):
-    if config.getoption("--with-detector-simulators"):
-        return
-    skip = pytest.mark.skip(reason="need --with-detector-simulators option to run")
-    for item in items:
-        if "withdetectorsimulators" in item.keywords:
-            item.add_marker(skip)
-
-#helper fixture for servers
-@pytest.fixture
-def servers(request):
-    try:
-        return request.param  # comes from @pytest.mark.parametrize(..., indirect=True)
-    except AttributeError:
-        # fallback default if the test did not parametrize
-        return ['eiger', 'jungfrau', 'mythen3', 'gotthard2', 'ctb', 'moench', 'xilinx_ctb']
-    return request.param
-
-@pytest.fixture
-def test_with_simulators(servers):
-    """ Fixture to automatically setup virtual detector servers for testing. """
-
-    LOG_PREFIX_FNAME = '/tmp/slsDetectorPackage_virtual_PythonAPI_test'
-    MAIN_LOG_FNAME = LOG_PREFIX_FNAME + '_log.txt'
-
-    with open(MAIN_LOG_FNAME, 'w') as fp:
-        try:
-            nmods = 2
-            for server in servers:
-                for ninterfaces in range(1,2):
-                    if ninterfaces == 2 and server != 'jungfrau' and server != 'moench':
-                        continue
-                        
-                    msg = f'Starting Python API Tests for {server}'
-
-                    if server == 'jungfrau' or server == 'moench':
-                        msg += f' with {ninterfaces} interfaces'
-
-                    Log(LogLevel.INFOBLUE, msg, fp)
-                    cleanup(fp)
-                    startDetectorVirtualServer(server, nmods, fp)
-                    startReceiver(nmods, fp)
-                    d = loadConfig(name=server, log_file_fp=fp, num_mods=nmods, num_frames=1, num_interfaces=ninterfaces)
-                    loadBasicSettings(name=server, d=d, fp=fp)
-                    yield # run test 
-            cleanup(fp) # teardown 
-        except Exception as e:
-            with open(MAIN_LOG_FNAME, 'a') as fp_error:
-                traceback.print_exc(file=fp_error)
-                Log(LogLevel.ERROR, f'Tests Failed.', fp)
-            cleanup(fp)
-            
-

python/tests/test_pythonAPI.py

@@ -1,48 +0,0 @@
-import pytest 
-import sys 
-
-from conftest import test_with_simulators
-
-from slsdet import Detector
-
-@pytest.mark.withdetectorsimulators
-@pytest.mark.parametrize("servers", [["moench"]], indirect=True)
-def test_rx_ROI_moench(test_with_simulators, servers):
-    """ Test setting and getting rx_ROI property of Detector class for moench. """
-
-    d = Detector()
-    d.rx_roi = (0, 10, 10, 20)
-    roi = d.rx_roi
-    assert roi == [(0, 10, 10, 20)]
-    
-    d.rx_roi = [5,15,15,25]
-
-    assert d.rx_roi == [(5,15,15,25)]
-
-    d.rx_roi = [[0,10,0,20], [5,20,410,420]] 
-
-    roi = d.rx_roi
-    assert roi == [(0,10,0,20), (5,20,410,420)]
-
-    d.rx_clearroi() 
-    roi = d.rx_roi
-    assert roi == [(-1,-1,-1,-1)] 
-
-@pytest.mark.withdetectorsimulators
-@pytest.mark.parametrize("servers", [["mythen3"]], indirect=True)
-def test_rx_ROI_mythen(test_with_simulators, servers):
-    """ Test setting and getting rx_ROI property of Detector class for mythen. """
-
-    d = Detector()
-    d.rx_roi = (0, 10)
-    roi = d.rx_roi
-    assert roi == [(0, 10, -1, -1)]
-
-    #d.rx_roi = [[5,15, 0, 1]] # not allowed for mythen3
-
-    d.rx_roi = [0,10, -1, -1]
-
-    assert d.rx_roi == [(0,10,-1,-1)]
-    
-
-

sample/CMakeLists.txt

@@ -3,6 +3,8 @@
 add_executable(using_logger using_logger.cpp)
 target_link_libraries(using_logger 
     slsSupportShared
+    pthread
+    rt
 )  
 
 set_target_properties(using_logger PROPERTIES

slsDetectorCalibration/interpolations/etaInterpolationBase.h

@@ -200,6 +200,9 @@ class etaInterpolationBase : public slsInterpolation {
     // virtual void prepareInterpolation(int &ok)=0;
 
     void debugSaveAll(int ind = 0) {
+
+      std::cout << "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++SAVING ETAS"<< std::endl;
+      
         int ibx, iby;
         char tit[10000];
 
@@ -214,21 +217,21 @@ class etaInterpolationBase : public slsInterpolation {
             etah[ii] = heta[ii];
             tot_eta += heta[ii];
         }
-        sprintf(tit, "/scratch/eta_%d.tiff", ind);
+        sprintf(tit, "eta_%d.tiff", ind);
         WriteToTiff(etah, tit, nbetaX, nbetaY);
 
         for (int ii = 0; ii < nbetaX * nbetaY; ii++) {
             ibb = (hhx[ii] * nSubPixelsX);
             etah[ii] = ibb;
         }
-        sprintf(tit, "/scratch/eta_hhx_%d.tiff", ind);
+        sprintf(tit, "eta_hhx_%d.tiff", ind);
         WriteToTiff(etah, tit, nbetaX, nbetaY);
 
         for (int ii = 0; ii < nbetaX * nbetaY; ii++) {
             ibb = hhy[ii] * nSubPixelsY;
             etah[ii] = ibb;
         }
-        sprintf(tit, "/scratch/eta_hhy_%d.tiff", ind);
+        sprintf(tit, "eta_hhy_%d.tiff", ind);
         WriteToTiff(etah, tit, nbetaX, nbetaY);
 
         float *ftest = new float[nSubPixelsX * nSubPixelsY];
@@ -262,7 +265,7 @@ class etaInterpolationBase : public slsInterpolation {
                      << std::endl;
         }
 
-        sprintf(tit, "/scratch/ftest_%d.tiff", ind);
+        sprintf(tit, "./ftest_%d.tiff", ind);
         WriteToTiff(ftest, tit, nSubPixelsX, nSubPixelsY);
 
         // int ibx=0, iby=0;
@@ -280,7 +283,7 @@ class etaInterpolationBase : public slsInterpolation {
             } else
                 etah[ii] = 0;
         }
-        sprintf(tit, "/scratch/eta_bad_%d.tiff", ind);
+        sprintf(tit, "./eta_bad_%d.tiff", ind);
         WriteToTiff(etah, tit, nbetaX, nbetaY);
         // std::cout << "Index: " << ind << "\t Bad bins: "<< nbad << std::endl;
         // int ibx=0, iby=0;

slsDetectorCalibration/interpolations/etaInterpolationRosenblatt.h

@@ -0,0 +1,232 @@
+// SPDX-License-Identifier: LGPL-3.0-or-other
+// Copyright (C) 2021 Contributors to the SLS Detector Package
+#ifndef ETA_INTERPOLATION_POSXY_H
+#define ETA_INTERPOLATION_POSXY_H
+//#define SAVE_ALL
+//#include "sls/tiffIO.h"
+#include "eta2InterpolationBase.h"
+#include "eta3InterpolationBase.h"
+#include "etaInterpolationBase.h"
+
+
+class etaInterpolationRosenblatt : public virtual etaInterpolationBase {
+  public:
+    etaInterpolationRosenblatt(int nx = 400, int ny = 400, int ns = 25, int nsy = 25,
+                          int nb = -1, int nby = -1, double emin = 1,
+                          double emax = 0)
+        : etaInterpolationBase(nx, ny, ns, nsy, nb, nby, emin, emax){
+              //  std::cout << "epxy " << nb << " " << emin << " " << emax << std::endl;
+              //  std::cout << nbeta << " " << etamin << " " << etamax << std::endl;
+          };
+
+    etaInterpolationRosenblatt(etaInterpolationRosenblatt *orig)
+        : etaInterpolationBase(orig){};
+
+    virtual etaInterpolationRosenblatt *Clone() = 0; /* { */
+
+    /* return new etaInterpolationPosXY(this); */
+
+    /* }; */
+
+    virtual void prepareInterpolation(int &ok) {
+        ok = 1;
+
+        ///*Eta Distribution Rebinning*///
+        // double bsize=1./nSubPixels; //precision
+        // std::cout<<"nPixelsX = "<<nPixelsX<<" nPixelsY = "<<nPixelsY<<" nSubPixels
+        // = "<<nSubPixels<<endl;
+        double tot_eta = 0;
+        double tot_eta_x = 0;
+        double tot_eta_y = 0;
+        for (int ip = 0; ip < nbetaX * nbetaY; ip++)
+            tot_eta += heta[ip];
+        std::cout << "total eta entries is :" << tot_eta << std::endl;
+        if (tot_eta <= 0) {
+            ok = 0;
+            return;
+        };
+
+        double *hx = new double[nbetaX];  // profile x
+        double *hy = new double[nbetaY];  // profile y
+        double *hix = new double[nbetaX]; // integral of projection x
+        double *hiy = new double[nbetaY]; // integral of projection y
+        //  int ii=0;
+        double etax, etay;
+        for (int ib = 0; ib < nbetaX; ib++) {
+
+            // tot_eta_y=0;
+
+            for (int iby = 0; iby < nbetaY; iby++) {
+                etay = etamin + iby * etastepY;
+                // std::cout << etax << std::endl;
+
+                // tot_eta_x+=hx[iby];
+                if (etay >= 0 && etay <= 1)
+                    hy[iby] = heta[ib + iby * nbetaX];
+                else
+                    hy[iby] = 0;
+                // tot_eta_y+=hy[iby];
+            }
+
+            hiy[0] = hy[0];
+
+            for (int iby = 1; iby < nbetaY; iby++) {
+                hiy[iby] = hiy[iby - 1] + hy[iby];
+            }
+
+            tot_eta_y = hiy[nbetaY - 1] + 1;
+
+            for (int iby = 0; iby < nbetaY; iby++) {
+                if (tot_eta_y <= 0) {
+                    hhy[ib + iby * nbetaX] = -1;
+                    // ii=(ibx*nSubPixels)/nbeta;
+                } else {
+                    // if (hiy[ibx]>tot_eta_y*(ii+1)/nSubPixels) ii++;
+                    hhy[ib + iby * nbetaX] = hiy[iby] / tot_eta_y;
+                }
+            }
+        }
+
+        for (int ib = 0; ib < nbetaY; ib++) {
+
+            for (int ibx = 0; ibx < nbetaX; ibx++) {
+                etax = etamin + ibx * etastepX;
+                // std::cout << etax << std::endl;
+                if (etax >= 0 && etax <= 1)
+                    hx[ibx] = heta[ibx + ib * nbetaX];
+                else {
+                    hx[ibx] = 0;
+                }
+            }
+            hix[0] = hx[0];
+
+            for (int ibx = 1; ibx < nbetaX; ibx++) {
+                hix[ibx] = hix[ibx - 1] + hx[ibx];
+            }
+
+	    // tot_eta_x = hix[nbetaX - 1] + 1;
+
+            for (int ibx = 0; ibx < nbetaX; ibx++) {
+	      //if (tot_eta_x <= 0) {
+              //      hhx[ibx + ib * nbetaX] = -1;
+              //  } else {
+	      hhx[ibx + ib * nbetaX] = hix[ibx];// / tot_eta_x;
+	      //}
+            }
+
+            
+        }
+
+
+	  for (int ibx = 0; ibx < nbetaX; ibx++) {
+	  int val=0;
+	for (int ib = 0; ib < nbetaY; ib++) {
+	    val+=hhx[ibx + ib * nbetaX];
+	  }
+	// for (int ibx = 0; ibx < nbetaX; ibx++) {
+	for (int ib = 0; ib < nbetaY; ib++) {
+	    hhx[ibx + ib * nbetaX]=val;
+          }    
+	}
+	tot_eta_x = hhx[nbetaX - 1] + 1;
+	for (int ib = 0; ib < nbetaY; ib++) {
+	    
+	  //tot_eta_x = hix[nbetaX - 1] + 1;
+
+            for (int ibx = 0; ibx < nbetaX; ibx++) {
+                if (tot_eta_x <= 0) {
+                    hhx[ibx + ib * nbetaX] = -1;
+                } else {
+                    hhx[ibx + ib * nbetaX] = hhx[ibx + ib * nbetaX] / tot_eta_x;
+                }
+            }
+	}
+	/*
+        int ibx, iby, ib;
+
+        iby = 0;
+        while (hhx[iby * nbetaY + nbetaY / 2] < 0)
+            iby++;
+        for (ib = 0; ib < iby; ib++) {
+            for (ibx = 0; ibx < nbetaX; ibx++)
+                hhx[ibx + nbetaX * ib] = hhx[ibx + nbetaX * iby];
+        }
+        iby = nbetaY - 1;
+
+        while (hhx[iby * nbetaY + nbetaY / 2] < 0)
+            iby--;
+        for (ib = iby + 1; ib < nbetaY; ib++) {
+            for (ibx = 0; ibx < nbetaX; ibx++)
+                hhx[ibx + nbetaX * ib] = hhx[ibx + nbetaX * iby];
+        }
+
+        iby = 0;
+        while (hhy[nbetaX / 2 * nbetaX + iby] < 0)
+            iby++;
+        for (ib = 0; ib < iby; ib++) {
+            for (ibx = 0; ibx < nbetaY; ibx++)
+                hhy[ib + nbetaX * ibx] = hhy[iby + nbetaX * ibx];
+        }
+        iby = nbetaX - 1;
+
+        while (hhy[nbetaX / 2 * nbetaX + iby] < 0)
+            iby--;
+        for (ib = iby + 1; ib < nbetaX; ib++) {
+            for (ibx = 0; ibx < nbetaY; ibx++)
+                hhy[ib + nbetaX * ibx] = hhy[iby + nbetaX * ibx];
+        }
+	*/
+	//#ifdef SAVE_ALL
+        debugSaveAll();
+	//#endif
+        delete[] hx;
+        delete[] hy;
+        delete[] hix;
+        delete[] hiy;
+
+        return;
+    }
+};
+
+class eta2InterpolationRosenblatt : public virtual eta2InterpolationBase,
+                               public virtual etaInterpolationRosenblatt {
+  public:
+    eta2InterpolationRosenblatt(int nx = 400, int ny = 400, int ns = 25,
+                           int nsy = 25, int nb = -1, int nby = -1,
+                           double emin = 1, double emax = 0)
+        : etaInterpolationBase(nx, ny, ns, nsy, nb, nby, emin, emax),
+          eta2InterpolationBase(nx, ny, ns, nsy, nb, nby, emin, emax),
+          etaInterpolationRosenblatt(nx, ny, ns, nsy, nb, nby, emin, emax){
+              //  std::cout << "e2pxy " << nb << " " << emin << " " << emax << std::endl;
+          };
+
+    eta2InterpolationRosenblatt(eta2InterpolationRosenblatt *orig)
+        : etaInterpolationBase(orig), etaInterpolationRosenblatt(orig){};
+
+    virtual eta2InterpolationRosenblatt *Clone() {
+        return new eta2InterpolationRosenblatt(this);
+    };
+};
+
+class eta3InterpolationRosenblatt : public virtual eta3InterpolationBase,
+                               public virtual etaInterpolationRosenblatt {
+  public:
+    eta3InterpolationRosenblatt(int nx = 400, int ny = 400, int ns = 25,
+                           int nsy = 25, int nb = -1, int nby = -1,
+                           double emin = 1, double emax = 0)
+        : etaInterpolationBase(nx, ny, ns, nsy, nb, nby, emin, emax),
+          eta3InterpolationBase(nx, ny, ns, nsy, nb, nby, emin, emax),
+          etaInterpolationRosenblatt(nx, ny, ns, nsy, nb, nby, emin, emax){
+              //   std::cout << "e3pxy " << nbeta << " " << etamin << " " << etamax
+              //   << " " << nSubPixels<< std::endl;
+          };
+
+    eta3InterpolationRosenblatt(eta3InterpolationRosenblatt *orig)
+        : etaInterpolationBase(orig), etaInterpolationRosenblatt(orig){};
+
+    virtual eta3InterpolationRosenblatt *Clone() {
+        return new eta3InterpolationRosenblatt(this);
+    };
+};
+
+#endif

slsDetectorCalibration/jungfrauExecutables/CMakeLists.txt

@@ -76,8 +76,11 @@ foreach(exe ${JUNGFRAU_EXECUTABLES})
     target_link_libraries(${exe} 
         PUBLIC
         slsSupportStatic
+        pthread 
         tiffio
         fmt::fmt
+          #-L/usr/lib64/
+        #-lm  -lstdc++  -lrt
 
         PRIVATE
         slsProjectWarnings

slsDetectorCalibration/moenchExecutables/CMakeLists.txt

@@ -69,6 +69,7 @@ foreach(exe ${MOENCH_EXECUTABLES})
         PUBLIC
         slsSupportStatic
         ${ZeroMQ_LIBRARIES} 
+        pthread 
         tiffio
 
         PRIVATE

slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp

@@ -17,7 +17,7 @@
 #endif
 
 //#include "etaInterpolationPosXY.h"
-#include "etaInterpolationPosXY.h"
+#include "etaInterpolationRosenblatt.h"
 #include "noInterpolation.h"
 //#include "etaInterpolationCleverAdaptiveBins.h"
 //#include "etaInterpolationRandomBins.h"
@@ -114,8 +114,8 @@ int main(int argc, char *argv[]) {
     //int f0 = -1;
     //  int nSubPixels = nsubpix;
 #ifndef NOINTERPOLATION
-    eta2InterpolationPosXY *interp =
+    eta2InterpolationRosenblatt *interp =
-      new eta2InterpolationPosXY(NC, NR, nsubpix, nsubpix, etabins, etabins, etamin, etamax);
+      new eta2InterpolationRosenblatt(NC, NR, nsubpix, nsubpix, etabins, etabins, etamin, etamax);
     // eta2InterpolationCleverAdaptiveBins *interp=new
     // eta2InterpolationCleverAdaptiveBins(NC, NR, nsubpix, etabins, etamin,
     // etamax);
@@ -134,6 +134,7 @@ int main(int argc, char *argv[]) {
     cout << "read ff " << argv[2] << endl;
     sprintf(fname, "%s", argv[2]);
     interp->readFlatField(fname);
+    
     interp->prepareInterpolation(ok); //, MAX_ITERATIONS);
 #endif
     // return 0;

slsDetectorCalibration/moenchExecutables/moenchRawDataProcess.cpp

@@ -174,6 +174,7 @@ int main(int argc, char *argv[]) {
     int nped = 1000;
     
     int cf = 0;
+
     int numberOfPackets=nrows/8;
 #ifdef RECT
     cout << "Should be rectangular but now it will crash! No data structure defined!" << endl;
@@ -181,7 +182,7 @@ int main(int argc, char *argv[]) {
     
 #ifndef MOENCH04
     moench03v2Data *decoder = new moench03v2Data(nrows/2);
-    cout << "MOENCH03!" << endl;
+    cout << "MOENCH03 V2!" << endl;
 #endif
 
 #ifdef MOENCH04
@@ -298,7 +299,7 @@ int main(int argc, char *argv[]) {
     double *ped=new double[nx * ny];//, *ped1;
     int pos,pos1;
     //return  0;
-  
+
     if (pedfile.find(".raw") != std::string::npos) {
       pos1=pedfile.rfind("/");
       strcpy(froot,pedfile.substr(pos1).c_str());
@@ -309,6 +310,7 @@ int main(int argc, char *argv[]) {
     cout << "PEDESTAL " << endl;
     if (pedfile.find(".tif") == std::string::npos) {
       sprintf(fname, "%s", pedfile.c_str());
+
             cout << fname << endl;
             std::time(&end_time);
             //cout << "aaa" << std::ctime(&end_time) << endl;
@@ -320,24 +322,28 @@ int main(int argc, char *argv[]) {
             if (filebin.is_open()) {
 	      ff = -1;
                 while (decoder->readNextFrame(filebin, ff, np, buff)) {
+
 		  if (np == numberOfPackets) {
 		    mt->pushData(buff);
                         mt->nextThread();
                         mt->popFree(buff);
                         ifr++;
 			if (ifr % 100 == 0)
+
 			  cout << ifr << " " << ff << " " << np << endl;
 			    //	break;
 		  } else {
-		    cout << ifr << " " << ff << " " << np << endl;
+		    cout << "bp "<< ifr << " " << ff << " " << np << endl;
 		    break;
 		  }
                     ff = -1;
                 }
                 filebin.close();
                 while (mt->isBusy()) {
-		          ;
+
-		          }
+		  ;
+
+		}
 		
 		sprintf(imgfname, "%s/%s_ped.tiff", outdir.c_str(),froot);
 		mt->writePedestal(imgfname);
@@ -382,7 +388,7 @@ int main(int argc, char *argv[]) {
        runmax--;
        flist.close();
        cout << "Found " << runmax << " files " << endl;
-       flist.open (fformat, std::ifstream::in);
+       flist.open (args["flist"].c_str(), std::ifstream::in);
     } 
 
     for (int irun = runmin; irun <= runmax; irun++) {
@@ -435,6 +441,7 @@ int main(int argc, char *argv[]) {
             ff = -1;
             ifr = 0;
             while (decoder->readNextFrame(filebin, ff, np, buff)) {
+
 	      if (np == numberOfPackets) {
                     //         //push
                     mt->pushData(buff);
@@ -462,8 +469,19 @@ int main(int argc, char *argv[]) {
                     }
 	      } else {
 		cout << "bp " << ifr << " " << ff << " " << np << endl;
+		
 	      }
                 ff = -1;
+
+
+		if (ifr % 100 == 0){
+		  sprintf(imgfname, "%s/%s_f%05d_ped.tiff", outdir.c_str(),froot, ifile++); 
+		  while (mt->isBusy()) {
+		    ;
+		  }
+		  mt->writePedestal(imgfname);
+		}
+
             }
             cout << "--" << endl;
             filebin.close();

slsDetectorServers/ctbDetectorServer/CMakeLists.txt

@@ -37,9 +37,7 @@ target_compile_definitions(ctbDetectorServer_virtual
 )
 
 target_link_libraries(ctbDetectorServer_virtual
-    PUBLIC 
+    PUBLIC pthread rt m slsProjectCSettings
-    m 
-    slsProjectCSettings
 )
 
 set_target_properties(ctbDetectorServer_virtual PROPERTIES

slsDetectorServers/eigerDetectorServer/CMakeLists.txt

@@ -30,8 +30,7 @@ target_compile_definitions(eigerDetectorServer_virtual
 )
 
 target_link_libraries(eigerDetectorServer_virtual
-    PUBLIC 
+    PUBLIC pthread rt slsProjectCSettings
-        slsProjectCSettings
 )
 
 set_target_properties(eigerDetectorServer_virtual PROPERTIES

slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt

@@ -31,8 +31,7 @@ target_compile_definitions(gotthard2DetectorServer_virtual
 )
 
 target_link_libraries(gotthard2DetectorServer_virtual
-    PUBLIC 
+    PUBLIC pthread rt slsProjectCSettings
-        slsProjectCSettings
 )
 
 set_target_properties(gotthard2DetectorServer_virtual PROPERTIES

slsDetectorServers/jungfrauDetectorServer/CMakeLists.txt

@@ -29,8 +29,7 @@ target_compile_definitions(jungfrauDetectorServer_virtual
 )
 
 target_link_libraries(jungfrauDetectorServer_virtual
-    PUBLIC 
+    PUBLIC pthread rt slsProjectCSettings
-        slsProjectCSettings
 )
 
 set_target_properties(jungfrauDetectorServer_virtual PROPERTIES

slsDetectorServers/moenchDetectorServer/CMakeLists.txt

@@ -29,8 +29,7 @@ target_compile_definitions(moenchDetectorServer_virtual
 )
 
 target_link_libraries(moenchDetectorServer_virtual
-    PUBLIC 
+    PUBLIC pthread rt slsProjectCSettings
-        slsProjectCSettings
 )
 
 set_target_properties(moenchDetectorServer_virtual PROPERTIES

slsDetectorServers/mythen3DetectorServer/CMakeLists.txt

@@ -33,8 +33,7 @@ target_compile_definitions(mythen3DetectorServer_virtual
 )
 
 target_link_libraries(mythen3DetectorServer_virtual
-    PUBLIC 
+    PUBLIC pthread rt slsProjectCSettings
-        slsProjectCSettings
 )
 
 set_target_properties(mythen3DetectorServer_virtual PROPERTIES

slsDetectorServers/xilinx_ctbDetectorServer/CMakeLists.txt

@@ -31,9 +31,7 @@ target_compile_definitions(xilinx_ctbDetectorServer_virtual
 )
 
 target_link_libraries(xilinx_ctbDetectorServer_virtual
-    PUBLIC 
+    PUBLIC pthread rt m slsProjectCSettings
-        m 
-        slsProjectCSettings
 )
 
 set_target_properties(xilinx_ctbDetectorServer_virtual PROPERTIES

slsDetectorServers/xilinx_ctbDetectorServer/chip_config_xilinx.txt

@@ -1,5 +1,5 @@
 # Prepare MH02 configuration
-reg 0xC00C 0x00040041
+reg 0xC00C 0x00000041
 reg 0xC010 0x01200004
 
 # configure Matterhorn SPI
@@ -14,7 +14,7 @@ reg 0xC120 0x1
 reg 0xC120 0x0
 
 # set MSB LSB inversions and polarity for transceiver
-reg 0xC120 0x1e0
+reg 0xC120 0x61e0
 
 # Enable MH02 PLL clock
 pattern enable_clock_pattern.pyat

slsDetectorServers/xilinx_ctbDetectorServer/reset_chip_xilinx.txt

@@ -1,7 +1,7 @@
 
 # turn off clock
-clearbit 0xB018 15 
+setbit 0xC00C 16 
-setbit 0xB010 15
+setbit 0xC014 0
 sleep 1
 
 # reset Matterhorn periphery
@@ -9,7 +9,8 @@ setbit 0xC014 1
 sleep 1
 
 # turn on clock
-clearbit 0xB010 15
+clearbit 0xC00C 16
+setbit 0xC014 0
 sleep 1
 
 # reset rx transceiver datapath

slsDetectorSoftware/CMakeLists.txt

@@ -28,11 +28,11 @@ target_link_libraries(slsDetectorObject
     PUBLIC
         slsProjectOptions
         slsSupportStatic
+        pthread
     PRIVATE
         slsProjectWarnings
 )
 
-
 set(DETECTOR_LIBRARY_TARGETS slsDetectorObject)
 
 
@@ -97,7 +97,8 @@ if(SLS_USE_TEXTCLIENT)
         add_executable(${val1} src/CmdApp.cpp)
 
         target_link_libraries(${val1} 
-            slsDetectorStatic
+        slsDetectorStatic
+        pthread
         )
         SET_SOURCE_FILES_PROPERTIES( src/Caller.cpp PROPERTIES COMPILE_FLAGS "-Wno-unused-variable -Wno-unused-but-set-variable")
 

slsDetectorSoftware/src/Module.cpp

@@ -2568,15 +2568,17 @@ std::vector<int> Module::getReceiverDbitList() const {
 
 void Module::setReceiverDbitList(std::vector<int> list) {
     LOG(logDEBUG1) << "Setting Receiver Dbit List";
-
+    if (list.size() > 64) {
+        throw RuntimeError("Dbit list size cannot be greater than 64\n");
+    }
     for (auto &it : list) {
         if (it < 0 || it > 63) {
             throw RuntimeError("Dbit list value must be between 0 and 63\n");
         }
     }
-    auto r = stableRemoveDuplicates(list);
+    std::sort(begin(list), end(list));
-    if(r)
+    auto last = std::unique(begin(list), end(list));
-        LOG(logWARNING) << "Removed duplicated from receiver dbit list";
+    list.erase(last, list.end());
 
     StaticVector<int, MAX_RX_DBIT> arg = list;
     sendToReceiver(F_SET_RECEIVER_DBIT_LIST, arg, nullptr);

slsReceiverSoftware/CMakeLists.txt

@@ -49,7 +49,7 @@ target_link_libraries(slsReceiverObject
     slsProjectOptions
     slsSupportStatic
   PRIVATE
-    slsProjectWarnings #don't propagate warnings
+    slsProjectWarnings #don't propagate warnigns 
 )
 
 target_compile_definitions(slsReceiverObject 
@@ -118,6 +118,8 @@ if (SLS_USE_RECEIVER_BINARIES)
     target_link_libraries(slsReceiver PUBLIC
     PUBLIC
         slsReceiverStatic
+        pthread
+        rt
     PRIVATE
         slsProjectWarnings
     )
@@ -136,6 +138,8 @@ if (SLS_USE_RECEIVER_BINARIES)
     target_link_libraries(slsMultiReceiver 
     PUBLIC
         slsReceiverStatic
+        pthread
+        rt
     PRIVATE
         slsProjectWarnings
     )
@@ -154,6 +158,8 @@ if (SLS_USE_RECEIVER_BINARIES)
     target_link_libraries(slsFrameSynchronizer 
     PUBLIC
         slsReceiverStatic
+        pthread
+        rt
     PRIVATE
         slsProjectWarnings
         

slsReceiverSoftware/tests/test-Apps.cpp

@@ -138,8 +138,7 @@ TEST_CASE("Parse version and help", "[detector]") {
     }
 }
 
-// TODO: fails on gitea CI due to uid issue, fix later
+TEST_CASE("Parse port and uid", "[detector]") {
-TEST_CASE("Parse port and uid", "[.failsongitea][detector]") {
     uid_t uid = getuid();
     std::string uidStr = std::to_string(uid);
     uid_t invalidUid = uid + 1000;
@@ -148,12 +147,8 @@ TEST_CASE("Parse port and uid", "[.failsongitea][detector]") {
     for (auto app : {AppType::SingleReceiver, AppType::MultiReceiver,
                      AppType::FrameSynchronizer}) {
         CommandLineOptions s(app);
-
+        REQUIRE_THROWS(
-        // TODO! This test fails on gitea CI probably because the user can set the uid
+            s.parse({"", "-p", "1234", "-u", invalidUidStr})); // invalid uid
-        // commenting it out for now. Revisit later.
-        // REQUIRE_THROWS(
-        //     s.parse({"", "-p", "1234", "-u", invalidUidStr})); // invalid uid
-
         REQUIRE_THROWS(s.parse({"", "-p", "500"}));            // invalid port
 
         auto opts = s.parse({"", "-p", "1234", "-u", uidStr});

slsReceiverSoftware/tests/test-ArrangeDataBasedOnBitList.cpp

@@ -64,8 +64,7 @@ class DataProcessorTest : public DataProcessor {
  * num_transceiver_bytes = 2 both bytes have a value of 125
  * num_digital_bytes is variable and is defined by number of samples
  * default num sample is 5
- * all bytes in digital data take a value of 0xFF (alternating bits between 0,
+ * all bytes in digital data take a value of 255
- * 1)
  */
 class DataProcessorTestFixture {
   public:
@@ -107,7 +106,7 @@ class DataProcessorTestFixture {
                                                  num_random_offset_bytes);
     }
 
-    void set_data(const std::bitset<8> pattern = 0xFF) {
+    void set_data() {
         delete[] data;
         uint64_t max_bytes_per_bit =
             num_samples % 8 == 0 ? num_samples / 8 : num_samples / 8 + 1;
@@ -119,8 +118,7 @@ class DataProcessorTestFixture {
         memset(data, dummy_value, num_analog_bytes); // set to dummy value
         memset(data + num_analog_bytes, 0,
                num_random_offset_bytes); // set to zero
-        memset(data + num_analog_bytes + num_random_offset_bytes,
+        memset(data + num_analog_bytes + num_random_offset_bytes, 0xFF,
-               static_cast<uint8_t>(pattern.to_ulong()),
                num_digital_bytes); // all digital bits are one
         memset(data + num_digital_bytes + num_analog_bytes +
                    num_random_offset_bytes,
@@ -172,7 +170,7 @@ TEST_CASE_METHOD(DataProcessorTestFixture, "Remove Trailing Bits",
 TEST_CASE_METHOD(DataProcessorTestFixture, "Reorder all",
                  "[.dataprocessor][.reorder]") {
     // parameters: num_samples, expected_num_digital_bytes,
-    // expected_digital_part_for_each_bit
+    // expected_digital_part
     auto parameters = GENERATE(
         std::make_tuple(5, 64, std::vector<uint8_t>{0b00011111}),
         std::make_tuple(10, 2 * 64, std::vector<uint8_t>{0xFF, 0b00000011}),
@@ -266,13 +264,11 @@ TEST_CASE_METHOD(DataProcessorTestFixture, "Arrange bitlist with reorder false",
     // expected_digital_part
     auto parameters = GENERATE(
         std::make_tuple(5, std::vector<int>{1, 4, 5}, 5,
-                        std::vector<uint8_t>{0b00000010}),
+                        std::vector<uint8_t>{0b00000111}),
-        std::make_tuple(5, std::vector<int>{1, 5, 4}, 5,
-                        std::vector<uint8_t>{0b00000100}),
         std::make_tuple(5, std::vector<int>{1, 5, 3, 7, 8, 50, 42, 60, 39}, 10,
-                        std::vector<uint8_t>{0b11110000, 0b00000000}),
+                        std::vector<uint8_t>{0xFF, 0b00000001}),
         std::make_tuple(5, std::vector<int>{1, 5, 3, 7, 8, 50, 42, 60}, 5,
-                        std::vector<uint8_t>{0b11110000}));
+                        std::vector<uint8_t>{0xFF}));
 
     size_t num_samples, expected_num_digital_bytes;
     std::vector<uint8_t> expected_digital_part;
@@ -285,7 +281,7 @@ TEST_CASE_METHOD(DataProcessorTestFixture, "Arrange bitlist with reorder false",
     generaldata->SetCtbDbitReorder(false);
 
     set_num_samples(num_samples);
-    set_data(0b01010101); // set digital data to 0x55 to have alternating bits
+    set_data();
 
     size_t expected_size =
         num_analog_bytes + num_transceiver_bytes + expected_num_digital_bytes;
@@ -320,15 +316,11 @@ TEST_CASE_METHOD(DataProcessorTestFixture, "Arrange bitlist with reorder true",
     // expected_digital_part
     auto parameters = GENERATE(
         std::make_tuple(5, std::vector<int>{1, 4, 5}, 3,
-                        std::vector<uint8_t>{0x00, 0b00011111, 0x00}),
+                        std::vector<uint8_t>{0b00011111}),
-        std::make_tuple(5, std::vector<int>{1, 5, 4}, 3,
-                        std::vector<uint8_t>{0x00, 0x00, 0b00011111}),
         std::make_tuple(10, std::vector<int>{1, 4, 5}, 6,
-                        std::vector<uint8_t>{0x00, 0x00, 0b11111111, 0b00000011,
+                        std::vector<uint8_t>{0xFF, 0b00000011}),
-                                             0x00, 0x00}),
         std::make_tuple(8, std::vector<int>{1, 5, 3, 7, 8, 50, 42, 60, 39}, 9,
-                        std::vector<uint8_t>{0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF,
+                        std::vector<uint8_t>{0xFF}));
-                                             0xFF, 0xFF, 0x00}));
 
     size_t num_samples, expected_num_digital_bytes;
     std::vector<uint8_t> expected_digital_part;
@@ -341,7 +333,7 @@ TEST_CASE_METHOD(DataProcessorTestFixture, "Arrange bitlist with reorder true",
     generaldata->SetCtbDbitReorder(true);
 
     set_num_samples(num_samples);
-    set_data(0b01010101);
+    set_data();
 
     size_t expected_size =
         num_analog_bytes + num_transceiver_bytes + expected_num_digital_bytes;
@@ -351,8 +343,11 @@ TEST_CASE_METHOD(DataProcessorTestFixture, "Arrange bitlist with reorder true",
 
     memset(expected_data, dummy_value, num_analog_bytes);
 
-    memcpy(expected_data + num_analog_bytes, expected_digital_part.data(),
+    for (size_t sample = 0; sample < bitlist.size(); ++sample) {
-           expected_digital_part.size());
+        memcpy(expected_data + num_analog_bytes +
+                   expected_digital_part.size() * sample,
+               expected_digital_part.data(), expected_digital_part.size());
+    }
 
     memset(expected_data + expected_num_digital_bytes + num_analog_bytes,
            dummy_value, num_transceiver_bytes);

slsSupportLib/CMakeLists.txt

@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: LGPL-3.0-or-other
 # Copyright (C) 2021 Contributors to the SLS Detector Package
-
-
-
 set(SOURCES
     src/string_utils.cpp
     src/file_utils.cpp
@@ -92,17 +89,12 @@ target_link_libraries(slsSupportObject
   PUBLIC
     slsProjectOptions 
     ${STD_FS_LIB} # from helpers.cmake
-    Threads::Threads # slsDetector and Receiver need this
     
   PRIVATE
     slsProjectWarnings
     md5sls     
 )
 
-#RH8 glibc 2.28, RH9 glibc 2.34 linking rt is only needed with glibc < 2.34
-#but we do it for all Linux builds to avoid too many conditionals
-target_link_libraries (slsSupportObject PUBLIC $<$<PLATFORM_ID:Linux>:rt>) 
-
 #Treat both vendored and system zmq as interface for receiver binaries
 if(SLS_USE_SYSTEM_ZMQ)
     message(STATUS "slsSupportLib using ZEROMQ_TARGET=${ZEROMQ_TARGET}")

slsSupportLib/include/sls/container_utils.h

@@ -6,7 +6,6 @@
 #include <algorithm>
 #include <memory>
 #include <numeric>
-#include <set>
 #include <sstream>
 #include <string>
 #include <type_traits>
@@ -156,10 +155,6 @@ template <typename Container> bool hasDuplicates(Container c) {
     return pos != c.end(); // if we found something there are duplicates
 }
 
-/**
- * @brief Sorts the container and removes duplicated elements
- * returns true if elements were removed otherwiese false
- */
 template <typename T>
 typename std::enable_if<is_container<T>::value, bool>::type
 removeDuplicates(T &c) {
@@ -172,29 +167,6 @@ removeDuplicates(T &c) {
     return false;
 }
 
-/**
- * @brief Removed duplicated entries while preserving the oder
- * returns true if elements were removed otherwiese false
- */
-template <typename T>
-typename std::enable_if<is_container<T>::value, bool>::type
-stableRemoveDuplicates(T &c) {
-    auto containerSize = c.size();
-    std::set<typename T::value_type> seen;
-    c.erase(
-        std::remove_if(c.begin(), c.end(),
-            [&](const typename T::value_type& val) {
-                return !seen.insert(val).second;  // erase if already seen
-            }),
-        c.end()
-    );
-    if (c.size() != containerSize) {
-        return true;
-    }
-    return false;
-}
-
-
 } // namespace sls
 
 #endif // CONTAINER_UTILS_H

slsSupportLib/include/sls/file_utils.h

@@ -16,7 +16,6 @@ namespace sls {
  * @param nch number of channels
  * @param offset start channel value
  */
-[[deprecated]]
 int readDataFile(std::ifstream &infile, short int *data, int nch,
                  int offset = 0);
 
@@ -24,7 +23,6 @@ int readDataFile(std::ifstream &infile, short int *data, int nch,
  * @param data array of data value
  * @param nch number of channels
  */
-[[deprecated]]
 int readDataFile(std::string fname, short int *data, int nch);
 
 std::vector<char> readBinaryFile(const std::string &fname,
@@ -35,7 +33,6 @@ std::vector<char> readBinaryFile(const std::string &fname,
  * @param data array of data values
  * @param offset start channel number
  */
-[[deprecated]]
 int writeDataFile(std::ofstream &outfile, int nch, short int *data,
                   int offset = 0);
 
@@ -43,7 +40,6 @@ int writeDataFile(std::ofstream &outfile, int nch, short int *data,
  * @param nch number of channels
  * @param data array of data values
  */
-[[deprecated]]
 int writeDataFile(std::string fname, int nch, short int *data);
 
 // mkdir -p path implemented by recursive calls

slsSupportLib/tests/test-container_utils.cpp

@@ -153,35 +153,13 @@ TEST_CASE("check for duplicates in vector of pairs") {
     REQUIRE(hasDuplicates(vec) == true);
 }
 
-TEST_CASE("sorts the vector and remove duplicates") {
+TEST_CASE("remove duplicates from vector") {
     std::vector<int> v{5, 6, 5, 3};
     auto r = removeDuplicates(v);
     CHECK(r == true); // did indeed remove elements
     CHECK(v == std::vector<int>{3, 5, 6});
 }
 
-TEST_CASE("remove duplicates but keep order") {
-    std::vector<int> v{5, 6, 5, 3};
-    auto r = stableRemoveDuplicates(v);
-    CHECK(r == true); // did indeed remove elements
-    CHECK(v == std::vector<int>{5, 6, 3});
-}
-
-TEST_CASE("remove duplicates but keep order, all elements the same ") {
-    std::vector<char> v{'c', 'c', 'c', 'c', 'c', 'c'};
-    auto r = stableRemoveDuplicates(v);
-    CHECK(r == true); // did indeed remove elements
-    CHECK(v == std::vector<char>{'c'});
-}
-
-TEST_CASE("remove duplicates but keep order, pattern ") {
-    std::vector<int> v{8,1,2,8,8,3,2};
-    auto r = stableRemoveDuplicates(v);
-    CHECK(r == true); // did indeed remove elements
-    CHECK(v == std::vector<int>{8,1,2,3});
-}
-
-
 TEST_CASE("remove duplicated empty vector") {
     std::vector<int> v;
     auto r = removeDuplicates(v);
@@ -189,11 +167,4 @@ TEST_CASE("remove duplicated empty vector") {
     CHECK(v == std::vector<int>{});
 }
 
-TEST_CASE("remove duplicated empty vector using stable version") {
-    std::vector<int> v;
-    auto r = stableRemoveDuplicates(v);
-    CHECK(r == false); // no elements to remove
-    CHECK(v == std::vector<int>{});
-}
-
 } // namespace sls

tests/CMakeLists.txt

@@ -24,6 +24,7 @@ target_link_libraries(tests
     PUBLIC 
       slsProjectOptions
       slsSupportStatic
+      pthread
     PRIVATE
       slsProjectWarnings
 )  

tests/scripts/test_frame_synchronizer.py

@@ -113,7 +113,7 @@ def startTestsForAll(args, fp):
             startDetectorVirtualServer(server, args.num_mods, fp)
             startFrameSynchronizerPullSocket(server, fp)
             startFrameSynchronizer(args.num_mods, fp)
-            d = loadConfig(name=server, rx_hostname=args.rx_hostname, settingsdir=args.settingspath, log_file_fp=fp, num_mods=args.num_mods, num_frames=args.num_frames)
+            d = loadConfig(name=server, rx_hostname=args.rx_hostname, settingsdir=args.settingspath, fp=fp, num_mods=args.num_mods, num_frames=args.num_frames)
             loadBasicSettings(name=server, d=d, fp=fp)
             acquire(fp, d)
             testFramesCaught(server, d, args.num_frames)

tests/scripts/test_roi.py

@@ -18,11 +18,9 @@ from utils_for_test import (
     RuntimeException,
     cleanup,
     startProcessInBackground,
-    startReceiver,
     startDetectorVirtualServer,
     connectToVirtualServers,
     loadBasicSettings,
-    loadConfig,
     runProcessWithLogFile
 )
 
@@ -30,6 +28,45 @@ LOG_PREFIX_FNAME = '/tmp/slsDetectorPackage_virtual_roi_test'
 MAIN_LOG_FNAME = LOG_PREFIX_FNAME + '_log.txt'
 ROI_TEST_FNAME = LOG_PREFIX_FNAME + '_results_'
 
+def startReceiver(num_mods, fp):
+    if num_mods == 1:
+        cmd = ['slsReceiver']
+    else:
+        cmd = ['slsMultiReceiver', str(DEFAULT_TCP_RX_PORTNO), str(num_mods)]
+        # in 10.0.0
+        #cmd = ['slsMultiReceiver', '-p', str(DEFAULT_TCP_RX_PORTNO), '-n', str(num_mods)]
+    startProcessInBackground(cmd, fp)
+    time.sleep(1)
+
+
+def loadConfigForRoi(name, fp, num_mods = 1, num_interfaces = 1):
+    Log(LogLevel.INFO, 'Loading config')
+    Log(LogLevel.INFO, 'Loading config', fp)
+    try:
+        d = connectToVirtualServers(name, num_mods)
+        
+        if name == 'jungfrau' or name == 'moench':
+            d.numinterfaces = num_interfaces
+
+        d.udp_dstport = DEFAULT_UDP_DST_PORTNO
+        if name == 'eiger' or name == 'jungfrau' or name == 'moench':
+            d.udp_dstport2 = DEFAULT_UDP_DST_PORTNO + 1
+
+        d.rx_hostname = 'localhost'
+        d.udp_dstip = 'auto'
+        if name != "eiger":
+            d.udp_srcip = 'auto'
+        if name == 'jungfrau' or name == 'moench':
+            d.udp_dstip2 = 'auto'
+            d.powerchip = 1
+
+        d.frames = 5
+
+    except Exception as e:
+        raise RuntimeException(f'Could not load config for {name}. Error: {str(e)}') from e
+    
+    return d
+
 def startTestsForAll(fp):
     servers = [
         'eiger',
@@ -52,7 +89,7 @@ def startTestsForAll(fp):
                 cleanup(fp)
                 startDetectorVirtualServer(server, nmods, fp)
                 startReceiver(nmods, fp)
-                d = loadConfig(name=server, log_file_fp = fp, num_mods=nmods, num_frames=5, num_interfaces=ninterfaces)
+                d = loadConfigForRoi(name=server, fp=fp, num_mods=nmods, num_interfaces=ninterfaces)
                 loadBasicSettings(name=server, d=d, fp=fp)
 
                 fname = ROI_TEST_FNAME + server + '.txt'

tests/scripts/test_simulators.py

@@ -63,7 +63,7 @@ def startCmdTestsForAll(args, fp):
             cleanup(fp)
             startDetectorVirtualServer(name=server, num_mods=num_mods, fp=fp)
             startReceiver(num_mods, fp)
-            d = loadConfig(name=server, rx_hostname=args.rx_hostname, settingsdir=args.settingspath, log_file_fp=fp, num_mods=num_mods)
+            d = loadConfig(name=server, rx_hostname=args.rx_hostname, settingsdir=args.settingspath, fp=fp, num_mods=num_mods)
             loadBasicSettings(name=server, d=d, fp=fp)
             runProcessWithLogFile('Cmd Tests (' + args.markers + ') for ' + server, cmd, fp, fname)
         except Exception as e:

tests/scripts/utils_for_test.py

@@ -16,6 +16,7 @@ SERVER_START_PORTNO=1900
 
 init(autoreset=True)
 
+
 class LogLevel(Enum):
     INFO = 0
     INFORED = 1
@@ -192,51 +193,32 @@ def connectToVirtualServers(name, num_mods, ctb_object=False):
 
     return d
 
-def startReceiver(num_mods, fp):
-    if num_mods == 1:
-        cmd = ['slsReceiver']
-    else:
-        cmd = ['slsMultiReceiver', str(DEFAULT_TCP_RX_PORTNO), str(num_mods)]
-        # in 10.0.0
-        #cmd = ['slsMultiReceiver', '-p', str(DEFAULT_TCP_RX_PORTNO), '-n', str(num_mods)]
-    startProcessInBackground(cmd, fp)
-    time.sleep(1)
 
-
+def loadConfig(name, rx_hostname, settingsdir, fp, num_mods = 1, num_frames = 1):
-def loadConfig(name, rx_hostname = 'localhost', settingsdir = None, log_file_fp = None, num_mods = 1, num_frames = 1, num_interfaces = 1):
     Log(LogLevel.INFO, 'Loading config')
-    Log(LogLevel.INFO, 'Loading config', log_file_fp)
+    Log(LogLevel.INFO, 'Loading config', fp)
     try:
         d = connectToVirtualServers(name, num_mods)
-
-        if name == 'jungfrau' or name == 'moench':
-            d.numinterfaces = num_interfaces
-
         d.udp_dstport = DEFAULT_UDP_DST_PORTNO
-        if name == 'eiger' or name == 'jungfrau' or name == 'moench':
+        if name == 'eiger':
             d.udp_dstport2 = DEFAULT_UDP_DST_PORTNO + 1
 
         d.rx_hostname = rx_hostname
-
         d.udp_dstip = 'auto'
-
         if name != "eiger":
             d.udp_srcip = 'auto'
 
-        if name == "jungfrau" or name == "moench":  
-            d.udp_dstip2 = 'auto'
-
         if name == "jungfrau" or name == "moench" or name == "xilinx_ctb":
             d.powerchip = 1
 
         if name == "xilinx_ctb":
             d.configureTransceiver()
 
-        if settingsdir is not None and name in ['eiger', 'mythen3']: 
+        if name == "eiger":
-            d.settingspath = settingsdir + '/' + name + '/'
+            d.trimen = [4500, 5400, 6400]
-            d.trimen = [4500, 5400, 6400] if name == 'eiger' else [4000, 6000, 8000, 12000]
+            d.settingspath = settingsdir + '/eiger/'
-            d.setThresholdEnergy(4500, detectorSettings.STANDARD) 
+            d.setThresholdEnergy(4500, detectorSettings.STANDARD)
-        
+
         d.frames = num_frames
       
     except Exception as e:

this_build_bin_path.sh

@@ -1,14 +1,39 @@
-#!/bin/bash
+# SPDX-License-Identifier: LGPL-3.0-or-other
+# Copyright (C) 2021 Contributors to the SLS Detector Package
+#echo $#
+#if [ $# = 0 ]; then 
+#    f=$0
+#else
+#    f=$1
+#fi
+#echo $f
+if [ "x${BASH_ARGV[0]}" = "x" ]; then
+#if [ "x$f" = "x" ]; then
+    if [ ! -f this_build_bin_path.sh ]; then
+	f=$0
+	echo "aaaa"
+    #thispath=$(dirname ${BASH_ARGV[0]})  
+    thispath=$(dirname $f) 
+    p=$(cd ${thispath};pwd); 
+    THIS_PATH="$p/build/bin/"
+   #     echo "ERROR: must cd where/this/package/is before calling this_path.sh"
+#	echo "Try sourcing it"                                 
+    else
+	echo "bbb"
+	THIS_PATH="$PWD/build/bin/"; 
+    fi                        
+else        
+    thispath=$(dirname ${BASH_ARGV[0]})
+    p=$(cd ${thispath};pwd); 
+    THIS_PATH="$p/build/bin/"    
+    echo "ccc"
+fi   
 
-# Since this script could be sourced, $0 is not sufficent, BASH_SOURCE[0] is necessary
+    echo "this_path="$THIS_PATH  
-SCRIPT_LOCATION="$(realpath ${BASH_SOURCE[0]})"
+    export PATH=$THIS_PATH:$PATH
-SCRIPT_LOCATION="$(dirname ${SCRIPT_LOCATION})"
+    export LD_LIBRARY_PATH=$THIS_PATH:$LD_LIBRARY_PATH
-BUILDBIN_LOCATION="${SCRIPT_LOCATION}/build/bin"
+    export PYTHONPATH=$THIS_PATH:$PYTHONPATH
-
+    
-if [ ! -d "${BUILDBIN_LOCATION}" ]; then
+    echo "path="$PATH
-	echo Cannot find path ${BUILDBIN_LOCATION}
+    echo "ld_library_path="$LD_LIBRARY_PATH
-else
+    echo "pythonpath="$PYTHON_PATH
-	echo Adding ${BUILDBIN_LOCATION} to PATH and PYTHONPATH
-	export PATH=${BUILDBIN_LOCATION}:${PATH}
-	export PYTHONPATH=${BUILDBIN_LOCATION}:${PYTHONPATH}
-fi