Index: trunk/BNC/src/upload/bncrtnetuploadcaster.cpp
===================================================================
--- trunk/BNC/src/upload/bncrtnetuploadcaster.cpp	(revision 8718)
+++ trunk/BNC/src/upload/bncrtnetuploadcaster.cpp	(revision 8720)
@@ -106,20 +106,27 @@
   // -----------------------------
   // Transformation Parameters from ITRF2014 to ETRF2000
+  // EUREF Technical Note 1 Relationship and Transformation between the ITRF and ETRF
+  // Zuheir Altamimi, June 28, 2018
   if (_crdTrafo == "ETRF2000") {
-    _dx  =  0.0537;
-    _dy  =  0.0512;
-    _dz  = -0.0551;
+    _dx  =  0.0547;
+    _dy  =  0.0522;
+    _dz  = -0.0741;
+
     _dxr =  0.0001;
     _dyr =  0.0001;
     _dzr = -0.0019;
-    _ox  = -0.000891;
-    _oy  = -0.005390;
-    _oz  =  0.008712;
-    _oxr = -0.000081;
-    _oyr = -0.000490;
-    _ozr = +0.000792;
-    _sc  =  1.02;
+
+    _ox  =  0.001701;
+    _oy  =  0.010290;
+    _oz  = -0.016632;
+
+    _oxr =  0.000081;
+    _oyr =  0.000490;
+    _ozr = -0.000729;
+
+    _sc  =  2.12;
     _scr =  0.11;
-    _t0  =  2000.0;
+
+    _t0  =  2010.0;
   }
   // Transformation Parameters from ITRF2014 to GDA2020 (Ryan Ruddick, GA)
@@ -128,15 +135,20 @@
     _dy  = 0.0;
     _dz  = 0.0;
+
     _dxr = 0.0;
     _dyr = 0.0;
     _dzr = 0.0;
+
     _ox  = 0.0;
     _oy  = 0.0;
     _oz  = 0.0;
+
     _oxr = 0.00150379;
     _oyr = 0.00118346;
     _ozr = 0.00120716;
+
     _sc  = 0.0;
     _scr = 0.0;
+
     _t0  = 2020.0;
   }
@@ -146,34 +158,43 @@
     _dy  =  0.0018;
     _dz  = -0.0061;
+
     _dxr =  0.0000;
     _dyr =  0.0000;
     _dzr =  0.0000;
-    _ox  =  0.000170;
-    _oy  = -0.000030;
-    _oz  =  0.000070;
+
+    _ox  =  0.000000;
+    _oy  =  0.000000;
+    _oz  =  0.000000;
+
     _oxr =  0.000000;
     _oyr =  0.000000;
     _ozr =  0.000000;
-    _sc  = -1.000;
-    _scr =  0.000;
-    _t0  =  2000.4;
+
+    _sc  = -1.00000;
+    _scr =  0.00000;
+    _t0  =  2000.0;
   }
   // Transformation Parameters from ITRF2014 to DREF91
   else if (_crdTrafo == "DREF91") {
-    _dx  =  0.0537;
-    _dy  =  0.0512;
-    _dz  = -0.0551;
+    _dx  =  0.0547;
+    _dy  =  0.0522;
+    _dz  = -0.0741;
+
     _dxr =  0.0001;
     _dyr =  0.0001;
     _dzr = -0.0019;
-    _ox  = -0.000233;
-    _oy  = -0.005598;
-    _oz  =  0.009467;
-    _oxr = -0.000081;
-    _oyr = -0.000490;
-    _ozr =  0.000792;
-    _sc  =  1.02;
+    // ERTF200  + rotation parameters (ETRF200 => DREF91)
+    _ox  =  0.001701 + 0.000658;
+    _oy  =  0.010290 - 0.000208;
+    _oz  = -0.016632 + 0.000755;
+
+    _oxr =  0.000081;
+    _oyr =  0.000490;
+    _ozr = -0.000729;
+
+    _sc  =  2.12;
     _scr =  0.11;
-    _t0  =  2000.0;
+
+    _t0  =  2010.0;
   }
   else if (_crdTrafo == "Custom") {
@@ -226,13 +247,9 @@
     return;
   }
-  int iEpoBegEarlier = _rtnetStreamBuffer.indexOf('*');
-if (iEpoBegEarlier != -1 && iEpoBegEarlier < iEpoBeg) { // are there more epoch lines in buffer?
-    _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoBegEarlier);
-  }
   else {
     _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoBeg);
   }
 
-  int iEpoEnd = _rtnetStreamBuffer.indexOf("EOE"); // end of first epoch
+  int iEpoEnd = _rtnetStreamBuffer.indexOf("EOE"); // end of last epoch
   if (iEpoEnd == -1) {
     return;