mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-02-07 15:28:39 +01:00
Dhanya Thattil
ee27f0bc1b
readout speed added to json and h5 master files. Also fixed master file inconsistencies Sserver binaries - update server binaries because readoutspeed needs to be sent to receiver with rx_hostname command API - added const to Detector class set/getburstmode Python - updated python bindings (burstmode const and roi arguments) Cmd generation - added pragma once in Caller.in.h as Caller is included in test files m3: num channels due to #counters < 3 * workaround for m3 for messed up num channels (client always assumes all counters enabled and adds them to num channels), fix for hdf5 g2: exptime master file inconsistency - exptime didnt match because of round of when setting burst mode (sets to a different clk divider) - so updating actual time for all timers (exptime, period, subexptime etc, ) in Module class, get timer values from detector when setting it and then send to receiver to write in master file ctb image size incorrect: - write actual size into master file and not the reserved size (digital reduces depending on dbit list and dbit offset) - added a calculate ctb image size free function in generalData.h that is used there as well as for the tests. master file inconsistencies - refactored master attributes writing using templates - names changed to keep it consistent between json and hdf5 master file (Version, Pixels, Exposure Times, GateDelays, Acquisition Period, etc.) - datatypes changed to keep it simple where possible: imageSize, dynamicRange, tengiga, quad, readnrows, analog, analogsamples, digital, digitalsamples, dbitreorder, dbitoffset, transceivermask, transeiver, transceiversamples, countermask, gates =>int - replacing "toString" with arrays, objects etc for eg for scan, rois, etc. - json header always written (empty dataset or empty brackets) - hdf5 needs const char* so have to convert strings to it, but taking care that strings exist prior to push_back - master attributes (redundant string literals->error prone tests for master file - suppressed deprecated functions in rapidjson warnings just for the tests - added slsREceiverSoftware/src to allow access to receiver_defs.h to test binary/hdf5 version - refactored acquire tests by moving all the acquire tests from individual detector type files to a single one=test-Caller-acquire.cpp - set some default settings (loadBasicSettings) for a basic acquire at load config part for the test_simulator python scripts. so minimum number of settings for detector to be set for any acquire tests. - added tests to test master files for json and hdf5= test-Caller-master-attributes.cpp - added option to add '-m' markers for tests using test_simulator python script
52 lines
1.9 KiB
CMake
Executable File
52 lines
1.9 KiB
CMake
Executable File
# SPDX-License-Identifier: LGPL-3.0-or-other
|
|
# Copyright (C) 2021 Contributors to the SLS Detector Package
|
|
|
|
|
|
target_sources(tests PRIVATE
|
|
${CMAKE_CURRENT_SOURCE_DIR}/test-SharedMemory.cpp
|
|
${CMAKE_CURRENT_SOURCE_DIR}/test-slsDetector.cpp
|
|
|
|
${CMAKE_CURRENT_SOURCE_DIR}/Caller/test-Caller.cpp
|
|
${CMAKE_CURRENT_SOURCE_DIR}/Caller/test-Caller-rx.cpp
|
|
${CMAKE_CURRENT_SOURCE_DIR}/Caller/test-Caller-pattern.cpp
|
|
${CMAKE_CURRENT_SOURCE_DIR}/Caller/test-Caller-eiger.cpp
|
|
${CMAKE_CURRENT_SOURCE_DIR}/Caller/test-Caller-jungfrau.cpp
|
|
${CMAKE_CURRENT_SOURCE_DIR}/Caller/test-Caller-mythen3.cpp
|
|
${CMAKE_CURRENT_SOURCE_DIR}/Caller/test-Caller-gotthard2.cpp
|
|
${CMAKE_CURRENT_SOURCE_DIR}/Caller/test-Caller-chiptestboard.cpp
|
|
${CMAKE_CURRENT_SOURCE_DIR}/Caller/test-Caller-xilinx-chiptestboard.cpp
|
|
${CMAKE_CURRENT_SOURCE_DIR}/Caller/test-Caller-moench.cpp
|
|
${CMAKE_CURRENT_SOURCE_DIR}/Caller/test-Caller-global.cpp
|
|
${CMAKE_CURRENT_SOURCE_DIR}/Caller/test-Caller-acquire.cpp
|
|
${CMAKE_CURRENT_SOURCE_DIR}/Caller/test-Caller-master-attributes.cpp
|
|
|
|
|
|
${CMAKE_CURRENT_SOURCE_DIR}/test-Result.cpp
|
|
${CMAKE_CURRENT_SOURCE_DIR}/test-CmdParser.cpp
|
|
${CMAKE_CURRENT_SOURCE_DIR}/test-Module.cpp
|
|
${CMAKE_CURRENT_SOURCE_DIR}/test-Pattern.cpp
|
|
${CMAKE_CURRENT_SOURCE_DIR}/test-CtbConfig.cpp
|
|
)
|
|
|
|
# HDF5 file
|
|
if (SLS_USE_HDF5)
|
|
target_compile_definitions(tests
|
|
PUBLIC
|
|
-DHDF5C ${HDF5_DEFINITIONS}
|
|
)
|
|
endif (SLS_USE_HDF5)
|
|
|
|
target_compile_options(tests
|
|
PRIVATE
|
|
# Suppress warnings for deprecated functions in rapidjson
|
|
-Wno-deprecated-declarations
|
|
)
|
|
|
|
target_include_directories(tests
|
|
PUBLIC
|
|
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../src>"
|
|
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include/sls>"
|
|
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../slsReceiverSoftware/src>"
|
|
PRIVATE
|
|
${SLS_INTERNAL_RAPIDJSON_DIR}
|
|
) |