Changeset 9618 in ntrip for trunk

Timestamp:

Jan 23, 2022, 9:42:55 PM (2 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src

Files:

• PPP/pppFilter.cpp (modified) (2 diffs)
• PPP/pppSatObs.cpp (modified) (2 diffs)
• pppMain.cpp (modified) (3 diffs)

trunk/BNC/src/PPP/pppFilter.cpp

@@ -270 +270 @@
       return failure;
     }
-    if (!preProcessing &&
-        (OPT->_obsModelType == OPT->DCMcodeBias ||
-         OPT->_obsModelType == OPT->DCMphaseBias))  {
-      if (nSat < 2.0) {
-        LOG << " number of observations < 2\n";
-        return failure;
-      }
-    }
-
+    
     if ((!iOutlier) &&
         (OPT->_obsModelType == OPT->DCMcodeBias ||
@@ -718 +710 @@
     for (unsigned jj = 0; jj < allObs.size(); jj++) {
       if (allObs[jj]->prn().system() == sys) {
+        allObs[jj]->resetOutlier();
         obsVector.push_back(allObs[jj]);
       }

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -632 +632 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_pppSatObs::printObsMinusComputed() const {
-// TODO: LOG should be LOG
-  cout.setf(ios::fixed);
-  cout << "\nOBS-COMP for Satellite " << _prn.toString() << (isReference() ? " (Reference Satellite)" : "") << endl
+// TODO: cout should be LOG
+  LOG.setf(ios::fixed);
+  LOG << "\nOBS-COMP for Satellite " << _prn.toString() << (isReference() ? " (Reference Satellite)" : "") << endl
        << "========================== " << endl;
   for (unsigned ii = 0; ii < OPT->LCs(_prn.system()).size(); ii++) {
     t_lc::type tLC = OPT->LCs(_prn.system())[ii];
-    cout << "OBS-CMP " << setw(4) << t_lc::toString(tLC) << ": " << _prn.toString() << " "
+    LOG << "OBS-CMP " << setw(4) << t_lc::toString(tLC) << ": " << _prn.toString() << " "
         << setw(12) << setprecision(3) << obsValue(tLC) << " "
         << setw(12) << setprecision(3) << cmpValue(tLC) << " "
@@ -644 +644 @@
   }
 }
-
 
 //

trunk/BNC/src/pppMain.cpp

@@ -206 +206 @@
       opt->_obsModelType = t_pppOptions::PPPRTK;
       opt->_pseudoObsIono  = false;
-      opt->_noiseIon = 0.1;
+      opt->_noiseIon = 10.0;
     }
     else if (settings.value("PPP/modelObs").toString() == "Uncombined PPP") {
       opt->_obsModelType = t_pppOptions::UncombPPP;
-      opt->_noiseIon = 0.1;
+      opt->_noiseIon = 10.0;
       if (opt->_pseudoObsIono) {
         opt->_refSatRequired = true;
@@ -219 +219 @@
       opt->_refSatRequired = true;
       opt->_noiseCodeBias  = 100.0;
-      opt->_noiseIon = 0.1;
+      opt->_noiseIon = 10.0;
     }
     else if (settings.value("PPP/modelObs").toString() == "DCM with Phase Biases") {
@@ -225 +225 @@
       opt->_refSatRequired = true;
       opt->_noisePhaseBias = 100.0;
-      opt->_noiseIon = 0.1;
+      opt->_noiseIon = 10.0;
     }
 #endif