From: www@jspc55 <www@jspc55>
Date: Thu, 6 Mar 2014 10:21:46 +0000 (+0100)
Subject: minor fixes concerning scaleoffset
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=63efda2e683444536a660f7c42feef8bff466fab;p=mvdsensorcontrol.git

minor fixes concerning scaleoffset
---

diff --git a/tools/adcread.pl b/tools/adcread.pl
index 67b703f..35fef3b 100755
--- a/tools/adcread.pl
+++ b/tools/adcread.pl
@@ -97,7 +97,7 @@ print "$mean\t$stdev\t$min\t$max\n";
 
 sub getVal{
   my $read = trb_register_read($self->{FPGA},$self->{address});
-  my $value = ($read->{$self->{FPGA}} & 0xFFFF ) * $self->{scale} + $self->{scaleoffset};
+  my $value = ($read->{$self->{FPGA}} & 0xFFFF ) * $self->{scale} + ($self->{scaleoffset}||0);
   return $value;
 }
 
@@ -105,8 +105,8 @@ sub minMax{
 #   read min and max 
   my $read = trb_register_read($self->{FPGA},$self->{address}+0x30);
   my $minmax = ($read->{$self->{FPGA}} ) ;
-  my $min = ($minmax & 0x0000FFFF) * $self->{scale} + $self->{scaleoffset}; # lower 16 bit
-  my $max = ($minmax >> 16       ) * $self->{scale} + $self->{scaleoffset};        # upper 16 bit
+  my $min = ($minmax & 0x0000FFFF) * $self->{scale} + ($self->{scaleoffset}||0); # lower 16 bit
+  my $max = ($minmax >> 16       ) * $self->{scale} + ($self->{scaleoffset}||0);        # upper 16 bit
   return ($min, $max);
 }
 
diff --git a/tools/plotService.pl b/tools/plotService.pl
index 6fb4782..2d01435 100755
--- a/tools/plotService.pl
+++ b/tools/plotService.pl
@@ -206,12 +206,12 @@ sub sample {
   # sample random number for debug
 #   HPlot::PlotAdd($self->{requestString},rand());
   my $read = trb_register_read($self->{FPGA},$self->{address});
-  my $value = ($read->{$self->{FPGA}} & 0xFFFF ) * $self->{scale} + $self->{scaleoffset};
+  my $value = ($read->{$self->{FPGA}} & 0xFFFF ) * $self->{scale} + ($self->{scaleoffset}||0);
 #   read min and max 
   my $read = trb_register_read($self->{FPGA},$self->{address}+0x30);
   my $minmax = ($read->{$self->{FPGA}} ) ;
-  my $min = ($minmax & 0x0000FFFF) * $self->{scale} + $self->{scaleoffset}; # lower 16 bit
-  my $max = ($minmax >> 16       ) * $self->{scale} + $self->{scaleoffset};        # upper 16 bit
+  my $min = ($minmax & 0x0000FFFF) * $self->{scale} + ($self->{scaleoffset}||0); # lower 16 bit
+  my $max = ($minmax >> 16       ) * $self->{scale} + ($self->{scaleoffset}||0);        # upper 16 bit
 #   print $value."\n" if $myverbose;
   HPlot::PlotAdd($self->{requestString},$value,0);
   HPlot::PlotAdd($self->{requestString},$min,1);