casa5
Public
Commits
| 550 550 | |
| 551 551 | // Extract per-spw ref Freq for phase(delay) calculation |
| 552 552 | // from the CalTable |
| 553 553 | MSSpectralWindow msSpw(ct_->spectralWindow()); |
| 554 554 | ROMSSpWindowColumns msCol(msSpw); |
| 555 555 | |
| 556 556 | String ctvers=ct_->CASAvers(); |
| 557 557 | if (ctvers==String("Unknown") || // pre-5.3.0-80 (no version recorded in table) |
| 558 558 | ctvers==String("5.3.0-100") || // a few pre-release versions with reverted behavior |
| 559 559 | ctvers==String("5.3.0-101") || |
| 560 - | ctvers==String("5.3.0-102") ) { |
| 560 + | ctvers==String("5.3.0-102") || |
| 561 + | ctvers==String("5.3.0-103") || |
| 562 + | ctvers==String("5.3.0-104") ) { |
| 561 563 | // Old-fashioned; use spw edge freq |
| 562 564 | msCol.refFrequency().getColumn(KrefFreqs_,true); |
| 563 565 | if (typeName()!=String("KMBD Jones") && |
| 564 566 | typeName()!=String("KAntPos Jones") ) |
| 565 567 | logSink() << LogIO::WARN |
| 566 568 | << " Found pre-5.3.0 CASA delay cal table; using spw REF_FREQUENCY pivot (usually the edge) for phase(freq) calculation." |
| 567 569 | << LogIO::POST; |
| 568 570 | } |
| 569 571 | else { |
| 570 572 | // Use the "physical" (centroid) frequency, per spw |
| 615 617 | |
| 616 618 | // Enforce calWt() = false for delays |
| 617 619 | calWt()=false; |
| 618 620 | |
| 619 621 | // Extract per-spw ref Freq for phase(delay) calculation |
| 620 622 | // from the CalTable |
| 621 623 | String ctvers=cpp_->CTCASAvers(); |
| 622 624 | if (ctvers==String("Unknown") || // pre-5.3.0-80 (no version recorded in table) |
| 623 625 | ctvers==String("5.3.0-100") || // a few pre-release versions with reverted behavior |
| 624 626 | ctvers==String("5.3.0-101") || |
| 625 - | ctvers==String("5.3.0-102") ) { |
| 627 + | ctvers==String("5.3.0-102") || |
| 628 + | ctvers==String("5.3.0-103") || |
| 629 + | ctvers==String("5.3.0-104") ) { |
| 626 630 | KrefFreqs_.assign(cpp_->refFreqIn()); |
| 627 631 | if (typeName()!=String("KMBD Jones") && |
| 628 632 | typeName()!=String("KAntPos Jones") ) |
| 629 633 | logSink() << LogIO::WARN |
| 630 634 | << " Found pre-5.3.0 CASA K (delay) cal table; using spw REF_FREQUENCY pivot (usually the edge) for phase(freq) calculation." |
| 631 635 | << LogIO::POST; |
| 632 636 | } |
| 633 637 | else { |
| 634 638 | // Extract physical freq |
| 635 639 | KrefFreqs_.resize(nSpw()); |