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

Timestamp:

Nov 20, 2023, 10:23:42 PM (6 months ago)

Author:

stuerze

Message:

changes regarding PPP: allow single frequency PPP and allow to select the frequency bands that are used

File:

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

trunk/BNC/src/PPP/pppParlist.cpp

@@ -179 +179 @@
         else {
           if      (_tLC == t_lc::l1) {
-            return obs->lambda(t_lc::l1) * phaseCoeff[t_lc::toFreq(obs->prn().system(),t_lc::l1)];
+            return obs->lambda(t_lc::l1) * phaseCoeff[obs->fType1()];
           }
           else if (_tLC == t_lc::l2) {
-            return obs->lambda(t_lc::l2) * phaseCoeff[t_lc::toFreq(obs->prn().system(),t_lc::l2)];
+            return obs->lambda(t_lc::l2) * phaseCoeff[obs->fType2()];
           }
         }
@@ -198 +198 @@
     if (obs->prn() == _prn) {
       if      (tLC == t_lc::c1) {
-        return ionoCoeff[t_lc::toFreq(obs->prn().system(),t_lc::c1)];
+        return ionoCoeff[obs->fType1()];
       }
       else if (tLC == t_lc::c2) {
-        return ionoCoeff[t_lc::toFreq(obs->prn().system(),t_lc::c2)];
+        return ionoCoeff[obs->fType2()];
       }
       else if (tLC == t_lc::l1) {
-        return ionoCoeff[t_lc::toFreq(obs->prn().system(),t_lc::l1)];
+        return ionoCoeff[obs->fType1()];
       }
       else if (tLC == t_lc::l2) {
-        return ionoCoeff[t_lc::toFreq(obs->prn().system(),t_lc::l2)];
+        return ionoCoeff[obs->fType2()];
       }
       else if (tLC == t_lc::GIM) {
@@ -414 +414 @@
   }
 
-  if (OPT->_obsModelType == OPT->PPPRTK || OPT->_pseudoObsIono) {
+  if (OPT->_ionoModelType == OPT->PPP_RTK || OPT->_pseudoObsIono) {
     vector<t_pppParam*>::iterator it = _params.begin();
     while (it != _params.end()) {
@@ -502 +502 @@
   // Ionosphere
   // ----------
-  if (OPT->_obsModelType == OPT->UncombPPP) {
+  if (OPT->_ionoModelType == OPT->est) {
     for (unsigned jj = 0; jj < obsVector.size(); jj++) {
       const t_pppSatObs* satObs = obsVector[jj];
-      required.push_back(new t_pppParam(t_pppParam::ion, satObs->prn(), t_lc::dummy));
+      char sys = satObs->prn().system();
+      std::vector<t_lc::type> LCs = OPT->LCs(sys);
+      if (std::find(LCs.begin(), LCs.end(), t_lc::cIF) == LCs.end() &&
+          std::find(LCs.begin(), LCs.end(), t_lc::lIF) == LCs.end()) {
+        required.push_back(new t_pppParam(t_pppParam::ion, satObs->prn(), t_lc::dummy));
+      }
     }
   }
@@ -512 +517 @@
   for (unsigned jj = 0; jj < obsVector.size(); jj++) {
     const t_pppSatObs*  satObs = obsVector[jj];
-    const vector<t_lc::type>& ambLCs = OPT->ambLCs(satObs->prn().system());
+    char sys = satObs->prn().system();
+    const vector<t_lc::type>& ambLCs = OPT->ambLCs(sys);
     for (unsigned ii = 0; ii < ambLCs.size(); ii++) {
       required.push_back(new t_pppParam(t_pppParam::amb, satObs->prn(), ambLCs[ii], &obsVector));
@@ -520 +526 @@
   // Receiver Code Biases
   // --------------------
-  if (OPT->_obsModelType == OPT->PPPRTK) {
+  if (OPT->_ionoModelType == OPT->PPP_RTK) {
     std::vector<t_lc::type> lc;
     if (_usedSystems.contains('G')) {
@@ -589 +595 @@
   // Receiver Phase Biases
   // ---------------------
-  if (OPT->_obsModelType == OPT->PPPRTK) {
+  if (OPT->_ionoModelType == OPT->PPP_RTK) {
     std::vector<t_lc::type> lc;
     if (_usedSystems.contains('G')) {