Changeset 8910 in ntrip for trunk/BNC

Timestamp:

Mar 23, 2020, 11:46:21 AM (5 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (1 diff)
• pppFilter.cpp (modified) (5 diffs)
• pppFilter.h (modified) (1 diff)

trunk/BNC/src/PPP/pppClient.cpp

@@ -67 +67 @@
   }
 
-  if (OPT->_refSatRequired) {
+  if (_opt->_refSatRequired) {
     for (unsigned iSys = 0; iSys < OPT->systems().size(); iSys++) {
       char system = OPT->systems()[iSys];

trunk/BNC/src/PPP/pppFilter.cpp

@@ -38 +38 @@
   _numSat = 0;
   _obsPool = obsPool;
+  _refPrn  = t_prn();
 }
 
@@ -122 +123 @@
     for (unsigned iSys = 0; iSys < OPT->systems().size(); iSys++) {
       char system = OPT->systems()[iSys];
-      t_prn refPrn = (_obsPool->getRefSatMapElement(system))->prn();
+      if (OPT->_refSatRequired) {
+        _refPrn = (_obsPool->getRefSatMapElement(system))->prn();
+      }
       vector<t_pppSatObs*> obsVector;
       for (unsigned jj = 0; jj < allObs.size(); jj++) {
@@ -129 +132 @@
         }
       }
-      if (processSystem(OPT->LCs(system), obsVector, refPrn,
+      if (processSystem(OPT->LCs(system), obsVector, _refPrn,
                         epoch->pseudoObsIono(), preProcessing) != success) {
         return failure;
@@ -140 +143 @@
   for (unsigned iSys = 0; iSys < OPT->systems().size(); iSys++) {
     char system = OPT->systems()[iSys];
-    t_prn refPrn = (_obsPool->getRefSatMapElement(system))->prn();
+    if (OPT->_refSatRequired) {
+      _refPrn = (_obsPool->getRefSatMapElement(system))->prn();
+    }
     unsigned int num = 0;
     vector<t_pppSatObs*> obsVector;
@@ -150 +155 @@
     }
     LOG << epoTimeStr << " SATNUM " << system << ' ' << right << setw(2) << num << endl;
-    if (processSystem(OPT->LCs(system), obsVector, refPrn,
+    if (processSystem(OPT->LCs(system), obsVector, _refPrn,
                       epoch->pseudoObsIono(), preProcessing) != success) {
       return failure;

trunk/BNC/src/PPP/pppFilter.h

@@ -102 +102 @@
   bncTime         _firstEpoTime;
   bncTime         _lastEpoTimeOK;
+  t_prn           _refPrn;
 };