Changeset 10010 in ntrip for trunk/BNC/src

Timestamp:

Mar 17, 2023, 2:27:30 PM (2 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src/PPP

Files:

• pppFilter.cpp (modified) (8 diffs)
• pppFilter.h (modified) (1 diff)
• pppSatObs.cpp (modified) (3 diffs)

trunk/BNC/src/PPP/pppFilter.cpp

@@ -72 +72 @@
 
   const QMap<char, t_pppRefSat*> &refSatMap = epoch->refSatMap();
-
+  const QList<char> &usedSystems = _parlist.usedSystems();
   //--
   // Set Parameters
@@ -78 +78 @@
     return failure;
   }
-
+#ifdef BNC_DEBUG_PPP
   if (OPT->_obsModelType == OPT->DCMcodeBias ||
-  OPT->_obsModelType == OPT->DCMphaseBias) {
-#ifdef BNC_DEBUG_PPP
-  _parlist.printParams(_epoTime);
+      OPT->_obsModelType == OPT->DCMphaseBias) {
+    _parlist.printParams(_epoTime);
+  }
 #endif
-  }
+
   // Status Vector, Variance-Covariance Matrix
   // -----------------------------------------
   ColumnVector xFltOld = _xFlt;
   SymmetricMatrix QFltOld = _QFlt;
-  setStateVectorAndVarCovMatrix(xFltOld, QFltOld);
+  bool setNeuNoiseToZero = false;
+  for (int iSys = 0; iSys < usedSystems.size(); iSys++) {
+    char sys = usedSystems[iSys];
+    int num = 0;
+    for (unsigned jj = 0; jj < allObs.size(); jj++) {
+      if (allObs[jj]->prn().system() == sys) {
+        ++num;
+      }
+    }
+    if (num < OPT->_minObs) {
+      setNeuNoiseToZero = true;
+    }
+  }
+  setStateVectorAndVarCovMatrix(xFltOld, QFltOld, setNeuNoiseToZero);
 
   // Pre-Process Satellite Systems separately
@@ -97 +110 @@
   OPT->_obsModelType == OPT->DCMphaseBias) {
     preProcessing = true;
-    const QList<char> &usedSystems = _parlist.usedSystems();
     for (int iSys = 0; iSys < usedSystems.size(); iSys++) {
       char sys = usedSystems[iSys];
@@ -137 +149 @@
   // ------------------------------------
   preProcessing = false;
-  const QList<char> &usedSystems = _parlist.usedSystems();
   for (int iSys = 0; iSys < usedSystems.size(); iSys++) {
     char sys = usedSystems[iSys];
@@ -594 +605 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-void t_pppFilter::predictCovCrdPart(const SymmetricMatrix &QFltOld) {
+void t_pppFilter::predictCovCrdPart(const SymmetricMatrix &QFltOld, bool setNeuNoiseToZero) {
 
   const vector<t_pppParam*> &params = _parlist.params();
@@ -622 +633 @@
   } else {
     double dt = _epoTime - _firstEpoTime;
-    if (dt < OPT->_seedingTime) {
+    if (dt < OPT->_seedingTime || setNeuNoiseToZero) {
       _QFlt.SymSubMatrix(1, 3) = QFltOld.SymSubMatrix(1, 3);
     } else {
@@ -633 +644 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_pppFilter::setStateVectorAndVarCovMatrix(const ColumnVector &xFltOld,
-    const SymmetricMatrix &QFltOld) {
+    const SymmetricMatrix &QFltOld, bool setNeuNoiseToZero) {
 
   const vector<t_pppParam*> &params = _parlist.params();
@@ -666 +677 @@
     }
   }
-  predictCovCrdPart(QFltOld);
+  predictCovCrdPart(QFltOld, setNeuNoiseToZero);
 }
 

trunk/BNC/src/PPP/pppFilter.h

@@ -206 +206 @@
               const QMap<char, t_pppRefSat*>& refSatMap);
 
-  void setStateVectorAndVarCovMatrix(const ColumnVector& xFltOld, const SymmetricMatrix& QFltOld);
-
-  void predictCovCrdPart(const SymmetricMatrix& QFltOld);
+  void setStateVectorAndVarCovMatrix(const ColumnVector& xFltOld, const SymmetricMatrix& QFltOld,
+                                     bool setNeuNoiseToZero);
+
+  void predictCovCrdPart(const SymmetricMatrix& QFltOld, bool setNeuNoiseToZero);
 
   t_irc addNoiseToPar(t_pppParam::e_type parType, char sys);

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -33 +33 @@
 using namespace std;
 
-const double   GLO_WEIGHT_FACTOR = 1.0;
-const double   BDS_WEIGHT_FACTOR = 1.0;
+const double   GLO_WEIGHT_FACTOR = 2.0;
+const double   BDS_WEIGHT_FACTOR = 2.0;
 
 // Constructor
@@ -355 +355 @@
   // De-Weight GLO+BDS
   // -----------------
-  if (_prn.system() == 'R') {
+  if (_prn.system() == 'R' && t_lc::includesCode(tLC)) {
     retVal *= GLO_WEIGHT_FACTOR;
   }
-  if (_prn.system() == 'C') {
+  if (_prn.system() == 'C' && t_lc::includesCode(tLC)){
     retVal *= BDS_WEIGHT_FACTOR;
   }
@@ -398 +398 @@
 
   retVal = sqrt(retVal);
+
+  // De-Weight GLO+BDS
+  // -----------------
+  if (_prn.system() == 'R' && t_lc::includesCode(tLC)) {
+    retVal *= GLO_WEIGHT_FACTOR;
+  }
+  if (_prn.system() == 'C' && t_lc::includesCode(tLC)){
+    retVal *= BDS_WEIGHT_FACTOR;
+  }
+
 
   return retVal;