From a7464acc2d1886e9fd76eab9c9a56abb80b4eba7 Mon Sep 17 00:00:00 2001
From: Sarod Yatawatta <sarod@dop373.nfra.nl>
Date: Wed, 7 Feb 2018 12:29:57 +0100
Subject: [PATCH] include both headers

---
 src/MS/Makefile | 4 ++--
 src/MS/data.cpp | 1 +
 src/MS/main.cpp | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/MS/Makefile b/src/MS/Makefile
index cd817ce..d5cdee0 100644
--- a/src/MS/Makefile
+++ b/src/MS/Makefile
@@ -18,7 +18,7 @@ LDFLAGS=-Wl,--rpath,/cm/shared/package/openblas/0.2.17mt/lib/,${CASA_LIBDIR}
 #LDFLAGS=-Wl,-t,--rpath,/software/users/lofareor/SW/lib64
 # -Wl,--hash-style=both
 
-MY_LIBS=-lm -ldirac -lsagecal
+MY_LIBS=-lm -lradio -ldirac
 INCLUDES=-I. -I../lib/Dirac -I../lib/Radio $(CASA_INCDIR) -I/usr/include
 LIBPATH=-L$(LAPACK_DIR) $(CASA_LIBDIR)  -L../lib/Dirac -L../lib/Radio
 
@@ -33,7 +33,7 @@ main.o:main.cpp
 	$(CXX) $(CXXFLAGS) $(INCLUDES) $(GLIBI) -c $<
 data.o:data.cpp data.h
 	$(CXX) $(CXXFLAGS) $(INCLUDES) $(GLIBI) -c $<
-sagecal:$(OBJECTS) ../lib/Radio/libsagecal.a ../lib/Dirac/libdirac.a 
+sagecal:$(OBJECTS) ../lib/Radio/libradio.a ../lib/Dirac/libdirac.a 
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(INCLUDES) $(GLIBI) $(LIBPATH)  -o $@  $(OBJECTS) $(MY_LIBS) $(LAPACK) $(CASA_LIBS)  $(GLIBL)
 clean:
 	rm *.o *.tmp *.fits *.swp *.swo *.o *.output
diff --git a/src/MS/data.cpp b/src/MS/data.cpp
index 7aa1842..768ad09 100644
--- a/src/MS/data.cpp
+++ b/src/MS/data.cpp
@@ -19,6 +19,7 @@
 
 #include "data.h"
 #include "Radio.h"
+#include "Dirac.h"
 #include <measures/Measures/MDirection.h>
 #include <measures/Measures/UVWMachine.h>
 #include <casa/Quanta.h>
diff --git a/src/MS/main.cpp b/src/MS/main.cpp
index 3bfbedb..23772d9 100644
--- a/src/MS/main.cpp
+++ b/src/MS/main.cpp
@@ -25,8 +25,8 @@
 #include <pthread.h>
 #include <casacore/casa/Quanta/Quantum.h>
 
-#include <Dirac.h>
 #include <Radio.h>
+#include <Dirac.h>
 
 #ifndef LMCUT
 #define LMCUT 40