Changeset 9548 in ntrip for trunk/BNC/src/PPP/pppParlist.cpp

Timestamp:

Nov 18, 2021, 4:55:06 PM (2 years ago)

Author:

stuerze

Message:

update regarding PPP

File:

• trunk/BNC/src/PPP/pppParlist.cpp (modified) (5 diffs)

trunk/BNC/src/PPP/pppParlist.cpp

@@ -183 +183 @@
   switch (_type) {
   case crdX:
-    if (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
+    if (tLC == t_lc::GIM) {return 0.0;}
     return (sta->xyzApr()[0] - obs->xc()[0]) / rhoV.NormFrobenius();
   case crdY:
-    if (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
+    if (tLC == t_lc::GIM) {return 0.0;}
     return (sta->xyzApr()[1] - obs->xc()[1]) / rhoV.NormFrobenius();
   case crdZ:
-    if (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
+    if (tLC == t_lc::GIM) {return 0.0;}
     return (sta->xyzApr()[2] - obs->xc()[2]) / rhoV.NormFrobenius();
   case clkR:
-    if (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
+    if (tLC == t_lc::GIM) {return 0.0;}
     return 1.0;
   case offGR:
-    if (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
+    if (tLC == t_lc::GIM) {return 0.0;}
     return (obs->prn().system() == 'R') ? 1.0 : 0.0;
   case offGE:
-    if (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
+    if (tLC == t_lc::GIM) {return 0.0;}
     return (obs->prn().system() == 'E') ? 1.0 : 0.0;
   case offGC:
-    if (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
+    if (tLC == t_lc::GIM) {return 0.0;}
     return (obs->prn().system() == 'C') ? 1.0 : 0.0;
   case amb:
-    if      (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
+    if      (tLC == t_lc::GIM) {return 0.0;}
     else if ((OPT->_obsModelType == OPT->IF)     ||
              (OPT->_obsModelType == OPT->PPPRTK) ||
@@ -232 +232 @@
     if      (tLC == t_lc::GIM) {
       return 0.0;
-    }
-    else if (tLC == t_lc::Tz0) {
-      return 1.0;
     }
     else {
@@ -544 +541 @@
                 par->type() == t_pppParam::pBiasG1 ||
                 par->type() == t_pppParam::pBiasG2) && !usedSystems().contains('G')) {
-        delete par;
 #ifdef BNC_DEBUG_PPP
         LOG << "remove1 " << par->toString() << std::endl;
 #endif
-       it = _params.erase(it);
+        delete par;
+        it = _params.erase(it);
       }
       else if ((par->type() == t_pppParam::cBiasR1 ||
@@ -554 +551 @@
                 par->type() == t_pppParam::pBiasR1 ||
                 par->type() == t_pppParam::pBiasR2) && !usedSystems().contains('R')) {
-        delete par;
 #ifdef BNC_DEBUG_PPP
         LOG << "remove1 " << par->toString() << std::endl;
 #endif
-       it = _params.erase(it);
+        delete par;
+        it = _params.erase(it);
       }
       else if ((par->type() == t_pppParam::cBiasE1 ||
@@ -564 +561 @@
                 par->type() == t_pppParam::pBiasE1 ||
                 par->type() == t_pppParam::pBiasE2) && !usedSystems().contains('E')) {
-        delete par;
 #ifdef BNC_DEBUG_PPP
         LOG << "remove1 " << par->toString() << std::endl;
 #endif
-       it = _params.erase(it);
+        delete par;
+        it = _params.erase(it);
       }
       else if ((par->type() == t_pppParam::cBiasC1 ||
                 par->type() == t_pppParam::cBiasC2 ||
                 par->type() == t_pppParam::pBiasC1 ||
-                par->type() == t_pppParam::pBiasG2) && !usedSystems().contains('C')) {
-        delete par;
+                par->type() == t_pppParam::pBiasC2) && !usedSystems().contains('C')) {
 #ifdef BNC_DEBUG_PPP
         LOG << "remove1 " << par->toString() << std::endl;
 #endif
-       it = _params.erase(it);
+        delete par;
+        it = _params.erase(it);
       }
       else {