Index: trunk/BNC/src/PPP/pppClient.cpp =================================================================== --- trunk/BNC/src/PPP/pppClient.cpp (revision 11040) +++ trunk/BNC/src/PPP/pppClient.cpp (revision 11041) @@ -157,4 +157,15 @@ } _obsPool->putCodeBias(newBias); + } +} + +// +////////////////////////////////////////////////////////////////////////////// +void t_pppClient::putSatAntennas(const vector& satAntennas) { + if (OPT->_logMode == t_pppOptions::normal && satAntennas.size() > 0) { + LOG << "satAntennas " << string(satAntennas[0]->_time) << ' ' << satAntennas.size() << endl; + } + for (unsigned ii = 0; ii < satAntennas.size(); ii++) { + _obsPool->putSatAntenna(new t_satAntenna(*satAntennas[ii])); } } Index: trunk/BNC/src/PPP/pppClient.h =================================================================== --- trunk/BNC/src/PPP/pppClient.h (revision 11040) +++ trunk/BNC/src/PPP/pppClient.h (revision 11041) @@ -33,4 +33,5 @@ void putCodeBiases(const std::vector& biases); void putPhaseBiases(const std::vector& biases); + void putSatAntennas(const std::vector& satAntennas); void processEpoch(const std::vector& satObs, t_output* output); Index: trunk/BNC/src/PPP/pppObsPool.cpp =================================================================== --- trunk/BNC/src/PPP/pppObsPool.cpp (revision 11040) +++ trunk/BNC/src/PPP/pppObsPool.cpp (revision 11041) @@ -51,4 +51,7 @@ _satPhaseBiases[ii] = 0; } + for (unsigned ii = 0; ii <= t_prn::MAXPRN; ii++) { + _satAntennas[ii] = 0; + } _vTec = 0; _metaData = 0; @@ -63,4 +66,7 @@ for (unsigned ii = 0; ii <= t_prn::MAXPRN; ii++) { delete _satPhaseBiases[ii]; + } + for (unsigned ii = 0; ii <= t_prn::MAXPRN; ii++) { + delete _satAntennas[ii]; } delete _vTec; @@ -110,4 +116,12 @@ LOG << endl; } +} + +// +///////////////////////////////////////////////////////////////////////////// +void t_pppObsPool::putSatAntenna(t_satAntenna* satAntenna) { + int iPrn = satAntenna->_prn.toInt(); + delete _satAntennas[iPrn]; + _satAntennas[iPrn] = satAntenna; } Index: trunk/BNC/src/PPP/pppObsPool.h =================================================================== --- trunk/BNC/src/PPP/pppObsPool.h (revision 11040) +++ trunk/BNC/src/PPP/pppObsPool.h (revision 11041) @@ -32,4 +32,5 @@ void putCodeBias(t_satCodeBias* satCodeBias); void putPhaseBias(t_satPhaseBias* satPhaseBias); + void putSatAntenna(t_satAntenna* satAntenna); void putTec(t_vTec* _vTec); void putMetaData(t_metaData* metaData); @@ -45,4 +46,7 @@ const t_satPhaseBias* satPhaseBias(const t_prn& prn) const { return _satPhaseBiases[prn.toInt()]; + } + const t_satAntenna* satAntenna(const t_prn& prn) const { + return _satAntennas[prn.toInt()]; } const t_vTec* vTec() const {return _vTec;} @@ -61,4 +65,5 @@ t_satCodeBias* _satCodeBiases[t_prn::MAXPRN+1]; t_satPhaseBias* _satPhaseBiases[t_prn::MAXPRN+1]; + t_satAntenna* _satAntennas[t_prn::MAXPRN+1]; t_vTec* _vTec; t_metaData* _metaData; Index: trunk/BNC/src/PPP/pppSatObs.cpp =================================================================== --- trunk/BNC/src/PPP/pppSatObs.cpp (revision 11040) +++ trunk/BNC/src/PPP/pppSatObs.cpp (revision 11041) @@ -400,4 +400,70 @@ +// A system's Satellite Antenna message is only trustworthy once the +// provider has confirmed it via Metadata: SatelliteAntennaIOD (DF+010) must +// be non-zero, and must match the Data IOD (DF+069) of a Metadata entry for +// model-correction type 1 (satellite antenna PCV) or type 2 (GDV) - either +// entry matching is sufficient. Metadata carries this IOD once globally, not +// per system (DF+010 is GNSS-specific, DF+069 is not), so the same Metadata +// entries are reused as the trust anchor for every system's check - the +// provider is relied on to keep DF+010 synchronized with DF+069 across all +// systems for this to work. +//////////////////////////////////////////////////////////////////////////// +static bool ssrSatAntennaTrusted(const t_satAntenna* satAntenna) { + if (!satAntenna || satAntenna->_satelliteAntennaIOD == 0) { + return false; + } + const t_metaData* metaData = PPP_CLIENT->obsPool()->metaData(); + if (!metaData) { + return false; + } + for (unsigned ii = 0; ii < metaData->_entries.size(); ii++) { + const t_metaDataEntry& entry = metaData->_entries[ii]; + if ((entry._typeIndicator == 1 || entry._typeIndicator == 2) && // PCV or GDV + entry._dataIODIndicator && + entry._dataIOD == satAntenna->_satelliteAntennaIOD) { + return true; + } + } + return false; +} + +// Satellite antenna correction (offset + nadir-angle-dependent PCV) from a +// live SSR Satellite Antenna message, in the same additive sense as +// bncAntex::satCorr(). Returns false (corr untouched) if no trusted SSR data +// is available for this PRN/frequency (see ssrSatAntennaTrusted), so the +// caller falls back to the static ANTEX file. +//////////////////////////////////////////////////////////////////////////// +static bool ssrSatAntennaCorr(const t_satAntenna* satAntenna, const string& frqStr, + double elTx, double& corr) { + if (!satAntenna) { + return false; + } + for (unsigned ii = 0; ii < satAntenna->_freq.size(); ii++) { + const t_frqAntenna& frq = satAntenna->_freq[ii]; + if (frq._frqType != frqStr) { + continue; + } + corr = 0.0; + if (frq._nadirCorrectionIndicator) { + corr += frq._nadirCorrection; + } + if (!frq._nadirAngleCorrection.empty()) { + // 1-degree bins starting at nadir (0 deg), per RTCM-SSR spec + double nadirDeg = 90.0 - elTx * 180.0 / M_PI; + int idx = int(nadirDeg + 0.5); + if (idx < 0) { + idx = 0; + } + else if (idx >= (int)frq._nadirAngleCorrection.size()) { + idx = (int)frq._nadirAngleCorrection.size() - 1; + } + corr += frq._nadirAngleCorrection[idx]; + } + return true; + } + return false; +} + // //////////////////////////////////////////////////////////////////////////// @@ -476,4 +542,8 @@ // ------------------------------------------- if (PPP_CLIENT->antex()) { + const t_satAntenna* satAntenna = PPP_CLIENT->obsPool()->satAntenna(_prn); + if (!ssrSatAntennaTrusted(satAntenna)) { + satAntenna = 0; // untrusted (IOD zero, or not confirmed via Metadata) - fall back to ANTEX + } for (unsigned ii = 0; ii < t_frequency::max; ii++) { t_frequency::type frqType = static_cast(ii); @@ -482,20 +552,42 @@ bool found; QString prn(_prn.toString().c_str()); - _model._antPCO[ii] = PPP_CLIENT->antex()->rcvCorr(station->antName(), frqType, _model._eleSat, _model._azSat, found); - _model._antPCO[ii] += PPP_CLIENT->antex()->satCorr(prn, frqType, _model._elTx, _model._azTx, found); - if (OPT->_isAPC && found) { - // the PCOs as given in the satellite antenna correction for all frequencies - // have to be reduced by the PCO of the respective reference frequency - if (_prn.system() == 'G') { - _model._antPCO[ii] -= PPP_CLIENT->antex()->satCorr(prn, t_frequency::G1, _model._elTx, _model._azTx, found); + _model._antPCO[ii] = PPP_CLIENT->antex()->rcvCorr(station->antName(), frqType, _model._eleSat, _model._azSat, found); + + // Prefer a live, trusted SSR Satellite Antenna correction over the + // static ANTEX file when available for this satellite/frequency, + // mirroring how SSR orbit/clock corrections already take precedence + // over broadcast ephemerides elsewhere in this codebase. Unlike + // ANTEX's satCorr() (a single geometric PCO/PCV value shared by code + // and phase alike), the SSR message's DF+011/DF+012 indicators say + // explicitly which observable(s) the correction applies to, so it is + // routed into the dedicated phase-only/code-only fields instead of + // the shared _antPCO - both may fire for the same ssrCorr value if + // both indicators are set. + double ssrCorr; + if (ssrSatAntennaCorr(satAntenna, frqStr, _model._elTx, ssrCorr)) { + if (satAntenna->_phaseCenterInfoInd) { + _model._antPCV[ii] += ssrCorr; } - else if (_prn.system() == 'R') { - _model._antPCO[ii] -= PPP_CLIENT->antex()->satCorr(prn, t_frequency::R1, _model._elTx, _model._azTx, found); + if (satAntenna->_groupDelayInfoInd) { + _model._antGDV[ii] += ssrCorr; } - else if (_prn.system() == 'E') { - _model._antPCO[ii] -= PPP_CLIENT->antex()->satCorr(prn, t_frequency::E1, _model._elTx, _model._azTx, found); - } - else if (_prn.system() == 'C') { - _model._antPCO[ii] -= PPP_CLIENT->antex()->satCorr(prn, t_frequency::C2, _model._elTx, _model._azTx, found); + } + else { + _model._antPCO[ii] += PPP_CLIENT->antex()->satCorr(prn, frqType, _model._elTx, _model._azTx, found); + if (OPT->_isAPC && found) { + // the PCOs as given in the satellite antenna correction for all frequencies + // have to be reduced by the PCO of the respective reference frequency + if (_prn.system() == 'G') { + _model._antPCO[ii] -= PPP_CLIENT->antex()->satCorr(prn, t_frequency::G1, _model._elTx, _model._azTx, found); + } + else if (_prn.system() == 'R') { + _model._antPCO[ii] -= PPP_CLIENT->antex()->satCorr(prn, t_frequency::R1, _model._elTx, _model._azTx, found); + } + else if (_prn.system() == 'E') { + _model._antPCO[ii] -= PPP_CLIENT->antex()->satCorr(prn, t_frequency::E1, _model._elTx, _model._azTx, found); + } + else if (_prn.system() == 'C') { + _model._antPCO[ii] -= PPP_CLIENT->antex()->satCorr(prn, t_frequency::C2, _model._elTx, _model._azTx, found); + } } } @@ -645,4 +737,6 @@ if (_prn.system() == frqStr[0]) { LOG << "PCO : " << frqStr << setw(12) << setprecision(3) << _model._antPCO[iFreq] << endl + << "SSR PCV : " << frqStr << setw(12) << setprecision(3) << _model._antPCV[iFreq] << endl + << "SSR GDV : " << frqStr << setw(12) << setprecision(3) << _model._antGDV[iFreq] << endl << "BIAS CODE : " << frqStr << setw(12) << setprecision(3) << _model._codeBias[iFreq] << "\t(" << _obs[iFreq]->trkChar() << ") " << endl << "BIAS PHASE : " << frqStr << setw(12) << setprecision(3) << _model._phaseBias[iFreq] << "\t(" << _obs[iFreq]->trkChar() << ") " << endl @@ -704,9 +798,9 @@ for (it = codeCoeff.begin(); it != codeCoeff.end(); it++) { t_frequency::type tFreq = it->first; - dispPart += it->second * (_model._antPCO[tFreq] - _model._codeBias[tFreq]); + dispPart += it->second * (_model._antPCO[tFreq] + _model._antGDV[tFreq] - _model._codeBias[tFreq]); } for (it = phaseCoeff.begin(); it != phaseCoeff.end(); it++) { t_frequency::type tFreq = it->first; - dispPart += it->second * (_model._antPCO[tFreq] - _model._phaseBias[tFreq] + + dispPart += it->second * (_model._antPCO[tFreq] + _model._antPCV[tFreq] - _model._phaseBias[tFreq] + _model._windUp * t_CST::lambda(tFreq, _channel)); } Index: trunk/BNC/src/PPP/pppSatObs.h =================================================================== --- trunk/BNC/src/PPP/pppSatObs.h (revision 11040) +++ trunk/BNC/src/PPP/pppSatObs.h (revision 11041) @@ -109,4 +109,6 @@ for (unsigned ii = 0; ii < t_frequency::max; ii++) { _antPCO[ii] = 0.0; + _antPCV[ii] = 0.0; + _antGDV[ii] = 0.0; _codeBias[ii] = 0.0; _phaseBias[ii] = 0.0; @@ -130,5 +132,7 @@ double _windUp; double _rel; - double _antPCO[t_frequency::max]; + double _antPCO[t_frequency::max]; // ANTEX-sourced, shared code+phase (geometric PCO/PCV) + double _antPCV[t_frequency::max]; // SSR-sourced, phaserange only (DF+011 Phase Center indicator) + double _antGDV[t_frequency::max]; // SSR-sourced, pseudorange only (DF+012 Group Delay indicator) double _codeBias[t_frequency::max]; double _phaseBias[t_frequency::max]; Index: trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp =================================================================== --- trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp (revision 11040) +++ trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp (revision 11041) @@ -702,5 +702,8 @@ } t_frqAntenna frqAntenna; - frqAntenna._freqIndex = f; + frqAntenna._frqType = _ssrCorr->antFreqIndexToStr(si.sysChar, f); + if (frqAntenna._frqType.empty()) { + continue; // reserved/unmapped DF+018 bit position + } frqAntenna._nadirCorrectionIndicator = satPart.Freq[f].NadirCorrectionIndicator; frqAntenna._nadirCorrection = satPart.Freq[f].NadirCorrection; Index: trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h =================================================================== --- trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h (revision 11040) +++ trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h (revision 11041) @@ -516,4 +516,8 @@ virtual std::string codeTypeToRnxType(char system, CodeType type) = 0; virtual CodeType rnxTypeToCodeType(char system, std::string type) = 0; + /* DF+018 GNSS Frequency Mask bit position (0-based) -> t_frequency::type + label (e.g. "G1", "R2", "E7"), per system. Returns "" for a reserved/ + unmapped bit position. */ + virtual std::string antFreqIndexToStr(char system, unsigned int freqIndex) = 0; Index: trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.cpp =================================================================== --- trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.cpp (revision 11040) +++ trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.cpp (revision 11041) @@ -937,2 +937,10 @@ } +// +//////////////////////////////////////////////////////////////////////////// +std::string SsrCorrIgs::antFreqIndexToStr(char, unsigned int) { + // This format does not decode Satellite Antenna message content; only + // present to satisfy SsrCorr's interface. + return ""; +} + Index: trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.h =================================================================== --- trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.h (revision 11040) +++ trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.h (revision 11041) @@ -219,4 +219,5 @@ std::string metaTypeToStr(unsigned int ind); std::string codeTypeToRnxType(char system, CodeType type); + std::string antFreqIndexToStr(char system, unsigned int freqIndex); SsrCorr::CodeType rnxTypeToCodeType(char system, std::string type); Index: trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp =================================================================== --- trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp (revision 11040) +++ trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp (revision 11041) @@ -1391,2 +1391,10 @@ } +// +//////////////////////////////////////////////////////////////////////////// +std::string SsrCorrRtcm::antFreqIndexToStr(char, unsigned int) { + // Satellite Antenna messages are not defined in (old) RTCM-SSR; only + // present to satisfy SsrCorr's interface. + return ""; +} + Index: trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h =================================================================== --- trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h (revision 11040) +++ trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h (revision 11041) @@ -218,4 +218,5 @@ std::string metaTypeToStr(unsigned int ind); std::string codeTypeToRnxType(char system, CodeType type); + std::string antFreqIndexToStr(char system, unsigned int freqIndex); SsrCorr::CodeType rnxTypeToCodeType(char system, std::string type); Index: trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp =================================================================== --- trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp (revision 11040) +++ trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp (revision 11041) @@ -1410,2 +1410,40 @@ return "reserved!"; } + +// +//////////////////////////////////////////////////////////////////////////// +std::string SsrCorrRtcmNew::antFreqIndexToStr(char system, unsigned int freqIndex) { + switch (system) { + case 'G': + if (freqIndex == 0) return "G1"; + if (freqIndex == 1) return "G2"; + if (freqIndex == 2) return "G5"; + break; + case 'R': + if (freqIndex == 0) return "R1"; + if (freqIndex == 1) return "R2"; + break; + case 'E': + if (freqIndex == 0) return "E1"; + if (freqIndex == 1) return "E6"; + if (freqIndex == 2) return "E7"; + if (freqIndex == 3) return "E8"; + if (freqIndex == 4) return "E5"; + break; + case 'J': + if (freqIndex == 0) return "J1"; + if (freqIndex == 1) return "J6"; + if (freqIndex == 2) return "J2"; + if (freqIndex == 3) return "J5"; + break; + case 'C': + if (freqIndex == 0) return "C2"; // B1 + if (freqIndex == 1) return "C6"; // B3 + if (freqIndex == 2) return "C7"; // B2 + if (freqIndex == 3) return "C5"; // B2a + if (freqIndex == 4) return "C7"; // B2b (same t_frequency::type as B2) + if (freqIndex == 5) return "C1"; // B1C + break; + } + return ""; // reserved / unmapped bit position +} Index: trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.h =================================================================== --- trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.h (revision 11040) +++ trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.h (revision 11041) @@ -273,4 +273,5 @@ std::string codeTypeToRnxType(char system, CodeType type); SsrCorr::CodeType rnxTypeToCodeType(char system, std::string type); + std::string antFreqIndexToStr(char system, unsigned int freqIndex); size_t MakeClockOrbit(const struct ClockOrbit *co, ClockOrbitType type, int moremessagesfollow, char *buffer, size_t size); Index: trunk/BNC/src/pppRun.cpp =================================================================== --- trunk/BNC/src/pppRun.cpp (revision 11040) +++ trunk/BNC/src/pppRun.cpp (revision 11041) @@ -119,4 +119,7 @@ connect(BNC_CORE, SIGNAL(newPhaseBiases(QList)), this, SLOT(slotNewPhaseBiases(QList)),conType); + + connect(BNC_CORE, SIGNAL(newSatAntennas(QList)), + this, SLOT(slotNewSatAntennas(QList)),conType); connect(BNC_CMB, SIGNAL(newOrbCorrections(QList)), @@ -567,4 +570,38 @@ // //////////////////////////////////////////////////////////////////////////// +void t_pppRun::slotNewSatAntennas(QList satAntennas) { + if (satAntennas.size() == 0) { + return; + } + + if (_opt->_realTime) { + if (_opt->_corrMount.empty() && _opt->_biasMount.empty()) { + return; + } + if (!_opt->_biasMount.empty()) { + if (_opt->_biasMount != satAntennas[0]._staID) { + return; + } + } + else if (!_opt->_corrMount.empty()) { + if (_opt->_corrMount != satAntennas[0]._staID) { + return; + } + } + } + vector antennas; + for (int ii = 0; ii < satAntennas.size(); ii++) { + antennas.push_back(new t_satAntenna(satAntennas[ii])); + } + + _pppClient->putSatAntennas(antennas); + + for (unsigned ii = 0; ii < antennas.size(); ii++) { + delete antennas[ii]; + } +} + +// +//////////////////////////////////////////////////////////////////////////// void t_pppRun::slotNewPhaseBiases(QList phaseBiases) { if (phaseBiases.size() == 0) { @@ -630,4 +667,5 @@ connect(_corrFile, SIGNAL(newPhaseBiases(QList)), this, SLOT(slotNewPhaseBiases(QList))); } + connect(_corrFile, SIGNAL(newSatAntennas(QList)), this, SLOT(slotNewSatAntennas(QList))); if (_opt->_ionoFile.empty()) { connect(_corrFile, SIGNAL(newTec(t_vTec)), this, SLOT(slotNewTec(t_vTec))); Index: trunk/BNC/src/pppRun.h =================================================================== --- trunk/BNC/src/pppRun.h (revision 11040) +++ trunk/BNC/src/pppRun.h (revision 11041) @@ -46,4 +46,5 @@ void slotNewCodeBiases(QList codeBiases); void slotNewPhaseBiases(QList phaseBiases); + void slotNewSatAntennas(QList satAntennas); void slotNewObs(QByteArray staID, QList obsList); void slotSetSpeed(int speed); Index: trunk/BNC/src/satObs.cpp =================================================================== --- trunk/BNC/src/satObs.cpp (revision 11040) +++ trunk/BNC/src/satObs.cpp (revision 11041) @@ -521,5 +521,5 @@ for (unsigned ii = 0; ii < satAntenna._freq.size(); ii++) { const t_frqAntenna& frqAntenna = satAntenna._freq[ii]; - *out << " " << frqAntenna._freqIndex << ' ' + *out << " " << frqAntenna._frqType << ' ' << frqAntenna._nadirCorrectionIndicator << ' ' << setw(10) << setprecision(4) << frqAntenna._nadirCorrection; @@ -573,5 +573,5 @@ for (int jj = 0; jj < numFreq; jj++) { t_frqAntenna frqAntenna; - in >> frqAntenna._freqIndex >> frqAntenna._nadirCorrectionIndicator >> frqAntenna._nadirCorrection; + in >> frqAntenna._frqType >> frqAntenna._nadirCorrectionIndicator >> frqAntenna._nadirCorrection; for (unsigned kk = 0; kk < numAngles; kk++) { double val; Index: trunk/BNC/src/satObs.h =================================================================== --- trunk/BNC/src/satObs.h (revision 11040) +++ trunk/BNC/src/satObs.h (revision 11041) @@ -283,9 +283,8 @@ public: t_frqAntenna() { - _freqIndex = 0; _nadirCorrectionIndicator = false; _nadirCorrection = 0.0; } - unsigned int _freqIndex; // 0 .. ANT_MAXFREQUENCIES-1, DF+018 bit position + std::string _frqType; // t_frequency::type label, e.g. "G1", "R2", "E7" bool _nadirCorrectionIndicator; double _nadirCorrection; // m, only valid if _nadirCorrectionIndicator