update hmon links, remove old MDC, add new ones

diff --git a/.gitignore b/.gitignore
index b18c1c601cfcd2dc1ba107df4e785db3935dad8f..bc9e9ef365d1ef77f19fcad99b2262523e7adabc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ threshold
 thr_trb3
 *_bck
 test
+oldconfs

diff --git a/hmon/hmon_mdc_temp.pl b/hmon/hmon_mdc_temp.pl
index d46902a08b531d11e0aff87ab50acea99590f334..f3a7267ed87aa8e41475048264e0a17a174c2a02 100755 (executable)
--- a/hmon/hmon_mdc_temp.pl
+++ b/hmon/hmon_mdc_temp.pl
@@ -40,15 +40,15 @@ my $data = Perl2Epics::GetAll();
 
 while (1) {
   my $rh_mdc_temp;
-  $rh_mdc_temp = trb_register_read(0xfffd, 0x0) or sleep 5 and next;
-
-  foreach my $board (sort {$a <=> $b} keys %$rh_mdc_temp) {
-    my $id_0 = ($board >> 8) & 0x0f;
-    my $id_1 = ($board >> 4) & 0x0f;
-    my $id_2 = ($board >> 0) & 0x0f;
-    $store->{$id_0}->{$id_1}->{$id_2} =
-      (($rh_mdc_temp->{$board} >> 20) & 0xfff) / 16;
-  }
+#   $rh_mdc_temp = trb_register_read(0xfffd, 0x0) or sleep 5 and next;
+# 
+#   foreach my $board (sort {$a <=> $b} keys %$rh_mdc_temp) {
+#     my $id_0 = ($board >> 8) & 0x0f;
+#     my $id_1 = ($board >> 4) & 0x0f;
+#     my $id_2 = ($board >> 0) & 0x0f;
+#     $store->{$id_0}->{$id_1}->{$id_2} =
+#       (($rh_mdc_temp->{$board} >> 20) & 0xfff) / 16;
+#   }
 
   $rh_mdc_temp = trb_register_read(0xfe90, 0x0) or sleep 5 and next;
 

diff --git a/hmon/hmon_mdcnew_triggererrors.pl b/hmon/hmon_mdcnew_triggererrors.pl
deleted file mode 100644 (file)
index b9d4994..0000000
--- a/hmon/hmon_mdcnew_triggererrors.pl
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/perl
-
-use warnings;
-use strict;
-use Data::Dumper;
-use Data::TreeDumper;
-use Hmon;
-use QA;
-use HPlot;
-use lib '.';
-use MDC;
-use Time::HiRes qw(usleep time);
-use List::Util qw[min max];
-
-use HADES::TrbNet;
-
-#$ENV{DAQOPSERVER} = 'localhost:40';
-trb_init_ports() or die trb_strerror();
-
-
-HPlot::PlotInit({
-  name    => "MDCNewTemps",
-  file    => "files/MDCNewTemps",
-  title   => "Temperatures",
-  entries => 80,
-  curves  => 30,
-  type    => HPlot::TYPE_HEATMAP,
-  output  => HPlot::OUT_PNG,
-  zlabel  => "Hitrate",
-  sizex   => 610,
-  sizey   => 510,
-  nokey   => 1,
-  buffer  => 1,
-  ymin    => 29.5,
-  ymax    => -0.5,
-  xmin    => -0.5,
-  xmax    => 79.5,
-  #cbmax   => "100<*<1E7",
-  #cbmin   => 0,
-  noinit  => 1,
-  additional => "set format y \"%02o\";set ytics (0,5,8,13,16,21,24,29);set xtics('0' 0,'2' 10, '4' 20,'6' 30,'8' 40,'A' 50, 'C' 60, 'E' 70);",
-  showvalues => 0,  }
-  );
-
-
-my $str  = Hmon::MakeTitle(8, 11, "MDC Temperatures",0);
-$str .= qq@<img src="%ADDPNG files/MDCNewTemps.png%" type="image/png"><br>\n@;
-$str .= Hmon::MakeFooter();
-Hmon::WriteFile("MDCNewTemps",$str);  
-  
-  
-while (1) {
-  HPlot::PlotClear('MDCNewTemps');
-  my $mdc_temp;
-  $mdc_temp = trb_register_read(0xfffb, 0) or sleep 5 and next;
- 
-  foreach my $board (keys %$mdc_temp) {
-    my $t = ($mdc_temp->{$board}>>20)/16;
-    my ($p,$s,$b,$e) = MDC::get_position($board);
-    my $xpos = $b*5 + ($e==5?0:$e+1);
-    my $ypos = $p*8+$s;
-    next if $p == -1;
-#     printf("%x %i %i %i %i\n",$board,$p,$s,$b,$e) ;
-    HPlot::PlotFill('MDCNewTemps',$t,$xpos,$ypos);
-    }
-  
-  HPlot::PlotDraw('MDCNewTemps');
-
-  sleep 10;
-  }
-

diff --git a/hmon/index.cgi b/hmon/index.cgi
index e89096a5e56316131156baf8677825fc6ec8d29a..4a36628b11397dd9b96f4088b521878b8cc131e6 100755 (executable)
--- a/hmon/index.cgi
+++ b/hmon/index.cgi
@@ -156,27 +156,29 @@ function openwin(url) {
 <li><a target="_blank" href="monitor.cgi?10-window-RichGas">Rich Gas Information</a></li>
 </ul></div>
 
-<div class="linkbox" style="float:left"><h4>MDC</h4><ul>
-<li><a href="monitor.cgi?10-MDCRates-MDCBusy-MDCTemperature-MDCRetransmission-MDCTriggerError-MDCTokenMiss">MDC Overview</a></li>
+<div class="linkbox" style="float:left"><h4>MDC DAQ</h4><ul>
+<li><a href="monitor.cgi?2-MDCNewMissing">Missing boards</a></li>
+<li><a href="monitor.cgi?2-window-MDCTriggerError">Trigger Errors</a></li>
+<li><a href="monitor.cgi?2-MDCNewRate">Hit Rates</a></li>
+<li><a href="monitor.cgi?10-MDCNewTemps">Temperatures</a></li>
+<hr>
+<li><a href="monitor.cgi?15-MDCNewPowerBoards">Powerboards</a></li>
+<li><a href="monitor.cgi?30-MDCNewVoltSet">Voltage Settings</a></li>
+<li><a href="monitor.cgi?30-window18x21-MDCNewVoltage12-MDCNewVoltage34">Voltages</a></li>
+</ul></div>
+
+<div class="linkbox" style="float:left"><h4>MDC DCS</h4><ul>
+<li><a href="monitor.cgi?15-MDCNew1wireTemps">1-wire temperature</a></li>
 <li><a href="monitor.cgi?1-window-MDCHV">HV settings</a></li>
 <li><a href="monitor.cgi?15-window18x21-mdchvV0-mdchvV1-mdchvV2-mdchvV3">HV voltage trend plots</a></li>
 <li><a href="monitor.cgi?15-window18x21-mdchvC0-mdchvC1-mdchvC2-mdchvC3">HV current trend plots</a></li>
-<li><a href="monitor.cgi?2-window-MDCBusy">Busy Times</a></li>
-<li><a href="monitor.cgi?2-window-MDCRates">Data Rates</a></li>
-<li><a href="monitor.cgi?2-window-MDCTokenMiss">Missing Tokens</a></li>
-<li><a href="monitor.cgi?2-window-MDCRetransmission">Retransmission</a></li>
-<li><a href="monitor.cgi?10-window-MDCTemperature">Temperature</a></li>
-<li><a href="monitor.cgi?2-window-MDCTriggerError">Trigger Errors</a></li>
 <li><a href="monitor.cgi?10-window-MDCPressure">Gas System Pressures</a></li>
 <li><a href="monitor.cgi?10-window-MDCReflow">Gas System Reflow &amp; Scales</a></li>
-<li><a href="monitor.cgi?15-window18x30-MDCVoltage5V8-MDCVoltage3V8-MDCVoltage1V8-MDCVoltagep3V-MDCVoltagem3V">Raw Voltages</a></li>
 <li><a href="monitor.cgi?2-window-MDCLV">LV switch status</a></li>
 </ul></div>
 
 
 
-
-
 <div class="linkbox" style="float:right"><h4>Wall</h4><ul>
 <li><a href="monitor.cgi?2-window-FwRates">FW Rates</a></li>
 <li><a href="monitor.cgi?10-window-FwHV">FW HV Voltage</a></li>

diff --git a/hmon/indexstyles.css b/hmon/indexstyles.css
index 4ed2c7d5101269b7d2900222d003025ffefbd5e7..48f7b56c1a556a2cc8d0a3fe7dae240b40304340 100644 (file)
--- a/hmon/indexstyles.css
+++ b/hmon/indexstyles.css
@@ -56,7 +56,7 @@ body.index div h4 {
        
 body.index div ul{
        margin:0 20px 0 20px;
-       width:300px;
+       width:290px;
        margin-bottom:0px;
        padding-left:13px;
        }
@@ -88,7 +88,9 @@ body>div, .logos {
 div.linkbox {
        text-align:left;
   width:350px;
+       padding:0;
   margin:10px;
+       overflow-y:hidden;
        }
        
 div.linkbox h4{

diff --git a/hmon/hmon_mdc_busy.pl b/hmon/old/hmon_mdc_busy.pl
similarity index 100%
rename from hmon/hmon_mdc_busy.pl
rename to hmon/old/hmon_mdc_busy.pl

diff --git a/hmon/hmon_mdc_rate.pl b/hmon/old/hmon_mdc_rate.pl
similarity index 100%
rename from hmon/hmon_mdc_rate.pl
rename to hmon/old/hmon_mdc_rate.pl

diff --git a/hmon/hmon_mdc_retr.pl b/hmon/old/hmon_mdc_retr.pl
similarity index 100%
rename from hmon/hmon_mdc_retr.pl
rename to hmon/old/hmon_mdc_retr.pl

diff --git a/hmon/hmon_mdc_tokenmiss.pl b/hmon/old/hmon_mdc_tokenmiss.pl
similarity index 100%
rename from hmon/hmon_mdc_tokenmiss.pl
rename to hmon/old/hmon_mdc_tokenmiss.pl

diff --git a/hmon/hmon_mdc_voltage.pl b/hmon/old/hmon_mdc_voltage.pl
similarity index 100%
rename from hmon/hmon_mdc_voltage.pl
rename to hmon/old/hmon_mdc_voltage.pl

diff --git a/hmon/start.sh b/hmon/start.sh
index d5a6450914c417d8b73300ff79cf80a8f012eeb9..8a1ad397abee00667b4c539aae234c5622bc1af7 100755 (executable)
--- a/hmon/start.sh
+++ b/hmon/start.sh
@@ -48,13 +48,18 @@ mkdir -p `pwd`/pion
 #pkill -f "sshfs -o allow_other hadaq@hadesp66:/home/hades-qa/online/5.34.38/pics"
 fusermount -u qa
 timeout 2 bash -c "sshfs -o allow_other hadaq@hadesp66:/home/hades-qa/online/5.34.38/apr25/pics `pwd`/qa"
-fusermount -u vertex  
-timeout 2 bash -c "sshfs -o allow_other hadaq@hadesp66:/home/hades-qa/online/5.34.38/apr25/vertex/pics `pwd`/vertex"
+#fusermount -u vertex  
+#timeout 2 bash -c "sshfs -o allow_other hadaq@hadesp66:/home/hades-qa/online/5.34.38/apr25/vertex/pics `pwd`/vertex"
 
-fusermount -u /tmp/qaexport  
-timeout 2 bash -c "sshfs -o allow_other hadaq@hadesp66:/tmp/qaexport /tmp/qaexport"
+#fusermount -u /tmp/qaexport  
+#timeout 2 bash -c "sshfs -o allow_other hadaq@hadesp66:/tmp/qaexport /tmp/qaexport"
 fusermount -u /srv/www/htdocs/qaweb/htdocs/qaexport
-timeout 2 bash -c "sshfs -o allow_other hadaq@hadesp66:/tmp/qaexport /srv/www/htdocs/qaweb/htdocs/qaexport"
+timeout 2 bash -c "sshfs -o allow_other -o follow_symlinks hadaq@hadesp66:/dev/shm/qaexport /srv/www/htdocs/qaweb/htdocs/qaexport"
+
+
+
+touch /dev/shm/qaexport_demon_queue.txt
+chmod a+rw /dev/shm/qaexport_demon_queue.txt
 
 #pkill -f "sshfs -o allow_other hadaq@hadesp63:/home/hadaq/local/tdcmon/dabc/cal"
 fusermount -u calibration