Skip to content
Snippets Groups Projects
Commit cc91bfe8 authored by Ruud Overeem's avatar Ruud Overeem
Browse files

Bug 1167: Cleaned up MAC layers. There are less dependancies between the packages now.

parent a737c64e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 30 additions and 37 deletions
MAC/APL/PAC/BS_Protocol/Makefile.am
+ 0
− 1
View file @ cc91bfe8
......@@ -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)
......
MAC/APL/PAC/BS_Protocol/configure.in
+ 2
− 2
View file @ cc91bfe8
......@@ -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)
......
MAC/APL/PAC/BS_Protocol/include/APL/BS_Protocol/Beamlet2SubbandMap.h
+ 1
− 3
View file @ cc91bfe8
......@@ -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>
......
MAC/APL/PAC/BS_Protocol/src/BS_Protocol.prot
+ 1
− 1
View file @ cc91bfe8
......@@ -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.
......
MAC/APL/PAC/BS_Protocol/src/Makefile.am
+ 2
− 3
View file @ cc91bfe8
......@@ -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 = \
......
MAC/APL/PAC/BeamServer/Makefile.am
+ 0
− 1
View file @ cc91bfe8
......@@ -8,7 +8,6 @@ DISTCHECK_CONFIGURE_FLAGS=\
--with-common=$(prefix)\
--with-suite=$(prefix)\
--with-gcftm=$(prefix)\
--with-gcfcommon=$(prefix) \
--with-rsp=$(prefix)
EXTRA_DIST = \
......
MAC/APL/PAC/BeamServer/configure.in
+ 2
− 2
View file @ cc91bfe8
......@@ -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
......
MAC/APL/PAC/BeamServer/src/BeamServer.cc
+ 4
− 4
View file @ cc91bfe8
......@@ -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) {
......
MAC/APL/PAC/BeamServer/src/beamctl.cc
+ 3
− 3
View file @ cc91bfe8
......@@ -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);
......
MAC/APL/PAC/BeamServer/test/AVTStub.cc
+ 1
− 1
View file @ cc91bfe8
......@@ -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>
......
MAC/APL/PAC/BeamServer/test/EPATest.cc
+ 1
− 1
View file @ cc91bfe8
......@@ -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>
......
MAC/APL/PAC/BeamServer/test/SweepTest.cc
+ 1
− 1
View file @ cc91bfe8
......@@ -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>
......
MAC/APL/PAC/CAL_Protocol/Makefile.am
+ 0
− 1
View file @ cc91bfe8
......@@ -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)
......
MAC/APL/PAC/CAL_Protocol/configure.in
+ 2
− 3
View file @ cc91bfe8
......@@ -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)
......
MAC/APL/PAC/CAL_Protocol/src/CAL_Protocol.prot
+ 1
− 1
View file @ cc91bfe8
......@@ -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.
......
MAC/APL/PAC/CAL_Protocol/src/Makefile.am
+ 2
− 3
View file @ cc91bfe8
......@@ -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 = \
......
MAC/APL/PAC/CAL_Protocol/src/SpectralWindow.cc
+ 2
− 1
View file @ cc91bfe8
......@@ -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>
......
MAC/APL/PAC/CAL_Protocol/src/SubArray.cc
+ 1
− 1
View file @ cc91bfe8
......@@ -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;
......
MAC/APL/PAC/CalServer/configure.in
+ 2
− 2
View file @ cc91bfe8
......@@ -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")
......
MAC/APL/PAC/CalServer/src/ACMProxy.cc
+ 2
− 2
View file @ cc91bfe8
......@@ -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);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment