casa / casa6 / 2f3edc040b9

Commits

Mark Kettenis authored 2f3edc040b9 Merge 05 Oct 2021

Merge branch 'master' into CAS-13622

casa5/code/mstransform/TVI/ChannelAverageTVI.cc

Modified

-660
+	// Accumulate elapsed time
-661
+	Tss_+=omp_get_wtime()-time0;
-662
+#endif
-663
-664
+	return;
-665
+}
-666
-667
+// -----------------------------------------------------------------------
-668
+//
-669
+// -----------------------------------------------------------------------
--
+Vector<Double> ChannelAverageTVI::getFrequencies (	Double time,
--
+													Int frameOfReference,
--
+													Int spectralWindowId,
--
+													Int msId) const
-+
+Vector<Double> ChannelAverageTVI::getFrequencies ( Double time,
-+
+						   Int frameOfReference,
-+
+						   Int spectralWindowId,
-+
+						   Int msId) const
-674
+{
-675
--
+        // Pass-thru for single-channel case or chanbin=1 case
--
+        if (getVii()->visibilityShape()[1]==1 ||
--
+	    spwChanbinMap_p[spectralWindowId]==1) {
-+
+        // Pass-thru for chanbin=1 case
-+
+        if (spwChanbinMap_p[spectralWindowId]==1) {
-678
+	  return getVii()->getFrequencies(time,frameOfReference,spectralWindowId,msId);
-679
+	}
-680
--
+	// Get frequencies from input VI
-+
+	// Get frequencies from input VI, which we will process
-682
+	Vector<Double> inputFrequencies = getVii()->getFrequencies(time,frameOfReference,
--
+																spectralWindowId,msId);
-+
+								   spectralWindowId,msId);
-+
-+
+	// Pass-thru for single-channel case
-+
+	//  NB: This does NOT depend on current iteration having same spw as specified spectralWindowId
-+
+	//  NB: Nor does it rely on sensing the apparent shape of the visibility data object (so that need not be pre-filled)
-+
+	if (inputFrequencies.nelements()==1)
-+
+	  return inputFrequencies;
-690
-691
+	// Produce output (transformed) frequencies
-692
+	Vector<Double> outputFrecuencies(spwOutChanNumMap_p[spectralWindowId],0);
-693
-694
+	// Gather input data
-695
+	DataCubeMap inputData;
-696
+	DataCubeHolder<Double> inputFrecuenciesHolder(inputFrequencies);
-697
+	inputData.add(MS::DATA,inputFrecuenciesHolder);
-698
-699
+	// Gather output data
-705
+	PlainChannelAverageKernel<Double> kernel;
-706
+	uInt width = spwChanbinMap_p[spectralWindowId];
-707
+	ChannelAverageTransformEngine<Double> transformer(&kernel,&inputData,&outputData,width);
-708
-709
+	// Transform data
-710
+	transformer.transform();
-711
-712
+	return outputFrecuencies;
-713
+}
-714
-+
+Vector<Double> ChannelAverageTVI::getChanWidths ( Double time,
-+
+						  Int frameOfReference,
-+
+						  Int spectralWindowId,
-+
+						  Int msId) const
-+
+{
-+
-+
+        // Pass-thru for chanbin=1 case
-+
+        if (spwChanbinMap_p[spectralWindowId]==1) {
-+
+	  return getVii()->getChanWidths(time,frameOfReference,spectralWindowId,msId);
-+
+	}
-+
-+
+	// Get widths from input VI
-+
+	Vector<Double> inputWidths = getVii()->getChanWidths(time,frameOfReference,
-+
+							     spectralWindowId,msId);
-+
+	// Pass-thru for single-channel case
-+
+	//  NB: This does NOT depend on current iteration having same spw as specified spectralWindowId
-+
+	//  NB: Nor does it rely on sensing the apparent shape of the visibility data object (so that need not be pre-filled)
-+
+	if (inputWidths.nelements()==1)
-+
+	  return inputWidths;
-+
-+
+	// Produce output (summed) widths
-+
+	Vector<Double> outputWidths(spwOutChanNumMap_p[spectralWindowId],0);
-+
-+
+	// Gather input data
-+
+	DataCubeMap inputData;
-+
+	DataCubeHolder<Double> inputWidthsHolder(inputWidths);
-+
+	inputData.add(MS::DATA,inputWidthsHolder);
-+
+	// We need flag vector (all false==unflagged) for ChannelAccumulationKernal (which just adds within bins)
-+
+	Vector<Bool> nonflagged(inputWidths.nelements(),false);
-+
+	DataCubeHolder<Bool> inputFlagHolder(nonflagged);
-+
+	inputData.add(MS::FLAG,inputFlagHolder);
-+
-+
+	// Gather output data
-+
+	DataCubeMap outputData;
-+
+	DataCubeHolder<Double> outputWidthsHolder(outputWidths);
-+
+	outputData.add(MS::DATA,outputWidthsHolder);
-+
-+
+	// Configure Transformation Engine
-+
+	//PlainChannelAverageKernel<Double> kernel;
-+
+	ChannelAccumulationKernel<Double> kernel;
-+
+	uInt width = spwChanbinMap_p[spectralWindowId];
-+
+	ChannelAverageTransformEngine<Double> transformer(&kernel,&inputData,&outputData,width);
-+
-+
+	// Transform data
-+
+	transformer.transform();
-+
-+
+	return outputWidths;
-+
+}
-+
-764
+// -----------------------------------------------------------------------
-765
+//
-766
+// -----------------------------------------------------------------------
-767
+void ChannelAverageTVI::writeFlag (const Cube<Bool> & flag)
-768
+{
-769
+	// Create a flag cube with the input VI shape
-770
+	Cube<Bool> propagatedFlagCube;
-771
+	propagatedFlagCube = getVii()->getVisBuffer()->flagCube();
-772
-773
+	// Propagate flags from the input cube to the propagated flag cube

casa6

Commits

Jira Issues

Add shortcut