From 8be410984c57d8e5d629cf23ba0fbf4555db4aaa Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Fri, 4 Dec 2020 10:16:27 +0100 Subject: [PATCH] add MDC to ADC readout --- users/frankfurt_test/trb3scadc.pl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/users/frankfurt_test/trb3scadc.pl b/users/frankfurt_test/trb3scadc.pl index e257196..2319220 100755 --- a/users/frankfurt_test/trb3scadc.pl +++ b/users/frankfurt_test/trb3scadc.pl @@ -12,20 +12,21 @@ trb_init_ports() or die trb_strerror(); my $board = hex($ARGV[0]); -#0 for TRB3sc, 1 for DiRich, 2 for Concentrator, 3 for PowerVoltages, 4 for PowerCurrents, 5 for Trb5sc +#0 for TRB3sc, 1 for DiRich, 2 for Concentrator, 3 for PowerVoltages, 4 for PowerCurrents, 5 for Trb5sc, 6 for MDC my $mode = $ARGV[1] || 0; my $t = [['mV (3.3)','mV (2.5)','mV (1.2)','mV (6)'], ['mV (3.3)','mV (2.5)','mV (1.1)',''], ['mV (3.3)','mV (2.5)','mV (1.2)','mA (@1.2)'], ['mV (3.3)','mV (2.5)','mV (1.2)','mV (1.1)'], ['mA (@1.1)','mA (@1.2)','mA (@2.5)','mA (@3.3)'], - ['mV (5)','mV (1.1)','mV (2.5)','mV (3.3)']]; -my $channel = [7,7,7,6,6,7]; #SPI interface number - 777657 would be right + ['mV (5)','mV (1.1)','mV (2.5)','mV (3.3)'], + ['mV (1.1 raw)','mV (1.1)','mV (3.3 raw)','mV (2.5)']]; +my $channel = [7,7,7,6,6,7,7]; #SPI interface number - 777657 would be right #1:4V, 2:2V, 3:1V -my $resolution = [[2,1,2,1], [2,2,2,1], [2,2,2,4], [2,2,2,2], [3,3,2,2], [1,2,1,2]]; -my $multiplier= [[1,1,0.5,2],[1,1,0.5,0],[1,1,0.5,3.125],[1,1,0.5,0.5], [2.5,1.25,1,0.5], [2,0.5,1,1]]; -my $modedesc = [ 'Trb3sc', 'DiRich', 'Concentrator', 'Power-Voltages','Power-Currents', 'Trb5sc']; +my $resolution = [[2,1,2,1], [2,2,2,1], [2,2,2,4], [2,2,2,2], [3,3,2,2], [1,2,1,2], [2,2,2,2]]; +my $multiplier= [[1,1,0.5,2],[1,1,0.5,0],[1,1,0.5,3.125],[1,1,0.5,0.5], [2.5,1.25,1,0.5], [2,0.5,1,1], [0.5,0.5,1,1]]; +my $modedesc = [ 'Trb3sc', 'DiRich', 'Concentrator', 'Power-Voltages','Power-Currents', 'Trb5sc', 'MDC']; print "\nRunning in mode ".$modedesc->[$mode]."\n\n"; -- 2.43.0