WIP

CMakeLists.txt

@@ -8,8 +8,13 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
 
 cmake_policy(SET CMP0074 NEW)
 include(cmake/project_version.cmake)
+
+#functions to add compiler flags
 include(cmake/SlsAddFlag.cmake)
+
 include(cmake/SlsFindZeroMQ.cmake)
+
+# Include additional modules that are used unconditionally
 include(GNUInstallDirs)
 
 # If conda build, always set lib dir to 'lib'
@@ -23,7 +28,7 @@ string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER)
 
 # Set targets export name (used by slsDetectorPackage and dependencies)
 set(TARGETS_EXPORT_NAME "${PROJECT_NAME_LOWER}-targets")
-set(namespace "sls::")
+#set(namespace "${PROJECT_NAME}::")
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 
@@ -34,8 +39,6 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
     set(SLS_MASTER_PROJECT ON)
 endif()
 
-
-
 option(SLS_USE_HDF5 "HDF5 File format" OFF)
 option(SLS_BUILD_SHARED_LIBRARIES "Build shared libaries" ON)
 option(SLS_USE_TEXTCLIENT "Text Client" ON)
@@ -68,20 +71,6 @@ if(SLS_BUILD_ONLY_MOENCH)
 endif()
 
 
-option(SLS_EXT_BUILD "external build of part of the project" OFF)
-if(SLS_EXT_BUILD)
-    message(STATUS "External build using already installed libraries")
-    set(SLS_BUILD_SHARED_LIBRARIES OFF CACHE BOOL "Should already exist" FORCE)
-    set(SLS_USE_TEXTCLIENT OFF CACHE BOOL "Should already exist" FORCE)
-    set(SLS_USE_DETECTOR OFF CACHE BOOL "Should already exist" FORCE)
-    set(SLS_USE_RECEIVER OFF CACHE BOOL "Should already exist" FORCE)
-    set(SLS_USE_RECEIVER_BINARIES OFF CACHE BOOL "Should already exist" FORCE)
-    set(SLS_MASTER_PROJECT OFF CACHE BOOL "No master proj in case of extbuild" FORCE) 
-endif()
-
-#Maybe have an option guarding this?
-set(SLS_INTERNAL_RAPIDJSON_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/rapidjson)
-
 set(ClangFormat_EXCLUDE_PATTERNS    "build/" 
                                     "libs/" 
                                     "slsDetectorCalibration/" 
@@ -92,6 +81,9 @@ set(ClangFormat_EXCLUDE_PATTERNS    "build/"
                                     ${CMAKE_BINARY_DIR})
 find_package(ClangFormat)
 
+
+
+
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
@@ -110,68 +102,62 @@ else()
 endif()
 
 
-if(SLS_EXT_BUILD)
+#Add two fake libraries to manage options
-    # Find ourself in case of external build
+add_library(slsProjectOptions INTERFACE)
-    find_package(slsDetectorPackage ${PROJECT_VERSION} REQUIRED)
+add_library(slsProjectWarnings INTERFACE)
-endif()
+target_compile_features(slsProjectOptions INTERFACE cxx_std_11)
+target_compile_options(slsProjectWarnings INTERFACE 
+                                            -Wall
+                                            -Wextra
+                                            -Wno-unused-parameter
+                                            # -Wold-style-cast
+                                            -Wnon-virtual-dtor
+                                            -Woverloaded-virtual
+                                            -Wdouble-promotion
+                                            -Wformat=2
+                                            -Wredundant-decls
+                                            # -Wconversion
+                                            -Wvla
+                                            -Wdouble-promotion
+                                            -Werror=return-type
+                                 )
+
+#Settings for C code
+add_library(slsProjectCSettings INTERFACE)
+target_compile_options(slsProjectCSettings INTERFACE 
+                                            -std=gnu99 #fixed
+                                            -Wall
+                                            -Wextra
+                                            -Wno-unused-parameter
+                                            -Wdouble-promotion
+                                            -Wformat=2
+                                            -Wredundant-decls
+                                            -Wdouble-promotion
+                                            -Werror=return-type
+                                )
 
 
-
+#Testing for minimum version for compilers
-# slsProjectOptions and slsProjectWarnings are used
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-# to control options for the libraries
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.2)
-if(NOT TARGET slsProjectOptions)
+        message(FATAL_ERROR "Clang version must be at least 3.2!")
-    add_library(slsProjectOptions INTERFACE)
+    endif()
-    target_compile_features(slsProjectOptions INTERFACE cxx_std_11)
+elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-endif()
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
-
+            message(FATAL_ERROR "GCC version must be at least 4.8!")
-if (NOT TARGET slsProjectWarnings)
+    endif()
-    add_library(slsProjectWarnings INTERFACE)
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5)
-    target_compile_options(slsProjectWarnings INTERFACE 
-        -Wall
-        -Wextra
-        -Wno-unused-parameter
-        # -Wold-style-cast
-        -Wnon-virtual-dtor
-        -Woverloaded-virtual
-        -Wdouble-promotion
-        -Wformat=2
-        -Wredundant-decls
-        # -Wconversion
-        -Wvla
-        -Wdouble-promotion
-        -Werror=return-type
-    )
-    # Add or disable warnings depending on if the compiler supports them 
-    # The function checks internally and sets HAS_warning-name
-    sls_enable_cxx_warning("-Wnull-dereference")
-    sls_enable_cxx_warning("-Wduplicated-cond")
-    sls_disable_cxx_warning("-Wclass-memaccess")
-
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
             target_compile_options(slsProjectWarnings INTERFACE 
-                                                -Wno-missing-field-initializers)
+                                             -Wno-missing-field-initializers)
+    endif()
 endif()
 
-
+# Add or disable warnings depending on if the compiler supports them 
-endif()
+# The function checks internally and sets HAS_warning-name
-
+sls_enable_cxx_warning("-Wnull-dereference")
-
+sls_enable_cxx_warning("-Wduplicated-cond")
-if (NOT TARGET slsProjectCSettings)
+sls_disable_cxx_warning("-Wclass-memaccess")
-    #Settings for C code
+sls_disable_c_warning("-Wstringop-truncation")
-    add_library(slsProjectCSettings INTERFACE)
-    target_compile_options(slsProjectCSettings INTERFACE 
-                                                -std=gnu99 #fixed
-                                                -Wall
-                                                -Wextra
-                                                -Wno-unused-parameter
-                                                -Wdouble-promotion
-                                                -Wformat=2
-                                                -Wredundant-decls
-                                                -Wdouble-promotion
-                                                -Werror=return-type
-                                    )
-    sls_disable_c_warning("-Wstringop-truncation")
-endif()
 
 
 if(SLS_USE_SANITIZER)
@@ -186,14 +172,19 @@ if(SLS_TUNE_LOCAL)
 endif()
 
 
-if(SLS_MASTER_PROJECT)
+#rapidjson
-install(TARGETS slsProjectOptions slsProjectWarnings 
+add_library(rapidjson INTERFACE)
+target_include_directories(rapidjson INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libs/rapidjson>  
+)
+
+# Install fake the libraries
+install(TARGETS slsProjectOptions slsProjectWarnings rapidjson
     EXPORT "${TARGETS_EXPORT_NAME}"
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
 )
-endif()
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_INSTALL_RPATH $ORIGIN)
@@ -209,9 +200,8 @@ if (SLS_USE_TESTS)
 endif(SLS_USE_TESTS)
 
 
-if(NOT SLS_EXT_BUILD)
+# Common functionallity to detector and receiver
-    add_subdirectory(slsSupportLib)
+add_subdirectory(slsSupportLib)
-endif()
 
 if (SLS_USE_DETECTOR OR SLS_USE_TEXTCLIENT)
     add_subdirectory(slsDetectorSoftware)
@@ -235,7 +225,7 @@ endif (SLS_USE_INTEGRATION_TESTS)
 
 if (SLS_USE_PYTHON)
     find_package (Python 3.6 COMPONENTS Interpreter Development)
-    add_subdirectory(libs/pybind11  ${CMAKE_BINARY_DIR}/bin/)
+    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

slsDetectorCalibration/moenchExecutables/CMakeLists.txt

@@ -56,8 +56,7 @@ foreach(exe ${MOENCH_EXECUTABLES})
         ../dataStructures 
         ../interpolations
         ../../slsReceiverSoftware/include/
-	    ../../slsSupportLib/include/
+	../../slsSupportLib/include/
-        ${SLS_INTERNAL_RAPIDJSON_DIR}
     )
 
     target_link_libraries(${exe} 

slsDetectorSoftware/CMakeLists.txt

@@ -17,8 +17,6 @@ add_library(slsDetectorObject OBJECT
 target_include_directories(slsDetectorObject PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
     "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
-    PRIVATE
-    ${SLS_INTERNAL_RAPIDJSON_DIR}
 )
 
 target_link_libraries(slsDetectorObject 

slsReceiverSoftware/CMakeLists.txt

@@ -40,8 +40,6 @@ add_library(slsReceiverObject OBJECT
 target_include_directories(slsReceiverObject PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
     "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
-    PRIVATE
-    ${SLS_INTERNAL_RAPIDJSON_DIR}
 )
 
 target_link_libraries(slsReceiverObject 

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,10 +523,10 @@ 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);
+                pStartAcquisition);
         } catch (const std::exception &e) {
             throw sls::RuntimeError("Start Acquisition Callback Error: " +
                                     std::string(e.what()));
@@ -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;

slsSupportLib/CMakeLists.txt

@@ -34,8 +34,6 @@ set(PUBLICHEADERS
 if(SLS_DEVEL_HEADERS)
     set(PUBLICHEADERS
         ${PUBLICHEADERS}
-        include/sls/ansi.h
-        include/sls/logger.h
         include/sls/file_utils.h
         include/sls/sls_detector_funcs.h
         include/sls/ClientSocket.h
@@ -48,7 +46,7 @@ if(SLS_DEVEL_HEADERS)
         include/sls/versionAPI.h
         include/sls/ZmqSocket.h
         include/sls/bit_utils.h
-        include/sls/md5.h
+        include/sls/mdf5.h
         include/sls/md5_helper.h
     )
 endif()
@@ -77,16 +75,13 @@ target_include_directories(slsSupportObject
   PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
     "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
-    PRIVATE
-    ${SLS_INTERNAL_RAPIDJSON_DIR}
 )
 
-message(STATUS "RAPID: ${SLS_INTERNAL_RAPIDJSON_DIR}")
-
 target_link_libraries(slsSupportObject 
   PUBLIC
     slsProjectOptions 
     libzmq
+    rapidjson
   PRIVATE
     slsProjectWarnings
     md5sls