comment pasttrec settings, add custom broadcast address to address generator

diff --git a/scripts/generate_address_settings.pl b/scripts/generate_address_settings.pl
index c81c4ccf9845790bb710eba2bc78f7b97e0f8481..f6c5e24369ea67ba8d8ab4c602ff2ee3a6f9757c 100755 (executable)
--- a/scripts/generate_address_settings.pl
+++ b/scripts/generate_address_settings.pl
@@ -21,7 +21,7 @@ foreach my $uid (keys %$boards) {
   foreach my $k (keys %{$boards->{$uid}}) {
     my $addr = $boards->{$uid}{$k};
     
-    my $str = sprintf("0x%04x 0x7001 0x%08x\n", $addr, 0x80000000+$addr);
+    my $str = sprintf("0x%04x 0x7001 0x%08x\n", $addr, 0x80900000+$addr);
 
     my $filename = sprintf("../settings_oep/auto/%04x_02_network_address.trbcmd",$addr);
     open(FILE, '>', $filename) or die $!;
@@ -39,7 +39,7 @@ foreach my $uid (keys %$boards) {
   foreach my $k (keys %{$boards->{$uid}}) {
     my $addr = $boards->{$uid}{$k};
     
-    my $str = sprintf("0x%04x 0x7001 0x%08x\n", $addr, 0x80000000+$addr);
+    my $str = sprintf("0x%04x 0x7001 0x%08x\n", $addr, 0x80910000+$addr);
 
     my $filename = sprintf("../settings_tdc/auto/%04x_02_network_address.trbcmd",$addr);
     open(FILE, '>', $filename) or die $!;

diff --git a/scripts/generate_pasttrec_settings.pl b/scripts/generate_pasttrec_settings.pl
index d9d26d536c8448399623053f0c173eadcb627334..b5944b3f96d579e0228a8d2819a583820b964d4d 100755 (executable)
--- a/scripts/generate_pasttrec_settings.pl
+++ b/scripts/generate_pasttrec_settings.pl
@@ -10,10 +10,10 @@ my $DEBUG = 0;       #print debug messages
 my $LOAD_DIRECT = 1; #load settings and initialize 
 my $WRITE_FILES = 1; #write configration files
 
-my @default_settings = (0x50018,
-                        0x5011e,
-                        0x50215,
-                        0x5030a,
+my @default_settings = (0x50018,    #1:0 peaking 10ns, 3:2 gain 1mV, 4 internal bandgap
+                        0x5011e,    #2:0 tail1 R 27k, 5:3 tail1 C 10pF
+                        0x50215,    #2:0 tail1 R 23k, 5:3 tail1 C 0.9pF
+                        0x50305,    #6:0 global threshold 5=10mV
                         0x50400,0x50500,0x50600,0x50700,0x50800,0x50900,0x50a00,0x50b00,
                         0,0,0,0);