Starting with Cameo apps

CMakeLists.txt

@@ -23,6 +23,7 @@ endif()
 
 
 option(NOMAD "Compile Nomad library and programs" OFF)
+option(CAMEO "Compile Cameo programs" OFF)
 
 #------------------------------------------------------------
 # Libraries
@@ -67,16 +68,8 @@ install(DIRECTORY src/lstdpp128/
     FILES_MATCHING PATTERN "*.h"
 )
 
-install(TARGETS lstdpp128
-  EXPORT lstdpp128export
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} # windows
-    COMPONENT lstdpp128_Runtime
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # dynamic
-    COMPONENT lstdpp128_Runtime
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # static
-    COMPONENT lstdpp128_Development
-  PUBLIC_HEADER  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+install(TARGETS lstdpp128 
+    DESTINATION lib
 )
 
 #------------------------------------------------------------

src/lstdpp128/algorithms/nomad/CMakeLists.txt

@@ -10,13 +10,5 @@ set_target_properties(lstdppnomad128 PROPERTIES
 )
 
 install(TARGETS lstdppnomad128
-  EXPORT lstdppnomad128export
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} # windows
-    COMPONENT lstdppnomad128_Runtime
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # dynamic
-    COMPONENT lstdppnomad128_Runtime
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # static
-    COMPONENT lstdppnomad128_Development
-  PUBLIC_HEADER  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-)
+	DESTINATION lib
+)
\ No newline at end of file

src/lstdpp128/apps/CMakeLists.txt

@@ -2,4 +2,8 @@ add_subdirectory(common)
 
 if(NOMAD)
   add_subdirectory(nomad)
-endif(NOMAD)
\ No newline at end of file
+endif(NOMAD)
+
+if(CAMEO)
+  add_subdirectory(cameo)
+endif(CAMEO)
\ No newline at end of file

src/lstdpp128/apps/cameo/CMakeLists.txt

+#------------------------------------------------------------
+# Programs
+#------------------------------------------------------------
+
+add_executable(lstcameohisto128
+	Utils.cpp
+    CameoLiveHistogram.cpp
+)
+
+target_link_libraries(lstcameohisto128 PUBLIC
+	lstdppnomad128 lstdpp128
+)
+
+
+add_executable(lstcameocoincidence128
+	Utils.cpp
+    CameoLiveCoincidence.cpp
+)
+
+target_link_libraries(lstcameocoincidence128 PUBLIC
+	lstdppnomad128 lstdpp128
+)
+
+#------------------------------------------------------------
+# Install
+#------------------------------------------------------------
+
+install(
+	TARGETS lstcameohisto128 lstcameocoincidence128
+	DESTINATION bin
+)
\ No newline at end of file

src/lstdpp128/apps/cameo/CameoLiveCoincidence.cpp

@@ -165,16 +165,16 @@ int main(int argc, char * argv[]) {
 				cout << "#events read " << algorithm.processor().numberOfGoodEvents() << endl;
 
 				// publish results
-				publisher->send(algorithm.processor().getChannelRates(), algorithm.processor().getTotalNumberOfChannels());
-				publisher->send(algorithm.processor().getCoincidenceRates(), algorithm.processor().getNumberOfCoincidenceRates());
+//				publisher->send(algorithm.processor().getChannelRates(), algorithm.processor().getTotalNumberOfChannels());
+//				publisher->send(algorithm.processor().getCoincidenceRates(), algorithm.processor().getNumberOfCoincidenceRates());
 
 				last = current;
 			}
 		}
 
 		// publish results at the end
-		publisher->send(algorithm.processor().getChannelRates(), algorithm.processor().getTotalNumberOfChannels());
-		publisher->send(algorithm.processor().getCoincidenceRates(), algorithm.processor().getNumberOfCoincidenceRates());
+//		publisher->send(algorithm.processor().getChannelRates(), algorithm.processor().getTotalNumberOfChannels());
+//		publisher->send(algorithm.processor().getCoincidenceRates(), algorithm.processor().getNumberOfCoincidenceRates());
 
 		time_t t2 = time(0);
 

src/lstdpp128/apps/cameo/CameoLiveHistogram.cpp

@@ -149,16 +149,16 @@ int main(int argc, char * argv[]) {
 				cout << "#events read " << algorithm.processor().numberOfGoodEvents() << endl;
 
 				// publish results
-				publisher->send(algorithm.processor().getChannelRates(), algorithm.processor().getTotalNumberOfChannels());
-				publisher->send(algorithm.processor().getHistograms(), algorithm.processor().getTotalHistogramSize());
+//				publisher->send(algorithm.processor().getChannelRates(), algorithm.processor().getTotalNumberOfChannels());
+//				publisher->send(algorithm.processor().getHistograms(), algorithm.processor().getTotalHistogramSize());
 
 				last = current;
 			}
 		}
 
 		// publish results at the end
-		publisher->send(algorithm.processor().getChannelRates(), algorithm.processor().getTotalNumberOfChannels());
-		publisher->send(algorithm.processor().getHistograms(), algorithm.processor().getTotalHistogramSize());
+//		publisher->send(algorithm.processor().getChannelRates(), algorithm.processor().getTotalNumberOfChannels());
+//		publisher->send(algorithm.processor().getHistograms(), algorithm.processor().getTotalHistogramSize());
 
 		time_t t2 = time(0);