Changeset 9432 in ntrip for trunk/BNC

Timestamp:

May 18, 2021, 11:15:08 PM (3 years ago)

Author:

stuerze

Message:

update regarding PPP

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (2 diffs)
• pppFilter.cpp (modified) (1 diff)
• pppSatObs.cpp (modified) (2 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -606 +606 @@
       if (_obsPool->refSatChanged()) {
         if(_filter->datumTransformation() != success) {
-          LOG << "_filter->datumTransformation() != success" << endl;
+          LOG << "pppFilter::datumTransformation() != success" << endl;
           return finish(failure);
         }
         else {
-          LOG << "_filter->datumTransformation() == success" << endl;
+          LOG << "pppFilter::datumTransformation() == success" << endl;
           if (!_obsPool->refSatChangeRequired()) {
             _obsPool->saveLastEpoRefSats();
@@ -891 +891 @@
       return failure;
     }
-    QString str;LOG << prn.toString() << endl;
+    QString str;
     if (prn == _obsPool->getRefSatMapElementLastEpoch(sys) ||
                _obsPool->getRefSatMapElementLastEpoch(sys) == t_prn() )  {

trunk/BNC/src/PPP/pppFilter.cpp

@@ -286 +286 @@
           PP[iObs] = 1.0 / (obs->sigma(tLC) * obs->sigma(tLC));
         }
-      }
-    }
-    if (OPT->_obsModelType == OPT->DCMcodeBias ||
-        OPT->_obsModelType == OPT->DCMphaseBias) {
-      if (iObs < 2) { // TODO SATNUM => usableSys has to be removed 
-        return failure;
       }
     }

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -317 +317 @@
   // --------------------------
   if ((_prn.system() == 'R' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) ||
-      (_prn.system() == 'C' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC)))) {  
+      (_prn.system() == 'C' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC)))) {
     retVal *= 5.0;
   }
@@ -359 +359 @@
 
   retVal = sqrt(retVal);
+
+  if ((_prn.system() == 'R' && t_lc::includesCode(tLC)) ||
+      (_prn.system() == 'C' && t_lc::includesCode(tLC))) {
+    retVal *= 3.0;
+  }
 
   return retVal;