From: hadaq <hadaq@hades33.gsi.de>
Date: Mon, 13 Jan 2025 11:05:38 +0000 (+0100)
Subject: baselines für MBO 115
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=058149cf137a195c11c22809e0410f448544edba;p=daqtools.git

baselines für MBO 115
---

diff --git a/tools/HPlot.pm b/tools/HPlot.pm
index b559cdf..821a80d 100755
--- a/tools/HPlot.pm
+++ b/tools/HPlot.pm
@@ -227,7 +227,7 @@ sub PlotInit {
     }
     else {
       #plot_write($fh,"plot '-' matrix with image, '-' matrix using 1:2:(sprintf('%i', \$3)) with labels tc rgb \"#ffffff\" font ',10'");
-      $p->{$name}->{plot_string} .= "plot '-' matrix with image, '-' matrix using 1:2:(sprintf('%i', \$3)) with labels tc rgb \"#ffffff\" font ',10'";
+      $p->{$name}->{plot_string} .= "plot '-' matrix with image, '-' matrix using 1:2:(sprintf('%.".($p->{$name}->{showvalues}-1)."f', \$3)) with labels tc rgb \"#ffffff\" font ',10'";
       ####      plot_write($fh,"plot '-' matrix with image, '-' matrix using 1:2:(sprintf('%i', \$3)):3 with labels tc palette  font ',10'");
     }
     plot_write($fh, $p->{$name}->{plot_string});
diff --git a/tools/loadregisterdb.pl b/tools/loadregisterdb.pl
index 19227f2..7d0d5be 100755
--- a/tools/loadregisterdb.pl
+++ b/tools/loadregisterdb.pl
@@ -23,13 +23,13 @@ while (my $a = <FILE>) {
     }
 #0x2000       1     0x38     0x38     0x38     0x38     0x38     0x38
   if(my ($addr,$set,$str) = $a =~ /^\s*0x(\w\w\w\w)\s+(\d+)((\s+0?x?\w+)+)/) {
-#       print "$addr : $set : $str\n";
     my @vals = split(/\s+/,$str);
     shift(@vals) if($vals[0] eq '');
     my $i = 0;
     #print Dumper \@vals;
     foreach my $t (@vals) {
       if($t =~ /0?x?(\w+)/) {
+#        $cmd .= "echo $addr;trbcmd w 0x$addr 0x$reglist->{$set}->{$i++} $t\n";
         $cmd .= "trbcmd w 0x$addr 0x$reglist->{$set}->{$i++} $t\n";
 	#print "cmd: $cmd\n";
         }
diff --git a/web/htdocs/apacheEnv.pm b/web/htdocs/apacheEnv.pm
index 1047d68..3b882c6 100644
--- a/web/htdocs/apacheEnv.pm
+++ b/web/htdocs/apacheEnv.pm
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #This file sets the environment in case that the daqtools are run within an Apache web-server.
 
-$ENV{'DAQOPSERVER'} = 'hades46:84';
+$ENV{'DAQOPSERVER'} = 'hadesp31';
 
 
 1;