From: hadaq Date: Fri, 20 Dec 2024 09:48:09 +0000 (+0100) Subject: update various configuration files and control tools X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=7dcedb17bbe67843aaae2133a2e4422c3797c28a;p=hadesdaq.git update various configuration files and control tools --- diff --git a/hub/addresses_hub_mdcupgrade.db b/hub/addresses_hub_mdcupgrade.db index 788219d..bbef2c3 100644 --- a/hub/addresses_hub_mdcupgrade.db +++ b/hub/addresses_hub_mdcupgrade.db @@ -1,67 +1,69 @@ #Address # S/N # FPGA # ################################################### #Hub master boards -0x8500 556 1 -0x8510 563 1 -0x8520 555 1 +0x8500 548 1 +0x8510 565 1 +0x8520 546 1 0x8530 554 1 -0x8540 546 1 -0x8550 550 1 -0x8560 535 1 -0x8570 551 1 -0x8580 567 1 -0x8590 502 1 -0x85a0 506 1 -0x85b0 562 1 +0x8540 563 1 +0x8550 555 1 +0x8560 5 1 +0x8570 5 1 +0x8580 5 1 +0x8590 5 1 +0x85a0 5 1 +0x85b0 5 1 + #Hub boards -0x8501 524 1 -0x8502 501 1 -0x8503 528 1 +0x8502 512 1 +0x8504 531 1 +0x8501 538 1 +0x8503 526 1 -0x8511 520 1 -0x8512 508 1 -0x8513 512 1 -0x8514 543 1 +0x8511 508 1 +0x8512 509 1 +0x8513 537 1 -0x8521 510 1 -0x8522 522 1 -0x8523 521 1 +0x8521 523 1 +0x8522 517 1 +0x8523 540 1 -0x8531 507 1 -0x8532 538 1 -0x8533 530 1 +0x8531 536 1 +0x8532 543 1 +0x8533 507 1 -0x8541 537 1 -0x8542 531 1 -0x8543 519 1 -0x8544 536 1 +0x8541 533 1 +0x8542 519 1 +0x8543 530 1 -0x8551 532 1 -0x8552 533 1 +0x8551 539 1 +0x8552 520 1 0x8553 534 1 +0x8554 521 1 + -0x8561 518 1 -0x8562 513 1 -0x8563 500 1 +0x8561 5 1 +0x8562 5 1 +0x8563 5 1 -0x8571 561 1 -0x8572 566 1 -0x8573 559 1 +0x8571 5 1 +0x8572 5 1 +0x8573 5 1 -0x8581 517 1 -0x8582 516 1 -0x8583 557 1 +0x8581 5 1 +0x8582 5 1 +0x8583 5 1 -0x8591 515 1 -0x8592 527 1 -0x8593 503 1 +0x8591 5 1 +0x8592 5 1 +0x8593 5 1 -0x85a1 523 1 -0x85a2 526 1 -0x85a3 509 1 +0x85a1 5 1 +0x85a2 5 1 +0x85a3 5 1 -0x85b1 525 1 -0x85b2 504 1 -0x85b3 529 1 +0x85b1 5 1 +0x85b2 5 1 +0x85b3 5 1 diff --git a/hub/register_configgbe_2019.db b/hub/register_configgbe_2019.db index 4e56c4e..f4694f2 100644 --- a/hub/register_configgbe_2019.db +++ b/hub/register_configgbe_2019.db @@ -94,16 +94,31 @@ # 0x8d00 1 0x8d00 1 1 - 0x1000 1 0x1000 1 0 - 0x1010 1 0x1010 1 0 - 0x1020 1 0x1020 1 0 - 0x1030 1 0x1030 1 0 - 0x1040 1 0x1040 1 0 - 0x1050 1 0x1050 1 0 +# 0x1000 1 0x1000 1 0 +# 0x1010 1 0x1010 1 0 +# 0x1020 1 0x1020 1 0 +# 0x1030 1 0x1030 1 0 +# 0x1040 1 0x1040 1 0 +# 0x1050 1 0x1050 1 0 0x1100 1 0x1100 1 0 0x1110 1 0x1110 1 0 0x1120 1 0x1120 1 0 0x1130 1 0x1130 1 0 0x1140 1 0x1140 1 0 0x1150 1 0x1150 1 0 - 0x1160 1 0x1160 1 0 +# 0x1160 1 0x1160 1 0 + + + + 0x8500 1 0x8500 1 1 + 0x8510 1 0x8510 1 1 + 0x8520 1 0x8520 1 1 + 0x8530 1 0x8530 1 1 + 0x8540 1 0x8540 1 1 + 0x8550 1 0x8550 1 1 + 0x8560 1 0x8560 1 1 + 0x8570 1 0x8570 1 1 + 0x8580 1 0x8580 1 1 + 0x8590 1 0x8590 1 1 + 0x85a0 1 0x85a0 1 1 + 0x85b0 1 0x85b0 1 1 diff --git a/hub/startup.script b/hub/startup.script index 98a6c4a..bbd0ef6 100644 --- a/hub/startup.script +++ b/hub/startup.script @@ -2,7 +2,9 @@ exec_cmd{local} ~/trbsoft/daq/main/merge_serial_address.pl ~/trbsoft/daq/hub/serials_trb3.db ~/trbsoft/daq/hub/addresses_hub_trb3.db #addresses for hubs exec_cmd{local} ~/trbsoft/daq/main/merge_serial_address.pl ~/trbsoft/daq/hub/serials_trb3sc.db ~/trbsoft/daq/hub/addresses_hub_trb3sc.db #addresses for hubs +exec_cmd{local} ~/trbsoft/daq/main/merge_serial_address.pl ~/trbsoft/daq/hub/serials_trb3sc.db ~/trbsoft/daq/hub/addresses_hub_mdcupgrade.db #addresses for hubs exec_cmd{local} ~/trbsoft/daq/main/merge_serial_address.pl ~/trbsoft/daq/hub/serials_mdcaddon.db ~/trbsoft/daq/hub/addresses_mdcaddon.db #addresses for addons +exec_cmd{local} cd ~/trbsoft/hades_mdc_settings/scripts; ./load_mdc_addresses.sh wait trbcmd w 0xfffe 0xc5 0x4000 @@ -90,8 +92,9 @@ trbcmd clearbit 0x8000 0xc1 0x200 #Load hub level setting for time-out for each hub in the system trbcmd loadbit 0xfe52 0xc5 0xffff0000 0x80080000 #Combiner + trbcmd loadbit 0xfe90 0xc5 0xffff0000 0x800c0000 #MDC OEP - trbcmd loadbit 0xfe61 0xc5 0xffff0000 0x00080000 #Ecal bkpl master + trbcmd loadbit 0xfe61 0xc5 0xffff0000 0x80040000 #bkpl master # trbcmd loadbit 0x8b00 0xc5 0xffff0000 0x00080000 #STS1 # trbcmd loadbit 0x8b01 0xc5 0xffff0000 0x00080000 @@ -111,17 +114,20 @@ trbcmd clearbit 0x8000 0xc1 0x200 trbcmd loadbit 0x86c4 0xc5 0xffff0000 0x00080000 trbcmd loadbit 0x86c5 0xc5 0xffff0000 0x00080000 - trbcmd loadbit 0x84c0 0xc5 0xffff0000 0x00080000 #RPC - trbcmd loadbit 0x84c1 0xc5 0xffff0000 0x00080000 - trbcmd loadbit 0x84c2 0xc5 0xffff0000 0x00080000 - trbcmd loadbit 0x84c3 0xc5 0xffff0000 0x00080000 - trbcmd loadbit 0x84c4 0xc5 0xffff0000 0x00080000 - trbcmd loadbit 0x84c5 0xc5 0xffff0000 0x00080000 +# trbcmd loadbit 0x84c0 0xc5 0xffff0000 0x00080000 #RPC +# trbcmd loadbit 0x84c1 0xc5 0xffff0000 0x00080000 +# trbcmd loadbit 0x84c2 0xc5 0xffff0000 0x00080000 +# trbcmd loadbit 0x84c3 0xc5 0xffff0000 0x00080000 +# trbcmd loadbit 0x84c4 0xc5 0xffff0000 0x00080000 +# trbcmd loadbit 0x84c5 0xc5 0xffff0000 0x00080000 + trbcmd loadbit 0xfe11 0xc5 0xffff0000 0x80300000 #with new hub (with auto-switch-off) trbcmd loadbit 0xfe15 0xc5 0xffff0000 0x00080000 #MDC hubs trbcmd loadbit 0xfe66 0xc5 0xffff0000 0x00040000 #trb3sc gbe nobkpl RICH + + trbcmd loadbit 0xfe65 0xc5 0xffff0000 0x800a0000 #trb3sc nogbe bkpl (central and MDC) trbcmd loadbit 0x8800 0xc5 0xffff0000 0x00020000 trbcmd loadbit 0x8011 0xc5 0xffff0000 0x00020000 diff --git a/main/address_range.db b/main/address_range.db index 4bdbeab..7618d55 100644 --- a/main/address_range.db +++ b/main/address_range.db @@ -19,6 +19,7 @@ Central-Hub 0x8000 0x80FF TRB3sc Rich-Comb 0x8200 0x82ff DiRichConcentrator Rich-Hub 0x83c0 0x83df TRB3sc RPC-Hub 0x8400 0x84FF TRB3sc +MDCnew-Hub 0x8500 0x85FF TRB3sc TOF-Hub 0x8600 0x86FF TRB3 Wall-Hub 0x8700 0x87FF TRB3 CTS-Hub 0x8800 0x887F TRB3sc @@ -31,7 +32,8 @@ fRPC-Hub 0x8c00 0x8cff TRB3 iTOF-Hub 0x8d00 0x8dff TRB3sc TestSetup 0xF000 0xFEFF Test Broadcast 0xFF00 0xFFFF Broadcast - +MDCnew-OEP 0x8e00 0x8fff MdcOep +MDCnew-TDC 0xa000 0xb000 MdcTdc #Hub-All 0x8000 0x8FFF Hub2 #Hub-AllTrb3 0x8000 0x8FFF Hub-TRB3sc #RICH-ADCM 0x3000 0x31FF RICH-ADCM diff --git a/main/main_hades.script b/main/main_hades.script index 27244ab..e58eaad 100644 --- a/main/main_hades.script +++ b/main/main_hades.script @@ -88,8 +88,8 @@ wait exec_cmd{con} echo "Configure Start" exec_script{local} ../start/startup.script - exec_cmd{con} echo "Configure iTOF" - exec_script{local} ../itof/startup.script +# exec_cmd{con} echo "Configure iTOF" +# exec_script{local} ../itof/startup.script exec_cmd{con} echo "Configure Trigger" exec_script{local} ../trg/startup.script diff --git a/main/startup.pl b/main/startup.pl index 91346d6..42102e0 100755 --- a/main/startup.pl +++ b/main/startup.pl @@ -1415,7 +1415,8 @@ sub checkCompileTime() { } } print "Please reboot OEP!\n" if ($oldCompileTime); - &askUser() if ($oldCompileTime); +# &askUser() if ($oldCompileTime); + &promptUser("Close window, reboot OEP, try again.") if ($oldCompileTime); } sub askUser() { diff --git a/main/subevtids.db b/main/subevtids.db index fb0c76c..9171878 100644 --- a/main/subevtids.db +++ b/main/subevtids.db @@ -70,3 +70,15 @@ 0x8c00 #FRPC-0 0x8c10 #FRPC-1 0x8d00 #ITOF +0x8500 #MDCnew0 +0x8510 #MDCnew1 +0x8520 #MDCnew2 +0x8530 #MDCnew3 +0x8540 #MDCnew4 +0x8550 #MDCnew5 +0x8560 #MDCnew6 +0x8570 #MDCnew7 +0x8580 #MDCnew8 +0x8590 #MDCnew9 +0x85a0 #MDCnewA +0x85b0 #MDCnewB diff --git a/mdc/addresses_oep.db b/mdc/addresses_oep.db index b4857cb..732e7b6 100644 --- a/mdc/addresses_oep.db +++ b/mdc/addresses_oep.db @@ -501,7 +501,7 @@ 0x234a 283 1 12 0 0x234b 474 1 12 0 #AT (29.06.11) exchange OEPB 279->092 // 14.02.12 092->474 0x234c 488 1 12 0 ## 30.8.2018 OEP switch with 0x2154 due to many faults there, (old #197 now at 0x2154) -0x234d 155 1 12 0 ## 12.2.2024 oep swith from 092 to 155 ; 11.1.2019 OEP exchange, old 189 +0x234d 019 1 12 0 ## 6.3.2024 019 new because 155 (failing during beamtime fe24 for 2 Days) 12.2.2024 oep swith from 092 to 155 ; 11.1.2019 OEP exchange, old 189 0x234e 133 1 12 0 ## 11.1.2019 OEP exchange, old 190 0x234f 232 1 12 0 ## 11.1.2019 OEP exchange, old 191 ################################################### diff --git a/mdc/serials_oep.db b/mdc/serials_oep.db index 54e6c6d..892fe2b 100644 --- a/mdc/serials_oep.db +++ b/mdc/serials_oep.db @@ -2,8 +2,11 @@ # s/n # unique id ########################### +0071 0xc9000001fc641d28 +0091 0xb9000001fc62a828 0131 0x4f000001fc5ef428 0171 0xa5000001fc634328 +0191 0x8a000001fc639628 0211 0x62000001fc57e328 0221 0x5e000001fc535c28 0231 0x59000001fc488628 @@ -382,7 +385,8 @@ 4191 0x41000001fc6a6b28 4201 0x81000001fc6b8428 #4211 0x4d000001fc61e228 # disabled? JAM -4221 0x47000001fc629628 +4211 0xbf000001fc629d28 #new CW +4221 0x47000001fc629628 4231 0xac000001fc629328 4251 0x72000001fc6b5528 4241 0xd3000001fc628c28 diff --git a/nettools/Perl2Epics.pm b/nettools/Perl2Epics.pm index 88cc504..75fc394 100644 --- a/nettools/Perl2Epics.pm +++ b/nettools/Perl2Epics.pm @@ -34,8 +34,12 @@ CA->import; # $ENV{EPICS_CA_AUTO_ADDR_LIST} = 'YES'; $ENV{EPICS_CA_AUTO_ADDR_LIST} = 'NO'; +#$ENV{EPICS_TS_MIN_WEST} = '-120' #Germany + +$ENV{EPICS_CA_CONN_TMO} = '60.0'; #JoF: Does not seem to do anything + #JoF2022: updated during beamtime -$ENV{EPICS_CA_ADDR_LIST} = "cryo1.hades.gsi.de lxhadesmcs01p frpcpid1 lxhaddcs10p lxhaddcs11 lxhaddcs12p lxhaddcs13p gas.hades.gsi.de richhvcrate"; +$ENV{EPICS_CA_ADDR_LIST} = "cryo1.hades.gsi.de magctrl frpcpid1 lxhaddcs10p lxhaddcs11p lxhaddcs12p lxhaddcs13p gas.hades.gsi.de richhvcrate"; # $ENV{EPICS_CA_ADDR_LIST} = "192.168.111.255"; lxhadeb07p lxhaddcs05p lxhaddcs06p #$ENV{EPICS_CA_ADDR_LIST} = "192.168.103.182 192.168.100.235 192.168.100.236 192.168.97.10 192.168.97.11 192.168.97.14 192.168.97.15 192.168.100.17 192.168.97.4 192.168.100.216"; diff --git a/nettools/missingipfix.pl b/nettools/missingipfix.pl index e6d1ae2..6795da1 100755 --- a/nettools/missingipfix.pl +++ b/nettools/missingipfix.pl @@ -14,18 +14,24 @@ use List::Util qw[min max sum]; trb_init_ports() or die trb_strerror(); - +my $errorfound = 0; my $o = trb_register_read_mem(0xff7f,0x83c0,0,4); foreach my $b (keys %$o) { next if $b < 0x2000; + next if $b >= 0xf000; next if $b == 0x8800; next if $o->{$b}[0] != 0; next if $o->{$b}[3] != 0; + $errorfound = -1; my $str = sprintf("%04x",$b); print "Without IP: $str. Rebooting.\n"; system("trbcmd reload 0x$str"); } -print "\n If some errors or boards are listed above: Restart DAQ. \n If not: continue \n\n"; + +if($errorfound == 0) {print "Everything seems fine. Continue!\n";} +if($errorfound == -1) {print "ERROR: Problem found. Restart DAQ!\n";} + +exit $errorfound; diff --git a/nettools/switchport.pl b/nettools/switchport.pl index 644b8f9..928044a 100755 --- a/nettools/switchport.pl +++ b/nettools/switchport.pl @@ -24,8 +24,9 @@ else { sub ex { my ($cmd) = @_; my $err = 0; - $cmd .= " 2>&1"; + $cmd = "timeout 1s " . $cmd . " 2>&1"; my @out = qx($cmd); + if($?) {$err = 1;} foreach my $s (@out) { print "$s"; if($s =~ /ERROR/) { diff --git a/rpc/startup.script b/rpc/startup.script index d3b3575..9642463 100644 --- a/rpc/startup.script +++ b/rpc/startup.script @@ -6,5 +6,5 @@ trbcmd w 0xfe73 0x7114 0x00050000 #min number of words per board load_register register_tdc_rpc.db #Load Thresholds -exec_cmd{local} /home/hadaq/trbsoft/daq/rpc/trb3sc/thresholds/resetThresholdAllJan.sh +exec_cmd{local} /home/hadaq/trbsoft/daq/rpc/trb3sc/thresholds/setThresholdAllJan.sh exec_cmd{local} /home/hadaq/trbsoft/daq/rpc/setAllMultBoard.sh diff --git a/utils/ECAL_LV5_Powercycle.sh b/utils/ECAL_LV5_Powercycle.sh index 8c13958..35e56e7 100755 --- a/utils/ECAL_LV5_Powercycle.sh +++ b/utils/ECAL_LV5_Powercycle.sh @@ -3,7 +3,7 @@ echo 'Sending power cycle request' #echo 'OUTPUT:GENERAL OFF' | ssh odroid6 'cat > /dev/HAMEG_HAMEG_HO720_100030805647' /home/hadaq/trbsoft/daq/utils/HMP_Powersupply.pl 'IP192.168.103.201&HMP&5025&OUTPUT:GENERAL OFF' -/home/hadaq/trbsoft/daq/utils/HMP_Powersupply.pl 'IP192.168.103.186&HMP&5025&OUTPUT:GENERAL OFF' +/home/hadaq/trbsoft/daq/utils/HMP_Powersupply.pl 'IP192.168.103.185&HMP&5025&OUTPUT:GENERAL OFF' /home/hadaq/trbsoft/daq/utils/HMP_Powersupply.pl 'IP192.168.103.189&HMP&5025&OUTPUT:GENERAL OFF' sleep 3 @@ -11,7 +11,7 @@ echo 'switching on...' #echo 'OUTPUT:GENERAL ON' | ssh odroid6 'cat > /dev/HAMEG_HAMEG_HO720_100030805647' /home/hadaq/trbsoft/daq/utils/HMP_Powersupply.pl 'IP192.168.103.201&HMP&5025&OUTPUT:GENERAL ON' -/home/hadaq/trbsoft/daq/utils/HMP_Powersupply.pl 'IP192.168.103.186&HMP&5025&OUTPUT:GENERAL ON' +/home/hadaq/trbsoft/daq/utils/HMP_Powersupply.pl 'IP192.168.103.185&HMP&5025&OUTPUT:GENERAL ON' /home/hadaq/trbsoft/daq/utils/HMP_Powersupply.pl 'IP192.168.103.189&HMP&5025&OUTPUT:GENERAL ON' echo "Done" sleep 5 diff --git a/utils/HUB_Powercycle.pl b/utils/HUB_Powercycle.pl index 007581a..9a641d9 100755 --- a/utils/HUB_Powercycle.pl +++ b/utils/HUB_Powercycle.pl @@ -19,8 +19,8 @@ print "Connected\n"; Perl2Epics::Put("RICHLV_PowerOnOff",1); Perl2Epics::Update(0.2); -print "turned off. Wait 8 seconds\n"; -sleep 8; +print "turned off. Wait 2 seconds\n"; +sleep 2; Perl2Epics::Put("RICHLV_PowerOnOff",0); Perl2Epics::Update(0.2); print "turned on. You can continue!\n"; diff --git a/utils/Powercycle_CTS.sh b/utils/Powercycle_CTS.sh index c0fb75f..da5e021 100755 --- a/utils/Powercycle_CTS.sh +++ b/utils/Powercycle_CTS.sh @@ -6,5 +6,5 @@ echo 'Sending power cycle request for CTS' sleep 3 /home/hadaq/trbsoft/daq/utils/HMP_Powersupply.pl 'IP192.168.103.183&HMP&5025&INST OUT3&OUTP:SEL ON' - -sleep 5 +echo "Done. Now wait 1 minute and do a Reprogram FPGA!" +sleep 10 diff --git a/utils/Powercycle_Start.sh b/utils/Powercycle_Start.sh index 512babb..1f2784b 100755 --- a/utils/Powercycle_Start.sh +++ b/utils/Powercycle_Start.sh @@ -8,7 +8,7 @@ sleep 3 /home/hadaq/trbsoft/daq/utils/HMP_Powersupply.pl 'IP192.168.103.188&HMP&5025&INST OUT4&OUTP:SEL ON' /home/hadaq/trbsoft/daq/utils/HMP_Powersupply.pl 'IP192.168.103.83&HMP&5025&INST OUT3&OUTP:SEL ON' - +echo "Done" # # echo -n 'current status: ' # echo 'OUTPUT:GENERAL ?' | ssh odroid5 'cat > /dev/HAMEG_HAMEG_HO720_100030505473; timeout 1 cat /dev/HAMEG_HAMEG_HO720_100030505473' diff --git a/utils/doyoureallywant.pl b/utils/doyoureallywant.pl index 2368632..c9f260f 100755 --- a/utils/doyoureallywant.pl +++ b/utils/doyoureallywant.pl @@ -10,6 +10,10 @@ my $text; $text="You really want to $ARGV[0]?"; +if ($#ARGV >= 1) { + $text .= "\n\n$ARGV[1]"; +} + #my $cmd = "kdialog --yesno \"$text\" --title \"Restart/Stop DAQ\""; #my $cmd = "gdialog --yesno \"$text\" --title \"Restart/Stop DAQ\""; #my $cmd = "Xdialog --title \"Restart/Stop DAQ\" --yesno \"$text\" 10 100";