casa / casa5 / 1983e70e01f

Commits

Ville Suoranta authored 1983e70e01f Merge 11 Apr 2018

Merge pull request #454 in CASA/casa from feature/CAS-10138 to master

* commit '438c40a15a66cb53da1b22b70ffc728a41fe7373':
  Add 5.3.0-106 to legacy edge-pivot behavior for delay corrections as 5.3.0-107 is now the likely merge version.
  Update CASA version trap for legacy edge-pivot behavior to in clude 5.3.0-104,105, as 5.3.0-106 is the likely merge version.
  Added 5.3.0-103,104 as subject to legacy edge pivot in delay corrections.
  Trap delay caltables created in 5.3.0-100,101,102 a force old edge pivot behavior, since some users may have created delay tables in these versions, and effectively rely on this.
  Removed _lexical_ comparison test on the originating CASA version for delay cal tables because it fails when version numbers add digits. The comparison wasn't really needed because delay tables prior to 5.3.0-80 have no version labelling them and so behave as "Unknown".

code/synthesis/MeasurementComponents/KJones.cc

Modified

-546
+    logSink() << " (" << this->typeName() << ": Enforcing calWt()=false for phase/delay-like terms)" << LogIO::POST;
-547
-548
+  // Enforce calWt() = false for delays
-549
+  calWt()=false;
-550
-551
+  // Extract per-spw ref Freq for phase(delay) calculation
-552
+  //  from the CalTable
-553
+  MSSpectralWindow msSpw(ct_->spectralWindow());
-554
+  ROMSSpWindowColumns msCol(msSpw);
-555
--
+  if (ct_->CASAvers()==String("Unknown") || ct_->CASAvers()<String("5.3.0-80")) {
-+
+  String ctvers=ct_->CASAvers();
-+
+  if (ctvers==String("Unknown") ||    // pre-5.3.0-80 (no version recorded in table)
-+
+      ctvers==String("5.3.0-100") ||  // a few pre-release versions with reverted behavior
-+
+      ctvers==String("5.3.0-101") ||
-+
+      ctvers==String("5.3.0-102") ||
-+
+      ctvers==String("5.3.0-103") ||
-+
+      ctvers==String("5.3.0-104") ||
-+
+      ctvers==String("5.3.0-105") ||
-+
+      ctvers==String("5.3.0-106") ) {
-565
+    // Old-fashioned; use spw edge freq
-566
+    msCol.refFrequency().getColumn(KrefFreqs_,true);
--
+    if (typeName()!=String("KMBD Jones"))
-+
+    if (typeName()!=String("KMBD Jones") &&
-+
+	typeName()!=String("KAntPos Jones") )
-569
+      logSink() << LogIO::WARN
-570
+		<< " Found pre-5.3.0 CASA delay cal table; using spw REF_FREQUENCY pivot (usually the edge) for phase(freq) calculation."
-571
+		<< LogIO::POST;
-572
+  }
-573
+  else {
-574
+  // Use the "physical" (centroid) frequency, per spw
-575
+    Vector<Double> chanfreq;
-576
+    KrefFreqs_.resize(nSpw()); KrefFreqs_.set(0.0);
-577
+    for (Int ispw=0;ispw<nSpw();++ispw) {
-578
+      msCol.chanFreq().get(ispw,chanfreq,true);  // reshape, if nec.
-615
+  SolvableVisCal::setCallib(callib,selms);
-616
-617
+  if (calWt())
-618
+    logSink() << " (" << this->typeName() << ": Enforcing calWt()=false for phase/delay-like terms)" << LogIO::POST;
-619
-620
+  // Enforce calWt() = false for delays
-621
+  calWt()=false;
-622
-623
+  // Extract per-spw ref Freq for phase(delay) calculation
-624
+  //  from the CalTable
--
+  if (cpp_->CTCASAvers()==String("Unknown") || cpp_->CTCASAvers()<String("5.3.0-80")) {
-+
+  String ctvers=cpp_->CTCASAvers();
-+
+  if (ctvers==String("Unknown") ||    // pre-5.3.0-80 (no version recorded in table)
-+
+      ctvers==String("5.3.0-100") ||  // a few pre-release versions with reverted behavior
-+
+      ctvers==String("5.3.0-101") ||
-+
+      ctvers==String("5.3.0-102") ||
-+
+      ctvers==String("5.3.0-103") ||
-+
+      ctvers==String("5.3.0-104") ||
-+
+      ctvers==String("5.3.0-105") ||
-+
+      ctvers==String("5.3.0-106") ) {
-634
+    KrefFreqs_.assign(cpp_->refFreqIn());
--
+    if (typeName()!=String("KMBD Jones"))
-+
+    if (typeName()!=String("KMBD Jones") &&
-+
+	typeName()!=String("KAntPos Jones") )
-637
+      logSink() << LogIO::WARN
-638
+		<< " Found pre-5.3.0 CASA K (delay) cal table; using spw REF_FREQUENCY pivot (usually the edge) for phase(freq) calculation."
-639
+		<< LogIO::POST;
-640
+  }
-641
+  else {
-642
+    // Extract physical freq
-643
+    KrefFreqs_.resize(nSpw());
-644
+    for (Int ispw=0;ispw<nSpw();++ispw) {
-645
+      const Vector<Double>& f(cpp_->freqIn(ispw));
-646
+      Int nf=f.nelements();

casa5

Commits

Jira Issues

Add shortcut