Merge branch '3.0' into developer

examples/eiger_10Gb.config

@@ -2,6 +2,7 @@ detsizechan 1024 512
 #detetctor geometry, long side of the module first
 hostname beb059+beb058+ 
 #1Gb detector hostname for controls
+
 0:rx_tcpport 1991 
 #tcpport for the first halfmodule                 
 0:rx_udpport 50011 
@@ -12,6 +13,7 @@ hostname beb059+beb058+
 #udp IP of the receiver over 10Gb              
 0:detectorip 10.0.30.100 
 #first half module 10 Gb IP 
+
 1:rx_tcpport 1992 
 #tcpport for the second halfmodule                  
 1:rx_udpport 50013 
@@ -23,6 +25,9 @@ hostname beb059+beb058+
 #can be the same or different from 0:rx_udpip                                   
 1:detectorip 10.0.40.101 
 #second half module 10 Gb IP 
+
 rx_hostname x12sa-vcons 
 #1Gb receiver pc hostname
-outdir /sls/X12SA/data/x12saop/Data10/Eiger0.5M
+
+outdir /sls/X12SA/data/x12saop/Data10/Eiger0.5M
+threaded 1

examples/eiger_1Gb.config

@@ -15,7 +15,10 @@ hostname beb059+beb058+
 1:rx_udpport 50013 
 #udp port first quadrant, second halfmodule       
 1:rx_udpport2 50014 
-#udp port second quadrant, second halfmodule      
+#udp port second quadrant, second halfmodule  
+    
 rx_hostname x12sa-vcons 
 #1Gb receiver pc hostname
-outdir /sls/X12SA/data/x12saop/Data10/Eiger0.5M
+
+outdir /sls/X12SA/data/x12saop/Data10/Eiger0.5M
+threaded 1

examples/gotthard.config

@@ -1,5 +1,5 @@
-type Gotthard+
-0:hostname bchip007
+hostname bchip007
+
 #0:port 1952
 #0:stopport 1953
 #0:rx_tcpport 1956 must also have this in receiver config file

examples/jungfrau.config

@@ -0,0 +1,18 @@
+hostname bchip038+
+
+settingsdir /home/mySoft/slsDetectorsPackage/settingsdir/jungfrau
+caldir /home/mySoft/slsDetectorsPackage/settingsdir/jungfrau
+lock 0
+
+0:rx_udpport 50004
+0:rx_udpip 10.1.1.100
+0:detectorip 10.1.1.10
+
+rx_hostname pcmoench01
+
+powerchip 1
+timing auto
+
+outdir /external_pool/jungfrau_data/softwaretest
+threaded 1
+

examples/jungfrau_two.config

@@ -0,0 +1,30 @@
+detsizechan 1024 1024
+hostname bchip048+bchip052+
+
+settingsdir /home/mySoft/slsDetectorsPackage/settingsdir/jungfrau
+caldir /home/mySoft/slsDetectorsPackage/settingsdir/jungfrau
+lock 0
+
+
+0:rx_udpport 50004
+0:rx_udpip 10.1.1.100
+0:rx_udpmac F4:52:14:2F:32:00
+0:detectorip 10.1.1.10
+0:detectormac 00:aa:bb:cc:dd:33
+
+1:rx_tcpport 1955
+1:rx_udpport 50005
+1:rx_udpip 10.1.1.100
+1:rx_udpmac F4:52:14:2F:32:00
+1:detectorip 10.1.1.11
+1:detectormac 00:aa:bb:cc:dd:33
+
+rx_hostname pcmoench01
+
+powerchip 1
+extsig:0 trigger_in_rising_edge
+timing auto
+
+outdir /external_pool/jungfrau_data/softwaretest
+threaded 1
+

examples/two_gotthard.config

@@ -2,7 +2,6 @@
 
 detsizechan 2560 1
 
-#type Gotthard+
 hostname bchip007+bchip009+
 
 #0:hostname bchip007