From bea90796072296614cfffa900d39b19d34cb0e7e Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Tue, 23 Dec 2008 13:18:31 +0000
Subject: [PATCH] Bug 1301: Merged changes on the branch
LCS-APS-Bug1301-task-branch (r12322:12365) with the trunk.
---
.gitattributes | 4 -
.gitignore | 6 +-
CEP/Calibration/BBSControl/configure.in | 1 -
.../BBSControl/include/BBSControl/Command.h | 14 +-
.../include/BBSControl/CommandQueue.h | 10 +-
.../include/BBSControl/CorrectStep.h | 2 +-
.../include/BBSControl/FinalizeCommand.h | 4 +-
.../include/BBSControl/InitializeCommand.h | 4 +-
.../BBSControl/include/BBSControl/MultiStep.h | 10 +-
.../include/BBSControl/NextChunkCommand.h | 4 +-
.../BBSControl/include/BBSControl/NoiseStep.h | 6 +-
.../include/BBSControl/PredictStep.h | 2 +-
.../include/BBSControl/RecoverCommand.h | 4 +-
.../BBSControl/include/BBSControl/RefitStep.h | 2 +-
.../BBSControl/include/BBSControl/ShiftStep.h | 2 +-
.../include/BBSControl/SingleStep.h | 6 +-
.../BBSControl/include/BBSControl/SolveStep.h | 6 +-
.../BBSControl/include/BBSControl/Step.h | 10 +-
.../BBSControl/include/BBSControl/Strategy.h | 12 +-
.../include/BBSControl/SubtractStep.h | 2 +-
.../include/BBSControl/SynchronizeCommand.h | 4 +-
CEP/Calibration/BBSControl/src/Command.cc | 3 +-
.../BBSControl/src/CommandExecutor.cc | 2 +-
.../BBSControl/src/CommandQueue.cc | 3 +-
CEP/Calibration/BBSControl/src/CorrectStep.cc | 4 +-
.../BBSControl/src/FinalizeCommand.cc | 1 -
.../BBSControl/src/GlobalProcessControl.cc | 3 +-
.../BBSControl/src/InitializeCommand.cc | 1 -
.../BBSControl/src/KernelProcessControl.cc | 7 +-
CEP/Calibration/BBSControl/src/MultiStep.cc | 3 +-
.../BBSControl/src/NextChunkCommand.cc | 4 +-
CEP/Calibration/BBSControl/src/NoiseStep.cc | 9 +-
CEP/Calibration/BBSControl/src/PredictStep.cc | 4 +-
.../BBSControl/src/QueryBuilder/AddCommand.cc | 3 +-
.../BBSControl/src/RecoverCommand.cc | 1 -
CEP/Calibration/BBSControl/src/RefitStep.cc | 4 +-
CEP/Calibration/BBSControl/src/ShiftStep.cc | 4 +-
CEP/Calibration/BBSControl/src/SingleStep.cc | 3 +-
CEP/Calibration/BBSControl/src/SolveStep.cc | 3 +-
.../BBSControl/src/SolverProcessControl.cc | 3 +-
CEP/Calibration/BBSControl/src/Step.cc | 6 +-
CEP/Calibration/BBSControl/src/Strategy.cc | 10 +-
.../BBSControl/src/SubtractStep.cc | 4 +-
.../BBSControl/src/SynchronizeCommand.cc | 1 -
.../BBSControl/test/tCommandQueue.cc | 3 +-
CEP/Calibration/BBSControl/test/tStrategy.cc | 3 +-
CEP/DP3/CS1_SPWCombine/configure.in | 2 +-
.../CS1_SPWCombine/CombinerProcessControl.h | 2 +-
.../src/CombinerProcessControl.cc | 2 +-
CEP/DP3/CS1_pp_lib/configure.in | 2 +-
.../CS1_pp_lib/PipelineProcessControl.h | 2 +-
.../CS1_pp_lib/src/PipelineProcessControl.cc | 2 +-
CEP/DP3/CS1_pp_lib/test/test_flaggers.cc | 2 +-
CEP/Imager/MWCommon/configure.in | 2 +-
.../include/MWCommon/ParameterHandler.h | 3 +-
.../MWCommon/include/MWCommon/VdsPartDesc.h | 8 +-
CEP/Imager/MWCommon/src/VdsPartDesc.cc | 1 -
CEP/Imager/MWCommon/test/tClusterDesc.cc | 8 +-
CEP/Imager/MWCommon/test/tNodeDesc.cc | 6 +-
CEP/Imager/MWCommon/test/tVdsDesc.cc | 8 +-
CEP/Imager/MWCommon/test/tVdsPartDesc.cc | 5 +-
CEP/Imager/MWControl/src/MWSpec.cc | 1 -
CEP/Imager/MWControl/test/tMWSpec.cc | 5 +-
CEP/Imager/MWImager/configure.in | 1 -
.../MWImager/include/MWImager/ConvertParset.h | 8 +-
CEP/Imager/MWImager/src/ConvertParset.cc | 17 +-
CEP/MS/configure.in | 1 -
CEP/MS/src/combinevds.cc | 5 +-
CEP/MS/src/makems.cc | 5 +-
JAVA/CEP/jParmFacade/configure.in | 1 -
LCS/ACC/APS/APS.spec.in | 162 ------------------
LCS/ACC/APS/CMakeLists.txt | 14 --
LCS/ACC/APS/Makefile.am | 16 --
LCS/ACC/APS/bootstrap | 3 -
LCS/ACC/APS/configure.in | 66 -------
LCS/ACC/APS/include/APS/Exceptions.h | 51 ------
LCS/ACC/APS/include/APS/Makefile.am | 11 --
LCS/ACC/APS/include/Makefile.am | 3 -
LCS/ACC/APS/package.dox | 7 -
LCS/ACC/APS/src/CMakeLists.txt | 17 --
LCS/ACC/APS/src/Makefile.am | 20 ---
LCS/ACC/APS/test/Makefile.am | 32 ----
LCS/ACC/APS/test/newset.stdout | 13 --
LCS/ACC/PLC/configure.in | 1 -
LCS/ACC/PLC/include/PLC/ProcCtrlCmdLine.h | 2 +-
LCS/ACC/PLC/include/PLC/ProcCtrlProxy.h | 8 +-
LCS/ACC/PLC/include/PLC/ProcCtrlRemote.h | 2 +-
LCS/ACC/PLC/src/ACCmain.cc | 6 +-
LCS/ACC/PLC/src/ProcCtrlCmdLine.cc | 4 +-
LCS/ACC/PLC/src/ProcCtrlRemote.cc | 4 +-
LCS/ACC/lofarconf.in | 1 -
LCS/ApplCommon/configure.in | 1 -
.../include/ApplCommon/Observation.h | 4 +-
LCS/ApplCommon/src/Observation.cc | 1 -
LCS/ApplCommon/test/tObservation.cc | 3 +-
LCS/Common/include/Common/Exceptions.h | 6 +
.../APS => Common/include/Common}/KVpair.h | 10 +-
LCS/Common/include/Common/Makefile.am | 4 +
.../include/Common}/ParameterSet.h | 14 +-
.../include/Common}/ParameterSetImpl.h | 21 +--
.../include/Common}/ParameterValue.h | 8 +-
LCS/{ACC/APS => Common}/src/KVpair.cc | 6 +-
LCS/Common/src/Makefile.am | 10 +-
LCS/{ACC/APS => Common}/src/ParameterSet.cc | 6 +-
.../APS => Common}/src/ParameterSetImpl.cc | 14 +-
LCS/{ACC/APS => Common}/src/ParameterValue.cc | 12 +-
LCS/{ACC/APS => Common}/src/getparsetvalue.cc | 4 +-
LCS/Common/test/Makefile.am | 67 ++------
.../APS => Common}/test/nocase2normal.sed | 0
LCS/{ACC/APS => Common}/test/tParameterSet.cc | 5 +-
.../test/tParameterSet.in_merge_nocase | 0
.../test/tParameterSet.in_merge_normal | 0
.../test/tParameterSet.in_param_nocase | 0
.../test/tParameterSet.in_param_normal | 0
.../test/tParameterSet.log_prop | 0
LCS/{ACC/APS => Common}/test/tParameterSet.sh | 0
.../APS => Common}/test/tParameterSet.stdout | 0
.../APS => Common}/test/tParameterSetPerf.cc | 3 +-
.../APS => Common}/test/tParameterSetPerf.run | 0
.../APS => Common}/test/tParameterSetPerf.sh | 0
.../APS => Common}/test/tParameterValue.cc | 3 +-
.../APS => Common}/test/tParameterValue.sh | 0
.../test/tgetparsetvalue.parset | 0
.../APS => Common}/test/tgetparsetvalue.run | 0
.../APS => Common}/test/tgetparsetvalue.sh | 0
.../test/tgetparsetvalue.stdout | 0
LCS/pyparameterset/configure.in | 1 -
LCS/pyparameterset/src/pyparameterset.cc | 12 +-
MAC/APL/APLCommon/configure.in | 1 -
MAC/APL/APLCommon/src/ChildControl.cc | 3 +-
MAC/APL/APLCommon/src/ControllerDefines.cc | 6 +-
MAC/APL/APLCommon/src/ParentControl.cc | 3 +-
MAC/APL/CEPCU/configure.in | 1 -
MAC/APL/CEPCU/src/ApplController/ACDaemon.h | 3 +-
.../CEPCU/src/ApplController/ApplController.h | 3 +-
.../src/ApplController/ConfigurationMgr.cc | 2 +-
.../src/ApplController/ConfigurationMgr.h | 3 +-
MAC/APL/CEPCU/src/ApplController/ItemList.h | 3 +-
.../CEPCU/src/ApplController/StateEngine.h | 3 +-
.../src/OfflineControl/OfflineControl.cc | 21 ++-
.../CEPCU/src/OfflineControl/OfflineControl.h | 6 +-
.../CEPCU/src/OnlineControl/OnlineControl.cc | 5 +-
.../CEPCU/src/OnlineControl/OnlineControl.h | 4 +-
MAC/APL/CEPCU/test/ApplController/APCmdImpl.h | 2 +-
.../CEPCU/test/ApplController/APExample.cc | 3 +-
MAC/APL/CEPCU/test/ApplController/APTest.cc | 3 +-
MAC/APL/CUDaemons/configure.in | 1 -
.../src/LoggingClient/LoggingClient.cc | 3 +-
.../src/ServiceBroker/ServiceBroker.cc | 14 +-
MAC/APL/CURTDBDaemons/configure.in | 1 -
.../src/KeyValueLogger/KeyValueLogger.cc | 6 +-
.../src/SASGateway/SASGateway.cc | 3 +-
MAC/APL/MainCU/configure.in | 1 -
.../MainCU/src/MACScheduler/MACScheduler.cc | 5 +-
.../MainCU/src/MACScheduler/MACScheduler.h | 2 +-
MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc | 3 +-
MAC/APL/MainCU/src/MACScheduler/ObsClaimer.h | 2 +-
.../ObservationControl/ObservationControl.cc | 3 +-
.../ObservationControl/ObservationControl.h | 2 +-
MAC/APL/PAC/BeamServer/src/BeamServer.cc | 2 +-
MAC/APL/PAC/BeamServer/src/BeamServerMain.cc | 3 +-
MAC/APL/PAC/BeamServer/src/beamctl.cc | 5 +-
MAC/APL/PAC/CalServer/src/ACMProxy.cc | 2 +-
MAC/APL/PAC/CalServer/src/CalServer.cc | 2 +-
MAC/APL/PIC/MIS/configure.in | 1 -
MAC/APL/PIC/MIS/src/MISDaemon.cc | 3 +-
MAC/APL/PIC/RSPDriver/src/RSPDriver.cc | 2 +-
MAC/APL/PIC/RSPDriver/test/EPAStub.cc | 2 +-
MAC/APL/PIC/TBBDriver/configure.in | 1 -
MAC/APL/PIC/TBBDriver/src/DriverSettings.cc | 5 +-
MAC/APL/PIC/TBBDriver/src/TBBDriver.cc | 7 +-
MAC/APL/PIC/TBBDriver/test/TPStub.cc | 3 +-
.../include/APL/RTCCommon/PSAccess.h | 4 +-
MAC/APL/RTDBCommon/configure.in | 1 -
MAC/APL/StationCU/configure.in | 1 -
.../StationCU/src/BeamControl/BeamControl.cc | 3 +-
.../StationCU/src/BeamControl/BeamControl.h | 2 +-
.../CalibrationControl/CalibrationControl.cc | 1 -
.../DigitalBoardControl.cc | 3 +-
.../DigitalBoardControl/DigitalBoardControl.h | 2 +-
.../HardwareMonitor/HardwareMonitorMain.cc | 3 +-
.../StationCU/src/StationControl/ActiveObs.cc | 1 -
.../StationCU/src/StationControl/ActiveObs.h | 2 +-
.../src/StationControl/StationControl.cc | 3 +-
.../src/StationControl/StationControl.h | 2 +-
.../StationCU/src/TBBControl/TBBControl.cc | 3 +-
MAC/APL/StationCU/src/TBBControl/TBBControl.h | 2 +-
.../src/TBBControl/TBBObservation.cc | 1 -
.../StationCU/src/TBBControl/TBBObservation.h | 4 +-
MAC/APL/StationCU/src/TBBControl/VHECRTask.cc | 3 +-
MAC/APL/TestCtlr/configure.in | 1 -
MAC/APL/TestCtlr/src/ControllerMenu.cc | 3 +-
MAC/APL/TestCtlr/src/ControllerMenu.h | 2 +-
MAC/APL/TestCtlr/src/TestController.cc | 3 +-
.../LogSys/KVLogSys/src/GCF_KeyValueLogger.cc | 4 +-
MAC/GCF/LogSys/KVLogSys/src/KVLUtils.cc | 2 +-
.../KVLogSys/src/KeyValueLoggerDaemon.cc | 2 +-
.../KVLogSys/src/KeyValueLoggerMaster.cc | 4 +-
MAC/GCF/LogSys/configure.in | 1 -
MAC/GCF/PVSS/src/GSA_SCADAHandler.cc | 8 +-
MAC/GCF/TM/configure.in | 1 -
MAC/GCF/TM/src/GCF_Task.cc | 5 +-
MAC/GCF/TM/src/Port/GCF_Port.cc | 3 +-
MAC/GCF/TM/src/Port/GCF_RawPort.cc | 3 +-
MAC/GCF/TM/src/PortImpl/GCF_DevicePort.cc | 4 +-
MAC/GCF/TM/src/PortImpl/GCF_ETHRawPort.cc | 8 +-
MAC/GCF/TM/src/PortImpl/GCF_TCPPort.cc | 7 +-
MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.cc | 2 +-
MAC/GCF/_PAL/PI/src/GPI_Controller.cc | 4 +-
MAC/GCF/_PAL/PML/src/GPM_Controller.cc | 4 +-
MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.cc | 8 +-
MAC/GCF/_PAL/configure.in | 1 -
.../_PALlight/CEP-PMLlight/src/PIClient.cc | 8 +-
.../PMLlight/src/GPM_RTController.cc | 6 +-
RTCP/CNProc/test/transpose.cc | 12 +-
RTCP/IONProc/configure.in | 1 -
RTCP/IONProc/src/ION_main.cc | 4 +-
RTCP/IONProc/src/WH_DelayCompensation.cc | 1 -
RTCP/Interface/configure.in | 1 -
RTCP/Interface/include/Interface/Parset.h | 9 +-
RTCP/Interface/src/Parset.cc | 8 +-
RTCP/Storage/configure.in | 1 -
RTCP/Storage/src/Storage_main.cc | 2 +-
RTCP/Storage/src/SubbandWriter.cc | 2 +-
RTCP/Storage/test/AH_TestStorage.cc | 2 +-
RTCP/Storage/test/tAH_TestStorage.cc | 2 +-
SAS/OTB/jOTDB2/configure.in | 1 -
SAS/OTDB/configure.in | 1 -
SAS/OTDB/include/OTDB/TreeValue.h | 5 +-
SAS/OTDB/test/Makefile.am | 2 +-
SAS/OTDB/test/tPICvalue.cc | 2 +-
SAS/OTDB/test/tVHvalue.cc | 2 +-
USG/VHECR/src/VHECRTask.cc | 3 +-
233 files changed, 372 insertions(+), 947 deletions(-)
delete mode 100644 LCS/ACC/APS/APS.spec.in
delete mode 100644 LCS/ACC/APS/CMakeLists.txt
delete mode 100644 LCS/ACC/APS/Makefile.am
delete mode 100755 LCS/ACC/APS/bootstrap
delete mode 100644 LCS/ACC/APS/configure.in
delete mode 100644 LCS/ACC/APS/include/APS/Exceptions.h
delete mode 100644 LCS/ACC/APS/include/APS/Makefile.am
delete mode 100644 LCS/ACC/APS/include/Makefile.am
delete mode 100644 LCS/ACC/APS/package.dox
delete mode 100644 LCS/ACC/APS/src/CMakeLists.txt
delete mode 100644 LCS/ACC/APS/src/Makefile.am
delete mode 100644 LCS/ACC/APS/test/Makefile.am
delete mode 100644 LCS/ACC/APS/test/newset.stdout
rename LCS/{ACC/APS/include/APS => Common/include/Common}/KVpair.h (93%)
rename LCS/{ACC/APS/include/APS => Common/include/Common}/ParameterSet.h (99%)
rename LCS/{ACC/APS/include/APS => Common/include/Common}/ParameterSetImpl.h (98%)
rename LCS/{ACC/APS/include/APS => Common/include/Common}/ParameterValue.h (97%)
rename LCS/{ACC/APS => Common}/src/KVpair.cc (96%)
rename LCS/{ACC/APS => Common}/src/ParameterSet.cc (96%)
rename LCS/{ACC/APS => Common}/src/ParameterSetImpl.cc (98%)
rename LCS/{ACC/APS => Common}/src/ParameterValue.cc (97%)
rename LCS/{ACC/APS => Common}/src/getparsetvalue.cc (96%)
rename LCS/{ACC/APS => Common}/test/nocase2normal.sed (100%)
rename LCS/{ACC/APS => Common}/test/tParameterSet.cc (99%)
rename LCS/{ACC/APS => Common}/test/tParameterSet.in_merge_nocase (100%)
rename LCS/{ACC/APS => Common}/test/tParameterSet.in_merge_normal (100%)
rename LCS/{ACC/APS => Common}/test/tParameterSet.in_param_nocase (100%)
rename LCS/{ACC/APS => Common}/test/tParameterSet.in_param_normal (100%)
rename LCS/{ACC/APS => Common}/test/tParameterSet.log_prop (100%)
rename LCS/{ACC/APS => Common}/test/tParameterSet.sh (100%)
rename LCS/{ACC/APS => Common}/test/tParameterSet.stdout (100%)
rename LCS/{ACC/APS => Common}/test/tParameterSetPerf.cc (97%)
rename LCS/{ACC/APS => Common}/test/tParameterSetPerf.run (100%)
rename LCS/{ACC/APS => Common}/test/tParameterSetPerf.sh (100%)
rename LCS/{ACC/APS => Common}/test/tParameterValue.cc (98%)
rename LCS/{ACC/APS => Common}/test/tParameterValue.sh (100%)
rename LCS/{ACC/APS => Common}/test/tgetparsetvalue.parset (100%)
rename LCS/{ACC/APS => Common}/test/tgetparsetvalue.run (100%)
rename LCS/{ACC/APS => Common}/test/tgetparsetvalue.sh (100%)
rename LCS/{ACC/APS => Common}/test/tgetparsetvalue.stdout (100%)
diff --git a/.gitattributes b/.gitattributes
index ff8723cac84..cae69d4d467 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -251,7 +251,6 @@ LCS/pyparameterset/bootstrap -text
LCS/pytools/bootstrap -text
MAC/APL/APLCommon/Makefile.am -text svneol=native#application/octet-stream
MAC/APL/APLCommon/bootstrap -text svneol=native#application/octet-stream
-MAC/APL/APLCommon/configure.in -text svneol=native#application/octet-stream
MAC/APL/APLCommon/src/Makefile.am -text svneol=native#application/octet-stream
MAC/APL/APLCommon/src/StartDaemon_Protocol.prot -text svneol=native#application/octet-stream
MAC/APL/CEPCU/src/ApplController/CMakeLists.txt -text
@@ -278,7 +277,6 @@ MAC/APL/PAC/MatlabCal/test/frequencies.dat -text
MAC/APL/PAC/MatlabCal/test/srcpos.dat -text
MAC/APL/PIC/MIS/Makefile.am -text svneol=native#application/octet-stream
MAC/APL/PIC/MIS/bootstrap -text svneol=native#application/octet-stream
-MAC/APL/PIC/MIS/configure.in -text svneol=native#application/octet-stream
MAC/APL/PIC/MIS/src/MIS_Protocol.prot -text svneol=native#application/octet-stream
MAC/APL/PIC/MIS/src/Makefile.am -text svneol=native#application/octet-stream
MAC/APL/PIC/MIS/test/MACall.tse.prot -text svneol=native#application/octet-stream
@@ -376,7 +374,6 @@ MAC/GCF/RTDB/test/readScript.ctl -text
MAC/GCF/RTDB/test/writeScript.ctl -text
MAC/GCF/TM/Makefile.am -text svneol=native#application/octet-stream
MAC/GCF/TM/bootstrap -text svneol=native#application/octet-stream
-MAC/GCF/TM/configure.in -text svneol=native#application/octet-stream
MAC/GCF/TM/src/Makefile.am -text svneol=native#application/octet-stream
MAC/GCF/TM/test/Echo_Protocol.prot -text svneol=native#application/octet-stream
MAC/GCF/TM/test/tGCFTask1.cc -text
@@ -408,7 +405,6 @@ MAC/GCF/_PAL/SAL/test/Echo_Protocol.prot -text svneol=native#application/octet-s
MAC/GCF/_PAL/SAL/test/Makefile.am -text svneol=native#application/octet-stream
MAC/GCF/_PAL/SAL/test/sal-test.conf.in -text svneol=native#application/octet-stream
MAC/GCF/_PAL/bootstrap -text svneol=native#application/octet-stream
-MAC/GCF/_PAL/configure.in -text svneol=native#application/octet-stream
MAC/GCF/_PALlight/CEP-PMLlight/Makefile.am -text svneol=native#application/octet-stream
MAC/GCF/_PALlight/CEP-PMLlight/src/Makefile.am -text svneol=native#application/octet-stream
MAC/GCF/_PALlight/Makefile.am -text svneol=native#application/octet-stream
diff --git a/.gitignore b/.gitignore
index 5765184c961..45d71d07043 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,9 +61,6 @@ JAVA/MAC/jRSP/nbproject/private
LCS/ACC/ALC/Makefile.common
LCS/ACC/ALC/autoconf_share
LCS/ACC/ALC/lofarconf
-LCS/ACC/APS/Makefile.common
-LCS/ACC/APS/autoconf_share
-LCS/ACC/APS/lofarconf
LCS/ACC/PLC/Makefile.common
LCS/ACC/PLC/autoconf_share
LCS/ACC/PLC/lofarconf
@@ -233,6 +230,9 @@ MAC/Test/TestHarness/TSE/lofarconf
RTCP/CNProc/Makefile.common
RTCP/CNProc/autoconf_share
RTCP/CNProc/lofarconf
+RTCP/FCNP/Makefile.common
+RTCP/FCNP/autoconf_share
+RTCP/FCNP/lofarconf
RTCP/IONProc/Makefile.common
RTCP/IONProc/autoconf_share
RTCP/IONProc/lofarconf
diff --git a/CEP/Calibration/BBSControl/configure.in b/CEP/Calibration/BBSControl/configure.in
index f12f5c40825..971d05ea148 100644
--- a/CEP/Calibration/BBSControl/configure.in
+++ b/CEP/Calibration/BBSControl/configure.in
@@ -33,7 +33,6 @@ lofar_MPI
lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypes.h)
lofar_INTERNAL(LCS/Blob,Blob,,1,Blob/BlobHeader.h)
lofar_INTERNAL(LCS/Transport,Transport,,1,Transport/TransportHolder.h)
-lofar_INTERNAL(LCS/ACC/APS,APS,,1,APS/ParameterSet.h)
lofar_INTERNAL(LCS/ACC/PLC,PLC,,1,PLC/ProcessControl.h)
lofar_INTERNAL(CEP/Calibration/BBSKernel,BBSKernel,,1,BBSKernel/Equator.h)
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/Command.h b/CEP/Calibration/BBSControl/include/BBSControl/Command.h
index bc589de6b7e..5add24cc4de 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/Command.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/Command.h
@@ -33,7 +33,7 @@
namespace LOFAR
{
//# Forward declarations
- namespace ACC { namespace APS { class ParameterSet; } }
+ class ParameterSet;
namespace BBS
{
@@ -56,10 +56,10 @@ namespace LOFAR
virtual const string& type() const = 0;
// Write the contents of \c *this into the ParameterSet \a ps.
- virtual void write(ACC::APS::ParameterSet& ps) const = 0;
+ virtual void write(ParameterSet& ps) const = 0;
// Read the contents from the ParameterSet \a ps into \c *this.
- virtual void read(const ACC::APS::ParameterSet& ps) = 0;
+ virtual void read(const ParameterSet& ps) = 0;
// Print the contents of \c *this in human readable form into the output
// stream \a os.
@@ -77,12 +77,12 @@ namespace LOFAR
friend ostream& operator<<(ostream&, const Command&);
// Write the contents of a Command to a ParameterSet.
- friend ACC::APS::ParameterSet&
- operator<<(ACC::APS::ParameterSet&, const Command&);
+ friend ParameterSet&
+ operator<<(ParameterSet&, const Command&);
// Read the contents of a ParameterSet into a Command.
- friend ACC::APS::ParameterSet&
- operator>>(ACC::APS::ParameterSet&, Command&);
+ friend ParameterSet&
+ operator>>(ParameterSet&, Command&);
};
// Factory that can be used to generate new Command objects.
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/CommandQueue.h b/CEP/Calibration/BBSControl/include/BBSControl/CommandQueue.h
index 90ba1ee7bab..6455597e1ef 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/CommandQueue.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/CommandQueue.h
@@ -53,7 +53,7 @@
namespace LOFAR
{
//# Forward Declarations
- namespace ACC { namespace APS { class ParameterSet; } }
+ class ParameterSet;
namespace BBS
{
@@ -254,7 +254,7 @@ namespace LOFAR
// Constructor for select-like queries. The result is returned as a
// string.
- ExecQuery(const string& query, ACC::APS::ParameterSet& result);
+ ExecQuery(const string& query, ParameterSet& result);
// This method will be invoked by the perform() method of your
// pqxx::connection class to execute the query stored in itsQuery. The
@@ -273,13 +273,13 @@ namespace LOFAR
private:
// Empty ParameterSet, used to initialize itsResult properly, when the
// one-argument constructor is used.
- static ACC::APS::ParameterSet emptyResult;
+ static ParameterSet emptyResult;
// String containing the query to be executed.
const string itsQuery;
// Reference to the ParameterSet that will hold the query result.
- ACC::APS::ParameterSet& itsResult;
+ ParameterSet& itsResult;
// The result of the executed query must be stored internally, because
// it will be written in operator() and will be read in on_commit().
@@ -291,7 +291,7 @@ namespace LOFAR
// optional argument \a doAlwaysPrefix indicates whether keys should
// always be prefixed with \c _row(<row-nr>) or not. By default, when
// only one row is returned, the prefix \c _row(0). is dropped.
- ACC::APS::ParameterSet execQuery(const string& query,
+ ParameterSet execQuery(const string& query,
bool doAlwaysPrefix = false) const;
// Connection to the PostgreSQL database. The pqxx::connection object
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/CorrectStep.h b/CEP/Calibration/BBSControl/include/BBSControl/CorrectStep.h
index eb80218a551..db7319bedc2 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/CorrectStep.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/CorrectStep.h
@@ -49,7 +49,7 @@ namespace LOFAR
}
CorrectStep(const string& name,
- const ACC::APS::ParameterSet& parSet,
+ const ParameterSet& parSet,
const Step* parent);
// Accept a CommandVisitor that wants to process \c *this.
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/FinalizeCommand.h b/CEP/Calibration/BBSControl/include/BBSControl/FinalizeCommand.h
index 167ff53b04d..ffa0f6bd76d 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/FinalizeCommand.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/FinalizeCommand.h
@@ -48,10 +48,10 @@ namespace LOFAR
virtual const string& type() const;
// Write the contents of \c *this into the ParameterSet \a ps.
- virtual void write(ACC::APS::ParameterSet& ps) const;
+ virtual void write(ParameterSet& ps) const;
// Read the contents from the ParameterSet \a ps into \c *this.
- virtual void read(const ACC::APS::ParameterSet& ps);
+ virtual void read(const ParameterSet& ps);
// Print the contents of \c *this in human readable form into the output
// stream \a os.
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/InitializeCommand.h b/CEP/Calibration/BBSControl/include/BBSControl/InitializeCommand.h
index 4719833fbde..70d2a5d8da2 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/InitializeCommand.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/InitializeCommand.h
@@ -50,10 +50,10 @@ namespace LOFAR
virtual const string& type() const;
// Write the contents of \c *this into the ParameterSet \a ps.
- virtual void write(ACC::APS::ParameterSet& ps) const;
+ virtual void write(ParameterSet& ps) const;
// Read the contents from the ParameterSet \a ps into \c *this.
- virtual void read(const ACC::APS::ParameterSet& ps);
+ virtual void read(const ParameterSet& ps);
// Print the contents of \c *this in human readable form into the output
// stream \a os.
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/MultiStep.h b/CEP/Calibration/BBSControl/include/BBSControl/MultiStep.h
index 3df417ee88d..9e461b9c034 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/MultiStep.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/MultiStep.h
@@ -48,7 +48,7 @@ namespace LOFAR
// object being created. The third argument is used to pass a
// backreference to the parent Step object.
MultiStep(const string& name,
- const ACC::APS::ParameterSet& parset,
+ const ParameterSet& parset,
const Step* parent);
// Default constructor. Construct an empty MultiStep object and make
@@ -72,18 +72,18 @@ namespace LOFAR
private:
// Write the contents of \c *this into the ParameterSet \a ps.
- virtual void write(ACC::APS::ParameterSet& ps) const;
+ virtual void write(ParameterSet& ps) const;
// Read the contents from the ParameterSet \a ps into \c *this.
- virtual void read(const ACC::APS::ParameterSet& ps);
+ virtual void read(const ParameterSet& ps);
// Write the individual Step objects in \a itsSteps, which make up
// this MultiStep, to the ParameterSet \a ps.
- void writeSteps(ACC::APS::ParameterSet& ps) const;
+ void writeSteps(ParameterSet& ps) const;
// Read the individual Step objects, which make up this MultiStep,
// from the ParameterSet \a ps and store them in \a itsSteps.
- void readSteps(const ACC::APS::ParameterSet& ps);
+ void readSteps(const ParameterSet& ps);
// Implementation of getAllSteps() for MultiStep. It retrieves all
// steps by calling getAllSteps() on all steps that comprise this
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/NextChunkCommand.h b/CEP/Calibration/BBSControl/include/BBSControl/NextChunkCommand.h
index cdd77e5c432..c3b3e4400c1 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/NextChunkCommand.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/NextChunkCommand.h
@@ -67,10 +67,10 @@ namespace LOFAR
virtual const string& type() const;
// Write the contents of \c *this into the ParameterSet \a ps.
- virtual void write(ACC::APS::ParameterSet& ps) const;
+ virtual void write(ParameterSet& ps) const;
// Read the contents from the ParameterSet \a ps into \c *this.
- virtual void read(const ACC::APS::ParameterSet& ps);
+ virtual void read(const ParameterSet& ps);
// Print the contents of \c *this in human readable form into the output
// stream \a os.
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/NoiseStep.h b/CEP/Calibration/BBSControl/include/BBSControl/NoiseStep.h
index 055416904e7..2bce1cd8ea2 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/NoiseStep.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/NoiseStep.h
@@ -49,7 +49,7 @@ public:
// parset, by searching for keys <tt>Step.\a name</tt>. \a parent
// is a pointer to the Step object that is the parent of \c *this.
NoiseStep(const string& name,
- const ACC::APS::ParameterSet& parset,
+ const ParameterSet& parset,
const Step* parent);
virtual ~NoiseStep();
@@ -79,10 +79,10 @@ public:
private:
// Write the contents of \c *this into the ParameterSet \a ps.
- virtual void write(ACC::APS::ParameterSet& ps) const;
+ virtual void write(ParameterSet& ps) const;
// Read the contents from the ParameterSet \a ps into \c *this.
- virtual void read(const ACC::APS::ParameterSet& ps);
+ virtual void read(const ParameterSet& ps);
double itsMean, itsSigma;
// uint32 itsSeed;
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/PredictStep.h b/CEP/Calibration/BBSControl/include/BBSControl/PredictStep.h
index b7dd849ddbb..085ee1042fd 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/PredictStep.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/PredictStep.h
@@ -49,7 +49,7 @@ namespace LOFAR
}
PredictStep(const string& name,
- const ACC::APS::ParameterSet& parSet,
+ const ParameterSet& parSet,
const Step* parent);
// Accept a CommandVisitor that wants to process \c *this.
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/RecoverCommand.h b/CEP/Calibration/BBSControl/include/BBSControl/RecoverCommand.h
index 7fc96685a23..051b41bdf28 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/RecoverCommand.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/RecoverCommand.h
@@ -39,10 +39,10 @@ namespace LOFAR
virtual const string& type() const;
// Write the contents of \c *this into the ParameterSet \a ps.
- virtual void write(ACC::APS::ParameterSet& ps) const;
+ virtual void write(ParameterSet& ps) const;
// Read the contents from the ParameterSet \a ps into \c *this.
- virtual void read(const ACC::APS::ParameterSet& ps);
+ virtual void read(const ParameterSet& ps);
// Print the contents of \c *this in human readable form into the output
// stream \a os.
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/RefitStep.h b/CEP/Calibration/BBSControl/include/BBSControl/RefitStep.h
index aa6300352dd..a0427446f6a 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/RefitStep.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/RefitStep.h
@@ -49,7 +49,7 @@ namespace LOFAR
}
RefitStep(const string& name,
- const ACC::APS::ParameterSet& parSet,
+ const ParameterSet& parSet,
const Step* parent);
// Accept a CommandVisitor that wants to process \c *this.
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/ShiftStep.h b/CEP/Calibration/BBSControl/include/BBSControl/ShiftStep.h
index e537493674e..708f9a88fcb 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/ShiftStep.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/ShiftStep.h
@@ -49,7 +49,7 @@ namespace LOFAR
}
ShiftStep(const string& name,
- const ACC::APS::ParameterSet& parSet,
+ const ParameterSet& parSet,
const Step* parent);
// Accept a CommandVisitor that wants to process \c *this.
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/SingleStep.h b/CEP/Calibration/BBSControl/include/BBSControl/SingleStep.h
index 690be60d1cf..86ec82a58b3 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/SingleStep.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/SingleStep.h
@@ -66,17 +66,17 @@ namespace LOFAR
// parset, by searching for keys <tt>Step.\a name</tt>. \a parent
// is a pointer to the Step object that is the parent of \c *this.
// SingleStep(const string& name,
-// const ACC::APS::ParameterSet& parset,
+// const ParameterSet& parset,
// const Step* parent);
SingleStep(const string& name, const Step* parent);
// Write the contents of \c *this into the ParameterSet \a ps.
- virtual void write(ACC::APS::ParameterSet& ps) const;
+ virtual void write(ParameterSet& ps) const;
// Read the contents from the ParameterSet \a ps into \c *this,
// overriding the default values, "inherited" from the parent step
// object.
- virtual void read(const ACC::APS::ParameterSet& ps);
+ virtual void read(const ParameterSet& ps);
// Name of the column to write data to.
string itsOutputColumn;
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/SolveStep.h b/CEP/Calibration/BBSControl/include/BBSControl/SolveStep.h
index fd58abd3839..aa15a3b9d11 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/SolveStep.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/SolveStep.h
@@ -52,7 +52,7 @@ namespace LOFAR
// parset, by searching for keys <tt>Step.\a name</tt>. \a parent
// is a pointer to the Step object that is the parent of \c *this.
SolveStep(const string& name,
- const ACC::APS::ParameterSet& parset,
+ const ParameterSet& parset,
const Step* parent);
virtual ~SolveStep();
@@ -83,10 +83,10 @@ namespace LOFAR
private:
// Write the contents of \c *this into the ParameterSet \a ps.
- virtual void write(ACC::APS::ParameterSet& ps) const;
+ virtual void write(ParameterSet& ps) const;
// Read the contents from the ParameterSet \a ps into \c *this.
- virtual void read(const ACC::APS::ParameterSet& ps);
+ virtual void read(const ParameterSet& ps);
vector<string> itsParms; ///< Names of the solvable parameters
vector<string> itsExclParms; ///< Parameters excluded from solve
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/Step.h b/CEP/Calibration/BBSControl/include/BBSControl/Step.h
index 7981f22b7f0..91210372b68 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/Step.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/Step.h
@@ -39,7 +39,7 @@
namespace LOFAR
{
//# Forward Declarations.
- namespace ACC { namespace APS { class ParameterSet; } }
+ class ParameterSet;
namespace BBS
{
@@ -92,7 +92,7 @@ namespace LOFAR
// otherwise it is a SingleStep. The third, optional, argument is used
// to pass a backreference to the parent Step object.
static shared_ptr<Step> create(const string& name,
- const ACC::APS::ParameterSet& parSet,
+ const ParameterSet& parSet,
const Step* parent = 0);
// Print the contents of \c *this in human readable form into the output
@@ -123,12 +123,12 @@ namespace LOFAR
// @}
// Write the contents of \c *this into the ParameterSet \a ps.
- virtual void write(ACC::APS::ParameterSet& ps) const;
+ virtual void write(ParameterSet& ps) const;
// Read the contents from the ParameterSet \a ps into \c *this,
// overriding the default values, "inherited" from the parent step
// object.
- virtual void read(const ACC::APS::ParameterSet& ps);
+ virtual void read(const ParameterSet& ps);
protected:
// Default constructor. Construct an empty Step object and make it a
@@ -140,7 +140,7 @@ namespace LOFAR
// object being created. The third argument is used to pass a
// backreference to the parent Step object.
// Step(const string& name,
-// const ACC::APS::ParameterSet& parSet,
+// const ParameterSet& parSet,
// const Step* parent);
Step(const string& name, const Step* parent);
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/Strategy.h b/CEP/Calibration/BBSControl/include/BBSControl/Strategy.h
index 5af68632dc8..dc93cab1b33 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/Strategy.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/Strategy.h
@@ -37,7 +37,7 @@
namespace LOFAR
{
//# Forward declarations
- namespace ACC { namespace APS { class ParameterSet; } }
+ class ParameterSet;
namespace BBS
{
@@ -55,7 +55,7 @@ namespace LOFAR
Strategy() {}
// Create a solve strategy for the given work domain.
- Strategy(const ACC::APS::ParameterSet& aParamSet);
+ Strategy(const ParameterSet& aParamSet);
// Destructor.
~Strategy();
@@ -64,10 +64,10 @@ namespace LOFAR
virtual const string& type() const;
// Write the contents of \c *this into the ParameterSet \a ps.
- virtual void write(ACC::APS::ParameterSet& ps) const;
+ virtual void write(ParameterSet& ps) const;
// Read the contents from the ParameterSet \a ps into \c *this.
- virtual void read(const ACC::APS::ParameterSet& ps);
+ virtual void read(const ParameterSet& ps);
// Accept a CommandVisitor that wants to process \c *this.
virtual void accept(CommandVisitor &visitor) const;
@@ -100,10 +100,10 @@ namespace LOFAR
private:
// Read the Step objects from the parameter set \a ps and store them
// in \a itsSteps.
- bool readSteps(const ACC::APS::ParameterSet& ps);
+ bool readSteps(const ParameterSet& ps);
// Write the Step objects in \a itsSteps to parameter set \a ps.
- void writeSteps(ACC::APS::ParameterSet& ps) const;
+ void writeSteps(ParameterSet& ps) const;
// Name of the Measurement Set
string itsDataSet;
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/SubtractStep.h b/CEP/Calibration/BBSControl/include/BBSControl/SubtractStep.h
index baf55296788..724320a9c2c 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/SubtractStep.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/SubtractStep.h
@@ -47,7 +47,7 @@ namespace LOFAR
SingleStep(parent) {}
SubtractStep(const string& name,
- const ACC::APS::ParameterSet& parSet,
+ const ParameterSet& parSet,
const Step* parent);
// Accept a CommandVisitor that wants to process \c *this.
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/SynchronizeCommand.h b/CEP/Calibration/BBSControl/include/BBSControl/SynchronizeCommand.h
index 409b42cc93c..59fd46dbd90 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/SynchronizeCommand.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/SynchronizeCommand.h
@@ -39,10 +39,10 @@ namespace LOFAR
virtual const string& type() const;
// Write the contents of \c *this into the ParameterSet \a ps.
- virtual void write(ACC::APS::ParameterSet& ps) const;
+ virtual void write(ParameterSet& ps) const;
// Read the contents from the ParameterSet \a ps into \c *this.
- virtual void read(const ACC::APS::ParameterSet& ps);
+ virtual void read(const ParameterSet& ps);
// Print the contents of \c *this in human readable form into the output
// stream \a os.
diff --git a/CEP/Calibration/BBSControl/src/Command.cc b/CEP/Calibration/BBSControl/src/Command.cc
index dc7de35d2d9..3fe6690b348 100644
--- a/CEP/Calibration/BBSControl/src/Command.cc
+++ b/CEP/Calibration/BBSControl/src/Command.cc
@@ -26,14 +26,13 @@
//# Includes
#include <BBSControl/Command.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/LofarLogger.h>
namespace LOFAR
{
namespace BBS
{
- using ACC::APS::ParameterSet;
//##-------- P u b l i c m e t h o d s --------##//
diff --git a/CEP/Calibration/BBSControl/src/CommandExecutor.cc b/CEP/Calibration/BBSControl/src/CommandExecutor.cc
index 4c7f24a18cb..d0cb9dc02c5 100644
--- a/CEP/Calibration/BBSControl/src/CommandExecutor.cc
+++ b/CEP/Calibration/BBSControl/src/CommandExecutor.cc
@@ -56,7 +56,7 @@
#include <Blob/BlobIStream.h>
#include <Blob/BlobIBufStream.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/LofarLogger.h>
#include <Common/lofar_fstream.h>
diff --git a/CEP/Calibration/BBSControl/src/CommandQueue.cc b/CEP/Calibration/BBSControl/src/CommandQueue.cc
index c98f0a6b298..c348724149c 100644
--- a/CEP/Calibration/BBSControl/src/CommandQueue.cc
+++ b/CEP/Calibration/BBSControl/src/CommandQueue.cc
@@ -33,7 +33,7 @@
#include <BBSControl/Strategy.h>
#include <BBSControl/Exceptions.h>
#include <BBSControl/StreamUtil.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/LofarLogger.h>
//# For getpid() and pid_t.
@@ -68,7 +68,6 @@
namespace LOFAR
{
- using ACC::APS::ParameterSet;
namespace BBS
{
diff --git a/CEP/Calibration/BBSControl/src/CorrectStep.cc b/CEP/Calibration/BBSControl/src/CorrectStep.cc
index ce9f54b219f..3fdb1a26443 100644
--- a/CEP/Calibration/BBSControl/src/CorrectStep.cc
+++ b/CEP/Calibration/BBSControl/src/CorrectStep.cc
@@ -23,7 +23,7 @@
#include <lofar_config.h>
#include <BBSControl/CorrectStep.h>
#include <BBSControl/CommandVisitor.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
namespace LOFAR
{
@@ -31,7 +31,7 @@ namespace LOFAR
{
CorrectStep::CorrectStep(const string& name,
- const ACC::APS::ParameterSet& parSet,
+ const ParameterSet& parSet,
const Step* parent) :
SingleStep(name, parent)
{
diff --git a/CEP/Calibration/BBSControl/src/FinalizeCommand.cc b/CEP/Calibration/BBSControl/src/FinalizeCommand.cc
index 20e305a59a6..0385a1ca065 100644
--- a/CEP/Calibration/BBSControl/src/FinalizeCommand.cc
+++ b/CEP/Calibration/BBSControl/src/FinalizeCommand.cc
@@ -30,7 +30,6 @@ namespace LOFAR
{
namespace BBS
{
- using ACC::APS::ParameterSet;
// Register FinalizeCommand with the CommandFactory. Use an anonymous
// namespace. This ensures that the variable `dummy' gets its own private
diff --git a/CEP/Calibration/BBSControl/src/GlobalProcessControl.cc b/CEP/Calibration/BBSControl/src/GlobalProcessControl.cc
index 8644e1d421a..5a74d276514 100644
--- a/CEP/Calibration/BBSControl/src/GlobalProcessControl.cc
+++ b/CEP/Calibration/BBSControl/src/GlobalProcessControl.cc
@@ -32,7 +32,7 @@
#include <BBSControl/FinalizeCommand.h>
#include <BBSControl/CommandQueue.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Blob/BlobIStream.h>
#include <Blob/BlobIBufStream.h>
#include <Common/LofarLogger.h>
@@ -46,7 +46,6 @@
#include <unistd.h> // for sleep()
-using namespace LOFAR::ACC::APS;
namespace LOFAR
{
diff --git a/CEP/Calibration/BBSControl/src/InitializeCommand.cc b/CEP/Calibration/BBSControl/src/InitializeCommand.cc
index 20d2b7b291b..fb1f97a17ff 100644
--- a/CEP/Calibration/BBSControl/src/InitializeCommand.cc
+++ b/CEP/Calibration/BBSControl/src/InitializeCommand.cc
@@ -30,7 +30,6 @@ namespace LOFAR
{
namespace BBS
{
- using ACC::APS::ParameterSet;
// Register InitializeCommand with the CommandFactory. Use an anonymous
// namespace. This ensures that the variable `dummy' gets its own private
diff --git a/CEP/Calibration/BBSControl/src/KernelProcessControl.cc b/CEP/Calibration/BBSControl/src/KernelProcessControl.cc
index dd8865b9cca..40fca13faf5 100644
--- a/CEP/Calibration/BBSControl/src/KernelProcessControl.cc
+++ b/CEP/Calibration/BBSControl/src/KernelProcessControl.cc
@@ -36,8 +36,8 @@
#include <BBSControl/Exceptions.h>
#include <BBSControl/StreamUtil.h>
-#include <APS/ParameterSet.h>
-#include <APS/Exceptions.h>
+#include <Common/ParameterSet.h>
+#include <Common/Exceptions.h>
#include <Blob/BlobStreamable.h>
#include <Common/LofarLogger.h>
@@ -51,7 +51,6 @@
#include <stdlib.h>
-using namespace LOFAR::ACC::APS;
namespace LOFAR
{
@@ -112,7 +111,7 @@ namespace LOFAR
try {
uint32 kernelId =
- LOFAR::ACC::APS::globalParameterSet()->getUint32("Kernel.Id");
+ globalParameterSet()->getUint32("Kernel.Id");
// Create a new CommandQueue. This will open a connection to the
// blackboard database.
diff --git a/CEP/Calibration/BBSControl/src/MultiStep.cc b/CEP/Calibration/BBSControl/src/MultiStep.cc
index 0335251304b..7e9240819ec 100644
--- a/CEP/Calibration/BBSControl/src/MultiStep.cc
+++ b/CEP/Calibration/BBSControl/src/MultiStep.cc
@@ -25,7 +25,7 @@
#include <BBSControl/MultiStep.h>
#include <BBSControl/Exceptions.h>
#include <BBSControl/CommandVisitor.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <BBSControl/StreamUtil.h>
#include <Common/LofarLogger.h>
@@ -33,7 +33,6 @@ namespace LOFAR
{
namespace BBS
{
- using ACC::APS::ParameterSet;
//##-------- P u b l i c m e t h o d s --------##//
diff --git a/CEP/Calibration/BBSControl/src/NextChunkCommand.cc b/CEP/Calibration/BBSControl/src/NextChunkCommand.cc
index ac3cd0c7253..87c09f3aeeb 100644
--- a/CEP/Calibration/BBSControl/src/NextChunkCommand.cc
+++ b/CEP/Calibration/BBSControl/src/NextChunkCommand.cc
@@ -26,7 +26,7 @@
#include <Common/LofarLogger.h>
#include <Common/lofar_iostream.h>
#include <Common/lofar_iomanip.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <casa/Quanta/Quantum.h>
#include <casa/Quanta/MVTime.h>
@@ -35,8 +35,6 @@ namespace LOFAR
{
namespace BBS
{
- using ACC::APS::ParameterSet;
- using ACC::APS::KVpair;
// Register NextChunkCommand with the CommandFactory. Use an anonymous
// namespace. This ensures that the variable `dummy' gets its own private
diff --git a/CEP/Calibration/BBSControl/src/NoiseStep.cc b/CEP/Calibration/BBSControl/src/NoiseStep.cc
index 51029bb483d..0f835dd9965 100644
--- a/CEP/Calibration/BBSControl/src/NoiseStep.cc
+++ b/CEP/Calibration/BBSControl/src/NoiseStep.cc
@@ -25,13 +25,12 @@
#include <BBSControl/CommandVisitor.h>
#include <BBSControl/StreamUtil.h>
#include <Common/LofarLogger.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
namespace LOFAR
{
namespace BBS
{
-using ACC::APS::ParameterSet;
using LOFAR::operator<<;
NoiseStep::NoiseStep(const Step* parent)
@@ -41,7 +40,7 @@ NoiseStep::NoiseStep(const Step* parent)
}
NoiseStep::NoiseStep(const string& name,
- const ACC::APS::ParameterSet& parset,
+ const ParameterSet& parset,
const Step* parent)
: SingleStep(name, parent)
{
@@ -89,7 +88,7 @@ const string& NoiseStep::type() const
//##-------- P r i v a t e m e t h o d s --------##//
-void NoiseStep::write(ACC::APS::ParameterSet& ps) const
+void NoiseStep::write(ParameterSet& ps) const
{
LOG_TRACE_LIFETIME(TRACE_LEVEL_COND, "");
SingleStep::write(ps);
@@ -102,7 +101,7 @@ void NoiseStep::write(ACC::APS::ParameterSet& ps) const
LOG_TRACE_VAR_STR("\nContents of ParameterSet ps:\n" << ps);
}
-void NoiseStep::read(const ACC::APS::ParameterSet& ps)
+void NoiseStep::read(const ParameterSet& ps)
{
LOG_TRACE_LIFETIME(TRACE_LEVEL_COND, "");
SingleStep::read(ps);
diff --git a/CEP/Calibration/BBSControl/src/PredictStep.cc b/CEP/Calibration/BBSControl/src/PredictStep.cc
index 79fc52b92a7..e1d97a160c2 100644
--- a/CEP/Calibration/BBSControl/src/PredictStep.cc
+++ b/CEP/Calibration/BBSControl/src/PredictStep.cc
@@ -23,7 +23,7 @@
#include <lofar_config.h>
#include <BBSControl/PredictStep.h>
#include <BBSControl/CommandVisitor.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
namespace LOFAR
{
@@ -31,7 +31,7 @@ namespace LOFAR
{
PredictStep::PredictStep(const string& name,
- const ACC::APS::ParameterSet& parSet,
+ const ParameterSet& parSet,
const Step* parent) :
SingleStep(name, parent)
{
diff --git a/CEP/Calibration/BBSControl/src/QueryBuilder/AddCommand.cc b/CEP/Calibration/BBSControl/src/QueryBuilder/AddCommand.cc
index 2a5002a10c5..e316b68446b 100644
--- a/CEP/Calibration/BBSControl/src/QueryBuilder/AddCommand.cc
+++ b/CEP/Calibration/BBSControl/src/QueryBuilder/AddCommand.cc
@@ -41,7 +41,7 @@
#include <BBSControl/NoiseStep.h>
#include <BBSControl/Exceptions.h>
#include <BBSControl/StreamUtil.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/LofarLogger.h>
namespace LOFAR
@@ -49,7 +49,6 @@ namespace LOFAR
namespace BBS
{
using LOFAR::operator<<;
- using ACC::APS::ParameterSet;
namespace QueryBuilder
{
diff --git a/CEP/Calibration/BBSControl/src/RecoverCommand.cc b/CEP/Calibration/BBSControl/src/RecoverCommand.cc
index 53ebd5f391b..9cbf2cfeb76 100644
--- a/CEP/Calibration/BBSControl/src/RecoverCommand.cc
+++ b/CEP/Calibration/BBSControl/src/RecoverCommand.cc
@@ -30,7 +30,6 @@ namespace LOFAR
{
namespace BBS
{
- using ACC::APS::ParameterSet;
// Register RecoverCommand with the CommandFactory. Use an anonymous
// namespace. This ensures that the variable `dummy' gets its own private
diff --git a/CEP/Calibration/BBSControl/src/RefitStep.cc b/CEP/Calibration/BBSControl/src/RefitStep.cc
index 17c7281bc66..c4071fbbdf6 100644
--- a/CEP/Calibration/BBSControl/src/RefitStep.cc
+++ b/CEP/Calibration/BBSControl/src/RefitStep.cc
@@ -23,7 +23,7 @@
#include <lofar_config.h>
#include <BBSControl/RefitStep.h>
#include <BBSControl/CommandVisitor.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
namespace LOFAR
{
@@ -31,7 +31,7 @@ namespace LOFAR
{
RefitStep::RefitStep(const string& name,
- const ACC::APS::ParameterSet& parSet,
+ const ParameterSet& parSet,
const Step* parent) :
SingleStep(name, parent)
{
diff --git a/CEP/Calibration/BBSControl/src/ShiftStep.cc b/CEP/Calibration/BBSControl/src/ShiftStep.cc
index 210b8250d76..2e42b66207c 100644
--- a/CEP/Calibration/BBSControl/src/ShiftStep.cc
+++ b/CEP/Calibration/BBSControl/src/ShiftStep.cc
@@ -23,7 +23,7 @@
#include <lofar_config.h>
#include <BBSControl/ShiftStep.h>
#include <BBSControl/CommandVisitor.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
namespace LOFAR
{
@@ -31,7 +31,7 @@ namespace LOFAR
{
ShiftStep::ShiftStep(const string& name,
- const ACC::APS::ParameterSet& parSet,
+ const ParameterSet& parSet,
const Step* parent) :
SingleStep(name, parent)
{
diff --git a/CEP/Calibration/BBSControl/src/SingleStep.cc b/CEP/Calibration/BBSControl/src/SingleStep.cc
index 13f5f981b2a..f22dec996a8 100644
--- a/CEP/Calibration/BBSControl/src/SingleStep.cc
+++ b/CEP/Calibration/BBSControl/src/SingleStep.cc
@@ -26,14 +26,13 @@
#include <BBSControl/Exceptions.h>
#include <BBSControl/CommandVisitor.h>
#include <BBSControl/StreamUtil.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/LofarLogger.h>
namespace LOFAR
{
namespace BBS
{
- using ACC::APS::ParameterSet;
using LOFAR::operator<<;
//##-------- P u b l i c m e t h o d s --------##//
diff --git a/CEP/Calibration/BBSControl/src/SolveStep.cc b/CEP/Calibration/BBSControl/src/SolveStep.cc
index e3253986447..47edd0cedf3 100644
--- a/CEP/Calibration/BBSControl/src/SolveStep.cc
+++ b/CEP/Calibration/BBSControl/src/SolveStep.cc
@@ -26,7 +26,7 @@
#include <BBSControl/Exceptions.h>
#include <BBSControl/CommandVisitor.h>
#include <BBSControl/StreamUtil.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/LofarLogger.h>
#include <Common/lofar_iomanip.h>
@@ -34,7 +34,6 @@ namespace LOFAR
{
namespace BBS
{
- using ACC::APS::ParameterSet;
using LOFAR::operator<<;
diff --git a/CEP/Calibration/BBSControl/src/SolverProcessControl.cc b/CEP/Calibration/BBSControl/src/SolverProcessControl.cc
index ab98479e3d5..18621343a43 100644
--- a/CEP/Calibration/BBSControl/src/SolverProcessControl.cc
+++ b/CEP/Calibration/BBSControl/src/SolverProcessControl.cc
@@ -37,7 +37,7 @@
#include <BBSControl/Exceptions.h>
#include <BBSControl/Types.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Blob/BlobStreamable.h>
#include <Common/Exceptions.h>
#include <Common/LofarLogger.h>
@@ -49,7 +49,6 @@
namespace LOFAR
{
- using namespace ACC::APS;
namespace BBS
{
diff --git a/CEP/Calibration/BBSControl/src/Step.cc b/CEP/Calibration/BBSControl/src/Step.cc
index ecada4e188b..e08f396575b 100644
--- a/CEP/Calibration/BBSControl/src/Step.cc
+++ b/CEP/Calibration/BBSControl/src/Step.cc
@@ -33,15 +33,13 @@
#include <BBSControl/MultiStep.h>
#include <BBSControl/Exceptions.h>
#include <BBSControl/StreamUtil.h>
-#include <APS/ParameterSet.h>
-#include <APS/Exceptions.h>
+#include <Common/ParameterSet.h>
+#include <Common/Exceptions.h>
#include <Common/LofarLogger.h>
#include <Common/lofar_iomanip.h>
namespace LOFAR
{
- using ACC::APS::ParameterSet;
- using ACC::APS::APSException;
namespace BBS
{
diff --git a/CEP/Calibration/BBSControl/src/Strategy.cc b/CEP/Calibration/BBSControl/src/Strategy.cc
index b66b7274bd3..a07bf1594b4 100644
--- a/CEP/Calibration/BBSControl/src/Strategy.cc
+++ b/CEP/Calibration/BBSControl/src/Strategy.cc
@@ -27,15 +27,13 @@
#include <BBSControl/Types.h>
#include <BBSControl/CommandVisitor.h>
#include <BBSControl/Exceptions.h>
-#include <APS/ParameterSet.h>
-#include <APS/Exceptions.h>
+#include <Common/ParameterSet.h>
+#include <Common/Exceptions.h>
#include <BBSControl/StreamUtil.h>
#include <Common/LofarLogger.h>
namespace LOFAR
{
- using ACC::APS::ParameterSet;
- using ACC::APS::APSException;
namespace BBS
{
@@ -146,7 +144,7 @@ namespace LOFAR
//##-------- P r i v a t e m e t h o d s --------##//
- void Strategy::write(ACC::APS::ParameterSet& ps) const
+ void Strategy::write(ParameterSet& ps) const
{
LOG_TRACE_LIFETIME(TRACE_LEVEL_COND, "");
ps.add("DataSet", itsDataSet);
@@ -168,7 +166,7 @@ namespace LOFAR
}
- void Strategy::read(const ACC::APS::ParameterSet& ps)
+ void Strategy::read(const ParameterSet& ps)
{
LOG_TRACE_LIFETIME(TRACE_LEVEL_COND, "");
diff --git a/CEP/Calibration/BBSControl/src/SubtractStep.cc b/CEP/Calibration/BBSControl/src/SubtractStep.cc
index d6015f2d9ff..7946ec442ca 100644
--- a/CEP/Calibration/BBSControl/src/SubtractStep.cc
+++ b/CEP/Calibration/BBSControl/src/SubtractStep.cc
@@ -23,7 +23,7 @@
#include <lofar_config.h>
#include <BBSControl/SubtractStep.h>
#include <BBSControl/CommandVisitor.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
namespace LOFAR
{
@@ -31,7 +31,7 @@ namespace LOFAR
{
SubtractStep::SubtractStep(const string& name,
- const ACC::APS::ParameterSet& parSet,
+ const ParameterSet& parSet,
const Step* parent) :
SingleStep(name, parent)
{
diff --git a/CEP/Calibration/BBSControl/src/SynchronizeCommand.cc b/CEP/Calibration/BBSControl/src/SynchronizeCommand.cc
index beb435712a4..34e86861b1c 100644
--- a/CEP/Calibration/BBSControl/src/SynchronizeCommand.cc
+++ b/CEP/Calibration/BBSControl/src/SynchronizeCommand.cc
@@ -30,7 +30,6 @@ namespace LOFAR
{
namespace BBS
{
- using ACC::APS::ParameterSet;
// Register SynchronizeCommand with the CommandFactory. Use an anonymous
// namespace. This ensures that the variable `dummy' gets its own private
diff --git a/CEP/Calibration/BBSControl/test/tCommandQueue.cc b/CEP/Calibration/BBSControl/test/tCommandQueue.cc
index f103ec08c62..2206a492d6e 100644
--- a/CEP/Calibration/BBSControl/test/tCommandQueue.cc
+++ b/CEP/Calibration/BBSControl/test/tCommandQueue.cc
@@ -34,7 +34,7 @@
#include <BBSControl/PredictStep.h>
#include <BBSControl/ShiftStep.h>
#include <BBSControl/RefitStep.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/LofarLogger.h>
#include <Common/lofar_fstream.h>
#include <stdlib.h>
@@ -42,7 +42,6 @@
using namespace LOFAR;
using namespace LOFAR::BBS;
-using namespace LOFAR::ACC::APS;
int main(int /*argc*/, char* argv[])
{
diff --git a/CEP/Calibration/BBSControl/test/tStrategy.cc b/CEP/Calibration/BBSControl/test/tStrategy.cc
index 1dfb38f136c..e905e6d7b69 100644
--- a/CEP/Calibration/BBSControl/test/tStrategy.cc
+++ b/CEP/Calibration/BBSControl/test/tStrategy.cc
@@ -25,12 +25,11 @@
#include <BBSControl/Strategy.h>
#include <BBSControl/Step.h>
#include <BBSControl/MultiStep.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/LofarLogger.h>
using namespace LOFAR;
using namespace LOFAR::BBS;
-using namespace LOFAR::ACC::APS;
// Compare files. Return true if equal, otherwise false.
bool compareFiles(const char* f1, const char* f2)
diff --git a/CEP/DP3/CS1_SPWCombine/configure.in b/CEP/DP3/CS1_SPWCombine/configure.in
index a0381c7007a..29d415df463 100644
--- a/CEP/DP3/CS1_SPWCombine/configure.in
+++ b/CEP/DP3/CS1_SPWCombine/configure.in
@@ -44,8 +44,8 @@ dnl Check for LOFAR specific things
dnl
lofar_GENERAL(1)
lofar_AIPSPP(1)
+lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypes.h)
lofar_INTERNAL(LCS/ACC/PLC,PLC,,1,PLC/ProcessControl.h)
-lofar_INTERNAL(LCS/ACC/APS,APS,,1,APS/ParameterSet.h)
dnl
dnl Output Makefiles
diff --git a/CEP/DP3/CS1_SPWCombine/include/CS1_SPWCombine/CombinerProcessControl.h b/CEP/DP3/CS1_SPWCombine/include/CS1_SPWCombine/CombinerProcessControl.h
index e077ceec58f..57034010ab1 100644
--- a/CEP/DP3/CS1_SPWCombine/include/CS1_SPWCombine/CombinerProcessControl.h
+++ b/CEP/DP3/CS1_SPWCombine/include/CS1_SPWCombine/CombinerProcessControl.h
@@ -21,7 +21,7 @@
#define LOFARCOMBINERPROCESSCONTROL_H
#include <PLC/ProcessControl.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <vector>
/**
diff --git a/CEP/DP3/CS1_SPWCombine/src/CombinerProcessControl.cc b/CEP/DP3/CS1_SPWCombine/src/CombinerProcessControl.cc
index 973c5a76015..a1dd1babc5a 100644
--- a/CEP/DP3/CS1_SPWCombine/src/CombinerProcessControl.cc
+++ b/CEP/DP3/CS1_SPWCombine/src/CombinerProcessControl.cc
@@ -56,7 +56,7 @@ namespace LOFAR
//===============>>> CombinerProcessControl::define <<<==============================
tribool CombinerProcessControl::define()
{
- LOFAR::ACC::APS::ParameterSet* ParamSet = LOFAR::ACC::APS::globalParameterSet();
+ ParameterSet* ParamSet = globalParameterSet();
itsInMS = ParamSet->getStringVector("inms");
itsOutMS = ParamSet->getString("outms");
return true;
diff --git a/CEP/DP3/CS1_pp_lib/configure.in b/CEP/DP3/CS1_pp_lib/configure.in
index 8282dfd9225..cbf04665079 100644
--- a/CEP/DP3/CS1_pp_lib/configure.in
+++ b/CEP/DP3/CS1_pp_lib/configure.in
@@ -50,8 +50,8 @@ dnl Check for LOFAR specific things
dnl
lofar_GENERAL(1)
lofar_AIPSPP(1)
+lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypes.h)
lofar_INTERNAL(LCS/ACC/PLC,PLC,,1,PLC/ProcessControl.h)
-lofar_INTERNAL(LCS/ACC/APS,APS,,1,APS/ParameterSet.h)
dnl
dnl Output Makefiles
diff --git a/CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/PipelineProcessControl.h b/CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/PipelineProcessControl.h
index 707f567f5e7..8d6c7afe1f7 100644
--- a/CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/PipelineProcessControl.h
+++ b/CEP/DP3/CS1_pp_lib/include/CS1_pp_lib/PipelineProcessControl.h
@@ -21,7 +21,7 @@
#define LOFARPIPELINEPROCESSCONTROL_H
#include <PLC/ProcessControl.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
/**
@author Adriaan Renting
diff --git a/CEP/DP3/CS1_pp_lib/src/PipelineProcessControl.cc b/CEP/DP3/CS1_pp_lib/src/PipelineProcessControl.cc
index 3b19e4b47d0..7d7be1dbd78 100644
--- a/CEP/DP3/CS1_pp_lib/src/PipelineProcessControl.cc
+++ b/CEP/DP3/CS1_pp_lib/src/PipelineProcessControl.cc
@@ -65,7 +65,7 @@ namespace LOFAR
//===============>>> PipelineProcessControl::define <<<==============================
tribool PipelineProcessControl::define()
{
- LOFAR::ACC::APS::ParameterSet* ParamSet = LOFAR::ACC::APS::globalParameterSet();
+ ParameterSet* ParamSet = globalParameterSet();
myDetails = new RunDetails();
myDetails->Fixed = ParamSet->getUint32("fixed", 0); // BandpassCorrector
myDetails->FreqWindow = ParamSet->getUint32("freqwindow", 1); // FrequencyFlagger, MADFlagger
diff --git a/CEP/DP3/CS1_pp_lib/test/test_flaggers.cc b/CEP/DP3/CS1_pp_lib/test/test_flaggers.cc
index bee4231bd35..3d4953ed0f9 100644
--- a/CEP/DP3/CS1_pp_lib/test/test_flaggers.cc
+++ b/CEP/DP3/CS1_pp_lib/test/test_flaggers.cc
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
details.FreqWindow = 9;
details.TimeWindow = SIZE;
details.Existing = false;
- details.Treshold = 4.5;
+ details.Threshold = 4.5;
DataBuffer data(&info, details.TimeWindow, false);
ACG gen(11, 20);
diff --git a/CEP/Imager/MWCommon/configure.in b/CEP/Imager/MWCommon/configure.in
index 9f392b2db0a..6024a848a3c 100644
--- a/CEP/Imager/MWCommon/configure.in
+++ b/CEP/Imager/MWCommon/configure.in
@@ -52,8 +52,8 @@ dnl Check for LOFAR specific things
dnl
lofar_GENERAL
lofar_AIPSPP(1,"-lcasa")
+lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypes.h)
lofar_INTERNAL(LCS/Blob,Blob,,1,Blob/BlobHeader.h,,)
-lofar_INTERNAL(LCS/ACC/APS,APS,,1,APS/ParameterSet.h,,)
dnl
dnl Output Makefiles
diff --git a/CEP/Imager/MWCommon/include/MWCommon/ParameterHandler.h b/CEP/Imager/MWCommon/include/MWCommon/ParameterHandler.h
index bdc00fe67b0..3a98573de91 100644
--- a/CEP/Imager/MWCommon/include/MWCommon/ParameterHandler.h
+++ b/CEP/Imager/MWCommon/include/MWCommon/ParameterHandler.h
@@ -27,14 +27,13 @@
// @brief Handle a LOFAR .parset file
// @author Ger van Diepen (diepen AT astron nl)
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Blob/BlobIStream.h>
#include <Blob/BlobOStream.h>
namespace LOFAR { namespace CEP {
//# Put ParameterSet into LOFAR::CEP namespace for ease of use.
- using LOFAR::ACC::APS::ParameterSet;
// @ingroup MWCommon
// @brief Handle a LOFAR .parset file
diff --git a/CEP/Imager/MWCommon/include/MWCommon/VdsPartDesc.h b/CEP/Imager/MWCommon/include/MWCommon/VdsPartDesc.h
index c3b1ccd083e..5c7471bef44 100644
--- a/CEP/Imager/MWCommon/include/MWCommon/VdsPartDesc.h
+++ b/CEP/Imager/MWCommon/include/MWCommon/VdsPartDesc.h
@@ -28,7 +28,7 @@
// @author Ger van Diepen (diepen AT astron nl)
//# Includes
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Blob/BlobOStream.h>
#include <Blob/BlobIStream.h>
#include <string>
@@ -60,7 +60,7 @@ namespace LOFAR { namespace CEP {
{}
// Construct from the given parameterset.
- explicit VdsPartDesc (const ACC::APS::ParameterSet&);
+ explicit VdsPartDesc (const ParameterSet&);
// Set VDS name and file system.
void setName (const std::string& name, const std::string& fileSys);
@@ -91,7 +91,7 @@ namespace LOFAR { namespace CEP {
{ return itsParms.add (key, value); }
// Get access to the extra parameters.
- const ACC::APS::ParameterSet& getParms() const
+ const ParameterSet& getParms() const
{ return itsParms; }
// Clear the extra parameters.
@@ -147,7 +147,7 @@ namespace LOFAR { namespace CEP {
std::vector<int32> itsNChan; //# nr of channels per band
std::vector<double> itsStartFreqs; //# start freq of each channel
std::vector<double> itsEndFreqs; //# end freq of each channel
- ACC::APS::ParameterSet itsParms; //# extra parameters
+ ParameterSet itsParms; //# extra parameters
};
// Put/get the object to/from a blob.
diff --git a/CEP/Imager/MWCommon/src/VdsPartDesc.cc b/CEP/Imager/MWCommon/src/VdsPartDesc.cc
index 3e63ab9f73a..a82827aebf2 100644
--- a/CEP/Imager/MWCommon/src/VdsPartDesc.cc
+++ b/CEP/Imager/MWCommon/src/VdsPartDesc.cc
@@ -20,7 +20,6 @@ namespace std {
}
using namespace std;
using namespace casa;
-using LOFAR::ACC::APS::ParameterSet;
namespace LOFAR { namespace CEP {
diff --git a/CEP/Imager/MWCommon/test/tClusterDesc.cc b/CEP/Imager/MWCommon/test/tClusterDesc.cc
index 62ed03ed8f8..ae1cc23f483 100644
--- a/CEP/Imager/MWCommon/test/tClusterDesc.cc
+++ b/CEP/Imager/MWCommon/test/tClusterDesc.cc
@@ -8,11 +8,13 @@
#include <MWCommon/ClusterDesc.h>
#include <Common/LofarLogger.h>
+#include <Common/ParameterSet.h>
#include <ostream>
#include <fstream>
-using namespace LOFAR::CEP;
using namespace std;
+using namespace LOFAR;
+using namespace LOFAR::CEP;
void check (const ClusterDesc& cl)
{
@@ -59,7 +61,7 @@ void doIt()
ofstream fos("tClusterDesc_tmp.fil");
cl.write (fos);
// Read back.
- LOFAR::ACC::APS::ParameterSet parset("tClusterDesc_tmp.fil");
+ ParameterSet parset("tClusterDesc_tmp.fil");
ClusterDesc cl2(parset);
check(cl2);
cl = cl2;
@@ -96,7 +98,7 @@ void doParset()
ofstream fos("tClusterDesc_tmp.fil2");
cdesc.write (fos);
// Read back.
- LOFAR::ACC::APS::ParameterSet parset("tClusterDesc_tmp.fil2");
+ ParameterSet parset("tClusterDesc_tmp.fil2");
ClusterDesc cl2(parset);
check1 (cl2);
}
diff --git a/CEP/Imager/MWCommon/test/tNodeDesc.cc b/CEP/Imager/MWCommon/test/tNodeDesc.cc
index 5f75b3ecac7..f21d59e217b 100644
--- a/CEP/Imager/MWCommon/test/tNodeDesc.cc
+++ b/CEP/Imager/MWCommon/test/tNodeDesc.cc
@@ -8,11 +8,13 @@
#include <MWCommon/NodeDesc.h>
#include <Common/LofarLogger.h>
+#include <Common/ParameterSet.h>
#include <ostream>
#include <fstream>
-using namespace LOFAR::CEP;
using namespace std;
+using namespace LOFAR;
+using namespace LOFAR::CEP;
void check (const NodeDesc& node)
{
@@ -39,7 +41,7 @@ void doIt()
ofstream fos("tNodeDesc_tmp.fil");
node.write (fos, "");
// Read back.
- LOFAR::ACC::APS::ParameterSet parset("tNodeDesc_tmp.fil");
+ ParameterSet parset("tNodeDesc_tmp.fil");
NodeDesc node2(parset);
check(node2);
node = node2;
diff --git a/CEP/Imager/MWCommon/test/tVdsDesc.cc b/CEP/Imager/MWCommon/test/tVdsDesc.cc
index 533443847f5..1c2d03d164e 100644
--- a/CEP/Imager/MWCommon/test/tVdsDesc.cc
+++ b/CEP/Imager/MWCommon/test/tVdsDesc.cc
@@ -8,12 +8,14 @@
#include <MWCommon/VdsDesc.h>
#include <Common/LofarLogger.h>
+#include <Common/ParameterSet.h>
#include <ostream>
#include <fstream>
-using namespace LOFAR::CEP;
-using namespace casa;
using namespace std;
+using namespace casa;
+using namespace LOFAR;
+using namespace LOFAR::CEP;
void checkVds (const VdsPartDesc& vds, double endTime)
{
@@ -60,7 +62,7 @@ void doIt()
ofstream fos("tVdsDesc_tmp.fil");
vfds.write (fos);
// Read back.
- LOFAR::ACC::APS::ParameterSet parset("tVdsDesc_tmp.fil");
+ ParameterSet parset("tVdsDesc_tmp.fil");
VdsDesc vfds2(parset);
check(vfds2);
vfds = vfds2;
diff --git a/CEP/Imager/MWCommon/test/tVdsPartDesc.cc b/CEP/Imager/MWCommon/test/tVdsPartDesc.cc
index 7dd66edb023..54a8f8186af 100644
--- a/CEP/Imager/MWCommon/test/tVdsPartDesc.cc
+++ b/CEP/Imager/MWCommon/test/tVdsPartDesc.cc
@@ -11,6 +11,7 @@
#include <Blob/BlobOBufString.h>
#include <Blob/BlobIBufString.h>
#include <Common/LofarLogger.h>
+#include <Common/ParameterSet.h>
#include <ostream>
#include <fstream>
@@ -69,7 +70,7 @@ void doIt()
ofstream fos("tVdsPartDesc_tmp.fil");
vds.write (fos, "");
// Read back.
- LOFAR::ACC::APS::ParameterSet parset("tVdsPartDesc_tmp.fil");
+ ParameterSet parset("tVdsPartDesc_tmp.fil");
VdsPartDesc vds2(parset);
check(vds2);
vds = vds2;
@@ -90,7 +91,7 @@ void doIt()
// Check if times are written as well.
ofstream fos2("tVdsPartDesc_tmp.fil2");
vdsb.write (fos2, "");
- VdsPartDesc vdsb2(LOFAR::ACC::APS::ParameterSet("tVdsPartDesc_tmp.fil2"));
+ VdsPartDesc vdsb2(ParameterSet("tVdsPartDesc_tmp.fil2"));
check(vdsb2, 10);
vdsb.clearParms();
ASSERT (vdsb.getParms().size() == 0);
diff --git a/CEP/Imager/MWControl/src/MWSpec.cc b/CEP/Imager/MWControl/src/MWSpec.cc
index cbbb2ce5aa4..bbdb6388f3d 100644
--- a/CEP/Imager/MWControl/src/MWSpec.cc
+++ b/CEP/Imager/MWControl/src/MWSpec.cc
@@ -33,7 +33,6 @@
namespace std {
using LOFAR::operator<<;
}
-using namespace LOFAR::ACC::APS;
using namespace std;
namespace LOFAR { namespace CEP {
diff --git a/CEP/Imager/MWControl/test/tMWSpec.cc b/CEP/Imager/MWControl/test/tMWSpec.cc
index 0a226930c31..3da065bd141 100644
--- a/CEP/Imager/MWControl/test/tMWSpec.cc
+++ b/CEP/Imager/MWControl/test/tMWSpec.cc
@@ -23,10 +23,11 @@
#include <lofar_config.h>
#include <MWControl/MWMultiSpec.h>
#include <MWControl/MWParameterHandler.h>
+#include <Common/ParameterSet.h>
+#include <Common/lofar_iostream.h>
-using namespace LOFAR::ACC::APS;
+using namespace LOFAR;
using namespace LOFAR::CEP;
-using namespace std;
int main()
{
diff --git a/CEP/Imager/MWImager/configure.in b/CEP/Imager/MWImager/configure.in
index c3e001bffb7..bd244cbda16 100644
--- a/CEP/Imager/MWImager/configure.in
+++ b/CEP/Imager/MWImager/configure.in
@@ -52,7 +52,6 @@ dnl Check for LOFAR specific things
dnl
lofar_GENERAL
lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_INTERNAL(LCS/ACC/APS,APS,,1,APS/ParameterSet.h,,)
lofar_INTERNAL(CEP/Imager/MWCommon,MWCommon,,1,MWCommon/ClusterDesc.h,,)
lofar_INTERNAL(CEP/MS,MS,,1,MS/VdsMaker.h,bbms,)
diff --git a/CEP/Imager/MWImager/include/MWImager/ConvertParset.h b/CEP/Imager/MWImager/include/MWImager/ConvertParset.h
index 44663fbb4d9..3351ad5c1e6 100644
--- a/CEP/Imager/MWImager/include/MWImager/ConvertParset.h
+++ b/CEP/Imager/MWImager/include/MWImager/ConvertParset.h
@@ -43,13 +43,13 @@ namespace LOFAR {
// Convert the input parset file (in SAS format) to the output parset
// (in cimager format).
// The output parset is written if the output name is not empty.
- static ACC::APS::ParameterSet convertParset (const std::string& nameIn,
+ static ParameterSet convertParset (const std::string& nameIn,
const std::string& nameOut);
// Convert the input parset (in SAS format) to the output parset
// (in cimager format).
// The output parset is written if the output name is not empty.
- static ACC::APS::ParameterSet convertParset (const ACC::APS::ParameterSet&,
+ static ParameterSet convertParset (const ParameterSet&,
const std::string& nameOut);
// Append the parameters of in to the output.
@@ -57,8 +57,8 @@ namespace LOFAR {
// Parameter names in the <src>old2newNameMap</src> are renamed.
// Parameters defined in the <src>defaults</src> are written in the output
// if not defined in the input.
- static void convert (ACC::APS::ParameterSet& out,
- const ACC::APS::ParameterSet& in,
+ static void convert (ParameterSet& out,
+ const ParameterSet& in,
const std::map<std::string,std::string>& old2NewNameMap,
const std::map<std::string,std::string>& defaults,
const std::string& prefix);
diff --git a/CEP/Imager/MWImager/src/ConvertParset.cc b/CEP/Imager/MWImager/src/ConvertParset.cc
index 3c4b5913c58..53eca38d271 100644
--- a/CEP/Imager/MWImager/src/ConvertParset.cc
+++ b/CEP/Imager/MWImager/src/ConvertParset.cc
@@ -28,7 +28,6 @@
#include <iostream>
using namespace std;
-using namespace LOFAR::ACC::APS;
namespace LOFAR {
@@ -65,18 +64,18 @@ namespace LOFAR {
}
}
- ACC::APS::ParameterSet MWImager::convertParset (const string& nameIn,
+ ParameterSet MWImager::convertParset (const string& nameIn,
const string& nameOut)
{
- return convertParset (ACC::APS::ParameterSet(nameIn), nameOut);
+ return convertParset (ParameterSet(nameIn), nameOut);
}
- ACC::APS::ParameterSet MWImager::convertParset (const ACC::APS::ParameterSet& parset,
+ ParameterSet MWImager::convertParset (const ParameterSet& parset,
const string& nameOut)
{
map<string,string> emptyMap;
- ACC::APS::ParameterSet out;
- ACC::APS::ParameterSet in (parset);
+ ParameterSet out;
+ ParameterSet in (parset);
// The output name is the base MS name minus the possible extension
// and directory.
string outname = in.getString ("dataset");
@@ -90,7 +89,7 @@ namespace LOFAR {
}
// Convert the gridder keywords.
{
- ACC::APS::ParameterSet grin = in.makeSubset ("Gridder.");
+ ParameterSet grin = in.makeSubset ("Gridder.");
in.subtractSubset ("Gridder.");
// Get the gridder type.
string type = grin.getString ("type");
@@ -100,7 +99,7 @@ namespace LOFAR {
}
// Convert the solver keywords.
{
- ACC::APS::ParameterSet soin = in.makeSubset ("Solver.");
+ ParameterSet soin = in.makeSubset ("Solver.");
in.subtractSubset ("Solver.");
// Get the solver type (dirty, clean).
string type = soin.getString ("type");
@@ -111,7 +110,7 @@ namespace LOFAR {
}
// Convert the images keywords.
{
- ACC::APS::ParameterSet imin = in.makeSubset ("Images.");
+ ParameterSet imin = in.makeSubset ("Images.");
in.subtractSubset ("Images.");
// Combine ra,dec,type into a single string.
string angle1 = imin.getString ("ra");
diff --git a/CEP/MS/configure.in b/CEP/MS/configure.in
index 6f6ae320996..12edfe76b72 100644
--- a/CEP/MS/configure.in
+++ b/CEP/MS/configure.in
@@ -56,7 +56,6 @@ lofar_AIPSPP(1,"-lms -lmeasures -ltables -lscimath -lscimath_f -lcasa")
lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
lofar_INTERNAL(LCS/Blob,Blob,,1,Blob/BlobHeader.h,,)
lofar_INTERNAL(LCS/Transport,Transport,,1,Transport/DataHolder.h,,)
-lofar_INTERNAL(LCS/ACC/APS,APS,,1,APS/ParameterSet.h,,)
lofar_INTERNAL(CEP/Imager/MWCommon,MWCommon,,1,MWCommon/ClusterDesc.h,,)
dnl
diff --git a/CEP/MS/src/combinevds.cc b/CEP/MS/src/combinevds.cc
index 2f32d2fdb70..4de5867259e 100644
--- a/CEP/MS/src/combinevds.cc
+++ b/CEP/MS/src/combinevds.cc
@@ -23,14 +23,15 @@
#include <lofar_config.h>
#include <MWCommon/VdsDesc.h>
#include <Common/LofarLogger.h>
+#include <Common/ParameterSet.h>
#include <casa/OS/Path.h>
-#include<stdexcept>
+#include <stdexcept>
#include <iostream>
#include <fstream>
using namespace std;
+using namespace LOFAR;
using namespace LOFAR::CEP;
-using LOFAR::ACC::APS::ParameterSet;
int main(int argc, const char* argv[])
{
diff --git a/CEP/MS/src/makems.cc b/CEP/MS/src/makems.cc
index dd220fddd81..4ede277af58 100644
--- a/CEP/MS/src/makems.cc
+++ b/CEP/MS/src/makems.cc
@@ -26,7 +26,7 @@
#include <MS/DH_MSMake.h>
#include <MS/MSCreate.h>
#include <MS/MSDesc.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Blob/BlobOBufStream.h>
#include <Blob/BlobOStream.h>
#include <Blob/BlobArray.h>
@@ -48,7 +48,6 @@
#include <sstream>
using namespace LOFAR;
-using namespace ACC;
using namespace casa;
using namespace std;
@@ -188,7 +187,7 @@ void createMSSeq (const string& msName, int seqnr,
void doMaster (bool send)
{
- APS::ParameterSet params ("makems.cfg");
+ ParameterSet params ("makems.cfg");
// Get the various parameters.
double startFreq = params.getDouble ("StartFreq");
double stepFreq = params.getDouble ("StepFreq");
diff --git a/JAVA/CEP/jParmFacade/configure.in b/JAVA/CEP/jParmFacade/configure.in
index da547a72f43..1cf74cecaa8 100644
--- a/JAVA/CEP/jParmFacade/configure.in
+++ b/JAVA/CEP/jParmFacade/configure.in
@@ -65,7 +65,6 @@ lofar_INTERNAL(CEP/BB/ParmDB,ParmDB,,1,ParmDB/ParmDB.h,,)
lofar_INTERNAL(CEP/BB/BBSKernel,BBSKernel,,1,BBSKernel/MNS/MeqParmFunklet.h)
lofar_INTERNAL(CEP/BB/ParmFacade,ParmFacade,,1,ParmFacade/ParmFacade.h,,)
lofar_INTERNAL(CEP/BB/MS,MS,,1,MS/MSDesc.h,bbms)
-lofar_INTERNAL(LCS/ACC/APS,APS,,1,APS/ParameterSet.h)
lofar_INTERNAL(LCS/Transport,Transport,,1,Transport/TransportHolder.h,,)
lofar_INTERNAL(LCS/Blob,Blob,,1,Blob/BlobHeader.h,,)
lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
diff --git a/LCS/ACC/APS/APS.spec.in b/LCS/ACC/APS/APS.spec.in
deleted file mode 100644
index 515fb6f8bcc..00000000000
--- a/LCS/ACC/APS/APS.spec.in
+++ /dev/null
@@ -1,162 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# APS.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: APS contains a class for managing (startup) parameters for an application.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-#Requires: Common >= 3.0
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-APS is the package that handles the (startup) parameters of an application.
-Although it is designed to coorporae with the OTDB from SAS it can be used
-as a stand-alone library.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
- echo
- echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
- echo @ @
- echo @ RPM_BUILD_ROOT is not what I expected. Please clean it yourself. @
- echo @ @
- echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
- echo
-else
- echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
- rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
- echo
- echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
- echo @ @
- echo @ RPM_BUILD_ROOT is not what I expected. Please clean it yourself. @
- echo @ @
- echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
- echo
-else
- echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
- rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/LCS/ACC/APS/CMakeLists.txt b/LCS/ACC/APS/CMakeLists.txt
deleted file mode 100644
index 98df6077c6c..00000000000
--- a/LCS/ACC/APS/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-## ------------------------------------------------------------------------------
-## Project characteristics
-
-project (APS)
-
-cmake_minimum_required (VERSION 2.5)
-
-## ------------------------------------------------------------------------------
-## Directories to be included in the build
-
-add_subdirectory (include)
-add_subdirectory (src)
-#add_subdirectory (test)
diff --git a/LCS/ACC/APS/Makefile.am b/LCS/ACC/APS/Makefile.am
deleted file mode 100644
index 13a42b9a7bd..00000000000
--- a/LCS/ACC/APS/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=src test include
-
-ACLOCAL_AMFLAGS = -I $(top_srcdir)/autoconf_share
-
-pkgextdir = $(prefix)/config/$(PACKAGE)
-pkgext_DATA = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-DISTCHECK_CONFIGURE_FLAGS=\
- --with-common=$(prefix)
-
-EXTRA_DIST = \
- Makefile.common \
- APS.spec \
- autoconf_share/compiletool
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/ACC/APS/bootstrap b/LCS/ACC/APS/bootstrap
deleted file mode 100755
index 06f18cde1db..00000000000
--- a/LCS/ACC/APS/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/LCS/ACC/APS/configure.in b/LCS/ACC/APS/configure.in
deleted file mode 100644
index c56d4758c55..00000000000
--- a/LCS/ACC/APS/configure.in
+++ /dev/null
@@ -1,66 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(APS, 2.1, no-define)
-
-dnl
-dnl Initialize for LOFAR (may set compilers)
-dnl
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_YACC
-AC_PROG_CC
-AC_PROG_CXX
-AM_PROG_LEX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-
-dnl Checks for libraries.
-
-dnl dnl Replace `main' with a function in -lfl:
-dnl AC_CHECK_LIB(fl, main)
-dnl dnl Replace `main' with a function in -lcosev_r:
-dnl AC_CHECK_LIB(cosev_r, main)
-dnl dnl Replace `main' with a function in -lcosnm_r:
-dnl AC_CHECK_LIB(cosnm_r, main)
-dnl dnl Replace `main' with a function in -lorb_r:
-dnl AC_CHECK_LIB(orb_r, main)
-dnl dnl Replace `main' with a function in -lpthread:
-dnl AC_CHECK_LIB(pthread, main)
-dnl dnl Replace `main' with a function in -lvport_r:
-dnl AC_CHECK_LIB(vport_r, main)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-include/Makefile
-include/APS/Makefile
-Makefile
-src/Makefile
-test/Makefile
-APS.spec
-)
diff --git a/LCS/ACC/APS/include/APS/Exceptions.h b/LCS/ACC/APS/include/APS/Exceptions.h
deleted file mode 100644
index 89caffa0cf6..00000000000
--- a/LCS/ACC/APS/include/APS/Exceptions.h
+++ /dev/null
@@ -1,51 +0,0 @@
-//# Exceptions.h: Implements a map of Key-Value pairs.
-//#
-//# Copyright (C) 2002-2003
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
-//#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
-//# (at your option) any later version.
-//#
-//# This program is distributed in the hope that it will be useful,
-//# but WITHOUT ANY WARRANTY; without even the implied warranty of
-//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-//# GNU General Public License for more details.
-//#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//#
-//# Note: This source is read best with tabstop 4.
-//#
-//# $Id$
-
-#ifndef LOFAR_APS_EXCEPTIONS_H
-#define LOFAR_APS_EXCEPTIONS_H
-
-#include <Common/Exception.h>
-
-namespace LOFAR
-{
- namespace ACC
- {
- namespace APS
- {
- // \addtogroup APS
- // @{
-
- // An APSException will be thrown when something goes awry in the
- // ParameterSet classes.
- EXCEPTION_CLASS(APSException, LOFAR::Exception);
-
- // @}
-
- } // namespace APS
-
- } // namespace ACC
-
-} // namespace LOFAR
-
-#endif
diff --git a/LCS/ACC/APS/include/APS/Makefile.am b/LCS/ACC/APS/include/APS/Makefile.am
deleted file mode 100644
index 283f5c3e52b..00000000000
--- a/LCS/ACC/APS/include/APS/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-pkginclude_HEADERS = Package__Version.h \
- Exceptions.h \
- KVpair.h \
- ParameterValue.h \
- ParameterSet.h \
- ParameterSetImpl.h
-
-
-noinst_HEADERS =
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/ACC/APS/include/Makefile.am b/LCS/ACC/APS/include/Makefile.am
deleted file mode 100644
index 371dd9b4812..00000000000
--- a/LCS/ACC/APS/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = APS
-
-include $(top_srcdir)/Makefile.common
diff --git a/LCS/ACC/APS/package.dox b/LCS/ACC/APS/package.dox
deleted file mode 100644
index 129c3aa204e..00000000000
--- a/LCS/ACC/APS/package.dox
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// \ingroup ACC
-// \defgroup APS Application ParameterSet (APS)
-//
-// Class for managing (startup) parameters.
-//
-
diff --git a/LCS/ACC/APS/src/CMakeLists.txt b/LCS/ACC/APS/src/CMakeLists.txt
deleted file mode 100644
index 4b307da67a0..00000000000
--- a/LCS/ACC/APS/src/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-## ------------------------------------------------------------------------------
-## Build the library
-
-file (GLOB libaps_SOURCES *.cc )
-
-add_library (aps ${libaps_SOURCES})
-
-## ------------------------------------------------------------------------------
-## Installation
-
-install (
- TARGETS aps
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
- )
-
diff --git a/LCS/ACC/APS/src/Makefile.am b/LCS/ACC/APS/src/Makefile.am
deleted file mode 100644
index 3019ddb185b..00000000000
--- a/LCS/ACC/APS/src/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-lib_LTLIBRARIES = libaps.la
-
-libaps_la_SOURCES = Package__Version.cc \
- KVpair.cc \
- ParameterSet.cc \
- ParameterSetImpl.cc \
- ParameterValue.cc
-
-bin_PROGRAMS = getparsetvalue versionaps
-
-getparsetvalue_SOURCES = getparsetvalue.cc
-getparsetvalue_LDADD = libaps.la
-getparsetvalue_DEPENDENCIES = libaps.la $(LOFAR_DEPEND)
-
-versionaps_SOURCES = versionaps.cc
-versionaps_LDADD = libaps.la
-versionaps_DEPENDENCIES = libaps.la $(LOFAR_DEPEND)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/LCS/ACC/APS/test/Makefile.am b/LCS/ACC/APS/test/Makefile.am
deleted file mode 100644
index 2885304951e..00000000000
--- a/LCS/ACC/APS/test/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-
-check_PROGRAMS = tParameterValue tParameterSet tParameterSetPerf
-
-tParameterValue_SOURCES = tParameterValue.cc
-tParameterSet_SOURCES = tParameterSet.cc
-tParameterSetPerf_SOURCES= tParameterSetPerf.cc
-
-LDADD = ../src/libaps.la
-DEPENDENCIES = ../src/libaps.la $(LOFAR_DEPEND)
-
-TESTSCRIPTS = tParameterValue.sh \
- tParameterSet.sh \
- tParameterSetPerf.sh \
- tgetparsetvalue.sh
-
-TESTS = $(TESTSCRIPTS)
-
-
-EXTRA_DIST = tParameterSet.in_merge_nocase \
- tParameterSet.in_merge_normal \
- tParameterSet.in_param_nocase \
- tParameterSet.in_param_normal \
- tParameterSet.log_prop \
- tParameterSet.stdout \
- tParameterSetPerf.run \
- tgetparsetvalue.run \
- tgetparsetvalue.parset \
- tgetparsetvalue.stdout \
- $(TESTSCRIPTS)
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/LCS/ACC/APS/test/newset.stdout b/LCS/ACC/APS/test/newset.stdout
deleted file mode 100644
index 3bb562169a9..00000000000
--- a/LCS/ACC/APS/test/newset.stdout
+++ /dev/null
@@ -1,13 +0,0 @@
-a.b=0..3
-a.b.c=5
-a.b.c.d.e.f.g.h=tjee wat een levels!
-a.b.d=7
-a.b.double=3.1415926535897932384626433832795
-a.b.lange_naam="dit is nu een andere naam geworden met extra spaties aan het einde "
-a.b.time1=15 s
-a.b.time2=15m
-a.b.time3=15 hour
-a.c.a=nog een afkorting
-e.g=een voorbeeld
-egg=een ei
-vtest.intVector1Dim=[ 3, "20485", 002, '4904' , 25 ]
diff --git a/LCS/ACC/PLC/configure.in b/LCS/ACC/PLC/configure.in
index c229a60e2ca..9256edba042 100644
--- a/LCS/ACC/PLC/configure.in
+++ b/LCS/ACC/PLC/configure.in
@@ -55,7 +55,6 @@ lofar_MPI(0)
lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
lofar_INTERNAL(LCS/Blob,Blob,,1,Blob/BlobHeader.h,,)
lofar_INTERNAL(LCS/Transport,Transport,,1,Transport/TransportHolder.h,,)
-lofar_INTERNAL(LCS/ACC/APS,APS,,1,APS/ParameterSet.h,,)
lofar_EXTERNAL(boost,1,boost/logic/tribool.hpp,"")
dnl
diff --git a/LCS/ACC/PLC/include/PLC/ProcCtrlCmdLine.h b/LCS/ACC/PLC/include/PLC/ProcCtrlCmdLine.h
index bb4966529b9..518f453c52b 100644
--- a/LCS/ACC/PLC/include/PLC/ProcCtrlCmdLine.h
+++ b/LCS/ACC/PLC/include/PLC/ProcCtrlCmdLine.h
@@ -52,7 +52,7 @@ namespace LOFAR
// to ProcessController's member functions; the number of times that
// the run() method will be called is determined by the value of the
// value of the key \c noRuns in \a arg.
- virtual int operator()(const APS::ParameterSet& arg);
+ virtual int operator()(const ParameterSet& arg);
};
// @}
diff --git a/LCS/ACC/PLC/include/PLC/ProcCtrlProxy.h b/LCS/ACC/PLC/include/PLC/ProcCtrlProxy.h
index 3909bb0368f..2045a44bb6a 100644
--- a/LCS/ACC/PLC/include/PLC/ProcCtrlProxy.h
+++ b/LCS/ACC/PLC/include/PLC/ProcCtrlProxy.h
@@ -34,11 +34,11 @@
namespace LOFAR
{
+ //# Forward declarations
+ class ParameterSet;
+
namespace ACC
{
- //# Forward declarations
- namespace APS { class ParameterSet; }
-
namespace PLC
{
//# Forward declarations
@@ -96,7 +96,7 @@ namespace LOFAR
// derived classes.
// \return 0 : success
// \return 1 : failure
- virtual int operator()(const APS::ParameterSet& arg) = 0;
+ virtual int operator()(const ParameterSet& arg) = 0;
private:
// Pointer to the "real" ProcessControl object.
diff --git a/LCS/ACC/PLC/include/PLC/ProcCtrlRemote.h b/LCS/ACC/PLC/include/PLC/ProcCtrlRemote.h
index d5f2bffc610..b48c5662a4f 100644
--- a/LCS/ACC/PLC/include/PLC/ProcCtrlRemote.h
+++ b/LCS/ACC/PLC/include/PLC/ProcCtrlRemote.h
@@ -51,7 +51,7 @@ namespace LOFAR
// Start the process controller. Let it run under control of a
// ProcControlServer.
- virtual int operator()(const APS::ParameterSet& arg);
+ virtual int operator()(const ParameterSet& arg);
};
// @}
diff --git a/LCS/ACC/PLC/src/ACCmain.cc b/LCS/ACC/PLC/src/ACCmain.cc
index c3d9e1a1573..f89cf4205f8 100644
--- a/LCS/ACC/PLC/src/ACCmain.cc
+++ b/LCS/ACC/PLC/src/ACCmain.cc
@@ -27,8 +27,8 @@
#include <libgen.h>
#include <Common/LofarLogger.h>
#include <Common/LofarLocators.h>
-#include <APS/ParameterSet.h>
-#include <APS/Exceptions.h>
+#include <Common/ParameterSet.h>
+#include <Common/Exceptions.h>
#include <PLC/ProcControlServer.h>
#include <PLC/ProcCtrlCmdLine.h>
#include <PLC/ProcCtrlRemote.h>
@@ -41,7 +41,7 @@ namespace LOFAR {
namespace ACC {
namespace PLC {
-using namespace APS;
+using LOFAR::ParameterSet;
//
// ACCmain(argc, argv, procCtrl*)
diff --git a/LCS/ACC/PLC/src/ProcCtrlCmdLine.cc b/LCS/ACC/PLC/src/ProcCtrlCmdLine.cc
index 19bc11062f1..be0a2ee5d97 100644
--- a/LCS/ACC/PLC/src/ProcCtrlCmdLine.cc
+++ b/LCS/ACC/PLC/src/ProcCtrlCmdLine.cc
@@ -26,7 +26,7 @@
//# Includes
#include <PLC/ProcCtrlCmdLine.h>
#include <PLC/PCCmd.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/LofarLogger.h>
namespace LOFAR
@@ -35,7 +35,7 @@ namespace LOFAR
{
namespace PLC
{
- using APS::ParameterSet;
+// using LOFAR::ParameterSet;
//## -------- P u b l i c m e t h o d s -------- ##//
diff --git a/LCS/ACC/PLC/src/ProcCtrlRemote.cc b/LCS/ACC/PLC/src/ProcCtrlRemote.cc
index 67656ae59a7..fdc286bbb46 100644
--- a/LCS/ACC/PLC/src/ProcCtrlRemote.cc
+++ b/LCS/ACC/PLC/src/ProcCtrlRemote.cc
@@ -25,7 +25,7 @@
//# Includes
#include <PLC/ProcCtrlRemote.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/LofarLogger.h>
namespace LOFAR
@@ -34,7 +34,7 @@ namespace LOFAR
{
namespace PLC
{
- using namespace APS;
+ using LOFAR::ParameterSet;
ProcCtrlRemote::ProcCtrlRemote(ProcessControl* aProcCtrl) :
ProcCtrlProxy(aProcCtrl)
diff --git a/LCS/ACC/lofarconf.in b/LCS/ACC/lofarconf.in
index 05612668883..e2ab7286a13 100644
--- a/LCS/ACC/lofarconf.in
+++ b/LCS/ACC/lofarconf.in
@@ -1,3 +1,2 @@
ALC
PLC
-APS
diff --git a/LCS/ApplCommon/configure.in b/LCS/ApplCommon/configure.in
index 83425e3199c..e1e5eddc17f 100644
--- a/LCS/ApplCommon/configure.in
+++ b/LCS/ApplCommon/configure.in
@@ -53,7 +53,6 @@ dnl
lofar_GENERAL
lofar_MPI
lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/APS, APS, , 1, APS/ParameterSet.h,,)
lofar_EXTERNAL(boost,1,boost/date_time/date.hpp, boost_date_time)
dnl
dnl Output Makefiles
diff --git a/LCS/ApplCommon/include/ApplCommon/Observation.h b/LCS/ApplCommon/include/ApplCommon/Observation.h
index cba6a500a02..f119ff99b35 100644
--- a/LCS/ApplCommon/include/ApplCommon/Observation.h
+++ b/LCS/ApplCommon/include/ApplCommon/Observation.h
@@ -29,7 +29,7 @@
//# Never #include <config.h> or #include <lofar_config.h> in a header file!
//# Includes
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/lofar_bitset.h>
#include <Common/lofar_vector.h>
#include <Common/lofar_string.h>
@@ -52,7 +52,7 @@ class Observation
public:
Observation();
~Observation();
- explicit Observation (ACC::APS::ParameterSet* aParSet);
+ explicit Observation (ParameterSet* aParSet);
// global function for converting filtername to nyquist zone
static uint32 nyquistzoneFromFilter(const string& filterName);
diff --git a/LCS/ApplCommon/src/Observation.cc b/LCS/ApplCommon/src/Observation.cc
index 7df08a92a9a..58fa3f83b80 100644
--- a/LCS/ApplCommon/src/Observation.cc
+++ b/LCS/ApplCommon/src/Observation.cc
@@ -31,7 +31,6 @@
#include <Common/lofar_set.h>
namespace LOFAR {
- using namespace ACC::APS;
Observation::Observation() :
name(),
diff --git a/LCS/ApplCommon/test/tObservation.cc b/LCS/ApplCommon/test/tObservation.cc
index 0e99592600b..83dce389278 100644
--- a/LCS/ApplCommon/test/tObservation.cc
+++ b/LCS/ApplCommon/test/tObservation.cc
@@ -25,11 +25,10 @@
//# Includes
#include <Common/LofarLogger.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <ApplCommon/Observation.h>
using namespace LOFAR;
-using namespace LOFAR::ACC::APS;
int main (int argc, char* argv[])
{
diff --git a/LCS/Common/include/Common/Exceptions.h b/LCS/Common/include/Common/Exceptions.h
index 4036e1114d3..f5b3deefc8d 100644
--- a/LCS/Common/include/Common/Exceptions.h
+++ b/LCS/Common/include/Common/Exceptions.h
@@ -49,6 +49,12 @@ namespace LOFAR
//
EXCEPTION_CLASS(NotImplemented, Exception);
+ //
+ // This exception will be thrown when an error occurs in the ParameterSet
+ // classes.
+ //
+ EXCEPTION_CLASS(APSException, Exception);
+
} // namespace ASTRON
#endif
diff --git a/LCS/ACC/APS/include/APS/KVpair.h b/LCS/Common/include/Common/KVpair.h
similarity index 93%
rename from LCS/ACC/APS/include/APS/KVpair.h
rename to LCS/Common/include/Common/KVpair.h
index 8c030d4b874..2cd0a6b16b8 100644
--- a/LCS/ACC/APS/include/APS/KVpair.h
+++ b/LCS/Common/include/Common/KVpair.h
@@ -22,8 +22,8 @@
//#
//# $Id$
-#ifndef LOFAR_APS_KVPAIR_H
-#define LOFAR_APS_KVPAIR_H
+#ifndef LOFAR_COMMON_KVPAIR_H
+#define LOFAR_COMMON_KVPAIR_H
// \file
// Implements a KV pair as a pair<string, string>.
@@ -36,9 +36,7 @@
namespace LOFAR {
- namespace ACC {
- namespace APS {
-// \addtogroup APS
+// \addtogroup Common
// @{
// Implements a KV pair as a pair<string, string>.
@@ -61,8 +59,6 @@ public:
};
// @} addgroup
- } // namespace APS
- } // namespace ACC
} // namespace LOFAR
#endif
diff --git a/LCS/Common/include/Common/Makefile.am b/LCS/Common/include/Common/Makefile.am
index f105b5a3115..0e730a3fcef 100644
--- a/LCS/Common/include/Common/Makefile.am
+++ b/LCS/Common/include/Common/Makefile.am
@@ -24,6 +24,7 @@ pkginclude_HEADERS = Package__Version.h \
FileLocator.h \
hexdump.h \
i4complex.h \
+ KVpair.h \
lofar_algorithm.h \
lofar_bitset.h \
LofarConstants.h \
@@ -56,6 +57,9 @@ pkginclude_HEADERS = Package__Version.h \
lofar_vector.h \
Numeric.h \
ObjectFactory.h \
+ ParameterValue.h \
+ ParameterSet.h \
+ ParameterSetImpl.h \
PrettyUnits.h \
Process.h \
RunOnNode.h \
diff --git a/LCS/ACC/APS/include/APS/ParameterSet.h b/LCS/Common/include/Common/ParameterSet.h
similarity index 99%
rename from LCS/ACC/APS/include/APS/ParameterSet.h
rename to LCS/Common/include/Common/ParameterSet.h
index f0dd23ceafc..bbf71871431 100644
--- a/LCS/ACC/APS/include/APS/ParameterSet.h
+++ b/LCS/Common/include/Common/ParameterSet.h
@@ -22,22 +22,20 @@
//#
//# $Id$
-#ifndef LOFAR_APS_PARAMETERSET_H
-#define LOFAR_APS_PARAMETERSET_H
+#ifndef LOFAR_COMMON_PARAMETERSET_H
+#define LOFAR_COMMON_PARAMETERSET_H
// \file
// Implements a map of Key-Value pairs.
//# Never #include <config.h> or #include <lofar_config.h> in a header file!
//# Includes
-#include <APS/ParameterSetImpl.h>
-#include <APS/KVpair.h>
+#include <Common/ParameterSetImpl.h>
+#include <Common/KVpair.h>
namespace LOFAR {
- namespace ACC {
- namespace APS {
-// \addtogroup APS
+// \addtogroup Common
// @{
//# Description of class.
@@ -818,8 +816,6 @@ inline vector<time_t> ParameterSet::getTimeVector(const string& aKey,
return itsSet->getTimeVector(aKey, aValue, expandable);
}
- } // namespace APS
- } // namespace ACC
} // namespace LOFAR
#endif
diff --git a/LCS/ACC/APS/include/APS/ParameterSetImpl.h b/LCS/Common/include/Common/ParameterSetImpl.h
similarity index 98%
rename from LCS/ACC/APS/include/APS/ParameterSetImpl.h
rename to LCS/Common/include/Common/ParameterSetImpl.h
index 76ebdaa7cc1..e5ece1b32a8 100644
--- a/LCS/ACC/APS/include/APS/ParameterSetImpl.h
+++ b/LCS/Common/include/Common/ParameterSetImpl.h
@@ -22,15 +22,15 @@
//#
//# $Id$
-#ifndef LOFAR_APS_PARAMETERSETIMPL_H
-#define LOFAR_APS_PARAMETERSETIMPL_H
+#ifndef LOFAR_COMMON_PARAMETERSETIMPL_H
+#define LOFAR_COMMON_PARAMETERSETIMPL_H
// \file
// Implements a map of Key-Value pairs.
//# Never #include <config.h> or #include <lofar_config.h> in a header file!
//# Includes
-#include <APS/ParameterValue.h>
+#include <Common/ParameterValue.h>
#include <Common/LofarTypes.h>
#include <Common/lofar_map.h>
#include <Common/lofar_string.h>
@@ -40,9 +40,8 @@
#include <Common/StringUtil.h>
namespace LOFAR {
- namespace ACC {
- namespace APS {
-// \addtogroup APS
+
+// \addtogroup Common
// @{
const char PC_QUAL_STABLE[] = { "stable" };
@@ -57,7 +56,7 @@ typedef StringUtil::Compare KeyCompare;
// A key/value map is defined as a map of strings. The third template
// parameter, \c KeyCompare, is the string comparison functor that will be
// used to compare keys.
-typedef map <string, ParameterValue, KeyCompare> KeyValueMap;
+typedef map <string, ParameterValue, KeyCompare> KVMap;
//# Description of class.
// The ParameterSetImpl class is a key-value implementation of the type
@@ -67,11 +66,11 @@ typedef map <string, ParameterValue, KeyCompare> KeyValueMap;
// A couple of getXxx routines are provided to convert the strings to the
// desired type.
//
-class ParameterSetImpl : public KeyValueMap
+class ParameterSetImpl : public KVMap
{
public:
- typedef KeyValueMap::iterator iterator;
- typedef KeyValueMap::const_iterator const_iterator;
+ typedef KVMap::iterator iterator;
+ typedef KVMap::const_iterator const_iterator;
// \name Construction and Destruction
// A ParameterSetImpl can be constructed as empty collection, can be
@@ -598,8 +597,6 @@ inline time_t ParameterSetImpl::getTime(const string& aKey, const time_t& aValue
return it->second.getTime();
}
- } // namespace APS
- } // namespace ACC
} // namespace LOFAR
#endif
diff --git a/LCS/ACC/APS/include/APS/ParameterValue.h b/LCS/Common/include/Common/ParameterValue.h
similarity index 97%
rename from LCS/ACC/APS/include/APS/ParameterValue.h
rename to LCS/Common/include/Common/ParameterValue.h
index ad4050a3c0b..36c28056bcd 100644
--- a/LCS/ACC/APS/include/APS/ParameterValue.h
+++ b/LCS/Common/include/Common/ParameterValue.h
@@ -20,8 +20,8 @@
//#
//# $Id$
-#ifndef LOFAR_APS_PARAMETERVALUE_H
-#define LOFAR_APS_PARAMETERVALUE_H
+#ifndef LOFAR_COMMON_PARAMETERVALUE_H
+#define LOFAR_COMMON_PARAMETERVALUE_H
// \file
// The value of a parameter
@@ -33,7 +33,7 @@
#include <Common/lofar_vector.h>
#include <Common/StringUtil.h>
-namespace LOFAR { namespace ACC { namespace APS {
+namespace LOFAR {
class ParameterValue
{
@@ -168,6 +168,6 @@ namespace LOFAR { namespace ACC { namespace APS {
string itsValue;
};
-}}}
+}
#endif
diff --git a/LCS/ACC/APS/src/KVpair.cc b/LCS/Common/src/KVpair.cc
similarity index 96%
rename from LCS/ACC/APS/src/KVpair.cc
rename to LCS/Common/src/KVpair.cc
index 409a5b4b3e3..76ecf2bdca5 100644
--- a/LCS/ACC/APS/src/KVpair.cc
+++ b/LCS/Common/src/KVpair.cc
@@ -26,12 +26,10 @@
//# Includes
#include<Common/LofarLogger.h>
#include<Common/StringUtil.h>
-#include<APS/KVpair.h>
+#include<Common/KVpair.h>
#include<time.h>
namespace LOFAR {
- namespace ACC {
- namespace APS {
#define OPTIONAL_TIMESTAMP \
if (genTimestamp) { \
@@ -108,6 +106,4 @@ KVpair& KVpair::operator=(const KVpair& that)
}
- } // namespace APS
- } // namespace ACC
} // namespace LOFAR
diff --git a/LCS/Common/src/Makefile.am b/LCS/Common/src/Makefile.am
index e1a81212ebd..c90b32fdfa3 100644
--- a/LCS/Common/src/Makefile.am
+++ b/LCS/Common/src/Makefile.am
@@ -14,10 +14,14 @@ libcommon_la_SOURCES = Package__Version.cc \
Exception.cc \
FileLocator.cc \
hexdump.cc \
+ KVpair.cc \
lofar_bitset.cc \
LofarLogCout.cc \
LofarLogger.cc \
Numeric.cc \
+ ParameterSet.cc \
+ ParameterSetImpl.cc \
+ ParameterValue.cc \
PrettyUnits.cc \
Process.cc \
RunOnNode.cc \
@@ -37,10 +41,14 @@ if HAVE_SHMEM
libcommon_la_LIBADD = shmem/libshmem.la
endif
-bin_PROGRAMS = versioncommon
+bin_PROGRAMS = versioncommon getparsetvalue
versioncommon_SOURCES = versioncommon.cc
versioncommon_LDADD = libcommon.la
versioncommon_DEPENDENCIES = libcommon.la $(LOFAR_DEPEND)
+getparsetvalue_SOURCES = getparsetvalue.cc
+getparsetvalue_LDADD = libcommon.la
+getparsetvalue_DEPENDENCIES = libcommon.la $(LOFAR_DEPEND)
+
include $(top_srcdir)/Makefile.common
diff --git a/LCS/ACC/APS/src/ParameterSet.cc b/LCS/Common/src/ParameterSet.cc
similarity index 96%
rename from LCS/ACC/APS/src/ParameterSet.cc
rename to LCS/Common/src/ParameterSet.cc
index 3a77a7450e4..9d24c667267 100644
--- a/LCS/ACC/APS/src/ParameterSet.cc
+++ b/LCS/Common/src/ParameterSet.cc
@@ -24,14 +24,12 @@
#include <lofar_config.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/LofarLogger.h>
#include <Common/lofar_fstream.h>
namespace LOFAR {
- namespace ACC {
- namespace APS {
//-------------------------- creation and destroy ---------------------------
static ParameterSet* globalParameterSetInstance = 0;
@@ -122,6 +120,4 @@ std::ostream& operator<< (std::ostream& os, const ParameterSet &thePS)
return os;
}
- } // namespace APS
- } // namespace ACC
} // namespace LOFAR
diff --git a/LCS/ACC/APS/src/ParameterSetImpl.cc b/LCS/Common/src/ParameterSetImpl.cc
similarity index 98%
rename from LCS/ACC/APS/src/ParameterSetImpl.cc
rename to LCS/Common/src/ParameterSetImpl.cc
index 460841c6572..ab314fc8981 100644
--- a/LCS/ACC/APS/src/ParameterSetImpl.cc
+++ b/LCS/Common/src/ParameterSetImpl.cc
@@ -23,8 +23,8 @@
//# Always #include <lofar_config.h> first!
#include <lofar_config.h>
-#include <APS/ParameterSetImpl.h>
-#include <APS/Exceptions.h>
+#include <Common/ParameterSetImpl.h>
+#include <Common/Exceptions.h>
#include <Common/LofarLogger.h>
#include <Common/lofar_fstream.h>
#include <Common/StreamUtil.h>
@@ -32,17 +32,13 @@
#include <string>
namespace LOFAR {
- namespace ACC {
- namespace APS {
-
- using LOFAR::operator<<;
//-------------------------- creation and destroy ---------------------------
//
// Default constructor
//
ParameterSetImpl::ParameterSetImpl(KeyCompare::Mode mode)
- : KeyValueMap(mode),
+ : KVMap(mode),
itsCount (1),
itsMode(mode)
{}
@@ -52,7 +48,7 @@ ParameterSetImpl::ParameterSetImpl(KeyCompare::Mode mode)
//
ParameterSetImpl::ParameterSetImpl(const string& theFilename,
KeyCompare::Mode mode)
- : KeyValueMap(mode),
+ : KVMap(mode),
itsCount (1),
itsMode(mode)
{
@@ -642,6 +638,4 @@ string ParameterSetImpl::locateModule(const string& shortKey) const
return ("");
}
- } // namespace APS
- } // namespace ACC
} // namespace LOFAR
diff --git a/LCS/ACC/APS/src/ParameterValue.cc b/LCS/Common/src/ParameterValue.cc
similarity index 97%
rename from LCS/ACC/APS/src/ParameterValue.cc
rename to LCS/Common/src/ParameterValue.cc
index 11f5f16d110..4c184a853bf 100644
--- a/LCS/ACC/APS/src/ParameterValue.cc
+++ b/LCS/Common/src/ParameterValue.cc
@@ -21,13 +21,13 @@
//# $Id$
#include<lofar_config.h>
-#include <APS/ParameterValue.h>
-#include <APS/Exceptions.h>
+#include <Common/ParameterValue.h>
+#include <Common/Exceptions.h>
#include <Common/LofarLogger.h>
-namespace LOFAR { namespace ACC { namespace APS {
+namespace LOFAR {
- ParameterValue::ParameterValue (const string& value, bool trim)
+ ParameterValue::ParameterValue (const string& value, bool trim)
: itsValue (value)
{
if (trim) {
@@ -38,7 +38,7 @@ namespace LOFAR { namespace ACC { namespace APS {
}
}
}
-
+
ParameterValue ParameterValue::expand() const
{
return ParameterValue (expandArrayString (itsValue));
@@ -285,4 +285,4 @@ time_t ParameterValue::StringToTime_t (const string& aString)
return theTime;
}
-}}}
+}
diff --git a/LCS/ACC/APS/src/getparsetvalue.cc b/LCS/Common/src/getparsetvalue.cc
similarity index 96%
rename from LCS/ACC/APS/src/getparsetvalue.cc
rename to LCS/Common/src/getparsetvalue.cc
index ce8603f00c7..18504ebe165 100644
--- a/LCS/ACC/APS/src/getparsetvalue.cc
+++ b/LCS/Common/src/getparsetvalue.cc
@@ -23,7 +23,7 @@
//# Always #include <lofar_config.h> first!
#include <lofar_config.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/LofarLogger.h>
#include <stdexcept>
#include <iostream>
@@ -44,7 +44,7 @@ int main (int argc, const char* argv[])
iss >> inx;
useAll = false;
}
- LOFAR::ACC::APS::ParameterSet parset(argv[1]);
+ LOFAR::ParameterSet parset(argv[1]);
if (useAll) {
std::string value = parset.getString (argv[2]);
std::cout << value << std::endl;
diff --git a/LCS/Common/test/Makefile.am b/LCS/Common/test/Makefile.am
index 616c5567aa5..9e71d41559d 100644
--- a/LCS/Common/test/Makefile.am
+++ b/LCS/Common/test/Makefile.am
@@ -4,6 +4,7 @@ CHECKTOOLPROGS = testLogger tAllocator tDataConvert \
tHexdump testSocket tComplex tProcess \
tRunOnNode tTimer tNumeric tSingleton \
tObjectFactory tSystemUtil tSaxpy tPrettyUnits \
+ tParameterValue tParameterSet tParameterSetPerf \
tBacktrace
check_PROGRAMS = $(CHECKTOOLPROGS)
@@ -12,7 +13,9 @@ TESTSCRIPTS = testLogger.sh tAllocator.sh tDataConvert.sh \
tFileLocator.sh tStringUtil.sh tStreamUtil.sh \
tHexdump.sh testSocket.sh tComplex.sh tProcess.sh \
tRunOnNode.sh tTimer.sh tNumeric.sh tSingleton.sh \
- tObjectFactory.sh tPrettyUnits.sh
+ tObjectFactory.sh tPrettyUnits.sh \
+ tParameterValue.sh tParameterSet.sh \
+ tParameterSetPerf.sh tgetparsetvalue.sh
TESTS = $(TESTSCRIPTS)
@@ -31,81 +34,31 @@ EXTRA_DIST = $(TESTSCRIPTS) \
tObjectFactory.stdout tPrettyUnits.stdout
testLogger_SOURCES = testLogger.cc
-testLogger_LDADD = ../src/libcommon.la
-testLogger_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-
tAllocator_SOURCES = tAllocator.cc
-tAllocator_LDADD = ../src/libcommon.la
-tAllocator_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-
tDataConvert_SOURCES = tDataConvert.cc
-tDataConvert_LDADD = ../src/libcommon.la
-tDataConvert_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-
tFileLocator_SOURCES = tFileLocator.cc
-tFileLocator_LDADD = ../src/libcommon.la
-tFileLocator_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-
tStringUtil_SOURCES = tStringUtil.cc
-tStringUtil_LDADD = ../src/libcommon.la
-tStringUtil_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-
tStreamUtil_SOURCES = tStreamUtil.cc
-tStreamUtil_LDADD = ../src/libcommon.la
-tStreamUtil_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-
tHexdump_SOURCES = tHexdump.cc
-tHexdump_LDADD = ../src/libcommon.la
-tHexdump_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-
testSocket_SOURCES = testSocket.cc
-testSocket_LDADD = ../src/libcommon.la
-testSocket_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-
tComplex_SOURCES = tComplex.cc
-tComplex_LDADD = ../src/libcommon.la
-tComplex_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-
tProcess_SOURCES = tProcess.cc
-tProcess_LDADD = ../src/libcommon.la
-tProcess_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-
tRunOnNode_SOURCES = tRunOnNode.cc
-tRunOnNode_LDADD = ../src/libcommon.la
-tRunOnNode_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-
tTimer_SOURCES = tTimer.cc
-tTimer_LDADD = ../src/libcommon.la
-tTimer_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-
tNumeric_SOURCES = tNumeric.cc
-tNumeric_LDADD = ../src/libcommon.la
-tNumeric_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-
tSingleton_SOURCES = tSingleton.cc
-tSingleton_LDADD = ../src/libcommon.la
-tSingleton_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-
tObjectFactory_SOURCES = tObjectFactory.cc \
Shapes.h Shapes.cc \
Coordinates.h Coordinates.cc
-tObjectFactory_LDADD = ../src/libcommon.la
-tObjectFactory_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-
tSystemUtil_SOURCES = tSystemUtil.cc
-tSystemUtil_LDADD = ../src/libcommon.la
-tSystemUtil_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-
tSaxpy_SOURCES = tSaxpy.cc
-tSaxpy_LDADD = ../src/libcommon.la
-tSaxpy_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-
tPrettyUnits_SOURCES = tPrettyUnits.cc
-tPrettyUnits_LDADD = ../src/libcommon.la
-tPrettyUnits_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-
tBacktrace_SOURCES = tBacktrace.cc
-tBacktrace_LDADD = ../src/libcommon.la
-tBacktrace_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
+tParameterValue_SOURCES = tParameterValue.cc
+tParameterSet_SOURCES = tParameterSet.cc
+tParameterSetPerf_SOURCES = tParameterSetPerf.cc
+
+LDADD = ../src/libcommon.la
+DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
include $(top_srcdir)/Makefile.common
diff --git a/LCS/ACC/APS/test/nocase2normal.sed b/LCS/Common/test/nocase2normal.sed
similarity index 100%
rename from LCS/ACC/APS/test/nocase2normal.sed
rename to LCS/Common/test/nocase2normal.sed
diff --git a/LCS/ACC/APS/test/tParameterSet.cc b/LCS/Common/test/tParameterSet.cc
similarity index 99%
rename from LCS/ACC/APS/test/tParameterSet.cc
rename to LCS/Common/test/tParameterSet.cc
index 3e8e237cfe0..d3450f4ff6e 100644
--- a/LCS/ACC/APS/test/tParameterSet.cc
+++ b/LCS/Common/test/tParameterSet.cc
@@ -26,8 +26,8 @@
#include <Common/lofar_iostream.h>
#include <iterator>
-#include <APS/ParameterSet.h>
-#include <APS/Exceptions.h>
+#include <Common/ParameterSet.h>
+#include <Common/Exceptions.h>
#include <Common/LofarLogger.h>
#include <Common/StreamUtil.h>
@@ -36,7 +36,6 @@
using namespace std;
using namespace LOFAR;
-using namespace LOFAR::ACC::APS;
int doIt(KeyCompare::Mode mode)
{
diff --git a/LCS/ACC/APS/test/tParameterSet.in_merge_nocase b/LCS/Common/test/tParameterSet.in_merge_nocase
similarity index 100%
rename from LCS/ACC/APS/test/tParameterSet.in_merge_nocase
rename to LCS/Common/test/tParameterSet.in_merge_nocase
diff --git a/LCS/ACC/APS/test/tParameterSet.in_merge_normal b/LCS/Common/test/tParameterSet.in_merge_normal
similarity index 100%
rename from LCS/ACC/APS/test/tParameterSet.in_merge_normal
rename to LCS/Common/test/tParameterSet.in_merge_normal
diff --git a/LCS/ACC/APS/test/tParameterSet.in_param_nocase b/LCS/Common/test/tParameterSet.in_param_nocase
similarity index 100%
rename from LCS/ACC/APS/test/tParameterSet.in_param_nocase
rename to LCS/Common/test/tParameterSet.in_param_nocase
diff --git a/LCS/ACC/APS/test/tParameterSet.in_param_normal b/LCS/Common/test/tParameterSet.in_param_normal
similarity index 100%
rename from LCS/ACC/APS/test/tParameterSet.in_param_normal
rename to LCS/Common/test/tParameterSet.in_param_normal
diff --git a/LCS/ACC/APS/test/tParameterSet.log_prop b/LCS/Common/test/tParameterSet.log_prop
similarity index 100%
rename from LCS/ACC/APS/test/tParameterSet.log_prop
rename to LCS/Common/test/tParameterSet.log_prop
diff --git a/LCS/ACC/APS/test/tParameterSet.sh b/LCS/Common/test/tParameterSet.sh
similarity index 100%
rename from LCS/ACC/APS/test/tParameterSet.sh
rename to LCS/Common/test/tParameterSet.sh
diff --git a/LCS/ACC/APS/test/tParameterSet.stdout b/LCS/Common/test/tParameterSet.stdout
similarity index 100%
rename from LCS/ACC/APS/test/tParameterSet.stdout
rename to LCS/Common/test/tParameterSet.stdout
diff --git a/LCS/ACC/APS/test/tParameterSetPerf.cc b/LCS/Common/test/tParameterSetPerf.cc
similarity index 97%
rename from LCS/ACC/APS/test/tParameterSetPerf.cc
rename to LCS/Common/test/tParameterSetPerf.cc
index b64b00076c4..29233439b36 100644
--- a/LCS/ACC/APS/test/tParameterSetPerf.cc
+++ b/LCS/Common/test/tParameterSetPerf.cc
@@ -21,12 +21,11 @@
//# $Id$
#include <lofar_config.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/LofarLogger.h>
#include <Common/Timer.h>
using namespace LOFAR;
-using namespace ACC::APS;
void test()
{
diff --git a/LCS/ACC/APS/test/tParameterSetPerf.run b/LCS/Common/test/tParameterSetPerf.run
similarity index 100%
rename from LCS/ACC/APS/test/tParameterSetPerf.run
rename to LCS/Common/test/tParameterSetPerf.run
diff --git a/LCS/ACC/APS/test/tParameterSetPerf.sh b/LCS/Common/test/tParameterSetPerf.sh
similarity index 100%
rename from LCS/ACC/APS/test/tParameterSetPerf.sh
rename to LCS/Common/test/tParameterSetPerf.sh
diff --git a/LCS/ACC/APS/test/tParameterValue.cc b/LCS/Common/test/tParameterValue.cc
similarity index 98%
rename from LCS/ACC/APS/test/tParameterValue.cc
rename to LCS/Common/test/tParameterValue.cc
index 33ef42a331a..18a396156dc 100644
--- a/LCS/ACC/APS/test/tParameterValue.cc
+++ b/LCS/Common/test/tParameterValue.cc
@@ -21,12 +21,11 @@
//# $Id$
#include <lofar_config.h>
-#include <APS/ParameterValue.h>
+#include <Common/ParameterValue.h>
#include <Common/StringUtil.h>
#include <Common/LofarLogger.h>
using namespace LOFAR;
-using namespace ACC::APS;
void testScalar()
{
diff --git a/LCS/ACC/APS/test/tParameterValue.sh b/LCS/Common/test/tParameterValue.sh
similarity index 100%
rename from LCS/ACC/APS/test/tParameterValue.sh
rename to LCS/Common/test/tParameterValue.sh
diff --git a/LCS/ACC/APS/test/tgetparsetvalue.parset b/LCS/Common/test/tgetparsetvalue.parset
similarity index 100%
rename from LCS/ACC/APS/test/tgetparsetvalue.parset
rename to LCS/Common/test/tgetparsetvalue.parset
diff --git a/LCS/ACC/APS/test/tgetparsetvalue.run b/LCS/Common/test/tgetparsetvalue.run
similarity index 100%
rename from LCS/ACC/APS/test/tgetparsetvalue.run
rename to LCS/Common/test/tgetparsetvalue.run
diff --git a/LCS/ACC/APS/test/tgetparsetvalue.sh b/LCS/Common/test/tgetparsetvalue.sh
similarity index 100%
rename from LCS/ACC/APS/test/tgetparsetvalue.sh
rename to LCS/Common/test/tgetparsetvalue.sh
diff --git a/LCS/ACC/APS/test/tgetparsetvalue.stdout b/LCS/Common/test/tgetparsetvalue.stdout
similarity index 100%
rename from LCS/ACC/APS/test/tgetparsetvalue.stdout
rename to LCS/Common/test/tgetparsetvalue.stdout
diff --git a/LCS/pyparameterset/configure.in b/LCS/pyparameterset/configure.in
index 5fd465774c4..02413e834df 100644
--- a/LCS/pyparameterset/configure.in
+++ b/LCS/pyparameterset/configure.in
@@ -54,7 +54,6 @@ dnl
dnl Check for LOFAR specific things
dnl
lofar_GENERAL
-lofar_INTERNAL(LCS/ACC/APS,APS,,1,APS/ParameterSet.h)
lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h)
lofar_INTERNAL(LCS/pytools,pytools,,,,"")
diff --git a/LCS/pyparameterset/src/pyparameterset.cc b/LCS/pyparameterset/src/pyparameterset.cc
index 3f624521070..6af366e6015 100644
--- a/LCS/pyparameterset/src/pyparameterset.cc
+++ b/LCS/pyparameterset/src/pyparameterset.cc
@@ -20,7 +20,7 @@
//# $Id$
#include <lofar_config.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <pyrap/Converters/PycExcp.h>
#include <pyrap/Converters/PycBasicData.h>
@@ -34,7 +34,7 @@
using namespace boost::python;
using namespace casa::pyrap;
-namespace LOFAR { namespace ACC { namespace APS {
+namespace LOFAR {
class PyParameterSet : public ParameterSet
{
@@ -232,7 +232,7 @@ namespace LOFAR { namespace ACC { namespace APS {
;
}
-}}}
+}
// Define the python module itself.
@@ -240,7 +240,7 @@ BOOST_PYTHON_MODULE(_pyparameterset)
{
casa::pyrap::register_convert_excp();
casa::pyrap::register_convert_basicdata();
- casa::pyrap::register_convert_std_vector<LOFAR::ACC::APS::ParameterValue>();
+ casa::pyrap::register_convert_std_vector<ParameterValue>();
casa::pyrap::register_convert_std_vector<bool>();
casa::pyrap::register_convert_std_vector<int>();
casa::pyrap::register_convert_std_vector<float>();
@@ -248,6 +248,6 @@ BOOST_PYTHON_MODULE(_pyparameterset)
casa::pyrap::register_convert_std_vector<std::string>();
// casa::pyrap::register_convert_casa_record();
- LOFAR::ACC::APS::pyparametervalue();
- LOFAR::ACC::APS::pyparameterset();
+ pyparametervalue();
+ pyparameterset();
}
diff --git a/MAC/APL/APLCommon/configure.in b/MAC/APL/APLCommon/configure.in
index 8e05cf7cd76..a68de81ab40 100644
--- a/MAC/APL/APLCommon/configure.in
+++ b/MAC/APL/APLCommon/configure.in
@@ -55,7 +55,6 @@ dnl
lofar_GENERAL
lofar_COMPILETOOLS
lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/APS, APS, , 1, APS/ParameterSet.h,,)
lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,"",)
dnl lofar_EXTERNAL(boost,1,boost/date_time/date.hpp, boost_date_time)
diff --git a/MAC/APL/APLCommon/src/ChildControl.cc b/MAC/APL/APLCommon/src/ChildControl.cc
index c198c4ce2ee..8eb8ad83edc 100644
--- a/MAC/APL/APLCommon/src/ChildControl.cc
+++ b/MAC/APL/APLCommon/src/ChildControl.cc
@@ -27,7 +27,7 @@
#include <sys/stat.h>
#include <Common/LofarLogger.h>
#include <Common/SystemUtil.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <GCF/TM/GCF_Protocols.h>
#include <MACIO/MACServiceInfo.h>
#include <APL/APLCommon/APLUtilities.h>
@@ -42,7 +42,6 @@ using namespace boost;
namespace LOFAR {
using namespace Deployment;
using namespace GCF::TM;
- using namespace ACC::APS;
namespace APLCommon {
//-------------------------- creation and destroy ---------------------------
diff --git a/MAC/APL/APLCommon/src/ControllerDefines.cc b/MAC/APL/APLCommon/src/ControllerDefines.cc
index 1b024906e5f..9ee4c4a1bfe 100644
--- a/MAC/APL/APLCommon/src/ControllerDefines.cc
+++ b/MAC/APL/APLCommon/src/ControllerDefines.cc
@@ -27,7 +27,7 @@
#include <Common/LofarLogger.h>
#include <Common/StringUtil.h> // rtrim
#include <Common/SystemUtil.h>
-#include <APS/ParameterSet.h> // indexValue
+#include <Common/ParameterSet.h> // indexValue
#include <APL/APLCommon/ControllerDefines.h>
#include <APL/APLCommon/StationInfo.h>
#include "Controller_Protocol.ph"
@@ -165,7 +165,7 @@ bool isSharedController(uint16 cntlrType)
// Get the ObservationNr from the controllername.
uint32 getObservationNr (const string& controllerName)
{
- return (ACC::APS::indexValue(controllerName, "{}"));
+ return (indexValue(controllerName, "{}"));
}
//
@@ -176,7 +176,7 @@ uint16 getInstanceNr (const string& controllerName)
{
string cntlrName (controllerName); // destroyable copy
rtrim(cntlrName, "{}0123456789");
- return (ACC::APS::indexValue(cntlrName, "[]"));
+ return (indexValue(cntlrName, "[]"));
}
//
diff --git a/MAC/APL/APLCommon/src/ParentControl.cc b/MAC/APL/APLCommon/src/ParentControl.cc
index 517ca346815..4e8b9d99cb7 100644
--- a/MAC/APL/APLCommon/src/ParentControl.cc
+++ b/MAC/APL/APLCommon/src/ParentControl.cc
@@ -26,7 +26,7 @@
//# Includes
#include <Common/LofarLogger.h>
#include <Common/SystemUtil.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <GCF/TM/GCF_Protocols.h>
#include <MACIO/MACServiceInfo.h>
#include <APL/APLCommon/APLUtilities.h>
@@ -38,7 +38,6 @@
namespace LOFAR {
using namespace Deployment;
using namespace GCF::TM;
- using namespace ACC::APS;
namespace APLCommon {
typedef struct stateFlow_t {
diff --git a/MAC/APL/CEPCU/configure.in b/MAC/APL/CEPCU/configure.in
index 9ff9ceb7c07..f2d5ac2ca2c 100644
--- a/MAC/APL/CEPCU/configure.in
+++ b/MAC/APL/CEPCU/configure.in
@@ -56,7 +56,6 @@ lofar_GENERAL
lofar_COMPILETOOLS
lofar_PVSS(1)
lofar_INTERNAL(LCS/Common, Common,, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/APS, APS,, 1, APS/ParameterSet.h,,)
lofar_INTERNAL(LCS/ApplCommon, ApplCommon,, 1, ApplCommon/Observation.h,,)
lofar_INTERNAL(LCS/ACC/ALC, ALC,, 1, ALC/ApplControl.h,,)
lofar_INTERNAL(LCS/ACC/PLC, PLC,, 1, PLC/PCCmd.h,,)
diff --git a/MAC/APL/CEPCU/src/ApplController/ACDaemon.h b/MAC/APL/CEPCU/src/ApplController/ACDaemon.h
index eea7a17bc2e..a84c6777b6d 100644
--- a/MAC/APL/CEPCU/src/ApplController/ACDaemon.h
+++ b/MAC/APL/CEPCU/src/ApplController/ACDaemon.h
@@ -33,10 +33,9 @@
#include <Common/Exception.h>
#include <Common/Net/Socket.h>
#include <Common/Net/FdSet.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include "ACRequestPool.h"
-using namespace LOFAR::ACC::APS;
namespace LOFAR {
namespace ACC {
diff --git a/MAC/APL/CEPCU/src/ApplController/ApplController.h b/MAC/APL/CEPCU/src/ApplController/ApplController.h
index e838ede56dc..a8a63fa87ad 100644
--- a/MAC/APL/CEPCU/src/ApplController/ApplController.h
+++ b/MAC/APL/CEPCU/src/ApplController/ApplController.h
@@ -37,7 +37,7 @@
#include <Transport/TH_Socket.h>
#include <ALC/ApplControlServer.h> //# communication stub
#include <PLC/DH_ProcControl.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <MACIO/EventPort.h>
#include "ACCmdImpl.h" //# the real implementation
#include "ACDaemonComm.h"
@@ -47,7 +47,6 @@
#include "ItemList.h"
#include "ProcRuler.h"
-using namespace LOFAR::ACC::APS;
using namespace LOFAR::ACC::ALC;
using namespace LOFAR::ACC::PLC;
diff --git a/MAC/APL/CEPCU/src/ApplController/ConfigurationMgr.cc b/MAC/APL/CEPCU/src/ApplController/ConfigurationMgr.cc
index abe9a95b3ef..a20ebf8fa06 100644
--- a/MAC/APL/CEPCU/src/ApplController/ConfigurationMgr.cc
+++ b/MAC/APL/CEPCU/src/ApplController/ConfigurationMgr.cc
@@ -27,7 +27,7 @@
//# $Id$
#include <Common/LofarLogger.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <PL/TPersistentObject.h>
#include <PL/PersistenceBroker.h>
#include <PL/Attrib.h>
diff --git a/MAC/APL/CEPCU/src/ApplController/ConfigurationMgr.h b/MAC/APL/CEPCU/src/ApplController/ConfigurationMgr.h
index e93ac88baf6..123fc607cba 100644
--- a/MAC/APL/CEPCU/src/ApplController/ConfigurationMgr.h
+++ b/MAC/APL/CEPCU/src/ApplController/ConfigurationMgr.h
@@ -31,9 +31,8 @@
//# Never #include <config.h> or #include <lofar_config.h> in a header file!
#include <Common/lofar_string.h>
#include <PL/PersistenceBroker.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
-using LOFAR::ACC::APS::ParameterSet;
namespace LOFAR {
namespace ACC {
diff --git a/MAC/APL/CEPCU/src/ApplController/ItemList.h b/MAC/APL/CEPCU/src/ApplController/ItemList.h
index f817595792c..590ce6d9923 100644
--- a/MAC/APL/CEPCU/src/ApplController/ItemList.h
+++ b/MAC/APL/CEPCU/src/ApplController/ItemList.h
@@ -31,9 +31,8 @@
//# Never #include <config.h> or #include <lofar_config.h> in a header file!
//# Includes
#include <Common/lofar_vector.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
-using namespace LOFAR::ACC::APS;
namespace LOFAR {
namespace ACC {
diff --git a/MAC/APL/CEPCU/src/ApplController/StateEngine.h b/MAC/APL/CEPCU/src/ApplController/StateEngine.h
index 3b984913dc9..8860093af67 100644
--- a/MAC/APL/CEPCU/src/ApplController/StateEngine.h
+++ b/MAC/APL/CEPCU/src/ApplController/StateEngine.h
@@ -32,9 +32,8 @@
//# Includes
#include <Common/Exception.h>
#include <ALC/DH_ApplControl.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
-using namespace LOFAR::ACC::APS;
using namespace LOFAR::ACC::ALC;
namespace LOFAR {
diff --git a/MAC/APL/CEPCU/src/OfflineControl/OfflineControl.cc b/MAC/APL/CEPCU/src/OfflineControl/OfflineControl.cc
index 2b2c95d971c..2412be7ef3d 100644
--- a/MAC/APL/CEPCU/src/OfflineControl/OfflineControl.cc
+++ b/MAC/APL/CEPCU/src/OfflineControl/OfflineControl.cc
@@ -23,8 +23,8 @@
#include <Common/LofarLogger.h>
#include <boost/shared_array.hpp>
-#include <APS/ParameterSet.h>
-#include <APS/Exceptions.h>
+#include <Common/ParameterSet.h>
+#include <Common/Exceptions.h>
#include <GCF/GCF_PVTypes.h>
#include <GCF/PAL/GCF_PVSSInfo.h>
#include <GCF/Utils.h>
@@ -46,7 +46,6 @@ using namespace std;
namespace LOFAR {
using namespace APLCommon;
- using namespace ACC::APS;
using namespace ACC::ALC;
namespace CEPCU {
@@ -451,7 +450,7 @@ uint16_t OfflineControl::doClaim(const string& cntlrName)
CEPApplicationManagerPtr accClient(new CEPApplicationManager(*this, procName));
itsCepApplications[procName] = accClient;
- ACC::APS::ParameterSet params;
+ ParameterSet params;
params.clear();
// import the ApplCtrl section
params.adoptCollection(globalParameterSet()->makeSubset("ApplCtrl", "ApplCtrl"));
@@ -493,7 +492,7 @@ uint16_t OfflineControl::doPrepare(const string& cntlrName)
try
{
- map<string, ACC::APS::ParameterSet>::iterator it;
+ map<string, ParameterSet>::iterator it;
for(it = itsCepAppParams.begin(); it != itsCepAppParams.end();++it)
{
// only start processes that do not depend on other processes
@@ -518,7 +517,7 @@ uint16_t OfflineControl::doPrepare(const string& cntlrName)
//
void OfflineControl::prepareProcess(const string& cntlrName, const string& procName, const time_t startTime)
{
- map<string, ACC::APS::ParameterSet>::iterator it = itsCepAppParams.find(procName);
+ map<string, ParameterSet>::iterator it = itsCepAppParams.find(procName);
if(it != itsCepAppParams.end()) {
string procName = it->second.getString("ApplCtrl.process[1].ID");
string hostName = it->second.getString("ApplCtrl.hostname");
@@ -592,7 +591,7 @@ void OfflineControl::prepareProcess(const string& cntlrName, const string& procN
void OfflineControl::doRelease(void)
{
try {
- map<string, ACC::APS::ParameterSet>::iterator it;
+ map<string, ParameterSet>::iterator it;
for(it = itsCepAppParams.begin(); it != itsCepAppParams.end();++it) {
string hostName, remoteFile, resultFile, procName;
hostName = it->second.getString("ApplCtrl.hostname");
@@ -650,7 +649,7 @@ void OfflineControl::appBooted(const string& procName, uint16 result)
if (result == (AcCmdMaskOk | AcCmdMaskScheduled))
{
map<string,CEPApplicationManagerPtr>::iterator itApp = itsCepApplications.find(procName);
- map<string, ACC::APS::ParameterSet>::iterator itParam = itsCepAppParams.find(procName);
+ map<string, ParameterSet>::iterator itParam = itsCepAppParams.find(procName);
map<string,time_t>::iterator itStart = itsCepAppStartTimes.find(procName);
if(itApp != itsCepApplications.end() && itParam != itsCepAppParams.end() && itStart != itsCepAppStartTimes.end())
{
@@ -686,7 +685,7 @@ void OfflineControl::appDefined(const string& procName, uint16 result)
if (result == (AcCmdMaskOk | AcCmdMaskScheduled))
{
map<string,CEPApplicationManagerPtr>::iterator itApp = itsCepApplications.find(procName);
- map<string, ACC::APS::ParameterSet>::iterator itParam = itsCepAppParams.find(procName);
+ map<string, ParameterSet>::iterator itParam = itsCepAppParams.find(procName);
map<string,time_t>::iterator itStart = itsCepAppStartTimes.find(procName);
if(itApp != itsCepApplications.end() && itParam != itsCepAppParams.end() && itStart != itsCepAppStartTimes.end())
{
@@ -791,7 +790,7 @@ void OfflineControl::appQuitDone(const string& procName, uint16 result)
// If the list only contains the finished process, the new process can be started
if(itDep->second.size() == 1)
{
- map<string, ACC::APS::ParameterSet>::iterator itParam = itsCepAppParams.find(procName);
+ map<string, ParameterSet>::iterator itParam = itsCepAppParams.find(procName);
if(itParam != itsCepAppParams.end())
{
// boot the process in 30 seconds
@@ -852,7 +851,7 @@ void OfflineControl::appRecovered(const string& procName, uint16 /*result*/)
LOG_INFO_STR("appRecovered from " << procName);
map<string,CEPApplicationManagerPtr>::iterator itApp = itsCepApplications.find(procName);
- map<string, ACC::APS::ParameterSet>::iterator itParam = itsCepAppParams.find(procName);
+ map<string, ParameterSet>::iterator itParam = itsCepAppParams.find(procName);
map<string,time_t>::iterator itStart = itsCepAppStartTimes.find(procName);
if(itApp != itsCepApplications.end() && itParam != itsCepAppParams.end() && itStart != itsCepAppStartTimes.end())
{
diff --git a/MAC/APL/CEPCU/src/OfflineControl/OfflineControl.h b/MAC/APL/CEPCU/src/OfflineControl/OfflineControl.h
index eb543f89fff..85d4a2bbaa6 100644
--- a/MAC/APL/CEPCU/src/OfflineControl/OfflineControl.h
+++ b/MAC/APL/CEPCU/src/OfflineControl/OfflineControl.h
@@ -30,7 +30,7 @@
#include <Common/LofarLogger.h>
//# ACC Includes
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
//# GCF Includes
#include <GCF/RTDB/RTDBPropertySet.h>
@@ -116,8 +116,8 @@ private:
GCFTimerPort* itsTimerPort;
map<string, CEPApplicationManager*> itsCepApplications;
- map<string, ACC::APS::ParameterSet> itsCepAppParams;
- ACC::APS::ParameterSet itsResultParams;
+ map<string, ParameterSet> itsCepAppParams;
+ ParameterSet itsResultParams;
map<string, vector<string> > itsProcessDependencies;
map<string, time_t> itsCepAppStartTimes;
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
index 719fa2a8f90..0fac1b95aed 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
@@ -26,8 +26,8 @@
#include <Common/StreamUtil.h>
//#include <Common/lofar_vector.h>
//#include <Common/lofar_string.h>
-#include <APS/ParameterSet.h>
-#include <APS/Exceptions.h>
+#include <Common/ParameterSet.h>
+#include <Common/Exceptions.h>
#include <GCF/PVSS/GCF_PVTypes.h>
#include <Common/SystemUtil.h>
#include <MACIO/MACServiceInfo.h>
@@ -51,7 +51,6 @@ using namespace std;
namespace LOFAR {
using namespace APLCommon;
- using namespace ACC::APS;
using namespace ACC::ALC;
namespace CEPCU {
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h
index f9dd572fb0a..f459d178767 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h
@@ -30,7 +30,7 @@
#include <Common/LofarLogger.h>
//# ACC Includes
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
//# GCF Includes
#include <GCF/TM/GCF_Control.h>
@@ -130,7 +130,7 @@ private:
GCFTimerPort* itsTimerPort;
CAMmap itsCEPapplications;
- ACC::APS::ParameterSet itsResultParams;
+ ParameterSet itsResultParams;
CTState::CTstateNr itsState;
diff --git a/MAC/APL/CEPCU/test/ApplController/APCmdImpl.h b/MAC/APL/CEPCU/test/ApplController/APCmdImpl.h
index 6d5a37e3595..309d5245fbc 100644
--- a/MAC/APL/CEPCU/test/ApplController/APCmdImpl.h
+++ b/MAC/APL/CEPCU/test/ApplController/APCmdImpl.h
@@ -27,7 +27,7 @@
//# Includes
#include <PLC/ProcessControl.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/lofar_tribool.h>
using namespace LOFAR::ACC::PLC;
diff --git a/MAC/APL/CEPCU/test/ApplController/APExample.cc b/MAC/APL/CEPCU/test/ApplController/APExample.cc
index e6ca4db7191..8a2507945da 100644
--- a/MAC/APL/CEPCU/test/ApplController/APExample.cc
+++ b/MAC/APL/CEPCU/test/ApplController/APExample.cc
@@ -28,12 +28,11 @@
#include <libgen.h>
#include <Common/LofarLogger.h>
#include <PLC/ProcControlServer.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <APCmdImpl.h>
using namespace LOFAR;
using namespace LOFAR::ACC;
-using namespace LOFAR::ACC::APS;
using namespace LOFAR::ACC::PLC;
//
diff --git a/MAC/APL/CEPCU/test/ApplController/APTest.cc b/MAC/APL/CEPCU/test/ApplController/APTest.cc
index 02f7db4daac..f73436313e7 100644
--- a/MAC/APL/CEPCU/test/ApplController/APTest.cc
+++ b/MAC/APL/CEPCU/test/ApplController/APTest.cc
@@ -30,12 +30,11 @@
#include <Common/LofarLogger.h>
#include <Common/LofarLocators.h>
#include <PLC/ProcControlServer.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <APCmdImpl.h>
using namespace LOFAR;
using namespace LOFAR::ACC;
-using namespace LOFAR::ACC::APS;
using namespace LOFAR::ACC::PLC;
//
diff --git a/MAC/APL/CUDaemons/configure.in b/MAC/APL/CUDaemons/configure.in
index cc8a5f0bfa4..1c794935f81 100644
--- a/MAC/APL/CUDaemons/configure.in
+++ b/MAC/APL/CUDaemons/configure.in
@@ -55,7 +55,6 @@ dnl
lofar_GENERAL
lofar_COMPILETOOLS
lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/APS, APS, , 1, APS/ParameterSet.h,,)
lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,"kvt_protocol log_protocol macio",)
lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,,)
lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, , 1, APL/APLCommon/APL_Defines.h,,)
diff --git a/MAC/APL/CUDaemons/src/LoggingClient/LoggingClient.cc b/MAC/APL/CUDaemons/src/LoggingClient/LoggingClient.cc
index 7f038dcee13..e4f0b0b7e98 100644
--- a/MAC/APL/CUDaemons/src/LoggingClient/LoggingClient.cc
+++ b/MAC/APL/CUDaemons/src/LoggingClient/LoggingClient.cc
@@ -24,7 +24,7 @@
#include <Common/LofarLogger.h>
#include <Common/lofar_fstream.h>
#include <Common/Version.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
//#include <GCF/PVSS/GCF_PVTypes.h>
#include <MACIO/MACServiceInfo.h>
#include <MACIO/LOG_Protocol.ph>
@@ -36,7 +36,6 @@
using namespace log4cplus;
using namespace log4cplus::helpers;
namespace LOFAR {
- using namespace ACC::APS;
using namespace GCF::TM;
namespace CUDaemons {
diff --git a/MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.cc b/MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.cc
index 93474f6c867..ea1a628b016 100644
--- a/MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.cc
+++ b/MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.cc
@@ -26,7 +26,7 @@
#include <Common/lofar_fstream.h>
#include <Common/Version.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <MACIO/MACServiceInfo.h>
#include <MACIO/SB_Protocol.ph>
#include <MACIO/GCF_Event.h>
@@ -244,12 +244,12 @@ void ServiceBroker::acceptConnectRequest()
//
void ServiceBroker::readRanges()
{
- ASSERTSTR (ACC::APS::globalParameterSet()->isDefined("firstPortNumber") &&
- ACC::APS::globalParameterSet()->isDefined("lastPortNumber"),
+ ASSERTSTR (globalParameterSet()->isDefined("firstPortNumber") &&
+ globalParameterSet()->isDefined("lastPortNumber"),
"Ranges not specified in ParameterSet");
- itsLowerLimit = ACC::APS::globalParameterSet()->getUint16("firstPortNumber");
- itsUpperLimit = ACC::APS::globalParameterSet()->getUint16("lastPortNumber");
+ itsLowerLimit = globalParameterSet()->getUint16("firstPortNumber");
+ itsUpperLimit = globalParameterSet()->getUint16("lastPortNumber");
ASSERTSTR(itsLowerLimit < itsUpperLimit, "Invalid portnumber range specified");
ASSERTSTR(itsLowerLimit > 1023, "Portnumbers below 1024 may not be used");
@@ -271,11 +271,11 @@ void ServiceBroker::readRanges()
itsLowerLimit, itsUpperLimit, itsNrPorts));
// Finally read or construct name of adminfile.
- if (!ACC::APS::globalParameterSet()->isDefined("adminFile")) {
+ if (!globalParameterSet()->isDefined("adminFile")) {
itsAdminFile = "./SB.admin";
}
else {
- itsAdminFile = ACC::APS::globalParameterSet()->getString("adminFile");
+ itsAdminFile = globalParameterSet()->getString("adminFile");
}
LOG_INFO_STR ("Using file " << itsAdminFile << " for administration");
}
diff --git a/MAC/APL/CURTDBDaemons/configure.in b/MAC/APL/CURTDBDaemons/configure.in
index fe657b4ab27..6e01748dda4 100644
--- a/MAC/APL/CURTDBDaemons/configure.in
+++ b/MAC/APL/CURTDBDaemons/configure.in
@@ -56,7 +56,6 @@ lofar_GENERAL
lofar_COMPILETOOLS
lofar_PVSS(1)
lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/APS, APS, , 1, APS/ParameterSet.h,,)
lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,"kvt_protocol log_protocol",)
lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,,)
lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, , 1, APL/APLCommon/APL_Defines.h,,)
diff --git a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc
index 963c8d32286..a4ca6804ba8 100644
--- a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc
+++ b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc
@@ -23,7 +23,7 @@
#include <lofar_config.h>
#include <Common/LofarLogger.h>
#include <Common/Version.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <MACIO/GCF_Event.h>
#include <MACIO/MACServiceInfo.h>
#include <MACIO/KVT_Protocol.ph>
@@ -211,7 +211,7 @@ GCFEvent::TResult KeyValueLogger::operational(GCFEvent& event,
answer.seqnr = logEvent.seqnr;
answer.result = PVSS::SA_NO_ERROR;
- int32 timeStamp = ACC::APS::indexValue(logEvent.key, "{}");
+ int32 timeStamp = indexValue(logEvent.key, "{}");
rtrim (logEvent.key, "{}01234565789"); // cut off timestamp
// replace all but last . with underscore.
string::reverse_iterator riter = logEvent.key.rbegin();
@@ -253,7 +253,7 @@ GCFEvent::TResult KeyValueLogger::operational(GCFEvent& event,
answer.seqnr = logEvent.seqnr;
answer.result = PVSS::SA_NO_ERROR;
for (uint32 i = 0; i < logEvent.msgCount; i++) {
- int32 timeStamp = ACC::APS::indexValue(logEvent.keys.theVector[i], "{}");
+ int32 timeStamp = indexValue(logEvent.keys.theVector[i], "{}");
rtrim (logEvent.keys.theVector[i], "{}01234565789"); // cut off timestamp
// replace all but last . with underscore.
string::reverse_iterator riter = logEvent.keys.theVector[i].rbegin();
diff --git a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc
index cdcbca703ff..48a12179a8c 100644
--- a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc
+++ b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc
@@ -23,7 +23,7 @@
#include <lofar_config.h>
#include <Common/LofarLogger.h>
#include <Common/Version.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <MACIO/GCF_Event.h>
#include <MACIO/MACServiceInfo.h>
#include <MACIO/KVT_Protocol.ph>
@@ -39,7 +39,6 @@
namespace LOFAR {
using namespace MACIO;
- using namespace ACC::APS;
using namespace OTDB;
using namespace Deployment;
namespace GCF {
diff --git a/MAC/APL/MainCU/configure.in b/MAC/APL/MainCU/configure.in
index f59213ce5d8..c30a8d7bae4 100644
--- a/MAC/APL/MainCU/configure.in
+++ b/MAC/APL/MainCU/configure.in
@@ -56,7 +56,6 @@ lofar_GENERAL
lofar_COMPILETOOLS
lofar_PVSS(1)
lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/APS, APS, , 1, APS/ParameterSet.h,,)
lofar_INTERNAL(SAS/OTDB, OTDB, , 1, OTDB/OTDBconnection.h,,)
lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,,)
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
index 9eea804ae66..b87db1b5001 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
@@ -25,7 +25,7 @@
#include <Common/StringUtil.h>
#include <Common/Version.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <GCF/TM/GCF_Protocols.h>
#include <MACIO/MACServiceInfo.h>
#include <GCF/PVSS/GCF_PVTypes.h>
@@ -51,7 +51,6 @@ using namespace std;
namespace LOFAR {
using namespace APLCommon;
- using namespace ACC::APS;
namespace MainCU {
// static (this) pointer used for signal handling
@@ -224,7 +223,7 @@ GCFEvent::TResult MACScheduler::initial_state(GCFEvent& event, GCFPortInterface&
// Try to connect to the SAS database.
- ACC::APS::ParameterSet* pParamSet = ACC::APS::globalParameterSet();
+ ParameterSet* pParamSet = globalParameterSet();
string username = pParamSet->getString("OTDBusername");
string DBname = pParamSet->getString("OTDBdatabasename");
string password = pParamSet->getString("OTDBpassword");
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.h b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.h
index 8aa333f7441..672fc210382 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.h
+++ b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.h
@@ -44,7 +44,7 @@
#include <OTDB/OTDBconnection.h>
#include <OTDB/TreeMaintenance.h>
#include <OTDB/OTDBnode.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include "ObsClaimer.h"
diff --git a/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc b/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc
index 17127c32c45..70c53feb3dd 100644
--- a/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc
@@ -25,7 +25,7 @@
#include <Common/StreamUtil.h>
#include <Common/Version.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <GCF/TM/GCF_Protocols.h>
#include <GCF/TM/GCF_PortInterface.h>
#include <MACIO/MACServiceInfo.h>
@@ -52,7 +52,6 @@ using namespace std;
namespace LOFAR {
using namespace APLCommon;
- using namespace ACC::APS;
namespace MainCU {
//
diff --git a/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.h b/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.h
index 79e04dad3bb..31bd16a23f9 100644
--- a/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.h
+++ b/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.h
@@ -37,7 +37,7 @@
#include <APL/RTDBCommon/ClaimMgrTask.h>
//# ACC Includes
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
// forward declaration
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
index 1265da7ddc2..5540db2a192 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
@@ -24,7 +24,7 @@
#include <Common/StreamUtil.h>
#include <Common/Version.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/SystemUtil.h>
#include <ApplCommon/Observation.h>
#include <MACIO/MACServiceInfo.h>
@@ -46,7 +46,6 @@
namespace LOFAR {
using namespace Deployment;
using namespace APLCommon;
- using namespace ACC::APS;
using namespace GCF::TM;
using namespace GCF::PVSS;
using namespace GCF::RTDB;
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
index 2d9a4cb6588..ba24199ae85 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
@@ -43,7 +43,7 @@
#include <Common/lofar_datetime.h>
//# ACC Includes
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
// forward declaration
diff --git a/MAC/APL/PAC/BeamServer/src/BeamServer.cc b/MAC/APL/PAC/BeamServer/src/BeamServer.cc
index aa0b6159f4e..bc9890df867 100644
--- a/MAC/APL/PAC/BeamServer/src/BeamServer.cc
+++ b/MAC/APL/PAC/BeamServer/src/BeamServer.cc
@@ -25,7 +25,7 @@
#include <Common/LofarLogger.h>
#include <Common/LofarLocators.h>
#include <Common/Version.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <MACIO/MACServiceInfo.h>
diff --git a/MAC/APL/PAC/BeamServer/src/BeamServerMain.cc b/MAC/APL/PAC/BeamServer/src/BeamServerMain.cc
index f88c1ececf4..990973d4299 100644
--- a/MAC/APL/PAC/BeamServer/src/BeamServerMain.cc
+++ b/MAC/APL/PAC/BeamServer/src/BeamServerMain.cc
@@ -26,7 +26,7 @@
#include <lofar_config.h>
#include <Common/LofarLogger.h>
#include <Common/LofarLocators.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <GCF/TM/GCF_Task.h>
#include <APL/RTCCommon/daemonize.h>
@@ -35,7 +35,6 @@
using namespace LOFAR;
using namespace LOFAR::BS;
using namespace LOFAR::GCF::TM;
-using namespace LOFAR::ACC::APS;
//
// MAIN
diff --git a/MAC/APL/PAC/BeamServer/src/beamctl.cc b/MAC/APL/PAC/BeamServer/src/beamctl.cc
index 7d591df2225..5db25422d24 100644
--- a/MAC/APL/PAC/BeamServer/src/beamctl.cc
+++ b/MAC/APL/PAC/BeamServer/src/beamctl.cc
@@ -27,7 +27,7 @@
#include <APL/RSP_Protocol/RCUSettings.h>
#include <MACIO/MACServiceInfo.h>
#include <Common/LofarLocators.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include "beamctl.h"
@@ -67,7 +67,6 @@
using namespace std;
using namespace blitz;
using namespace LOFAR;
-using namespace ACC::APS;
using namespace BS;
using namespace RTC;
using namespace CAL_Protocol;
@@ -501,7 +500,7 @@ int main(int argc, char** argv)
cout << "Reading configuration files" << endl;
try {
LOFAR::ConfigLocator cl;
- LOFAR::ACC::APS::globalParameterSet()->adoptFile(cl.locate("beamctl.conf"));
+ globalParameterSet()->adoptFile(cl.locate("beamctl.conf"));
}
catch (LOFAR::Exception& e) {
cerr << "Failed to load configuration files: " << e.text() << endl;
diff --git a/MAC/APL/PAC/CalServer/src/ACMProxy.cc b/MAC/APL/PAC/CalServer/src/ACMProxy.cc
index e7d697ad68d..a213a0f4416 100644
--- a/MAC/APL/PAC/CalServer/src/ACMProxy.cc
+++ b/MAC/APL/PAC/CalServer/src/ACMProxy.cc
@@ -34,7 +34,7 @@
#include <APL/RTCCommon/Timestamp.h>
#include <APL/RTCCommon/PSAccess.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
using namespace std;
using namespace blitz;
diff --git a/MAC/APL/PAC/CalServer/src/CalServer.cc b/MAC/APL/PAC/CalServer/src/CalServer.cc
index 8bee3d85536..3abebc0792e 100644
--- a/MAC/APL/PAC/CalServer/src/CalServer.cc
+++ b/MAC/APL/PAC/CalServer/src/CalServer.cc
@@ -52,7 +52,7 @@
#include <APL/RTCCommon/Timestamp.h>
#include <APL/RTCCommon/PSAccess.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <fstream>
#include <signal.h>
#include <getopt.h>
diff --git a/MAC/APL/PIC/MIS/configure.in b/MAC/APL/PIC/MIS/configure.in
index 96dc847eda0..a337971c071 100644
--- a/MAC/APL/PIC/MIS/configure.in
+++ b/MAC/APL/PIC/MIS/configure.in
@@ -39,7 +39,6 @@ lofar_GENERAL
lofar_COMPILETOOLS
lofar_PVSS(1)
lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/APS, APS, , 1, APS/ParameterSet.h,,)
lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,,)
lofar_INTERNAL(MAC/GCF/PVSS, GCFPVSS, , 1, GCF/PVSS/PVSSservice.h,,)
diff --git a/MAC/APL/PIC/MIS/src/MISDaemon.cc b/MAC/APL/PIC/MIS/src/MISDaemon.cc
index ec11df3e874..43b76db942d 100644
--- a/MAC/APL/PIC/MIS/src/MISDaemon.cc
+++ b/MAC/APL/PIC/MIS/src/MISDaemon.cc
@@ -24,7 +24,7 @@
#include <Common/LofarLogger.h>
#include <Common/LofarLocators.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <MACIO/MACServiceInfo.h>
#include <GCF/PVSS/GCF_PVTypes.h>
#include <GCF/PVSS/PVSSresult.h>
@@ -41,7 +41,6 @@
namespace LOFAR {
using namespace MACIO;
using namespace GCF::TM;
- using namespace ACC::APS;
namespace AMI {
//
diff --git a/MAC/APL/PIC/RSPDriver/src/RSPDriver.cc b/MAC/APL/PIC/RSPDriver/src/RSPDriver.cc
index a0cb72f272d..52d125f7b4f 100644
--- a/MAC/APL/PIC/RSPDriver/src/RSPDriver.cc
+++ b/MAC/APL/PIC/RSPDriver/src/RSPDriver.cc
@@ -30,7 +30,7 @@
#include <APL/RTCCommon/PSAccess.h>
#include <APL/RTCCommon/daemonize.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <APL/RSP_Protocol/RSP_Protocol.ph>
#include <APL/RSP_Protocol/EPA_Protocol.ph>
diff --git a/MAC/APL/PIC/RSPDriver/test/EPAStub.cc b/MAC/APL/PIC/RSPDriver/test/EPAStub.cc
index c5726246fd7..5d6144dd3e7 100644
--- a/MAC/APL/PIC/RSPDriver/test/EPAStub.cc
+++ b/MAC/APL/PIC/RSPDriver/test/EPAStub.cc
@@ -32,7 +32,7 @@
#include <APL/RSP_Protocol/BeamletWeights.h>
#include <APL/RTCCommon/PSAccess.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <iostream>
#include <sys/time.h>
diff --git a/MAC/APL/PIC/TBBDriver/configure.in b/MAC/APL/PIC/TBBDriver/configure.in
index b7802be5552..cd99aab159a 100644
--- a/MAC/APL/PIC/TBBDriver/configure.in
+++ b/MAC/APL/PIC/TBBDriver/configure.in
@@ -58,7 +58,6 @@ lofar_INTERNAL(MAC/Test/Suite, Suite, , 1, Suite/test.h,,)
lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
lofar_INTERNAL(MAC/APL/PIC/TBB_Protocol,TBB_Protocol,,1,APL/TBB_Protocol/TBB_Protocol.ph,,)
-lofar_INTERNAL(LCS/ACC/APS,APS,,1,APS/ParameterSet.h)
dnl
dnl Output Makefiles
diff --git a/MAC/APL/PIC/TBBDriver/src/DriverSettings.cc b/MAC/APL/PIC/TBBDriver/src/DriverSettings.cc
index bbc1a45169a..7d295983bb0 100644
--- a/MAC/APL/PIC/TBBDriver/src/DriverSettings.cc
+++ b/MAC/APL/PIC/TBBDriver/src/DriverSettings.cc
@@ -24,14 +24,13 @@
#include <lofar_config.h>
#include <Common/LofarLogger.h>
#include <Common/LofarLocators.h>
-#include <APS/ParameterSet.h>
-#include <APS/Exceptions.h>
+#include <Common/ParameterSet.h>
+#include <Common/Exceptions.h>
#include <MACIO/MACServiceInfo.h>
#include <DriverSettings.h>
using namespace LOFAR;
//using namespace GCFCommon;
-using namespace ACC::APS;
using namespace TBB;
diff --git a/MAC/APL/PIC/TBBDriver/src/TBBDriver.cc b/MAC/APL/PIC/TBBDriver/src/TBBDriver.cc
index 1dcfd43065a..7c39d91e480 100644
--- a/MAC/APL/PIC/TBBDriver/src/TBBDriver.cc
+++ b/MAC/APL/PIC/TBBDriver/src/TBBDriver.cc
@@ -25,7 +25,7 @@
#include <Common/LofarLogger.h>
#include <Common/LofarLocators.h>
#include <APL/RTCCommon/daemonize.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <MACIO/MACServiceInfo.h>
#include <Common/hexdump.h>
@@ -72,7 +72,6 @@
#define ETHERTYPE_TP 0x7BB0 // letters of TBB
using namespace LOFAR;
-using namespace ACC::APS;
using namespace TBB;
static bool itsDaemonize = false;
@@ -1333,8 +1332,8 @@ int main(int argc, char** argv)
LOG_DEBUG_STR("Reading configuration files");
try {
LOFAR::ConfigLocator cl;
- LOFAR::ACC::APS::globalParameterSet()->adoptFile(cl.locate("TBBDriver.conf"));
- LOFAR::ACC::APS::globalParameterSet()->adoptFile(cl.locate("RemoteStation.conf"));
+ LOFAR::globalParameterSet()->adoptFile(cl.locate("TBBDriver.conf"));
+ LOFAR::globalParameterSet()->adoptFile(cl.locate("RemoteStation.conf"));
}
catch (LOFAR::Exception& e) {
LOG_ERROR_STR("Failed to load configuration files: " << e.text());
diff --git a/MAC/APL/PIC/TBBDriver/test/TPStub.cc b/MAC/APL/PIC/TBBDriver/test/TPStub.cc
index 19dbdb76df1..4c8ef90bd80 100644
--- a/MAC/APL/PIC/TBBDriver/test/TPStub.cc
+++ b/MAC/APL/PIC/TBBDriver/test/TPStub.cc
@@ -24,7 +24,7 @@
#include <lofar_config.h>
#include <Common/LofarLogger.h>
#include <Common/LofarLocators.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <iostream>
#include <sys/time.h>
@@ -38,7 +38,6 @@
using namespace std;
using namespace LOFAR;
-using namespace ACC::APS;
using namespace TP_Protocol;
using namespace TBB;
using namespace TBB_Test;
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/PSAccess.h b/MAC/APL/RTCCommon/include/APL/RTCCommon/PSAccess.h
index 387fbc2c1ff..b72d3f19be5 100644
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/PSAccess.h
+++ b/MAC/APL/RTCCommon/include/APL/RTCCommon/PSAccess.h
@@ -25,9 +25,7 @@
#ifndef PSACCESS_H_
#define PSACCESS_H_
-#include <APS/ParameterSet.h>
-using LOFAR::ACC::APS::ParameterSet;
-using LOFAR::ACC::APS::globalParameterSet;
+#include <Common/ParameterSet.h>
#define __psaccess__convert_i getInt32
#define __psaccess__convert_f getFloat
diff --git a/MAC/APL/RTDBCommon/configure.in b/MAC/APL/RTDBCommon/configure.in
index d1d3fc5cc14..8c9f0924a1d 100644
--- a/MAC/APL/RTDBCommon/configure.in
+++ b/MAC/APL/RTDBCommon/configure.in
@@ -56,7 +56,6 @@ lofar_GENERAL
lofar_COMPILETOOLS
lofar_PVSS(1)
lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/APS, APS, , 1, APS/ParameterSet.h,,)
lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
lofar_INTERNAL(MAC/GCF/PVSS, GCFPVSS, , 1, GCF/PVSS/PVSSservice.h,,)
lofar_INTERNAL(MAC/GCF/RTDB, GCFRTDB, , 1, GCF/RTDB/RTDB_PropertySet.h,,)
diff --git a/MAC/APL/StationCU/configure.in b/MAC/APL/StationCU/configure.in
index ab8133c727a..1a530101802 100644
--- a/MAC/APL/StationCU/configure.in
+++ b/MAC/APL/StationCU/configure.in
@@ -57,7 +57,6 @@ lofar_COMPILETOOLS
lofar_PVSS(1)
lofar_BLITZ
lofar_INTERNAL(LCS/Common, Common,, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/APS, APS,, 1, APS/ParameterSet.h,,)
lofar_INTERNAL(LCS/ApplCommon, ApplCommon,, 1, ApplCommon/Observation.h,,)
dnl lofar_INTERNAL(SAS/OTDB, OTDB,, 1, OTDB/OTDBconnection.h,,)
lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
diff --git a/MAC/APL/StationCU/src/BeamControl/BeamControl.cc b/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
index 8303193901d..2bad414a2fe 100644
--- a/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
+++ b/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
@@ -25,7 +25,7 @@
#include <Common/Version.h>
#include <ApplCommon/Observation.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <GCF/PVSS/GCF_PVTypes.h>
#include <Common/SystemUtil.h>
#include <MACIO/MACServiceInfo.h>
@@ -47,7 +47,6 @@ using namespace std;
namespace LOFAR {
using namespace APLCommon;
- using namespace ACC::APS;
namespace StationCU {
// static pointer to this object for signal handler
diff --git a/MAC/APL/StationCU/src/BeamControl/BeamControl.h b/MAC/APL/StationCU/src/BeamControl/BeamControl.h
index fbe8f3287cd..c222897418c 100644
--- a/MAC/APL/StationCU/src/BeamControl/BeamControl.h
+++ b/MAC/APL/StationCU/src/BeamControl/BeamControl.h
@@ -29,7 +29,7 @@
#include <Common/lofar_datetime.h>
//# ACC Includes
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
//# GCF Includes
#include <MACIO/GCF_Event.h>
diff --git a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
index 81d9087c477..ba42f7dc14e 100644
--- a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
+++ b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
@@ -42,7 +42,6 @@ using namespace LOFAR::GCF::RTDB;
namespace LOFAR {
using namespace APLCommon;
- using namespace ACC::APS;
namespace StationCU {
// static pointer to this object for signal handler
diff --git a/MAC/APL/StationCU/src/DigitalBoardControl/DigitalBoardControl.cc b/MAC/APL/StationCU/src/DigitalBoardControl/DigitalBoardControl.cc
index 1ffce4687f1..68d7151e624 100644
--- a/MAC/APL/StationCU/src/DigitalBoardControl/DigitalBoardControl.cc
+++ b/MAC/APL/StationCU/src/DigitalBoardControl/DigitalBoardControl.cc
@@ -24,7 +24,7 @@
#include <Common/SystemUtil.h>
#include <Common/Version.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <MACIO/MACServiceInfo.h>
#include <GCF/PVSS/GCF_PVTypes.h>
#include <APL/APLCommon/APL_Defines.h>
@@ -45,7 +45,6 @@ using namespace std;
namespace LOFAR {
using namespace APLCommon;
- using namespace ACC::APS;
namespace StationCU {
// static pointer to this object for signal handler
diff --git a/MAC/APL/StationCU/src/DigitalBoardControl/DigitalBoardControl.h b/MAC/APL/StationCU/src/DigitalBoardControl/DigitalBoardControl.h
index 4bbcb43ea5a..2524fe8d544 100644
--- a/MAC/APL/StationCU/src/DigitalBoardControl/DigitalBoardControl.h
+++ b/MAC/APL/StationCU/src/DigitalBoardControl/DigitalBoardControl.h
@@ -28,7 +28,7 @@
#include <Common/lofar_string.h>
//# ACC Includes
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
//# GCF Includes
#include <MACIO/GCF_Event.h>
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc b/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc
index 8a63d86382e..b47f3c55168 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc
+++ b/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc
@@ -24,7 +24,7 @@
#include <Common/LofarLogger.h>
#include <Common/Version.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <APL/RSP_Protocol/RSP_Protocol.ph>
#include <GCF/RTDB/DP_Protocol.ph>
#include "RSPMonitor.h"
@@ -32,7 +32,6 @@
#include "../Package__Version.h"
using namespace LOFAR;
-using namespace LOFAR::ACC::APS;
using namespace LOFAR::GCF;
using namespace LOFAR::GCF::TM;
using namespace LOFAR::StationCU;
diff --git a/MAC/APL/StationCU/src/StationControl/ActiveObs.cc b/MAC/APL/StationCU/src/StationControl/ActiveObs.cc
index 22ceef60339..1d027a7b39b 100644
--- a/MAC/APL/StationCU/src/StationControl/ActiveObs.cc
+++ b/MAC/APL/StationCU/src/StationControl/ActiveObs.cc
@@ -41,7 +41,6 @@
#include "ActiveObs.h"
namespace LOFAR {
- using ACC::APS::ParameterSet;
using namespace APLCommon;
using namespace MACIO;
using namespace GCF::TM;
diff --git a/MAC/APL/StationCU/src/StationControl/ActiveObs.h b/MAC/APL/StationCU/src/StationControl/ActiveObs.h
index f015f3cb070..a38c8cc4618 100644
--- a/MAC/APL/StationCU/src/StationControl/ActiveObs.h
+++ b/MAC/APL/StationCU/src/StationControl/ActiveObs.h
@@ -62,7 +62,7 @@ class ActiveObs : public GCFFsm
public:
ActiveObs (const string& name,
State initial,
- ACC::APS::ParameterSet* aPS,
+ ParameterSet* aPS,
GCFTask& task);
virtual ~ActiveObs();
diff --git a/MAC/APL/StationCU/src/StationControl/StationControl.cc b/MAC/APL/StationCU/src/StationControl/StationControl.cc
index 59c56b1db44..3175ff401e6 100644
--- a/MAC/APL/StationCU/src/StationControl/StationControl.cc
+++ b/MAC/APL/StationCU/src/StationControl/StationControl.cc
@@ -30,7 +30,7 @@
#include <Common/SystemUtil.h>
#include <Common/Version.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <GCF/PVSS/GCF_PVTypes.h>
#include <MACIO/MACServiceInfo.h>
#include <APL/APLCommon/APL_Defines.h>
@@ -57,7 +57,6 @@ using namespace std;
namespace LOFAR {
using namespace APLCommon;
- using namespace ACC::APS;
namespace StationCU {
// static pointer to this object for signalhandler
diff --git a/MAC/APL/StationCU/src/StationControl/StationControl.h b/MAC/APL/StationCU/src/StationControl/StationControl.h
index 09d714d9f63..b3fd599e23f 100644
--- a/MAC/APL/StationCU/src/StationControl/StationControl.h
+++ b/MAC/APL/StationCU/src/StationControl/StationControl.h
@@ -32,7 +32,7 @@
#include <ApplCommon/Observation.h>
//# ACC Includes
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
//# GCF Includes
#include <MACIO/GCF_Event.h>
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBControl.cc b/MAC/APL/StationCU/src/TBBControl/TBBControl.cc
index d8681aaeb2b..80ef45eebdc 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBControl.cc
+++ b/MAC/APL/StationCU/src/TBBControl/TBBControl.cc
@@ -25,7 +25,7 @@
#include <Common/LofarLogger.h>
#include <Common/Version.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <GCF/PVSS/GCF_PVTypes.h>
#include <GCF/Utils.h>
#include <MACIO/MACServiceInfo.h>
@@ -56,7 +56,6 @@ using namespace std;
using namespace LOFAR;
using namespace APLCommon;
using namespace RTC;
-using namespace ACC::APS;
using namespace StationCU;
// static pointer to this object for signal handler
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBControl.h b/MAC/APL/StationCU/src/TBBControl/TBBControl.h
index f120c0cfbdc..db11af40e5e 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBControl.h
+++ b/MAC/APL/StationCU/src/TBBControl/TBBControl.h
@@ -29,7 +29,7 @@
#include <Common/lofar_datetime.h>
//# ACC Includes
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
//# GCF Includes
#include <GCF/TM/GCF_Port.h>
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBObservation.cc b/MAC/APL/StationCU/src/TBBControl/TBBObservation.cc
index 53074430c87..e9cb39446e2 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBObservation.cc
+++ b/MAC/APL/StationCU/src/TBBControl/TBBObservation.cc
@@ -31,7 +31,6 @@
#include "TBBObservation.h"
using namespace LOFAR;
-using namespace ACC::APS;
using namespace StationCU;
using namespace APLCommon;
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBObservation.h b/MAC/APL/StationCU/src/TBBControl/TBBObservation.h
index 0b3f341a183..d347a84cba9 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBObservation.h
+++ b/MAC/APL/StationCU/src/TBBControl/TBBObservation.h
@@ -30,7 +30,7 @@
//# Includes
#include <Common/LofarTypes.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/lofar_bitset.h>
namespace LOFAR {
@@ -52,7 +52,7 @@ public:
TBBObservation();
~TBBObservation() { };
- explicit TBBObservation (ACC::APS::ParameterSet* aParSet);
+ explicit TBBObservation (ParameterSet* aParSet);
typedef bitset<256> RCUset_t;
diff --git a/MAC/APL/StationCU/src/TBBControl/VHECRTask.cc b/MAC/APL/StationCU/src/TBBControl/VHECRTask.cc
index ae032af81a6..69d6957289a 100644
--- a/MAC/APL/StationCU/src/TBBControl/VHECRTask.cc
+++ b/MAC/APL/StationCU/src/TBBControl/VHECRTask.cc
@@ -21,12 +21,11 @@
//# $Id$
#include <lofar_config.h>
#include <Common/LofarLogger.h>
-// #include <APS/ParameterSet.h>
+// #include <Common/ParameterSet.h>
#include "VHECRTask.h"
namespace LOFAR {
- // using namespace ACC::APS;
namespace StationCU {
//
diff --git a/MAC/APL/TestCtlr/configure.in b/MAC/APL/TestCtlr/configure.in
index 0cfb0e178ca..959d32db54b 100644
--- a/MAC/APL/TestCtlr/configure.in
+++ b/MAC/APL/TestCtlr/configure.in
@@ -56,7 +56,6 @@ lofar_GENERAL
lofar_COMPILETOOLS
lofar_PVSS(1)
lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/APS, APS, , 1, APS/ParameterSet.h,,)
lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,"gcftm",)
lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, , 1, APL/APLCommon/APL_Defines.h,"aplcommon",)
diff --git a/MAC/APL/TestCtlr/src/ControllerMenu.cc b/MAC/APL/TestCtlr/src/ControllerMenu.cc
index d44720f5c0f..e02a2afef8e 100644
--- a/MAC/APL/TestCtlr/src/ControllerMenu.cc
+++ b/MAC/APL/TestCtlr/src/ControllerMenu.cc
@@ -25,7 +25,7 @@
#include <Common/lofar_fstream.h>
#include <Common/SystemUtil.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <MACIO/MACServiceInfo.h>
#include <APL/APLCommon/APL_Defines.h>
#include <APL/APLCommon/ControllerDefines.h>
@@ -41,7 +41,6 @@ namespace LOFAR {
using namespace APLCommon;
using namespace GCF::TM;
using namespace Deployment;
- using namespace ACC::APS;
namespace Test {
//
diff --git a/MAC/APL/TestCtlr/src/ControllerMenu.h b/MAC/APL/TestCtlr/src/ControllerMenu.h
index dab5e9b7072..f30bedb6f2a 100644
--- a/MAC/APL/TestCtlr/src/ControllerMenu.h
+++ b/MAC/APL/TestCtlr/src/ControllerMenu.h
@@ -42,7 +42,7 @@
#include <Common/LofarLogger.h>
//# ACC Includes
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
// forward declaration
diff --git a/MAC/APL/TestCtlr/src/TestController.cc b/MAC/APL/TestCtlr/src/TestController.cc
index ac4f04321bb..b970de08fc3 100644
--- a/MAC/APL/TestCtlr/src/TestController.cc
+++ b/MAC/APL/TestCtlr/src/TestController.cc
@@ -24,7 +24,7 @@
#include <Common/LofarLogger.h>
#include <Common/LofarLocators.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <MACIO/MACServiceInfo.h>
#include <APL/APLCommon/APL_Defines.h>
#include <APL/APLCommon/Controller_Protocol.ph>
@@ -37,7 +37,6 @@ using namespace LOFAR::GCF::TM;
namespace LOFAR {
using namespace APLCommon;
- using namespace ACC::APS;
namespace Test {
//
diff --git a/MAC/GCF/LogSys/KVLogSys/src/GCF_KeyValueLogger.cc b/MAC/GCF/LogSys/KVLogSys/src/GCF_KeyValueLogger.cc
index 7b93845b9ee..e0f2564dd23 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/GCF_KeyValueLogger.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/GCF_KeyValueLogger.cc
@@ -24,15 +24,13 @@
#include <GCF/GCF_ServiceInfo.h>
#include <GCF/LogSys/GCF_KeyValueLogger.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <KVL_Protocol.ph>
#include <KVLDefines.h>
#include <sys/time.h>
#include <time.h>
namespace LOFAR {
- using ACC::APS::ParameterSet;
- using ACC::APS::globalParameterSet;
namespace GCF {
using namespace TM;
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.cc b/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.cc
index 4ac0a4e0884..d33a592ff83 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.cc
@@ -23,7 +23,7 @@
#include <lofar_config.h>
#include "KVLUtils.h"
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <KVLDefines.h>
#include <sys/time.h>
#include <time.h>
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.cc b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.cc
index 09d5fe81a4c..bb5cc1ed1de 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.cc
@@ -23,7 +23,7 @@
#include <lofar_config.h>
#include "KeyValueLoggerDaemon.h"
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <KVLDefines.h>
#include <sys/time.h>
#include <time.h>
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.cc b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.cc
index 1fc5e12c178..ac2fd2e1e48 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.cc
@@ -23,7 +23,7 @@
#include <lofar_config.h>
#include "KeyValueLoggerMaster.h"
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <KVLDefines.h>
#include <sys/time.h>
#include <time.h>
@@ -37,8 +37,6 @@
namespace LOFAR {
using namespace OTDB;
- using ACC::APS::ParameterSet;
- using ACC::APS::globalParameterSet;
namespace GCF {
using namespace TM;
namespace LogSys {
diff --git a/MAC/GCF/LogSys/configure.in b/MAC/GCF/LogSys/configure.in
index 73945b885b8..2309a8b48a2 100644
--- a/MAC/GCF/LogSys/configure.in
+++ b/MAC/GCF/LogSys/configure.in
@@ -43,7 +43,6 @@ lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
lofar_INTERNAL(MAC/GCF/TM, eventport, , 1, GCF/TM/EventPort.h,,)
lofar_INTERNAL(MAC/GCF/PAL, gcfpal, , 1, GCF/PAL/GCF_PVSSInfo.h,,)
lofar_INTERNAL(SAS/OTDB, otdb, , 1, OTDB/OTDBconnection.h,,)
-lofar_INTERNAL(LCS/ACC/APS, aps, , 1, APS/ParameterSet.h,,)
lofar_EXTERNAL(pqxx,2.5.5,pqxx/pqxx, pqxx)
lofar_EXTERNAL(pq,,libpq-fe.h,)
diff --git a/MAC/GCF/PVSS/src/GSA_SCADAHandler.cc b/MAC/GCF/PVSS/src/GSA_SCADAHandler.cc
index 6cb80a3a7af..201ac6faf83 100644
--- a/MAC/GCF/PVSS/src/GSA_SCADAHandler.cc
+++ b/MAC/GCF/PVSS/src/GSA_SCADAHandler.cc
@@ -27,7 +27,7 @@
#include "GSA_SCADAHandler.h"
#include <GSA_Resources.h>
#include <GCF/TM/GCF_Task.h>
-//#include <APS/ParameterSet.h>
+//#include <Common/ParameterSet.h>
namespace LOFAR {
namespace GCF {
@@ -48,11 +48,11 @@ GSASCADAHandler* GSASCADAHandler::instance()
//#define PARAM_DEFAULT_PVSS_CMDLINE "mac.controller.pvss.cmdline"
// string pvssCmdLineParam = PARAM_DEFAULT_PVSS_CMDLINE;
// char* appName = strrchr(GCFTask::_argv[0], '/');
-// if (!ACC::APS::globalParameterSet()->isDefined(pvssCmdLineParam)) {
+// if (!globalParameterSet()->isDefined(pvssCmdLineParam)) {
// pvssCmdLineParam = formatString(PARAM_PVSS_CMDLINE, (appName ? appName + 1 : GCFTask::_argv[0]));
// }
-// if (ACC::APS::globalParameterSet()->isDefined(pvssCmdLineParam)) {
-// cmdline += ACC::APS::globalParameterSet()->getString(pvssCmdLineParam);
+// if (globalParameterSet()->isDefined(pvssCmdLineParam)) {
+// cmdline += globalParameterSet()->getString(pvssCmdLineParam);
// }
// The PVSS API 3.0.1 redirects stdout and stderr output automatically to
diff --git a/MAC/GCF/TM/configure.in b/MAC/GCF/TM/configure.in
index 4b3f75bcac6..7a1a48246c0 100644
--- a/MAC/GCF/TM/configure.in
+++ b/MAC/GCF/TM/configure.in
@@ -37,7 +37,6 @@ dnl Check for LOFAR specific things
dnl
lofar_GENERAL
lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/APS, APS, , 1, APS/ParameterSet.h,,)
lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
dnl
diff --git a/MAC/GCF/TM/src/GCF_Task.cc b/MAC/GCF/TM/src/GCF_Task.cc
index bc8f5b32f83..dfb89807544 100644
--- a/MAC/GCF/TM/src/GCF_Task.cc
+++ b/MAC/GCF/TM/src/GCF_Task.cc
@@ -33,8 +33,7 @@
#include <Common/lofar_fstream.h>
#include <Common/LofarLocators.h>
-#include <APS/ParameterSet.h>
-using LOFAR::ACC::APS::ParameterSet;
+#include <Common/ParameterSet.h>
using std::ifstream;
#include <signal.h>
@@ -101,7 +100,7 @@ void GCFTask::init(int argc, char** argv, const string& logfile)
}
// Read in the ParameterSet of the task (<task>.conf)
- ParameterSet* pParamSet = ACC::APS::globalParameterSet();
+ ParameterSet* pParamSet = globalParameterSet();
string configFile(aCL.locate(procName + ".conf"));
if (!configFile.empty()) {
LOG_INFO_STR ("Using parameterfile: " << configFile);
diff --git a/MAC/GCF/TM/src/Port/GCF_Port.cc b/MAC/GCF/TM/src/Port/GCF_Port.cc
index f90eceaf1aa..2043a672a07 100644
--- a/MAC/GCF/TM/src/Port/GCF_Port.cc
+++ b/MAC/GCF/TM/src/Port/GCF_Port.cc
@@ -23,7 +23,7 @@
#include <lofar_config.h>
#include <Common/LofarLogger.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <MACIO/GCF_Event.h>
#include <GCF/TM/GCF_Port.h>
#include <GCF/TM/GCF_RawPort.h>
@@ -36,7 +36,6 @@
#include <GCF/TM/GCF_DevicePort.h>
namespace LOFAR {
- using namespace ACC::APS;
namespace GCF {
namespace TM {
diff --git a/MAC/GCF/TM/src/Port/GCF_RawPort.cc b/MAC/GCF/TM/src/Port/GCF_RawPort.cc
index 9cde2704db5..8157592c0c3 100644
--- a/MAC/GCF/TM/src/Port/GCF_RawPort.cc
+++ b/MAC/GCF/TM/src/Port/GCF_RawPort.cc
@@ -30,10 +30,9 @@
#include <GCF/TM/GCF_Protocols.h>
#include <GTM_Defines.h>
#include <Timer/GTM_TimerHandler.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
namespace LOFAR {
- using namespace ACC::APS;
namespace GCF {
namespace TM {
diff --git a/MAC/GCF/TM/src/PortImpl/GCF_DevicePort.cc b/MAC/GCF/TM/src/PortImpl/GCF_DevicePort.cc
index 1f3e0c14da0..dec6fb4964c 100644
--- a/MAC/GCF/TM/src/PortImpl/GCF_DevicePort.cc
+++ b/MAC/GCF/TM/src/PortImpl/GCF_DevicePort.cc
@@ -28,7 +28,7 @@
#include <GTM_Defines.h>
#include <GCF/TM/GCF_Task.h>
#include <GCF/TM/GCF_Protocols.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <errno.h>
namespace LOFAR
@@ -111,7 +111,7 @@ bool GCFDevicePort::open()
{
// retrieve the device name from the parameter set
setDeviceName(
- ACC::APS::globalParameterSet()->getString(
+ globalParameterSet()->getString(
formatString(
"mac.ns.%s.%s.deviceName",
_pTask->getName().c_str(),
diff --git a/MAC/GCF/TM/src/PortImpl/GCF_ETHRawPort.cc b/MAC/GCF/TM/src/PortImpl/GCF_ETHRawPort.cc
index 08a17055cd2..13349ada7e2 100644
--- a/MAC/GCF/TM/src/PortImpl/GCF_ETHRawPort.cc
+++ b/MAC/GCF/TM/src/PortImpl/GCF_ETHRawPort.cc
@@ -31,7 +31,7 @@
#include "GTM_ETHSocket.h"
#include <GTM_Defines.h>
#include <errno.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
namespace LOFAR
{
@@ -98,7 +98,7 @@ bool GCFETHRawPort::open()
PARAM_ETH_IFNAME,
getTask()->getName().c_str(),
getRealName().c_str());
- _ifname += ACC::APS::globalParameterSet()->getString(ifNameParam);
+ _ifname += globalParameterSet()->getString(ifNameParam);
}
catch (...)
{
@@ -115,7 +115,7 @@ bool GCFETHRawPort::open()
PARAM_ETH_MACADDR,
getTask()->getName().c_str(),
getRealName().c_str());
- _destMacStr += ACC::APS::globalParameterSet()->getString(destMacParam);
+ _destMacStr += globalParameterSet()->getString(destMacParam);
}
catch (...)
{
@@ -132,7 +132,7 @@ bool GCFETHRawPort::open()
PARAM_ETH_ETHERTYPE,
getTask()->getName().c_str(),
getRealName().c_str());
- _ethertype += ACC::APS::globalParameterSet()->getInt32(ethertypeParam);
+ _ethertype += globalParameterSet()->getInt32(ethertypeParam);
}
catch (...)
{
diff --git a/MAC/GCF/TM/src/PortImpl/GCF_TCPPort.cc b/MAC/GCF/TM/src/PortImpl/GCF_TCPPort.cc
index 14ca9c3bc4c..1c25d3d7106 100644
--- a/MAC/GCF/TM/src/PortImpl/GCF_TCPPort.cc
+++ b/MAC/GCF/TM/src/PortImpl/GCF_TCPPort.cc
@@ -28,7 +28,7 @@
#include <GCF/TM/GCF_TCPPort.h>
#include <GCF/TM/GCF_Task.h>
#include <GCF/TM/GCF_Protocols.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include "GTM_TCPServerSocket.h"
#include <ServiceBroker/ServiceBrokerTask.h>
//#include <ServiceBroker/GSB_Defines.h>
@@ -36,7 +36,6 @@
#include <errno.h>
namespace LOFAR {
- using namespace ACC::APS;
namespace GCF {
using namespace SB;
namespace TM {
@@ -198,8 +197,8 @@ bool GCFTCPPort::open()
// portnumber overruled by user? try mac.ns.<taskname>.<realname>.port
string portNumParam = formatString(PARAM_TCP_PORTNR,
getTask()->getName().c_str(), getRealName().c_str());
- if (ACC::APS::globalParameterSet()->isDefined(portNumParam)) {
- _portNumber = ACC::APS::globalParameterSet()->getInt32(portNumParam);
+ if (globalParameterSet()->isDefined(portNumParam)) {
+ _portNumber = globalParameterSet()->getInt32(portNumParam);
}
if (_portNumber > 0) { // portnumber hard set by user.
serviceRegistered(SB_NO_ERROR, _portNumber); // 'hard' open port
diff --git a/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.cc b/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.cc
index 724d69d550a..cc414f1ef90 100644
--- a/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.cc
+++ b/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.cc
@@ -28,7 +28,7 @@
//#include "GSB_Defines.h"
#include <MACIO/MACServiceInfo.h>
#include <PortImpl/GTM_TCPServerSocket.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
namespace LOFAR {
namespace GCF {
diff --git a/MAC/GCF/_PAL/PI/src/GPI_Controller.cc b/MAC/GCF/_PAL/PI/src/GPI_Controller.cc
index 948735d04f9..ffe0c6c5c37 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_Controller.cc
+++ b/MAC/GCF/_PAL/PI/src/GPI_Controller.cc
@@ -26,7 +26,7 @@
#include "GPI_CEPServer.h"
#include "GPI_RTCServer.h"
#include <GCF/Protocols/PI_Protocol.ph>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
namespace LOFAR
{
@@ -44,7 +44,7 @@ GPIController::GPIController() :
// initialize the port provider
_rtcClientPortProvider.init(*this, "rtc-provider", GCFPortInterface::MSPP, PI_PROTOCOL);
_cepClientPortProvider.init(*this, "cep-provider", GCFPortInterface::MSPP, PI_PROTOCOL);
- ACC::APS::globalParameterSet()->adoptFile("PropertyAgent.conf");
+ globalParameterSet()->adoptFile("PropertyAgent.conf");
}
GPIController::~GPIController()
diff --git a/MAC/GCF/_PAL/PML/src/GPM_Controller.cc b/MAC/GCF/_PAL/PML/src/GPM_Controller.cc
index 6cb4482cdcf..d40ee4bf2d3 100644
--- a/MAC/GCF/_PAL/PML/src/GPM_Controller.cc
+++ b/MAC/GCF/_PAL/PML/src/GPM_Controller.cc
@@ -28,7 +28,7 @@
#include <GCF/PAL/GCF_MyPropertySet.h>
#include <GCF/PAL/GCF_SysConnGuard.h>
#include <GCF/Utils.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <GCF/PAL/GCF_PVSSInfo.h>
#include <GCF/GCF_ServiceInfo.h>
@@ -69,7 +69,7 @@ GPMController::GPMController() :
// read in the configuration files.
// ConfigLocator aCL;
// LOG_DEBUG ("Adopting config file: PropertyAgent.conf");
-// ACC::APS::globalParameterSet()->adoptFile(aCL.locate("PropertyAgent.conf"));
+// globalParameterSet()->adoptFile(aCL.locate("PropertyAgent.conf"));
// Start task that monitor (dis)connecting systems.
_pSysConnGuard->registerTask(*this);
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.cc b/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.cc
index 08c79c76e3f..97fe9598cb6 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.cc
+++ b/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.cc
@@ -30,7 +30,7 @@
#include "GSA_SCADAHandler.h"
#include <GSA_Resources.h>
#include <GCF/TM/GCF_Task.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
namespace LOFAR {
namespace GCF {
@@ -48,11 +48,11 @@ GSASCADAHandler* GSASCADAHandler::instance()
cmdline += "-currentproj ";
string pvssCmdLineParam = PARAM_DEFAULT_PVSS_CMDLINE;
char* appName = strrchr(GCFTask::_argv[0], '/');
- if (!ACC::APS::globalParameterSet()->isDefined(pvssCmdLineParam)) {
+ if (!globalParameterSet()->isDefined(pvssCmdLineParam)) {
pvssCmdLineParam = formatString(PARAM_PVSS_CMDLINE, (appName ? appName + 1 : GCFTask::_argv[0]));
}
- if (ACC::APS::globalParameterSet()->isDefined(pvssCmdLineParam)) {
- cmdline += ACC::APS::globalParameterSet()->getString(pvssCmdLineParam);
+ if (globalParameterSet()->isDefined(pvssCmdLineParam)) {
+ cmdline += globalParameterSet()->getString(pvssCmdLineParam);
}
// The PVSS API 3.0.1 redirects stdout and stderr output automatically to
// a file created by the API
diff --git a/MAC/GCF/_PAL/configure.in b/MAC/GCF/_PAL/configure.in
index 3d96757e87a..a6c4598d5ec 100644
--- a/MAC/GCF/_PAL/configure.in
+++ b/MAC/GCF/_PAL/configure.in
@@ -39,7 +39,6 @@ lofar_GENERAL
lofar_PVSS(1)
lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
lofar_INTERNAL(LCS/Transport, transport, , 1, Transport/DataHolder.h,,)
-lofar_INTERNAL(LCS/ACC/APS, APS, ,1, APS/ParameterSet.h,,)
lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, , 1, GCF/GCF_Defines.h,,)
lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
lofar_INTERNAL(MAC/GCF/Protocols, gcfpirtcprot, , 1, GCF/Protocols/PI_Protocol.ph,,)
diff --git a/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.cc b/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.cc
index fd8287357c2..9cd37b75925 100644
--- a/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.cc
+++ b/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.cc
@@ -25,7 +25,7 @@
#include <PIClient.h>
#include <GCF/PALlight/CEPPropertySet.h>
#include <GCF/Utils.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Transport/TH_Socket.h>
#include <Blob/BlobOStream.h>
#include <Blob/BlobIStream.h>
@@ -114,11 +114,11 @@ void PIClient::run()
try
{
LOG_DEBUG("Setup connection");
- ACC::APS::globalParameterSet()->adoptFile("PropertyInterface.conf");
+ globalParameterSet()->adoptFile("PropertyInterface.conf");
_dhPIClient.init();
- TH_Socket* pTH = new TH_Socket(ACC::APS::globalParameterSet()->getString(PARAM_PI_HOST),
- ACC::APS::globalParameterSet()->getString(PARAM_PI_PORT),
+ TH_Socket* pTH = new TH_Socket(globalParameterSet()->getString(PARAM_PI_HOST),
+ globalParameterSet()->getString(PARAM_PI_PORT),
false);
LOG_DEBUG("Try to connect");
pTH->init();
diff --git a/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.cc b/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.cc
index 8012456fce5..c7552263aad 100644
--- a/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.cc
+++ b/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.cc
@@ -26,7 +26,7 @@
#include <GCF/PALlight/GCF_RTMyPropertySet.h>
#include <stdio.h>
#include <GCF/Utils.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
namespace LOFAR
{
@@ -49,8 +49,8 @@ GPMRTController::GPMRTController() :
// initialize the port
_propertyInterface.init(*this, "client", GCFPortInterface::SAP, PI_PROTOCOL);
- ACC::APS::globalParameterSet()->adoptFile("gcf-pmllight.conf");
- ACC::APS::globalParameterSet()->adoptFile("PropertyInterface.conf");
+ globalParameterSet()->adoptFile("gcf-pmllight.conf");
+ globalParameterSet()->adoptFile("PropertyInterface.conf");
}
GPMRTController* GPMRTController::instance(bool temporary)
diff --git a/RTCP/CNProc/test/transpose.cc b/RTCP/CNProc/test/transpose.cc
index 30fbf51437c..77270373a8f 100644
--- a/RTCP/CNProc/test/transpose.cc
+++ b/RTCP/CNProc/test/transpose.cc
@@ -21,7 +21,7 @@
#include <lofar_config.h>
#if defined HAVE_MPI
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/lofar_complex.h>
#include <Common/Timer.h>
#include <PLC/ACCmain.h>
@@ -53,7 +53,7 @@ class DH_RSP : public DataHolder
public:
typedef i4complex SampleType;
- DH_RSP(const string &name, const ACC::APS::ParameterSet &ps);
+ DH_RSP(const string &name, const ParameterSet &ps);
DataHolder *clone() const;
virtual void init();
@@ -65,7 +65,7 @@ class DH_RSP : public DataHolder
};
-DH_RSP::DH_RSP(const string &name, const ACC::APS::ParameterSet &ps)
+DH_RSP::DH_RSP(const string &name, const ParameterSet &ps)
:
DataHolder(name, "DH_RSP")
{
@@ -218,7 +218,7 @@ class WH_Transpose : public WorkHolder
public:
typedef i4complex SampleType;
- WH_Transpose(const string &name, const ACC::APS::ParameterSet &ps, unsigned rank, MPI_Comm comm);
+ WH_Transpose(const string &name, const ParameterSet &ps, unsigned rank, MPI_Comm comm);
virtual void preprocess();
virtual void process();
@@ -230,7 +230,7 @@ class WH_Transpose : public WorkHolder
void allToAll();
- const ACC::APS::ParameterSet &itsParamSet;
+ const ParameterSet &itsParamSet;
unsigned itsCoreNumber, itsPsetNumber, itsPsetIndex;
unsigned itsNrStations, itsNrCorrelatorPsets, itsNrPsets;
unsigned itsPhase;
@@ -242,7 +242,7 @@ class WH_Transpose : public WorkHolder
};
-WH_Transpose::WH_Transpose(const string &name, const ACC::APS::ParameterSet &ps, unsigned rank, MPI_Comm communicator)
+WH_Transpose::WH_Transpose(const string &name, const ParameterSet &ps, unsigned rank, MPI_Comm communicator)
:
WorkHolder(0, 0, name, string("WH_Transpose")),
itsParamSet(ps),
diff --git a/RTCP/IONProc/configure.in b/RTCP/IONProc/configure.in
index b69d4033552..954dad5bd8c 100644
--- a/RTCP/IONProc/configure.in
+++ b/RTCP/IONProc/configure.in
@@ -57,7 +57,6 @@ lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
lofar_INTERNAL(LCS/AMC/AMCBase,AMCBase,,1,AMCBase/Converter.h)
lofar_INTERNAL(LCS/AMC/AMCImpl,AMCImpl,,1,AMCImpl/ConverterImpl.h)
lofar_INTERNAL(LCS/Stream,Stream,,1,Stream/Stream.h,,)
-lofar_INTERNAL(LCS/ACC/APS,APS,,1,APS/ParameterSet.h,,)
lofar_INTERNAL(LCS/ACC/PLC,PLC,,1,PLC/ACCmain.h,,)
lofar_INTERNAL(RTCP/Interface,Interface,,1,Interface/Config.h,,)
lofar_INTERNAL(RTCP/FCNP,FCNP,,0,FCNP/fcnp_ion.h,fcnp_ion)
diff --git a/RTCP/IONProc/src/ION_main.cc b/RTCP/IONProc/src/ION_main.cc
index 85927f28a88..3a716cc7515 100644
--- a/RTCP/IONProc/src/ION_main.cc
+++ b/RTCP/IONProc/src/ION_main.cc
@@ -410,7 +410,7 @@ void *master_thread(void *)
pthread_t input_thread_id, output_thread_id;
std::clog << "trying to use " << global_argv[1] << " as ParameterSet" << std::endl;
- ACC::APS::ParameterSet parameterSet(global_argv[1]);
+ ParameterSet parameterSet(global_argv[1]);
Parset parset(¶meterSet);
parset.adoptFile("OLAP.parset");
@@ -534,7 +534,7 @@ static void tryToGetPersonality()
nrPsets = 1;
try {
- ACC::APS::ParameterSet personality("/proc/personality.sh");
+ ParameterSet personality("/proc/personality.sh");
#if defined HAVE_ZOID // compiler bug: exceptions cause crashes
try {
diff --git a/RTCP/IONProc/src/WH_DelayCompensation.cc b/RTCP/IONProc/src/WH_DelayCompensation.cc
index 1262ca1a591..c00e22b0b6f 100644
--- a/RTCP/IONProc/src/WH_DelayCompensation.cc
+++ b/RTCP/IONProc/src/WH_DelayCompensation.cc
@@ -39,7 +39,6 @@
namespace LOFAR
{
using namespace AMC;
- using ACC::APS::ParameterSet;
namespace RTCP
{
diff --git a/RTCP/Interface/configure.in b/RTCP/Interface/configure.in
index 17591f262ae..90f30b80be1 100644
--- a/RTCP/Interface/configure.in
+++ b/RTCP/Interface/configure.in
@@ -56,7 +56,6 @@ lofar_MPI
lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
dnl lofar_INTERNAL(LCS/Transport,Transport,,1,Transport/DataHolder.h,,)
lofar_INTERNAL(LCS/Stream,Stream,,1,Stream/Stream.h,,)
-lofar_INTERNAL(LCS/ACC/APS,APS,,0,APS/ParameterSet.h,,)
lofar_INTERNAL(LCS/ApplCommon,ApplCommon,,1,ApplCommon/Observation.h,,)
dnl lofar_INTERNAL(CEP/tinyCEP,tinyCEP,,0,tinyCEP/TinyDataManager.h,,)
lofar_EXTERNAL(boost,1,boost/date_time/date.hpp,"")
diff --git a/RTCP/Interface/include/Interface/Parset.h b/RTCP/Interface/include/Interface/Parset.h
index 2c9eb03be2d..a9c877fd8f3 100644
--- a/RTCP/Interface/include/Interface/Parset.h
+++ b/RTCP/Interface/include/Interface/Parset.h
@@ -23,15 +23,13 @@
#ifndef LOFAR_INTERFACE_PARSET_H
#define LOFAR_INTERFACE_PARSET_H
-#if defined HAVE_APS
-
// \file
// class/struct that holds the Parset information
//# Never #include <config.h> or #include <lofar_config.h> in a header file!
//# Includes
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/StreamUtil.h>
#include <Common/lofar_datetime.h>
#include <Common/LofarLogger.h>
@@ -53,11 +51,11 @@ namespace RTCP {
// The Parset class is a public struct that can be used as base-class
// for holding Parset related information.
// It can be instantiated with a parset containing Parset information.
-class Parset: public ACC::APS::ParameterSet
+class Parset: public ParameterSet
{
public:
Parset();
- Parset(ACC::APS::ParameterSet *aParSet);
+ Parset(ParameterSet *aParSet);
~Parset();
void check() const;
@@ -388,5 +386,4 @@ inline bool Parset::realTime() const
} // namespace RTCP
} // namespace LOFAR
-#endif // defined HAVE_APS
#endif
diff --git a/RTCP/Interface/src/Parset.cc b/RTCP/Interface/src/Parset.cc
index ed184f4cfa9..367273a8908 100644
--- a/RTCP/Interface/src/Parset.cc
+++ b/RTCP/Interface/src/Parset.cc
@@ -23,8 +23,6 @@
//# Always #include <lofar_config.h> first!
#include <lofar_config.h>
-#if defined HAVE_APS
-
//# Includes
#include <Common/LofarLogger.h>
#include <Common/lofar_datetime.h>
@@ -54,9 +52,9 @@ Parset::Parset()
}
-Parset::Parset(ACC::APS::ParameterSet *aParSet)
+Parset::Parset(ParameterSet *aParSet)
:
- ACC::APS::ParameterSet(*aParSet),
+ ParameterSet(*aParSet),
itsObservation(aParSet)
{
check();
@@ -347,5 +345,3 @@ int Parset::findIndex(uint32 pset, const vector<uint32> &psets)
} // namespace RTCP
} // namespace LOFAR
-
-#endif // defined HAVE_APS
diff --git a/RTCP/Storage/configure.in b/RTCP/Storage/configure.in
index 73146d168ff..d2aec9b21be 100644
--- a/RTCP/Storage/configure.in
+++ b/RTCP/Storage/configure.in
@@ -58,7 +58,6 @@ lofar_AIPSPP(0,"-lms -lmeasures -ltables -lscimath -lscimath_f -lcasa")
lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
dnl lofar_INTERNAL(LCS/Transport,Transport,,1,Transport/DataHolder.h,,)
lofar_INTERNAL(LCS/AMC/AMCBase,AMCBase,,1,AMCBase/Epoch.h,,)
-lofar_INTERNAL(LCS/ACC/APS,APS,,1,APS/ParameterSet.h,,)
dnl lofar_INTERNAL(CEP/tinyCEP,tinyCEP,,1,tinyCEP/TinyDataManager.h,,)
dnl lofar_INTERNAL(CEP/CEPFrame,CEPFrame,,1,CEPFrame/DataManager.h,,)
lofar_INTERNAL(RTCP/Interface,Interface,,1,Interface/Parset.h,,)
diff --git a/RTCP/Storage/src/Storage_main.cc b/RTCP/Storage/src/Storage_main.cc
index 12240314b25..ec063f65f8c 100644
--- a/RTCP/Storage/src/Storage_main.cc
+++ b/RTCP/Storage/src/Storage_main.cc
@@ -50,7 +50,7 @@ static void child(int argc, char *argv[], int rank)
LOG_DEBUG_STR("Initialized logsystem with: " << aCL.locate(logPropFile));
std::clog << "trying to use parset \"" << argv[1] << '"' << std::endl;
- ACC::APS::ParameterSet parameterSet(argv[1]);
+ ParameterSet parameterSet(argv[1]);
Parset parset(¶meterSet);
parset.adoptFile("OLAP.parset");
diff --git a/RTCP/Storage/src/SubbandWriter.cc b/RTCP/Storage/src/SubbandWriter.cc
index 1862c0b3915..95897da4f2b 100644
--- a/RTCP/Storage/src/SubbandWriter.cc
+++ b/RTCP/Storage/src/SubbandWriter.cc
@@ -22,7 +22,7 @@
#include <lofar_config.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <Common/LofarLogger.h>
#include <Common/lofar_iomanip.h>
#include <Storage/SubbandWriter.h>
diff --git a/RTCP/Storage/test/AH_TestStorage.cc b/RTCP/Storage/test/AH_TestStorage.cc
index 2d369d5b7d0..b83afd76c28 100644
--- a/RTCP/Storage/test/AH_TestStorage.cc
+++ b/RTCP/Storage/test/AH_TestStorage.cc
@@ -45,7 +45,7 @@ namespace LOFAR
LOG_TRACE_FLOW_STR("Start of tAH_Storage::define()");
- ACC::APS::ParameterSet parameterSet("RTCP.parset");
+ ParameterSet parameterSet("RTCP.parset");
Parset itsPS(¶meterSet);
diff --git a/RTCP/Storage/test/tAH_TestStorage.cc b/RTCP/Storage/test/tAH_TestStorage.cc
index fd5f6a12b78..bf103bb6882 100644
--- a/RTCP/Storage/test/tAH_TestStorage.cc
+++ b/RTCP/Storage/test/tAH_TestStorage.cc
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
THROW(StorageException, std::string("usage: ") << argv[0] << " parset");
std::clog << "trying to use parset \"" << argv[1] << '"' << std::endl;
- ACC::APS::ParameterSet parameterSet(argv[1]);
+ ParameterSet parameterSet(argv[1]);
Parset parset(¶meterSet);
parset.adoptFile("OLAP.parset");
diff --git a/SAS/OTB/jOTDB2/configure.in b/SAS/OTB/jOTDB2/configure.in
index bbd1c9263eb..42c6a58a7d8 100644
--- a/SAS/OTB/jOTDB2/configure.in
+++ b/SAS/OTB/jOTDB2/configure.in
@@ -55,7 +55,6 @@ dnl lofar_BLITZ
dnl lofar_MPI
lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
lofar_INTERNAL(SAS/OTDB,OTDB,,1,OTDB/OTDBnode.h,,)
-lofar_INTERNAL(LCS/ACC/APS,APS,,1,APS/ParameterSet.h,,)
lofar_EXTERNAL(boost,1,boost/date_time/date.hpp, boost_date_time)
lofar_EXTERNAL(pq,,libpq-fe.h, pq, /usr/local/pgsql)
lofar_EXTERNAL(pqxx,2.5.0,pqxx/pqxx, pqxx)
diff --git a/SAS/OTDB/configure.in b/SAS/OTDB/configure.in
index 1903c153e41..20d8e201771 100644
--- a/SAS/OTDB/configure.in
+++ b/SAS/OTDB/configure.in
@@ -52,7 +52,6 @@ dnl Check for LOFAR specific things
dnl
lofar_GENERAL
lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/APS,APS,,1,APS/ParameterSet.h,,)
lofar_EXTERNAL(boost,1,boost/date_time/date.hpp, boost_date_time)
lofar_EXTERNAL(pqxx,2.5.5,pqxx/pqxx, pqxx)
lofar_EXTERNAL(pq,,libpq-fe.h, pq, /usr/local/pgsql)
diff --git a/SAS/OTDB/include/OTDB/TreeValue.h b/SAS/OTDB/include/OTDB/TreeValue.h
index f05d3bf5d6b..1659b91e56c 100644
--- a/SAS/OTDB/include/OTDB/TreeValue.h
+++ b/SAS/OTDB/include/OTDB/TreeValue.h
@@ -31,9 +31,8 @@
#include <OTDB/OTDBconnection.h>
#include <OTDB/OTDBtypes.h>
#include <OTDB/OTDBvalue.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
-using namespace LOFAR::ACC::APS;
namespace LOFAR {
namespace OTDB {
@@ -64,7 +63,7 @@ public:
// Note: This form will probably be used by SAS and OTB when committing
// a list of modified node.
bool addKVTlist (vector<OTDBvalue> aValueList);
- bool addKVTparamSet (const ACC::APS::ParameterSet& aPS);
+ bool addKVTparamSet (const ParameterSet& aPS);
//# SHM queries
// With searchInPeriod a list of all valuechanges in the OTDB tree can
diff --git a/SAS/OTDB/test/Makefile.am b/SAS/OTDB/test/Makefile.am
index 76e16d2b619..bafc496452d 100644
--- a/SAS/OTDB/test/Makefile.am
+++ b/SAS/OTDB/test/Makefile.am
@@ -19,7 +19,7 @@ tVTtree_SOURCES = tVTtree.cc
tVHtree_SOURCES = tVHtree.cc
tVHvalue_SOURCES = tVHvalue.cc
-tVHvalue_LDADD = ../src/libotdb.la -lpqxx -laps
+tVHvalue_LDADD = ../src/libotdb.la -lpqxx
tConnection_SOURCES = tConnection.cc
diff --git a/SAS/OTDB/test/tPICvalue.cc b/SAS/OTDB/test/tPICvalue.cc
index 8eac16075bc..9685003ccec 100644
--- a/SAS/OTDB/test/tPICvalue.cc
+++ b/SAS/OTDB/test/tPICvalue.cc
@@ -27,7 +27,7 @@
#include <Common/LofarLogger.h>
#include <Common/lofar_fstream.h>
#include <Common/lofar_datetime.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <OTDB/TreeMaintenance.h>
#include <OTDB/TreeValue.h>
#include <OTDB/OTDBtypes.h>
diff --git a/SAS/OTDB/test/tVHvalue.cc b/SAS/OTDB/test/tVHvalue.cc
index 68468b9ad54..79568c3fb6d 100644
--- a/SAS/OTDB/test/tVHvalue.cc
+++ b/SAS/OTDB/test/tVHvalue.cc
@@ -27,7 +27,7 @@
#include <Common/LofarLogger.h>
#include <Common/lofar_fstream.h>
#include <Common/lofar_datetime.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include <OTDB/TreeMaintenance.h>
#include <OTDB/TreeValue.h>
#include <OTDB/OTDBtypes.h>
diff --git a/USG/VHECR/src/VHECRTask.cc b/USG/VHECR/src/VHECRTask.cc
index f6eb31db0fd..e510c02472f 100644
--- a/USG/VHECR/src/VHECRTask.cc
+++ b/USG/VHECR/src/VHECRTask.cc
@@ -21,12 +21,11 @@
//# $Id$
#include <lofar_config.h>
#include <Common/LofarLogger.h>
-#include <APS/ParameterSet.h>
+#include <Common/ParameterSet.h>
#include "VHECRTask.h"
namespace LOFAR {
- using namespace ACC::APS;
namespace StationCU {
//
--
GitLab