JAM: commit changes due to work on "daq setup to ora" export. Will also store all...

diff --git a/ecal/serials_trb3sc.db b/ecal/serials_trb3sc.db
index 035bfa313ae4fac49ffc2db496232c34249741cc..f969767bdb5b0b426f41feac8a9dc1ff9b91f55b 100644 (file)
--- a/ecal/serials_trb3sc.db
+++ b/ecal/serials_trb3sc.db
@@ -1,5 +1,5 @@
 #List of all serial numbers for TRB3sc. 3-digit serial, append a '1'
-
+# JAM 23-03-18: comment all serials here that do not belong to ecal (for daq2stdout Oracle export)
 #  Serial    #  Unique ID
 ########################################
 
@@ -11,7 +11,7 @@
    0061        0x0000000000000000
    0071        0xfc000006e90e8828
    0081        0x67000006ea309a28
-   0091        0xf1000006e919a128
+#   0091        0xf1000006e919a128
    0101        0x5d000006e913bc28
 
    1051        0x8400000941031228
@@ -38,46 +38,46 @@
    1251        0xb1000009409d6328
    1261        0x0200000940881428
    1271        0x9b00000940876628
-   1281        0x0d00000940876f28
-   1291        0x9a00000940a5da28
+#   1281        0x0d00000940876f28
+#   1291        0x9a00000940a5da28
 
-   1301        0x1d00000940a5ce28
-   1311        0xf600000940a5cb28
+#   1301        0x1d00000940a5ce28
+#   1311        0xf600000940a5cb28
    1321        0x6f00000940a61528
    1331        0xea00000940a61228
    1341        0x120000094094a928
-   1361        0xb100000940d69628
-   1371        0x4900000940a60928
-   1381        0x7700000940956828
-   1391        0x6100000940df2928
+#   1361        0xb100000940d69628
+#   1371        0x4900000940a60928
+#   1381        0x7700000940956828
+#   1391        0x6100000940df2928
 
    1401        0x6d00000940a60628
    1411        0xa900000940a5fd28
-   1421        0x2c00000940a5fa28
+#   1421        0x2c00000940a5fa28
    1431        0x1600000940a63f28
-   1441        0x5c00000940a63228
+#   1441        0x5c00000940a63228
    1451        0xc300000940955b28
-   1461        0x4d00000940a62f28
+#   1461        0x4d00000940a62f28
    1471        0x1c00000940a66028
    1481        0x4600000940955c28
-   1491        0x3b00000940955028
+#   1491        0x3b00000940955028
 
    1501        0x4f0000094093c328
    1511        0x4400000940954f28
-   1531        0x3c0000094093b628
+#   1531        0x3c0000094093b628
    1541        0x1a0000094093aa28
-   1551        0x5600000940939228
-   1561        0x0f00000940939128
-   1571        0x430000094093a928
-   1581        0x2b00000940939e28
+#   1551        0x5600000940939228
+#   1561        0x0f00000940939128
+#   1571        0x430000094093a928
+#   1581        0x2b00000940939e28
    1591        0x7200000940939d28
 
-   1601        0xcd00000940943b28
-   1611        0xd100000940938628
-   1621        0x4800000940943c28
-   1631        0x840000094117ff28
-   1641        0x250000094117f728
+#   1601        0xcd00000940943b28
+#   1611        0xd100000940938628
+#   1621        0x4800000940943c28
+#   1631        0x840000094117ff28
+#   1641        0x250000094117f728
    1651        0xce0000094117f228
-   1661        0xf300000941240528
+#   1661        0xf300000941240528
    
 

diff --git a/evtbuild/eb_bnet_ltsm.conf b/evtbuild/eb_bnet_ltsm.conf
index bb2f8d0764816b79d6d6323d329c9ead59f5c16e..c77202bfd02706503d318f9117e78f57f1efbd20 100644 (file)
--- a/evtbuild/eb_bnet_ltsm.conf
+++ b/evtbuild/eb_bnet_ltsm.conf
@@ -137,16 +137,16 @@ LTSM:          0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 
 # LTSM default options for all EB processes
 
-LTSM_PATH:      /lustre/hebe/hades/test2017/sep29
+LTSM_PATH:      /lustre/hebe/hades/jan18test/default
 #LTSM_PATH:      /home/hadaq/raw/jun17/default
 #LTSM_PATH:      /home/hadaq/raw/jun17/default
-LTSM_Server:   lxltsm01-tsm-server
-
+#LTSM_Server:  lxltsm01-tsm-server
+LTSM_Server: lxltsm01-8t
 #LTSM_Node:    LTSM_TEST01
 #LTSM_Passwd:  LTSM_TEST01
 
-LTSM_Node:     lxbkhebe
-LTSM_Passwd:    lxbkhebe
+LTSM_Node:     hades8t
+LTSM_Passwd:    hades8t
 
 
 LTSM_Filesystem:       /lustre/hebe

diff --git a/hmon/QA.pm b/hmon/QA.pm
index 1cbd3d6895f819a5951627ecd183a8e2791dc30b..f1957e417dc4533604acb81e943618a247a5e06f 100644 (file)
--- a/hmon/QA.pm
+++ b/hmon/QA.pm
@@ -16,7 +16,8 @@ our $cats = {'main'=>"Main",
              'feeerr'=>"Fee",
              'other'=>"Other",
              'pion'=>"Pion",
-             'qa'=>'QA'};
+             'rich'=>'RICH',
+             'ecal'=>'ECal'};
 
 # Order of categories
 our $entries->{'cats'} = ["main",
@@ -29,8 +30,10 @@ our $entries->{'cats'} = ["main",
                           "endp",
                           "feeerr",
 #                          "pion",
+                          "rich",
+                         "ecal",
                           "other",
-                          "qa",
+
 ];
 
 # Order of entries in each cat
@@ -42,10 +45,11 @@ $entries->{'server'}  = ['fill', 'cpu', 'icinga', 'etrax', 'pwrsup'];
 $entries->{'eb'}      = ['run', 'rate','bytes', 'lostevt', 'errbits'];
 $entries->{'mdc'}     = ['token', 'blocked', 'temp', 'linkqual', 'voltage'];
 $entries->{'endp'}    = ['mdc','rich', 'tof', 'rpc', 'other'];
-$entries->{'feeerr'}  = ['rich', 'trb', 'feeerr','trginp','trgqual'];
+$entries->{'feeerr'}  = ['mdcinvalid', 'trb', 'feeerr','trginp','trgqual'];
 $entries->{'pion'}    = ['nxstatus', 'HV', 'HVcurr', 'cooling','seu'];
-$entries->{'other'}   = ['magnet','rich','shower','mdcinvalid','sequencer'];
-$entries->{'qa'}      = ['goofy','','','',''];
+$entries->{'other'}   = ['magnet','goofy','','','sequencer'];
+$entries->{'rich'}    = ['','','','',''];
+$entries->{'ecal'}    = ['','','','',''];
 
 
 our $QAServer = "hades33";

diff --git a/hmon/hmon_mdc_invaliddatamode.pl b/hmon/hmon_mdc_invaliddatamode.pl
index 0f23f190384be5418776a66e0a0a496a278fce3e..bf0346f30e67d2de8e6fef90df1c6464fab8fdef 100644 (file)
--- a/hmon/hmon_mdc_invaliddatamode.pl
+++ b/hmon/hmon_mdc_invaliddatamode.pl
@@ -37,6 +37,6 @@ while (1) {
   $status = "$cnt" if $cnt;
   $longmsg = "Boards sending the out-of-order flag: $boardlist" if $cnt;
   
-  QA::WriteQALog($fqa, "other", "mdcinvalid", 20, $qastate,"MDC HV", $status,$longmsg);    
+  QA::WriteQALog($fqa, "fee", "mdcinvalid", 20, $qastate,"MDC HV", $status,$longmsg);    
   sleep(5);
-  }
\ No newline at end of file
+  }

diff --git a/hmon/start.sh b/hmon/start.sh
index dd03cdcc7c005d34af067d97480bc8a2848d4e0e..c2e0ff57b4a5579d31ffb0f79619f7cd9b218aa5 100755 (executable)
--- a/hmon/start.sh
+++ b/hmon/start.sh
@@ -70,7 +70,8 @@ if($r==0) {
   my $cmd = "pgrep -f \"permanent/$t[1]\"";
   my @qx = qx($cmd);
   exit if (scalar @qx > 0);
-  system("$c 2>>/home/hadaq/trbsoft/hadesdaq/hmon/logs/perlerror_$t[1]"); 
+# system("$c 2>>/home/hadaq/trbsoft/hadesdaq/hmon/logs/perlerror_$t[1]"); 
+  exec("bash", "-c", "$c 2>>/home/hadaq/trbsoft/hadesdaq/hmon/logs/perlerror_$t[1]"); 
   exit;
   } 
 END: {if($r!=0 and eof()) {foreach (@l) {wait}}} ' &
@@ -85,7 +86,7 @@ push(@l, $r);
 if($r == 0) { 
   chomp $c;
   my @t = split("/",$c);
-  system("$c 2>>/home/hadaq/trbsoft/hadesdaq/hmon/logs/perlerror_$t[1]"); 
+  exec("bash", "-c", "$c 2>>/home/hadaq/trbsoft/hadesdaq/hmon/logs/perlerror_$t[1]"); 
   exit;
   } 
 END: {if($r!=0 and eof()) {foreach (@l) {wait}}} ' &

diff --git a/hmon/stop.sh b/hmon/stop.sh
index 00058a406fb924508031878c8bd0b2bbe380c26d..a8ab4c333cb080550e2e72e80d28eb97e74bf903 100755 (executable)
--- a/hmon/stop.sh
+++ b/hmon/stop.sh
@@ -4,8 +4,7 @@ echo "  <Hmon>    Killing all sub-processes..."
 
 pkill -f "\./hmon_.+\.pl" 2>/dev/null 1>/dev/null
 pkill -f "sh -c \./hmon_.*\.sh"
-
-pkill -f "lxhadeb06 ping -i 100 lxhadesdaqp"
+pkill -f "lxhadeb06p ping -i 100 lxhadesdaqp"
 pkill -f "/usr/bin/perl -w \./speakdaemon.pl"
 pkill -f "/usr/bin/perl -w \./hmon_.*\.sh"
 pkill -f "hmon_tail -n"

diff --git a/hub/serials_trb3sc.db b/hub/serials_trb3sc.db
index a37e891264294da986678b4ce5079d93b7519ecd..00eac82faacd04513102ccb8de61ec2b62faebd8 100644 (file)
--- a/hub/serials_trb3sc.db
+++ b/hub/serials_trb3sc.db
@@ -1,5 +1,5 @@
 #List of all serial numbers for TRB3sc. 3-digit serial, append a '1'
-
+# JAM 23-03-18: comment all serials here that do not belong to hub (for daq2stdout Oracle export)
 #  Serial    #  Unique ID
 ########################################
 
@@ -14,42 +14,42 @@
    0091        0xf1000006e919a128
    0101        0x5d000006e913bc28
 
-   1051        0x8400000941031228
-   1061        0xb300000941031328
-   1071        0xb000000940ce5228
-   1081        0xcd00000940ce5e28
-   1091        0x3500000940ce5528
+#   1051        0x8400000941031228
+#   1061        0xb300000941031328
+#   1071        0xb000000940ce5228
+#   1081        0xcd00000940ce5e28
+#   1091        0x3500000940ce5528
 
-   1101        0xfc00000940ce6a28
-   1111        0x3f000009408c2e28
-   1131        0x4f000009408a9b28
-   1141        0x2000000940c1e928
-   1151        0x6f000009409d7428
-   1161        0xcc000009409d6f28
+#   1101        0xfc00000940ce6a28
+#   1111        0x3f000009408c2e28
+#   1131        0x4f000009408a9b28
+#   1141        0x2000000940c1e928
+#   1151        0x6f000009409d7428
+#   1161        0xcc000009409d6f28
    1171        0xf600000940c29928
-   1191        0x7100000940c28d28
+#   1191        0x7100000940c28d28
 
-   1201        0xc100000940c29828
-   1211        0x4600000940c28c28   
+#   1201        0xc100000940c29828
+#   1211        0x4600000940c28c28   
    1231        0x3b00000940c28028
-   1241        0x7d00000940880b28
-   1251        0xb1000009409d6328
+#   1241        0x7d00000940880b28
+#   1251        0xb1000009409d6328
    1261        0x0200000940881428
-   1271        0x9b00000940876628
+#   1271        0x9b00000940876628
    1281        0x0d00000940876f28
    1291        0x9a00000940a5da28
 
    1301        0x1d00000940a5ce28
    1311        0xf600000940a5cb28
-   1321        0x6f00000940a61528
-   1331        0xea00000940a61228
+#   1321        0x6f00000940a61528
+#   1331        0xea00000940a61228
    1341        0x120000094094a928
    1361        0xb100000940d69628
    1371        0x4900000940a60928
    1381        0x7700000940956828
    1391        0x6100000940df2928
 
-   1401        0x6d00000940a60628
+#   1401        0x6d00000940a60628
    1411        0xa900000940a5fd28
    1421        0x2c00000940a5fa28
    1431        0x1600000940a63f28
@@ -61,14 +61,14 @@
    1491        0x3b00000940955028
 
    1501        0x4f0000094093c328
-   1511        0x4400000940954f28
+#   1511        0x4400000940954f28
    1531        0x3c0000094093b628
-   1541        0x1a0000094093aa28
+#   1541        0x1a0000094093aa28
    1551        0x5600000940939228
    1561        0x0f00000940939128
    1571        0x430000094093a928
    1581        0x2b00000940939e28
-   1591        0x7200000940939d28
+#   1591        0x7200000940939d28
 
    1601        0xcd00000940943b28
    1611        0xd100000940938628

diff --git a/main/address_range.db b/main/address_range.db
index f21209935704f51994c119fbe8e22662f00bdbe1..865eca75daf27eb6ed72c7ce01b3a392eb5a070c 100644 (file)
--- a/main/address_range.db
+++ b/main/address_range.db
@@ -23,7 +23,8 @@ Pion-Hub     0x8900    0x89FF     TRB3
 Ecal-Hub     0x8a00    0x8aff     TRB3sc
 TestSetup    0xF000    0xFEFF     Test
 Broadcast    0xFF00    0xFFFF     Broadcast
-Hub-All      0x8000    0x8FFF     Hub
+Hub-All      0x8000    0x8FFF     Hub2
+Hub-AllTrb3  0x8000    0x8FFF     Hub-TRB3sc
 
 
 #RICH-ADCM    0x3000    0x31FF     RICH-ADCM

diff --git a/main/data_sources.db b/main/data_sources.db
index e0ff78b02f97bac87d1c016a7e777ec0d83685ea..991a4c9a871031eb630bb4aa48a90555abde0048 100644 (file)
--- a/main/data_sources.db
+++ b/main/data_sources.db
@@ -3,10 +3,10 @@
 # Addr     On/Off     Name              DataSize
 #Start must be the first for EvtId
 0x8800      1         CentralCTS       low
-0x8400      0         RPC123             mid
-0x8410      0         RPC456             mid
-0x8600      0         TOF               low
-0x8700      0         FW                low
+0x8400      1         RPC123             mid
+0x8410      1         RPC456             mid
+0x8600      1         TOF               low
+0x8700      1         FW                low
 0x8880      0         StartTRB3         low
 0x8890      0         VetoTRB3          low
 0x8900      0         Pion1             mid

diff --git a/main/subevtids.db b/main/subevtids.db
index c8fef1f3fafcc1ca7979015c9ab3362678bf7197..2aafb641b6a6a8ca592c84141d249ac3f42c224c 100644 (file)
--- a/main/subevtids.db
+++ b/main/subevtids.db
@@ -1,5 +1,4 @@
 # subEvtId      System
-
 0x0001          #CTS
 0x1000          #MDC-AddOn
 0x1010          #MDC-AddOn
@@ -41,5 +40,4 @@
 0x8a02          #Ecal2
 0x8a03          #Ecal3
 0x8a04          #Ecal4
-0x8a05          #Ecal5
-
+0x8a05          #Ecal5
\ No newline at end of file

diff --git a/mdc/serials_oep.db b/mdc/serials_oep.db
index fe29cc78358475d630c9a8f2deb7995c5e19f305..5e7c9c4b0207ab8024fcb0637ab88c33e58f0853 100644 (file)
--- a/mdc/serials_oep.db
+++ b/mdc/serials_oep.db
@@ -449,3 +449,4 @@
 498 0x85000001fc778728
 499 0xd0000001fc76f728  # not light on FOT
 500 0x46000001fc76fe28
+

diff --git a/oracle/daq2stdout.pl b/oracle/daq2stdout.pl
index 888fae010e7c32eacf1e846a93923e44ef5e88fd..66ff633ae67d155f9b2acbb443461695f39f5e84 100755 (executable)
--- a/oracle/daq2stdout.pl
+++ b/oracle/daq2stdout.pl
@@ -102,30 +102,34 @@ sub readDB()
     &readAddrRangesDB("../main/address_range.db");
 
     #- Read serials_db
-    &readSerialsDB("../start/serials_start.db", "StartVeto");
+    #&readSerialsDB("../start/serials_start.db", "StartVeto");
     &readSerialsDB("../start/serials_start_trb3.db", "StartTrb3");
     &readSerialsDB("../hub/serials_hub.db", "Hub-All");
+    &readSerialsDB("../hub/serials_trb3sc.db", "Hub-AllTrb3");
     &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("../ecal/serials_trb3sc.db", "ECal");
+    #&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");
+    #&readSerialsDB("../shower/serials_shower.db", "Shw-AddOn");
     &readSerialsDB("../tof/serials_tof.db", "TOF");
     &readSerialsDB("../wall/serials_wall.db", "Wall");
-
+ 
     #- Read addresses_db
-    &readAddressesDB("../start/addresses_start.db", "StartVeto");
+    #&readAddressesDB("../start/addresses_start.db", "StartVeto");
     &readAddressesDB("../start/addresses_start_trb3.db", "StartTrb3");
     &readAddressesDB("../hub/addresses_hub.db","Hub-All");
+    &readAddressesDB("../hub/addresses_hub_trb3sc.db","Hub-AllTrb3");
     &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("../ecal/addresses_ecal.db", "ECal");
+    #&readAddressesDB("../pion/addresses_pion.db", "Pion");
+    #&readAddressesDB("../rich/addresses_trb3sc.db", "Rich-Hub");
     &readAddressesDB("../rpc/addresses_rpc.db", "RPC");
-    &readAddressesDB("../shower/addresses_shower.db", "Shw-AddOn");
+   # &readAddressesDB("../shower/addresses_shower.db", "Shw-AddOn");
     &readAddressesDB("../tof/addresses_tof.db", "TOF");
     &readAddressesDB("../wall/addresses_wall.db", "Wall");
 }
@@ -134,7 +138,9 @@ sub readSubEvtIdsDB()
 {
     my ($file2read) = @_;
     
-    my $fh = new FileHandle($file2read, "r");
+    #print "readSubEvtIdsDB is reading file $file2read \n ";
+    
+    my $fh = new FileHandle($file2read, "r") or die "could not open file $file2read";
 
     my $SPACE = "";
 
@@ -147,11 +153,14 @@ sub readSubEvtIdsDB()
               }
               {$SPACE}gxms;    # Raplace it with a single space
 
+              
+       # print   " $_ \n";    
+              
        #- Skip line if it contains only whitespaces
        next unless(/\S/);
 
        #- Extract command and parameters
-       if($_ =~ /0x(\d{4})/){
+       if($_ =~ /0x([0-9a-fA-F]{4})/){
            push(@subEvtId_list, lc($1));
        }
        else{
@@ -167,8 +176,10 @@ sub readSubEvtIdsDB()
 sub readAddrRangesDB()
 {
     my ($file2read) = @_;
+    
+     # print "readAddrRangesDB is reading file $file2read \n ";
 
-    my $fh = new FileHandle($file2read, "r");
+    my $fh = new FileHandle($file2read, "r") or die "could not open file $file2read";;
 
     my $SPACE = "";
 
@@ -203,6 +214,9 @@ sub readAddrRangesDB()
        $addr_ranges_href->{$sys}->{'min'}  = $min;
        $addr_ranges_href->{$sys}->{'max'}  = $max;
        $addr_ranges_href->{$sys}->{'type'} = $type;
+       
+       # print   " readAddrRangesDB got system $sys , min: $min, max:$max type:$type \n";    
+       
     }
     
     $fh->close;
@@ -212,7 +226,9 @@ sub readAddressesDB()
 {
     my ($file2read, $type) = @_;
 
-    my $fh = new FileHandle($file2read, "r");
+   # print "readAddressesDB is reading file $file2read for type $type \n ";
+    
+    my $fh = new FileHandle($file2read, "r") or die "could not open file $file2read";;
 
     my $SPACE = "";
 
@@ -246,6 +262,9 @@ sub readAddressesDB()
            exit(1);
        }
 
+       #print " address:$addr, serial:$serial, fpga:$fpga, design:$design trb:$trb \n";
+       
+       
        #- Add to a main configuration hash
        if( defined $conf_db_href->{'addresses'}->{$type}->{$serial}->{'addr'} ){
            if( hex($addr) < hex($conf_db_href->{'addresses'}->{$type}->{$serial}->{'addr'}) ){
@@ -299,7 +318,9 @@ sub readSerialsDB()
 {
     my ($file2read, $type) = @_;
 
-    my $fh = new FileHandle($file2read, "r");
+    #print "readSerialsDB is reading file $file2read for type $type \n ";
+    
+    my $fh = new FileHandle($file2read, "r") or die "could not open file $file2read";
 
     my $SPACE = "";
 
@@ -329,6 +350,8 @@ sub readSerialsDB()
            exit(1);
        }
 
+       #print " serial:$serial, id:$id \n";
+       
        #- Add to a main configuration hash
        $conf_db_href->{'serials'}->{$type}->{$serial} = $id;
     }
@@ -433,7 +456,7 @@ sub getSysType()
     my $ret_type;
 
     foreach my $type ( sort keys %$addr_ranges_href ){
-       next if( $type eq "Hub-All");
+       next if( $type eq "Hub-All" || $type eq "Hub-AllTrb3");
        
        my $addr_min = $addr_ranges_href->{$type}->{'min'};
        my $addr_max = $addr_ranges_href->{$type}->{'max'};