continued padiwa temp

diff --git a/dmon/scripts/dmon_heatmaprich.pl b/dmon/scripts/dmon_heatmaprich.pl
index 5963b31b66ad53b5c8529c254f6b9ccf2b436ebe..988c49de38caf64085ef7e588391f40f0ab4dc9c 100755 (executable)
--- a/dmon/scripts/dmon_heatmaprich.pl
+++ b/dmon/scripts/dmon_heatmaprich.pl
@@ -41,7 +41,7 @@ $plot2->{ylabel} = "row";
 $plot2->{addCmd} = "set lmargin at screen 0.07\nset rmargin at screen 0.85\nset bmargin at screen 0.07\nset tmargin at screen 0.95";
 HPlot::PlotInit($plot2);
 
-my $str = Dmon::MakeTitle(10,15,"HeatmapRich",0);
+my $str = Dmon::MakeTitle(9,14,"HeatmapRich",0);
    $str .= qq@<img src="%ADDPNG HeatmapRich.png%" type="image/png">@;
    $str .= Dmon::MakeFooter();
 Dmon::WriteFile("HeatmapRich",$str);

diff --git a/dmon/scripts/dmon_padiwatemp.pl b/dmon/scripts/dmon_padiwatemp.pl
index 5c51aa9810c2a6e1cae5334e70e3bcb34973386c..e6ff64fb36052fcf95718cf634639e7faf0c0e1a 100755 (executable)
--- a/dmon/scripts/dmon_padiwatemp.pl
+++ b/dmon/scripts/dmon_padiwatemp.pl
@@ -2,11 +2,13 @@
 
 use warnings;
 use lib "./code";
+use lib "../tools";
 use HADES::TrbNet;
 use Dmon;
+use HPlot;
 use Data::Dumper;
 
-my %config = do $ARGV[0];
+my %config = Dmon::StartUp();
 
 
 
@@ -34,12 +36,13 @@ sub sendcmd {
    
 
 while(1) {
-  my $r = sendcmd(0x10040000,0xfe48,0);
   my $max = 1; 
   my $min = 100;  
   my ($maxboard, $minboard);
 
-  foreach my $b (keys %$r) {
+  foreach my $b ($config{PadiwaTrbAdresses}) {
+    my $r = sendcmd(0x10040000,$b,0);
+    next unless defined $r;
     my $temp = (($r->{$b} & 0xFFF))/16;
     next if ($temp < 10 || $temp > 90);
     if ($max < $temp) {

diff --git a/users/cern_cbmrich/dmon_config.pl b/users/cern_cbmrich/dmon_config.pl
index 2ff1dd94d57e124d0251fa9e3064ea1f4ffb1d13..2088f3882bfb45706c81e9708f0f2214e568949a 100644 (file)
--- a/users/cern_cbmrich/dmon_config.pl
+++ b/users/cern_cbmrich/dmon_config.pl
@@ -5,7 +5,7 @@
 activeScripts => [['time','ping','-','-','daqop'],
                   ['numfee','temperature','reftime','billboard','mbs'],
                   ['trgrate','datarate','deadtime','-','-'],
-                  ['heatmaprich','-','-','-','-'],
+                  ['heatmaprich','padiwatemp','-','-','-'],
                   ['cbmnetlink','cbmnetdata','cbmnetsync','-','-'],],
                   
 #Names to be shown in left column of Overview (max 4 letters!)
@@ -33,8 +33,7 @@ PadiwaTrbAdresses => [0x0010,0x0011,0x0012,0x0013,
                       0x00d0,0x00d1,0x00d2,0x00d3,
                       0x00e0,0x00e1,0x00e2,0x00e3,
                       0x00f0,0x00f1,0x00f2,0x00f3,
-                      0x0100,0x0101,0x0102,0x0103,
-                      0x0110,0x0111,0x0112,0x0113],
+                      0x0100,0x0101,0x0102,0x0103],
 
 HubTrbAdresses =>  [0x7005,0x7000,0x7001,0x7002,0x7003,
                     0x0015,