From 07a292af951e6d105ad7d9c0a286debdf9e20d8f Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 20 Jul 2020 17:28:29 +0200 Subject: [PATCH] gotthard --- slsDetectorServers/gotthardDetectorServer/CMakeLists.txt | 2 ++ slsDetectorServers/gotthardDetectorServer/Makefile | 1 + .../gotthardDetectorServer/{config.txt => config_gotthard.txt} | 0 .../gotthardDetectorServer/slsDetectorServer_defs.h | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) rename slsDetectorServers/gotthardDetectorServer/{config.txt => config_gotthard.txt} (100%) diff --git a/slsDetectorServers/gotthardDetectorServer/CMakeLists.txt b/slsDetectorServers/gotthardDetectorServer/CMakeLists.txt index c4e2e3130..d3a14b689 100644 --- a/slsDetectorServers/gotthardDetectorServer/CMakeLists.txt +++ b/slsDetectorServers/gotthardDetectorServer/CMakeLists.txt @@ -37,3 +37,5 @@ set_target_properties(gotthardDetectorServer_virtual PROPERTIES install(TARGETS gotthardDetectorServer_virtual RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) + +configure_file(config_gotthard.txt ${CMAKE_BINARY_DIR}/bin/config_gotthard.txt COPYONLY) \ No newline at end of file diff --git a/slsDetectorServers/gotthardDetectorServer/Makefile b/slsDetectorServers/gotthardDetectorServer/Makefile index 2264c5554..ef245754a 100755 --- a/slsDetectorServers/gotthardDetectorServer/Makefile +++ b/slsDetectorServers/gotthardDetectorServer/Makefile @@ -31,6 +31,7 @@ $(PROGS): $(OBJS) mkdir -p $(DESTDIR) $(CC) -o $@ $^ $(CFLAGS) $(LDLIBS) mv $(PROGS) $(DESTDIR) + cp config_gotthard.txt $(DESTDIR) rm *.gdb rm $(main_src)*.o diff --git a/slsDetectorServers/gotthardDetectorServer/config.txt b/slsDetectorServers/gotthardDetectorServer/config_gotthard.txt similarity index 100% rename from slsDetectorServers/gotthardDetectorServer/config.txt rename to slsDetectorServers/gotthardDetectorServer/config_gotthard.txt diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h index a7e588eff..bc01d327d 100644 --- a/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h @@ -30,7 +30,7 @@ enum CLKINDEX { ADC_CLK, NUM_CLOCKS }; }; /* for 25 um */ -#define CONFIG_FILE "config.txt" +#define CONFIG_FILE "config_gotthard.txt" /* Hardware Definitions */ #define NCHAN (128)