M3vtrim min (#454)

* Remove the vtrim min 600 check when setting threshold energy. vth1-3:200 - 2400, others 0-2800

* compile fix

RELEASE.txt

@@ -62,13 +62,13 @@ This document describes the differences between v7.0.0 and v6.x.x
 - m3 polarity, interpolation (enables all counters when enabled), pump probe, analog pulsing, digital pulsing
 - updatedetectorserver - removes old server current binary pointing to for blackfin
 - removing copydetectorserver using tftp 
->>>>>>> developer
 - registerCallBackRawDataReady and registerCallBackRawDataModifyReady now gives a sls_receiver_header* instead of a char*, and uint32_t to size_t
 - registerCallBackStartAcquisition gave incorrect imagesize (+120 bytes). corrected.
 - registerCallBackStartAcquisition parameter is a const string reference
 - m3 (runnig config second time with tengiga 0, dr !=32, counters !=0x7) calculated incorrect image size expected
 - fixed row column indexing (mainly for multi module Jungfrau 2 interfaces )
 - eiger gui row indices not flipped anymore (fix in config)
+- m3 (settings dac check disabled temporarily?)
 
 2. Resolved Issues
 ==================

conda-recepie/build.sh

@@ -2,18 +2,17 @@
 # Copyright (C) 2021 Contributors to the SLS Detector Package
 
 mkdir build
-
+mkdir install
 cd build
 cmake .. \
       -DCMAKE_PREFIX_PATH=$CONDA_PREFIX \
-      -DCMAKE_INSTALL_PREFIX=$PREFIX \
+      -DCMAKE_INSTALL_PREFIX=install \
       -DSLS_USE_TEXTCLIENT=ON \
       -DSLS_USE_RECEIVER=ON \
-      -DSLS_USE_GUI=OFF \
+      -DSLS_USE_GUI=ON \
-      -DSLS_USE_MOENCH=OFF\
+      -DSLS_USE_MOENCH=ON\
       -DSLS_USE_TESTS=ON \
       -DSLS_USE_PYTHON=OFF \
-      -DSLS_DEVEL_HEADERS=ON \
       -DCMAKE_BUILD_TYPE=Release \
       -DSLS_USE_HDF5=OFF\
      
@@ -23,7 +22,3 @@ cmake --build . -- -j${NCORES}
 cmake --build . --target install
 
 CTEST_OUTPUT_ON_FAILURE=1 ctest -j 2
-
-#Clean up for the next build
-# cd ..
-# rm -rf build

conda-recepie/build_pylib.sh

@@ -2,7 +2,5 @@
 # Copyright (C) 2021 Contributors to the SLS Detector Package
 
 echo "|<-------- starting python build"
-echo $PWD
 cd python
-echo "folder: $PWD"
+${PYTHON} setup.py install
-${PYTHON} setup.py install

conda-recepie/conda_build_config.yaml

@@ -0,0 +1,9 @@
+python:
+    - 3.6
+    - 3.7
+    - 3.8
+    - 3.9
+    - 3.10
+    
+numpy: 
+    - 1.17

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_gui.sh

@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: LGPL-3.0-or-other
+# Copyright (C) 2021 Contributors to the SLS Detector Package
+#Copy the GUI 
+mkdir -p $PREFIX/bin
+cp build/install/bin/slsDetectorGui $PREFIX/bin/.

conda-recepie/copy_lib.sh

@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: LGPL-3.0-or-other
+# Copyright (C) 2021 Contributors to the SLS Detector Package
+
+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_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/slsReceiver $PREFIX/bin/.
+cp build/install/bin/slsMultiReceiver $PREFIX/bin/.
+
+
+cp build/install/include/sls/* $PREFIX/include/sls
+cp -rv build/install/share $PREFIX

conda-recepie/copy_moench.sh

@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: LGPL-3.0-or-other
+# Copyright (C) 2021 Contributors to the SLS Detector Package
+
+#Copy the Moench executables 
+mkdir -p $PREFIX/bin
+cp build/install/bin/moench* $PREFIX/bin/.

conda-recepie/meta.yaml

@@ -0,0 +1,134 @@
+
+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
+    - qwt 6.*
+    - qt 4.8.*
+    - zeromq
+    - 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
+    - zeromq
+    - xorg-libx11
+    - xorg-libice
+    - xorg-libxext
+    - xorg-libsm
+    - xorg-libxau
+    - xorg-libxrender
+    - xorg-libxfixes
+    - expat
+
+  run:
+    - zeromq
+    - libstdcxx-ng
+    - libgcc-ng 
+
+
+outputs:
+  - name: slsdetlib
+    script: copy_lib.sh
+
+    requirements:
+      build:
+        - {{ compiler('c') }}
+        - {{compiler('cxx')}}
+        - libstdcxx-ng
+        - libgcc-ng
+        - zeromq
+
+      host:
+        - zeromq
+
+      run: 
+        - libstdcxx-ng
+        - libgcc-ng
+        - zeromq
+
+  - name: slsdet
+
+    script: build_pylib.sh
+
+    requirements:
+      build:
+        - python
+        - {{ compiler('c') }}
+        - {{compiler('cxx')}}
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
+        - setuptools
+
+      host:
+        - python
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
+
+
+      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) }}
+        - qwt 6.*
+
+      run:
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
+        - qwt 6.*
+        - qt 4.8.*
+        - 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/ctbgui/build.sh

@@ -1,24 +0,0 @@
-# SPDX-License-Identifier: LGPL-3.0-or-other
-# Copyright (C) 2021 Contributors to the SLS Detector Package
-
-mkdir build
-
-cd build
-cmake .. \
-      -DCMAKE_PREFIX_PATH=$CONDA_PREFIX \
-      -DCMAKE_INSTALL_PREFIX=$PREFIX \
-      -DSLS_USE_CTBGUI=ON \
-      -DSLS_EXT_BUILD=ON\
-      -DCMAKE_BUILD_TYPE=Release \
-      -DSLS_USE_HDF5=OFF\
-     
-NCORES=$(getconf _NPROCESSORS_ONLN)
-echo "Building using: ${NCORES} cores"
-cmake --build . -- -j${NCORES}
-cmake --build . --target install
-
-CTEST_OUTPUT_ON_FAILURE=1 ctest -j 2
-
-#Clean up for the next build
-# cd ..
-# rm -rf build

conda-recipes/ctbgui/meta.yaml

@@ -1,94 +0,0 @@
-package:
-  name: ctbgui
-  version: {{ environ.get('GIT_DESCRIBE_TAG', '') }}
-
-source:
-  - path: ../..
-
-build:
-  number: 0
-  binary_relocation: True
-  rpaths:
-    - lib/
-
-requirements:
-  build:
-    - {{ compiler('c') }}
-    - {{compiler('cxx')}}
-    - slsdetlib {{ environ.get('GIT_DESCRIBE_TAG', '') }}
-    - cmake
-    - root
-    # - qwt 6.*
-    # - qt 4.8.*
-    # - zeromq
-    # - 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
-    - root
-    - slsdetlib {{ environ.get('GIT_DESCRIBE_TAG', '') }}
-    # - zeromq
-    # - xorg-libx11
-    # - xorg-libice
-    # - xorg-libxext
-    # - xorg-libsm
-    # - xorg-libxau
-    # - xorg-libxrender
-    # - xorg-libxfixes
-    # - expat
-
-  run:
-    # - zeromq
-    - libstdcxx-ng
-    - libgcc-ng 
-    - root
-    # - slsdetlib {{ environ.get('GIT_DESCRIBE_TAG', '') }}
-    # - qwt 6.*
-    # - qt 4.8.*
-    # - expat
-
-
-
-  # - name: slsdetgui
-  #   script: copy_gui.sh
-  #   requirements:
-
-  #     build:
-  #       - {{ compiler('c') }}
-  #       - {{compiler('cxx')}}
-  #       - {{ pin_subpackage('slsdetlib', exact=True) }}
-  #       - qwt 6.*
-
-  #     run:
-  #       - {{ pin_subpackage('slsdetlib', exact=True) }}
-  #       - qwt 6.*
-  #       - qt 4.8.*
-  #       - 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-recipes/moenchzmq/build.sh

@@ -1,25 +0,0 @@
-# SPDX-License-Identifier: LGPL-3.0-or-other
-# Copyright (C) 2021 Contributors to the SLS Detector Package
-
-mkdir build
-
-cd build
-cmake .. \
-      -DCMAKE_PREFIX_PATH=$CONDA_PREFIX \
-      -DCMAKE_INSTALL_PREFIX=$PREFIX \
-      -DSLS_USE_MOENCH=ON\
-      -DSLS_USE_TESTS=ON \
-      -DSLS_EXT_BUILD=ON \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DSLS_USE_HDF5=OFF\
-     
-NCORES=$(getconf _NPROCESSORS_ONLN)
-echo "Building using: ${NCORES} cores"
-cmake --build . -- -j${NCORES}
-cmake --build . --target install
-
-CTEST_OUTPUT_ON_FAILURE=1 ctest -j 2
-
-#Clean up for the next build
-# cd ..
-# rm -rf build

conda-recipes/moenchzmq/meta.yaml

@@ -1,36 +0,0 @@
-
-package:
-  name: moenchzmq
-  version: {{ environ.get('GIT_DESCRIBE_TAG', '') }}
-
-source:
-  - path: ../..
-
-build:
-  number: 0
-  binary_relocation: True
-  rpaths:
-    - lib/
-
-requirements:
-  build:
-    - {{ compiler('c') }}
-    - {{compiler('cxx')}}
-    - cmake
-    - libstdcxx-ng
-    - libgcc-ng
-    - zeromq
-    - libtiff
-    - slsdetlib {{ environ.get('GIT_DESCRIBE_TAG', '') }}
-
-  host:
-    - zeromq
-    - libtiff
-    - slsdetlib {{ environ.get('GIT_DESCRIBE_TAG', '') }}
-
-  run: 
-    - libstdcxx-ng
-    - libgcc-ng
-    - zeromq
-    - libtiff
-    - slsdetlib {{ environ.get('GIT_DESCRIBE_TAG', '') }}

conda-recipes/slsdet/conda_build_config.yaml

@@ -1,2 +0,0 @@
-python: 
-   - 3.9

conda-recipes/slsdet/meta.yaml

@@ -1,34 +0,0 @@
-
-package:
-  name: slsdet
-  version: {{ environ.get('GIT_DESCRIBE_TAG', '') }}
-
-source:
-  - path: ../..
-
-build:
-  number: 0
-  binary_relocation: True
-  rpaths:
-    - lib/
-
-requirements:
-  build:
-    - python
-    - {{ compiler('c') }}
-    - {{compiler('cxx')}}
-    - cmake
-    - slsdetlib {{ environ.get('GIT_DESCRIBE_TAG', '') }}
-    - setuptools
-
-  host:
-    - python
-    - slsdetlib {{ environ.get('GIT_DESCRIBE_TAG', '') }}
-
-
-  run:
-    - libstdcxx-ng
-    - libgcc-ng
-    - python
-    - numpy
-    - slsdetlib {{ environ.get('GIT_DESCRIBE_TAG', '') }}

conda-recipes/slsdetgui/build.sh

@@ -1,24 +0,0 @@
-# SPDX-License-Identifier: LGPL-3.0-or-other
-# Copyright (C) 2021 Contributors to the SLS Detector Package
-
-mkdir build
-
-cd build
-cmake .. \
-      -DCMAKE_PREFIX_PATH=$CONDA_PREFIX \
-      -DCMAKE_INSTALL_PREFIX=$PREFIX \
-      -DSLS_USE_GUI=ON \
-      -DSLS_EXT_BUILD=ON\
-      -DCMAKE_BUILD_TYPE=Release \
-      -DSLS_USE_HDF5=OFF\
-     
-NCORES=$(getconf _NPROCESSORS_ONLN)
-echo "Building using: ${NCORES} cores"
-cmake --build . -- -j${NCORES}
-cmake --build . --target install
-
-CTEST_OUTPUT_ON_FAILURE=1 ctest -j 2
-
-#Clean up for the next build
-# cd ..
-# rm -rf build

conda-recipes/slsdetgui/meta.yaml

@@ -1,91 +0,0 @@
-package:
-  name: slsdetgui
-  version: {{ environ.get('GIT_DESCRIBE_TAG', '') }}
-
-source:
-  - path: ../..
-
-build:
-  number: 0
-  binary_relocation: True
-  rpaths:
-    - lib/
-
-requirements:
-  build:
-    - {{ compiler('c') }}
-    - {{compiler('cxx')}}
-    - slsdetlib {{ environ.get('GIT_DESCRIBE_TAG', '') }}
-    - cmake
-    - qwt 6.*
-    - qt 4.8.*
-    - zeromq
-    - 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
-    - slsdetlib {{ environ.get('GIT_DESCRIBE_TAG', '') }}
-    - zeromq
-    - xorg-libx11
-    - xorg-libice
-    - xorg-libxext
-    - xorg-libsm
-    - xorg-libxau
-    - xorg-libxrender
-    - xorg-libxfixes
-    - expat
-
-  run:
-    - zeromq
-    - libstdcxx-ng
-    - libgcc-ng 
-    - slsdetlib {{ environ.get('GIT_DESCRIBE_TAG', '') }}
-    - qwt 6.*
-    - qt 4.8.*
-    - expat
-
-
-
-  # - name: slsdetgui
-  #   script: copy_gui.sh
-  #   requirements:
-
-  #     build:
-  #       - {{ compiler('c') }}
-  #       - {{compiler('cxx')}}
-  #       - {{ pin_subpackage('slsdetlib', exact=True) }}
-  #       - qwt 6.*
-
-  #     run:
-  #       - {{ pin_subpackage('slsdetlib', exact=True) }}
-  #       - qwt 6.*
-  #       - qt 4.8.*
-  #       - 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-recipes/slsdetlib/meta.yaml

@@ -1,90 +0,0 @@
-
-package:
-  name: slsdetlib
-  version: {{ environ.get('GIT_DESCRIBE_TAG', '') }}
-
-source:
-  - path: ../..
-
-build:
-  number: 0
-  binary_relocation: True
-  rpaths:
-    - lib/
-
-requirements:
-      build:
-        - {{ compiler('c') }}
-        - {{compiler('cxx')}}
-        - cmake
-        - libstdcxx-ng
-        - libgcc-ng
-        - zeromq
-
-      host:
-        - zeromq
-
-      run: 
-        - libstdcxx-ng
-        - libgcc-ng
-        - zeromq
-
-
-# outputs:
-#   - name: slsdetlib
-#     script: build_lib.sh
-
-#     requirements:
-#       build:
-#         - {{ compiler('c') }}
-#         - {{compiler('cxx')}}
-#         - libstdcxx-ng
-#         - libgcc-ng
-#         - zeromq
-
-#       host:
-#         - zeromq
-
-#       run: 
-#         - libstdcxx-ng
-#         - libgcc-ng
-#         - zeromq
-
-  # - name: slsdet
-  #   script: build_py.sh
-
-    # requirements:
-    #   build:
-    #     - python
-    #     - {{ compiler('c') }}
-    #     - {{compiler('cxx')}}
-    #     - {{ pin_subpackage('slsdetlib', exact=True) }}
-    #     - setuptools
-
-    #   host:
-    #     - python
-    #     - {{ pin_subpackage('slsdetlib', exact=True) }}
-
-
-    #   run:
-    #     - libstdcxx-ng
-    #     - libgcc-ng
-    #     - python
-    #     - numpy
-    #     - {{ pin_subpackage('slsdetlib', exact=True) }}
-
-  # - name: slsdetgui
-  #   script: build_gui.sh
-  #   requirements:
-
-  #     build:
-  #       - {{ compiler('c') }}
-  #       - {{compiler('cxx')}}
-  #       - {{ pin_subpackage('slsdetlib', exact=True) }}
-  #       - qwt 6.*
-
-  #     run:
-  #       - {{ pin_subpackage('slsdetlib', exact=True) }}
-  #       - qwt 6.*
-  #       - qt 4.8.*
-  #       - expat

ctbGui/CMakeLists.txt

@@ -83,12 +83,8 @@ target_link_libraries(ctbGui PUBLIC
     ${TIFF_LIBRARIES}
 )
 
-#set_target_properties(ctbGui PROPERTIES
+set_target_properties(ctbGui PROPERTIES
-#    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-#
+
-#)
+)
 
-install(TARGETS ctbGui ctbRootLib
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-)

slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c

@@ -1411,6 +1411,9 @@ enum detectorSettings setSettings(enum detectorSettings sett) {
 }
 
 void validateSettings() {
+    LOG(logWARNING, ("Not validating dac settings temporarily"));
+    return;
+    
     // if any special dac value is changed individually => undefined
     const int specialDacs[NSPECIALDACS] = SPECIALDACINDEX;
     int *specialDacValues[] = {defaultDacValue_standard, defaultDacValue_fast,

slsDetectorSoftware/src/Detector.cpp

@@ -781,24 +781,7 @@ void Detector::startReceiver() { pimpl->Parallel(&Module::startReceiver, {}); }
 void Detector::stopReceiver() { pimpl->Parallel(&Module::stopReceiver, {}); }
 
 void Detector::startDetector(Positions pos) {
-    auto detector_type = getDetectorType(pos).squash();
+    pimpl->startAcquisition(false, pos);
-    if (detector_type == defs::MYTHEN3 && size() > 1) {
-        std::vector<int> slaves(pos);
-        auto is_master = getMaster(pos);
-        int masterPosition = -1;
-        for (unsigned int i = 0; i < is_master.size(); ++i) {
-            if (is_master[i]) {
-                masterPosition = i;
-                slaves.erase(slaves.begin() + i);
-            }
-        }
-        pimpl->Parallel(&Module::startAcquisition, pos);
-        if (masterPosition != -1) {
-            pimpl->Parallel(&Module::startAcquisition, {masterPosition});
-        }
-    } else {
-        pimpl->Parallel(&Module::startAcquisition, pos);
-    }
 }
 
 void Detector::startDetectorReadout() {

slsDetectorSoftware/src/DetectorImpl.cpp

@@ -1124,25 +1124,7 @@ int DetectorImpl::acquire() {
 
         // start and read all
         try {
-            if (detector_type == defs::MYTHEN3 && modules.size() > 1) {
+            startAcquisition(true, {});
-                // Multi module mythen
-                std::vector<int> master;
-                std::vector<int> slaves;
-                auto is_master = Parallel(&Module::isMaster, {});
-                slaves.reserve(modules.size() - 1); // check this one!!
-                for (size_t i = 0; i < modules.size(); ++i) {
-                    if (is_master[i])
-                        master.push_back(i);
-                    else
-                        slaves.push_back(i);
-                }
-                Parallel(&Module::startAcquisition, slaves);
-                Parallel(&Module::startAndReadAll, master);
-            } else {
-                // Normal acquire
-                Parallel(&Module::startAndReadAll, {});
-            }
-
         } catch (...) {
             if (receiver)
                 Parallel(&Module::stopReceiver, {});
@@ -1191,6 +1173,44 @@ int DetectorImpl::acquire() {
     return OK;
 }
 
+void DetectorImpl::startAcquisition(bool blocking, std::vector<int> positions) {
+    if (shm()->detType == defs::MYTHEN3 && size() > 1) {
+        std::vector<int> master;
+        std::vector<int> slaves;
+        if (positions.empty() ||
+            (positions.size() == 1 && positions[0] == -1)) {
+            positions.resize(modules.size());
+            std::iota(begin(positions), end(positions), 0);
+        }
+        // could be all slaves in positions
+        slaves.reserve(positions.size()); 
+        auto is_master = Parallel(&Module::isMaster, positions);
+        for (size_t i : positions) {
+            if (is_master[i]) 
+                master.push_back(i);
+            else
+                slaves.push_back(i);
+        }
+
+        if (!slaves.empty()) {
+            Parallel(&Module::startAcquisition, slaves);
+        }
+        if (!master.empty()) {
+            if (blocking) {
+                Parallel(&Module::startAndReadAll, master);
+            } else {
+                Parallel(&Module::startAcquisition, master);
+            }
+        }
+    } else {
+        if (blocking) {
+            Parallel(&Module::startAndReadAll, positions);
+        } else {
+            Parallel(&Module::startAcquisition, positions);
+        }
+    }
+}
+
 void DetectorImpl::printProgress(double progress) {
     // spaces for python printout
     std::cout << "    " << std::fixed << std::setprecision(2) << std::setw(6)

slsDetectorSoftware/src/DetectorImpl.h

@@ -278,6 +278,9 @@ class DetectorImpl : public virtual slsDetectorDefs {
      */
     int acquire();
 
+    /** also takes care of master and slave for multi module mythen */
+    void startAcquisition(bool blocking, std::vector<int> positions);
+
     /**
      * Combines data from all readouts and gives it to the gui
      * or just gives progress of acquisition by polling receivers

slsDetectorSoftware/src/Module.cpp

@@ -407,12 +407,18 @@ void Module::setAllThresholdEnergy(std::array<int, 3> e_eV,
 
     // check dacs
     out_of_range = false;
-    for (auto dac : {M_VTRIM, M_VTH1, M_VTH2, M_VTH3}) {
+    for (int i = 0; i != myMod.ndac; ++i) {
-        if (myMod.dacs[dac] < 600) {
+        int dacMin = 0;
-            myMod.dacs[dac] = 600;
+        int dacMax = 2800;
+        if (i == M_VTH1 || i == M_VTH2 || i == M_VTH3) {
+            dacMin = 200;
+            dacMax = 2400;
+        }
+        if (myMod.dacs[i] < dacMin) {
+            myMod.dacs[i] = dacMin;
             out_of_range = true;
-        } else if (myMod.dacs[dac] > 2400) {
+        } else if (myMod.dacs[i] > dacMax) {
-            myMod.dacs[dac] = 2400;
+            myMod.dacs[i] = dacMax;
             out_of_range = true;
         }
     }

slsSupportLib/include/sls/versionAPI.h

@@ -10,6 +10,6 @@
 #define APIGOTTHARD 0x220428
 #define APIGOTTHARD2 0x220428
 #define APIJUNGFRAU 0x220428
-#define APIMYTHEN3 0x220428
 #define APIMOENCH 0x220427
 #define APIEIGER 0x220428
+#define APIMYTHEN3 0x220510

tests/CMakeLists.txt

@@ -2,7 +2,6 @@
 # Copyright (C) 2021 Contributors to the SLS Detector Package
 include_directories(
     ${PROJECT_SOURCE_DIR}/libs/catch
-    ${SLS_INTERNAL_RAPIDJSON_DIR}
     include
 )