From e008489f3d9c9cf543f62938bc4911f499787926 Mon Sep 17 00:00:00 2001 From: Joern Adamczewski-Musch Date: Mon, 18 Jan 2021 13:08:09 +0100 Subject: [PATCH] Adjusted script to export boards to oracle for the changed trb3 serial numbers note that Oracle keeps previous 4-digit serial numbers, otherwise we will break table constraints unique id in Oracle is always the temperature sensor which mostly has not changed --- frpc/addresses_frpc.db | 16 ++-- hmon/getrootjson.cgi | 1 - hmon/hmon_endpoints.pl | 7 +- hmon/hmon_tdcchanerrors.pl | 4 +- hmon/permanent/hmon_interrupt.pl | 6 +- oracle/boards.txt | 135 +++++++++---------------------- oracle/daq2stdout.pl | 100 +++++++++++++++-------- sts/addresses_sts.db | 5 ++ 8 files changed, 128 insertions(+), 146 deletions(-) diff --git a/frpc/addresses_frpc.db b/frpc/addresses_frpc.db index 538f494..471e1ff 100644 --- a/frpc/addresses_frpc.db +++ b/frpc/addresses_frpc.db @@ -2,16 +2,16 @@ ################################################### # frpc1 -0x6800 2370 0 -0x6801 2371 1 -0x6802 2372 2 -0x6803 2373 3 +0x6800 237 0 +0x6801 237 1 +0x6802 237 2 +0x6803 237 3 # frpc2 -0x6810 2440 0 -0x6811 2441 1 -0x6812 2442 2 -0x6813 2443 3 +0x6810 244 0 +0x6811 244 1 +0x6812 244 2 +0x6813 244 3 diff --git a/hmon/getrootjson.cgi b/hmon/getrootjson.cgi index 194b8d7..dbbc4f2 100755 --- a/hmon/getrootjson.cgi +++ b/hmon/getrootjson.cgi @@ -14,7 +14,6 @@ print "Content-type: application/json\r\n\r\n"; my $q = CGI->new; -print Dumper $q; exit unless $q->param('histo') =~ /^[a-zA-Z0-9_\-\/]+$/; exit unless $q->param('src') =~ /^[a-zA-Z0-9]+$/; diff --git a/hmon/hmon_endpoints.pl b/hmon/hmon_endpoints.pl index f439110..689a1e5 100755 --- a/hmon/hmon_endpoints.pl +++ b/hmon/hmon_endpoints.pl @@ -153,6 +153,7 @@ while(1) { 0x5830,0x5831,0x5832,0x5833,0x5834,0x5835,0x5836,0x5837,0x5838, 0x5840,0x5841,0x5842,0x5843,0x5844,0x5845,0x5846,0x5847,0x5848, 0x5850,0x5851,0x5852,0x5853,0x5854,0x5855,0x5856,0x5857,0x5858, + ); #RPC -> is ECAL, STS @@ -178,7 +179,9 @@ while(1) { 0x6450, 0x6451, 0x6452, 0x6453, 0x6454, 0x6455, 0x6460, 0x6461, 0x6462, 0x6463, 0x6464, 0x6465, 0x6470, 0x6471, 0x6472, 0x6473, 0x6474, 0x6475, - +#fRPC + 0x8c00,0x6800,0x6801,0x6802,0x6803, + 0x8c10,0x6810,0x6811,0x6812,0x6813, ); my @other_boards =( @@ -187,7 +190,7 @@ while(1) { #central hub 0x8000,0x8011,0x8012,0x8013,0x8014,0x8800, 0x8810, #innerTOF - 0x8d00,0x5d00,0x5d01,0x5d02,0x5d03,0x5d04,0x5d04, + 0x8d00,0x5d00,0x5d01,0x5d02,0x5d03,0x5d04,0x5d05, # #Pion # 0x8900,0x3800,0x3801, # 0x8910,0x3810,0x3811, diff --git a/hmon/hmon_tdcchanerrors.pl b/hmon/hmon_tdcchanerrors.pl index 87fb061..c34ab46 100755 --- a/hmon/hmon_tdcchanerrors.pl +++ b/hmon/hmon_tdcchanerrors.pl @@ -18,7 +18,7 @@ use LWP::Simple qw(get); use Try::Tiny; -while(1) { +while(1) {{ my $dataerr = get ('http://localhost/mon/getrootjson.cgi?src=rawmon&histo=HADES/Run/HLD/HLD_ErrPerChannel'); my $datahit = get ('http://localhost/mon/getrootjson.cgi?src=rawmon&histo=HADES/Run/HLD/HLD_HitsPerChannel'); @@ -83,7 +83,7 @@ while(1) { # print Dumper @stats; HPlot::PlotDraw('TDCErrors'); sleep(300); -} +}} diff --git a/hmon/permanent/hmon_interrupt.pl b/hmon/permanent/hmon_interrupt.pl index efdb88e..855ddff 100755 --- a/hmon/permanent/hmon_interrupt.pl +++ b/hmon/permanent/hmon_interrupt.pl @@ -38,9 +38,11 @@ while(1) { my @arr = split(/\s+/,$out[0]); $store->{$s} = \@arr; next unless $laststore->{$s}; - my @diff = map {$store->{$s}[$_] - $laststore->{$s}[$_];} (2..65); + next unless $store->{$s}; + # JAM2021: adjust this for EBs without hyper threading: + my @diff = map {$store->{$s}[$_] - $laststore->{$s}[$_];} (3..33); my $sum = sum(@diff); - if ($diff[0] < 0.9*$sum) { + if ($diff[1] < 0.9*$sum) { $qastate = QA::WARN_2; $qastr .= "$s "; } diff --git a/oracle/boards.txt b/oracle/boards.txt index d693581..29f4594 100644 --- a/oracle/boards.txt +++ b/oracle/boards.txt @@ -52,7 +52,6 @@ TRB3sc 1311 f600000940a5cb28 8a04 TRB3sc 1341 120000094094a928 8a00 MDC-AddOn 1 8200000270f2b328 1150 - MDC-AddOn 2 9300000270f2ae28 1160 MDC-AddOn 3 fd00000270e01728 1120 MDC-AddOn 7 5900000270dd8b28 1010 MDC-AddOn 9 b200000270dd8e28 1130 @@ -1440,110 +1439,52 @@ DiRichConcentrator 109 6800000a5236b428 8266 TRB3sc 1631 840000094117ff28 83c8 TRB3sc 1641 250000094117f728 83c5 TRB3sc 1661 f300000941240528 83c6 - TRB3 310 0500000390172728 6460 - TRB3 311 8c00000390146128 6461 - TRB3 312 2700000390171d28 6462 - TRB3 313 2300000390173b28 6463 - TRB3 640 d10000046f465028 6420 - TRB3 641 850000046f20f728 6421 - TRB3 642 460000046f209728 6422 - TRB3 643 700000046f394b28 6423 - TRB3 710 8d000003131c6328 6440 - TRB3 711 1b000003131c6a28 6441 - TRB3 712 30000003131fb228 6442 - TRB3 713 69000003131fb128 6443 - TRB3 1080 3d000004fa143328 6410 - TRB3 1081 a3000004fa147628 6411 - TRB3 1082 50000004fa0dff28 6412 - TRB3 1083 d6000004f9ecae28 6413 - TRB3 1180 95000005ed3c0a28 6430 - TRB3 1181 73000005ed388428 6431 - TRB3 1182 ef000005ed1aeb28 6432 - TRB3 1183 06000005ed1afd28 6433 - TRB3 1220 08000005ed4c4d28 6444 - TRB3 1221 42000005ed6b0428 6445 - TRB3 1222 e0000005ed1c4128 6454 - TRB3 1223 29000005ed4bae28 6455 - TRB3 1250 27000005ed8af428 6400 - TRB3 1251 92000005ed912828 6401 - TRB3 1252 35000005ed86d328 6402 - TRB3 1253 08000005ed905228 6403 - TRB3 1540 070000070ee3cc28 6464 - TRB3 1541 b80000070ee46a28 6465 - TRB3 1542 800000070ee3d828 6474 - TRB3 1543 160000070ee3d128 6475 - TRB3 1550 4a0000070f35cc28 6450 - TRB3 1551 150000070f3b6428 6451 - TRB3 1552 010000070f366f28 6452 - TRB3 1553 5a0000070ef42f28 6453 - TRB3 1570 e90000070ecab028 6470 - TRB3 1571 050000070f310628 6471 - TRB3 1572 6e0000070ecaa428 6472 - TRB3 1573 360000070f3ea628 6473 - TRB3 315 9c00000390194c28 8b13 - TRB3 645 f50000046f394c28 8b02 - TRB3 715 b1000003131f9328 8b10 - TRB3 1085 ef000004fa0e3d28 8b01 - TRB3 1185 e7000005ed389e28 8b03 - TRB3 1225 f9000005ed797028 8b12 - TRB3 1255 e7000005ed7ede28 8b00 - TRB3 1545 9e0000070ee47628 8b15 - TRB3 1555 360000070f366e28 8b11 - TRB3 1575 b90000070f3dd528 8b14 + TRB3 311 9c00000390194c28 6460 + TRB3 641 f50000046f394c28 6420 + TRB3 711 b1000003131f9328 6440 + TRB3 1081 ef000004fa0e3d28 6410 + TRB3 1181 e7000005ed389e28 6430 + TRB3 1221 f9000005ed797028 6444 + TRB3 1251 e7000005ed7ede28 6400 + TRB3 1541 9e0000070ee47628 6464 + TRB3 1551 360000070f366e28 6450 + TRB3 1571 b90000070f3dd528 6470 + TRB3 311 9c00000390194c28 8b13 + TRB3 641 f50000046f394c28 8b02 + TRB3 711 b1000003131f9328 8b10 + TRB3 1081 ef000004fa0e3d28 8b01 + TRB3 1181 e7000005ed389e28 8b03 + TRB3 1221 f9000005ed797028 8b12 + TRB3 1251 e7000005ed7ede28 8b00 + TRB3 1541 9e0000070ee47628 8b15 + TRB3 1551 360000070f366e28 8b11 + TRB3 1571 b90000070f3dd528 8b14 TRB3sc 4051 0c00000348060928 5003 TRB3sc 4071 eb000003480c9c28 5002 TRB3sc 4091 5a00000347f16228 5001 TRB3sc 4391 d5000003480c5428 5000 TRB3sc 4121 3e000003480c5128 8880 - TRB3 60 b5000003482d3d28 5c20 - TRB3 61 d5000003481eef28 5c21 - TRB3 62 ec00000348284328 5c22 - TRB3 63 34000003482d1c28 5c23 - TRB3 880 04000003133e3728 5c10 - TRB3 881 8e0000031321c228 5c11 - TRB3 882 e1000003133e4b28 5c12 - TRB3 883 ef000003133e3228 5c13 - TRB3 940 05000004f9db9b28 5c50 - TRB3 941 4e000004fa20a028 5c51 - TRB3 942 a5000004fa24c128 5c52 - TRB3 943 c7000004fa24a928 5c53 - TRB3 1130 0d000005ed1d6828 5c40 - TRB3 1131 8e000005ed272228 5c41 - TRB3 1132 66000005ed2b1d28 5c42 - TRB3 1133 b9000005ed217528 5c43 - TRB3 2410 d9000008138f7228 5c00 - TRB3 2411 93000008129bca28 5c01 - TRB3 2412 df0000081244c628 5c02 - TRB3 2413 25000008129bea28 5c03 - TRB3 2420 dd0000081361fb28 5c30 - TRB3 2421 6500000812740e28 5c31 - TRB3 2422 d2000008135a6628 5c32 - TRB3 2423 4b00000813706228 5c33 - TRB3 65 c4000003481ef228 86c2 - TRB3 885 650000031321c728 86c1 - TRB3 945 81000004fa286228 86c5 - TRB3 1135 ae000005ed215d28 86c4 - TRB3 2415 5b0000081391d228 86c0 - TRB3 2425 22000008135a2128 86c3 - TRB3 1270 e1000005ed6c5028 5010 - TRB3 1271 39000005ed278728 5011 - TRB3 1272 c2000005ed2fd228 5012 - TRB3 1273 9f000005ed2ff728 5013 - TRB3 1275 9c000005ed716028 8890 - TRB3 2370 1800000813703e28 6800 - TRB3 2371 a200000813a78828 6801 - TRB3 2372 40000008123d4328 6802 - TRB3 2373 94000008123e2028 6803 - TRB3 2440 7000000943e2eb28 6810 - TRB3 2441 6100000943e2f628 6811 - TRB3 2442 7600000943e2de28 6812 - TRB3 2443 4700000943e2ea28 6813 - TRB3 2375 fc000008123d3c28 8c00 - TRB3 2445 3900000943b1c428 8c10 + TRB3 61 34000003482d1c28 5c20 + TRB3 881 650000031321c728 5c10 + TRB3 941 81000004fa286228 5c50 + TRB3 1131 ae000005ed215d28 5c40 + TRB3 2411 5b0000081391d228 5c00 + TRB3 2421 22000008135a2128 5c30 + TRB3 61 34000003482d1c28 86c2 + TRB3 881 650000031321c728 86c1 + TRB3 941 81000004fa286228 86c5 + TRB3 1131 ae000005ed215d28 86c4 + TRB3 2411 5b0000081391d228 86c0 + TRB3 2421 22000008135a2128 86c3 + TRB3 1271 9c000005ed716028 8890 + TRB3 2371 fc000008123d3c28 6800 + TRB3 2441 3900000943b1c428 6810 + TRB3 2371 fc000008123d3c28 8c00 + TRB3 2441 3900000943b1c428 8c10 TRB3sc 3371 72000005b6f3e028 5d02 TRB3sc 3381 060000070f046f28 5d00 + TRB3sc 3391 fb000005b7443428 5d04 TRB3sc 3411 56000005b7be1428 5d01 - TRB3sc 4061 0000000347efe028 5d04 TRB3sc 4081 c200000348068628 5d05 TRB3sc 4101 810000034809c528 5d03 TRB3sc 3071 1c00000a62956328 8d00 diff --git a/oracle/daq2stdout.pl b/oracle/daq2stdout.pl index 6e80b0e..90c538d 100755 --- a/oracle/daq2stdout.pl +++ b/oracle/daq2stdout.pl @@ -102,57 +102,61 @@ sub readDB() &readAddrRangesDB("../main/address_range.db"); #- Read serials_db + + + #&readSerialsDB("../start/serials_start.db", "StartVeto"); #&readSerialsDB("../start/serials_start_trb3.db", "StartTrb3",0); - &readSerialsDB("../start/serials_trb3sc.db", "Start",0); - &readSerialsDB("../start/serials_trb3sc.db", "iTOF",0); - &readSerialsDB("../start/serials_trb3.db", "Veto",0); + # JAM2021: serial number logic has changed! need to modify treatment here (drop trailing number) + &readSerialsDB("../start/serials_trb3sc.db", "Start",1); + &readSerialsDB("../start/serials_trb3sc.db", "iTOF",1); + # &readSerialsDB("../start/serials_trb3.db", "Veto",0); # &readSerialsDB("../hub/serials_hub.db", "Hub-All"); # &readSerialsDB("../hub/serials_trb3sc.db", "Hub-AllTrb3"); #&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "Hub-AllTrb3"); -&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "Ecal-Hub",0); -&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "Rich-Hub",0); -&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "RPC-Hub",0); +&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "Ecal-Hub",1); +&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "Rich-Hub",1); +&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "RPC-Hub",1); #&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "TOF-Hub",0); -&readSerialsDB("../../daqtools/base/serials_trb3.db", "TOF-Hub",0); - -&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "Central-Hub",0); -&readSerialsDB("../../daqtools/base/serials_trb3.db", "STS-Hub",0); -&readSerialsDB("../../daqtools/base/serials_trb3.db", "fRPC-Hub",0); -&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "CTS-Hub",0); -&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "StartHub",0); -&readSerialsDB("../../daqtools/base/serials_trb3.db", "VetoHub",0); -&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "iTOF-Hub",0); +&readSerialsDB("../../daqtools/base/serials_trb3.db", "TOF-Hub",1); + +&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "Central-Hub",1); +&readSerialsDB("../../daqtools/base/serials_trb3.db", "STS-Hub",1); +&readSerialsDB("../../daqtools/base/serials_trb3.db", "fRPC-Hub",1); +&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "CTS-Hub",1); +&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "StartHub",1); +&readSerialsDB("../../daqtools/base/serials_trb3.db", "VetoHub",1); +&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "iTOF-Hub",1); #&readSerialsDB("../hub/serials_hub.db", "RPC-Hub",0); #&readSerialsDB("../hub/serials_hub.db", "TOF-Hub",0); #&readSerialsDB("../hub/serials_hub.db", "Wall-Hub",0); -&readSerialsDB("../hub/serials_hub.db", "Pion-Hub",0); +#&readSerialsDB("../hub/serials_hub.db", "Pion-Hub",0); #&readSerialsDB("../hub/serials_hub.db", "StartHub",0); -&readSerialsDB("../cts/serials_cts.db", "CTS",0); - &readSerialsDB("../mdc/serials_mdcaddon.db", "MDC-AddOn",0); - &readSerialsDB("../mdc/serials_oep.db", "MDC-OEP",0); +&readSerialsDB("../cts/serials_cts.db", "CTS",1); + &readSerialsDB("../mdc/serials_mdcaddon.db", "MDC-AddOn",1); + &readSerialsDB("../mdc/serials_oep.db", "MDC-OEP",1); # &readSerialsDB("../ecal/serials_trb3sc.db", "ECal"); -&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "ECal",0); +&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "ECal",1); #&readSerialsDB("../pion/serials_pion.db", "Pion"); &readSerialsDB("../rich/serials_dirich.db", "Rich",2); &readSerialsDB("../rich/serials_dirich_concentrator.db", "Rich-Comb",1); # &readSerialsDB("../rpc/serials_rpc.db", "RPC",0); - &readSerialsDB("../rpc/serials_trb3sc.db", "RPC",0); + &readSerialsDB("../rpc/serials_trb3sc.db", "RPC",1); #&readSerialsDB("../shower/serials_shower.db", "Shw-AddOn"); #&readSerialsDB("../tof/serials_tof.db", "TOF",0); #&readSerialsDB("../tof/serials_trb3sc.db", "TOF",0); - &readSerialsDB("../tof/serials_trb3.db", "TOF",0); + &readSerialsDB("../tof/serials_trb3.db", "TOF",1); #&readSerialsDB("../wall/serials_wall.db", "Wall",0); - &readSerialsDB("../sts/serials_trb3.db", "STS",0); - &readSerialsDB("../frpc/serials_trb3.db", "fRPC",0); + &readSerialsDB("../sts/serials_trb3.db", "STS",1); + &readSerialsDB("../frpc/serials_trb3.db", "fRPC",1); #- Read addresses_db #&readAddressesDB("../start/addresses_start.db", "StartVeto"); #&readAddressesDB("../start/addresses_start_trb3.db", "StartTrb3"); &readAddressesDB("../start/addresses_trb3sc.db", "Start"); &readAddressesDB("../start/addresses_trb3sc.db", "iTOF"); - &readAddressesDB("../start/addresses_start_trb3.db", "Veto"); + # &readAddressesDB("../start/addresses_start_trb3.db", "Veto"); # &readAddressesDB("../hub/addresses_hub.db","Hub-All"); #&readAddressesDB("../hub/addresses_hub_trb3sc.db","Hub-AllTrb3"); &readAddressesDB("../hub/addresses_hub_trb3sc.db","Ecal-Hub"); @@ -168,7 +172,7 @@ sub readDB() #&readAddressesDB("../hub/addresses_hub.db","RPC-Hub"); #&readAddressesDB("../hub/addresses_hub.db","TOF-Hub"); #&readAddressesDB("../hub/addresses_hub.db","Wall-Hub"); - &readAddressesDB("../hub/addresses_hub.db","Pion-Hub"); + #&readAddressesDB("../hub/addresses_hub.db","Pion-Hub"); #&readAddressesDB("../hub/addresses_hub.db","StartHub"); &readAddressesDB("../hub/addresses_hub_trb3sc.db","StartHub"); &readAddressesDB("../hub/addresses_hub_trb3.db","VetoHub"); @@ -179,7 +183,7 @@ sub readDB() &readAddressesDB("../mdc/addresses_oep.db", "MDC-OEP"); &readAddressesDB("../ecal/addresses_ecal.db", "ECal"); #&readAddressesDB("../pion/addresses_pion.db", "Pion"); - #&readAddressesDB("../rich/addresses_trb3sc.db", "Rich-Hub"); + #&readAddressesDB("../rich/addresses_trb3sc.db", "Rich-Hub"); &readAddressesDB("../rich/addresses_dirich.db", "Rich"); &readAddressesDB("../rich/addresses_dirich_concentrator.db", "Rich-Comb"); @@ -286,7 +290,7 @@ sub readAddressesDB() { my ($file2read, $type) = @_; - # print "readAddressesDB is reading file $file2read for type $type \n "; + #print "readAddressesDB is reading file $file2read for type $type \n "; my $fh = new FileHandle($file2read, "r") or die "could not open file $file2read";; @@ -325,16 +329,18 @@ sub readAddressesDB() exit(1); } #print " address:$addr, serial:$serial, fpga:$fpga, design:$design trb:$trb \n"; - + #print " address:$addr, serial:$serial, fpga:$fpga \n"; #- Add to a main configuration hash if( defined $conf_db_href->{'addresses'}->{$type}->{$serial}->{'addr'} ){ + # JAM2021 what is this check for? if( hex($addr) < hex($conf_db_href->{'addresses'}->{$type}->{$serial}->{'addr'}) ) { $conf_db_href->{'addresses'}->{$type}->{$serial}->{'addr'} = $addr; $conf_db_href->{'addresses'}->{$type}->{$serial}->{'fpga'} = $fpga; # $conf_db_href->{'addresses'}->{$type}->{$serial}->{'design'} = $design; # $conf_db_href->{'addresses'}->{$type}->{$serial}->{'trb'} = $trb; +# print "assign address:$addr, serial:$serial, fpga:$fpga for type $type, replacing previous $conf_db_href->{'addresses'}->{$type}->{$serial}->{'addr'}\n" } } else{ @@ -342,6 +348,8 @@ sub readAddressesDB() $conf_db_href->{'addresses'}->{$type}->{$serial}->{'fpga'} = $fpga; # $conf_db_href->{'addresses'}->{$type}->{$serial}->{'design'} = $design; # $conf_db_href->{'addresses'}->{$type}->{$serial}->{'trb'} = $trb; + # print "assign new address:$addr, serial:$serial, fpga:$fpga for type $type \n" + } } @@ -368,9 +376,10 @@ sub readAddressesDB() if( lc($addr) ge lc($addr_min) && lc($addr) le lc($addr_max) ){ $conf_db_href->{'addresses'}->{$type}->{$serial}->{'type'} = $addr_ranges_href->{$type}->{'type'}; + # print "Registered Address $addr for system type $type, board type is $addr_ranges_href->{$type}->{'type'}, serial:$serial\n"; } else{ - #print "Address $addr does not fit the board type $type! Skip it\n" if ($opt_verb); + #print "Address $addr does not fit the board type $type! ( $addr_min, $addr_max ) Skip it.\n"; #if ($opt_verb); next; #print "Address $addr does not fit the board type $type! Exit\n"; #exit(1); @@ -423,8 +432,16 @@ sub readSerialsDB() } } + #JAM2021 - maybe have to skip the dummy ids also: + if($id eq "0"){ + print "Skipping dummy id 0x0 in $file2read \n" if ($opt_verb); + next; + } - + if($id eq "fff"){ + print "Skipping dummy id 0xfff in $file2read \n" if ($opt_verb); + next; + } @@ -441,7 +458,7 @@ sub readSerialsDB() # exit(1); } -# print " serial:$serial, id:$id \n"; + #print " serial:$serial, id:$id \n"; #- Add to a main configuration hash $conf_db_href->{'serials'}->{$type}->{$serial} = $id; @@ -460,7 +477,7 @@ sub checkBoards() foreach my $serial ( sort keys %{$conf_db_href->{'serials'}->{$type}} ){ if( $id eq $conf_db_href->{'serials'}->{$type}->{$serial} ){ - # print "Type: $type ID: $id "; + #print "Type: $type ID: $id "; my $addr = $conf_db_href->{'addresses'}->{$type}->{$serial}->{'addr'}; unless( defined $addr ){ @@ -468,7 +485,7 @@ sub checkBoards() print "ERROR: Address is not defined for type: $type serial: $serial.\n" if( $opt_verb ) ; next; } - # print " - Address: $addr \n"; + #print " - Address: $addr \n"; unless( $netaddr eq $addr ){ # print STDERR "Network address $netaddr does not fit the data base $addr!\n" if( $opt_verb ) ; print "Network address $netaddr does not fit the data base $addr!\n" if( $opt_verb ) ; @@ -524,7 +541,22 @@ sub printBoardsFromDB() my $addr = $conf_db_href->{'addresses'}->{$type}->{$serial}->{'addr'}; my $otype = $conf_db_href->{'addresses'}->{$type}->{$serial}->{'type'}; +# print "debug:"; +# print "type: $type " if defined($type); +# print "otype: $otype " if defined($otype); +# print "serial: $serial " if defined($serial); +# print "id: $id " if defined($id); +# print "address: $addr " if defined($addr); +# print "\n"; + next unless( defined $addr && defined $otype ); + + if(($type ne "Rich-Comb") and ($type ne "Rich") and ($type ne "MDC-AddOn") and ($type ne "MDC-OEP") and ($type ne "CTS") ){ + # JAM2021 here we have to correct the changed serial numbers for all systems except RICH MDC CTS + # otherwise we will mess up the oracle tables that have same temperature sensor ids with different serials + # -> keep old scheme with trailing 1 for trb3 trb3sc + $serial= $serial * 10.0 + 1.0; + } if( ! defined $opt_output || $opt_output eq "board" ){ printf("%10s %4d %17s %6s\n", $otype, $serial, $id, $addr); diff --git a/sts/addresses_sts.db b/sts/addresses_sts.db index 8f7297d..0f834c7 100644 --- a/sts/addresses_sts.db +++ b/sts/addresses_sts.db @@ -64,3 +64,8 @@ +#Veto +0x5010 127 0 +0x5011 127 1 +0x5012 127 2 +0x5013 127 3 -- 2.43.0