From 503364354de53afd8b78291e2ceb3ef15d7bba40 Mon Sep 17 00:00:00 2001 From: hadaq Date: Wed, 6 Jan 2021 11:21:16 +0100 Subject: [PATCH] updates to rate plots --- hmon/hmon_ecalrate.pl | 7 ++++--- hmon/hmon_endpoints.pl | 19 +++++++++---------- hmon/hmon_rpcrate.pl | 2 +- hmon/hmon_starthist.pl | 0 hmon/hmon_stsrate.pl | 5 +++-- hmon/hmon_tofrate.pl | 16 ++++++++-------- hmon/index.cgi | 2 +- 7 files changed, 26 insertions(+), 25 deletions(-) mode change 100755 => 100644 hmon/hmon_starthist.pl diff --git a/hmon/hmon_ecalrate.pl b/hmon/hmon_ecalrate.pl index b65f1f5..b5f34e2 100755 --- a/hmon/hmon_ecalrate.pl +++ b/hmon/hmon_ecalrate.pl @@ -33,7 +33,7 @@ for my $i (0..5) { cbmax => "100<*<100000", cbmin => 0.1, noinit => 1, - additional => "set logscale cb;", + additional => "set logscale cb;set format cb \"_{10}{\%L}\"", showvalues => 0, }); } for my $i (0..5) { @@ -57,7 +57,7 @@ for my $i (0..5) { cbmax => "100<*<100000", cbmin => 0.1, noinit => 1, - additional => "set logscale cb;", + additional => "set logscale cb;set format cb \"_{10}{\%L}\"", showvalues => 0, }); } for my $i (0..5) { @@ -104,7 +104,7 @@ xmax => 47.5, cbmax => "100<*<1E5", cbmin => 0, noinit => 1, -additional => "set logscale cb;", +additional => "set logscale cb;set format cb \"_{10}{\%L}\"", showvalues => 0, }); my $str = Hmon::MakeTitle(16, 20, "ECal Hit Rate",0); @@ -143,6 +143,7 @@ while(1) { if (defined $old) { my $tdiff = (time() - $oldtime||0) || 1; foreach my $b (keys %$o) { + next unless $b >= 0x6000 && $b <= 0x60FF; my $sec = ($b>>4) & 0x7; my $simpxpos = (($b>>4)&0xF)*10 + ($b&0xF); for my $v (0..23) { diff --git a/hmon/hmon_endpoints.pl b/hmon/hmon_endpoints.pl index 4ebdb98..f439110 100755 --- a/hmon/hmon_endpoints.pl +++ b/hmon/hmon_endpoints.pl @@ -182,22 +182,21 @@ while(1) { ); my @other_boards =( - #cts + #cts 0x0002,0x0003, - #central hub + #central hub 0x8000,0x8011,0x8012,0x8013,0x8014,0x8800, 0x8810, - #start/veto -# - #innerTOF -# + #innerTOF + 0x8d00,0x5d00,0x5d01,0x5d02,0x5d03,0x5d04,0x5d04, # #Pion # 0x8900,0x3800,0x3801, # 0x8910,0x3810,0x3811, -# #Start TRB3 -# 0x8880,0x5000,0x5002,0x5003, - #Hodo TRB3 + #Start TRB3sc + 0x8880,0x5000,0x5001,0x5002,0x5003, + #Hodo TRB3 0x8890,0x5010,0x5011,0x5012, - 0x0100,0x0110,0x0120 #trigger etc. + #Trigger + 0x0100,0x0110,0x0120 ); ###strip the register value diff --git a/hmon/hmon_rpcrate.pl b/hmon/hmon_rpcrate.pl index 58fe25f..a201324 100755 --- a/hmon/hmon_rpcrate.pl +++ b/hmon/hmon_rpcrate.pl @@ -35,7 +35,7 @@ xmax => 47.5, cbmax => "100<*<1E5", cbmin => 0, noinit => 1, -additional => "set logscale cb;", +additional => "set logscale cb;set format cb \"_{10}{\%L}\"", showvalues => 0, }; HPlot::PlotInit($plot1); diff --git a/hmon/hmon_starthist.pl b/hmon/hmon_starthist.pl old mode 100755 new mode 100644 diff --git a/hmon/hmon_stsrate.pl b/hmon/hmon_stsrate.pl index 56442be..2418e2c 100755 --- a/hmon/hmon_stsrate.pl +++ b/hmon/hmon_stsrate.pl @@ -35,7 +35,7 @@ xmax => 47.5, cbmax => "100<*<1E5", cbmin => 0, noinit => 1, -additional => "set logscale cb;", +additional => "set logscale cb;set format cb \"_{10}{\%L}\"", showvalues => 0, }; HPlot::PlotInit($plot1); @@ -69,11 +69,12 @@ while(1) { my $tdiff = (time() - $oldtime)|1; foreach my $b (keys %$o) { #my $ratesum = 0; - next unless ($b>=0x6400 && $b<=0x64ff); + next unless ($b>=0x6400 && $b<=0x6473); 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 --git a/hmon/hmon_tofrate.pl b/hmon/hmon_tofrate.pl index 964d88f..9642182 100755 --- a/hmon/hmon_tofrate.pl +++ b/hmon/hmon_tofrate.pl @@ -19,28 +19,28 @@ my $plot1 = { name => "TofRate", file => "files/TofRate", title => "TOF Rate", -entries => 32, +entries => 16, curves => 60, type => HPlot::TYPE_HEATMAP, output => HPlot::OUT_PNG, zlabel => "Hitrate", -sizex => 470, -sizey => 420, +sizex => 310, +sizey => 310, nokey => 1, buffer => 1, ymin => 59.5, ymax => -0.5, xmin => -0.5, -xmax => 31.5, +xmax => 15.5, cbmax => "100<*<1E5", cbmin => 0, noinit => 1, -additional => "set logscale cb;", +additional => "set logscale cb;unset ytics;set format cb \"_{10}{\%L}\"", showvalues => 0, }; HPlot::PlotInit($plot1); -my $str = Hmon::MakeTitle(6, 9, "TOF Hit Rate",0); +my $str = Hmon::MakeTitle(4, 7, "TOF Hit Rate",0); $str .= qq@
\n@; $str .= Hmon::MakeFooter(); @@ -70,7 +70,7 @@ while(1) { foreach my $b (keys %$o) { #my $ratesum = 0; next unless ($b>=0x5c00 && $b<=0x5cff); - my $xpos = (($b>>4)&0xF)*10 + ($b&0xF); + my $xpos = (($b>>4)&0xF)*10 + ($b&0xF)*2; for my $v (0..31) { my $vdiff = ($o->{$b}->[$v+1]&0xfffffff) - ($old->{$b}->[$v+1]&0xfffffff); @@ -78,7 +78,7 @@ while(1) { if ($vdiff < 0) { $vdiff += 2**28;} $diff->{$b}->[$v+1] = $vdiff/$tdiff; #$ratesum += $diff->{$b}->[$v+1]; - HPlot::PlotFill('TofRate',$diff->{$b}->[$v+1],$v,$xpos); + HPlot::PlotFill('TofRate',$diff->{$b}->[$v+1],$v%16,$xpos+$v/16); } #my $s = sprintf("0x%04x",$b); #$data->{$s}= int(100*($ratesum / 32) +0.5) /100; diff --git a/hmon/index.cgi b/hmon/index.cgi index 74520ca..3d0239c 100755 --- a/hmon/index.cgi +++ b/hmon/index.cgi @@ -60,7 +60,7 @@ function openwin(url) {
  • Main Screen 1 Eventrate & Busy
  • Main Screen 2 Spill Info
  • Main Screen 3 EBs
    • -
  • Main Screen 4 Tof Rpc STS Ecal rates
    • +
  • Main Screen 4 Tof Rpc STS Ecal iTOF fRPC Start rates

    • DAQ Network