WIP

CMakeLists.txt

@@ -71,7 +71,6 @@ if(SLS_BUILD_ONLY_MOENCH)
 endif()
 
 
-
 set(ClangFormat_EXCLUDE_PATTERNS    "build/" 
                                     "libs/" 
                                     "slsDetectorCalibration/" 
@@ -103,7 +102,6 @@ else()
 endif()
 
 
-
 #Add two fake libraries to manage options
 add_library(slsProjectOptions INTERFACE)
 add_library(slsProjectWarnings INTERFACE)
@@ -226,6 +224,8 @@ if (SLS_USE_INTEGRATION_TESTS)
 endif (SLS_USE_INTEGRATION_TESTS)
 
 if (SLS_USE_PYTHON)
+    find_package (Python 3.6 COMPONENTS Interpreter Development)
+    add_subdirectory(libs/pybind11)
     add_subdirectory(python)
 endif(SLS_USE_PYTHON)
 

RELEASE.txt

@@ -66,8 +66,6 @@ This document describes the differences between v7.0.0 and v6.x.x
 - 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
-
 
 2. Resolved Issues
 ==================

cmake/SlsFindZeroMQ.cmake

@@ -6,7 +6,7 @@ function(custom_find_zmq)
             message(STATUS "Looking for ZeroMQ in: ${ZeroMQ_HINT}")
             find_package(ZeroMQ 4 
                 NO_DEFAULT_PATH
-                HINTS ${ZeroMQ_HINT}
+                HINTS ${ZeroMQ_DIR}
             )
         else()
             find_package(ZeroMQ 4 QUIET)

cmake/libzmq-pkg-config/FindZeroMQ.cmake

@@ -4,33 +4,25 @@ find_package(PkgConfig)
 pkg_check_modules(PC_LIBZMQ QUIET libzmq)
 
 set(ZeroMQ_VERSION ${PC_LIBZMQ_VERSION})
-
+find_library(ZeroMQ_LIBRARY NAMES libzmq.so libzmq.dylib libzmq.dll
-find_path(ZeroMQ_INCLUDE_DIR zmq.h
+             PATHS ${PC_LIBZMQ_LIBDIR} ${PC_LIBZMQ_LIBRARY_DIRS})
-        PATHS ${ZeroMQ_DIR}/include
+find_library(ZeroMQ_STATIC_LIBRARY NAMES libzmq-static.a libzmq.a libzmq.dll.a
-        ${PC_LIBZMQ_INCLUDE_DIRS}
+             PATHS ${PC_LIBZMQ_LIBDIR} ${PC_LIBZMQ_LIBRARY_DIRS})
-)
-
-find_library(ZeroMQ_LIBRARY
-        NAMES zmq
-        PATHS ${ZeroMQ_DIR}/lib
-        ${PC_LIBZMQ_LIBDIR}
-        ${PC_LIBZMQ_LIBRARY_DIRS}
-)
 
 if(ZeroMQ_LIBRARY OR ZeroMQ_STATIC_LIBRARY)
     set(ZeroMQ_FOUND ON)
     message(STATUS "Found libzmq using PkgConfig")
 endif()
 
-set ( ZeroMQ_LIBRARIES ${ZeroMQ_LIBRARY} )
+if (TARGET libzmq)
-set ( ZeroMQ_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIR} )
+    # avoid errors defining targets twice
-
+    return()
-if (NOT TARGET libzmq)
-    add_library(libzmq UNKNOWN IMPORTED)
-    set_target_properties(libzmq PROPERTIES
-            IMPORTED_LOCATION ${ZeroMQ_LIBRARIES}
-            INTERFACE_INCLUDE_DIRECTORIES ${ZeroMQ_INCLUDE_DIRS})
 endif()
 
-include ( FindPackageHandleStandardArgs )
+add_library(libzmq SHARED IMPORTED)
-find_package_handle_standard_args ( ZeroMQ DEFAULT_MSG ZeroMQ_LIBRARIES ZeroMQ_INCLUDE_DIRS )
+set_property(TARGET libzmq PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${PC_LIBZMQ_INCLUDE_DIRS})
+set_property(TARGET libzmq PROPERTY IMPORTED_LOCATION ${ZeroMQ_LIBRARY})
+
+add_library(libzmq-static STATIC IMPORTED ${PC_LIBZMQ_INCLUDE_DIRS})
+set_property(TARGET libzmq-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${PC_LIBZMQ_INCLUDE_DIRS})
+set_property(TARGET libzmq-static PROPERTY IMPORTED_LOCATION ${ZeroMQ_STATIC_LIBRARY})

cmake/package_config.cmake

@@ -26,7 +26,7 @@ install(FILES
 )
 
 install(FILES
-  "${CMAKE_SOURCE_DIR}/cmake/libzmq-pkg-config/FindZeroMQ.cmake"
+  "${CMAKE_SOURCE_DIR}/libzmq-pkg-config/FindZeroMQ.cmake"
   COMPONENT devel
   DESTINATION ${CMAKE_INSTALL_DIR}/libzmq-pkg-config
 )

conda-recepie/copy_lib.sh

@@ -19,4 +19,4 @@ cp build/install/bin/slsMultiReceiver $PREFIX/bin/.
 
 
 cp build/install/include/sls/* $PREFIX/include/sls
-cp -rv build/install/share $PREFIX
+cp -r build/install/share/ $PREFIX/share

python/CMakeLists.txt

@@ -1,17 +1,6 @@
 # SPDX-License-Identifier: LGPL-3.0-or-other
 # Copyright (C) 2021 Contributors to the SLS Detector Package
 
-if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
-    #if we are only building the python extension
-    cmake_minimum_required(VERSION 3.12)    
-    project(slsdet)
-    find_package(slsDetectorPackage 6 REQUIRED)
-endif()
-
-
-find_package (Python 3.6 COMPONENTS Interpreter Development)
-add_subdirectory(../libs/pybind11  ${CMAKE_BINARY_DIR}/bin/)
-
 pybind11_add_module(_slsdet 
     src/main.cpp 
     src/enums.cpp

slsReceiverSoftware/src/GeneralData.h

@@ -62,7 +62,6 @@ class GeneralData {
     uint32_t adcEnableMaskOneGiga{BIT32_MASK};
     uint32_t adcEnableMaskTenGiga{BIT32_MASK};
     slsDetectorDefs::ROI roi{};
-    uint32_t counterMask{0};
 
     GeneralData(){};
     virtual ~GeneralData(){};
@@ -123,8 +122,8 @@ class GeneralData {
         ThrowGenericError("SetNumberofInterfaces");
     };
 
-    virtual void SetCounterMask(const int n) {
+    virtual void SetNumberofCounters(const int n) {
-        ThrowGenericError("setCounterMask");
+        ThrowGenericError("SetNumberofCounters");
     };
 
     virtual int GetNumberOfAnalogDatabytes() {
@@ -360,12 +359,13 @@ class JungfrauData : public GeneralData {
 
 class Mythen3Data : public GeneralData {
   private:
-    int ncounters{0};
+    int ncounters;
     const int NCHAN = 1280;
 
   public:
     Mythen3Data() {
         myDetectorType = slsDetectorDefs::MYTHEN3;
+        ncounters = 3;
         nPixelsY = 1;
         headerSizeinPacket = sizeof(slsDetectorDefs::sls_detector_header);
         maxFramesPerFile = MYTHEN3_MAX_FRAMES_PER_FILE;
@@ -376,7 +376,6 @@ class Mythen3Data : public GeneralData {
         defaultUdpSocketBufferSize = (1000 * 1024 * 1024);
         dynamicRange = 32;
         tengigaEnable = true;
-        SetCounterMask(0x7);
         UpdateImageSize();
     };
 
@@ -390,13 +389,7 @@ class Mythen3Data : public GeneralData {
         UpdateImageSize();
     };
 
-    virtual void SetCounterMask(const int mask) {
+    virtual void SetNumberofCounters(const int n) {
-        int n = __builtin_popcount(mask);
-        if (n < 1 || n > 3) {
-            throw sls::RuntimeError("Invalid number of counters " +
-                                    std::to_string(n) + ". Expected 1-3.");
-        }
-        counterMask = mask;
         ncounters = n;
         UpdateImageSize();
     };

slsReceiverSoftware/src/Implementation.cpp

@@ -153,20 +153,10 @@ void Implementation::setDetectorType(const detectorType d) {
     default:
         break;
     }
-
-    framesPerFile = generalData->maxFramesPerFile;
-    fifoDepth = generalData->defaultFifoDepth;
     numUDPInterfaces = generalData->numUDPInterfaces;
+    fifoDepth = generalData->defaultFifoDepth;
     udpSocketBufferSize = generalData->defaultUdpSocketBufferSize;
-    dynamicRange = generalData->dynamicRange;
+    framesPerFile = generalData->maxFramesPerFile;
-    tengigaEnable = generalData->tengigaEnable;
-    numberOfAnalogSamples = generalData->nAnalogSamples;
-    numberOfDigitalSamples = generalData->nDigitalSamples;
-    readoutType = generalData->readoutType;
-    adcEnableMaskOneGiga = generalData->adcEnableMaskOneGiga;
-    adcEnableMaskTenGiga = generalData->adcEnableMaskTenGiga;
-    roi = generalData->roi;
-    counterMask = generalData->counterMask;
 
     SetLocalNetworkParameters();
     SetupFifoStructure();
@@ -533,9 +523,9 @@ void Implementation::startReceiver() {
     // callbacks
     if (startAcquisitionCallBack) {
         try {
-            std::size_t imageSize =
+            std::size_t imageSize = static_cast<uint32_t>(generalData->imageSize);
-                static_cast<uint32_t>(generalData->imageSize);
+            startAcquisitionCallBack(
-            startAcquisitionCallBack(filePath, fileName, fileIndex, imageSize,
+                filePath, fileName, fileIndex, imageSize,
                 pStartAcquisition);
         } catch (const std::exception &e) {
             throw sls::RuntimeError("Start Acquisition Callback Error: " +
@@ -1405,8 +1395,14 @@ uint32_t Implementation::getCounterMask() const { return counterMask; }
 
 void Implementation::setCounterMask(const uint32_t i) {
     if (counterMask != i) {
-        generalData->SetCounterMask(i);
+        int ncounters = __builtin_popcount(i);
+        if (ncounters < 1 || ncounters > 3) {
+            throw sls::RuntimeError("Invalid number of counters " +
+                                    std::to_string(ncounters) +
+                                    ". Expected 1-3.");
+        }
         counterMask = i;
+        generalData->SetNumberofCounters(ncounters);
         SetupFifoStructure();
     }
     LOG(logINFO) << "Counter mask: " << sls::ToStringHex(counterMask);
@@ -1631,8 +1627,7 @@ void Implementation::setDbitOffset(const int s) { ctbDbitOffset = s; }
  *                                                *
  * ************************************************/
 void Implementation::registerCallBackStartAcquisition(
-    int (*func)(const std::string &, const std::string &, uint64_t, size_t,
+    int (*func)(const std::string &, const std::string &, uint64_t, size_t, void *),
-                void *),
     void *arg) {
     startAcquisitionCallBack = func;
     pStartAcquisition = arg;