Merge pull request #116 from slsdetectorgroup/serverconfigs

Serverconfigs

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)

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

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

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)

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:

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)

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)

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
 

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)

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)

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

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)

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)

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:

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)

slsSupportLib/include/versionAPI.h

@@ -3,10 +3,10 @@
 #define APILIB       0x200409
 #define APIRECEIVER  0x200409
 #define APIGUI       0x200409
-#define APICTB 0x200717
+#define APICTB 0x200720
-#define APIGOTTHARD 0x200717
+#define APIGOTTHARD 0x200720
-#define APIGOTTHARD2 0x200717
+#define APIGOTTHARD2 0x200720
-#define APIJUNGFRAU 0x200717
+#define APIJUNGFRAU 0x200720
-#define APIMYTHEN3 0x200717
+#define APIMYTHEN3 0x200720
-#define APIMOENCH 0x200717
+#define APIMOENCH 0x200720
-#define APIEIGER 0x200717
+#define APIEIGER 0x200720