Changeset 10233 in ntrip for trunk/BNC/scripts/Bnc.pm

Timestamp:

Nov 1, 2023, 9:02:50 AM (7 months ago)

Author:

stuerze

Message:

minor changes

File:

• trunk/BNC/scripts/Bnc.pm (modified) (4 diffs)

trunk/BNC/scripts/Bnc.pm

@@ -493 +493 @@
     my $epochSec     = 0;
     my $epochDiff    = 0;
-    my ( @hlp, @EPOCHs, @N, @E, @U, %SATNUM, @TRPs, @CLKs, @OFF_GLOs, @OFF_GALs, @OFF_BDSs, );
-    my ( @EPOCHs_CLK, @EPOCHs_OFF_GLO, @EPOCHs_OFF_GAL, @EPOCHs_OFF_BDS );
+    my ( @hlp, @N, @E, @U, %SATNUM, @TRPs, @G_CLKs, @R_CLKs, @E_CLKs, @C_CLKs );
+    my ( @EPOCHs, @EPOCHs_G_CLK, @EPOCHs_R_CLK, @EPOCHs_E_CLK, @EPOCHs_C_CLK);
     my ( %AMB,        %RES,            %ELE,            %ION, %BIA );
     my ( $station,    $lki,            $sys,            $sat, $amb );
@@ -584 +584 @@
             push @{ $BIA{$lki}{$sys}{DATA} },  $hlp[4] + $hlp[5];
         }
-        elsif ( $ln =~ /\bREC_CLK\b/ ) {
-            push ( @EPOCHs_CLK, $epochSec );
-            push ( @CLKs,       $hlp[2] + $hlp[3] );
-        }
-        elsif ( $ln =~ /\bOFF_GLO\b/ ) {    # 2015-08... OFF_GLO 52.6806 -3.8042 +- 9.0077
-            push ( @EPOCHs_OFF_GLO, $epochSec );
-            push ( @OFF_GLOs,       $hlp[2] + $hlp[3] );
-        }
-        elsif ( $ln =~ /\bOFF_GAL\b/ ) {    # 2015-08... OFF_GAL 52.6806 -3.8042 +- 9.0077
-            push ( @EPOCHs_OFF_GAL, $epochSec );
-            push ( @OFF_GALs,       $hlp[2] + $hlp[3] );
-        }
-        elsif ( $ln =~ /\bOFF_BDS\b/ ) {    # 2015-08... OFF_BDS 52.6806 -3.8042 +- 9.0077
-            push ( @EPOCHs_OFF_BDS, $epochSec );
-            push ( @OFF_BDSs,       $hlp[2] + $hlp[3] );
+        elsif ( $ln =~ /\bREC_CLK  G\b/ ){
+            push ( @EPOCHs_G_CLK, $epochSec);
+                push ( @G_CLKs, $hlp[3] + $hlp[4] );
+        }
+        elsif ( $ln =~ /\bREC_CLK  R\b/ ){
+            push ( @EPOCHs_R_CLK, $epochSec);
+                push ( @R_CLKs, $hlp[3] + $hlp[4] );
+        }
+        elsif ( $ln =~ /\bREC_CLK  E\b/ ){
+            push ( @EPOCHs_E_CLK, $epochSec);
+                push ( @E_CLKs, $hlp[3] + $hlp[4] );
+        }
+        elsif ( $ln =~ /\bREC_CLK  C\b/ ){
+            push ( @EPOCHs_C_CLK, $epochSec);
+                push ( @C_CLKs, $hlp[3] + $hlp[4] );
         }
         elsif ( $ln =~ /\bSATNUM\b/ ) {     # 2015-09... SATNUM G  8
@@ -619 +619 @@
            . scalar @U
            . ", TRPs:"
-           . scalar @TRPs );
+           . scalar @TRPs
+           . ", GPS CLKs:"
+           . scalar @G_CLKs
+           . ", GLO CLKs:"
+           . scalar @R_CLKs
+           . ", GAL CLKs:"
+           . scalar @E_CLKs
+           . ", BDS CLKs:"
+           . scalar @E_CLKs
+           );
     if ( $nof_epochs != scalar @N )                    { LOGDIE "number of epochs and residuals not equal\n" }
     if ( $nof_epochs != scalar @TRPs )                 { LOGDIE "number of epochs and TRPs not equal\n" }
-    if ( @CLKs && scalar @EPOCHs_CLK != scalar @CLKs ) { LOGDIE "number of epochs and CLKs not equal\n" }
-
-    if ( @OFF_GLOs && scalar @EPOCHs_OFF_GLO != scalar @OFF_GLOs ) {
-        LOGDIE "number of epochs and OFF_GLOs not equal\n";
-    }
-    if ( @OFF_GALs && scalar @EPOCHs_OFF_GAL != scalar @OFF_GALs ) {
-        LOGDIE "number of epochs and OFF_GALs not equal\n";
-    }
-    if ( @OFF_BDSs && scalar @EPOCHs_OFF_BDS != scalar @OFF_BDSs ) {
-        LOGDIE "number of epochs and OFF_BDSs not equal\n";
-    }
+    if ( @G_CLKs && scalar @EPOCHs_G_CLK != scalar @G_CLKs ) {LOGDIE "number of epochs and G_CLKs not equal\n";}
+    if ( @R_CLKs && scalar @EPOCHs_R_CLK != scalar @R_CLKs ) {LOGDIE "number of epochs and R_CLKs not equal\n";}
+    if ( @E_CLKs && scalar @EPOCHs_E_CLK != scalar @E_CLKs ) {LOGDIE "number of epochs and E_CLKs not equal\n";}
+    if ( @C_CLKs && scalar @EPOCHs_C_CLK != scalar @C_CLKs ) {LOGDIE "number of epochs and C_CLKs not equal\n";}
     if ( !$station ) { WARN "could not grep stationname from file: $file\n" }
 
@@ -642 +644 @@
                  SATNUM     => \%SATNUM,
                  TRPs       => \@TRPs,
-                 CLKs       => \@CLKs,
-                 CLK_EPOCHS => \@EPOCHs_CLK,
-                 OFF_GLOs   => \@OFF_GLOs,
-                 OFF_GALs   => \@OFF_GALs,
-                 OFF_BDSs   => \@OFF_BDSs,
+                 G_CLKs  => \@G_CLKs,
+                 R_CLKs  => \@R_CLKs,
+                 E_CLKs  => \@E_CLKs,
+                 C_CLKs  => \@C_CLKs,
                  RES        => \%RES,
                  AMB        => \%AMB,