casa5
Public
Commits
| 546 546 | logSink() << " (" << this->typeName() << ": Enforcing calWt()=false for phase/delay-like terms)" << LogIO::POST; |
| 547 547 | |
| 548 548 | // Enforce calWt() = false for delays |
| 549 549 | calWt()=false; |
| 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 - | if (ct_->CASAvers()==String("Unknown") || ct_->CASAvers()<String("5.3.0-80")) { |
| 556 + | String ctvers=ct_->CASAvers(); |
| 557 + | if (ctvers==String("Unknown")) { |
| 557 558 | // Old-fashioned; use spw edge freq |
| 558 559 | msCol.refFrequency().getColumn(KrefFreqs_,true); |
| 559 - | if (typeName()!=String("KMBD Jones")) |
| 560 + | if (typeName()!=String("KMBD Jones") && |
| 561 + | typeName()!=String("KAntPos Jones") ) |
| 560 562 | logSink() << LogIO::WARN |
| 561 563 | << " Found pre-5.3.0 CASA delay cal table; using spw REF_FREQUENCY pivot (usually the edge) for phase(freq) calculation." |
| 562 564 | << LogIO::POST; |
| 563 565 | } |
| 564 566 | else { |
| 565 567 | // Use the "physical" (centroid) frequency, per spw |
| 566 568 | Vector<Double> chanfreq; |
| 567 569 | KrefFreqs_.resize(nSpw()); KrefFreqs_.set(0.0); |
| 568 570 | for (Int ispw=0;ispw<nSpw();++ispw) { |
| 569 571 | msCol.chanFreq().get(ispw,chanfreq,true); // reshape, if nec. |
| 606 608 | SolvableVisCal::setCallib(callib,selms); |
| 607 609 | |
| 608 610 | if (calWt()) |
| 609 611 | logSink() << " (" << this->typeName() << ": Enforcing calWt()=false for phase/delay-like terms)" << LogIO::POST; |
| 610 612 | |
| 611 613 | // Enforce calWt() = false for delays |
| 612 614 | calWt()=false; |
| 613 615 | |
| 614 616 | // Extract per-spw ref Freq for phase(delay) calculation |
| 615 617 | // from the CalTable |
| 616 - | if (cpp_->CTCASAvers()==String("Unknown") || cpp_->CTCASAvers()<String("5.3.0-80")) { |
| 618 + | if (cpp_->CTCASAvers()==String("Unknown") ) { |
| 617 619 | KrefFreqs_.assign(cpp_->refFreqIn()); |
| 618 - | if (typeName()!=String("KMBD Jones")) |
| 620 + | if (typeName()!=String("KMBD Jones") && |
| 621 + | typeName()!=String("KAntPos Jones") ) |
| 619 622 | logSink() << LogIO::WARN |
| 620 623 | << " Found pre-5.3.0 CASA K (delay) cal table; using spw REF_FREQUENCY pivot (usually the edge) for phase(freq) calculation." |
| 621 624 | << LogIO::POST; |
| 622 625 | } |
| 623 626 | else { |
| 624 627 | // Extract physical freq |
| 625 628 | KrefFreqs_.resize(nSpw()); |
| 626 629 | for (Int ispw=0;ispw<nSpw();++ispw) { |
| 627 630 | const Vector<Double>& f(cpp_->freqIn(ispw)); |
| 628 631 | Int nf=f.nelements(); |