detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 23:10:02 +02:00
Code Issues Actions Packages Releases Activity

receiver runs but does not overwrite due to wx, async doesnt seems parallel problem, acquire gets stuck

Browse Source
This commit is contained in:
maliakal_d 2018-10-10 10:12:58 +02:00
parent 8151f1d5fe
commit 17a6322f7c
6 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -30,6 +30,14 @@ set(CMAKE_INSTALL_RPATH "$ORIGIN")
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
#zmq
add_library(zmq STATIC IMPORTED GLOBAL)
set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/slsSupportLib/include/libzmq.a)
set_target_properties(zmq PROPERTIES
IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE}
)
if (USE_TEXTCLIENT)
add_subdirectory(slsDetectorSoftware)
endif (USE_TEXTCLIENT)
@ -58,3 +66,6 @@ if (CALIBRATE)
endif()
endif()
endif(CALIBRATE)
install(FILES ${ZMQ_STATIC_ARCHIVE}
DESTINATION lib)

3
cmk.sh
View File

@ -116,7 +116,8 @@ done
if [ $TEXTCLIENT -eq 0 ] && [ $RECEIVER -eq 0 ] && [ $GUI -eq 0 ]; then
CMAKE_POST+=" -DUSE_TEXTCLIENT=ON -DUSE_RECEIVER=ON -DUSE_GUI=ON "
# CMAKE_POST+=" -DUSE_TEXTCLIENT=ON -DUSE_RECEIVER=ON -DUSE_GUI=ON "
CMAKE_POST+=" -DUSE_TEXTCLIENT=ON -DUSE_RECEIVER=ON "
echo "Compile Option: TextClient, Receiver and GUI"
else
if [ $TEXTCLIENT -eq 1 ]; then

10
slsDetectorSoftware/CMakeLists.txt
View File

@ -34,13 +34,6 @@ add_library(slsDetectorShared SHARED
${HEADERS}
)
add_library(zmq STATIC IMPORTED GLOBAL)
set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/../slsSupportLib/include/libzmq.a)
set_target_properties(zmq PROPERTIES
IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE}
)
target_link_libraries(slsDetectorShared
zmq
)
@ -81,9 +74,6 @@ if(DOXYGEN_FOUND)
endif()
install(FILES ${ZMQ_STATIC_ARCHIVE}
DESTINATION lib)
install(TARGETS slsDetectorShared slsDetectorStatic
LIBRARY DESTINATION lib
PUBLIC_HEADER DESTINATION include

8
slsReceiverSoftware/CMakeLists.txt
View File

@ -39,12 +39,6 @@ include_directories(
../slsSupportLib/include
)
add_library(zmq STATIC IMPORTED GLOBAL)
set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/../slsSupportLib/include/libzmq.a)
set_target_properties(zmq PROPERTIES
IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE}
)
add_library(slsReceiverStatic STATIC
${SOURCES}
@ -104,5 +98,3 @@ install(TARGETS slsReceiverShared slsReceiverStatic slsReceiver
PUBLIC_HEADER DESTINATION include)
install(FILES ${ZMQ_STATIC_ARCHIVE}
DESTINATION lib)

4
slsReceiverSoftware/include/BinaryFileStatic.h
View File

@ -123,12 +123,12 @@ class BinaryFileStatic {
{
if(!owenable){
if (NULL == (fd = fopen((const char *) fname.c_str(), "wx"))){
cprintf(RED,"Error in creating binary master file %s\n",fname.c_str());
cprintf(RED,"Error in creating binary master file (without overwrite enable) %s\n",fname.c_str());
fd = 0;
return 1;
}
}else if (NULL == (fd = fopen((const char *) fname.c_str(), "w"))){
cprintf(RED,"Error in creating binary master file %s\n",fname.c_str());
cprintf(RED,"Error in creating binary master file (with overwrite enable) %s\n",fname.c_str());
fd = 0;
return 1;
}

2
slsReceiverSoftware/src/slsReceiverImplementation.cpp
View File

@ -780,7 +780,7 @@ void slsReceiverImplementation::setSubPeriod(const uint64_t i){
FILE_LOG(logDEBUG) << __AT__ << " starting";
subPeriod = i;
FILE_LOG(logINFO) << "Sub Exposure Time: " << (double)subPeriod/(1E9) << "s";
FILE_LOG(logINFO) << "Sub Exposure Period: " << (double)subPeriod/(1E9) << "s";
}
int slsReceiverImplementation::setNumberOfFrames(const uint64_t i){