Index: trunk/BNC/src/PPP_free/bncmodel.cpp
===================================================================
--- trunk/BNC/src/PPP_free/bncmodel.cpp	(revision 6060)
+++ trunk/BNC/src/PPP_free/bncmodel.cpp	(revision 6061)
@@ -45,4 +45,5 @@
 
 #include "bncmodel.h"
+#include "pppClient.h"
 #include "bncpppclient.h"
 #include "bnccore.h"
@@ -339,21 +340,18 @@
   if (_antex) { 
     bool found;
-    phaseCenter = _antex->pco(_opt->antennaName, satData->eleSat, found);
+    phaseCenter = _antex->pco(QString(_opt->_antNameRover.c_str()), satData->eleSat, found);
     if (!found) {
-      _pppClient->emitNewMessage("ANTEX: antenna >" 
-                      + _opt->antennaName.toAscii() + "< not found", true);
+      LOG << "ANTEX: antenna >" << _opt->_antNameRover << "< not found\n";
     }
   }
 
   double antennaOffset = 0.0;
-  if (_opt->antEccSet()) {
-    double cosa = cos(satData->azSat);
-    double sina = sin(satData->azSat);
-    double cose = cos(satData->eleSat);
-    double sine = sin(satData->eleSat);
-    antennaOffset = -_opt->antEccNEU[0] * cosa*cose 
-                    -_opt->antEccNEU[1] * sina*cose 
-                    -_opt->antEccNEU[2] * sine;
-  }
+  double cosa = cos(satData->azSat);
+  double sina = sin(satData->azSat);
+  double cose = cos(satData->eleSat);
+  double sine = sin(satData->eleSat);
+  antennaOffset = -_opt->_neuEccRover(1) * cosa*cose 
+                  -_opt->_neuEccRover(2) * sina*cose 
+                  -_opt->_neuEccRover(3) * sine;
 
   return satData->rho + phaseCenter + antennaOffset + clk() 
@@ -410,6 +408,8 @@
   if (iPhase == 0) {
 
+    const double maxSolGap = 0.0;
+
     bool firstCrd = false;
-    if (!_lastTimeOK.valid() || (_opt->maxSolGap > 0 && _time - _lastTimeOK > _opt->maxSolGap)) {
+    if (!_lastTimeOK.valid() || (maxSolGap > 0.0 && _time - _lastTimeOK > maxSolGap)) {
       firstCrd = true;
       _startTime = epoData->tt;
@@ -419,6 +419,6 @@
     // Use different white noise for Quick-Start mode
     // ----------------------------------------------
-    double sigCrdP_used = _opt->sigCrdP;
-    if ( _opt->quickStart > 0.0 && _opt->quickStart > (epoData->tt - _startTime) ) {
+    double sigCrdP_used = _opt->_noiseCrd(1);
+    if ( _opt->_seedingTime > 0.0 && _opt->_seedingTime > (epoData->tt - _startTime) ) {
       sigCrdP_used   = 0.0;
     }
@@ -433,6 +433,6 @@
       if      (pp->type == bncParam::CRD_X) {
         if (firstCrd) {
-          if (_opt->refCrdSet()) {
-            pp->xx = _opt->refCrd[0];
+          if (_opt->xyzAprRoverSet()) {
+            pp->xx = _opt->_xyzAprRover[0];
           }
           else {
@@ -444,6 +444,6 @@
       else if (pp->type == bncParam::CRD_Y) {
         if (firstCrd) {
-          if (_opt->refCrdSet()) {
-            pp->xx = _opt->refCrd[1];
+          if (_opt->xyzAprRoverSet()) {
+            pp->xx = _opt->_xyzAprRover[1];
           }
           else {
@@ -455,6 +455,6 @@
       else if (pp->type == bncParam::CRD_Z) {
         if (firstCrd) {
-          if (_opt->refCrdSet()) {
-            pp->xx = _opt->refCrd[2];
+          if (_opt->xyzAprRoverSet()) {
+            pp->xx = _opt->_xyzAprRover[2];
           }
           else {
@@ -472,5 +472,5 @@
           _QQ(iPar, jj) = 0.0;
         }
-        _QQ(iPar,iPar) = _opt->sigClk0 * _opt->sigClk0;
+        _QQ(iPar,iPar) = _opt->_noiseClk * _opt->_noiseClk;
       }
     
@@ -478,5 +478,5 @@
       // ------------------
       else if (pp->type == bncParam::TROPO) {
-        _QQ(iPar,iPar) += _opt->sigTrpP * _opt->sigTrpP;
+        _QQ(iPar,iPar) += _opt->_noiseTrp * _opt->_noiseTrp;
       }
     
@@ -484,15 +484,9 @@
       // --------------
       else if (pp->type == bncParam::GLONASS_OFFSET) {
-        bool epoSpec = true;
-        if (epoSpec) {
-          pp->xx = 0.0;
-          for (int jj = 1; jj <= _params.size(); jj++) {
-            _QQ(iPar, jj) = 0.0;
-          }
-          _QQ(iPar,iPar) = _opt->sigGlonassOffset0 * _opt->sigGlonassOffset0;
-        }
-        else {
-          _QQ(iPar,iPar) += _opt->sigGlonassOffsetP * _opt->sigGlonassOffsetP;
-        }
+        pp->xx = 0.0;
+        for (int jj = 1; jj <= _params.size(); jj++) {
+          _QQ(iPar, jj) = 0.0;
+        }
+        _QQ(iPar,iPar) = 1000.0 * 1000.0;
       }
 
@@ -500,5 +494,5 @@
       // --------------
       else if (pp->type == bncParam::GALILEO_OFFSET) {
-        _QQ(iPar,iPar) += _opt->sigGalileoOffsetP * _opt->sigGalileoOffsetP;
+        _QQ(iPar,iPar) += 0.1 * 0.1;
       }
     }