From e4433a99a5a9271c0e7ba17b7d320195e18c9ff7 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 20 Jul 2020 17:24:55 +0200 Subject: [PATCH] moench --- slsDetectorServers/moenchDetectorServer/CMakeLists.txt | 2 ++ .../{DefaultPattern.txt => DefaultPattern_moench.txt} | 0 slsDetectorServers/moenchDetectorServer/Makefile | 1 + .../moenchDetectorServer/slsDetectorServer_defs.h | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) rename slsDetectorServers/moenchDetectorServer/{DefaultPattern.txt => DefaultPattern_moench.txt} (100%) diff --git a/slsDetectorServers/moenchDetectorServer/CMakeLists.txt b/slsDetectorServers/moenchDetectorServer/CMakeLists.txt index 3e8ec94cf..8d6d1f3f0 100644 --- a/slsDetectorServers/moenchDetectorServer/CMakeLists.txt +++ b/slsDetectorServers/moenchDetectorServer/CMakeLists.txt @@ -42,3 +42,5 @@ set_target_properties(moenchDetectorServer_virtual PROPERTIES install(TARGETS moenchDetectorServer_virtual RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) + +configure_file(DefaultPattern_mythen3.txt ${CMAKE_BINARY_DIR}/bin/DefaultPattern_moench.txt COPYONLY) \ No newline at end of file diff --git a/slsDetectorServers/moenchDetectorServer/DefaultPattern.txt b/slsDetectorServers/moenchDetectorServer/DefaultPattern_moench.txt similarity index 100% rename from slsDetectorServers/moenchDetectorServer/DefaultPattern.txt rename to slsDetectorServers/moenchDetectorServer/DefaultPattern_moench.txt diff --git a/slsDetectorServers/moenchDetectorServer/Makefile b/slsDetectorServers/moenchDetectorServer/Makefile index a4d07b266..a34b3f6b3 100755 --- a/slsDetectorServers/moenchDetectorServer/Makefile +++ b/slsDetectorServers/moenchDetectorServer/Makefile @@ -32,6 +32,7 @@ $(PROGS): $(OBJS) mkdir -p $(DESTDIR) $(CC) -o $@ $^ $(CFLAGS) $(LDLIBS) mv $(PROGS) $(DESTDIR) + cp DefaultPattern_moench.txt $(DESTDIR) rm *.gdb rm $(main_src)*.o rm *.o diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h index d701aa71c..79e3d4924 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h @@ -74,7 +74,7 @@ enum CLKINDEX { RUN_CLK, ADC_CLK, SYNC_CLK, DBIT_CLK, NUM_CLOCKS }; #define NCHANS_PER_ADC (25) /** Default Parameters */ -#define DEFAULT_PATTERN_FILE ("DefaultPattern.txt") +#define DEFAULT_PATTERN_FILE ("DefaultPattern_moench.txt") #define DEFAULT_DATA_BYTES (NCHIP * NCHAN * NUM_BITS_PER_PIXEL) #define DEFAULT_NUM_SAMPLES (5000) #define DEFAULT_EXPTIME (0)