From: Jan Michel Date: Fri, 8 Jun 2018 18:03:30 +0000 (+0200) Subject: update some configuration scripts X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=1b7bd52defe209c4796af13da597313c5d798176;p=hadesdaq.git update some configuration scripts --- diff --git a/ecal/startup.script b/ecal/startup.script index 96878be..ee674eb 100644 --- a/ecal/startup.script +++ b/ecal/startup.script @@ -6,11 +6,11 @@ #? - trbcmd w 0xfe71 0xc800 0x00000000 - trbcmd w 0xfe71 0xc800 0x50003000 + # trbcmd w 0xfe71 0xc800 0x00000000 + # trbcmd w 0xfe71 0xc800 0x50003000 - trbcmd w 0xfe71 0xc804 0x00000000 - trbcmd w 0xfe71 0xc804 0x00000078 + # trbcmd w 0xfe71 0xc804 0x00000000 + # trbcmd w 0xfe71 0xc804 0x00000078 #prepare PaDiWa-AMPS2 diff --git a/hub/startup.script b/hub/startup.script index 6ed043f..6638abf 100644 --- a/hub/startup.script +++ b/hub/startup.script @@ -48,7 +48,7 @@ wait #Load hub level setting for time-out for each hub in the system - trbcmd loadbit 0xfe52 0xc5 0xffff0000 0x00080000 #Combiner + trbcmd loadbit 0xfe52 0xc5 0xffff0000 0x80080000 #Combiner trbcmd loadbit 0xfe61 0xc5 0xffff0000 0x00080000 #Ecal bkpl master diff --git a/main/main_hades.script b/main/main_hades.script index 102b49f..06c1880 100644 --- a/main/main_hades.script +++ b/main/main_hades.script @@ -180,6 +180,7 @@ wait !endif exec_cmd{local} trbcmd w 0xffff 0x50 0 #Reset global time +exec_cmd{local} trbcmd w 0xffff 0x20 0x30 #Reset error counters #Oracle !ifndef NOORACLE diff --git a/main/startup_briccolage.sh b/main/startup_briccolage.sh index f58050d..8d4e172 100755 --- a/main/startup_briccolage.sh +++ b/main/startup_briccolage.sh @@ -36,7 +36,7 @@ notifyall.sh "DAQ" " DAQ is going to be restarted." "STARTUP" & trbcmd w 0x1031 0xc1 0xfbf #one hardware port is not working, but nothing connected trbcmd w 0x1031 0xc3 0xfbf #one hardware port is not working, but nothing connected - +switchport.pl 0x1113 6 off #221a 20180606 #2014-04-16 frquent reinits, still token missing 20114-08-13 CW #switchport.pl 0x1151 8 off #2257 #switchport.pl 0x1124 4 off #222a # noisy diff --git a/nettools/Perl2Epics.pm b/nettools/Perl2Epics.pm index 9b83613..7b91d47 100644 --- a/nettools/Perl2Epics.pm +++ b/nettools/Perl2Epics.pm @@ -168,7 +168,7 @@ sub Put { return -2; } - if (($c->element_count()) != 1) { + if (!$c || ($c->element_count()) != 1) { print "5\n"; return -3; } diff --git a/oracle/daq2oraclientstart.sh b/oracle/daq2oraclientstart.sh new file mode 100755 index 0000000..de70cb7 --- /dev/null +++ b/oracle/daq2oraclientstart.sh @@ -0,0 +1,12 @@ +#!/bin/bash +## start script for daq2ora +#JAM feb-2014 + +# need to specify oracle environment for remote icinga restart: +export ORACLE_HOME=/usr/lib/oracle/12.1/client64 +export PATH=$PATH:$ORACLE_HOME/bin +export LD_LIBRARY_PATH=$ORACLE_HOME/lib:$LD_LIBRARY_PATH +cd /home/hadaq/oper/daq2ora/ +/home/hadaq/trbsoft/daq/oracle/daq2ora_client.pl -d -o >/dev/null 2>&1 & +#/home/hadaq/trbsoft/daq/oracle/daq2ora_client.pl -d -o & +echo daq2ora demonized \ No newline at end of file diff --git a/oracle/postgres2orastart.sh b/oracle/postgres2orastart.sh new file mode 100755 index 0000000..0a2818f --- /dev/null +++ b/oracle/postgres2orastart.sh @@ -0,0 +1,10 @@ +#!/bin/bash +## start script for postgres2ora +#JAM 16-mar-2017 + +# need to specify oracle environment for remote icinga restart: +export ORACLE_HOME=/usr/lib/oracle/12.1/client64 +export PATH=$PATH:$ORACLE_HOME/bin +export LD_LIBRARY_PATH=$ORACLE_HOME/lib:$LD_LIBRARY_PATH +cd /home/hadaq/oper/postgres2ora/ +/home/hadaq/trbsoft/daq/oracle/postgres2ora.pl -opass hades -ppass yyyyyy -o >> postgres2ora.log 2>&1 diff --git a/rich/addresses_concentrator.db_20180525 b/rich/addresses_concentrator.db_20180525 index 0d4dc28..d5d7fe2 100644 --- a/rich/addresses_concentrator.db_20180525 +++ b/rich/addresses_concentrator.db_20180525 @@ -3,32 +3,32 @@ # serials are 3 digits, no trailing '0' -0x8204 1 0 0 1 +0x8204 068 0 0 1 0x8205 1 0 0 1 0x8206 076 0 0 1 0x8211 1 0 0 1 -0x8212 1 0 0 1 -0x8213 1 0 0 1 +0x8212 067 0 0 1 +0x8213 077 0 0 1 0x8214 080 0 0 1 0x8215 089 0 0 1 0x8216 087 0 0 1 0x8217 023 0 0 1 0x8218 1 0 0 1 -0x8221 1 0 0 1 -0x8222 1 0 0 1 -0x8223 1 0 0 1 +0x8221 053 0 0 1 +0x8222 099 0 0 1 +0x8223 066 0 0 1 0x8224 088 0 0 1 0x8225 084 0 0 1 0x8226 093 0 0 1 0x8227 090 0 0 1 0x8228 014 0 0 1 0x8229 092 0 0 1 -0x8231 1 0 0 1 +0x8231 052 0 0 1 0x8239 106 0 0 1 0x8240 1 0 0 1 -0x8241 1 0 0 1 -0x8242 1 0 0 1 -0x8243 1 0 0 1 +0x8241 074 0 0 1 +0x8242 096 0 0 1 +0x8243 071 0 0 1 0x8244 083 0 0 1 0x8245 061 0 0 1 0x8246 016 0 0 1 @@ -38,30 +38,30 @@ 0x824a 085 0 0 1 0x8250 1 0 0 1 0x8251 1 0 0 1 -0x8252 1 0 0 1 -0x8254 1 0 0 1 +0x8252 094 0 0 1 +0x8254 051 0 0 1 0x8256 102 0 0 1 0x8258 021 0 0 1 0x8259 091 0 0 1 0x825a 1 0 0 1 -0x8260 1 0 0 1 -0x8261 1 0 0 1 -0x8262 1 0 0 1 +0x8260 095 0 0 1 +0x8261 043 0 0 1 +0x8262 064 0 0 1 0x8263 069 0 0 1 0x8264 072 0 0 1 -0x8265 098 0 0 1 +0x8265 086 0 0 1 0x8266 109 0 0 1 0x8267 078 0 0 1 0x8268 012 0 0 1 0x8269 105 0 0 1 0x826a 011 0 0 1 -0x8271 1 0 0 1 +0x8271 065 0 0 1 0x8279 022 0 0 1 -0x8281 1 0 0 1 -0x8282 1 0 0 1 +0x8281 063 0 0 1 +0x8282 070 0 0 1 0x8283 073 0 0 1 0x8284 075 0 0 1 -0x8285 013 0 0 1 +0x8285 044 0 0 1 #was 13 0x8286 107 0 0 1 0x8287 019 0 0 1 0x8288 017 0 0 1 @@ -70,7 +70,7 @@ 0x8292 100 0 0 1 0x8293 098 0 0 1 0x8294 079 0 0 1 -0x8295 020 0 0 1 +0x8295 050 0 0 1 #was 20 0x8296 108 0 0 1 0x8297 025 0 0 1 0x8298 1 0 0 1 diff --git a/rich/startup.script b/rich/startup.script index 44f973d..7e55777 100644 --- a/rich/startup.script +++ b/rich/startup.script @@ -4,3 +4,6 @@ exec_cmd{local} /home/hadaq/trbsoft/hadesdaq/rich/merge_serial_address.pl /home/hadaq/trbsoft/hadesdaq/rich/serials_dirich.db /home/hadaq/trbsoft/hadesdaq/rich/addresses_dirich.db !endif +trbcmd loadbit 0xfe52 0xd580 0x6 0x2 #switch trigger input correctly + +load_register register_tdc_rich.db diff --git a/start/startup.script b/start/startup.script index 1479bd4..adf1bb2 100644 --- a/start/startup.script +++ b/start/startup.script @@ -9,7 +9,15 @@ !endif -#Switch off Veto TRB2 +#Switch off Trigger Generation Boards from trigger +trbcmd clearbit 0x8000 0xc0 1 #0x0100 +trbcmd clearbit 0x8000 0xc1 1 +trbcmd clearbit 0x8017 0xc0 0x40 #0x0110 +trbcmd clearbit 0x8017 0xc1 0x40 +#Trigger off on trigger generation boards +trbcmd clearbit 0x0100 0x22 0x8000000 +trbcmd clearbit 0x0110 0x22 0x8000000 + #TRB3 settings