Changeset 6023 in ntrip for trunk/BNC/src/PPP

Timestamp:

Aug 21, 2014, 10:20:03 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppSatObs.cpp (modified) (3 diffs)
• pppSatObs.h (modified) (2 diffs)

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -62 +62 @@
   _time    = pppSatObs._time;
   _outlier = false;
+  _valid   = true;
   for (unsigned ii = 0; ii < t_frequency::max; ii++) {
     _obs[ii] = 0;
@@ -111 +112 @@
   }
 
-  // Copy raw observations
-  // ---------------------
-  _f1    = t_CST::f1(_prn.system(), _channel);
-  _rawC1 = _validObs1->_code;
-  _rawL1 = _validObs1->_phase * t_CST::c / _f1;
-  if (dualFreq) {
-    _f2    = t_CST::f2(_prn.system(), _channel);
-    _rawC2 = _validObs2->_code;
-    _rawL2 = _validObs2->_phase * t_CST::c / _f2;
-  }
-  else {
-    _f2     = 0.0;
-    _rawC2  = 0.0;
-    _rawL2  = 0.0;
-  }
-
   // Compute Satellite Coordinates at Time of Transmission
   // -----------------------------------------------------
@@ -133 +118 @@
   bool totOK  = false;
   ColumnVector satPosOld(4); satPosOld = 0.0;
-  t_lc::type tLC = (dualFreq ? t_lc::cIF : t_lc::c1);
+  t_lc::type tLC = isValid(t_lc::cIF) ? t_lc::cIF : t_lc::c1;
   double prange = obsValue(tLC);
   for (int ii = 1; ii <= 10; ii++) {

trunk/BNC/src/PPP/pppSatObs.h

@@ -16 +16 @@
   t_pppSatObs(const t_satObs& satObs);
   ~t_pppSatObs();
-  bool                isValid() const;
+  bool                isValid() const {return _valid;};
   bool                isValid(t_lc::type tLC) const;
   const t_prn&        prn() const {return _prn;}
@@ -111 +111 @@
   void prepareObs(const t_satObs& satObs);
 
+  bool                         _valid;
   t_prn                        _prn;
   bncTime                      _time;