diff --git a/MAC/APL/PAC/BS_Protocol/Makefile.am b/MAC/APL/PAC/BS_Protocol/Makefile.am
index b1c69bc5720f3abf4675fd23a6d5cc5fa2bcb474..ef28e061557695a6098f9b148694c80636b5f88e 100644
--- a/MAC/APL/PAC/BS_Protocol/Makefile.am
+++ b/MAC/APL/PAC/BS_Protocol/Makefile.am
@@ -5,7 +5,6 @@ pkgext_DATA = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
DISTCHECK_CONFIGURE_FLAGS=\
--with-common=$(prefix) \
- --with-gcfcommon=$(prefix) \
--with-gcftm=$(prefix) \
--with-rtccommon=$(prefix) \
--with-rsp_protocol=$(prefix)
diff --git a/MAC/APL/PAC/BS_Protocol/configure.in b/MAC/APL/PAC/BS_Protocol/configure.in
index 562b0f89e41eddabb1c1aef5b661cf253eec6674..79f6a0ee9dfd4f3fec35ce702ed2dc18dcfaebff 100644
--- a/MAC/APL/PAC/BS_Protocol/configure.in
+++ b/MAC/APL/PAC/BS_Protocol/configure.in
@@ -56,8 +56,8 @@ dnl lofar_MPI
lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
lofar_INTERNAL(LCS/AMC/AMCBase, AMCBase, , 1, AMCBase/Converter.h,,)
lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, , 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/Marshalling.h,,)
+lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,"",)
+lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.h,,)
lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol, , 1, APL/RSP_Protocol/RSP_Protocol.ph,,)
lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
diff --git a/MAC/APL/PAC/BS_Protocol/include/APL/BS_Protocol/Beamlet2SubbandMap.h b/MAC/APL/PAC/BS_Protocol/include/APL/BS_Protocol/Beamlet2SubbandMap.h
index 66b63cdf24f3e8a455293f75f84a13e7e7e7ff3d..baeeefbda912cb7d2d5d99871519e749cf9bd24d 100644
--- a/MAC/APL/PAC/BS_Protocol/include/APL/BS_Protocol/Beamlet2SubbandMap.h
+++ b/MAC/APL/PAC/BS_Protocol/include/APL/BS_Protocol/Beamlet2SubbandMap.h
@@ -25,11 +25,9 @@
#ifndef BEAMLET2SUBBANDMAP_H_
#define BEAMLET2SUBBANDMAP_H_
-#include <APL/RTCCommon/Marshalling.h>
+#include <MACIO/Marshalling.h>
#include <APL/RSP_Protocol/EPA_Protocol.ph>
-#include <complex>
-#include <blitz/array.h>
#include <Common/LofarTypes.h>
#include <Common/lofar_string.h>
#include <Common/lofar_map.h>
diff --git a/MAC/APL/PAC/BS_Protocol/src/BS_Protocol.prot b/MAC/APL/PAC/BS_Protocol/src/BS_Protocol.prot
index cf54dfe82dc4633836a7088e763977faf4dbf86f..3b4612ea7e17eae88fbac0a2d48833edadbc768e 100644
--- a/MAC/APL/PAC/BS_Protocol/src/BS_Protocol.prot
+++ b/MAC/APL/PAC/BS_Protocol/src/BS_Protocol.prot
@@ -5,7 +5,7 @@ autogen definitions protocol;
description = "Protocol for the Beam Server";
prefix = "BS"; // for the signal names
-id = "(LOFAR::GCF::TM::F_APL_PROTOCOL+10)";
+id = "(LOFAR::MACIO::F_APL_PROTOCOL+10)";
// specify extra include files
// e.g.
diff --git a/MAC/APL/PAC/BS_Protocol/src/Makefile.am b/MAC/APL/PAC/BS_Protocol/src/Makefile.am
index 05e7ab3d1be8fc1debca537a2161cec34bfc038f..d028103a91455cd1ac9c7fabdd9c3a353f803932 100644
--- a/MAC/APL/PAC/BS_Protocol/src/Makefile.am
+++ b/MAC/APL/PAC/BS_Protocol/src/Makefile.am
@@ -5,11 +5,10 @@ AM_CPPFLAGS = \
AUTOGEN = autogen
SUFFIXES = .ph
%.cc: %.prot
- $(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
- cp $*.ph $(top_builddir)/include/APL/BS_Protocol
+ $(AUTOGEN) --writable -L $(datadir)/MACIO $<
%.ph: %.prot
- $(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
+ $(AUTOGEN) --writable -L $(datadir)/MACIO $<
cp $*.ph $(top_builddir)/include/APL/BS_Protocol
EXTRA_DIST = \
diff --git a/MAC/APL/PAC/BeamServer/Makefile.am b/MAC/APL/PAC/BeamServer/Makefile.am
index 6d0a046ae93dd7df7c6e1c6c6122db3fb3916ab9..91d36d03db841cff865b842746fa1065c84a13f5 100644
--- a/MAC/APL/PAC/BeamServer/Makefile.am
+++ b/MAC/APL/PAC/BeamServer/Makefile.am
@@ -8,7 +8,6 @@ DISTCHECK_CONFIGURE_FLAGS=\
--with-common=$(prefix)\
--with-suite=$(prefix)\
--with-gcftm=$(prefix)\
- --with-gcfcommon=$(prefix) \
--with-rsp=$(prefix)
EXTRA_DIST = \
diff --git a/MAC/APL/PAC/BeamServer/configure.in b/MAC/APL/PAC/BeamServer/configure.in
index 568f25ba6b2d8c6defbb3721f5025962978520c7..ab5c4862209453b9977865d417b691232321e6fe 100644
--- a/MAC/APL/PAC/BeamServer/configure.in
+++ b/MAC/APL/PAC/BeamServer/configure.in
@@ -68,8 +68,8 @@ lofar_INTERNAL(MAC/APL/PAC/CAL_Protocol, CAL_Protocol, , 1, APL/CAL_Protocol/CAL
lofar_INTERNAL(MAC/APL/PAC/BS_Protocol, BS_Protocol, , 1, APL/BS_Protocol/BS_Protocol.ph,,)
lofar_INTERNAL(LCS/AMC/AMCBase,AMCBase, , 1, AMCBase/Converter.h,,)
lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, , 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/Marshalling.h,,)
+lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
+lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.h,,)
lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
dnl
diff --git a/MAC/APL/PAC/BeamServer/src/BeamServer.cc b/MAC/APL/PAC/BeamServer/src/BeamServer.cc
index e5d5e06781b76d6d782ae3aba3893f5c3d7eb3c5..d7bda1cacfa043048908937a9378b3009cc5b5cc 100644
--- a/MAC/APL/PAC/BeamServer/src/BeamServer.cc
+++ b/MAC/APL/PAC/BeamServer/src/BeamServer.cc
@@ -26,7 +26,7 @@
#include <Common/LofarLocators.h>
#include <APS/ParameterSet.h>
-#include <GCF/GCF_ServiceInfo.h>
+#include <MACIO/MACServiceInfo.h>
#include <APL/RTCCommon/daemonize.h>
#include <APL/BS_Protocol/BS_Protocol.ph>
@@ -117,9 +117,9 @@ BeamServer::BeamServer(string name, int argc, char** argv)
// adopt commandline switches
parseOptions(argc, argv);
- GCF::TM::registerProtocol(BS_PROTOCOL, BS_PROTOCOL_STRINGS);
- GCF::TM::registerProtocol(RSP_PROTOCOL, RSP_PROTOCOL_STRINGS);
- GCF::TM::registerProtocol(CAL_PROTOCOL, CAL_PROTOCOL_STRINGS);
+ registerProtocol(BS_PROTOCOL, BS_PROTOCOL_STRINGS);
+ registerProtocol(RSP_PROTOCOL, RSP_PROTOCOL_STRINGS);
+ registerProtocol(CAL_PROTOCOL, CAL_PROTOCOL_STRINGS);
string instanceID;
if (m_instancenr >= 0) {
diff --git a/MAC/APL/PAC/BeamServer/src/beamctl.cc b/MAC/APL/PAC/BeamServer/src/beamctl.cc
index 306b5a40ac5edb74ab30ed8c654074eaf782be58..b65d7dca9ba0e9622be225cb5290c42557b5689a 100644
--- a/MAC/APL/PAC/BeamServer/src/beamctl.cc
+++ b/MAC/APL/PAC/BeamServer/src/beamctl.cc
@@ -25,7 +25,7 @@
#include <APL/CAL_Protocol/CAL_Protocol.ph>
#include <APL/BS_Protocol/BS_Protocol.ph>
#include <APL/RSP_Protocol/RCUSettings.h>
-#include <GCF/GCF_ServiceInfo.h>
+#include <MACIO/MACServiceInfo.h>
#include <Common/LofarLocators.h>
#include <APS/ParameterSet.h>
@@ -86,8 +86,8 @@ beamctl::beamctl(string name,
itsSkyScanTotalTime(3600), itsSkyScanPointTime(2), itsSkyScanWaitTime(10)
{
- GCF::TM::registerProtocol(CAL_PROTOCOL, CAL_PROTOCOL_STRINGS);
- GCF::TM::registerProtocol(BS_PROTOCOL, BS_PROTOCOL_STRINGS);
+ registerProtocol(CAL_PROTOCOL, CAL_PROTOCOL_STRINGS);
+ registerProtocol(BS_PROTOCOL, BS_PROTOCOL_STRINGS);
m_calserver.init(*this, MAC_SVCMASK_CALSERVER, GCFPortInterface::SAP, CAL_PROTOCOL);
m_beamserver.init(*this, MAC_SVCMASK_BEAMSERVER, GCFPortInterface::SAP, BS_PROTOCOL);
diff --git a/MAC/APL/PAC/BeamServer/test/AVTStub.cc b/MAC/APL/PAC/BeamServer/test/AVTStub.cc
index 90c3aecad00a3b468edc3768c2ee2081c1c2efe0..28cb7364953920c23486d2cdf74b968e56b53949 100644
--- a/MAC/APL/PAC/BeamServer/test/AVTStub.cc
+++ b/MAC/APL/PAC/BeamServer/test/AVTStub.cc
@@ -24,7 +24,7 @@
#include <lofar_config.h>
#include <Common/LofarLogger.h>
-#include <GCF/GCF_ServiceInfo.h>
+#include <MACIO/MACServiceInfo.h>
#include <Suite/suite.h>
#include <APL/RSP_Protocol/MEPHeader.h>
diff --git a/MAC/APL/PAC/BeamServer/test/EPATest.cc b/MAC/APL/PAC/BeamServer/test/EPATest.cc
index 747d0ebc60d8bec8d17a34a2e47fa16655712e6d..617d0685cf53c46c21d22648e8b93984e576980a 100644
--- a/MAC/APL/PAC/BeamServer/test/EPATest.cc
+++ b/MAC/APL/PAC/BeamServer/test/EPATest.cc
@@ -26,7 +26,7 @@
#include <lofar_config.h>
#include <Common/LofarLogger.h>
-#include <GCF/GCF_ServiceInfo.h>
+#include <MACIO/MACServiceInfo.h>
#include <Suite/suite.h>
#include <APL/RSP_Protocol/MEPHeader.h>
diff --git a/MAC/APL/PAC/BeamServer/test/SweepTest.cc b/MAC/APL/PAC/BeamServer/test/SweepTest.cc
index ab30cc0628046e1717d74f9f06a71d21952ebc2c..200e804541da5d3386b8c7b9c8cc0388dbb64f45 100644
--- a/MAC/APL/PAC/BeamServer/test/SweepTest.cc
+++ b/MAC/APL/PAC/BeamServer/test/SweepTest.cc
@@ -29,7 +29,7 @@
#include <lofar_config.h>
#include <Common/LofarLogger.h>
-#include <GCF/GCF_ServiceInfo.h>
+#include <MACIO/MACServiceInfo.h>
#include <Suite/suite.h>
#include <APL/RSP_Protocol/MEPHeader.h>
diff --git a/MAC/APL/PAC/CAL_Protocol/Makefile.am b/MAC/APL/PAC/CAL_Protocol/Makefile.am
index 4775c7ab1ea6fb472f4c9c2005f97ed60d390100..ba0dcac551d31e8996b755bfbe5883b1f0183224 100644
--- a/MAC/APL/PAC/CAL_Protocol/Makefile.am
+++ b/MAC/APL/PAC/CAL_Protocol/Makefile.am
@@ -5,7 +5,6 @@ pkgext_DATA = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
DISTCHECK_CONFIGURE_FLAGS=\
--with-common=$(prefix) \
- --with-gcfcommon=$(prefix) \
--with-gcftm=$(prefix) \
--with-rtccommon=$(prefix)
diff --git a/MAC/APL/PAC/CAL_Protocol/configure.in b/MAC/APL/PAC/CAL_Protocol/configure.in
index d2e6db5408b5ed516737401724ca2a1b38e14c77..238bc4f81b5e11049499d15fb2b3fbdee6d69483 100644
--- a/MAC/APL/PAC/CAL_Protocol/configure.in
+++ b/MAC/APL/PAC/CAL_Protocol/configure.in
@@ -52,9 +52,8 @@ dnl Check for LOFAR specific things
dnl
lofar_GENERAL
lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, , 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/Marshalling.h,,)
+lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,"",)
+lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.h,,)
lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol, , 1, APL/RSP_Protocol/RCUSettings.h,,)
lofar_EXTERNAL(BLITZ, 1, blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',, -lm)
diff --git a/MAC/APL/PAC/CAL_Protocol/src/CAL_Protocol.prot b/MAC/APL/PAC/CAL_Protocol/src/CAL_Protocol.prot
index 97b29f7c22e1246b7c080c406c50ca0cf230a52a..98219258b5537eb3e00c027911e07e268efb72ac 100644
--- a/MAC/APL/PAC/CAL_Protocol/src/CAL_Protocol.prot
+++ b/MAC/APL/PAC/CAL_Protocol/src/CAL_Protocol.prot
@@ -5,7 +5,7 @@ autogen definitions protocol;
description = "Protocol for the Calibration Server";
prefix = "CAL"; // for the signal names
-id = "(LOFAR::GCF::TM::F_APL_PROTOCOL+13)";
+id = "(LOFAR::MACIO::F_APL_PROTOCOL+13)";
// specify extra include files
// e.g.
diff --git a/MAC/APL/PAC/CAL_Protocol/src/Makefile.am b/MAC/APL/PAC/CAL_Protocol/src/Makefile.am
index 014707e7618639d21751d0ad31e00cfbdf22bf14..a8d25768f1cc30e3a338015f3ae2ff6870429a80 100644
--- a/MAC/APL/PAC/CAL_Protocol/src/Makefile.am
+++ b/MAC/APL/PAC/CAL_Protocol/src/Makefile.am
@@ -5,11 +5,10 @@ AM_CPPFLAGS = \
AUTOGEN = autogen
SUFFIXES = .ph
%.cc: %.prot
- $(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
- cp $*.ph $(top_builddir)/include/APL/CAL_Protocol
+ $(AUTOGEN) --writable -L $(datadir)/MACIO $<
%.ph: %.prot
- $(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
+ $(AUTOGEN) --writable -L $(datadir)/MACIO $<
cp $*.ph $(top_builddir)/include/APL/CAL_Protocol
EXTRA_DIST = \
diff --git a/MAC/APL/PAC/CAL_Protocol/src/SpectralWindow.cc b/MAC/APL/PAC/CAL_Protocol/src/SpectralWindow.cc
index fb3673692a22a918e38a4fd1872af458703c4817..61936514895c7973ad32601f68f79104ff795449 100644
--- a/MAC/APL/PAC/CAL_Protocol/src/SpectralWindow.cc
+++ b/MAC/APL/PAC/CAL_Protocol/src/SpectralWindow.cc
@@ -29,7 +29,8 @@
#include <blitz/array.h>
#include <sstream>
-#include <APL/RTCCommon/Marshalling.h>
+#include <MACIO/Marshalling.h>
+#include <APL/RTCCommon/MarshallBlitz.h>
#include <math.h>
diff --git a/MAC/APL/PAC/CAL_Protocol/src/SubArray.cc b/MAC/APL/PAC/CAL_Protocol/src/SubArray.cc
index 022f25bb4593d2497c5c332ec731e8bce0920056..dd1daab0df1fba34cbf18fa3af316a8f2a889cc4 100644
--- a/MAC/APL/PAC/CAL_Protocol/src/SubArray.cc
+++ b/MAC/APL/PAC/CAL_Protocol/src/SubArray.cc
@@ -25,8 +25,8 @@
#include <APL/CAL_Protocol/CalibrationInterface.h>
#include <Common/LofarLogger.h>
#include <Common/hexdump.h>
+#include <MACIO/Marshalling.h>
#include <APL/RTCCommon/MarshallBlitz.h>
-#include <APL/RTCCommon/Marshalling.h>
using namespace std;
using namespace blitz;
diff --git a/MAC/APL/PAC/CalServer/configure.in b/MAC/APL/PAC/CalServer/configure.in
index ceb0df7794cb3593bd4b7e5c71ed5711ca244a9a..fcab0ca7d437687dc91e01efea7b3e933b213c49 100644
--- a/MAC/APL/PAC/CalServer/configure.in
+++ b/MAC/APL/PAC/CalServer/configure.in
@@ -58,9 +58,9 @@ lofar_INTERNAL(LCS/Blob, Blob, , 1, Blob/BlobField.h,,)
lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
lofar_INTERNAL(MAC/Test/Suite, suite, , 1, Suite/suite.h,,)
lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol, , 1, APL/RSP_Protocol/RSP_Protocol.ph,,)
+lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, , 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/Marshalling.h,,)
+lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.h,,)
lofar_INTERNAL(MAC/APL/PAC/CAL_Protocol, CAL_Protocol, , 1, APL/CAL_Protocol/SubArray.h,,)
lofar_EXTERNAL(g2c, 1,,,,,,, "-lg2c")
lofar_EXTERNAL(cpplapack, 1, cpplapack.h, "", "/usr/local/lib/+pkg",,,, "-llapack -lblas -lm")
diff --git a/MAC/APL/PAC/CalServer/src/ACMProxy.cc b/MAC/APL/PAC/CalServer/src/ACMProxy.cc
index 8fabb6fddce7eede718931e88aa93f608ac9d917..f4f5c48ea79f0367ee2605d905d666561ba91df3 100644
--- a/MAC/APL/PAC/CalServer/src/ACMProxy.cc
+++ b/MAC/APL/PAC/CalServer/src/ACMProxy.cc
@@ -24,7 +24,7 @@
#include <lofar_config.h>
#include <Common/LofarLogger.h>
-#include <GCF/GCF_ServiceInfo.h>
+#include <MACIO/MACServiceInfo.h>
#include <APL/RSP_Protocol/RSP_Protocol.ph>
@@ -53,7 +53,7 @@ ACMProxy::ACMProxy(string name, ACCs& accs)
m_update_subband(0),
m_nrcus(0)
{
- GCF::TM::registerProtocol(RSP_PROTOCOL, RSP_PROTOCOL_STRINGS);
+ registerProtocol(RSP_PROTOCOL, RSP_PROTOCOL_STRINGS);
m_rspdriver.init(*this, MAC_SVCMASK_RSPDRIVER, GCFPortInterface::SAP, RSP_PROTOCOL);
}
diff --git a/MAC/APL/PAC/CalServer/src/CalServer.cc b/MAC/APL/PAC/CalServer/src/CalServer.cc
index 3137c0aea1ed62f6cb3ab966cd9f963e6a4a9d27..1d76217ccdb851e02ef9e42f2336c2ab993cc20d 100644
--- a/MAC/APL/PAC/CalServer/src/CalServer.cc
+++ b/MAC/APL/PAC/CalServer/src/CalServer.cc
@@ -32,7 +32,7 @@
#include <APL/CAL_Protocol/CAL_Protocol.ph>
#include <APL/RSP_Protocol/RSP_Protocol.ph>
-#include <GCF/GCF_ServiceInfo.h>
+#include <MACIO/MACServiceInfo.h>
#include "CalServer.h"
#include "SubArrays.h"
@@ -136,10 +136,10 @@ CalServer::CalServer(const string& name, ACCs& accs, int argc, char** argv)
instanceID = formatString("(%d)", m_instancenr);
}
- GCF::TM::registerProtocol(CAL_PROTOCOL, CAL_PROTOCOL_STRINGS);
+ registerProtocol(CAL_PROTOCOL, CAL_PROTOCOL_STRINGS);
m_acceptor.init(*this, MAC_SVCMASK_CALSERVER, GCFPortInterface::MSPP, CAL_PROTOCOL);
- GCF::TM::registerProtocol(RSP_PROTOCOL, RSP_PROTOCOL_STRINGS);
+ registerProtocol(RSP_PROTOCOL, RSP_PROTOCOL_STRINGS);
m_rspdriver.init(*this, MAC_SVCMASK_RSPDRIVER, GCFPortInterface::SAP, RSP_PROTOCOL);
}
diff --git a/MAC/APL/PAC/CalServer/src/calinfo.cc b/MAC/APL/PAC/CalServer/src/calinfo.cc
index c8f35f0d8a5a18ccd69a2afc493a0819c8db6c1e..67ef97dc14542114e177cc8497cde2cbf5b9ba5b 100644
--- a/MAC/APL/PAC/CalServer/src/calinfo.cc
+++ b/MAC/APL/PAC/CalServer/src/calinfo.cc
@@ -26,7 +26,7 @@
//# Includes
#include <Common/LofarLogger.h>
#include <APL/CAL_Protocol/CAL_Protocol.ph>
-#include <GCF/GCF_ServiceInfo.h>
+#include <MACIO/MACServiceInfo.h>
#include "calinfo.h"
namespace LOFAR {
@@ -38,7 +38,7 @@ calinfo::calinfo(const string& name) :
GCFTask((State)&calinfo::initial, "calinfo"),
itsSAname(name)
{
- GCF::TM::registerProtocol(CAL_PROTOCOL, CAL_PROTOCOL_STRINGS);
+ registerProtocol(CAL_PROTOCOL, CAL_PROTOCOL_STRINGS);
itsCalPort.init(*this, MAC_SVCMASK_CALSERVER, GCFPortInterface::SAP, CAL_PROTOCOL);
}
diff --git a/MAC/APL/PAC/CalServer/test/CalTest.cc b/MAC/APL/PAC/CalServer/test/CalTest.cc
index 8ee439a1a650ef6c37bb201960e4ad1d618bac4d..08ad331dd00d6b0c8bd85baf8ed40d6dba0f073d 100644
--- a/MAC/APL/PAC/CalServer/test/CalTest.cc
+++ b/MAC/APL/PAC/CalServer/test/CalTest.cc
@@ -24,7 +24,7 @@
// this include needs to be first!
#include <APL/CAL_Protocol/CAL_Protocol.ph>
-#include <GCF/GCF_ServiceInfo.h>
+#include <MACIO/MACServiceInfo.h>
#include <APL/RTCCommon/TestSuite.h>
#include "CalTest.h"