Changeset 9583 in ntrip for trunk/BNC/src/PPP

Timestamp:

Jan 4, 2022, 2:50:21 PM (3 years ago)

Author:

stuerze

Message:

update regarding PPP

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (2 diffs)
• pppFilter.cpp (modified) (4 diffs)
• pppSatObs.cpp (modified) (2 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -523 +523 @@
       // use observations only if satellite code biases are available
       // ------------------------------------------------------------
-      //useObsWithCodeBiasesOnly(_obsRover);
+      useObsWithCodeBiasesOnly(_obsRover);
 
       if (int(_obsRover.size()) < _opt->_minObs) {
@@ -719 +719 @@
           continue;
         }
-        if (satObs->prn().system() == sys && 
-        !_historicalRefSats[sys].contains(satObs->prn())) {
+        if (satObs->prn().system() == sys &&
+            !_historicalRefSats[sys].contains(satObs->prn())) {
           obsVector[ii]->setAsReference();
           refSat->setPrn(satObs->prn());

trunk/BNC/src/PPP/pppFilter.cpp

@@ -119 +119 @@
       if (processSystem(OPT->LCs(sys), obsVector, _refPrn,
                         epoch->pseudoObsIono(), preProcessing) != success) {
-        LOG << "processSystem !=  success (pre-processing)" << endl;
+        LOG << sys << ": processSystem !=  success (pre-processing)" << endl;
         _xFlt = xFltOld;
         _QFlt = QFltOld;
@@ -240 +240 @@
     // Real Observations
     // =================
+    double nSat = 0;
     for (unsigned ii = 0; ii < obsVector.size(); ii++) {
       t_pppSatObs* obs = obsVector[ii];
@@ -246 +247 @@
       }
       if (!obs->outlier()) {
+        nSat++;
         for (unsigned jj = 0; jj < usedLCs; jj++) {
           const t_lc::type tLC = LCs[jj];
@@ -264 +266 @@
     // Check number of observations
     // ----------------------------
-    if (iObs == -1) {LOG << "iObs == -1\n";
-      return failure;
+
+    if (OPT->_obsModelType == OPT->DCMcodeBias ||
+        OPT->_obsModelType == OPT->DCMphaseBias) {
+      if (nSat < 2.0) {
+        LOG << " number of observations < 2\n";
+        return failure;
+      }
+    }
+    else {
+      if (iObs == -1) {
+        LOG << " number of observations == -1\n";
+        return failure;
+      }
     }
 

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -312 +312 @@
   retVal = sqrt(retVal);
 
-  // De-Weight measurements
-  // ----------------------
-  if (_prn.system() == 'R') {
-    retVal *= 50.0;
-  }
-
   // Elevation-Dependent Weighting
   // -----------------------------
@@ -353 +347 @@
 
   retVal = sqrt(retVal);
-
-  if (_prn.system() == 'R') {
-    retVal *= 5.0;
-  }
 
   return retVal;