From 17a6322f7c4643b90382eb0b798626c6808c9fdb Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Wed, 10 Oct 2018 10:12:58 +0200
Subject: [PATCH] receiver runs but does not overwrite due to wx, async doesnt
 seems parallel problem, acquire gets stuck

---
 CMakeLists.txt                                        | 11 +++++++++++
 cmk.sh                                                |  3 ++-
 slsDetectorSoftware/CMakeLists.txt                    | 10 ----------
 slsReceiverSoftware/CMakeLists.txt                    | 10 +---------
 slsReceiverSoftware/include/BinaryFileStatic.h        |  4 ++--
 slsReceiverSoftware/src/slsReceiverImplementation.cpp |  2 +-
 6 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a00f719a..55f8074bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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) 
diff --git a/cmk.sh b/cmk.sh
index 7f4c7fda1..dbe484bfb 100755
--- a/cmk.sh
+++ b/cmk.sh
@@ -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
diff --git a/slsDetectorSoftware/CMakeLists.txt b/slsDetectorSoftware/CMakeLists.txt
index f145cfdb1..67da57b2d 100644
--- a/slsDetectorSoftware/CMakeLists.txt
+++ b/slsDetectorSoftware/CMakeLists.txt
@@ -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
diff --git a/slsReceiverSoftware/CMakeLists.txt b/slsReceiverSoftware/CMakeLists.txt
index f05869ea2..8aa4a9413 100644
--- a/slsReceiverSoftware/CMakeLists.txt
+++ b/slsReceiverSoftware/CMakeLists.txt
@@ -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}
@@ -103,6 +97,4 @@ install(TARGETS slsReceiverShared slsReceiverStatic slsReceiver
         ARCHIVE DESTINATION lib
         PUBLIC_HEADER DESTINATION include)
         
- 
-install(FILES ${ZMQ_STATIC_ARCHIVE}
-DESTINATION lib)       
\ No newline at end of file
+      
\ No newline at end of file
diff --git a/slsReceiverSoftware/include/BinaryFileStatic.h b/slsReceiverSoftware/include/BinaryFileStatic.h
index 348453b82..7d2445f61 100644
--- a/slsReceiverSoftware/include/BinaryFileStatic.h
+++ b/slsReceiverSoftware/include/BinaryFileStatic.h
@@ -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;
 		}
diff --git a/slsReceiverSoftware/src/slsReceiverImplementation.cpp b/slsReceiverSoftware/src/slsReceiverImplementation.cpp
index e9f45bf18..928812e81 100644
--- a/slsReceiverSoftware/src/slsReceiverImplementation.cpp
+++ b/slsReceiverSoftware/src/slsReceiverImplementation.cpp
@@ -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){