added scripts to read TDK Lambda and Hameg HMP via Ethernet

diff --git a/tools/powersupply_hameg.pl b/tools/powersupply_hameg.pl
new file mode 100755 (executable)
index 0000000..41fd0a3
--- /dev/null
+++ b/tools/powersupply_hameg.pl
@@ -0,0 +1,73 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use IO::Socket;
+use Time::HiRes qw(usleep);
+
+sub showUsage {
+  print "usage: hameg.pl [ON|OFF|ON#|OFF#|MEAS] HOST\n";
+  print " where ON/OFF applies to all channels and ON#/OFF# to the number (1-4) specified\n";
+  print "  example turn off 1 channel: ./hameg.pl OFF1 hameg01\n";
+
+  exit;
+}
+
+my $cmd  = $ARGV[0] or showUsage;
+my $peer = $ARGV[1] or showUsage;
+my $socket;
+
+$cmd = uc $cmd;
+
+
+sub measure {
+  my @values = ();
+  for(my $chan = 1; $chan <= 4; $chan++) {
+    usleep 1e5; print $socket "INST OUT$chan\n";
+    
+    usleep 1e5; print $socket "MEAS:VOLT?\n"; my $volt = <$socket>;
+    usleep 1e5; print $socket "MEAS:CURR?\n"; my $curr = <$socket>;
+    usleep 1e5; print $socket "OUTP:STAT?\n"; my $stat = <$socket>;
+
+    chomp $volt;
+    chomp $curr;
+    chomp $stat;
+
+    $stat = $stat eq "1" ? "ON" : "OFF";
+
+    print "$peer CH $chan: $curr A @ $volt V ($stat)\n";
+  }
+}
+
+sub switchPowerGen {
+  my $state = shift;
+  $state = (uc($state) eq 'ON' ? 'ON' : 'OFF');
+  usleep 1e5; print $socket "OUTP:GEN $state\n";
+}
+  
+sub switchPowerChan {
+  my $chan = shift;
+  my $state = shift;
+  $state = (uc($state) eq 'ON' ? 'ON' : 'OFF');
+  usleep 1e5; print $socket "INST OUT$chan\n";
+  usleep 1e5; print $socket "OUTP:STAT $state\n";
+}
+
+
+local $SIG{ALRM} = sub { die 'ERROR: Timed Out'; };
+alarm 3;
+
+$socket = IO::Socket::INET->new(PeerAddr => $peer, PeerPort => 50000, Proto => "tcp", Type => SOCK_STREAM) or die "ERROR: Cannot connect: $@";
+
+if ($cmd eq "ON" || $cmd eq "OFF") {
+  switchPowerGen $cmd;
+  measure;
+} elsif ($cmd =~ m/^(ON|OFF)([1-4])$/) {
+  switchPowerChan $2, $1;
+  measure;
+} elsif ($cmd =~ m/^MEAS/) {
+  measure;
+} else {
+  showUsage;
+}
+
+alarm 0;

diff --git a/tools/powersupply_tdklambda.pl b/tools/powersupply_tdklambda.pl
new file mode 100755 (executable)
index 0000000..10b567c
--- /dev/null
+++ b/tools/powersupply_tdklambda.pl
@@ -0,0 +1,56 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use IO::Socket;
+use Time::HiRes qw(usleep);
+
+sub showUsage {
+  print "usage: tdk.pl [ON|OFF|MEAS] HOST\n";
+  exit;
+}
+
+my $cmd  = $ARGV[0] or showUsage;
+my $peer = $ARGV[1] or showUsage;
+my $socket;
+
+$cmd = uc $cmd;
+
+sub measure {
+  my @values = ();
+
+  usleep 1e5; print $socket "MEAS:VOLT?\n";
+  my $volt = <$socket>;
+  usleep 1e5; print $socket "MEAS:CURR?\n";
+  my $curr = <$socket>;
+  usleep 1e5; print $socket "OUTP:STAT?\n";
+  my $state = <$socket>;
+
+  chomp $volt;
+  chomp $curr;
+  chomp $state;
+
+  print "$peer CH 0: $curr A @ $volt V ($state)\n";
+}
+
+sub switchPower {
+  my $state = shift;
+  $state = (uc($state) eq 'ON' ? 'ON' : 'OFF');
+  usleep 1e5; print $socket "OUTP:STAT $state\n";
+}
+
+local $SIG{ALRM} = sub { die 'ERROR: Timed Out'; };
+alarm 2;
+
+$socket = IO::Socket::INET->new(PeerAddr => $peer, PeerPort => 8003, Proto => "tcp", Type => SOCK_STREAM) or die "ERROR: Cannot connect: $@";
+
+if ($cmd eq "OFF" || $cmd eq "ON") {
+  switchPower $cmd;
+  measure;
+} elsif ($cmd =~ m/^MEAS/) {
+  measure;
+} else {
+  showUsage;
+}
+
+
+alarm 0;

diff --git a/users/cern_cbmrich/hameg.pl b/users/cern_cbmrich/hameg.pl
deleted file mode 100755 (executable)
index b9d8c5692954be04359ffa5a93d05ca04e683498..0000000000000000000000000000000000000000
--- a/users/cern_cbmrich/hameg.pl
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-use IO::Socket;
-use Time::HiRes qw(usleep);
-
-sub showUsage {
-  print "usage: tdk.pl [ON|OFF|ON#|OFF#|MEAS] HOST\n";
-  print " where ON/OFF applies to all channels and ON#/OFF# to the number (1-4) specified\n";
-  print "  example turn off 1 channel: ./hameg.pl OFF1 hameg01\n";
-
-  exit;
-}
-
-my $cmd  = $ARGV[0] or showUsage;
-my $peer = $ARGV[1] or showUsage;
-my $socket;
-
-$cmd = uc $cmd;
-
-
-sub measure {
-  my @values = ();
-  for(my $chan = 1; $chan <= 4; $chan++) {
-    usleep 1e5; print $socket "INST OUT$chan\n";
-    
-    usleep 1e5; print $socket "MEAS:VOLT?\n"; my $volt = <$socket>;
-    usleep 1e5; print $socket "MEAS:CURR?\n"; my $curr = <$socket>;
-    usleep 1e5; print $socket "OUTP:STAT?\n"; my $stat = <$socket>;
-
-    chomp $volt;
-    chomp $curr;
-    chomp $stat;
-
-    $stat = $stat eq "1" ? "ON" : "OFF";
-
-    print "$peer CH $chan: $curr A @ $volt V ($stat)\n";
-  }
-}
-
-sub switchPowerGen {
-  my $state = shift;
-  $state = (uc($state) eq 'ON' ? 'ON' : 'OFF');
-  usleep 1e5; print $socket "OUTP:GEN $state\n";
-}
-  
-sub switchPowerChan {
-  my $chan = shift;
-  my $state = shift;
-  $state = (uc($state) eq 'ON' ? 'ON' : 'OFF');
-  usleep 1e5; print $socket "INST OUT$chan\n";
-  usleep 1e5; print $socket "OUTP:STAT $state\n";
-}
-
-
-local $SIG{ALRM} = sub { die 'ERROR: Timed Out'; };
-alarm 3;
-
-$socket = IO::Socket::INET->new(PeerAddr => $peer, PeerPort => 50000, Proto => "tcp", Type => SOCK_STREAM) or die "ERROR: Cannot connect: $@";
-
-if ($cmd eq "ON" || $cmd eq "OFF") {
-  switchPowerGen $cmd;
-  measure;
-} elsif ($cmd =~ m/^(ON|OFF)([1-4])$/) {
-  switchPowerChan $2, $1;
-  measure;
-} elsif ($cmd =~ m/^MEAS/) {
-  measure;
-} else {
-  showUsage;
-}
-
-alarm 0;

diff --git a/users/cern_cbmrich/hameg.pl b/users/cern_cbmrich/hameg.pl
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..f664dc06af529f0f82d4b2ffc599d5b7b8f3801d
--- /dev/null
+++ b/users/cern_cbmrich/hameg.pl
@@ -0,0 +1 @@
+../../tools/powersupply_hameg.pl
\ No newline at end of file

diff --git a/users/cern_cbmrich/tdk.pl b/users/cern_cbmrich/tdk.pl
deleted file mode 100755 (executable)
index 10b567cd3843cf91709937428c91dd9d19c03bf9..0000000000000000000000000000000000000000
--- a/users/cern_cbmrich/tdk.pl
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-use IO::Socket;
-use Time::HiRes qw(usleep);
-
-sub showUsage {
-  print "usage: tdk.pl [ON|OFF|MEAS] HOST\n";
-  exit;
-}
-
-my $cmd  = $ARGV[0] or showUsage;
-my $peer = $ARGV[1] or showUsage;
-my $socket;
-
-$cmd = uc $cmd;
-
-sub measure {
-  my @values = ();
-
-  usleep 1e5; print $socket "MEAS:VOLT?\n";
-  my $volt = <$socket>;
-  usleep 1e5; print $socket "MEAS:CURR?\n";
-  my $curr = <$socket>;
-  usleep 1e5; print $socket "OUTP:STAT?\n";
-  my $state = <$socket>;
-
-  chomp $volt;
-  chomp $curr;
-  chomp $state;
-
-  print "$peer CH 0: $curr A @ $volt V ($state)\n";
-}
-
-sub switchPower {
-  my $state = shift;
-  $state = (uc($state) eq 'ON' ? 'ON' : 'OFF');
-  usleep 1e5; print $socket "OUTP:STAT $state\n";
-}
-
-local $SIG{ALRM} = sub { die 'ERROR: Timed Out'; };
-alarm 2;
-
-$socket = IO::Socket::INET->new(PeerAddr => $peer, PeerPort => 8003, Proto => "tcp", Type => SOCK_STREAM) or die "ERROR: Cannot connect: $@";
-
-if ($cmd eq "OFF" || $cmd eq "ON") {
-  switchPower $cmd;
-  measure;
-} elsif ($cmd =~ m/^MEAS/) {
-  measure;
-} else {
-  showUsage;
-}
-
-
-alarm 0;

diff --git a/users/cern_cbmrich/tdk.pl b/users/cern_cbmrich/tdk.pl
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..a6aa3ec7a476ed33d32474f59f47da81591aea0e
--- /dev/null
+++ b/users/cern_cbmrich/tdk.pl
@@ -0,0 +1 @@
+../../tools/powersupply_tdklambda.pl
\ No newline at end of file