From 0ed82d4ef7a10d8a935b5d075a990509da288e32 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 22 May 2018 15:13:26 +0200 Subject: [PATCH] settingsdir for gotthard, jungfrau, propix, moench deleted, as these are default values in server --- examples/gotthard.config | 7 +------ examples/jungfrau.config | 11 ++++------- examples/jungfrau_two.config | 11 +++-------- examples/two_gotthard.config | 10 +++------- settingsdir/gotthard/dynamicgain/calibration.sn | 1 - settingsdir/gotthard/dynamicgain/settings.sn | 8 -------- settingsdir/gotthard/highgain/calibration.sn | 1 - settingsdir/gotthard/highgain/settings.sn | 8 -------- settingsdir/gotthard/lowgain/calibration.sn | 1 - settingsdir/gotthard/lowgain/settings.sn | 8 -------- settingsdir/gotthard/mediumgain/calibration.sn | 1 - settingsdir/gotthard/mediumgain/settings.sn | 8 -------- settingsdir/gotthard/veryhighgain/calibration.sn | 1 - settingsdir/gotthard/veryhighgain/settings.sn | 8 -------- settingsdir/jungfrau/dynamicgain/calibration.sn | 1 - settingsdir/jungfrau/dynamicgain/settings.sn | 8 -------- settingsdir/jungfrau/dynamichg0 | 1 - settingsdir/jungfrau/fixgain1 | 1 - settingsdir/jungfrau/fixgain2 | 1 - settingsdir/jungfrau/forceswitchg1 | 1 - settingsdir/jungfrau/forceswitchg2 | 1 - settingsdir/moench/dynamicgain/calibration.sn | 1 - settingsdir/moench/dynamicgain/settings.sn | 8 -------- settingsdir/moench/highgain/calibration.sn | 1 - settingsdir/moench/highgain/settings.sn | 8 -------- settingsdir/moench/lowgain/calibration.sn | 1 - settingsdir/moench/lowgain/settings.sn | 8 -------- settingsdir/moench/mediumgain/calibration.sn | 1 - settingsdir/moench/mediumgain/settings.sn | 8 -------- settingsdir/moench/veryhighgain/calibration.sn | 1 - settingsdir/moench/veryhighgain/settings.sn | 8 -------- settingsdir/propix/dynamicgain/calibration.sn | 1 - settingsdir/propix/dynamicgain/settings.sn | 8 -------- settingsdir/propix/highgain/calibration.sn | 1 - settingsdir/propix/highgain/settings.sn | 8 -------- settingsdir/propix/lowgain/calibration.sn | 1 - settingsdir/propix/lowgain/settings.sn | 8 -------- settingsdir/propix/mediumgain/calibration.sn | 1 - settingsdir/propix/mediumgain/settings.sn | 8 -------- settingsdir/propix/veryhighgain/calibration.sn | 1 - settingsdir/propix/veryhighgain/settings.sn | 8 -------- 41 files changed, 11 insertions(+), 177 deletions(-) delete mode 100755 settingsdir/gotthard/dynamicgain/calibration.sn delete mode 100755 settingsdir/gotthard/dynamicgain/settings.sn delete mode 100644 settingsdir/gotthard/highgain/calibration.sn delete mode 100644 settingsdir/gotthard/highgain/settings.sn delete mode 100644 settingsdir/gotthard/lowgain/calibration.sn delete mode 100644 settingsdir/gotthard/lowgain/settings.sn delete mode 100644 settingsdir/gotthard/mediumgain/calibration.sn delete mode 100644 settingsdir/gotthard/mediumgain/settings.sn delete mode 100644 settingsdir/gotthard/veryhighgain/calibration.sn delete mode 100644 settingsdir/gotthard/veryhighgain/settings.sn delete mode 100755 settingsdir/jungfrau/dynamicgain/calibration.sn delete mode 100755 settingsdir/jungfrau/dynamicgain/settings.sn delete mode 120000 settingsdir/jungfrau/dynamichg0 delete mode 120000 settingsdir/jungfrau/fixgain1 delete mode 120000 settingsdir/jungfrau/fixgain2 delete mode 120000 settingsdir/jungfrau/forceswitchg1 delete mode 120000 settingsdir/jungfrau/forceswitchg2 delete mode 100755 settingsdir/moench/dynamicgain/calibration.sn delete mode 100755 settingsdir/moench/dynamicgain/settings.sn delete mode 100644 settingsdir/moench/highgain/calibration.sn delete mode 100644 settingsdir/moench/highgain/settings.sn delete mode 100644 settingsdir/moench/lowgain/calibration.sn delete mode 100644 settingsdir/moench/lowgain/settings.sn delete mode 100644 settingsdir/moench/mediumgain/calibration.sn delete mode 100644 settingsdir/moench/mediumgain/settings.sn delete mode 100644 settingsdir/moench/veryhighgain/calibration.sn delete mode 100644 settingsdir/moench/veryhighgain/settings.sn delete mode 100755 settingsdir/propix/dynamicgain/calibration.sn delete mode 100755 settingsdir/propix/dynamicgain/settings.sn delete mode 100644 settingsdir/propix/highgain/calibration.sn delete mode 100644 settingsdir/propix/highgain/settings.sn delete mode 100644 settingsdir/propix/lowgain/calibration.sn delete mode 100644 settingsdir/propix/lowgain/settings.sn delete mode 100644 settingsdir/propix/mediumgain/calibration.sn delete mode 100644 settingsdir/propix/mediumgain/settings.sn delete mode 100644 settingsdir/propix/veryhighgain/calibration.sn delete mode 100644 settingsdir/propix/veryhighgain/settings.sn diff --git a/examples/gotthard.config b/examples/gotthard.config index 5d2c4c8f7..f2c290df0 100644 --- a/examples/gotthard.config +++ b/examples/gotthard.config @@ -3,12 +3,8 @@ hostname bchip007 #0:port 1952 #0:stopport 1953 #0:rx_tcpport 1956 must also have this in receiver config file -0:settingsdir /home/l_maliakal_d/mySoft/newMythenSoftware/settingsdir/gotthard 0:angdir 1.000000 0:moveflag 0.000000 -0:lock 0 -0:caldir /home/l_maliakal_d/mySoft/newMythenSoftware/settingsdir/gotthard -0:ffdir /home/l_maliakal_d 0:extsig:0 off #0:detectorip 129.129.202.9 0:detectormac 00:aa:bb:cc:dd:ee @@ -20,7 +16,6 @@ hostname bchip007 master -1 sync none outdir /bigRAID/datadir_gotthard/rec_test_data -ffdir /home/l_maliakal_d headerbefore none headerafter none headerbeforepar none @@ -29,4 +24,4 @@ badchannels none angconv none globaloff 0.000000 binsize 0.001000 -threaded 1 + diff --git a/examples/jungfrau.config b/examples/jungfrau.config index 0b7e451d3..b5c8f734e 100644 --- a/examples/jungfrau.config +++ b/examples/jungfrau.config @@ -1,18 +1,15 @@ 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 + +#extsig:0 trigger_in_rising_edge +#timing trigger outdir /external_pool/jungfrau_data/softwaretest -threaded 1 + diff --git a/examples/jungfrau_two.config b/examples/jungfrau_two.config index fc2f6033b..16e50e57d 100644 --- a/examples/jungfrau_two.config +++ b/examples/jungfrau_two.config @@ -1,11 +1,6 @@ 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 @@ -22,9 +17,9 @@ lock 0 rx_hostname pcmoench01 powerchip 1 -extsig:0 trigger_in_rising_edge -timing auto +#extsig:0 trigger_in_rising_edge +#timing trigger outdir /external_pool/jungfrau_data/softwaretest -threaded 1 + diff --git a/examples/two_gotthard.config b/examples/two_gotthard.config index d3bf02cd6..3f9763d57 100644 --- a/examples/two_gotthard.config +++ b/examples/two_gotthard.config @@ -8,13 +8,11 @@ hostname bchip007+bchip009+ #0:port 1952 #0:stopport 1953 #0:rx_tcpport 1956 -0:settingsdir /home/l_msdetect/dhanya/slsDetectorsPackage/settingsdir/gotthard 0:angdir 1.000000 0:moveflag 0.000000 -0:lock 0 -0:caldir /home/l_msdetect/dhanya/slsDetectorsPackage/settingsdir/gotthard 0:ffdir /home/l_msdetect 0:extsig:0 off + 0:detectorip 10.1.1.2 #0:detectormac 00:aa:bb:cc:dd:ee #0:rx_udpport 50001 @@ -28,13 +26,11 @@ hostname bchip007+bchip009+ #1:port 1952 #1:stopport 1953 1:rx_tcpport 1957 -1:settingsdir /home/l_msdetect/dhanya/slsDetectorsPackage/settingsdir/gotthard 1:angdir 1.000000 1:moveflag 0.000000 -1:lock 0 -1:caldir /home/l_msdetect/dhanya/slsDetectorsPackage/settingsdir/gotthard 1:ffdir /home/l_msdetect 1:extsig:0 off + 1:detectorip 10.1.2.2 #1:detectormac 00:aa:bb:cc:dd:ee 1:rx_udpport 50004 @@ -56,4 +52,4 @@ badchannels none angconv none globaloff 0.000000 binsize 0.001000 -threaded 1 + diff --git a/settingsdir/gotthard/dynamicgain/calibration.sn b/settingsdir/gotthard/dynamicgain/calibration.sn deleted file mode 100755 index e5a59be31..000000000 --- a/settingsdir/gotthard/dynamicgain/calibration.sn +++ /dev/null @@ -1 +0,0 @@ -227 5.6 diff --git a/settingsdir/gotthard/dynamicgain/settings.sn b/settingsdir/gotthard/dynamicgain/settings.sn deleted file mode 100755 index 12aef34b2..000000000 --- a/settingsdir/gotthard/dynamicgain/settings.sn +++ /dev/null @@ -1,8 +0,0 @@ -Vref 660 -VcascN 650 -VcascP 1480 -Vout 1520 -Vcasc 1320 -Vin 1350 -Vref_comp 350 -Vib_test 2001 diff --git a/settingsdir/gotthard/highgain/calibration.sn b/settingsdir/gotthard/highgain/calibration.sn deleted file mode 100644 index e5a59be31..000000000 --- a/settingsdir/gotthard/highgain/calibration.sn +++ /dev/null @@ -1 +0,0 @@ -227 5.6 diff --git a/settingsdir/gotthard/highgain/settings.sn b/settingsdir/gotthard/highgain/settings.sn deleted file mode 100644 index 12aef34b2..000000000 --- a/settingsdir/gotthard/highgain/settings.sn +++ /dev/null @@ -1,8 +0,0 @@ -Vref 660 -VcascN 650 -VcascP 1480 -Vout 1520 -Vcasc 1320 -Vin 1350 -Vref_comp 350 -Vib_test 2001 diff --git a/settingsdir/gotthard/lowgain/calibration.sn b/settingsdir/gotthard/lowgain/calibration.sn deleted file mode 100644 index e5a59be31..000000000 --- a/settingsdir/gotthard/lowgain/calibration.sn +++ /dev/null @@ -1 +0,0 @@ -227 5.6 diff --git a/settingsdir/gotthard/lowgain/settings.sn b/settingsdir/gotthard/lowgain/settings.sn deleted file mode 100644 index 12aef34b2..000000000 --- a/settingsdir/gotthard/lowgain/settings.sn +++ /dev/null @@ -1,8 +0,0 @@ -Vref 660 -VcascN 650 -VcascP 1480 -Vout 1520 -Vcasc 1320 -Vin 1350 -Vref_comp 350 -Vib_test 2001 diff --git a/settingsdir/gotthard/mediumgain/calibration.sn b/settingsdir/gotthard/mediumgain/calibration.sn deleted file mode 100644 index e5a59be31..000000000 --- a/settingsdir/gotthard/mediumgain/calibration.sn +++ /dev/null @@ -1 +0,0 @@ -227 5.6 diff --git a/settingsdir/gotthard/mediumgain/settings.sn b/settingsdir/gotthard/mediumgain/settings.sn deleted file mode 100644 index 12aef34b2..000000000 --- a/settingsdir/gotthard/mediumgain/settings.sn +++ /dev/null @@ -1,8 +0,0 @@ -Vref 660 -VcascN 650 -VcascP 1480 -Vout 1520 -Vcasc 1320 -Vin 1350 -Vref_comp 350 -Vib_test 2001 diff --git a/settingsdir/gotthard/veryhighgain/calibration.sn b/settingsdir/gotthard/veryhighgain/calibration.sn deleted file mode 100644 index 66fd0867d..000000000 --- a/settingsdir/gotthard/veryhighgain/calibration.sn +++ /dev/null @@ -1 +0,0 @@ -227 5.6 \ No newline at end of file diff --git a/settingsdir/gotthard/veryhighgain/settings.sn b/settingsdir/gotthard/veryhighgain/settings.sn deleted file mode 100644 index 12aef34b2..000000000 --- a/settingsdir/gotthard/veryhighgain/settings.sn +++ /dev/null @@ -1,8 +0,0 @@ -Vref 660 -VcascN 650 -VcascP 1480 -Vout 1520 -Vcasc 1320 -Vin 1350 -Vref_comp 350 -Vib_test 2001 diff --git a/settingsdir/jungfrau/dynamicgain/calibration.sn b/settingsdir/jungfrau/dynamicgain/calibration.sn deleted file mode 100755 index e5a59be31..000000000 --- a/settingsdir/jungfrau/dynamicgain/calibration.sn +++ /dev/null @@ -1 +0,0 @@ -227 5.6 diff --git a/settingsdir/jungfrau/dynamicgain/settings.sn b/settingsdir/jungfrau/dynamicgain/settings.sn deleted file mode 100755 index b179a3c52..000000000 --- a/settingsdir/jungfrau/dynamicgain/settings.sn +++ /dev/null @@ -1,8 +0,0 @@ -VDAC0 1220 -VDAC1 3000 -VDAC2 1053 -VDAC3 1450 -VDAC4 750 -VDAC5 1000 -VDAC6 480 -VDAC7 420 diff --git a/settingsdir/jungfrau/dynamichg0 b/settingsdir/jungfrau/dynamichg0 deleted file mode 120000 index 4eb508c5a..000000000 --- a/settingsdir/jungfrau/dynamichg0 +++ /dev/null @@ -1 +0,0 @@ -dynamicgain \ No newline at end of file diff --git a/settingsdir/jungfrau/fixgain1 b/settingsdir/jungfrau/fixgain1 deleted file mode 120000 index 4eb508c5a..000000000 --- a/settingsdir/jungfrau/fixgain1 +++ /dev/null @@ -1 +0,0 @@ -dynamicgain \ No newline at end of file diff --git a/settingsdir/jungfrau/fixgain2 b/settingsdir/jungfrau/fixgain2 deleted file mode 120000 index 4eb508c5a..000000000 --- a/settingsdir/jungfrau/fixgain2 +++ /dev/null @@ -1 +0,0 @@ -dynamicgain \ No newline at end of file diff --git a/settingsdir/jungfrau/forceswitchg1 b/settingsdir/jungfrau/forceswitchg1 deleted file mode 120000 index 4eb508c5a..000000000 --- a/settingsdir/jungfrau/forceswitchg1 +++ /dev/null @@ -1 +0,0 @@ -dynamicgain \ No newline at end of file diff --git a/settingsdir/jungfrau/forceswitchg2 b/settingsdir/jungfrau/forceswitchg2 deleted file mode 120000 index 4eb508c5a..000000000 --- a/settingsdir/jungfrau/forceswitchg2 +++ /dev/null @@ -1 +0,0 @@ -dynamicgain \ No newline at end of file diff --git a/settingsdir/moench/dynamicgain/calibration.sn b/settingsdir/moench/dynamicgain/calibration.sn deleted file mode 100755 index e5a59be31..000000000 --- a/settingsdir/moench/dynamicgain/calibration.sn +++ /dev/null @@ -1 +0,0 @@ -227 5.6 diff --git a/settingsdir/moench/dynamicgain/settings.sn b/settingsdir/moench/dynamicgain/settings.sn deleted file mode 100755 index c9e071c7c..000000000 --- a/settingsdir/moench/dynamicgain/settings.sn +++ /dev/null @@ -1,8 +0,0 @@ -VDAC0 660 -VDAC1 650 -VDAC2 1480 -VDAC3 1520 -VDAC4 1320 -VDAC5 1350 -VDAC6 887 -VDAC7 2001 diff --git a/settingsdir/moench/highgain/calibration.sn b/settingsdir/moench/highgain/calibration.sn deleted file mode 100644 index e5a59be31..000000000 --- a/settingsdir/moench/highgain/calibration.sn +++ /dev/null @@ -1 +0,0 @@ -227 5.6 diff --git a/settingsdir/moench/highgain/settings.sn b/settingsdir/moench/highgain/settings.sn deleted file mode 100644 index c9e071c7c..000000000 --- a/settingsdir/moench/highgain/settings.sn +++ /dev/null @@ -1,8 +0,0 @@ -VDAC0 660 -VDAC1 650 -VDAC2 1480 -VDAC3 1520 -VDAC4 1320 -VDAC5 1350 -VDAC6 887 -VDAC7 2001 diff --git a/settingsdir/moench/lowgain/calibration.sn b/settingsdir/moench/lowgain/calibration.sn deleted file mode 100644 index e5a59be31..000000000 --- a/settingsdir/moench/lowgain/calibration.sn +++ /dev/null @@ -1 +0,0 @@ -227 5.6 diff --git a/settingsdir/moench/lowgain/settings.sn b/settingsdir/moench/lowgain/settings.sn deleted file mode 100644 index c9e071c7c..000000000 --- a/settingsdir/moench/lowgain/settings.sn +++ /dev/null @@ -1,8 +0,0 @@ -VDAC0 660 -VDAC1 650 -VDAC2 1480 -VDAC3 1520 -VDAC4 1320 -VDAC5 1350 -VDAC6 887 -VDAC7 2001 diff --git a/settingsdir/moench/mediumgain/calibration.sn b/settingsdir/moench/mediumgain/calibration.sn deleted file mode 100644 index e5a59be31..000000000 --- a/settingsdir/moench/mediumgain/calibration.sn +++ /dev/null @@ -1 +0,0 @@ -227 5.6 diff --git a/settingsdir/moench/mediumgain/settings.sn b/settingsdir/moench/mediumgain/settings.sn deleted file mode 100644 index c9e071c7c..000000000 --- a/settingsdir/moench/mediumgain/settings.sn +++ /dev/null @@ -1,8 +0,0 @@ -VDAC0 660 -VDAC1 650 -VDAC2 1480 -VDAC3 1520 -VDAC4 1320 -VDAC5 1350 -VDAC6 887 -VDAC7 2001 diff --git a/settingsdir/moench/veryhighgain/calibration.sn b/settingsdir/moench/veryhighgain/calibration.sn deleted file mode 100644 index 66fd0867d..000000000 --- a/settingsdir/moench/veryhighgain/calibration.sn +++ /dev/null @@ -1 +0,0 @@ -227 5.6 \ No newline at end of file diff --git a/settingsdir/moench/veryhighgain/settings.sn b/settingsdir/moench/veryhighgain/settings.sn deleted file mode 100644 index c9e071c7c..000000000 --- a/settingsdir/moench/veryhighgain/settings.sn +++ /dev/null @@ -1,8 +0,0 @@ -VDAC0 660 -VDAC1 650 -VDAC2 1480 -VDAC3 1520 -VDAC4 1320 -VDAC5 1350 -VDAC6 887 -VDAC7 2001 diff --git a/settingsdir/propix/dynamicgain/calibration.sn b/settingsdir/propix/dynamicgain/calibration.sn deleted file mode 100755 index e5a59be31..000000000 --- a/settingsdir/propix/dynamicgain/calibration.sn +++ /dev/null @@ -1 +0,0 @@ -227 5.6 diff --git a/settingsdir/propix/dynamicgain/settings.sn b/settingsdir/propix/dynamicgain/settings.sn deleted file mode 100755 index 324a9774c..000000000 --- a/settingsdir/propix/dynamicgain/settings.sn +++ /dev/null @@ -1,8 +0,0 @@ -Vref 660 -VcascN 650 -VcascP 1480 -Vout 1520 -Vcasc 1320 -Vin 1350 -Vref_comp 887 -Vib_test 2001 diff --git a/settingsdir/propix/highgain/calibration.sn b/settingsdir/propix/highgain/calibration.sn deleted file mode 100644 index e5a59be31..000000000 --- a/settingsdir/propix/highgain/calibration.sn +++ /dev/null @@ -1 +0,0 @@ -227 5.6 diff --git a/settingsdir/propix/highgain/settings.sn b/settingsdir/propix/highgain/settings.sn deleted file mode 100644 index 324a9774c..000000000 --- a/settingsdir/propix/highgain/settings.sn +++ /dev/null @@ -1,8 +0,0 @@ -Vref 660 -VcascN 650 -VcascP 1480 -Vout 1520 -Vcasc 1320 -Vin 1350 -Vref_comp 887 -Vib_test 2001 diff --git a/settingsdir/propix/lowgain/calibration.sn b/settingsdir/propix/lowgain/calibration.sn deleted file mode 100644 index e5a59be31..000000000 --- a/settingsdir/propix/lowgain/calibration.sn +++ /dev/null @@ -1 +0,0 @@ -227 5.6 diff --git a/settingsdir/propix/lowgain/settings.sn b/settingsdir/propix/lowgain/settings.sn deleted file mode 100644 index 324a9774c..000000000 --- a/settingsdir/propix/lowgain/settings.sn +++ /dev/null @@ -1,8 +0,0 @@ -Vref 660 -VcascN 650 -VcascP 1480 -Vout 1520 -Vcasc 1320 -Vin 1350 -Vref_comp 887 -Vib_test 2001 diff --git a/settingsdir/propix/mediumgain/calibration.sn b/settingsdir/propix/mediumgain/calibration.sn deleted file mode 100644 index e5a59be31..000000000 --- a/settingsdir/propix/mediumgain/calibration.sn +++ /dev/null @@ -1 +0,0 @@ -227 5.6 diff --git a/settingsdir/propix/mediumgain/settings.sn b/settingsdir/propix/mediumgain/settings.sn deleted file mode 100644 index 324a9774c..000000000 --- a/settingsdir/propix/mediumgain/settings.sn +++ /dev/null @@ -1,8 +0,0 @@ -Vref 660 -VcascN 650 -VcascP 1480 -Vout 1520 -Vcasc 1320 -Vin 1350 -Vref_comp 887 -Vib_test 2001 diff --git a/settingsdir/propix/veryhighgain/calibration.sn b/settingsdir/propix/veryhighgain/calibration.sn deleted file mode 100644 index 66fd0867d..000000000 --- a/settingsdir/propix/veryhighgain/calibration.sn +++ /dev/null @@ -1 +0,0 @@ -227 5.6 \ No newline at end of file diff --git a/settingsdir/propix/veryhighgain/settings.sn b/settingsdir/propix/veryhighgain/settings.sn deleted file mode 100644 index 324a9774c..000000000 --- a/settingsdir/propix/veryhighgain/settings.sn +++ /dev/null @@ -1,8 +0,0 @@ -Vref 660 -VcascN 650 -VcascP 1480 -Vout 1520 -Vcasc 1320 -Vin 1350 -Vref_comp 887 -Vib_test 2001