Index: trunk/BNC/bncephuser.cpp
===================================================================
--- trunk/BNC/bncephuser.cpp	(revision 3520)
+++ trunk/BNC/bncephuser.cpp	(revision 3521)
@@ -165,9 +165,4 @@
   if (!relevantMessageType(messageType)) {
     return failure;
-  }
-
-  if (messageType < 0) {
-    messageType = -messageType;
-    xyzCorr = true;  // correction in xyz instead of rao
   }
 
Index: trunk/BNC/bncephuser.h
===================================================================
--- trunk/BNC/bncephuser.h	(revision 3520)
+++ trunk/BNC/bncephuser.h	(revision 3521)
@@ -44,12 +44,8 @@
     eph     = 0;
     hrClk   = 0.0;
-    xyzCorr = false;
   }
   bool ready() {return raoSet && dClkSet;}
 
   static bool relevantMessageType(int msgType) {
-    if (msgType < 0) {
-      msgType = -msgType;
-    }
     return ( msgType == COTYPE_GPSCOMBINED     || 
              msgType == COTYPE_GLONASSCOMBINED ||
@@ -76,5 +72,4 @@
   bool         raoSet;
   bool         dClkSet;
-  bool         xyzCorr;
   const t_eph* eph;
 };
Index: trunk/BNC/bncpppclient.cpp
===================================================================
--- trunk/BNC/bncpppclient.cpp	(revision 3520)
+++ trunk/BNC/bncpppclient.cpp	(revision 3521)
@@ -376,9 +376,9 @@
 	  if      (eLast && eLast->IOD() == cc->iod) {
             eLast->position(tt.gpsw(), tt.gpssec(), xc.data(), vv.data());
-            return applyCorr(tt, cc, xc, vv, eLast);
+            return applyCorr(tt, cc, xc, vv);
           }
 	  else if (ePrev && ePrev->IOD() == cc->iod) {
             ePrev->position(tt.gpsw(), tt.gpssec(), xc.data(), vv.data());
-            return applyCorr(tt, cc, xc, vv, ePrev);
+            return applyCorr(tt, cc, xc, vv);
           }
 	}
@@ -399,6 +399,5 @@
 ////////////////////////////////////////////////////////////////////////////
 t_irc bncPPPclient::applyCorr(const bncTime& tt, const t_corr* cc, 
-                              ColumnVector& xc, ColumnVector& vv,
-                              const t_eph* eph) {
+                              ColumnVector& xc, ColumnVector& vv) {
 
   double dt = tt - cc->tt;
@@ -409,22 +408,11 @@
   }
 
-  if (cc->xyzCorr) {
-    xc[0] += raoHlp[0];
-    xc[1] += raoHlp[1];
-    xc[2] += raoHlp[2];
-    ColumnVector xcHlp(4);
-    ColumnVector vvHlp(3);
-    eph->position(cc->tt.gpsw(), cc->tt.gpssec(), xcHlp.data(), vvHlp.data());
-    xc[3] += cc->dClk - xcHlp[3];
-  }
-  else {
-    ColumnVector dx(3);
-    RSW_to_XYZ(xc.Rows(1,3), vv, raoHlp, dx);
-    xc[0] -= dx[0];
-    xc[1] -= dx[1];
-    xc[2] -= dx[2];
-    xc[3] += cc->dClk + cc->dotDClk * dt + cc->dotDotDClk * dt * dt
-          + cc->hrClk;
-  }
+  ColumnVector dx(3);
+  RSW_to_XYZ(xc.Rows(1,3), vv, raoHlp, dx);
+  xc[0] -= dx[0];
+  xc[1] -= dx[1];
+  xc[2] -= dx[2];
+  xc[3] += cc->dClk + cc->dotDClk * dt + cc->dotDotDClk * dt * dt
+        + cc->hrClk;
 
   return success;
Index: trunk/BNC/bncpppclient.h
===================================================================
--- trunk/BNC/bncpppclient.h	(revision 3520)
+++ trunk/BNC/bncpppclient.h	(revision 3521)
@@ -125,5 +125,5 @@
   void putNewObs(const t_obs& pp);
   static t_irc applyCorr(const bncTime& tt, const t_corr* cc, ColumnVector& xc, 
-                         ColumnVector& vv, const t_eph* eph);
+                         ColumnVector& vv);
 
  public slots:
Index: trunk/BNC/combination/bnccomb.cpp
===================================================================
--- trunk/BNC/combination/bnccomb.cpp	(revision 3520)
+++ trunk/BNC/combination/bnccomb.cpp	(revision 3521)
@@ -658,5 +658,5 @@
       corr->eph->position(time12.gpsw(), time12.gpssec(), 
                           xc.data(), vv.data());
-      bncPPPclient::applyCorr(time12, corr, xc, vv, corr->eph);
+      bncPPPclient::applyCorr(time12, corr, xc, vv);
       
       // Relativistic Correction