Changeset 6063 in ntrip for trunk/BNC

Timestamp:

Sep 7, 2014, 9:39:19 AM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/PPP_free/bncmodel.cpp (modified) (3 diffs)

trunk/BNC/src/PPP_free/bncmodel.cpp

@@ -783 +783 @@
     ColumnVector sz = -rSat / rSat.norm_Frobenius();
 
-    ColumnVector xSun = Sun(Mjd);
+    ColumnVector xSun = t_astro::Sun(Mjd);
     xSun /= xSun.norm_Frobenius();
 
@@ -1008 +1008 @@
     // First update using code observations, then phase observations
     // -------------------------------------------------------------      
-    for (int iPhase = 0; iPhase <= (_opt->usePhase ? 1 : 0); iPhase++) {
+    bool usePhase = _opt->ambLCs('G').size() || _opt->ambLCs('R').size() ||
+                    _opt->ambLCs('E').size();
+
+    for (int iPhase = 0; iPhase <= (usePhase ? 1 : 0); iPhase++) {
     
       // Status Prediction
@@ -1071 +1074 @@
         }
 
-        if (!_opt->usePhase || iPhase == 1) {
+        if (!usePhase || iPhase == 1) {
           if (_outlierGPS.size() > 0 || _outlierGlo.size() > 0) {
             _log += "Neglected PRNs: ";