From 2c89b5a1bb06fd904f90c13699c2b32dac007507 Mon Sep 17 00:00:00 2001 From: hadaq Date: Thu, 28 Nov 2024 13:12:25 +0100 Subject: [PATCH] MBOs exchanged in Plane 2 --- helperscripts/generate_channel_list.pl | 7 ++++--- installation/mbo_positions.db | 8 ++++---- installation/temperature_sensors.db | 2 +- scripts/read_1wire_sensors.pl | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/helperscripts/generate_channel_list.pl b/helperscripts/generate_channel_list.pl index 7596fcf..2a6bc6b 100755 --- a/helperscripts/generate_channel_list.pl +++ b/helperscripts/generate_channel_list.pl @@ -31,7 +31,8 @@ close FILE; ############################################################################### #Read old lookup table ############################################################################### -open FILE, "Lookup-Wire-OLD.txt" or die $!."\nLookup-Wire-OLD.txt not found."; +#~ open FILE, "Lookup-Wire-OLD.txt" or die $!."\nLookup-Wire-OLD.txt not found."; +open FILE, "lookupOld-allsectors-feb24.txt" or die $!."\n lookupOld-allsectors-feb24.txt not found."; while (my $a = ) { if(my @values = $a =~ /^(\d)\s(\d)\s(\d+)\s(\d+)\s\|\s(\d)\s(\d)\s(\d+)\s+.+\s(-?\d)\s(-?\d+)/) { my $p = shift @values; @@ -74,8 +75,8 @@ foreach my $p (0..3) { $oldc = 7-$c if ($c<8); $oldc = 39-$c if ($c >=16 && $c < 24); - my $layer = $oldlayer->[$p][0][$b][$f][$oldc]; - my $cell = $oldcell-> [$p][0][$b][$f][$oldc]; + my $layer = $oldlayer->[$p][$s][$b][$f][$oldc]; + my $cell = $oldcell-> [$p][$s][$b][$f][$oldc]; printf("0x%04x\t%u\t%u\t%u\t%u\t%i\t%i\n",$addr+$f,$c,$p,$s,$b,$layer,$cell); } diff --git a/installation/mbo_positions.db b/installation/mbo_positions.db index f21e6b3..b492a6f 100644 --- a/installation/mbo_positions.db +++ b/installation/mbo_positions.db @@ -107,7 +107,7 @@ 1 0 12 0 424 1 0 13 0 441 1 0 14 1 871 -1 0 15 1 873 +1 0 15 1 915 1 1 0 0 463 1 1 1 0 462 @@ -132,9 +132,9 @@ 1 2 3 0 451 1 2 4 0 376 1 2 5 0 414 -1 2 6 0 308 +1 2 6 0 455 1 2 7 0 409 -1 2 8 0 387 +1 2 8 0 308 1 2 9 0 405 1 2 10 0 331 1 2 11 0 420 @@ -158,7 +158,7 @@ 1 3 12 0 374 1 3 13 0 304 1 3 14 1 850 -1 3 15 1 880 +1 3 15 1 857 1 4 0 0 415 1 4 1 0 328 diff --git a/installation/temperature_sensors.db b/installation/temperature_sensors.db index ad2eace..22053df 100644 --- a/installation/temperature_sensors.db +++ b/installation/temperature_sensors.db @@ -1,6 +1,6 @@ # Plane # Sector # inner short # outer short # inner long # outer long # inner center # ##################################################################################################################################### - 0 0 A3000001f1408528 1F000001f14F7D28 B7000001f110A428 78000001F149E028 A2000001F1194E28 + 0 0 A3000001f1408528 1F000001f14F7D28 B7000001f110A428 78000001F149E028 A2000001F1194E28 0 1 22000001f1438f28 54000001f130e628 7e000001f12f9e28 81000001f1496e28 72000001F10CD428 0 2 96000001f1132328 a6000001f14adc28 55000001f141EE28 AD000001F12B0228 0D000001F10B8428 0 3 df000001f1508528 1f000001f1449e28 68000001f1438228 2d000001f1299428 94000001F1CF2628 diff --git a/scripts/read_1wire_sensors.pl b/scripts/read_1wire_sensors.pl index 3dda5df..af9a150 100755 --- a/scripts/read_1wire_sensors.pl +++ b/scripts/read_1wire_sensors.pl @@ -47,7 +47,7 @@ while(1) { foreach my $b (sort keys %$boards) { readData($b); } - last; + last; #don't remove, no loop for hmon sleep 10; } -- 2.43.0