From: Hadaq Hades <jan@lxhadeb07>
Date: Sun, 20 Dec 2020 20:32:56 +0000 (+0100)
Subject: changed algo of load_thresholds: now the order of the text table xxx.db is preserved, mt
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=af041db641e1212942b397885215b58a46b7f783;p=hadesdaq.git

changed algo of load_thresholds: now the order of the text table xxx.db is preserved, mt
---

diff --git a/main/startup.pl b/main/startup.pl
index d595c7b..8b9c697 100755
--- a/main/startup.pl
+++ b/main/startup.pl
@@ -1127,7 +1127,7 @@ sub makeRegisterConf() {
 
   my %reg_hash;
   my $reg_href = \%reg_hash;
-
+  my @load_array = ();
   my $fh = new FileHandle( "$register", "r" );
   &isItDefined( $fh, $register );
 
@@ -1207,7 +1207,9 @@ sub makeRegisterConf() {
         my $reg = @{ $mb_type->{$type} }[$i];
         my $val = $val[$i];
 
-        push( @{ $reg_hash{$addr} }, { $reg => $val } );
+        #push( @{ $reg_hash{$addr} }, { $reg => $val } );
+        push( @load_array, { "$addr" => { $reg => $val }} );
+
       }
     }
     elsif ($ver_table) {
@@ -1227,14 +1229,20 @@ sub makeRegisterConf() {
 
   $fh = new FileHandle(">$outConf_register") || die "could not open $outConf_register";
 
-  foreach my $addr ( sort keys %{$reg_href} ) {
-    foreach my $ref ( @{ $reg_href->{$addr} } ) {
-      my ( $reg, $thr ) = each( %{$ref} );
-
-      print $fh "w $addr $reg $thr\n";
-    }
+  foreach my $cur_element ( @load_array ) {
+    (my $addr) = keys %$cur_element;
+    my $db = $cur_element->{$addr};
+    my ( $reg, $thr ) = each( %{$cur_element->{$addr}} );
+    print $fh "w $addr $reg $thr\n";
   }
 
+  #foreach my $addr ( sort keys %{$reg_href} ) {
+  #  foreach my $ref ( @{ $reg_href->{$addr} } ) {
+  #    my ( $reg, $thr ) = each( %{$ref} );
+  #     print $fh "w $addr $reg $thr\n";
+  #  }
+  #}
+
   $fh->close;
 
   return $ret_register;