Changeset 9532 in ntrip
- Timestamp:
- Nov 5, 2021, 3:42:51 PM (3 years ago)
- Location:
- trunk/BNC/src/PPP
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/PPP/pppFilter.cpp
r9527 r9532 73 73 74 74 const QMap<char, t_pppRefSat*>& refSatMap = epoch->refSatMap(); 75 76 //LOG << "processEpoch: printParams before set" << endl; 77 //_parlist.printParams(_epoTime); 78 75 79 //-- 76 80 // Set Parameters … … 82 86 OPT->_obsModelType == OPT->DCMphaseBias) { 83 87 #ifdef BNC_DEBUG_PPP 84 LOG << "processEpoch: printParams after set" << endl;85 _parlist.printParams(_epoTime);88 //LOG << "processEpoch: printParams after set" << endl; 89 //_parlist.printParams(_epoTime); 86 90 #endif 87 91 } … … 118 122 _xFlt = xFltOld; 119 123 _QFlt = QFltOld; 124 _obsPool->deleteLastEpoch(); 120 125 restoreState(2); 121 126 return failure; … … 712 717 return success; 713 718 } 719 // LOG << "datumTransformation: printParams before set" << endl; 720 // _parlist.printParams(_epoTime); 714 721 715 722 // set AA2 … … 720 727 721 728 #ifdef BNC_DEBUG_PPP 722 LOG << "datumTransformation: printParams after set" << endl;723 _parlist.printParams(_epoTime);729 // LOG << "datumTransformation: printParams after set" << endl; 730 // _parlist.printParams(_epoTime); 724 731 #endif 725 732 … … 809 816 // ==================== 810 817 #ifdef BNC_DEBUG_PPP 811 //LOG << "AA1\n"; _datumTrafo->printMatrix(_datumTrafo->AA1(), _datumTrafo->numObs(), _datumTrafo->numPar());812 //LOG << "AA2\n"; _datumTrafo->printMatrix(_datumTrafo->AA2(), _datumTrafo->numObs(), _datumTrafo->numPar());818 // LOG << "AA1\n"; _datumTrafo->printMatrix(_datumTrafo->AA1(), _datumTrafo->numObs(), _datumTrafo->numPar()); 819 // LOG << "AA2\n"; _datumTrafo->printMatrix(_datumTrafo->AA2(), _datumTrafo->numObs(), _datumTrafo->numPar()); 813 820 #endif 814 821 if(_datumTrafo->computeTrafoMatrix() != success) { -
trunk/BNC/src/PPP/pppParlist.cpp
r9528 r9532 480 480 } 481 481 482 // check which systems have observations 483 // ------------------------------------- 484 _usedSystems.clear(); 485 for (unsigned jj = 0; jj < obsVector.size(); jj++) { 486 const t_pppSatObs* satObs = obsVector[jj]; 487 char sys = satObs->prn().system();LOG << satObs->prn().toString() << endl; 488 if (!_usedSystems.contains(sys)) { 489 _usedSystems.append(sys); 490 } 491 } 492 493 if (_usedSystems.size() > 1 && 494 !_usedSystems.contains('G')) { // required to setup ISB w. r. t. GPS 495 return failure; 496 } 497 498 499 482 500 // Check whether parameters have observations 483 501 // ------------------------------------------ … … 515 533 if ((par->type() == t_pppParam::amb) && 516 534 (!par->lastObsTime().valid() || (epoTime - par->lastObsTime() > 0.0))) { 517 #ifdef BNC_DEBUG_PPP518 535 LOG << "remove1 " << par->toString() << std::endl; 519 #endif520 536 lostSats.append(par->prn()); 521 537 delete par; 522 538 it = _params.erase(it); 539 } 540 // Check if systems have to be presented per biases 541 else if ((par->type() == t_pppParam::cBiasG1 || 542 par->type() == t_pppParam::cBiasG2 || 543 par->type() == t_pppParam::pBiasG1 || 544 par->type() == t_pppParam::pBiasG2) && !usedSystems().contains('G')) { 545 delete par; LOG << "remove1 " << par->toString() << std::endl; 546 it = _params.erase(it); 547 } 548 else if ((par->type() == t_pppParam::cBiasR1 || 549 par->type() == t_pppParam::cBiasR2 || 550 par->type() == t_pppParam::pBiasR1 || 551 par->type() == t_pppParam::pBiasR2) && !usedSystems().contains('R')) { 552 delete par; LOG << "remove1 " << par->toString() << std::endl; 553 it = _params.erase(it); 554 } 555 else if ((par->type() == t_pppParam::cBiasE1 || 556 par->type() == t_pppParam::cBiasE2 || 557 par->type() == t_pppParam::pBiasE1 || 558 par->type() == t_pppParam::pBiasE2) && !usedSystems().contains('E')) { 559 delete par; LOG << "remove1 " << par->toString() << std::endl; 560 it = _params.erase(it); 561 } 562 else if ((par->type() == t_pppParam::cBiasC1 || 563 par->type() == t_pppParam::cBiasC2 || 564 par->type() == t_pppParam::pBiasC1 || 565 par->type() == t_pppParam::pBiasG2) && !usedSystems().contains('C')) { 566 delete par; LOG << "remove1 " << par->toString() << std::endl; 567 it = _params.erase(it); 523 568 } 524 569 else { … … 533 578 if ((par->type() == t_pppParam::ion) && 534 579 (lostSats.contains(par->prn()) || (epoTime - par->lastObsTime() > 0.0))) { 535 #ifdef BNC_DEBUG_PPP536 580 LOG << "remove1 " << par->toString() << std::endl; 537 #endif538 581 delete par; 539 582 it = _params.erase(it); … … 545 588 } 546 589 547 // check which systems have observations548 // -------------------------------------549 _usedSystems.clear();550 for (unsigned jj = 0; jj < obsVector.size(); jj++) {551 const t_pppSatObs* satObs = obsVector[jj];552 char sys = satObs->prn().system();553 if (!_usedSystems.contains(sys)) {554 _usedSystems.append(sys);555 }556 }557 558 if (_usedSystems.size() > 1 &&559 !_usedSystems.contains('G')) { // required to setup ISB w. r. t. GPS560 return failure;561 }562 590 563 591 // Required Set of Parameters
Note:
See TracChangeset
for help on using the changeset viewer.