From e4d6968189954f540eca04a4d63a680790687d0b Mon Sep 17 00:00:00 2001
From: maps <maps@jspc10.x-matter.uni-frankfurt.de>
Date: Fri, 31 Oct 2014 18:47:16 +0100
Subject: [PATCH] pack and unpack to save the signedness

---
 user_interface/plot.png      | Bin 0 -> 4400 bytes
 user_interface/plotalldat.sh |  21 +++++++++++--
 user_interface/pmt_ro.pl     |  56 +++++++++++++++++++++++++++++++++--
 user_interface/regio.pm      |  11 +++----
 4 files changed, 77 insertions(+), 11 deletions(-)

diff --git a/user_interface/plot.png b/user_interface/plot.png
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8f57cbafbb591653ec4885d3642e9a4bf3525ddf 100644
GIT binary patch
literal 4400
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
WVH+ugO5KkOV5hggSM~OY?7sjq2Ot0d

literal 0
HcmV?d00001

diff --git a/user_interface/plotalldat.sh b/user_interface/plotalldat.sh
index dceb247..d490adf 100755
--- a/user_interface/plotalldat.sh
+++ b/user_interface/plotalldat.sh
@@ -6,9 +6,24 @@ datfile=$i
 datfilebase=$(echo $datfile| sed 's/.dat//')
 
 cat <<EOF | gnuplot
-#set terminal png
-set terminal postscript enhanced solid color
-set output "$datfilebase.ps"
+set terminal png
+#set terminal postscript enhanced solid color
+
+set style line 1 lc rgb '#8b1a0e' pt 1 ps 1 lt 1 lw 2 # --- red
+set style line 2 lc rgb '#5e9c36' pt 6 ps 1 lt 1 lw 2 # --- green
+
+set style line 11 lc rgb '#808080' lt 1
+set border 3 back ls 11
+set tics nomirror
+
+set style line 12 lc rgb '#808080' lt 0 lw 1
+set grid back ls 12
+
+set xlabel "bins"
+set ylabel "counts"
+
+
+set output "$datfilebase.png"
 plot "$datfile" using 1:2
 EOF
 
diff --git a/user_interface/pmt_ro.pl b/user_interface/pmt_ro.pl
index 5233a11..2e88722 100755
--- a/user_interface/pmt_ro.pl
+++ b/user_interface/pmt_ro.pl
@@ -8,7 +8,20 @@ pmt_ro - configure and read out the photomultiplier hardware
 
 =head1 SYNOPSIS
 
-./pmt_ro action=signal_range channel=(signal|veto)
+automatic scan of signal range, can configure "integration time" of each step.
+
+/pmt_ro action=signal_range channel=(signal|veto) [delay=<delay in sec>]
+
+count on a specific channel for a specific time (default 1 sec)
+./pmt_ro.pl action=count channel=signal [delay=2.5]
+
+read from a register, either by name or by address
+./pmt_ro.pl action=read_register regName=signal_thresh
+
+./pmt_ro.pl action=read_register addr=21
+
+
+
 
 =head1 DESCRIPTION
 
@@ -105,7 +118,8 @@ sub main {
     read_register => 1,
     write_register => 1,
     find_baseline => 1,
-    signal_range => 1
+    signal_range => 1,
+    count => 1
   };
   
   # if method exists, execute it, if not complain and show help message
@@ -116,7 +130,7 @@ sub main {
     my $return = $self->$action(%$args);
     # does it return anything?
     if(defined($return)){ # we get a return value
-      if(ref($return) eq "SCALAR"){ # just print it if it is a scalar
+      if(ref(\$return) eq "SCALAR"){ # just print it if it is a scalar
         print "$return\n";
       } else { # use Data::Dumper to display a hash
         print "method returns a hash:\n";
@@ -129,6 +143,42 @@ sub main {
   }
 }
 
+sub count { # count for a given time on a given channel
+  # return number of counts
+  my $self = shift;
+  my %options = @_;
+  
+  my $channel = $options{channel}; # can be "signal" or "veto" or "net"
+  my $delay   = $options{delay} || 1;
+  
+  my $counter_addr;
+  my $threshold_addr;
+  
+  if( $channel eq "signal" ){
+    $counter_addr = $self->{regaddr_lookup}->{signal_counter};
+    $threshold_addr = $self->{regaddr_lookup}->{signal_thresh};
+  } elsif ( $channel eq "veto" ){
+    $counter_addr = $self->{regaddr_lookup}->{veto_counter};
+    $threshold_addr = $self->{regaddr_lookup}->{veto_thresh};
+  } elsif ( $channel eq "net" ){
+    $counter_addr = $self->{regaddr_lookup}->{net_counter};
+    $threshold_addr = $self->{regaddr_lookup}->{net_thresh};
+  } else {
+    die "$channel is not a valid channel!\n possible channels are \"signal\",\"veto\" and \"net\"\n!";
+  }
+  
+  $self->{regio}->write($self->{regaddr_lookup}->{acquisition},0); # stop acquisition
+  $self->{regio}->read($self->{regaddr_lookup}->{reset_counter}); # reset counter
+  $self->{regio}->write($self->{regaddr_lookup}->{acquisition},1); # start acquisition
+  Time::HiRes::sleep($delay); # let the counter count
+  $self->{regio}->write($self->{regaddr_lookup}->{acquisition},0); # stop acquisition
+  my $counts = $self->{regio}->read($counter_addr); # read counter value
+  $self->{regio}->write($self->{regaddr_lookup}->{acquisition},1); # start acquisition
+  
+  die "Padiwa does not answer!\n" unless defined($counts);
+  return $counts;
+}
+
 sub signal_range { # determine the range and the position the signal/noise in terms of
   # DAC setting
   my $self = shift;
diff --git a/user_interface/regio.pm b/user_interface/regio.pm
index bebf65e..abb23f5 100644
--- a/user_interface/regio.pm
+++ b/user_interface/regio.pm
@@ -128,11 +128,12 @@ sub communicate {
   }
   
   if($ack){
-    my $byte3 = ord(substr($rstring,0,1));
-    my $byte2 = ord(substr($rstring,1,1));
-    my $byte1 = ord(substr($rstring,2,1));
-    my $byte0 = ord(substr($rstring,3,1));
-    my $val = (($byte3<<24)|($byte2<<16)|($byte1<<8)|$byte0);
+#     my $byte3 = ord(substr($rstring,0,1));
+#     my $byte2 = ord(substr($rstring,1,1));
+#     my $byte1 = ord(substr($rstring,2,1));
+#     my $byte0 = ord(substr($rstring,3,1));
+#     my $val = (($byte3<<24)|($byte2<<16)|($byte1<<8)|$byte0);
+    my $val = unpack('l',reverse pack('a4',substr($rstring,0,4)));
     return $val;
   } else {
     print "no answer\n" if $self->{verbose};
-- 
2.43.0