Changeset 10385 in ntrip

Timestamp:

Mar 12, 2024, 10:29:47 AM (7 months ago)

Author:

stuerze

Message:

changes regarding PPP

Location:

trunk/BNC

Files:

• scripts/Bnc.pm (modified) (2 diffs)
• scripts/pppPlot.pl (modified) (3 diffs)
• src/PPP/pppFilter.cpp (modified) (3 diffs)

trunk/BNC/scripts/Bnc.pm

@@ -589 +589 @@
         }
         elsif ( $ln =~ /\bOFF_GLO\b/ ) {                # 2015-08... OFF_GLO 52.6806 -3.8042 +- 9.0077
-            push ( @EPOCH_OFF_GLO, $epochSec );
+#            push ( @EPOCH_OFF_GLO, $epochSec );
             push ( @OFF_GLO,       $hlp[2] + $hlp[3] );
         }
         elsif ( $ln =~ /\bOFF_GAL\b/ ) {                # 2015-08... OFF_GAL 52.6806 -3.8042 +- 9.0077
-            push ( @EPOCH_OFF_GAL, $epochSec );
+#            push ( @EPOCH_OFF_GAL, $epochSec );
             push ( @OFF_GAL,       $hlp[2] + $hlp[3] );
         }
         elsif ( $ln =~ /\bOFF_BDS\b/ ) {                # 2015-08... OFF_BDS 52.6806 -3.8042 +- 9.0077
-            push ( @EPOCH_OFF_BDS, $epochSec );
+#            push ( @EPOCH_OFF_BDS, $epochSec );
             push ( @OFF_BDS,       $hlp[2] + $hlp[3] );
         }
@@ -624 +624 @@
     if ( $nof_epochs != scalar @TRP )                            { LOGDIE "number of epochs and TRP not equal\n" }
     if ( @CLK     && scalar @EPOCH_CLK     != scalar @CLK )      { LOGDIE "number of epochs and CLK not equal\n" }
-    if ( @OFF_GLO && scalar @EPOCH_OFF_GLO != scalar @OFF_GLO )  { LOGDIE "number of epochs and OFF_GLO not equal\n" }
-    if ( @OFF_GAL && scalar @EPOCH_OFF_GAL != scalar @OFF_GAL )  { LOGDIE "number of epochs and OFF_GAL not equal\n" }
-    if ( @OFF_BDS && scalar @EPOCH_OFF_BDS != scalar @OFF_BDS )  { LOGDIE "number of epochs and OFF_BDS not equal\n" }
+#    if ( @OFF_GLO && scalar @EPOCH_OFF_GLO != scalar @OFF_GLO )  { LOGDIE "number of epochs and OFF_GLO not equal\n" }
+#    if ( @OFF_GAL && scalar @EPOCH_OFF_GAL != scalar @OFF_GAL )  { LOGDIE "number of epochs and OFF_GAL not equal\n" }
+#    if ( @OFF_BDS && scalar @EPOCH_OFF_BDS != scalar @OFF_BDS )  { LOGDIE "number of epochs and OFF_BDS not equal\n" }
 
     if ( !$station ) { WARN "could not grep stationname from file: $file\n" }

trunk/BNC/scripts/pppPlot.pl

@@ -257 +257 @@
 
                 $dataset = Chart::Gnuplot::DataSet->new(
-                                                         xdata   => $EPOCH_OFF_GLO,
+                                                         #xdata   => $EPOCH_OFF_GLO,
+                                                         xdata   => $EPOCH,
                                                          ydata   => $file->{'OFF_GLO'},
                                                          title   => "Receiver Offset GLONASS",
@@ -290 +291 @@
 
                 $dataset = Chart::Gnuplot::DataSet->new(
-                                                         xdata   => $EPOCH_OFF_GAL,
+                                                         #xdata   => $EPOCH_OFF_GAL,
+                                                         xdata   => $EPOCH,
                                                          ydata   => $file->{'OFF_GAL'},
                                                          title   => "Receiver Offset Galileo",
@@ -323 +325 @@
 
                 $dataset = Chart::Gnuplot::DataSet->new(
-                                                         xdata   => $EPOCH_OFF_BDS,
+                                                         #xdata   => $EPOCH_OFF_BDS,
+                                                         xdata   => $EPOCH,
                                                          ydata   => $file->{'OFF_BDS'},
                                                          title   => "Receiver Offset Beidou",

trunk/BNC/src/PPP/pppFilter.cpp

@@ -100 +100 @@
       }
     }
-    LOG << epoTimeStr << " SATNUM " << sys << ' ' << right << setw(2) << num  << endl;
+    LOG << epoTimeStr << " SATNUM " << sys << ' ' << right << setw(2) << num;
+    if (num < OPT->_minObs) {
+      LOG << " < OPT->_minObs " << right << setw(2) << OPT->_minObs << endl;
+      continue;
+    }
+    LOG << endl;
     if (processSystem(OPT->LCs(sys), obsVector, epoch->pseudoObsIono()) != success) {
       LOG << "t_pppFilter::processSystem() !=  success: " << sys << endl;
@@ -347 +352 @@
 
         // Check Pre-Fit Residuals
-        // -----------------------
+        /* -----------------------
         else {
           ColumnVector AA(params.size());
@@ -362 +367 @@
             resetAmb(obs->prn(), obsVector, tLC);
           }
-        }
+        }*/
       }
     }