From: hadaq@countinghouse Date: Thu, 28 Aug 2014 15:25:52 +0000 (+0200) Subject: status, mt X-Git-Tag: pre2018~35 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=281a2aaca75e8ab2d76781af9f65e555463a4936;p=hadesdaq.git status, mt --- diff --git a/oracle/daq2stdout.pl b/oracle/daq2stdout.pl index 04925d4..888fae0 100755 --- a/oracle/daq2stdout.pl +++ b/oracle/daq2stdout.pl @@ -103,10 +103,12 @@ sub readDB() #- Read serials_db &readSerialsDB("../start/serials_start.db", "StartVeto"); + &readSerialsDB("../start/serials_start_trb3.db", "StartTrb3"); &readSerialsDB("../hub/serials_hub.db", "Hub-All"); &readSerialsDB("../cts/serials_cts.db", "CTS"); &readSerialsDB("../mdc/serials_mdcaddon.db", "MDC-AddOn"); &readSerialsDB("../mdc/serials_oep.db", "MDC-OEP"); + &readSerialsDB("../pion/serials_pion.db", "Pion"); &readSerialsDB("../rich/serials_rich.db", "RICH-ADCM"); &readSerialsDB("../rpc/serials_rpc.db", "RPC"); &readSerialsDB("../shower/serials_shower.db", "Shw-AddOn"); @@ -115,10 +117,12 @@ sub readDB() #- Read addresses_db &readAddressesDB("../start/addresses_start.db", "StartVeto"); + &readAddressesDB("../start/addresses_start_trb3.db", "StartTrb3"); &readAddressesDB("../hub/addresses_hub.db","Hub-All"); &readAddressesDB("../cts/addresses_cts.db", "CTS"); &readAddressesDB("../mdc/addresses_mdcaddon.db", "MDC-AddOn"); &readAddressesDB("../mdc/addresses_oep.db", "MDC-OEP"); + &readAddressesDB("../pion/addresses_pion.db", "Pion"); &readAddressesDB("../rich/addresses_rich.db", "RICH-ADCM"); &readAddressesDB("../rpc/addresses_rpc.db", "RPC"); &readAddressesDB("../shower/addresses_shower.db", "Shw-AddOn"); @@ -268,6 +272,7 @@ sub readAddressesDB() foreach my $serial ( sort keys %{$conf_db_href->{'addresses'}->{$type}} ){ my $addr = $conf_db_href->{'addresses'}->{$type}->{$serial}->{'addr'}; + #- Check if this 'type' is defined unless( defined $addr_ranges_href->{$type} ){ print "ERROR: readAddressesDB(): Unknown type $type for the file $file2read. Exit.\n";