Commits

Darrell Schiebel authored 9be371101cb Merge
Merge branch 'master' into CAS-13054

Conflicts: casa5/code/display/DisplayDatas/MSAsRaster.cc casa5/code/flagging/Flagging/FlagCalTableHandler.h casa5/code/mstransform/MSTransform/MSTransformBufferImpl.cc casa5/code/mstransform/MSTransform/MSTransformBufferImpl.h casa5/code/mstransform/MSTransform/MSTransformManager.cc casa5/code/mstransform/MSTransform/MSUVBin.cc casa5/code/mstransform/TVI/StatWtClassicalDataAggregator.cc casa5/code/mstransform/TVI/StatWtClassicalDataAggregator.h casa5/code/mstransform/TVI/StatWtDataAggregator.h casa5/code/mstransform/TVI/StatWtFloatingWindowDataAggregator.cc casa5/code/mstransform/TVI/StatWtFloatingWindowDataAggregator.h casa5/code/mstransform/TVI/StatWtTVI.cc casa5/code/msvis/MSVis/AveragingTvi2.cc casa5/code/msvis/MSVis/AveragingTvi2.h casa5/code/msvis/MSVis/MsAverager.cc casa5/code/msvis/MSVis/SimpleSimVi2.cc casa5/code/msvis/MSVis/SimpleSimVi2.h casa5/code/msvis/MSVis/TransformingVi2.cc casa5/code/msvis/MSVis/TransformingVi2.h casa5/code/msvis/MSVis/ViImplementation2.h casa5/code/msvis/MSVis/VisBuffer.cc casa5/code/msvis/MSVis/VisBuffer.h casa5/code/msvis/MSVis/VisBuffer2.h casa5/code/msvis/MSVis/VisBuffer2Adapter.h casa5/code/msvis/MSVis/VisBufferAsync.cc casa5/code/msvis/MSVis/VisBufferAsync.h casa5/code/msvis/MSVis/VisBufferAsyncWrapper.cc casa5/code/msvis/MSVis/VisBufferAsyncWrapper.h casa5/code/msvis/MSVis/VisBufferAsyncWrapper2.h casa5/code/msvis/MSVis/VisBufferImpl2.cc casa5/code/msvis/MSVis/VisBufferImpl2.h casa5/code/msvis/MSVis/VisBufferImpl2Internal.h casa5/code/msvis/MSVis/VisIterator.cc casa5/code/msvis/MSVis/VisibilityIterator.cc casa5/code/msvis/MSVis/VisibilityIterator.h casa5/code/msvis/MSVis/VisibilityIteratorImpl.cc casa5/code/msvis/MSVis/VisibilityIteratorImpl.h casa5/code/msvis/MSVis/VisibilityIteratorImpl2.cc casa5/code/msvis/MSVis/VisibilityIteratorImpl2.h casa5/code/plotms/Data/CalCache.cc casa5/code/singledish/SingleDish/SingleDishMS.cc casa5/code/spectrallines/Splatalogue/SplatalogueTable.cc casa5/code/synthesis/CalTables/CTMainColInterface.h casa5/code/synthesis/ImagerObjects/SynthesisUtilMethods.cc casa5/code/synthesis/MeasurementComponents/FiltrationTVI.h casa5/code/synthesis/MeasurementComponents/FiltrationTVI.tcc casa5/code/synthesis/MeasurementComponents/SDDoubleCircleGainCal.cc casa5/code/synthesis/MeasurementComponents/SingleDishSkyCal.cc casa5/code/synthesis/TransformMachines/VisModelData.cc casa5/code/synthesis/TransformMachines2/VisModelData.cc casa5/code/synthesis/Utilities/FixVis.cc casa5/code/synthesis/Utilities/PointingDirectionCalculator.cc casa5/code/synthesis/Utilities/PointingDirectionCalculator.h casa5/gcwrap/tools/ms/ms_cmpt.cc casa5/gcwrap/tools/tables/table_cmpt.cc
No tags

casa5/code/casatools/Config/State.h

Modified

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut