Changeset 6027 in ntrip

Timestamp:

Aug 21, 2014, 11:07:22 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

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

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -209 +209 @@
 ////////////////////////////////////////////////////////////////////////////
 bool t_pppSatObs::isValid(t_lc::type tLC) const {
+  bool valid = true;
+  obsValue(tLC, &valid);
+  return valid;
+}
+// 
+////////////////////////////////////////////////////////////////////////////
+double t_pppSatObs::obsValue(t_lc::type tLC, bool* valid) const {
 
   map<t_frequency::type, double> codeCoeff;
   map<t_frequency::type, double> phaseCoeff;
   lcCoeff(tLC, codeCoeff, phaseCoeff);
+
+  double retVal = 0.0;
+  if (valid) *valid = true;
 
   map<t_frequency::type, double>::const_iterator it;
@@ -218 +228 @@
     t_frequency::type tFreq = it->first;
     if (_obs[tFreq] == 0) {
-      return false;
+      if (valid) *valid = false;
+      return 0.0;
+    }
+    else {
+      retVal += _obs[tFreq]->_code * it->second;
     }
   }
@@ -224 +238 @@
     t_frequency::type tFreq = it->first;
     if (_obs[tFreq] == 0) {
-      return false;
-    }
-  }
-  
-  return true;  
-}
-
-// 
-////////////////////////////////////////////////////////////////////////////
-double t_pppSatObs::obsValue(t_lc::type tLC) const {
-
-  if (!_validObs2 && t_lc::need2ndFreq(tLC)) {
-    return 0.0;
-  }
-
-  return this->lc(tLC, _rawL1, _rawL2, _rawC1, _rawC2);
+      if (valid) *valid = false;
+      return 0.0;
+    }
+    else {
+      retVal += _obs[tFreq]->_phase * it->second;
+    }
+  }
+
+  return retVal;
 }
 

trunk/BNC/src/PPP/pppSatObs.h

@@ -22 +22 @@
   const bncTime&      time() const {return _time;}
   t_irc               cmpModel(const t_pppStation* station);
-  double              obsValue(t_lc::type tLC) const;
+  double              obsValue(t_lc::type tLC, bool* valid = 0) const;
   double              cmpValue(t_lc::type tLC) const;
   double              cmpValueForBanc(t_lc::type tLC) const;