From 90739662ea20af2eac483e860cad87fb610e4dbb Mon Sep 17 00:00:00 2001
From: Max Voronkov <50689421+VoronkovMA@users.noreply.github.com>
Date: Mon, 30 May 2022 09:34:46 +1000
Subject: [PATCH] Account for changes in casacore master (#46)

* change to match removal of the custom type system in casacore measures
probably a bug fix too in this particular location

* patch to account for the explicit Vector from vector constructor in casacore

* fixed deprecation warnings related to Table interface

* Revert "fixed deprecation warnings related to Table interface"

This reverts commit 84e2ecf7361e0a1ea806761a5670a188efa012e6.
---
 .../SpectralComponents/GaussianMultipletSpectralElement.cc      | 2 +-
 components/SpectralComponents/PCFSpectralElement.cc             | 2 +-
 synthesis/MeasurementComponents/KJones.cc                       | 2 +-
 synthesis/MeasurementEquations/Imager2.cc                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/SpectralComponents/GaussianMultipletSpectralElement.cc b/components/SpectralComponents/GaussianMultipletSpectralElement.cc
index 17b9bca..d455e54 100644
--- a/components/SpectralComponents/GaussianMultipletSpectralElement.cc
+++ b/components/SpectralComponents/GaussianMultipletSpectralElement.cc
@@ -317,7 +317,7 @@ ostream &operator<<(ostream& os, const GaussianMultipletSpectralElement& elem) {
 	os << SpectralElement::fromType((elem.getType())) << " element: " << endl;
 	os << "  Function:    " << elem.getFunction() << endl;
 	os << "  Gaussians:" << endl;
-	Vector<GaussianSpectralElement> gaussians = elem.getGaussians();
+	const std::vector<GaussianSpectralElement> gaussians = elem.getGaussians();
 	for (uInt i=0; i<gaussians.size(); i++) {
 		os << "Gaussian " << i << ": " << gaussians[i] << endl;
 	}
diff --git a/components/SpectralComponents/PCFSpectralElement.cc b/components/SpectralComponents/PCFSpectralElement.cc
index 5229a26..4bad072 100644
--- a/components/SpectralComponents/PCFSpectralElement.cc
+++ b/components/SpectralComponents/PCFSpectralElement.cc
@@ -69,7 +69,7 @@ PCFSpectralElement::PCFSpectralElement(
 PCFSpectralElement::PCFSpectralElement(
 	SpectralElement::Types type, Double amp,
 	Double center, Double width
-) : SpectralElement(type, std::vector<Double>(3)) {
+) : SpectralElement(type, Vector<Double>(3)) {
 	_initFunction();
 	setAmpl(amp);
 	setCenter(center);
diff --git a/synthesis/MeasurementComponents/KJones.cc b/synthesis/MeasurementComponents/KJones.cc
index 15fe22d..3719f39 100644
--- a/synthesis/MeasurementComponents/KJones.cc
+++ b/synthesis/MeasurementComponents/KJones.cc
@@ -979,7 +979,7 @@ void KAntPosJones::calcAllJones() {
   mb.set(mvb,mbearthref); 
 
   // A converter that takes the MBaseline from earth to sky frame
-  MBaseline::Ref mbskyref(MBaseline::fromDirType(MDirection::castType(phasedir.myType())));
+  MBaseline::Ref mbskyref(MBaseline::fromDirType(MDirection::castType(phasedir.getRef().getType())));
   MBaseline::Convert mbcverter(mb,mbskyref);
 
 
diff --git a/synthesis/MeasurementEquations/Imager2.cc b/synthesis/MeasurementEquations/Imager2.cc
index a416999..c6cd902 100644
--- a/synthesis/MeasurementEquations/Imager2.cc
+++ b/synthesis/MeasurementEquations/Imager2.cc
@@ -4476,7 +4476,7 @@ Bool Imager::calcImFreqs(Vector<Double>& imgridfreqs,
       std::vector<double>  stlimgridfreqs;
       imgridfreqs.tovector(stlimgridfreqs);
       std::reverse(stlimgridfreqs.begin(),stlimgridfreqs.end());  
-      imgridfreqs=stlimgridfreqs;
+      imgridfreqs=Vector<double>(stlimgridfreqs);
     }
     //cerr<<"Final imgridfreqs(0)="<<imgridfreqs(0)<<endl;