mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-05-02 10:50:05 +02:00
2f2fe4dd47
* Setting pattern from memory (#218) * ToString accepts c-style arrays * fixed patwait time bug in validation * Introduced pattern class * compile for servers too * Python binding for Pattern * added scanParameters in Python * slsReceiver: avoid potential memory leak around Implementation::generalData * additional constructors for scanPrameters in python * bugfix: avoid potentital memory leak in receiver if called outside constructor context * added scanParameters in Python * additional constructors for scanPrameters in python * M3defaultpattern (#227) * default pattern for m3 and moench including Python bindings * M3settings (#228) * some changes to compile on RH7 and in the server to load the default chip status register at startup * Updated mythen3DeectorServer_developer executable with correct initialization at startup Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com> Co-authored-by: Anna Bergamaschi <anna.bergamaschi@psi.ch> * Pattern.h as a public header files (#229) * fixed buffer overflow but caused by using global instead of local enum * replacing out of range trimbits with edge values * replacing dac values that are out of range after interpolation * updated pybind11 to 2.6.2 * Mythen3 improved synchronization (#231) Disabling scans for multi module Mythen3, since there is no feedback of the detectors being ready startDetector first starts the slaves then the master acquire firs calls startDetector for the slaves then acquire on the master getMaster to read back from hardware which one is master * New server for JF to go with the new FW (#232) * Modified Jungfrau speed settings for HW1.0 - FW fix version 1.1.1, compilation date 210218 * Corrected bug. DBIT clk phase is implemented in both HW version 1.0 and 2.0. Previous version did not update the DBIT phase shift on the configuration of a speed. * fix for m3 scan with single module * m3 fw version * m3 server * bugfix for bottom when setting quad * new strategy for finding zmq based on cppzmq Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch> Co-authored-by: Dhanya Thattil <33750417+thattil@users.noreply.github.com> Co-authored-by: Alejandro Homs Puron <ahoms@esrf.fr> Co-authored-by: Anna Bergamaschi <anna.bergamaschi@psi.ch> Co-authored-by: Xiaoqiang Wang <xiaoqiangwang@gmail.com> Co-authored-by: lopez_c <carlos.lopez-cuenca@psi.ch>
109 lines
2.9 KiB
CMake
Executable File
109 lines
2.9 KiB
CMake
Executable File
set(SOURCES
|
|
src/DetectorImpl.cpp
|
|
src/Module.cpp
|
|
src/Detector.cpp
|
|
src/CmdProxy.cpp
|
|
src/CmdParser.cpp
|
|
src/Pattern.cpp
|
|
)
|
|
|
|
add_library(slsDetectorObject OBJECT
|
|
${SOURCES}
|
|
)
|
|
|
|
target_include_directories(slsDetectorObject PUBLIC
|
|
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
|
|
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
|
|
)
|
|
|
|
target_link_libraries(slsDetectorObject
|
|
PUBLIC
|
|
slsProjectOptions
|
|
slsSupportStatic
|
|
pthread
|
|
rt
|
|
PRIVATE
|
|
slsProjectWarnings
|
|
)
|
|
|
|
|
|
set(PUBLICHEADERS
|
|
include/sls/detectorData.h
|
|
include/sls/Detector.h
|
|
include/sls/Result.h
|
|
include/sls/Pattern.h
|
|
)
|
|
|
|
#Shared library
|
|
add_library(slsDetectorShared SHARED $<TARGET_OBJECTS:slsDetectorObject>)
|
|
target_link_libraries(slsDetectorShared PUBLIC slsDetectorObject)
|
|
set_target_properties(slsDetectorShared PROPERTIES
|
|
LIBRARY_OUTPUT_NAME SlsDetector
|
|
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
|
|
PUBLIC_HEADER "${PUBLICHEADERS}"
|
|
)
|
|
|
|
#Static library
|
|
add_library(slsDetectorStatic STATIC $<TARGET_OBJECTS:slsDetectorObject>)
|
|
target_link_libraries(slsDetectorStatic PUBLIC slsDetectorObject)
|
|
|
|
set_target_properties(slsDetectorStatic PROPERTIES
|
|
ARCHIVE_OUTPUT_NAME SlsDetectorStatic
|
|
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
|
|
PUBLIC_HEADER "${PUBLICHEADERS}"
|
|
)
|
|
|
|
|
|
# message("Detector LTO_AVAILABLE:" ${SLS_LTO_AVAILABLE})
|
|
if((CMAKE_BUILD_TYPE STREQUAL "Release") AND SLS_LTO_AVAILABLE)
|
|
set_property(TARGET slsDetectorObject PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
|
|
set_property(TARGET slsDetectorStatic PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
|
|
set_property(TARGET slsDetectorShared PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
|
|
endif()
|
|
|
|
# Loop over list to generate command line binaries
|
|
set(bin_names "sls_detector_put"
|
|
"sls_detector_get"
|
|
"sls_detector_acquire"
|
|
"sls_detector_help")
|
|
set(cmd_name "PUT" "GET" "READOUT" "HELP")
|
|
list(LENGTH bin_names len1)
|
|
math(EXPR len2 "${len1} - 1")
|
|
|
|
foreach(val RANGE ${len2})
|
|
list(GET bin_names ${val} val1)
|
|
list(GET cmd_name ${val} val2)
|
|
message(STATUS "${val1} ${val2}")
|
|
|
|
add_executable(${val1} src/CmdLineApp.cpp)
|
|
target_link_libraries(${val1}
|
|
slsDetectorStatic
|
|
pthread
|
|
rt
|
|
)
|
|
set_target_properties(${val1} PROPERTIES
|
|
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
|
|
COMPILE_DEFINITIONS ${val2}=1
|
|
)
|
|
if(SLS_LTO_AVAILABLE)
|
|
set_property(TARGET ${val1} PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
|
|
endif()
|
|
endforeach()
|
|
|
|
|
|
install(TARGETS ${bin_names} DESTINATION bin)
|
|
|
|
|
|
if (SLS_USE_TESTS)
|
|
add_subdirectory(tests)
|
|
endif(SLS_USE_TESTS)
|
|
|
|
|
|
install(TARGETS slsDetectorShared slsDetectorObject slsDetectorStatic
|
|
EXPORT "${TARGETS_EXPORT_NAME}"
|
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sls
|
|
)
|