Index: /trunk/BNC/src/PPP/pppParlist.cpp =================================================================== --- /trunk/BNC/src/PPP/pppParlist.cpp (revision 9558) +++ /trunk/BNC/src/PPP/pppParlist.cpp (revision 9559) @@ -102,6 +102,6 @@ _noise = OPT->_noiseIon; break; - case cBiasG1: case cBiasR1: case cBiasE1: case cBiasC1: - case cBiasG2: case cBiasR2: case cBiasE2: case cBiasC2: + case cBiasG1: case cBiasE1: case cBiasC1: + case cBiasG2: case cBiasE2: case cBiasC2: _epoSpec = false; _sigma0 = OPT->_aprSigCodeBias; @@ -246,7 +246,4 @@ if ((obs->prn().system() == 'G') && (tLC == t_lc::c1)) {return 1.0;} else {return 0.0;} break; - case cBiasR1: - if ((obs->prn().system() == 'R') && (tLC == t_lc::c1)) {return 1.0;} else {return 0.0;} - break; case cBiasE1: if ((obs->prn().system() == 'E') && (tLC == t_lc::c1)) {return 1.0;} else {return 0.0;} @@ -257,7 +254,4 @@ case cBiasG2: if ((obs->prn().system() == 'G') && (tLC == t_lc::c2)) {return 1.0;} else {return 0.0;} - break; - case cBiasR2: - if ((obs->prn().system() == 'R') && (tLC == t_lc::c2)) {return 1.0;} else {return 0.0;} break; case cBiasE2: @@ -328,8 +322,4 @@ case cBiasG2: case pBiasG2: ss << "BIA " << left << setw(3) << t_lc::toString(_tLC) << right << " G "; - break; - case cBiasR1: - case cBiasR2: - ss << "BIA " << left << setw(3) << t_lc::toString(_tLC) << right << " R "; break; case cBiasE1: case pBiasE1: @@ -519,12 +509,4 @@ it = _params.erase(it); } - else if ((par->type() == t_pppParam::cBiasR1 || - par->type() == t_pppParam::cBiasR2) && !usedSystems().contains('R')) { -#ifdef BNC_DEBUG_PPP - LOG << "remove1 " << par->toString() << std::endl; -#endif - delete par; - it = _params.erase(it); - } else if ((par->type() == t_pppParam::cBiasE1 || par->type() == t_pppParam::cBiasE2 || @@ -594,13 +576,4 @@ } } - if (_usedSystems.contains('R')) { - lc = OPT->LCs('R'); - if (std::find(lc.begin(), lc.end(), t_lc::c1) != lc.end()) { - required.push_back(new t_pppParam(t_pppParam::cBiasR1, t_prn(), t_lc::c1)); - } - if (std::find(lc.begin(), lc.end(), t_lc::c2) != lc.end()) { - required.push_back(new t_pppParam(t_pppParam::cBiasR2, t_prn(), t_lc::c2)); - } - } if (_usedSystems.contains('E')) { lc = OPT->LCs('E'); Index: /trunk/BNC/src/PPP/pppParlist.h =================================================================== --- /trunk/BNC/src/PPP/pppParlist.h (revision 9558) +++ /trunk/BNC/src/PPP/pppParlist.h (revision 9559) @@ -16,6 +16,6 @@ public: enum e_type {crdX, crdY, crdZ, rClkG, rClkR, rClkE, rClkC, trp, ion, amb, - cBiasG1, cBiasR1, cBiasE1, cBiasC1, pBiasG1, pBiasE1, pBiasC1, - cBiasG2, cBiasR2, cBiasE2, cBiasC2, pBiasG2, pBiasE2, pBiasC2}; + cBiasG1, cBiasE1, cBiasC1, pBiasG1, pBiasE1, pBiasC1, + cBiasG2, cBiasE2, cBiasC2, pBiasG2, pBiasE2, pBiasC2}; t_pppParam(e_type type, const t_prn& prn, t_lc::type tLC, const std::vector* obsVector = 0); Index: /trunk/BNC/src/PPP/pppSatObs.cpp =================================================================== --- /trunk/BNC/src/PPP/pppSatObs.cpp (revision 9558) +++ /trunk/BNC/src/PPP/pppSatObs.cpp (revision 9559) @@ -65,5 +65,5 @@ // Select pseudo-ranges and phase observations // ------------------------------------------- - const string preferredAttrib = "G:12&PWCSLXYN R:12&PC E:1&BCX E:5&IQX C:IQX"; + const string preferredAttrib = "G:12&W R:12&P E:1&CX E:5&QX C:26&I"; for (unsigned iFreq = 1; iFreq < t_frequency::max; iFreq++) { Index: /trunk/BNC/src/bncgetthread.cpp =================================================================== --- /trunk/BNC/src/bncgetthread.cpp (revision 9558) +++ /trunk/BNC/src/bncgetthread.cpp (revision 9559) @@ -141,10 +141,10 @@ while (iSta.hasNext()) { QStringList hlp = iSta.next().split(","); - if (hlp.size() < 11) { + if (hlp.size() < 10) { continue; } QByteArray mp = hlp[0].toLatin1(); if (_staID == mp) { - nmeaPort = hlp[10].toInt(); + nmeaPort = hlp[9].toInt(); } } @@ -862,7 +862,5 @@ QString msg; QTextStream str(&msg); - QString s; - str << obs._prn.system() << " " - << s.sprintf("%2d", rnxTypes.size()) << " "; + str << obs._prn.system() << QString(" %1 ").arg(rnxTypes.size()); for (int iType = 0; iType < rnxTypes.size(); iType++) { str << " " << rnxTypes[iType]; Index: /trunk/BNC/src/bnchelp.html =================================================================== --- /trunk/BNC/src/bnchelp.html (revision 9558) +++ /trunk/BNC/src/bnchelp.html (revision 9559) @@ -186,6 +186,5 @@                   2.13.2.4 Tropo Sigma
                  2.13.2.5 Tropo Noise
-                  2.13.2.6 Iono Noise
-                  2.13.2.7 NMEA Port
+                  2.13.2.6 NMEA Port
            2.13.3 PPP (3): Processing Options
                  2.13.3.1 Linear Combinations
@@ -3650,10 +3649,5 @@

-

2.13.2.6 Iono Noise - mandatory

-

-Enter a white 'Noise' in meters per second to describe the expected variation of the ionospheric effect. Supposing 1Hz observation data, a value of 0.10 my be an apropriate choice. -

- -

2.13.2.7 NMEA Port - optional

+

2.13.2.6 NMEA Port - optional

Specify the IP port number of a local port where Point Positioning results become available as NMEA sentences. The default value for 'NMEA Port' is an empty option field, meaning that BNC does not provide NMEA sentences via IP port. Note that NMEA file output and NMEA IP port output are the same.

@@ -5218,5 +5212,5 @@ PPP Client Panel 2 keys: PPP/staTable {Station specifications table [character string, semicolon separated list, each element in quotation marks, example: - "FFMJ00DEU0,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,0.1,7777;CUT000AUS0,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,0.1,7778"]} + "FFMJ00DEU0,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,0.1,7777;CUT000AUS0,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,7778"]} PPP Client Panel 3 keys: Index: /trunk/BNC/src/bncmain.cpp =================================================================== --- /trunk/BNC/src/bncmain.cpp (revision 9558) +++ /trunk/BNC/src/bncmain.cpp (revision 9559) @@ -327,5 +327,5 @@ "(8) bnc --key uploadMountpointsOut \"products.igs-ip.net,98756,TEST,letmein,IGS14,2,/Users/weber/BNCOUTPUT${V3PROD}.clk,,33,3,2;" "euref-ip.net,333,TEST2,aaaaa,ETRF2000,2,,,33,5,5\"\n" - "(9) bnc --key PPP/staTable \"FFMJ00DEU1,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,0.1,7777;" + "(9) bnc --key PPP/staTable \"FFMJ00DEU1,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,7777;" "CUT000AUS0,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,0.1,7778\"\n"; Index: /trunk/BNC/src/pppMain.cpp =================================================================== --- /trunk/BNC/src/pppMain.cpp (revision 9558) +++ /trunk/BNC/src/pppMain.cpp (revision 9559) @@ -143,5 +143,5 @@ QStringList hlp = iSta.next().split(","); - if (hlp.size() < 11) { + if (hlp.size() < 10) { throw t_except("pppMain: wrong option staTable"); } @@ -159,6 +159,5 @@ opt->_aprSigTrp = hlp[7].toDouble(); opt->_noiseTrp = hlp[8].toDouble(); - opt->_noiseIon = hlp[9].toDouble(); - opt->_nmeaPort = hlp[10].toInt(); + opt->_nmeaPort = hlp[9].toInt(); if (_realTime) { @@ -205,7 +204,9 @@ opt->_obsModelType = t_pppOptions::PPPRTK; opt->_pseudoObsIono = false; + opt->_noiseIon = 0.1; } else if (settings.value("PPP/modelObs").toString() == "Uncombined PPP") { opt->_obsModelType = t_pppOptions::UncombPPP; + opt->_noiseIon = 0.1; if (opt->_pseudoObsIono) { opt->_refSatRequired = true; @@ -216,4 +217,5 @@ opt->_refSatRequired = true; opt->_noiseCodeBias = 1000.0; + opt->_noiseIon = 0.1; } else if (settings.value("PPP/modelObs").toString() == "DCM with Phase Biases") { @@ -221,4 +223,5 @@ opt->_refSatRequired = true; opt->_noisePhaseBias = 1000.0; + opt->_noiseIon = 0.1; } #endif Index: /trunk/BNC/src/pppWidgets.cpp =================================================================== --- /trunk/BNC/src/pppWidgets.cpp (revision 9558) +++ /trunk/BNC/src/pppWidgets.cpp (revision 9559) @@ -179,8 +179,8 @@ _corrWaitTime->setSuffix(" sec"); - _staTable->setColumnCount(11); + _staTable->setColumnCount(10); _staTable->setRowCount(0); _staTable->setHorizontalHeaderLabels( - QString("Station,Sigma N,Sigma E,Sigma H,Noise N,Noise E,Noise H,Tropo Sigma,Tropo Noise, Iono Noise, NMEA Port").split(",")); + QString("Station,Sigma N,Sigma E,Sigma H,Noise N,Noise E,Noise H,Tropo Sigma,Tropo Noise, NMEA Port").split(",")); _staTable->setSelectionMode(QAbstractItemView::ExtendedSelection); _staTable->setSelectionBehavior(QAbstractItemView::SelectRows); @@ -206,5 +206,5 @@ // WhatsThis, PPP (2) // ------------------ - _staTable->setWhatsThis(tr("

Specify values for Sigma and white Noise of the Stations North, East and Height coordinate components in meters. Specify also a Sigma in meters for a priori model based Tropospheric delays and a Sigma in meters per second for the delay's Noise.

Specifying one record per Station is mandatory. BNC will only process data for stations which are listed here. To define a station, specify the 'Mountpoint' when in 'Real-Time Streams' mode or the 4-character station ID when in 'RINEX Files' mode.

'Sigma' is meant to describe the uncertainty of a single coordinate or tropospheric delay estimated for one epoch. 'Noise' is meant to describe the variation of estimates from epoch to epoch.

You can also specify a 'NMEA Port' to output coordinates in NMEA format through an IP port of your local host. [key: PPP/staTable]

")); + _staTable->setWhatsThis(tr("

Specify values for Sigma and white Noise of the Stations North, East and Height coordinate components in meters. Specify also a Sigma in meters for a priori model based Tropospheric delays and a Sigma in meters per second for the delay's Noise.

Specifying one record per Station is mandatory. BNC will only process data for stations which are listed here. To define a station, specify the 'Mountpoint' when in 'Real-Time Streams' mode or the 4-character station ID when in 'RINEX Files' mode.

'Sigma' is meant to describe the uncertainty of a single coordinate or tropospheric delay estimated for one epoch. 'Noise' is meant to describe the variation of estimates from epoch to epoch.

You can also specify a 'NMEA Port' to output coordinates in NMEA format through an IP port of your local host. [key: PPP/staTable]

")); // WhatsThis, PPP (3)