updates to hmon scripts

diff --git a/hmon/hmon_trgsource.pl b/hmon/hmon_trgsource.pl
index 502385514c81d95c7e173399b89dfaeb1323cb95..dfc297c7a728dc0f251f052fda13b897e116d179 100755 (executable)
--- a/hmon/hmon_trgsource.pl
+++ b/hmon/hmon_trgsource.pl
@@ -169,7 +169,7 @@ while (1) {
 my $longmsgcheck = $longmsg;    
 
 #Input polarity wrong?    
-  if($QA::TrgCheckPolarity && (($polarity->{3}->[1] & 0x7fffffff) || $polarity->{3}->[0] & 0x1e0)) {
+  if($QA::TrgCheckPolarity && (($polarity->{3}->[1] & 0x7fff0000) || $polarity->{3}->[0] & 0x1e0)) {
     $qastate = QA::WARN;
     $longmsg .= " - Signal polarity wrong on inputs ";
     foreach my $i(0..30) {

diff --git a/hmon/permanent/hmon_eb_run.pl b/hmon/permanent/hmon_eb_run.pl
index 5c55c42aa576df1d5c3b3e3bc459c6b42ba2031c..493859caf511c01c9fa19d21565168fabadd0b37 100755 (executable)
--- a/hmon/permanent/hmon_eb_run.pl
+++ b/hmon/permanent/hmon_eb_run.pl
@@ -187,7 +187,10 @@ while(1) {
   QA::WriteQALog($fqa, "eb", "run", 10, $qastate, $qatitle, 
            "act: $recv/$sent (".$data->{"prefix"}->{val}.")", $qamsg);
 #   if ($totalrate) {
-    $qastatedisc = QA::GetQAState('below',$totaldiscarded/($totalrate || $totaldiscarded || 1),(0.001,0.01,0.1));
+    $qastatedisc = QA::GetQAState('below',$totaldiscarded/($totalrate || $totaldiscarded || 1),(0.01,0.05,0.1));
+    if($totalrate < 500) {
+      $qastatedisc = QA::GetQAState('below',$totaldiscarded || 1,(20,50,100));
+      }  
 #     }
 #   else {
 #     $qastatedisc = QA::NA;

diff --git a/hmon/permanent/hmon_magnet.pl b/hmon/permanent/hmon_magnet.pl
old mode 100644 (file)
new mode 100755 (executable)
index a7d4fcb..e8b72ff
--- a/hmon/permanent/hmon_magnet.pl
+++ b/hmon/permanent/hmon_magnet.pl
@@ -9,6 +9,7 @@ use QA;
 use Getopt::Long;
 use Data::Dumper;
 
+my $magnet_on = 0;
 
 my %range_list = (
                  'Time'             => {},
@@ -203,17 +204,20 @@ while(1) {
       }
     }
 
+    if(!$magnet_on) {$fatal_error_string .= "-- MAGNET IS DEFINED TO BE OFF --"; $value = "OFF";}
     #print $fatal_error_string . "\n";
-
     if ($fatal_error_counter>3) {
       $fatal_error_string .= " (last good check at $last_good_time)";
-      QA::WriteQALog($flog,"other","magnet",$interval+20,QA::FATAL,$title,$value,$fatal_error_string);
+      my $state = $magnet_on?(QA::FATAL):(QA::NOTE);
+      QA::WriteQALog($flog,"other","magnet",$interval+20,$state,$title,$value,$fatal_error_string);
     } elsif ($red_error_counter > 0) {
       $fatal_error_string .= " (last good check at $last_good_time)";
-      QA::WriteQALog($flog,"other","magnet",$interval+20,QA::ERROR,$title,$value,$fatal_error_string);
+      my $state = $magnet_on?(QA::ERROR):(QA::NOTE);
+      QA::WriteQALog($flog,"other","magnet",$interval+20,$state,$title,$value,$fatal_error_string);
     } elsif ($yellow_error_counter > 0) {
       $fatal_error_string .= " (last good check at $last_good_time)";
-      QA::WriteQALog($flog,"other","magnet",$interval+20,QA::WARN,$title,$value,$fatal_error_string);
+      my $state = $magnet_on?(QA::WARN):(QA::NOTE);
+      QA::WriteQALog($flog,"other","magnet",$interval+20,$state,$title,$value,$fatal_error_string);
     } else  {
       $longtext = "Checked at $time";
       QA::WriteQALog($flog,"other","magnet",$interval+20,QA::OK,$title,$value,$longtext);

diff --git a/hmon/permanent/hmon_mdchv.pl b/hmon/permanent/hmon_mdchv.pl
index b2a5f4d7fd0e81a946afcdd3829fc35781e3be96..728557528eae67b82a6feef8f4c7cc039aee198d 100755 (executable)
--- a/hmon/permanent/hmon_mdchv.pl
+++ b/hmon/permanent/hmon_mdchv.pl
@@ -13,7 +13,7 @@ use HADES::TrbNet;
 use HPlot;
 
 my $timer = 0;
-my @colors = ("#000000", "#ff0000","#00ff00","#0000ff","#cccc00","#cc00cc");
+my @colors = ("#000000", "#ff0000","#00ff00","#0000ff","#cccc00","#009955");
 my @names = qw( S1 S2 S3 S4 S5 S6);
 my @layerlabel  = qw(F C);
 my $connect_status = &trb_init_ports();
@@ -111,12 +111,7 @@ while(1) {
 
     #$str .= "<tr><th colspan=7>&nbsp;\n";      
     }  
-  $str .= "</table>\n";#</div>
-   $str .= "<br>currents trend <br>\n";
- $str .= "<br>\n";
-  $str .= qq@<img src="%ADDPNG files/MDCHV1FI.png%" type="image/png">\n@; 
-   $str .= "<br>\n";
-  $str .= qq@<img src="%ADDPNG files/MdcPressurePlane1.png%" type="image/png">\n@;  
+  $str .= "</table>\n";#</div
   $str .= Hmon::MakeFooter();
 
   if(!($timer%1)) {

diff --git a/hmon/permanent/hmon_mdcpressure.pl b/hmon/permanent/hmon_mdcpressure.pl
index b72615b6bb51e1766334009d0ebe6e45e2225669..7bf3f49c31088320ade73faff6222e91c714e34c 100755 (executable)
--- a/hmon/permanent/hmon_mdcpressure.pl
+++ b/hmon/permanent/hmon_mdcpressure.pl
@@ -172,7 +172,7 @@ foreach my $n (@names3) {
 foreach my $n (@names2) {
   Perl2Epics::Connect($n,"HAD:".$n);
   }
-
+Perl2Epics::Connect("reflowPressureAthmaverage","HAD:MDC:GAS:reflowPressureAthm:average");
   
 print "Connected.\n";
 
@@ -231,7 +231,7 @@ while(1) {
   
   
   if(!($timer%6)) {
-    HPlot::PlotAdd("AtmosPress",$data->{reflowPressureAthm:average}->{val});
+    HPlot::PlotAdd("AtmosPress",$data->{reflowPressureAthmaverage}->{val});
     HPlot::PlotDraw("AtmosPress");  
     }
 

diff --git a/hmon/permanent/hmon_qaplots.pl b/hmon/permanent/hmon_qaplots.pl
index 3b4c517e230e6642a24ff85ccd4b24b481c99fbc..44b27a5b94dda8589b09fde865e3a6900ff7e388 100755 (executable)
--- a/hmon/permanent/hmon_qaplots.pl
+++ b/hmon/permanent/hmon_qaplots.pl
@@ -33,6 +33,7 @@ my $out = $title;
   <ul>
   <li><a href="qaplot_Main.htm">Main</a><br>
   <li><a href="qaplot_Start.htm">Start</a><br>
+  <li><a href="qaplot_Hodo.htm">Hodoscope</a><br>
   <li><a href="qaplot_RICH.htm">RICH</a><br>
   <li><a href="qaplot_MDC.htm">MDC</a><br>
   <li><a href="qaplot_MDCTimes.htm">MDCTimes</a><br>
@@ -53,20 +54,38 @@ open ($fh,"> ".Hmon::HMONDIR."/files/qa.htm") or die;
 print $fh $out;
 close $fh;
 
-my @pages = qw(Main Start RICH MDC MDCTimes MDCTimesRaw TOF RPC Wall Shower Physics);  
+my @pages = qw(Main Hodo PionTrackerRaw PionTrackerCal RICH MDCMon MDCTimes MDCTimesRaw MDCExpert MDCTimesCal TOFMon RPC WALLMon SHOWERMon Physics);  
 
 my $files = {};
-$files->{'Main'} = ["MainPTScaler", "MainTRBNetDebugInfo", "MainTrigger", "MainTriggerTrend"];
-$files->{'Start'} = ["StartMain","StartMultDia1","StartMultDia2","StartMultDia3","StartMultVeto","StartRawTimesDia1","StartRawTimesDia2","StartRawTimesVeto","StartRawWidthDia1","StartRawWidthDia2","StartRawWidthVeto"];
-$files->{'RICH'} = ["RICHCharge","RICHColRow","RICHDirClus","RICHHitMult","RICHMult"];
-$files->{'MDC'} = ["MDCMain","MDCMain2","MDCL0","MDCL1","MDCL2","MDCL3","MDCMboNoise","MDCT0","MDCT1","MDCT2","MDCT3","MDCMb","MDCMboTrend","MDCMbTCal0","MDCMbTCal1","MDCMbTCal2","MDCMbTCal3","MDCCalStat","MDCErrStat"];
-$files->{'MDCTimesRaw'} = ["MDCTimesRaw0","MDCTimesRaw1","MDCTimes2Raw","MDCTimesRaw3","MDCpotatoRawP0","MDCpotatoRawP1","MDCpotatoRawP2","MDCpotatoRawP3"];
-$files->{'MDCTimes'} = ["MDCallChambers","MDCTimes0","MDCTimes1","MDCTimes2","MDCTimes3","MDCpotatoP0","MDCpotatoP1","MDCpotatoP2","MDCpotatoP3"];
-$files->{'TOF'} = ["TOFMain","TOFTDC","TOFADC","TOFHIT"];
-$files->{'RPC'} = ["RPCFeeMboDbo","RPCFeeTrbChannel","RPCFeeTrbMbo","RPCMain","RPCRawChargeDiff","RPCRawColCellMult2","RPCRawColCellMult","RPCRawHitsTrend","RPCRawRPCMult","RPCRawSecMult","RPCRpcHit","RPCRpcShower"];
-$files->{'Wall'} = ["WALLMain","WALLHit","WALLControl","WALLControlLATCH"];
-$files->{'Shower'} = ["SHOWERMain","SHOWERMults","SHOWERCAL","SHOWERSUMS","SHOWERSUMTREND"];
-$files->{'Physics'} = ["PhysBetaMomSys0","PhysBetaMomSys1","PhysMatch","PhysMultCand","PhysMultDist","PhysToTmips","PhysVertex"];
+# $files->{'Main'} = ["MainPTScaler", "MainTRBNetDebugInfo", "MainTrigger", "MainTriggerTrend"];
+# $files->{'Start'} = ["StartMain","StartMultDia1","StartMultDia2","StartMultDia3","StartMultVeto","StartRawTimesDia1","StartRawTimesDia2","StartRawTimesVeto","StartRawWidthDia1","StartRawWidthDia2","StartRawWidthVeto"];
+# $files->{'RICH'} = ["RICHCharge","RICHColRow","RICHDirClus","RICHHitMult","RICHMult"];
+# $files->{'MDC'} = ["MDCMain","MDCMain2","MDCL0","MDCL1","MDCL2","MDCL3","MDCMboNoise","MDCT0","MDCT1","MDCT2","MDCT3","MDCMb","MDCMboTrend","MDCMbTCal0","MDCMbTCal1","MDCMbTCal2","MDCMbTCal3","MDCCalStat","MDCErrStat"];
+# $files->{'MDCTimesRaw'} = ["MDCTimesRaw0","MDCTimesRaw1","MDCTimes2Raw","MDCTimesRaw3","MDCpotatoRawP0","MDCpotatoRawP1","MDCpotatoRawP2","MDCpotatoRawP3"];
+# $files->{'MDCTimes'} = ["MDCallChambers","MDCTimes0","MDCTimes1","MDCTimes2","MDCTimes3","MDCpotatoP0","MDCpotatoP1","MDCpotatoP2","MDCpotatoP3"];
+# $files->{'TOF'} = ["TOFMain","TOFTDC","TOFADC","TOFHIT"];
+# $files->{'RPC'} = ["RPCFeeMboDbo","RPCFeeTrbChannel","RPCFeeTrbMbo","RPCMain","RPCRawChargeDiff","RPCRawColCellMult2","RPCRawColCellMult","RPCRawHitsTrend","RPCRawRPCMult","RPCRawSecMult","RPCRpcHit","RPCRpcShower"];
+# $files->{'Wall'} = ["WALLMain","WALLHit","WALLControl","WALLControlLATCH"];
+# $files->{'Shower'} = ["SHOWERMain","SHOWERMults","SHOWERCAL","SHOWERSUMS","SHOWERSUMTREND"];
+# $files->{'Physics'} = ["PhysBetaMomSys0","PhysBetaMomSys1","PhysMatch","PhysMultCand","PhysMultDist","PhysToTmips","PhysVertex"];
+
+$files-> { "Main" } = [  "MainTrigger" ,  "MainTriggerTrend" ,  "MainPTScaler" ,  "MainTRBNetDebugInfo"  ];
+$files-> { "Hodo" } = [  "HodoMult" ,  "HodoTime"  ];
+$files-> { "PionTrackerRaw" } = [  "Mult" ,  "TS" ,  "Strip" ,  "Pileup" ,  "Overflow" ,  "ADCStrip" ,  "TSStrip" ,  "XY" ,  "RawPTHodoDt"  ];
+$files-> { "PionTrackerCal" } = [  "CalTS" ,  "CalADCStrip" ,  "CalTSStrip" ,  "CalPTHodoDt"  ];
+$files-> { "Start" } = [  "StartMain"  ];
+$files-> { "RICH" } = [  "RICHMult" ,  "RICHCharge" ,  "RICHColRow" ,  "RICHHitMult" ,  "RICHDirClus"  ];
+$files-> { "MDCMon" } = [  "MDCMain" ,  "Errors"  ];
+$files-> { "MDCTimes" } = [  "potato"  ];
+$files-> { "MDCExpert" } = [  "Hits" ,  "MDCL0" ,  "MDCL1" ,  "MDCL2" ,  "MDCL3" ,  "MDCMboNoise" ,  "MDCT0" ,  "MDCT1" ,  "MDCT2" ,  "MDCT3" ,  "MDCMb" ,  "MDCMboTrend" ,  "MDCMbTCal0" ,  "MDCMbTCal1" ,  "MDCMbTCal2" ,  "MDCMbTCal3" ,  "MDCCalStat" ,  "MDCErrStat"  ];
+$files-> { "MDCTimesCal" } = [  "Time1" ,  "ToT" ,  "MDCTimes0" ,  "MDCTimes1" ,  "MDCTimes2" ,  "MDCTimes3" ,  "MDCpotatoP0" ,  "MDCpotatoP1" ,  "MDCpotatoP2" ,  "MDCpotatoP3"  ];
+$files-> { "MDCTimesRaw" } = [  "MDCTimesRaw0" ,  "MDCTimesRaw1" ,  "MDCTimes2Raw" ,  "MDCTimesRaw3" ,  "MDCpotatoRawP0" ,  "MDCpotatoRawP1" ,  "MDCpotatoRawP2" ,  "MDCpotatoRawP3"  ];
+$files-> { "TOFMon" } = [  "TOFMain" ,  "TOFADC" ,  "TOFTDC" ,  "TOFHIT"  ];
+$files-> { "RPC" } = [  "RPCMain" ,  "RPCRawRPCMult" ,  "RPCRawSecMult" ,  "RPCRawColCellMult" ,  "RPCRawColCellMult2" ,  "RPCRawHitsTrend" ,  "RPCRawChargeDiff" ,  "RPCFeeTrbMbo" ,  "RPCFeeMboDbo" ,  "RPCFeeTrbChannel" ,  "RPCRpcHit" ,  "RPCRpcShower"  ];
+$files-> { "WALLMon" } = [  "WALLMain" ,  "WALLHit" ,  "WALLControl" ,  "WALLControlLATCH"  ];
+$files-> { "SHOWERMon" } = [  "SHOWERMain" ,  "SHOWERMults" ,  "SHOWERSUMS" ,  "SHOWERCAL" ,  "SHOWERSUMTREND"  ];
+$files-> { "Physics" } = [  "PhysMultCand" ,  "PhysMatch" ,  "PhysMultDist" ,  "PhysBetaMomSys0" ,  "PhysBetaMomSys1" ,  "PhysVertex" ,  "PhysToTmips"  ];
+
 
 # while(1) {
  

diff --git a/hmon/permanent/hmon_vertexplots.pl b/hmon/permanent/hmon_vertexplots.pl
index 9b7889b48ded82ff12d984e89d6a4e8449afc070..f3950bea53158d898a1dcac6915ba56a1234d359 100755 (executable)
--- a/hmon/permanent/hmon_vertexplots.pl
+++ b/hmon/permanent/hmon_vertexplots.pl
@@ -29,16 +29,16 @@ while(1) {
 
   $out .= "<table>";
 
-  my $cmd = "ls -rt /home/hadaq/trbsoft/daq/tools/hmon/vertex/target_*be*.jpg | tail -n 5";
+  my $cmd = "ls -rt /home/hadaq/trbsoft/daq/hmon/vertex/target_*e*.jpg | tail -n 5";
   my @files = qx($cmd);
   @files = reverse @files;
 
-  $cmd = "ls -rt /home/hadaq/trbsoft/daq/tools/hmon/vertex/targetSum10*be*.jpg | tail -n 5";
+  $cmd = "ls -rt /home/hadaq/trbsoft/daq/hmon/vertex/targetSum10*e*.jpg | tail -n 5";
   my @files2 = qx($cmd);
   @files2 = reverse @files2;
 
 
-  foreach my $i (0..4) {
+  foreach my $i (0..(scalar @files)-1) {
     $out .= "<tr><td style='text-align:center'>";
     my @n = split('/',$files[$i]);
     chop $n[-1];

diff --git a/hmon/start.sh b/hmon/start.sh
index 4b8953194f60d96cc464305e3972bc93f2aafdd8..c6625ba518b7d2e528f0797a8a45e18192f235d0 100755 (executable)
--- a/hmon/start.sh
+++ b/hmon/start.sh
@@ -7,10 +7,10 @@ mkdir /dev/shm/hmon
 #Kill old tunnel, make new one. Better: Check if tunnel still exists, if not restart.
 echo "  <Hmon>     Renewing tunnels and environment..."
 
-pgrep -f 'hmon_ssh -f -R 8888' >/dev/null
+pgrep -f 'ssh -f -R 8888' >/dev/null
 if [ $? -eq 1 ]; then
 echo "  <Hmon>     No tunnel found, digging new one";
-./hmon_ssh -f -R 8888:hades33.gsi.de:80 -R 3060:hades33.gsi.de:80 -R 8889:hades33.gsi.de:1234 -R 9999:lxhadeb06.gsi.de:80  cerberus.x-matter.uni-frankfurt.de -N &
+ssh -f -R 8888:hades33.gsi.de:80 -R 3060:hades33.gsi.de:80 -R 8889:hades33.gsi.de:1234 -R 9999:lxhadeb06.gsi.de:80  cerberus.x-matter.uni-frankfurt.de -N &
 fi
 
 killall speakdaemon.pl
@@ -30,8 +30,8 @@ mkdir `pwd`/pion
 
 DISPLAY=:0 ssh -f -X lxhadeb06 "ping -i 100 lxhadesdaqp" &>/dev/null &
 
-sshfs -o allow_other hades-qa@lxhadeb06:/home/hades-qa/online/apr12/vertex/vertex_jpg `pwd`/vertex
-sshfs -o allow_other hades-qa@lxhadeb06:/home/hades-qa/online/apr12/pics `pwd`/qa
+sshfs -o allow_other hades-qa@lxhadeb06:/home/hades-qa/online/jun14/pics/vertex `pwd`/vertex
+sshfs -o allow_other hades-qa@lxhadeb06:/home/hades-qa/online/jun14/pics `pwd`/qa
 sshfs -o allow_other hadaq@lxhadeb06:/data01/tmp/ `pwd`/pion