improved script to export DAQ configuration to Oracle:

clean up, avoid  dupclicate ids between old and new board scheme (serial number without or with trailiing fpga number)
snapshot of all other changes mady by anyone else.

diff --git a/control/gui/expert/Start_Speech_Output b/control/gui/expert/Start_Speech_Output
index 892f8d54b437926760a615a68a5cc07139208422..816fa2f709792e6ae5129c85e5f35b37580ed1a5 100755 (executable)
--- a/control/gui/expert/Start_Speech_Output
+++ b/control/gui/expert/Start_Speech_Output
@@ -1,5 +1,5 @@
 #!/bin/bash
-ssh hadaq@hadesp50 "killall -USR2 speakdaemon.pl"
+ssh hadaq@hadesp57 "killall -USR2 speakdaemon.pl"
 ssh hadaq@hades33 "killall -USR2 speakdaemon.pl"
 
 

diff --git a/control/gui/expert/Stop_Speech_Output b/control/gui/expert/Stop_Speech_Output
index c6b01757757c3782012c4eaaf3fd21e28b3a4cc1..55165b74e5063240fd1cd14f606c50cc0fac30f0 100755 (executable)
--- a/control/gui/expert/Stop_Speech_Output
+++ b/control/gui/expert/Stop_Speech_Output
@@ -1,6 +1,6 @@
 #!/bin/bash
 ssh hadaq@hades33 "killall -USR1 speakdaemon.pl"
 
-ssh hadaq@hadesp50 "killall -USR1 speakdaemon.pl; pkill -f espeak"
+ssh hadaq@hadesp57 "killall -USR1 speakdaemon.pl; pkill -f espeak"
 
 

diff --git a/control/gui/monitor/30_EPICS_Power b/control/gui/monitor/30_EPICS_Power
index b946ada792746f71ec510022f7e7a8aaefbb14ac..1ae3d81da92ab2960e07fdf743fc52944958f197 100755 (executable)
--- a/control/gui/monitor/30_EPICS_Power
+++ b/control/gui/monitor/30_EPICS_Power
@@ -1,2 +1,2 @@
 #!/bin/bash
-vncviewer-tigervnc -shared -passwd /home/hadaq/.vnc/passwd_scs  lxhaddcs11:44
+vncviewer-tigervnc -shared -passwd /home/hadaq/.vnc/passwd_scs  lxhaddcs11p:44

diff --git a/evtbuild/eb_2021-test.conf b/evtbuild/eb_2021-test.conf
index 65f9e7afbca84eea91117ac36c29f1178f380ffe..a7d4688cae0424a5b35c497e1ea197250c72b5f3 100644 (file)
--- a/evtbuild/eb_2021-test.conf
+++ b/evtbuild/eb_2021-test.conf
@@ -52,8 +52,8 @@ LTSM_Passwd:    wDhgcvFF7
 LTSM_Filesystem:       /lustre
 
 # following is for first FSD test setup JAM 4-2020:
-# LTSM_Node:   hadestest
-# LTSM_Passwd:    hadestest
+#LTSM_Node:    hadestest
+#LTSM_Passwd:    hadestest
 # LTSM_Filesystem:     /lustre
 
 
@@ -61,14 +61,15 @@ LTSM_USEFSD: 0
 # we need at least 5 entries here (number of eventbuilder servers)
 #LTSM_FSD_SERVERS: lxfsd01 lxfsd02-eth lxfsd03 lxfsd01
 #LTSM_FSD_SERVERS: lxfsd04-eth lxfsd07-eth lxfsd04-eth lxfsd07-eth lxfsd04-eth
-# setup tests january 2021:
-LTSM_FSD_SERVERS: lxfsd06-eth lxfsd02-eth lxfsd03-eth lxfsd07-eth lxfsd05-eth
+# setup tests september 2021:
+LTSM_FSD_SERVERS: lxfsd01 lxfsd02-eth lxfsd03-eth lxfsd06-eth lxfsd07-eth
 #LTSM_FSD_SERVERS: lxfsd01-eth lxfsd02 lxfsd03-eth lxfsd01-eth lxfsd02
 #LTSM_FSD_SERVERS: lxfsd01-eth lxfsd03-eth lxfsd01-eth lxfsd03-eth lxfsd01-eth
 LTSM_FSD_PORT: 7625 7625 7625 7625 7625
 
-
-
+# below we can optionally change storage destination: 0 - null, 1 - only FSQ server local, 2 - lustre, 3 -tsm, 4 - lustre+tsm,  
+LTSM_USEFSQDEST: 0
+LTSM_SQDEST: 4
 
 ########## end LTSM
 

diff --git a/evtbuild/start_eb_gbe_2021-test.pl b/evtbuild/start_eb_gbe_2021-test.pl
index 39d0fa0c82b3ea7b68d618a222504750d5c3f4c0..c1e2118c948c2a8522d351ceebe03a8b3f381a23 100755 (executable)
--- a/evtbuild/start_eb_gbe_2021-test.pl
+++ b/evtbuild/start_eb_gbe_2021-test.pl
@@ -151,8 +151,14 @@ sub init_CPU_status()   {
   $EB_CPU_status_href->{'192.168.105.12'}->{'build'} = "26-31";
 
   # JAM 7-2021: new servers have 64 cores, reserve lower 32 cpus for network interrupts - TODO with new set_eth_affinity.pl
-  $EB_CPU_status_href->{'192.168.105.114'}->{'input'} = "32-47";
-  $EB_CPU_status_href->{'192.168.105.114'}->{'build'} = "48-63";
+   $EB_CPU_status_href->{'192.168.105.114'}->{'input'} = "32-47";
+   $EB_CPU_status_href->{'192.168.105.114'}->{'build'} = "48-63";
+  
+#   $EB_CPU_status_href->{'192.168.105.114'}->{'input'} = "10-25";
+#  $EB_CPU_status_href->{'192.168.105.114'}->{'build'} = "26-31";
+  
+  
+  
   $EB_CPU_status_href->{'192.168.105.115'}->{'input'} = "32-47";
   
   $EB_CPU_status_href->{'192.168.105.115'}->{'build'} = "48-63";
@@ -253,7 +259,9 @@ sub getEBArgs()   {
   my @ltsm_fsd_server_list = split(/\s+/, $ltsm_fsd_servers);
   my $ltsm_fsd_ports      = $temp_args_href->{'Parallel'}->{'LTSM_FSD_PORT'};
   my @ltsm_fsd_port_list = split(/\s+/, $ltsm_fsd_ports);
-
+  
+  my $ltsm_usefsqdest    = $temp_args_href->{'Parallel'}->{'LTSM_USEFSQDEST'};
+  my $ltsm_fsqdest       = $temp_args_href->{'Parallel'}->{'LTSM_FSQDEST'};
 
   #--- Read GbE configuration
   my %eb_ids_gbe_hash;
@@ -295,6 +303,11 @@ sub getEBArgs()   {
     $href->{$ebproc}->{'LTSM_USEFSD'}  = $ltsm_usefsd;
     $href->{$ebproc}->{'LTSM_FSD_PORT'}  = $ltsm_fsd_port_list[$ebproc];
     $href->{$ebproc}->{'LTSM_FSD_SERVER'}  = $ltsm_fsd_server_list[$ebproc];
+    
+    
+    $href->{$ebproc}->{'LTSM_USEFSQDEST'}  = $ltsm_usefsqdest;    
+    $href->{$ebproc}->{'LTSM_FSQDEST'}     = $ltsm_fsqdest;  
+    
 
 
  #   if ($ebproc<7) {
@@ -552,6 +565,19 @@ sub startBnet()   {
             $exports = $exports . " export USEFSD=false;";
             $exports = $exports . " export LTSMSESSIONFILES=10;"
           }
+          #  JAM2021: for FSQ api with data destination flag:
+           if ($EB_Args_href->{$ebproc}->{'LTSM_USEFSQDEST'}) {
+            $exports = $exports . " export FSQDEST=". $EB_Args_href->{$ebproc}->{'LTSM_FSQDEST'}. ";";
+          }
+          else
+          {
+            # stick to full storage lustre and tsm-
+            $exports = $exports . " export FSQDEST=4;";          
+          }
+          
+          
+          
+          
           #       $exports = $exports . " export FSDPORT=". $EB_Args_href->{$ebproc}->{'LTSM_FSD_PORT'} . ";";           
           #        $exports = $exports . " export FSDSERVER=". $EB_Args_href->{$ebproc}->{'LTSM_FSD_SERVER'} . ";";
           my $fsdix=$ebserver % 6; # number of FSD servers used TODO get from configuration

diff --git a/hmon/QA.pm b/hmon/QA.pm
index 8cb84937f4cff6f9061c415306632b9495951d36..1bf00e7a74348ee43bf89c4b664284e49a214c4c 100644 (file)
--- a/hmon/QA.pm
+++ b/hmon/QA.pm
@@ -106,6 +106,8 @@ our @EcalHvLimits = (493,325,320);
 our @RpcHvLimits = (12,12,12);
 our @TofHvLimits = (764,760,759);
 our @FwHvLimits = (280,250,200);
+our @FrpcHvLimits = (5.5,3.9,0); #kV 5.6 -> std. / 4 -> idle
+our @ItofHvLimits = (1000,999,0);
 
 our @TdcCalibrationInterval = (320000,450000,600000);   
 our @TdcCalibrationTemperature = (5,7,10);    

diff --git a/hmon/hmon_stsrate.pl b/hmon/hmon_stsrate.pl
index b516b26c409e2170d30a4ffc73d23cebfc33b162..156407f3621fc45bd7fa3f34c7a78ca2e55a37f3 100755 (executable)
--- a/hmon/hmon_stsrate.pl
+++ b/hmon/hmon_stsrate.pl
@@ -47,66 +47,35 @@ $str .= Hmon::MakeFooter();
 Hmon::WriteFile("StsRate",$str);
 
 
-my $old;
-my $oldtime = time();
-my $time = time();
-my $diff;
-my $iter = 0;
-
-
-
 trb_init_ports() or die trb_strerror();
 
-
-while(1) {
-  #my $data;
-  #my $max = 0 ;
-  #my $min = 5E9;
-  
-  my $o = trb_register_read_mem(0xfe4c,0xc000,0,49) or die trb_strerror() or sleep 5 and next;
-
+my $old;
+while(1) {  
+  my $o = trb_registertime_read_mem(0xfe4c,0xc000,0,49) or sleep 5 and next;
   if (defined $old) {
-    my $tdiff = (time() - $oldtime)|1;
     foreach my $b (keys %$o) {
       #my $ratesum = 0;
       next unless ($b>=0x6400 && $b<=0x6473);
+      my $this_t = $o->{$b}{time}->[0];
+      my $old_t = $old->{$b}{time}->[0];
+      my $t_diff = ($this_t - $old_t) || 1;
+        $t_diff += 2**16 if $t_diff < 0;
+        $t_diff *= 16;
       my $xpos =  (($b>>4)&0xF)*10 + ($b&0xF);
 
       for my $v (0..47) {
         last if $v == 32 && ($b&0xF)==3 && $b < 0x6440;
         last if $v == 32 && ($b == 0x6464 || $b == 0x6465);
-        my $vdiff = ($o->{$b}->[$v+1]&0xfffffff) - ($old->{$b}->[$v+1]&0xfffffff);
-        
-        if ($vdiff < 0) { $vdiff += 2**28;}
-        $diff->{$b}->[$v+1] = $vdiff/$tdiff;
-        #$ratesum += $diff->{$b}->[$v+1];
-        HPlot::PlotFill('StsRate',$diff->{$b}->[$v+1],$v,$xpos);
-        }
-      #my $s = sprintf("0x%04x",$b);
-      #$data->{$s}= int(100*($ratesum / 32) +0.5) /100;
-      
-      #$min = $data->{$s} if $data->{$s} < $min;
-      #$max = $data->{$s} if  $data->{$s}> $max;
+        my $vdiff = ($o->{$b}{value}->[$v+1]&0xfffffff) - ($old->{$b}{value}->[$v+1]&0xfffffff);
+        $vdiff += 2**28 if $vdiff < 0;
+
+        HPlot::PlotFill('StsRate',$vdiff/$t_diff,$v,$xpos);
       }
+    }
     HPlot::PlotDraw('StsRate');    
     
-    
-    
-   # $data->{max} = $max;
-   # $data->{min} = $min;
-   # $data->{symbol} = " Hits/s";
-   # $data->{title} = "Mean DiRICH TDC Rate";
-    
-   
-   # $data->{updatetime} = getTimeString; 
-    
-   # my $fh;
-   # open($fh, ">", Hmon::HMONDIR."/files/richMeanRateDiRICH.json");
-   # print $fh   encode_json($data);
-   # close $fh;
-   }
+  }
     
   $old = $o;
-  $oldtime = time();
   sleep 2;
-  }
+}

diff --git a/hub/addresses_hub_trb3.db b/hub/addresses_hub_trb3.db
index 16e2b7f1deaba8103e887a86556ae580e0b662c6..2f10eb4940f591f479c0a8e1a3aa2fc4f2841fb6 100644 (file)
--- a/hub/addresses_hub_trb3.db
+++ b/hub/addresses_hub_trb3.db
@@ -21,7 +21,7 @@
  0x8b03        118            5         0         118
 
 #new TOF
-0x86c0         241     5       0       0
+0x86c0         088     5       0       0
 0x86c1         264     5       0       0
 0x86c2         006     5       0       0
 0x86c3         242     5       0       0

diff --git a/mdc/addresses_oep.db b/mdc/addresses_oep.db
index d49476415a74d3be53c53c82af6abf099c2d5f7a..65aeda76dbd516be2964ba137684a15796edd875 100644 (file)
--- a/mdc/addresses_oep.db
+++ b/mdc/addresses_oep.db
@@ -375,7 +375,7 @@
 0x2259       403         1          12        0 # 20100805 was 133, now 403
 0x225a       160         1          12        0 # 20100805 was 092, now 160
 0x225b       131         1          12        0
-0x225c       070         1          12        0
+0x225c       086         1          12        0 # #swichted with 0x225c on 19.10.2021 CW before #070 because 60% busy (new #173)
 0x225d       079         1          12        0
 0x225e       074         1          12        0 
 0x225f       072         1          12        0
@@ -517,7 +517,7 @@
 0x2359       083         1          12        0
 0x235a       274         1          12        0 #066 befor exchange with 499 5.10.2021 CW, 274 6.10.
 0x235b       069         1          12        0 # 20100806, was 082, now 069, actually it was ok, the optical cable was bad
-0x235c       086         1          12        0
+0x235c       070         1          12        0 #swichted with 0x225c on 19.10.2021 CW before #086
 0x235d       099         1          12        0
 0x235e       130         1          12        0
 0x235f       149         1          12        0

diff --git a/oracle/boards.txt b/oracle/boards.txt
index 54f35c1a4be09f7cafefafcaffafb99fff8b6d26..73318ef01d3bfb219e5ed48ec4f0a3918bf20a36 100644 (file)
--- a/oracle/boards.txt
+++ b/oracle/boards.txt
@@ -1,4 +1,3 @@
-       CTS  303  1e00000a6244da28   0010
        CTS  900  9300000270e8dd28   0002
     TRB3sc 1421  2c00000940a5fa28   8800
     TRB3sc 3101  2900000a63092028   8810
@@ -100,11 +99,10 @@
    MDC-OEP   62  18000001fc2f0328   2328
    MDC-OEP   64  c0000001fc2f2128   2329
    MDC-OEP   65  21000001fc763528   231f
-   MDC-OEP   66  05000001fc763a28   235a
    MDC-OEP   67  1d000001fc645528   2313
    MDC-OEP   68  2a000001fc645428   2213
    MDC-OEP   69  c6000001fc5db228   235b
-   MDC-OEP   70  87000001fc643628   225c
+   MDC-OEP   70  87000001fc643628   235c
    MDC-OEP   71  db000001fc60f228   2310
    MDC-OEP   72  6b000001fc5dd028   225f
    MDC-OEP   73  b5000001fc5dc728   2205
@@ -118,7 +116,7 @@
    MDC-OEP   82  9c000001fc718028   2323
    MDC-OEP   83  42000001ff5fea28   2359
    MDC-OEP   84  8f000001ff5ff328   220e
-   MDC-OEP   86  0d000001ff5f4428   235c
+   MDC-OEP   86  0d000001ff5f4428   225c
    MDC-OEP   87  16000001ff3a6628   2025
    MDC-OEP   89  d2000001fc2eb328   220d
    MDC-OEP   90  91000001ff3a7228   2222
@@ -265,6 +263,7 @@
    MDC-OEP  266  dd000001fc65ba28   2002
    MDC-OEP  272  dc000001fc298528   2209
    MDC-OEP  273  13000001fc298f28   214f
+   MDC-OEP  274  0a000001fc585328   235a
    MDC-OEP  275  b0000001fc299428   220b
    MDC-OEP  276  9c000001fc585a28   210d
    MDC-OEP  277  f8000001fc298a28   214c
@@ -439,16 +438,17 @@
    MDC-OEP  500  46000001fc76fe28   213e
     TRB3sc 2011  3300000a62e98e28   5813
     TRB3sc 2021  9900000a6244ce28   5818
-    TRB3sc 2031  5400000a631eea28   5826
     TRB3sc 2041  ec00000a6300a428   5847
     TRB3sc 2051  4600000a628e9c28   5827
     TRB3sc 2061  a700000a628ec628   5837
     TRB3sc 2071  a800000a62955028   5833
     TRB3sc 2091  1800000a631ed228   5854
+    TRB3sc 2101  bd00000a627d9228   5826
     TRB3sc 2111  e000000a62e97628   5822
     TRB3sc 2121  e900000a62442d28   5810
     TRB3sc 2131  9400000a63057628   5843
     TRB3sc 2141  8e00000a6244e628   5838
+    TRB3sc 2151  3600000a63009528   5855
     TRB3sc 2161  7b00000a63067e28   5802
     TRB3sc 2171  4200000a628eba28   5844
     TRB3sc 2181  4e00000a62e98228   5853
@@ -457,7 +457,6 @@
     TRB3sc 2221  5400000a63092c28   5812
     TRB3sc 2231  7200000a631ef628   5817
     TRB3sc 2241  f700000a631ef128   5811
-    TRB3sc 2251  4f00000a62e0d628   5855
     TRB3sc 2261  3b00000a6295fa28   5823
     TRB3sc 2271  5d00000a628ede28   5832
     TRB3sc 2281  e000000a631ed928   5824
@@ -497,679 +496,6 @@
     TRB3sc 3181  dd00000a624b3d28   84c2
     TRB3sc 3191  5800000a63218528   84c5
     TRB3sc 3201  5500000a6310f128   84c0
-    DiRich    1  ca00000711f93828   7000
-    DiRich   50  e000000a52311328   7034
-    DiRich   51  6100000a522d1728   7140
-    DiRich   52  1d00000a52420428   7062
-    DiRich   54  2b00000a52745428   7013
-    DiRich   55  f600000a52631328   7352
-    DiRich   56  8f00000a525b7328   7022
-    DiRich   58  d500000a525e9b28   7023
-    DiRich   59  6900000a52741528   7393
-    DiRich   60  5b00000a522ed228   7063
-    DiRich   61  6c00000a5232f628   7093
-    DiRich   63  f900000a52916528   7943
-    DiRich   64  6100000a52965a28   7823
-    DiRich   66  3000000a52915a28   7574
-    DiRich   67  ff00000a48b0fd28   71b5
-    DiRich   68  a200000a48afd628   7284
-    DiRich   69  ef00000a48af6b28   7073
-    DiRich   70  1a00000a48af8f28   7585
-    DiRich   71  d800000a529e4e28   7094
-    DiRich   72  3700000a5291ea28   7594
-    DiRich   74  8400000a529a8a28   7723
-    DiRich   75  d200000a52865028   7084
-    DiRich   77  4400000a5297c928   7595
-    DiRich   79  9400000a529f6f28   7175
-    DiRich   80  1300000a528cd928   71a5
-    DiRich   81  c500000a5288e628   7075
-    DiRich   85  4800000a52a17728   7092
-    DiRich   86  f700000a48eeb028   7192
-    DiRich   87  9900000a49498228   7085
-    DiRich   88  e000000a48ee9828   7474
-    DiRich   89  3300000a48ed4b28   7584
-    DiRich   90  3f00000a520cb628   7495
-    DiRich   92  2900000a49237028   7184
-    DiRich   93  6c00000a49238128   7675
-    DiRich   94  c200000a49237528   7275
-    DiRich   95  5400000a49237c28   7082
-    DiRich   96  dd00000a494add28   7095
-    DiRich   97  a200000a48d3ee28   7375
-    DiRich   98  dc00000a529a0c28   7923
-    DiRich   99  c900000a48af7728   7072
-    DiRich  100  6900000a52936b28   7194
-    DiRich  102  6e00000a528ee728   7385
-    DiRich  103  d800000a5292e228   7475
-    DiRich  104  db00000a48b0f228   7494
-    DiRich  106  ce00000a49003f28   7292
-    DiRich  107  8400000a48e26928   7732
-    DiRich  108  b000000a4907ea28   7285
-    DiRich  109  8700000a4907eb28   7a05
-    DiRich  110  fd00000a49400e28   7141
-    DiRich  111  5200000a495c5a28   7485
-    DiRich  112  8100000a495bed28   7174
-    DiRich  113  e500000a48c97f28   7395
-    DiRich  114  b300000a48c98028   7185
-    DiRich  115  af00000a495bbd28   7195
-    DiRich  116  3700000a49497628   7294
-    DiRich  117  1300000a49497928   7295
-    DiRich  118  9400000a49496d28   7074
-    DiRich  119  1100000a49496a28   7706
-    DiRich  120  1900000a48ef0f28   7083
-    DiRich  121  d400000a48ef1628   7822
-    DiRich  122  6400000a5296f928   7374
-    DiRich  124  a500000a52981428   7384
-    DiRich  125  6a00000a52837428   7722
-    DiRich  126  5800000a52849928   7922
-    DiRich  127  8e00000a5280a628   7394
-    DiRich  128  b400000a525a0128   7575
-    DiRich  129  4000000a52246a28   7484
-    DiRich  130  0e00000a525a4b28   7442
-    DiRich  131  4400000a49f50128   7472
-    DiRich  132  f000000a49dfc328   7113
-    DiRich  133  c100000a49f50628   7482
-    DiRich  134  5300000a48b56728   7446
-    DiRich  136  d800000a49dfa628   7a15
-    DiRich  139  6000000a52013528   7932
-    DiRich  142  5600000a48b0b928   7024
-    DiRich  143  c300000a48e4dd28   7015
-    DiRich  144  3c00000a5204e828   7014
-    DiRich  145  fe00000a52462928   7492
-    DiRich  147  8d00000a48b65b28   7025
-    DiRich  148  9a00000a48b55828   7162
-    DiRich  149  9e00000a52222b28   7163
-    DiRich  150  3300000a48f73828   7052
-    DiRich  151  c000000a48b6e628   7045
-    DiRich  152  5600000a48b6ef28   7042
-    DiRich  153  2b00000a48b6e328   7032
-    DiRich  154  2b00000a52229d28   7055
-    DiRich  155  8800000a49c06228   7297
-    DiRich  156  f500000a4931cf28   7016
-    DiRich  157  0a00000a48b56428   7043
-    DiRich  158  1d00000a48b66728   7270
-    DiRich  159  5f00000a49dfb228   7012
-    DiRich  160  4600000a493fd228   7493
-    DiRich  161  4700000a49769028   7033
-    DiRich  162  5700000a48b66a28   7152
-    DiRich  164  c100000a493fc628   7362
-    DiRich  165  6e00000a493aca28   7363
-    DiRich  166  fe00000a495f9628   7353
-    DiRich  167  5300000a495eed28   7253
-    DiRich  168  d200000a493ab528   7263
-    DiRich  169  b400000a495f9b28   7053
-    DiRich  170  9e00000a495ef428   7252
-    DiRich  171  2a00000a493abe28   7153
-    DiRich  172  0000000a48e2eb28   7262
-    DiRich  174  4800000a493bcf28   7433
-    DiRich  175  cf00000a493bdb28   7443
-    DiRich  176  8500000a48e2ec28   7b15
-    DiRich  179  3a00000a49769c28   7952
-    DiRich  180  9b00000a49efe028   7742
-    DiRich  182  3200000a49efa428   7522
-    DiRich  183  0000000a49f57528   7942
-    DiRich  184  8e00000a48d84e28   7934
-    DiRich  185  e500000a48e38e28   7205
-    DiRich  187  af00000a48e38328   7305
-    DiRich  188  f100000a48d7d628   7711
-    DiRich  189  0900000a48d7dd28   7423
-    DiRich  190  7400000a48d7d128   7953
-    DiRich  191  d700000a48d7ca28   7853
-    DiRich  192  f300000a48d7c528   7306
-    DiRich  193  2600000a48e2f728   7512
-    DiRich  194  4500000a48e30328   7412
-    DiRich  195  0200000a48e2f828   7753
-    DiRich  196  b900000a48fc2028   7752
-    DiRich  197  2600000a491c8928   7413
-    DiRich  198  5200000a48fc2528   7642
-    DiRich  199  9800000a48e38228   7513
-    DiRich  200  5e00000a49401528   7210
-    DiRich  201  eb00000a491c9028   7852
-    DiRich  202  1200000a49254d28   7743
-    DiRich  203  a200000a49255828   7843
-    DiRich  204  9500000a49255928   7523
-    DiRich  205  e400000a494dea28   7532
-    DiRich  206  cc00000a48fc6028   7542
-    DiRich  207  2900000a494df328   7632
-    DiRich  209  6200000a49eb0a28   7432
-    DiRich  212  8900000a49eb0f28   7533
-    DiRich  214  5100000a48e3bd28   7422
-    DiRich  215  4c00000a48e3ca28   7633
-    DiRich  216  3f00000a48dda328   7643
-    DiRich  219  8e00000a49251b28   7133
-    DiRich  220  d200000a49078228   7212
-    DiRich  221  f800000a49b47128   7833
-    DiRich  222  6200000a49da9128   7933
-    DiRich  223  ba00000a49ed7e28   7733
-    DiRich  224  5100000a49ed7b28   7322
-    DiRich  225  c700000a49ed7228   7314
-    DiRich  226  2600000a49313728   7214
-    DiRich  229  c200000a49c06f28   71a2
-    DiRich  231  8f00000a49bfc128   7427
-    DiRich  232  3600000a48b2f028   7325
-    DiRich  233  d000000a48b30328   7225
-    DiRich  234  b300000a48b2f728   7125
-    DiRich  235  6600000a48d64328   7224
-    DiRich  236  2800000a48b30828   7115
-    DiRich  237  fd00000a48e73e28   7315
-    DiRich  239  0800000a48bbe928   7313
-    DiRich  240  0200000a49ea6828   7383
-    DiRich  241  2c00000a48e3b128   7213
-    DiRich  243  9e00000a48d64828   7324
-    DiRich  244  ad00000a48b30f28   7604
-    DiRich  245  0e00000a48b31428   7215
-    DiRich  246  ba00000a48b32728   7124
-    DiRich  247  2a00000a48b31b28   7372
-    DiRich  249  8000000a48f3df28   7223
-    DiRich  250  f700000a49452c28   7312
-    DiRich  251  6100000a49452528   7907
-    DiRich  252  8a00000a49452028   7114
-    DiRich  253  d900000a48f3dc28   7323
-    DiRich  254  9300000a494af628   7044
-    DiRich  255  1b00000a497dd328   7244
-    DiRich  256  3d00000a49082628   7335
-    DiRich  257  3b00000a48e4d628   7245
-    DiRich  258  5700000a49080228   7807
-    DiRich  259  d600000a49082328   7235
-    DiRich  260  be00000a48e4d128   7065
-    DiRich  261  2100000a48afe428   7601
-    DiRich  262  0600000a48e0ec28   7064
-    DiRich  263  a000000a48afc528   7173
-    DiRich  264  3600000a48afcc28   7193
-    DiRich  265  6b00000a48afe928   7172
-    DiRich  266  4b00000a48afc028   7135
-    DiRich  267  1f00000a4922ed28   7134
-    DiRich  268  8f00000a490e7628   7144
-    DiRich  269  b100000a48afd828   7145
-    DiRich  270  2700000a48afd128   7283
-    DiRich  271  4200000a49092028   7282
-    DiRich  274  5900000a49f00b28   7554
-    DiRich  275  4e00000a49f02328   7565
-    DiRich  277  e400000a49efff28   7035
-    DiRich  278  1300000a4885b728   7273
-    DiRich  280  c700000a49083e28   7264
-    DiRich  283  ba00000a49083228   7254
-    DiRich  284  2c00000a49083b28   7655
-    DiRich  285  5300000a4886ce28   7435
-    DiRich  286  a500000a48925128   7654
-    DiRich  288  1500000a48924428   7564
-    DiRich  289  c500000a4886c728   7464
-    DiRich  290  4a00000a49f11c28   7165
-    DiRich  291  7f00000a4885a628   7364
-    DiRich  292  6b00000a48a72128   7454
-    DiRich  293  3600000a495f2c28   7465
-    DiRich  294  0100000a495f2d28   7265
-    DiRich  295  cf00000a48961128   7355
-    DiRich  296  7c00000a495f2128   7832
-    DiRich  298  3b00000a49281828   7455
-    DiRich  299  d000000a49281d28   7555
-    DiRich  300  2c00000a49283028   7365
-    DiRich  301  ab00000a49282428   7354
-    DiRich  302  e100000a49282928   7a03
-    DiRich  303  bc00000a4885c628   7544
-    DiRich  304  8b00000a4884de28   7645
-    DiRich  305  6600000a49a5a428   7164
-    DiRich  306  7f00000a48868d28   7535
-    DiRich  308  0000000a48869228   7644
-    DiRich  309  fb00000a49a57728   7293
-    DiRich  310  8400000a49a56828   7255
-    DiRich  311  fc00000a49e5d128   7534
-    DiRich  313  0500000a48851a28   7545
-    DiRich  314  4e00000a495f8328   7155
-    DiRich  315  c200000a493f5028   7444
-    DiRich  316  1100000a49766f28   7634
-    DiRich  317  9600000a4927fd28   7635
-    DiRich  318  6e00000a4927f628   7154
-    DiRich  319  5f00000a494b7328   7272
-    DiRich  323  7700000a48bbf628   7664
-    DiRich  324  a100000a4882fe28   7182
-    DiRich  326  8700000a48868628   7183
-    DiRich  329  4f00000a4973a128   7665
-    DiRich  331  8300000a49c5c528   7334
-    DiRich  332  da00000a49c5c628   7344
-    DiRich  333  cc00000a49c33d28   7445
-    DiRich  334  aa00000a496b9c28   7234
-    DiRich  335  3800000a49380728   7434
-    DiRich  336  e300000a4938b328   7345
-    DiRich  337  bd00000a49380028   7a07
-    DiRich  339  ba00000a48bbef28   7514
-    DiRich  342  bf00000a49c34828   7610
-    DiRich  344  df00000a497b5528   7521
-    DiRich  345  8800000a4931c328   7646
-    DiRich  346  3a00000a497b2928   7111
-    DiRich  347  7000000a497b2428   7120
-    DiRich  349  a000000a49856c28   7647
-    DiRich  350  2c00000a497dd228   7110
-    DiRich  352  7a00000a49855d28   7121
-    DiRich  353  6d00000a49857528   7417
-    DiRich  354  8300000a49084a28   70a2
-    DiRich  356  2200000a4907c528   7132
-    DiRich  357  1400000a49785228   7a31
-    DiRich  359  7300000a49091428   7483
-    DiRich  361  2e00000a488f1328   7525
-    DiRich  363  3f00000a488f0e28   7425
-    DiRich  364  5000000a48919e28   7373
-    DiRich  366  9800000a49789c28   7593
-    DiRich  367  7500000a4978ac28   7414
-    DiRich  369  4d00000a496aea28   7693
-    DiRich  370  6100000a49790b28   7682
-    DiRich  371  0c00000a49a58028   7672
-    DiRich  372  8100000a49e5dd28   7582
-    DiRich  373  f800000a49e3a128   7473
-    DiRich  374  9400000a49ec3728   7592
-    DiRich  375  fb00000a49aaf028   7142
-    DiRich  376  d200000a49ec5028   7673
-    DiRich  377  e300000a48ae1828   7320
-    DiRich  380  a900000a488f0728   7332
-    DiRich  381  8b00000a48e5da28   7333
-    DiRich  382  1900000a48ae0028   7906
-    DiRich  384  ef00000a48c49528   7462
-    DiRich  385  1700000a48c49e28   7242
-    DiRich  386  6a00000a48c49228   7692
-    DiRich  387  c900000a48c48928   7583
-    DiRich  388  1000000a48c53728   7463
-    DiRich  389  4900000a48c53428   7524
-    DiRich  390  9200000a4947c628   7026
-    DiRich  391  4c00000a4947d128   7021
-    DiRich  392  4a00000a49486328   7342
-    DiRich  393  ea00000a4948ee28   7243
-    DiRich  394  7d00000a49486228   7562
-    DiRich  395  cb00000a4947c528   7563
-    DiRich  396  8e00000a497b1a28   7553
-    DiRich  397  aa00000a497b1528   7452
-    DiRich  398  bf00000a49c06328   7232
-    DiRich  399  0b00000a49cde528   7683
-    DiRich  400  fc00000a497af328   7343
-    DiRich  401  d800000a49333b28   7572
-    DiRich  403  f800000a48aa3e28   7122
-    DiRich  404  2a00000a48aa4328   7573
-    DiRich  405  1e00000a48a9ff28   7143
-    DiRich  406  6e00000a48aa3728   7453
-    DiRich  408  2200000a494b7f28   7233
-    DiRich  409  f000000a494b0228   7515
-    DiRich  411  b500000a494aea28   7624
-    DiRich  412  d400000a494b0d28   7123
-    DiRich  413  da00000a494b7428   7662
-    DiRich  414  4a00000a488a3328   7653
-    DiRich  415  f400000a4880a528   7663
-    DiRich  417  7d00000a488a3228   7625
-    DiRich  418  4400000a4880b028   7614
-    DiRich  419  c300000a4880a428   7652
-    DiRich  420  8e00000a4929b728   7415
-    DiRich  421  c700000a495cc528   7552
-    DiRich  422  6800000a48ca1f28   7615
-    DiRich  423  3a00000a488fad28   7112
-    DiRich  424  fc00000a495be128   7424
-    DiRich  425  5400000a495f4428   7130
-    DiRich  426  a800000a48e01828   7304
-    DiRich  427  2d00000a48e01f28   7406
-    DiRich  428  1900000a48d9db28   7605
-    DiRich  429  3800000a48e02428   7222
-    DiRich  430  a100000a48ca2028   7606
-    DiRich  431  eb00000a495bc928   7407
-    DiRich  432  ac00000a48e03e28   7504
-    DiRich  433  5000000a48e01328   7506
-    DiRich  434  f700000a488fb428   7405
-    DiRich  435  7600000a488f9528   7607
-    DiRich  436  9d00000a488f9028   7507
-    DiRich  438  aa00000a48e00b28   7404
-    DiRich  439  bd00000a488fb928   7505
-    DiRich  440  fe00000a488f7d28   7105
-    DiRich  441  5800000a495c0528   7131
-    DiRich  442  fd00000a4929c228   7392
-    DiRich  444  d900000a495b6b28   7204
-    DiRich  446  e100000a48b64a28   7207
-    DiRich  447  7a00000a48b6ac28   7104
-    DiRich  448  ab00000a49082f28   7307
-    DiRich  449  c500000a48b64528   7106
-    DiRich  454  db00000a48e25f28   7935
-    DiRich  456  ca00000a49f1b828   7834
-    DiRich  457  2a00000a49a82928   7835
-    DiRich  458  d200000a49a82228   7206
-    DiRich  459  d700000a49f1cf28   7925
-    DiRich  460  d600000a49f14a28   7420
-    DiRich  461  2f00000a49f1c428   7107
-    DiRich  462  d900000a49e13f28   7b16
-    DiRich  463  ef00000a49dc8c28   7861
-    DiRich  464  ea00000a4992a728   7876
-    DiRich  465  4100000a49853628   7b03
-    DiRich  466  ce00000a4992a828   7b22
-    DiRich  467  7600000a4991da28   7603
-    DiRich  468  7a00000a49dc1328   7543
-    DiRich  469  a100000a49922f28   7b36
-    DiRich  474  8100000a48b40328   7623
-    DiRich  476  2700000a48e04028   7613
-    DiRich  477  7e00000a48b3f728   7612
-    DiRich  479  0400000a48b40428   7622
-    DiRich  480  2900000a48d96a28   72a2
-    DiRich  482  5600000a48aaca28   70a6
-    DiRich  484  0f00000a48d97628   7b21
-    DiRich  485  c300000a48f77f28   7816
-    DiRich  486  b100000a48b1cf28   7b12
-    DiRich  487  9b00000a491c7328   7241
-    DiRich  489  5b00000a48b43228   7b32
-    DiRich  490  bb00000a48e9c728   70b1
-    DiRich  491  d900000a48b59c28   70b7
-    DiRich  492  4200000a49dcee28   7a02
-    DiRich  493  8200000a49dd0128   70a5
-    DiRich  494  af00000a4982df28   7b27
-    DiRich  495  c500000a49dcfa28   7b34
-    DiRich  496  6300000a49824328   7b35
-    DiRich  497  be00000a49b35928   7766
-    DiRich  498  8a00000a493d7c28   7867
-    DiRich  499  0000000a496a5728   7860
-    DiRich  500  5c00000a492ae128   7761
-    DiRich  501  c700000a49283528   7070
-    DiRich  502  4800000a4927ea28   7866
-    DiRich  504  e800000a4895a328   7200
-    DiRich  506  2900000a495c6328   7b10
-    DiRich  508  1c00000a48b28628   70a1
-    DiRich  509  4200000a48b32c28   70a0
-    DiRich  511  7d00000a49dca328   7760
-    DiRich  514  1000000a4992bf28   70b0
-    DiRich  516  1000000a488fdb28   7b17
-    DiRich  518  6b00000a488fe228   72a4
-    DiRich  519  8900000a49279928   7296
-    DiRich  521  f700000a48c44128   7061
-    DiRich  524  0700000a49dd0628   73a5
-    DiRich  525  cc00000a49dd2a28   7b25
-    DiRich  528  7b00000a49a0ae28   72b4
-    DiRich  529  7800000a49a12128   7497
-    DiRich  530  5000000a49a05d28   72a5
-    DiRich  531  7f00000a49a08828   7197
-    DiRich  532  ac00000a49a07028   7496
-    DiRich  533  d800000a49a0b528   7770
-    DiRich  534  b500000a499e3d28   71a4
-    DiRich  536  7000000a49237328   7387
-    DiRich  537  0b00000a49263728   71b4
-    DiRich  539  f100000a499e4928   73a4
-    DiRich  541  3f00000a49563428   73b4
-    DiRich  542  2900000a4955b228   7397
-    DiRich  543  b200000a49ad2428   7487
-    DiRich  545  f200000a49562d28   73b5
-    DiRich  546  d900000a49dc0828   7b26
-    DiRich  547  5400000a4992cb28   7560
-    DiRich  548  ac00000a4992c028   7274
-    DiRich  550  9d00000a49549828   72b5
-    DiRich  551  0f00000a49817928   7771
-    DiRich  552  f400000a49ed5528   7842
-    DiRich  553  5800000a49af9628   73b1
-    DiRich  555  3a00000a49237e28   7a01
-    DiRich  556  c200000a494cef28   7620
-    DiRich  558  5d00000a48da8428   7396
-    DiRich  559  ab00000a491ddb28   7710
-    DiRich  560  d700000a499e5528   7b24
-    DiRich  561  0000000a491bda28   7366
-    DiRich  564  a700000a48da9c28   7501
-    DiRich  567  6c00000a48af5928   7400
-    DiRich  568  8300000a48da9328   7102
-    DiRich  570  0000000a49a7d828   7503
-    DiRich  571  7e00000a49db7a28   7100
-    DiRich  576  ba00000a4906ac28   7403
-    DiRich  577  2c00000a4906a528   7600
-    DiRich  578  7200000a498feb28   7500
-    DiRich  579  d800000a49828c28   7602
-    DiRich  580  db00000a4990a128   7054
-    DiRich  581  e900000a49900328   7103
-    DiRich  582  0f00000a491c6928   70b6
-    DiRich  583  5d00000a48b06328   7801
-    DiRich  584  3800000a494ec528   7301
-    DiRich  585  7600000a4912dd28   7402
-    DiRich  586  5100000a49124428   7700
-    DiRich  587  7500000a49124b28   7701
-    DiRich  588  d800000a4906c428   7401
-    DiRich  589  d600000a4906bd28   7502
-    DiRich  591  4200000a49551328   7911
-    DiRich  592  6800000a49dc9828   7616
-    DiRich  593  3d00000a4884fe28   7a13
-    DiRich  594  6d00000a4992b328   7811
-    DiRich  596  7500000a49563928   7810
-    DiRich  598  5400000a498ff728   7411
-    DiRich  599  ac00000a498ffc28   7617
-    DiRich  600  d100000a4955b928   7611
-    DiRich  601  5400000a4955be28   7416
-    DiRich  602  a700000a49b76c28   7910
-    DiRich  604  2200000a49b67228   7510
-    DiRich  605  2a00000a49ec5b28   7321
-    DiRich  607  af00000a49ec5c28   7900
-    DiRich  609  c900000a491be528   7b20
-    DiRich  611  2c00000a491dcf28   7800
-    DiRich  612  5900000a491bd928   7627
-    DiRich  613  0400000a48da8728   7511
-    DiRich  614  e000000a49673d28   7901
-    DiRich  616  eb00000a49ddb328   7426
-    DiRich  619  9d00000a49673128   7527
-    DiRich  622  a200000a49db7e28   7410
-    DiRich  623  1a00000a49db2728   73a3
-    DiRich  625  a300000a49923c28   73b2
-    DiRich  626  c600000a4992e428   7526
-    DiRich  627  4300000a4992e328   7517
-    DiRich  629  5600000a4992d828   71a3
-    DiRich  630  0000000a49818528   7a33
-    DiRich  631  eb00000a49818028   7220
-    DiRich  632  dd00000a48adfb28   7636
-    DiRich  634  c300000a4920db28   73a2
-    DiRich  635  b400000a48b35e28   7516
-    DiRich  638  e800000a48f3e828   7382
-    DiRich  639  b100000a48f3eb28   7536
-    DiRich  642  c500000a49bfcc28   7196
-    DiRich  643  f200000a49bfcd28   7436
-    DiRich  645  be00000a49858d28   7311
-    DiRich  646  5900000a499cba28   7546
-    DiRich  647  c300000a49858128   7626
-    DiRich  650  3700000a496a5628   7a32
-    DiRich  652  9800000a492c6728   70a7
-    DiRich  653  1100000a496a4a28   7637
-    DiRich  654  2600000a496a4b28   72b2
-    DiRich  655  9500000a492ade28   7902
-    DiRich  656  5600000a48e02628   7a34
-    DiRich  657  4300000a48e01d28   7802
-    DiRich  658  c600000a48e01a28   7702
-    DiRich  660  6500000a48e00128   7170
-    DiRich  662  4d00000a4912b628   7703
-    DiRich  663  6100000a49261328   7803
-    DiRich  667  da00000a48924e28   7912
-    DiRich  668  5a00000a48805128   7813
-    DiRich  669  fa00000a49b74928   7712
-    DiRich  670  ed00000a49b76128   73b3
-    DiRich  671  dc00000a49b75528   7227
-    DiRich  672  da00000a49b76028   7812
-    DiRich  673  0500000a49f0ab28   7326
-    DiRich  674  3400000a49f09f28   7806
-    DiRich  675  3200000a49f0aa28   7871
-    DiRich  676  0300000a49f09e28   7596
-    DiRich  677  4900000a49f09328   7a22
-    DiRich  678  2200000a48924528   7447
-    DiRich  681  9a00000a49e3c928   7b14
-    DiRich  682  8b00000a49e3d428   7171
-    DiRich  683  4000000a49e3f828   7547
-    DiRich  684  0800000a49124728   7b23
-    DiRich  685  2c00000a49124828   7437
-    DiRich  686  6300000a4912e628   7b01
-    DiRich  687  f300000a4912da28   7421
-    DiRich  689  0000000a49dbe028   7211
-    DiRich  690  1c00000a49d6a728   7310
-    DiRich  691  9b00000a49d6b328   7537
-    DiRich  692  fd00000a49dc0728   7520
-    DiRich  693  e700000a49924828   7621
-    DiRich  695  e300000a493b9828   7a12
-    DiRich  696  9c00000a493b8728   7280
-    DiRich  697  1900000a493b8028   7317
-    DiRich  699  2200000a49111a28   7731
-    DiRich  700  9200000a49110f28   7221
-    DiRich  702  4100000a48ff0028   7201
-    DiRich  704  dc00000a4906e228   7a24
-    DiRich  705  a800000a4949b628   7b06
-    DiRich  706  9100000a49074628   7216
-    DiRich  708  ee00000a499e2d28   7713
-    DiRich  709  7800000a499e2428   7226
-    DiRich  710  ff00000a499e3028   7117
-    DiRich  711  5000000a4912c128   7a14
-    DiRich  713  2200000a48d63728   7202
-    DiRich  714  4200000a49135328   7302
-    DiRich  715  0800000a49135e28   7217
-    DiRich  716  bd00000a4912f128   7126
-    DiRich  717  c000000a4912fd28   7a23
-    DiRich  718  1e00000a49260c28   7116
-    DiRich  719  e400000a4912f228   7127
-    DiRich  720  aa00000a4912d928   7203
-    DiRich  721  e900000a49ae1f28   7303
-    DiRich  722  bc00000a49e3d528   7a25
-    DiRich  724  f000000a49e3ed28   7913
-    DiRich  725  c700000a49e3ec28   7903
-    DiRich  726  a800000a497b0628   7316
-    DiRich  727  7f00000a49313428   72b3
-    DiRich  728  8c00000a497b0928   7327
-    DiRich  730  c000000a497b3128   7a06
-    DiRich  731  4500000a497b3628   7676
-    DiRich  732  2400000a48c81528   7597
-    DiRich  733  4c00000a48c82228   7697
-    DiRich  734  7d00000a48c81628   7577
-    DiRich  735  f300000a492cc628   7763
-    DiRich  736  3400000a48cba628   7587
-    DiRich  737  4300000a48fc3828   7776
-    DiRich  738  9000000a48ca1428   7686
-    DiRich  739  d600000a494e6328   7651
-    DiRich  740  9400000a4885a328   7020
-    DiRich  741  0000000a49312b28   7576
-    DiRich  742  7500000a4938ba28   7011
-    DiRich  743  a700000a4927c928   7030
-    DiRich  744  8e00000a49c05728   7690
-    DiRich  746  b800000a48ef0728   7027
-    DiRich  747  8100000a497aff28   7017
-    DiRich  748  b200000a491c9328   7681
-    DiRich  750  d800000a4943af28   7036
-    DiRich  751  1500000a4943b628   7772
-    DiRich  752  5f00000a4943bb28   7680
-    DiRich  753  4600000a48967c28   7670
-    DiRich  754  8d00000a48c85128   7380
-    DiRich  755  1000000a48968328   7481
-    DiRich  756  d400000a48c85228   7370
-    DiRich  757  1f00000a492c7328   7471
-    DiRich  759  d600000a491cce28   7570
-    DiRich  760  e100000a491ccf28   7010
-    DiRich  761  c900000a491caa28   7b05
-    DiRich  762  9c00000a491cc328   70b5
-    DiRich  764  9700000a49128728   7180
-    DiRich  765  9800000a49127b28   7290
-    DiRich  766  d800000a491cb728   7181
-    DiRich  767  6f00000a49128c28   7470
-    DiRich  768  d200000a48e6f228   7580
-    DiRich  769  7600000a49e98628   7031
-    DiRich  770  e200000a49852d28   7037
-    DiRich  771  0600000a498f2e28   72a3
-    DiRich  772  8300000a498f2928   7691
-    DiRich  773  3100000a49897928   7590
-    DiRich  774  7b00000a498f2228   7581
-    DiRich  775  8d00000a498a2d28   7591
-    DiRich  776  0a00000a498a3928   7490
-    DiRich  777  6600000a498a2828   7571
-    DiRich  778  4000000a498a3428   7390
-    DiRich  779  c600000a498fd828   7480
-    DiRich  780  8e00000a498edf28   7371
-    DiRich  781  3e00000a498fd328   7391
-    DiRich  782  0b00000a498ed828   7190
-    DiRich  783  4300000a498fdf28   7381
-    DiRich  784  4100000a498fcc28   7671
-    DiRich  785  8c00000a498ecc28   7291
-    DiRich  786  f300000a498ed328   7281
-    DiRich  787  0400000a498a4028   7191
-    DiRich  788  7400000a49898828   7491
-    DiRich  789  1b00000a49e1da28   7951
-    DiRich  790  d200000a49e1e528   7950
-    DiRich  791  7400000a498ec728   7851
-    DiRich  792  9e00000a498f5e28   7850
-    DiRich  793  5100000a4943c228   7740
-    DiRich  795  ba00000a4943c728   70b3
-    DiRich  796  2c00000a4943ce28   7840
-    DiRich  797  6200000a49126328   7940
-    DiRich  798  ef00000a48c83928   7841
-    DiRich  799  6800000a48c82d28   7076
-    DiRich  802  3b00000a48967028   7240
-    DiRich  803  ef00000a491cb628   7541
-    DiRich  804  3100000a48c82e28   7530
-    DiRich  805  6100000a4912f528   7531
-    DiRich  806  fe00000a491cab28   7431
-    DiRich  807  c200000a4912ee28   7540
-    DiRich  808  4300000a49073b28   7341
-    DiRich  809  9000000a49a7e428   7440
-    DiRich  810  0900000a49073628   7441
-    DiRich  811  7200000a495a2528   7331
-    DiRich  812  d500000a49073228   7430
-    DiRich  815  6500000a49072728   7330
-    DiRich  816  c400000a48f3ab28   7340
-    DiRich  817  d000000a4945b528   7721
-    DiRich  819  ec00000a494ae928   7720
-    DiRich  820  5000000a49e61d28   7231
-    DiRich  822  1a00000a488f8428   7931
-    DiRich  823  7100000a492a2728   7930
-    DiRich  825  6200000a499dc828   7831
-    DiRich  826  3c00000a49827528   7830
-    DiRich  828  4400000a499dd428   7730
-    DiRich  829  5100000a499def28   7631
-    DiRich  830  5d00000a49523828   7630
-    DiRich  831  ce00000a499e0428   7641
-    DiRich  832  a800000a4951f728   7640
-    DiRich  834  da00000a49409728   7561
-    DiRich  835  4b00000a495f2028   7687
-    DiRich  836  1100000a49520028   7696
-    DiRich  837  f000000a48c85d28   7271
-    DiRich  838  b800000a48c7c428   7741
-    DiRich  840  3700000a4906e728   7750
-    DiRich  841  c100000a48c86928   7751
-    DiRich  842  8f00000a48c7c528   7921
-    DiRich  844  0900000a492cde28   7820
-    DiRich  846  6900000a4949c528   7450
-    DiRich  848  ec00000a4949c228   7257
-    DiRich  849  e600000a49260728   7660
-    DiRich  851  c400000a499e5b28   7821
-    DiRich  852  9d00000a499e5828   7b30
-    DiRich  853  b300000a49b7d228   7090
-    DiRich  854  e900000a49e18e28   7091
-    DiRich  855  4300000a499e4f28   71b1
-    DiRich  856  0a00000a49936128   72a6
-    DiRich  857  b300000a4988d728   71a6
-    DiRich  858  9500000a4988cb28   72b7
-    DiRich  859  b500000a4988e228   7080
-    DiRich  860  a000000a498f9628   73b7
-    DiRich  861  7a00000a498fa728   7086
-    DiRich  862  6b00000a498fba28   71b0
-    DiRich  863  ec00000a498fae28   73b6
-    DiRich  864  ea00000a498f9b28   7096
-    DiRich  868  ee00000a49674428   72a0
-    DiRich  869  4600000a49678528   7b31
-    DiRich  870  da00000a4966ca28   7097
-    DiRich  871  af00000a498f6a28   72b6
-    DiRich  872  8b00000a49e1e628   73a7
-    DiRich  873  2b00000a491c6628   73a1
-    DiRich  874  8b00000a498f6528   72a1
-    DiRich  875  5500000a49e1f128   72b0
-    DiRich  876  9200000a49828128   71a0
-    DiRich  878  5500000a49561028   7081
-    DiRich  879  a500000a49828028   7087
-    DiRich  880  d600000a499dfb28   7b00
-    DiRich  881  8a00000a48f86328   71a7
-    DiRich  882  5200000a48abf528   7071
-    DiRich  884  1600000a48f83528   72b1
-    DiRich  886  f700000a48f86f28   73a0
-    DiRich  888  d100000a498ff028   7077
-    DiRich  889  ea00000a494eb828   71b7
-    DiRich  890  b000000a48c91628   73a6
-    DiRich  892  7900000a48b06c28   72a7
-    DiRich  893  d100000a488fa828   71b6
-    DiRich  894  7300000a48b9e228   7b02
-    DiRich  898  d000000a48ac0d28   73b0
-    DiRich  900  bb00000a48f85728   7b33
-    DiRich  901  4b00000a49dc2728   71a1
-    DiRich  903  f400000a48ac0228   7872
-    DiRich  904  1300000a518b7e28   7a35
-    DiRich  908  ac00000a4931cc28   70b4
-    DiRich  909  9000000a48b35128   7773
-    DiRich  910  9100000a498fa228   7b07
-    DiRich  912  d600000a4907a428   7b04
-    DiRich  917  9c00000a4941e928   7762
-    DiRich  919  bf00000a48e45428   70b2
-    DiRich  920  9100000a4949ce28   7767
-    DiRich  925  8900000a48dfb128   7a04
     DiRich 1033  0600000a49897828   70a4
     DiRich 1037  7000000a49bc5128   70a3
     DiRich 1038  5300000a49d52228   7056
@@ -1186,7 +512,6 @@
     DiRich 1049  0b00000a49a99c28   7156
     DiRich 1052  2000000a49aa4428   7176
     DiRich 1053  9c00000a49e4b328   7250
-    DiRich 1054  ae00000a49d3dc28   7267
     DiRich 1055  8d00000a49e4ae28   7266
     DiRich 1056  f000000a49e4a228   7167
     DiRich 1057  c200000a49d3cd28   7256
@@ -1228,6 +553,7 @@
     DiRich 1103  7000000a49179528   7451
     DiRich 1104  5600000a49178928   7941
     DiRich 1105  3a00000a49179828   7707
+    DiRich 1106  e400000a49df7d28   7a14
     DiRich 1108  0600000a4880f128   7a11
     DiRich 1109  e500000a49e49928   7a10
     DiRich 1110  dc00000a49df8028   7727
@@ -1354,6 +680,10 @@
     DiRich 1279  c400000bb708a228   7875
     DiRich 1280  b900000bb7bf4f28   7874
     DiRich 1281  6600000bb7316f28   7764
+    DiRich 5001  1e00000bb793d528   7394
+    DiRich 5002  bb00000bb7548e28   7342
+    DiRich 5003  8000000bb732ae28   7267
+    DiRich 5004  3d00000bb7093528   7521
 DiRichConcentrator   10  4100000a51caa828   8289
 DiRichConcentrator   11  6900000a529fc728   826a
 DiRichConcentrator   12  fd00000a52914328   8268
@@ -1440,48 +770,117 @@ DiRichConcentrator  109  6800000a5236b428   8266
     TRB3sc 1631  840000094117ff28   83c8
     TRB3sc 1641  250000094117f728   83c5
     TRB3sc 1661  f300000941240528   83c6
-      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
+      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
     TRB3sc 4051  0c00000348060928   5002
     TRB3sc 4071  eb000003480c9c28   5003
     TRB3sc 4091  5a00000347f16228   5001
     TRB3sc 4391  d5000003480c5428   5000
     TRB3sc 4121  3e000003480c5128   8880
-      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
+      TRB3   60  b5000003482d3d28   5c20
+      TRB3   61  d5000003481eef28   5c21
+      TRB3   62  ec00000348284328   5c22
+      TRB3   63  34000003482d1c28   5c23
+      TRB3  880  04000003133e3728   5c00
+      TRB3  881  8e0000031321c228   5c01
+      TRB3  882  e1000003133e4b28   5c02
+      TRB3  883  ef000003133e3228   5c03
+      TRB3  940  05000004f9db9b28   5c50
+      TRB3  941  4e000004fa20a028   5c51
+      TRB3  942  a5000004fa24c128   5c52
+      TRB3  943  c7000004fa24a928   5c53
+      TRB3 2420  dd0000081361fb28   5c30
+      TRB3 2421  6500000812740e28   5c31
+      TRB3 2422  d2000008135a6628   5c32
+      TRB3 2423  4b00000813706228   5c33
+      TRB3 2640  5900000943ba5c28   5c10
+      TRB3 2641  e700000943aab928   5c11
+      TRB3 2642  fe00000943ba6128   5c12
+      TRB3 2643  1f00000943aab228   5c13
+      TRB3 2650  e900000943803128   5c40
+      TRB3 2651  a700000943801a28   5c41
+      TRB3 2652  3700000943802628   5c42
+      TRB3 2653  c700000941998928   5c43
+      TRB3   65  c4000003481ef228   86c2
+      TRB3  885  650000031321c728   86c0
+      TRB3  945  81000004fa286228   86c5
+      TRB3 2425  22000008135a2128   86c3
+      TRB3 2645  6200000943aabe28   86c1
+      TRB3 2655  6e00000943802528   86c4
+      TRB3 1275  9c000005ed716028   8890
+      TRB3  740  6800000313245528   6710
+      TRB3  741  6e00000313246028   6711
+      TRB3  742  a700000313245f28   6712
+      TRB3  743  3100000313245628   6713
+      TRB3 2660  ae000009438a2928   6720
+      TRB3 2661  8900000943b4ac28   6721
+      TRB3 2662  56000009438a2228   6722
+      TRB3 2663  0400000943800128   6723
+      TRB3 2670  5d00000943800228   6700
+      TRB3 2671  fe00000943801928   6701
+      TRB3 2672  2600000942671d28   6702
+      TRB3 2673  2000000943800e28   6703
+      TRB3  745  010000031323a828   8701
+      TRB3 2665  cf000009438ad728   8702
+      TRB3 2675  de00000942671628   8700
+      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
     TRB3sc 3371  72000005b6f3e028   5d02
     TRB3sc 3381  060000070f046f28   5d00
     TRB3sc 3391  fb000005b7443428   5d04

diff --git a/oracle/daq2stdout.pl b/oracle/daq2stdout.pl
index 900f4f112d876f19e6bf6926401e467c14f3b92e..c4e7913cc0a26824dcc501da71ba4609b426a3f8 100755 (executable)
--- a/oracle/daq2stdout.pl
+++ b/oracle/daq2stdout.pl
@@ -119,6 +119,8 @@ sub readDB()
 &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",1);
+&readSerialsDB("../../daqtools/base/serials_trb3.db", "Wall-Hub",1);
+
 
 &readSerialsDB("../../daqtools/base/serials_trb3sc.db", "Central-Hub",1);
 &readSerialsDB("../../daqtools/base/serials_trb3.db", "STS-Hub",1);
@@ -127,6 +129,7 @@ sub readDB()
 &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);
@@ -149,6 +152,7 @@ sub readDB()
     &readSerialsDB("../tof/serials_trb3.db", "TOF",1);
     
     #&readSerialsDB("../wall/serials_wall.db", "Wall",0);
+    &readSerialsDB("../sts/serials_trb3.db", "Wall",1);
     &readSerialsDB("../sts/serials_trb3.db", "STS",1);
   &readSerialsDB("../frpc/serials_trb3.db", "fRPC",1);
   
@@ -178,6 +182,7 @@ sub readDB()
      &readAddressesDB("../hub/addresses_hub_trb3sc.db","StartHub"); 
       &readAddressesDB("../hub/addresses_hub_trb3.db","VetoHub"); 
      &readAddressesDB("../hub/addresses_hub_trb3sc.db","iTOF-Hub");
+      &readAddressesDB("../hub/addresses_hub_trb3.db","Wall-Hub");
  
     &readAddressesDB("../cts/addresses_cts.db", "CTS");
     &readAddressesDB("../start/addresses_trb3sc.db", "CTS");
@@ -196,9 +201,13 @@ sub readDB()
    # &readAddressesDB("../shower/addresses_shower.db", "Shw-AddOn");
    # &readAddressesDB("../tof/addresses_tof.db", "TOF");
      &readAddressesDB("../tof/addresses_tofnew.db", "TOF");
+     &readAddressesDB("../tof/addresses_tofnew.db", "Wall");
     #&readAddressesDB("../wall/addresses_wall.db", "Wall");
      &readAddressesDB("../sts/addresses_sts.db", "STS"); 
      &readAddressesDB("../frpc/addresses_frpc.db", "fRPC");
+     
+     
+     
 }
 
 sub readSubEvtIdsDB()
@@ -316,7 +325,7 @@ sub readAddressesDB()
 
        #if( $_ =~ /0x(\w+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/){
        if( $_ =~ /0x(\w+)\s+(\d+)\s+(\d+)/){
-           $addr   = lc($1); 
+           $addr = lc($1); 
            $serial = $2;
            $fpga   = $3;
           # $design = lc($4);
@@ -324,7 +333,7 @@ sub readAddressesDB()
        }
 
        unless( defined $addr || defined $serial || defined $fpga )
-        # || defined $design || defined $trb)
+        # || defined $design || defined $trb)s
                {
                        #print " address:$addr, serial:$serial, fpga:$fpga, design:$design trb:$trb \n";
            print "Not all parameters are defined in $file2read! Exit\n";
@@ -334,24 +343,25 @@ sub readAddressesDB()
     #print " address:$addr, serial:$serial, fpga:$fpga, design:$design trb:$trb \n";
        #print " address:$addr, serial:$serial, fpga:$fpga  \n";
        
+       $serial = $serial . $fpga ; # JAM 11-2021 take into account fpga number into serial number test!
        #- 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}->{'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"
+         #  print "assign address:$addr, serial:$serial, fpga:$fpga for type $type, replacing previous $conf_db_href->{'addresses'}->{$type}->{$serial}->{'addr'}\n"
            }
        }
        else{
            $conf_db_href->{'addresses'}->{$type}->{$serial}->{'addr'}   = $addr;
-           $conf_db_href->{'addresses'}->{$type}->{$serial}->{'fpga'}   = $fpga;
+           #$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"
+     #   print "assign new address:$addr, serial:$serial, fpga:$fpga for type $type \n"
        
        }
     }
@@ -422,13 +432,13 @@ sub readSerialsDB()
            # JAM2018: optionally correct/drop the additional trailing number in rich setup
            if($mode > 0)
            {
-             my $tempserial=$serial;
-             $serial= substr ($serial, 0, length($serial) -1);     
-             #print "corrected serial number $tempserial to $serial \n";
+#            my $tempserial=$serial;
+        #     $serial= substr ($serial, 0, length($serial) -1);            
+         #print "corrected serial number $tempserial to $serial \n";
              if($mode > 1)
              {
                # for dirich add optional leading 0
-               if(length($serial) <4){
+               if(length($serial) <4){ # was <4 JAM
                      $serial= "0" . $serial;
                #      print "added leading 0 to serial number: $serial";
                    }
@@ -554,13 +564,29 @@ sub printBoardsFromDB()
            
            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(($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; # JAM 10-nov-21 - try different evaluation
+#          }
+           
+            # JAM 10-nov-2021: as we treat new format of db differently now to avoid trb3 and trb3sc duplicates, handle some
+            # systems here to be consistent with oracle constrainsts:
+            if(($type eq "Rich") or ($type eq "Rich-Comb")  or ($type eq "MDC-OEP")) {
+             $serial= substr ($serial, 0, length($serial) -1); # drop trailing number here to be consistent with past
+            }
+           
+        if($type eq "MDC-AddOn") {
+            next unless (substr ($serial, length($serial) -1 ,1) eq "5"); # skip all but fpga 5 to avoid duplicate temp id
+            $serial= substr ($serial, 0, length($serial) -1); # drop trailing number here to be consistent with past        
+        }
+        if($type eq "CTS") {
+            next unless (substr ($serial, length($serial) -1 ,1) eq "2"); # skip all but fpga 2 to avoid duplicate temp id
+            $serial= substr ($serial, 0, length($serial) -1); # drop trailing number here to be consistent with past        
+        }
+        
+        
            if( ! defined $opt_output || $opt_output eq "board" ){
                printf("%10s %4d %17s %6s\n", $otype, $serial, $id, $addr);
            }

diff --git a/tof/addresses_tofnew.db b/tof/addresses_tofnew.db
index f69d07d48f36d02a9c834a24f06265d2f13d4f84..2c296d0e7c3f2b1cc303abf1435f46b3f0d4c346 100644 (file)
--- a/tof/addresses_tofnew.db
+++ b/tof/addresses_tofnew.db
@@ -1,10 +1,10 @@
 #Address  #   S/N   #   FPGA  #   Design  #  TRB  #
 ###################################################
 #######################TOF#########################
-0x5C00        241       0 
-0x5C01        241       1 
-0x5C02        241       2 
-0x5C03        241       3
+0x5C00        088       0 
+0x5C01        088       1 
+0x5C02        088       2 
+0x5C03        088       3
 
 0x5C10        264       0 
 0x5C11        264       1 

diff --git a/utils/chat_push b/utils/chat_push
index 365033e55ac68dc3fa9ba1f507b6b93b46a254e6..ac3bbb2e182d59a29263f1f258ba7e29b19164b3 100755 (executable)
--- a/utils/chat_push
+++ b/utils/chat_push
@@ -60,12 +60,13 @@ while ( defined (my $input = $term->readline($prompt)) ) {
     $outstr = sprintf "%2.2d-%2.2d %2.2d:%2.2d:%2.2d:  %s", $mon+1, $mday, $hour, $min, $sec , $_;
     $ln++;
 
+    s/\'/\\\'/g;
+    s/\"/\\\"/g;
+    s/\(/\\\(/g;
+    s/\)/\\\)/g;
+
     my $pr = print $fh_out $outstr . "\n";
-    my $cmd = "logger -p local1.info -t DAQ Chat \\<C\\> $_";
-    $cmd=~s/\'/\\\'/g;
-    $cmd=~s/\"/\\\"/g;
-    $cmd=~s/\(/\\\(/g;
-    $cmd=~s/\)/\\\)/g;
+    my $cmd = "logger -p local1.info -t DAQ Chat \\<C\\> \"$_\"";
     qx($cmd);
 
     if ($input=~/\S/) {