From 0dbab64b3d170c6af97a3592967e2e1cfacf3ba6 Mon Sep 17 00:00:00 2001
From: Tammo Jan Dijkema <T.J.Dijkema@gmail.com>
Date: Tue, 13 Mar 2018 10:08:15 +0100
Subject: [PATCH] Update namespace and include path for casacore >= 2.0

---
 src/MS/data.cpp | 10 +++++-----
 src/MS/data.h   | 26 +++++++++++++-------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/MS/data.cpp b/src/MS/data.cpp
index 768ad09..894d6e6 100644
--- a/src/MS/data.cpp
+++ b/src/MS/data.cpp
@@ -20,17 +20,17 @@
 #include "data.h"
 #include "Radio.h"
 #include "Dirac.h"
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/UVWMachine.h>
-#include <casa/Quanta.h>
-#include <casa/Quanta/Quantum.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/UVWMachine.h>
+#include <casacore/casa/Quanta.h>
+#include <casacore/casa/Quanta/Quantum.h>
 
 /* speed of light */
 #ifndef CONST_C
 #define CONST_C 299792458.0
 #endif
 
-using namespace casa;
+using namespace casacore;
 
 int Data::numChannels=1;
 unsigned long int Data::numRows;
diff --git a/src/MS/data.h b/src/MS/data.h
index 842edc8..925aaad 100644
--- a/src/MS/data.h
+++ b/src/MS/data.h
@@ -22,22 +22,22 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <iostream>
-#include <ms/MeasurementSets/MSIter.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/TableVector.h>
-#include <tables/Tables/TableRecord.h>
-#include <tables/Tables/TableColumn.h>
-#include <tables/Tables/TableIter.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <tables/Tables/ArrayColumn.h>
-#include <casa/Arrays/Array.h>
-#include <casa/Arrays/Cube.h>
+#include <casacore/ms/MeasurementSets/MSIter.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/TableVector.h>
+#include <casacore/tables/Tables/TableRecord.h>
+#include <casacore/tables/Tables/TableColumn.h>
+#include <casacore/tables/Tables/TableIter.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/casa/Arrays/Cube.h>
 #include <fstream>
 #include <math.h>
 #include <complex>
 
 
-using namespace casa;
+using namespace casacore;
 
 namespace Data
 {
@@ -121,8 +121,8 @@ namespace Data
     extern float min_uvcut;
     extern float max_uvcut;
     extern float max_uvtaper;
-    extern casa::String DataField; /* input column DATA/CORRECTED_DATA */
-    extern casa::String OutField; /* output column DATA/CORRECTED_DATA */
+    extern casacore::String DataField; /* input column DATA/CORRECTED_DATA */
+    extern casacore::String OutField; /* output column DATA/CORRECTED_DATA */
     extern int TileSize; //Tile size
     extern int Nt; /* no of worker threads */
     extern char *SkyModel; /* sky model file */