updates to rate plots

diff --git a/hmon/hmon_ecalrate.pl b/hmon/hmon_ecalrate.pl
index b65f1f5f83a014918779bf8fdebba1fe05435eb0..b5f34e24467bfd98042a3820209739d1326af6a4 100755 (executable)
--- 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 4ebdb983a758e9bf6bdc7ae4fa45a2ebd6ce0a27..f439110237d6af21fb4b12f91f739f45bd21f3d0 100755 (executable)
--- 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 58fe25f9706fc9d72cdb1ec1965f65a622b8cadc..a201324e8a33828682ec5f426fe81c22641854e7 100755 (executable)
--- 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 (executable)
new mode 100644 (file)

diff --git a/hmon/hmon_stsrate.pl b/hmon/hmon_stsrate.pl
index 56442be7d43ecfc62212ebb2b6af72bca376e54f..2418e2c169f249861f95ec040905f12d260dbe47 100755 (executable)
--- 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 964d88f7ec63f32679380c0c4eb01cf13638f9f1..9642182c6c2e20824e8f5c720f40082a9bd9cf3e 100755 (executable)
--- 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@<img src="%ADDPNG files/TofRate.png%" type="image/png"><br>\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 74520ca2b1c52d8051da43ede68a7fa244ff7e7f..3d0239c711a0b7a897f8685d6ee6bc6c9ecb0dca 100755 (executable)
--- a/hmon/index.cgi
+++ b/hmon/index.cgi
@@ -60,7 +60,7 @@ function openwin(url) {
 <li style="width:600px;"><a href="monitor.cgi?1-window9x27-busyhist-eventratelong-eventrateshort-StartBars">Main Screen 1</a> Eventrate & Busy
 <li style="width:600px;"><a href="monitor.cgi?1-window8x26-busy-DutyFactor-Pt3AcceptRatio-EvtsPerSpill-StartCountSpill">Main Screen 2</a> Spill Info
 <li style="width:600px;"><a href="monitor.cgi?1-window14x14-EBSummary-hldlast-CTSRates">Main Screen 3</a> EBs</li>
-<li style="width:600px;"><a href="monitor.cgi?2-window12x18-TofRate-RpcRate-StsRate-EcalSimpleRate">Main Screen 4</a> Tof Rpc STS Ecal rates</li>
+<li style="width:600px;"><a href="monitor.cgi?2-window18x16-EcalSimpleRate-RpcRate-StsRate-TofRate-ItofRate-StartRateSimple-FrpcRate">Main Screen 4</a> Tof Rpc STS Ecal iTOF fRPC Start rates</li>
 </ul></div>
 
 <div class="linkbox" style="clear:both"><h4>DAQ Network</h4><ul>