From: hadaq Date: Thu, 17 Dec 2020 11:57:40 +0000 (+0100) Subject: update addresses files to new style, use daqtools to set addresses X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=1fe8ee864fb755aca446512b35ac665469cf90c9;p=hadesdaq.git update addresses files to new style, use daqtools to set addresses --- diff --git a/cts/startup.script b/cts/startup.script index 661fb34..66b8557 100644 --- a/cts/startup.script +++ b/cts/startup.script @@ -1,10 +1,5 @@ #Start-up CTS -#Assign addresses -!ifndef RESTART - set_addresses serials_cts.db addresses_cts.db #addresses for central boards -!endif - trbcmd clearbit 0x0003 0xa0c0 0x20000000 #set profile B to start trbcmd w 0x0003 0xA0E0 0xcccccccc diff --git a/ecal/addresses_ecal.db b/ecal/addresses_ecal.db index caea576..481be5a 100644 --- a/ecal/addresses_ecal.db +++ b/ecal/addresses_ecal.db @@ -8,42 +8,42 @@ 0x6005 0 1 0 0 0x6006 0 1 0 0 - 0x6010 1171 1 0 0 - 0x6011 1651 1 0 0 - 0x6012 1231 1 0 0 - 0x6013 1211 1 0 0 - 0x6014 1591 1 0 0 - 0x6015 1051 1 0 0 - 0x6016 1061 1 0 0 + 0x6010 117 1 0 0 + 0x6011 165 1 0 0 + 0x6012 123 1 0 0 + 0x6013 121 1 0 0 + 0x6014 159 1 0 0 + 0x6015 105 1 0 0 + 0x6016 106 1 0 0 - 0x6020 1181 1 0 0 - 0x6021 1091 1 0 0 - 0x6022 1081 1 0 0 - 0x6023 1541 1 0 0 - 0x6024 1111 1 0 0 - 0x6025 1101 1 0 0 - 0x6026 1401 1 0 0 + 0x6020 118 1 0 0 + 0x6021 109 1 0 0 + 0x6022 108 1 0 0 + 0x6023 154 1 0 0 + 0x6024 111 1 0 0 + 0x6025 110 1 0 0 + 0x6026 140 1 0 0 - 0x6030 3111 1 0 0 - 0x6031 3121 1 0 0 - 0x6032 3131 1 0 0 - 0x6033 3241 1 0 0 - 0x6034 3231 1 0 0 - 0x6035 3221 1 0 0 - 0x6036 3211 1 0 0 + 0x6030 311 1 0 0 + 0x6031 312 1 0 0 + 0x6032 313 1 0 0 + 0x6033 324 1 0 0 + 0x6034 323 1 0 0 + 0x6035 322 1 0 0 + 0x6036 321 1 0 0 - 0x6040 1161 1 0 0 - 0x6041 1151 1 0 0 - 0x6042 1201 1 0 0 - 0x6043 1251 1 0 0 - 0x6044 1131 1 0 0 - 0x6045 1331 1 0 0 - 0x6046 1241 1 0 0 + 0x6040 116 1 0 0 + 0x6041 115 1 0 0 + 0x6042 120 1 0 0 + 0x6043 125 1 0 0 + 0x6044 113 1 0 0 + 0x6045 133 1 0 0 + 0x6046 124 1 0 0 - 0x6050 1221 1 0 0 - 0x6051 3051 1 0 0 - 0x6052 1141 1 0 0 - 0x6053 1191 1 0 0 - 0x6054 1511 1 0 0 - 0x6055 1321 1 0 0 - 0x6056 1261 1 0 0 + 0x6050 122 1 0 0 + 0x6051 305 1 0 0 + 0x6052 114 1 0 0 + 0x6053 119 1 0 0 + 0x6054 151 1 0 0 + 0x6055 132 1 0 0 + 0x6056 126 1 0 0 diff --git a/ecal/startup.script b/ecal/startup.script index 19dde07..685cf45 100644 --- a/ecal/startup.script +++ b/ecal/startup.script @@ -1,8 +1,3 @@ -#Assign addresses -!ifndef RESTART - set_addresses serials_trb3sc.db addresses_ecal.db -!endif - #################### ## Broadcast fe71 affects iTOF and Start as well! diff --git a/hub/addresses_hub_trb3.db b/hub/addresses_hub_trb3.db index a232670..f80605d 100644 --- a/hub/addresses_hub_trb3.db +++ b/hub/addresses_hub_trb3.db @@ -1,33 +1,33 @@ #Address # S/N # FPGA # Design # TRB # ################################################### #StartTRB3 -#0x8880 0065 5 0 006 -#0x8890 1065 5 0 106 +#0x8880 006 5 0 006 +#0x8890 106 5 0 106 #Veto -0x8890 1275 5 0 127 +0x8890 127 5 0 127 #new STS2 - 0x8b10 0715 5 0 071 - 0x8b11 1555 5 0 155 - 0x8b12 1225 5 0 122 - 0x8b13 0315 5 0 031 - 0x8b14 1575 5 0 157 - 0x8b15 1545 5 0 154 + 0x8b10 071 5 0 071 + 0x8b11 155 5 0 155 + 0x8b12 122 5 0 122 + 0x8b13 031 5 0 031 + 0x8b14 157 5 0 157 + 0x8b15 154 5 0 154 #new STS1 - 0x8b00 1255 5 0 125 - 0x8b01 1085 5 0 108 - 0x8b02 0645 5 0 064 - 0x8b03 1185 5 0 118 + 0x8b00 125 5 0 125 + 0x8b01 108 5 0 108 + 0x8b02 064 5 0 064 + 0x8b03 118 5 0 118 #new TOF - 0x86c0 2415 5 0 0 - 0x86c1 0885 5 0 0 - 0x86c2 0065 5 0 0 - 0x86c3 2425 5 0 0 - 0x86c4 1135 5 0 0 - 0x86c5 0945 5 0 0 +0x86c0 241 5 0 0 +0x86c1 088 5 0 0 +0x86c2 006 5 0 0 +0x86c3 242 5 0 0 +0x86c4 113 5 0 0 +0x86c5 094 5 0 0 #fRPC - 0x8c00 2375 5 0 0 - 0x8c10 2445 5 0 0 + 0x8c00 237 5 0 0 + 0x8c10 244 5 0 0 diff --git a/hub/addresses_hub_trb3sc.db b/hub/addresses_hub_trb3sc.db index 127d2be..4dc53dd 100644 --- a/hub/addresses_hub_trb3sc.db +++ b/hub/addresses_hub_trb3sc.db @@ -1,50 +1,50 @@ #Address # S/N # FPGA # Design # TRB # ################################################### #Central -0x8000 1611 1 0 0 -0x8800 1421 1 0 0 -0x8012 1571 1 0 0 -0x8011 1471 1 0 0 -0x8013 1491 1 0 0 -0x8014 1481 1 0 0 -0x8015 1551 1 0 0 -0x8016 1601 1 0 0 -0x8017 1561 1 0 0 -0x8018 1461 1 0 0 +0x8000 161 1 0 0 +0x8800 142 1 0 0 +0x8012 157 1 0 0 +0x8011 147 1 0 0 +0x8013 149 1 0 0 +0x8014 148 1 0 0 +0x8015 155 1 0 0 +0x8016 160 1 0 0 +0x8017 156 1 0 0 +0x8018 146 1 0 0 #2nd central crate -0x8810 3101 1 0 0 +0x8810 310 1 0 0 #Ecal -0x8a00 1341 1 0 0 -0x8a01 0091 1 0 0 -0x8a02 1301 1 0 0 -0x8a03 1281 1 0 0 -0x8a04 1311 1 0 0 -0x8a05 1291 1 0 0 +0x8a00 134 1 0 0 +0x8a01 009 1 0 0 +0x8a02 130 1 0 0 +0x8a03 128 1 0 0 +0x8a04 131 1 0 0 +0x8a05 129 1 0 0 #Rich - 0x83c0 1581 1 0 0 - 0x83c1 1441 1 0 0 - 0x83c2 1391 1 0 0 - 0x83c3 1381 1 0 0 - 0x83c4 1621 1 0 0 - 0x83c5 1641 1 0 0 - 0x83c6 1661 1 0 0 - 0x83c7 1371 1 0 0 - 0x83c8 1631 1 0 0 - 0x83c9 1531 1 0 0 - 0x83ca 1361 1 0 0 - 0x83cb 1411 1 0 0 + 0x83c0 158 1 0 0 + 0x83c1 144 1 0 0 + 0x83c2 139 1 0 0 + 0x83c3 138 1 0 0 + 0x83c4 162 1 0 0 + 0x83c5 164 1 0 0 + 0x83c6 166 1 0 0 + 0x83c7 137 1 0 0 + 0x83c8 163 1 0 0 + 0x83c9 153 1 0 0 + 0x83ca 136 1 0 0 + 0x83cb 141 1 0 0 #new RPC - 0x84c0 3201 1 0 320 - 0x84c1 3151 1 0 315 - 0x84c2 3181 1 0 318 - 0x84c3 3161 1 0 316 - 0x84c4 3171 1 0 317 - 0x84c5 3191 1 0 319 + 0x84c0 320 1 0 320 + 0x84c1 315 1 0 315 + 0x84c2 318 1 0 318 + 0x84c3 316 1 0 316 + 0x84c4 317 1 0 317 + 0x84c5 319 1 0 319 #Start - 0x8880 4121 1 0 412 - 0x8d00 3071 1 0 307 + 0x8880 412 1 0 412 + 0x8d00 307 1 0 307 diff --git a/hub/addresses_hub.db b/hub/old/addresses_hub.db similarity index 100% rename from hub/addresses_hub.db rename to hub/old/addresses_hub.db diff --git a/hub/serials_hub.db b/hub/old/serials_hub.db similarity index 100% rename from hub/serials_hub.db rename to hub/old/serials_hub.db diff --git a/hub/startup.script b/hub/startup.script index b388dfa..9f727e5 100644 --- a/hub/startup.script +++ b/hub/startup.script @@ -1,12 +1,16 @@ -#Assign addresses -!ifndef RESTART - set_addresses serials_hub.db addresses_hub.db #addresses for old hubs - set_addresses serials_trb3.db addresses_hub_trb3.db #addresses for hubs - set_addresses serials_trb3sc.db addresses_hub_trb3sc.db #addresses for hubs - set_addresses serials_mdcaddon.db addresses_mdcaddon.db #addresses for addons -!endif -wait - +# #Assign addresses +# !ifndef RESTART +# set_addresses serials_hub.db addresses_hub.db #addresses for old hubs +# set_addresses serials_trb3.db addresses_hub_trb3.db #addresses for hubs +# set_addresses serials_trb3sc.db addresses_hub_trb3sc.db #addresses for hubs +# set_addresses serials_mdcaddon.db addresses_mdcaddon.db #addresses for addons +# !endif +# wait + + +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_mdcaddon.db ~/trbsoft/daq/hub/addresses_mdcaddon.db #addresses for addons #Switch off Trigger Generation Boards from trigger diff --git a/main/main_hades.script b/main/main_hades.script index 7a6db3a..9aca7cf 100644 --- a/main/main_hades.script +++ b/main/main_hades.script @@ -8,34 +8,11 @@ read_addrange_db ../main/address_range.db ################################################# #Load TRB database files ################################################# -!ifdef MDCTEST - read_trb_db ../mdc/trb.db -!endif !ifndef NOCTS read_trb_db ../cts/trb.db !endif -#!ifndef NORPC -# read_trb_db ../rpc/trb.db -#!endif - -!ifndef NOTOF - read_trb_db ../tof/trb.db -!endif - -!ifndef NOHUB - read_trb_db ../hub/trb.db -!endif - -#!ifndef NOWALL -# read_trb_db ../wall/trb.db -#!endif - -!ifndef NOSTARTCTS #Contains both Start and Veto TRBs! -# read_trb_db ../start/trb.db -!endif - ################################################# @@ -43,85 +20,46 @@ read_addrange_db ../main/address_range.db ################################################# !ifndef CONFIGONLY -# Program CTS,SCS,TOF FPGA -# exec_cmd{local} echo "Programming TRB-FPGA" -# exec_cmd{wall} jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/tof/fpga/20120305_tof.stapl -# exec_cmd{rpc} jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/rpc/fpga/20120323_rpc_a.stapl -# exec_cmd{tof} jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/tof/fpga/20120305_tof.stapl -# #exec_cmd{start} jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/tof/fpga/20120305_tof.stapl -# #exec_cmd{veto} jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/tof/fpga/20120305_tof.stapl -# wait # Program 1st AddOn FPGA exec_cmd{local} echo "Programming FPGA1" -# exec_cmd{hub} jam_trbv2 --addononly -aFP /home/hadaq/hub/hub2_fpga1_single_20140818.stp - #exec_cmd{hubcts} jam_trbv2 --addon -aFP /home/hadaq/hub/hub2_fpga1_full_20110517.stp exec_cmd{cts} jam_trbv2 --addononly -aFP /home/hadaq/cts/20140422_cts_fpga1_only_etrax_a.stp wait # Program 2nd AddOn FPGA exec_cmd{local} echo "Programming FPGA2" - -# exec_cmd{hub} jam_trbv2 --addononly -aFP /home/hadaq/hub/hub2_fpga2_single_20120221.stp # multievent test -# #exec_cmd{hub} jam_trbv2 --addononly -aFP /home/hadaq/hub/hub2_fpga2_single_20111121.stp # proper one -# #exec_cmd{hubcts} jam_trbv2 --addon -aFP /home/hadaq/hub/hub2_fpga2_full_20111121.stp #experimental exec_cmd{cts} jam_trbv2 --addononly -aFP /home/hadaq/cts/20140422_cts_fpga2_only_etrax_a.stp wait # Wait for links - exec_cmd{local} echo "---------Waiting 8 seconds for FPGAs to boot ----------------" - exec_cmd{local} sleep 8 - exec_cmd{local} echo "---------Programming finished. Starting Configuration----------" + exec_cmd{local} echo "---------Programming finished. Please restart DAQ----------------" + exec_cmd{local} sleep 10000 wait !endif -!ifndef NORESET - exec_cmd{local} echo "network reset" - exec_cmd{local} trbcmd reset - wait - exec_cmd{local} sleep 1 - wait -!endif - - ################################################# #Configuration via TrbNet ################################################# -#Hub boards - !ifndef NOHUB - wait - exec_cmd{con} echo "Configure Hubs" - exec_script{pexor} ../hub/startup.script - wait - !endif +exec_cmd{con} echo "Configure Hubs" +exec_script{pexor} ../hub/startup.script wait +exec_cmd{local} ./setaddresses.sh +wait + + + !ifndef MDCNOCOMPILETIME exec_cmd{nofork} check_compile_time oep 0x4c3b2466 !endif #Configuration on TRBs - exec_cmd{con} echo "Configuring TDC on TRBs & BLR" -# !ifndef NORPC -# exec_script{rpc} ../rpc/configure_rpc.script -# !endif - -# !ifndef NOWALL -# exec_script{wall} ../wall/configure_wall.script -# !endif - - -# !ifndef NOTOF -# exec_script{tof} ../tof/configure_tof.script -# !endif - - !ifndef NOCTS - exec_script{blr} ../cts/configure_blr.script - !endif + exec_cmd{con} echo "Configuring BLR" + exec_script{blr} ../cts/configure_blr.script #MDC !ifndef NOMDC @@ -135,11 +73,11 @@ wait exec_script{local} ../rich/startup.script !endif -#Pion - !ifndef NOPION - exec_cmd{con} echo "Configure Pion" - exec_script{pexor} ../pion/startup.script - !endif +# #Pion +# !ifndef NOPION +# exec_cmd{con} echo "Configure Pion" +# exec_script{pexor} ../pion/startup.script +# !endif #ECAL !ifndef NOECAL @@ -159,11 +97,11 @@ wait exec_script{local} ../frpc/startup.script !endif -#Wall - !ifndef NOWALL - exec_cmd{con} echo "Configure Wall" - exec_script{local} ../wall/startup.script - !endif +# #Wall +# !ifndef NOWALL +# exec_cmd{con} echo "Configure Wall" +# exec_script{local} ../wall/startup.script +# !endif #Start/Veto !ifndef NOSTARTCTS diff --git a/main/merge_serial_address.pl b/main/merge_serial_address.pl new file mode 120000 index 0000000..799e387 --- /dev/null +++ b/main/merge_serial_address.pl @@ -0,0 +1 @@ +../../daqtools/tools/merge_serial_address.pl \ No newline at end of file diff --git a/main/setaddresses.sh b/main/setaddresses.sh new file mode 100755 index 0000000..04f789d --- /dev/null +++ b/main/setaddresses.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +./merge_serial_address.pl ~/trbsoft/daq/cts/serials_cts.db ~/trbsoft/daq/cts/addresses_cts.db #CTS +./merge_serial_address.pl ~/trbsoft/daq/ecal/serials_trb3sc.db ~/trbsoft/daq/ecal/addresses_ecal.db #Ecal +./merge_serial_address.pl ~/trbsoft/daq/mdc/serials_oep.db ~/trbsoft/daq/mdc/addresses_oep.db #MDC +./merge_serial_address.pl ~/trbsoft/daq/rich/serials_dirich_concentrator.db ~/trbsoft/daq/rich/addresses_dirich_concentrator.db +./merge_serial_address.pl ~/trbsoft/daq/rich/serials_dirich.db ~/trbsoft/daq/rich/addresses_dirich.db #RICH +./merge_serial_address.pl ~/trbsoft/daq/rpc/serials_trb3sc.db ~/trbsoft/daq/rpc/addresses_rpc_trb3sc.db #RPC +./merge_serial_address.pl ~/trbsoft/daq/start/serials_trb3sc.db ~/trbsoft/daq/start/addresses_trb3sc.db #Start, iTOF +./merge_serial_address.pl ~/trbsoft/daq/sts/serials_trb3.db ~/trbsoft/daq/sts/addresses_sts.db #STS, Veto +./merge_serial_address.pl ~/trbsoft/daq/tof/serials_trb3.db ~/trbsoft/daq/tof/addresses_tofnew.db #TOF, fRPC diff --git a/mdc/addresses_mdcaddon.db b/mdc/addresses_mdcaddon.db index 89bc32c..3fc8c4f 100644 --- a/mdc/addresses_mdcaddon.db +++ b/mdc/addresses_mdcaddon.db @@ -68,9 +68,9 @@ # 0x1164 006 3 19 0 # 0x1160 006 5 20 0 - 0x1161 002 0 19 0 - 0x1162 002 1 19 0 - 0x1163 002 2 19 0 - 0x1164 002 3 19 0 - 0x1160 002 5 20 0 +# 0x1161 002 0 19 0 +# 0x1162 002 1 19 0 +# 0x1163 002 2 19 0 +# 0x1164 002 3 19 0 +# 0x1160 002 5 20 0 diff --git a/mdc/startup.script b/mdc/startup.script index 8f0ef58..5736aae 100644 --- a/mdc/startup.script +++ b/mdc/startup.script @@ -1,10 +1,6 @@ #Empty debug fifo for tdc initialization readback trbcmd rm 0xfffd 0xe000 0xfff 1 >/dev/null -#Assign addresses -!ifndef RESTART - set_addresses serials_oep.db addresses_oep.db #addresses for OEP -!endif #Load settings for OEP - initialize ADC trbcmd w 0xfffd 0x8000 0xd diff --git a/rich/startup.script b/rich/startup.script index 091f4fd..5d912fb 100644 --- a/rich/startup.script +++ b/rich/startup.script @@ -1,8 +1,3 @@ -#Assign addresses -!ifndef RESTART - exec_cmd{local} /home/hadaq/trbsoft/hadesdaq/rich/merge_serial_address.pl /home/hadaq/trbsoft/hadesdaq/rich/serials_dirich_concentrator.db /home/hadaq/trbsoft/hadesdaq/rich/addresses_dirich_concentrator.db - 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 exec_cmd{local} /home/hadaq/trbsoft/hadesdaq/rich/retransmission.sh diff --git a/rpc/addresses_rpc_trb3sc.db b/rpc/addresses_rpc_trb3sc.db index 0aa7445..0e3d6a4 100644 --- a/rpc/addresses_rpc_trb3sc.db +++ b/rpc/addresses_rpc_trb3sc.db @@ -1,73 +1,63 @@ #Address # S/N # FPGA # Design # TRB # ################################################### -0x5800 2381 1 -0x5801 2541 1 -0x5802 2161 1 -0x5803 2571 1 -0x5804 2501 1 -0x5805 2561 1 -0x5806 2551 1 -0x5807 2491 1 -0x5808 2431 1 - -0x5810 2121 1 -0x5811 2241 1 -0x5812 2221 1 -0x5813 2011 1 -0x5814 2341 1 -0x5815 2451 1 -0x5816 2521 1 -0x5817 2231 1 -0x5818 2021 1 - -0x5820 2361 1 -0x5821 2391 1 -0x5822 2111 1 -0x5823 2261 1 -0x5824 2281 1 -0x5825 2401 1 -0x5826 2031 1 -0x5827 2051 1 -0x5828 2311 1 - -0x5830 2371 1 -0x5831 2531 1 -0x5832 2271 1 -0x5833 2071 1 -0x5834 2591 1 -0x5835 2441 1 -0x5836 2471 1 -0x5837 2061 1 -0x5838 2141 1 - - -0x5840 2201 1 -0x5841 2351 1 -0x5842 2581 1 -0x5843 2131 1 -0x5844 2171 1 -0x5845 2421 1 -0x5846 2321 1 -0x5847 2041 1 -0x5848 2481 1 - -0x5850 2601 1 -0x5851 2191 1 -0x5852 2461 1 -0x5853 2181 1 -0x5854 2091 1 -0x5855 2251 1 -0x5856 2511 1 -0x5857 2291 1 -0x5858 2411 1 - -#0x5850 2271 1 -#0x5851 2191 1 -#0x5852 2031 1 -#0x5853 2181 1 -#0x5854 2511 1 -#0x5855 2251 1 -#0x5856 2091 1 -#0x5857 2291 1 -#0x5858 2411 1 +0x5800 238 1 +0x5801 254 1 +0x5802 216 1 +0x5803 257 1 +0x5804 250 1 +0x5805 256 1 +0x5806 255 1 +0x5807 249 1 +0x5808 243 1 + +0x5810 212 1 +0x5811 224 1 +0x5812 222 1 +0x5813 201 1 +0x5814 234 1 +0x5815 245 1 +0x5816 252 1 +0x5817 223 1 +0x5818 202 1 + +0x5820 236 1 +0x5821 239 1 +0x5822 211 1 +0x5823 226 1 +0x5824 228 1 +0x5825 240 1 +0x5826 203 1 +0x5827 205 1 +0x5828 231 1 + +0x5830 237 1 +0x5831 253 1 +0x5832 227 1 +0x5833 207 1 +0x5834 259 1 +0x5835 244 1 +0x5836 247 1 +0x5837 206 1 +0x5838 214 1 + + +0x5840 220 1 +0x5841 235 1 +0x5842 258 1 +0x5843 213 1 +0x5844 217 1 +0x5845 242 1 +0x5846 232 1 +0x5847 204 1 +0x5848 248 1 + +0x5850 260 1 +0x5851 219 1 +0x5852 246 1 +0x5853 218 1 +0x5854 209 1 +0x5855 225 1 +0x5856 251 1 +0x5857 229 1 +0x5858 241 1 diff --git a/rpc/addresses_rpc.db b/rpc/old/addresses_rpc.db similarity index 100% rename from rpc/addresses_rpc.db rename to rpc/old/addresses_rpc.db diff --git a/rpc/configure_rpc.script b/rpc/old/configure_rpc.script similarity index 100% rename from rpc/configure_rpc.script rename to rpc/old/configure_rpc.script diff --git a/rpc/serials_rpc.db b/rpc/old/serials_rpc.db similarity index 100% rename from rpc/serials_rpc.db rename to rpc/old/serials_rpc.db diff --git a/rpc/startup.script b/rpc/startup.script index cb26632..eb9d2e0 100644 --- a/rpc/startup.script +++ b/rpc/startup.script @@ -1,11 +1,4 @@ -#Assign addresses -!ifndef RESTART -# set_addresses serials_rpc.db addresses_rpc.db #addresses for RPC TRB - set_addresses serials_trb3sc.db addresses_rpc_trb3sc.db #addresses for RPC TRB -!endif - - #All monitoring channels on trbcmd w 0xfe60 0xdf80 0xffffffff trbcmd w 0xfe60 0xdf85 0xffffffff diff --git a/start/addresses_trb3sc.db b/start/addresses_trb3sc.db index f1bee55..facec16 100644 --- a/start/addresses_trb3sc.db +++ b/start/addresses_trb3sc.db @@ -1,19 +1,19 @@ #Address # S/N # FPGA # Design # TRB # ################################################### -0x0100 1521 1 0 0 #central rack trig gen -0x0110 1451 1 0 0 # RICH rack sensor board -0x0120 0071 1 0 0 #ECal Laser Controller +0x0100 152 1 0 0 #central rack trig gen +0x0110 145 1 0 0 # RICH rack sensor board +0x0120 007 1 0 0 #ECal Laser Controller -0x5000 4391 1 0 0 -0x5001 4091 1 0 0 -0x5002 4071 1 0 0 -0x5003 4051 1 0 0 +0x5000 439 1 0 0 +0x5001 409 1 0 0 +0x5002 407 1 0 0 +0x5003 405 1 0 0 -0x5d00 3381 1 0 0 -0x5d01 3411 1 0 0 -0x5d02 3371 1 0 0 -0x5d03 4101 1 0 0 -0x5d04 4061 1 0 0 -0x5d05 4081 1 0 0 +0x5d00 338 1 0 0 +0x5d01 341 1 0 0 +0x5d02 337 1 0 0 +0x5d03 410 1 0 0 +0x5d04 406 1 0 0 +0x5d05 408 1 0 0 diff --git a/start/addresses_start_trb3.db b/start/old/addresses_start_trb3.db similarity index 100% rename from start/addresses_start_trb3.db rename to start/old/addresses_start_trb3.db diff --git a/start/startup.script b/start/startup.script index 07d6246..d2f0d1f 100644 --- a/start/startup.script +++ b/start/startup.script @@ -1,14 +1,7 @@ - - -#Set all addresses -!ifndef RESTART - set_addresses serials_trb3sc.db addresses_trb3sc.db -!endif - - ######## ### Veto TDC settings are in STS! +### Don't use any broadcast here! ######## ## -2us +1000ns trigger window @@ -60,11 +53,3 @@ trbcmd w 0x5003 0xdf80 0xffffffff trbcmd w 0x5003 0xdf85 0x0000ffff - -#invert inputs of slow channels -#exec_cmd{local} /home/hadaq/trbsoft/daqtools/tools/padiwa.pl 0x5010 0 invert 0xaaaa -#exec_cmd{local} /home/hadaq/trbsoft/daqtools/tools/padiwa.pl 0x5011 0 invert 0xaaaa -#exec_cmd{local} /home/hadaq/trbsoft/daqtools/tools/padiwa.pl 0x5012 0 invert 0xaaaa -#exec_cmd{local} /home/hadaq/trbsoft/daqtools/tools/padiwa.pl 0x5013 0 invert 0xaaaa - - diff --git a/sts/addresses_sts.db b/sts/addresses_sts.db index 92df92e..8f7297d 100644 --- a/sts/addresses_sts.db +++ b/sts/addresses_sts.db @@ -2,64 +2,64 @@ ################################################### # STS2-4 -0x6460 0310 0 -0x6461 0311 1 -0x6462 0312 2 -0x6463 0313 3 +0x6460 031 0 +0x6461 031 1 +0x6462 031 2 +0x6463 031 3 # STS2-1 -0x6440 0710 0 -0x6441 0711 1 -0x6442 0712 2 -0x6443 0713 3 +0x6440 071 0 +0x6441 071 1 +0x6442 071 2 +0x6443 071 3 # STS2-3 -0x6444 1220 0 -0x6445 1221 1 # has endpoint id 3? -0x6454 1222 2 -0x6455 1223 3 +0x6444 122 0 +0x6445 122 1 # has endpoint id 3? +0x6454 122 2 +0x6455 122 3 # STS2-6 -0x6464 1540 0 -0x6465 1541 1 -0x6474 1542 2 -0x6475 1543 3 +0x6464 154 0 +0x6465 154 1 +0x6474 154 2 +0x6475 154 3 # STS2-2 -0x6450 1550 0 -0x6451 1551 1 -0x6452 1552 2 -0x6453 1553 3 +0x6450 155 0 +0x6451 155 1 +0x6452 155 2 +0x6453 155 3 # STS2-5 -0x6470 1570 0 -0x6471 1571 1 -0x6472 1572 2 -0x6473 1573 3 +0x6470 157 0 +0x6471 157 1 +0x6472 157 2 +0x6473 157 3 # STS1-1 -0x6400 1250 0 -0x6401 1251 1 -0x6402 1252 2 -0x6403 1253 3 +0x6400 125 0 +0x6401 125 1 +0x6402 125 2 +0x6403 125 3 # STS1-2 -0x6410 1080 0 -0x6411 1081 1 -0x6412 1082 2 -0x6413 1083 3 +0x6410 108 0 +0x6411 108 1 +0x6412 108 2 +0x6413 108 3 # STS1-3 -0x6420 0640 0 -0x6421 0641 1 -0x6422 0642 2 -0x6423 0643 3 +0x6420 064 0 +0x6421 064 1 +0x6422 064 2 +0x6423 064 3 # STS1-4 -0x6430 1180 0 -0x6431 1181 1 -0x6432 1182 2 -0x6433 1183 3 +0x6430 118 0 +0x6431 118 1 +0x6432 118 2 +0x6433 118 3 diff --git a/sts/startup.script b/sts/startup.script index b6bd1f7..b6fad3e 100644 --- a/sts/startup.script +++ b/sts/startup.script @@ -1,7 +1,4 @@ -#Assign addresses -!ifndef RESTART - set_addresses serials_trb3.db addresses_sts.db -!endif +#Broadcasts affect Veto as well trbcmd s 0x42000005ed6b0428 0x03 0x6445 #workaround for wrong endpoint id diff --git a/tof/addresses_tofnew.db b/tof/addresses_tofnew.db index 6e31213..6f3c1e6 100644 --- a/tof/addresses_tofnew.db +++ b/tof/addresses_tofnew.db @@ -1,32 +1,32 @@ #Address # S/N # FPGA # Design # TRB # ################################################### -0x5C00 2410 0 -0x5C01 2411 1 -0x5C02 2412 2 -0x5C03 2413 3 +0x5C00 241 0 +0x5C01 241 1 +0x5C02 241 2 +0x5C03 241 3 -0x5C10 0880 0 -0x5C11 0881 1 -0x5C12 0882 2 -0x5C13 0883 3 +0x5C10 088 0 +0x5C11 088 1 +0x5C12 088 2 +0x5C13 088 3 -0x5C20 0060 0 -0x5C21 0061 1 -0x5C22 0062 2 -0x5C23 0063 3 +0x5C20 006 0 +0x5C21 006 1 +0x5C22 006 2 +0x5C23 006 3 -0x5C30 2420 0 -0x5C31 2421 1 -0x5C32 2422 2 -0x5C33 2423 3 +0x5C30 242 0 +0x5C31 242 1 +0x5C32 242 2 +0x5C33 242 3 -0x5C40 1130 0 -0x5C41 1131 1 -0x5C42 1132 2 -0x5C43 1133 3 +0x5C40 113 0 +0x5C41 113 1 +0x5C42 113 2 +0x5C43 113 3 -0x5C50 0940 0 -0x5C51 0941 1 -0x5C52 0942 2 -0x5C53 0943 3 +0x5C50 094 0 +0x5C51 094 1 +0x5C52 094 2 +0x5C53 094 3 diff --git a/tof/addresses_tof.db b/tof/old/addresses_tof.db similarity index 100% rename from tof/addresses_tof.db rename to tof/old/addresses_tof.db diff --git a/tof/configure_tof.script b/tof/old/configure_tof.script similarity index 100% rename from tof/configure_tof.script rename to tof/old/configure_tof.script diff --git a/tof/serials_tof.db b/tof/old/serials_tof.db similarity index 100% rename from tof/serials_tof.db rename to tof/old/serials_tof.db diff --git a/tof/serials_trb3sc.db b/tof/old/serials_trb3sc.db similarity index 100% rename from tof/serials_trb3sc.db rename to tof/old/serials_trb3sc.db diff --git a/tof/trb.db b/tof/old/trb.db similarity index 100% rename from tof/trb.db rename to tof/old/trb.db diff --git a/tof/startup.script b/tof/startup.script index 36a35f7..97d2278 100644 --- a/tof/startup.script +++ b/tof/startup.script @@ -1,10 +1,4 @@ -#Set all addresses -!ifndef RESTART -# set_addresses serials_tof.db addresses_tof.db #addresses for TOF TRB - set_addresses serials_trb3.db addresses_tofnew.db #addresses for TOF TRB -!endif - ######### #Note this affects fRPC as well #########