From: hadaq Date: Thu, 14 Aug 2025 15:40:00 +0000 (+0200) Subject: MBO P3&4 sector 2 added X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=9ed7cec57b36be3df028d91b9739baa27a3b0edd;p=hades_mdc_settings.git MBO P3&4 sector 2 added --- diff --git a/installation/mbo_positions.db b/installation/mbo_positions.db index 76bf50a..8703c70 100644 --- a/installation/mbo_positions.db +++ b/installation/mbo_positions.db @@ -230,22 +230,22 @@ 2 1 14 1 0 2 1 15 0 0 -2 2 0 1 0 -2 2 1 0 0 -2 2 2 0 0 -2 2 3 0 0 -2 2 4 0 0 -2 2 5 1 0 -2 2 6 1 0 -2 2 7 0 0 -2 2 8 0 0 -2 2 9 0 0 -2 2 10 0 0 -2 2 11 1 0 -2 2 12 0 0 -2 2 13 1 0 -2 2 14 1 0 -2 2 15 0 0 +2 2 0 1 910 +2 2 1 0 555 +2 2 2 0 385 +2 2 3 0 388 +2 2 4 0 540 +2 2 5 1 952 +2 2 6 1 890 +2 2 7 0 486 +2 2 8 0 487 +2 2 9 0 483 +2 2 10 0 481 +2 2 11 1 930 +2 2 12 0 615 +2 2 13 1 935 +2 2 14 1 901 +2 2 15 0 617 2 3 0 1 919 2 3 1 0 597 @@ -253,15 +253,15 @@ 2 3 3 0 600 2 3 4 0 605 2 3 5 1 835 -2 3 6 1 955 +2 3 6 1 950 # 955 2 3 7 0 594 2 3 8 0 620 2 3 9 0 603 2 3 10 0 601 -2 3 11 1 887 +2 3 11 1 951 # 887 2 3 12 0 482 2 3 13 1 113 -2 3 14 1 914 +2 3 14 1 907 # 914 2 3 15 0 484 2 4 0 1 0 @@ -334,22 +334,22 @@ 3 1 14 1 0 3 1 15 0 0 -3 2 0 0 0 -3 2 1 0 0 -3 2 2 0 0 -3 2 3 1 0 -3 2 4 1 0 -3 2 5 0 0 -3 2 6 0 0 -3 2 7 0 0 -3 2 8 0 0 -3 2 9 1 0 -3 2 10 1 0 -3 2 11 0 0 -3 2 12 0 0 -3 2 13 1 0 -3 2 14 1 0 -3 2 15 0 0 +3 2 0 0 590 +3 2 1 0 515 +3 2 2 0 480 +3 2 3 1 924 +3 2 4 1 925 +3 2 5 0 527 +3 2 6 0 576 +3 2 7 0 581 +3 2 8 0 584 +3 2 9 1 959 +3 2 10 1 900 +3 2 11 0 587 +3 2 12 0 557 +3 2 13 1 922 +3 2 14 1 927 +3 2 15 0 530 3 3 0 0 612 3 3 1 0 443 @@ -364,7 +364,7 @@ 3 3 10 1 903 3 3 11 0 379 3 3 12 0 531 -3 3 13 1 882 +3 3 13 1 956 # 882 3 3 14 1 906 3 3 15 0 567 diff --git a/installation/powerdistributor_positions.db b/installation/powerdistributor_positions.db index 3593acd..6aa6728 100644 --- a/installation/powerdistributor_positions.db +++ b/installation/powerdistributor_positions.db @@ -20,13 +20,13 @@ 2 0 052 2 1 000 2 2 000 - 2 3 000 + 2 3 063 2 4 000 2 5 000 3 0 000 3 1 000 3 2 000 - 3 3 000 + 3 3 051 3 4 000 3 5 000 diff --git a/scripts/generate_pasttrec_settings.pl b/scripts/generate_pasttrec_settings.pl index 1d566cc..0001826 100755 --- a/scripts/generate_pasttrec_settings.pl +++ b/scripts/generate_pasttrec_settings.pl @@ -111,7 +111,7 @@ foreach my $a (keys %$addresses) { foreach my $i (0..15) { #copy default settings $settings->{$a}[$pt*16+$i] = $default_settings[$i]; } - my $t = max($thresholds->{$a}[$pt] + $threshold,0) & 0x7f; + my $t = max($thresholds->{$a}[$pt]//0 + $threshold,0) & 0x7f; $settings->{$a}[$pt*16+3] = ($default_settings[3] & 0xfff00) + $t; if(!defined $baselines->{$addresses->{$a}}{$pt}) { diff --git a/settings_power/settings_voltage.db b/settings_power/settings_voltage.db index 99b27b6..29d4941 100644 --- a/settings_power/settings_voltage.db +++ b/settings_power/settings_voltage.db @@ -234,22 +234,22 @@ 0x8f2d 7 7 0x8f2e 7 7 0x8f2f 7 7 - 0x8f30 7 7 - 0x8f31 7 7 - 0x8f32 7 7 - 0x8f33 7 7 - 0x8f34 7 7 - 0x8f35 7 7 - 0x8f36 7 7 - 0x8f37 7 7 - 0x8f38 7 7 - 0x8f39 7 7 - 0x8f3a 7 7 - 0x8f3b 7 7 - 0x8f3c 7 7 - 0x8f3d 7 7 - 0x8f3e 7 7 - 0x8f3f 7 7 + 0x8f30 4 4 + 0x8f31 3 3 + 0x8f32 3 3 + 0x8f33 3 3 + 0x8f34 3 3 + 0x8f35 3 3 + 0x8f36 4 4 + 0x8f37 3 3 + 0x8f38 3 3 + 0x8f39 3 3 + 0x8f3a 3 3 + 0x8f3b 4 3 + 0x8f3c 2 2 + 0x8f3d 2 2 + 0x8f3e 2 2 + 0x8f3f 2 2 0x8f40 7 7 0x8f41 7 7 0x8f42 7 7 @@ -330,22 +330,22 @@ 0x8f8d 7 7 0x8f8e 7 7 0x8f8f 7 7 - 0x8f90 7 7 - 0x8f91 7 7 - 0x8f92 7 7 - 0x8f93 7 7 - 0x8f94 7 7 - 0x8f95 7 7 - 0x8f96 7 7 - 0x8f97 7 7 - 0x8f98 7 7 - 0x8f99 7 7 - 0x8f9a 7 7 - 0x8f9b 7 7 - 0x8f9c 7 7 - 0x8f9d 7 7 - 0x8f9e 7 7 - 0x8f9f 7 7 + 0x8f90 3 4 + 0x8f91 3 3 + 0x8f92 3 3 + 0x8f93 4 4 + 0x8f94 3 3 + 0x8f95 2 3 + 0x8f96 3 4 + 0x8f97 3 4 + 0x8f98 3 3 + 0x8f99 4 4 + 0x8f9a 3 3 + 0x8f9b 3 3 + 0x8f9c 2 2 + 0x8f9d 3 3 + 0x8f9e 2 3 + 0x8f9f 2 2 0x8fa0 7 7 0x8fa1 7 7 0x8fa2 7 7