casa / casa5 / c1ff075e49a

Commits

Ville Suoranta authored c1ff075e49a Merge 23 Jun 2017

Merge pull request #123 in CASA/casa from bugfix/CAS-10039 to master

* commit '24d9a0cfde99e4aca4b3055eb6b7a09a1dc72e41':
  Add unit test for single-polarization calibration
  Bug fix
  Fix single-polarization data problem
  Support single-polarization calibration.

code/synthesis/MeasurementComponents/SingleDishSkyCal.cc

Modified

-708
+	}
-709
-710
+	currSpw() = ispw;
-711
+	currField() = ifield;
-712
+	timeCentroid /= (Double)numSpectra;
-713
+	refTime() = timeCentroid;
-714
+	interval_ = effectiveExposure;
-715
-716
+	debuglog << "spw " << ispw << ": solveAllRPar.shape=" << solveAllRPar().shape() << " nPar=" << nPar() << " nChanPar=" << nChanPar() << " nElem=" << nElem() << debugpost;
-717
--
+	solveAllRPar() = dataSum.addDegenerate(1);
--
+	solveAllParOK() = resultMask.addDegenerate(1);
--
+	solveAllParErr() = 0.1; // TODO: this is tentative
--
+	solveAllParSNR() = 1.0; // TODO: this is tentative
-+
+  size_t const nCorr = dataSum.shape()[0];
-+
+	Cube<Float> const rpar = dataSum.addDegenerate(1);
-+
+	Cube<Bool> const parOK = resultMask.addDegenerate(1);
-+
+	for (size_t iCorr = 0; iCorr < nCorr; ++iCorr) {
-+
+	  solveAllRPar().yzPlane(iCorr) = rpar.yzPlane(iCorr);
-+
+	  solveAllParOK().yzPlane(iCorr) = parOK.yzPlane(iCorr);
-+
+	  solveAllParErr().yzPlane(iCorr) = 0.1; // TODO: this is tentative
-+
+	  solveAllParSNR().yzPlane(iCorr) = 1.0; // TODO: this is tentative
-+
+	}
-727
-728
+	keepNCT();
-729
-730
+	dataSum = 0.0f;
-731
+	weightSum = 0.0f;
-732
+	resultMask = true;
-733
+	timeCentroid = 0.0;
-734
+	numSpectra = 0;
-735
+	effectiveExposure = 0.0;
-736
+      }
-773
+    default: {
-774
+      throw(AipsError("Internal error(Calibrater Module): Unsupported parameter type "
-775
+		      "found in SingleDishSkyCal::initSolvePar()"));
-776
+      break;
-777
+    }
-778
+    }//switch
-779
-780
+    solveAllParOK().resize(solveAllRPar().shape());
-781
+    solveAllParErr().resize(solveAllRPar().shape());
-782
+    solveAllParSNR().resize(solveAllRPar().shape());
--
+    solveAllParOK()=true;
-+
+    solveAllParOK()=false;
-784
+    solveAllParErr()=0.0;
-785
+    solveAllParSNR()=0.0;
-786
+    solveParOK().reference(solveAllParOK());
-787
+    solveParErr().reference(solveAllParErr());
-788
+    solveParSNR().reference(solveAllParSNR());
-789
+  }
-790
+  currSpw()=0;
-791
+  currAnt_ = 0;
-792
-793
+  interval_.resize(nElem());
-1090
+  }
-1091
+}
-1092
-1093
+void SingleDishSkyCal::updateWt2(Matrix<Float> &weight, const Int &antenna1)
-1094
+{
-1095
+  // apply weight scaling factor
-1096
+  Matrix<Float> const factor = currWtScale().xyPlane(antenna1);
-1097
+  debuglog << "factor.shape() = " << factor.shape() << debugpost;
-1098
+  debuglog << "weight.shape() = " << weight.shape() << debugpost;
-1099
+  debuglog << "weight = " << weight << debugpost;
--
+  if (weight.shape() == factor.shape()) {
--
+    weight *= factor;
--
+  }
--
+  else if (weight.shape() == IPosition(2,factor.shape()[0],1)) {
--
+    weight *= factor(Slice(0,factor.shape()[0]),Slice(0,1));
--
+  }
--
+  else {
--
+    throw AipsError("Shape mismatch between input weight and weight scaling factor");
-+
-+
+  auto const wtShape = weight.shape();
-+
+  size_t const nCorr = wtShape[0];
-+
+  size_t const nChan = wtShape[1];
-+
+  // for each correlation
-+
+  for (size_t iCorr = 0; iCorr < nCorr; ++iCorr) {
-+
+    auto wSlice = weight.row(iCorr);
-+
+    auto const fSlice = factor.row(iCorr);
-+
+    if (fSlice.nelements() == nChan) {
-+
+      wSlice *= fSlice;
-+
+    } else if (nChan == 1) {
-+
+      // take mean of spectral weight factor to apply it to scalar weight
-+
+      wSlice *= mean(fSlice);
-+
+    } else {
-+
+      throw AipsError("Shape mismatch between input weight and weight scaling factor");
-+
+    }
-1116
+  }
-1117
+}
-1118
-1119
+//
-1120
+// SingleDishPositionSwitchCal
-1121
+//
-1122
-1123
+// Constructor
-1124
+SingleDishPositionSwitchCal::SingleDishPositionSwitchCal(VisSet& vs)
-1125
+  : VisCal(vs),

casa5

Commits

Jira Issues

Add shortcut