diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 3b39650a9..7d9d31a3f 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/eigerDetectorServer/CMakeLists.txt b/slsDetectorServers/eigerDetectorServer/CMakeLists.txt index f39c7b1dc..e663d4569 100644 --- a/slsDetectorServers/eigerDetectorServer/CMakeLists.txt +++ b/slsDetectorServers/eigerDetectorServer/CMakeLists.txt @@ -96,3 +96,7 @@ set_target_properties(eigerDetectorServerSlaveBottom_virtual PROPERTIES install(TARGETS eigerDetectorServerSlaveBottom_virtual RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) + + + +configure_file(config_eiger.txt ${CMAKE_BINARY_DIR}/bin/config_eiger.txt COPYONLY) diff --git a/slsDetectorServers/eigerDetectorServer/Makefile b/slsDetectorServers/eigerDetectorServer/Makefile index ff75189d6..04370b148 100755 --- a/slsDetectorServers/eigerDetectorServer/Makefile +++ b/slsDetectorServers/eigerDetectorServer/Makefile @@ -33,6 +33,7 @@ $(PROGS): $(OBJS) mkdir -p $(DESTDIR) $(CC) -o $@ $^ $(CFLAGS) $(LDLIBS) mv $(PROGS) $(DESTDIR) + cp config_eiger.txt $(DESTDIR) hv9m_blackfin_server:9mhvserial_bf.c diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer index 8a28acb04..146dce365 100755 Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ diff --git a/slsDetectorServers/eigerDetectorServer/config.txt b/slsDetectorServers/eigerDetectorServer/config_eiger.txt old mode 100644 new mode 100755 similarity index 100% rename from slsDetectorServers/eigerDetectorServer/config.txt rename to slsDetectorServers/eigerDetectorServer/config_eiger.txt diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h index 76268dedf..a8e8a0840 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h @@ -3,7 +3,7 @@ #define REQUIRED_FIRMWARE_VERSION (26) #define IDFILECOMMAND "more /home/root/executables/detid.txt" -#define CONFIG_FILE ("config.txt") +#define CONFIG_FILE ("config_eiger.txt") #define WAIT_STOP_SERVER_START (1 * 1000 * 1000) #define STATUS_IDLE 0 diff --git a/slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt b/slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt index 02dd438f2..6fbb6a8d1 100644 --- a/slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt +++ b/slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt @@ -38,3 +38,5 @@ set_target_properties(gotthard2DetectorServer_virtual PROPERTIES install(TARGETS gotthard2DetectorServer_virtual RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) + +configure_file(config_gotthard2.txt ${CMAKE_BINARY_DIR}/bin/config_gotthard2.txt COPYONLY) diff --git a/slsDetectorServers/gotthard2DetectorServer/Makefile b/slsDetectorServers/gotthard2DetectorServer/Makefile index 273630224..000d778bb 100755 --- a/slsDetectorServers/gotthard2DetectorServer/Makefile +++ b/slsDetectorServers/gotthard2DetectorServer/Makefile @@ -32,6 +32,7 @@ $(PROGS): $(OBJS) mkdir -p $(DESTDIR) $(CC) -o $@ $^ $(CFLAGS) $(LDLIBS) mv $(PROGS) $(DESTDIR) + cp config_gotthard2.txt $(DESTDIR) rm $(main_src)*.o clean: diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index 4166c3b46..8ec8afc5a 100755 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer differ diff --git a/slsDetectorServers/gotthard2DetectorServer/config.txt b/slsDetectorServers/gotthard2DetectorServer/config_gotthard2.txt old mode 100644 new mode 100755 similarity index 100% rename from slsDetectorServers/gotthard2DetectorServer/config.txt rename to slsDetectorServers/gotthard2DetectorServer/config_gotthard2.txt diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h index 825fd5898..f775acc7e 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h @@ -18,7 +18,7 @@ #define DAC_DRIVER_FILE_NAME ("/etc/devlinks/dac") #define ONCHIP_DAC_DRIVER_FILE_NAME ("/etc/devlinks/chipdac") #define TYPE_FILE_NAME ("/etc/devlinks/type") -#define CONFIG_FILE ("config.txt") +#define CONFIG_FILE ("config_gotthard2.txt") #define DAC_MAX_MV (2048) #define ONCHIP_DAC_MAX_VAL (0x3FF) #define ADU_MAX_VAL (0xFFF) 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/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer index 6f815d9d4..d71cd1f90 100755 Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer differ 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) diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 2ab30d3cc..bef4195af 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/moenchDetectorServer/CMakeLists.txt b/slsDetectorServers/moenchDetectorServer/CMakeLists.txt index 3e8ec94cf..056ee1f5e 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_moench.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/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer index 69e95f9ef..e8a16b655 100755 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ 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) diff --git a/slsDetectorServers/mythen3DetectorServer/CMakeLists.txt b/slsDetectorServers/mythen3DetectorServer/CMakeLists.txt index a5f14667a..85baade80 100644 --- a/slsDetectorServers/mythen3DetectorServer/CMakeLists.txt +++ b/slsDetectorServers/mythen3DetectorServer/CMakeLists.txt @@ -38,3 +38,5 @@ set_target_properties(mythen3DetectorServer_virtual PROPERTIES install(TARGETS mythen3DetectorServer_virtual RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) + +configure_file(DefaultPattern_mythen3.txt ${CMAKE_BINARY_DIR}/bin/DefaultPattern_mythen3.txt COPYONLY) \ No newline at end of file diff --git a/slsDetectorServers/mythen3DetectorServer/DefaultPattern.txt b/slsDetectorServers/mythen3DetectorServer/DefaultPattern_mythen3.txt old mode 100644 new mode 100755 similarity index 100% rename from slsDetectorServers/mythen3DetectorServer/DefaultPattern.txt rename to slsDetectorServers/mythen3DetectorServer/DefaultPattern_mythen3.txt diff --git a/slsDetectorServers/mythen3DetectorServer/Makefile b/slsDetectorServers/mythen3DetectorServer/Makefile index 607d27228..c07029041 100755 --- a/slsDetectorServers/mythen3DetectorServer/Makefile +++ b/slsDetectorServers/mythen3DetectorServer/Makefile @@ -32,6 +32,7 @@ $(PROGS): $(OBJS) mkdir -p $(DESTDIR) $(CC) -o $@ $^ $(CFLAGS) $(LDLIBS) mv $(PROGS) $(DESTDIR) + cp DefaultPattern_mythen3.txt $(DESTDIR) rm $(main_src)*.o clean: diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index 7401da623..785286507 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h index b85d01578..8f170e0dd 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h @@ -24,7 +24,7 @@ #define MAX_EXT_SIGNALS (8) /** Default Parameters */ -#define DEFAULT_PATTERN_FILE ("DefaultPattern.txt") +#define DEFAULT_PATTERN_FILE ("DefaultPattern_mythen3.txt") #define DEFAULT_INTERNAL_GATES (1) #define DEFAULT_EXTERNAL_GATES (1) #define DEFAULT_DYNAMIC_RANGE (32) diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 546213e49..5cb260890 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -3,10 +3,10 @@ #define APILIB 0x200409 #define APIRECEIVER 0x200409 #define APIGUI 0x200409 -#define APICTB 0x200717 -#define APIGOTTHARD 0x200717 -#define APIGOTTHARD2 0x200717 -#define APIJUNGFRAU 0x200717 -#define APIMYTHEN3 0x200717 -#define APIMOENCH 0x200717 -#define APIEIGER 0x200717 +#define APICTB 0x200720 +#define APIGOTTHARD 0x200720 +#define APIGOTTHARD2 0x200720 +#define APIJUNGFRAU 0x200720 +#define APIMYTHEN3 0x200720 +#define APIMOENCH 0x200720 +#define APIEIGER 0x200720