From 89e50c26286eaf294593cecdaaa7d8b88f49b380 Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Tue, 26 Apr 2011 09:40:07 +0000
Subject: [PATCH] Bug 1000: AntennaField moved back to APL/APLCommon so
LCS/ApplCommon does not depend on blitz Arrays. LCS/ApplCommon has a AntField
class now that contains the logical that used to be in the AntennaField
class. The 'new' AntennaField class uses the AntField class to readin the
information and presents it as a blitz-array.
---
.gitattributes | 10 +++++-----
LCS/ApplCommon/src/CMakeLists.txt | 1 -
LCS/ApplCommon/test/CMakeLists.txt | 1 -
.../APLCommon/include/APL/APLCommon}/AntennaField.h | 0
.../APL/APLCommon}/src/AntennaField.cc | 2 +-
MAC/APL/APLCommon/src/CMakeLists.txt | 1 +
MAC/APL/APLCommon/test/CMakeLists.txt | 1 +
.../APL/APLCommon}/test/tAntennaField.cc | 2 +-
.../APL/APLCommon}/test/tAntennaField.in | 0
.../APL/APLCommon}/test/tAntennaField.sh | 0
.../APL/APLCommon}/test/tAntennaField.stdout | 0
MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc | 2 +-
MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc | 2 +-
MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc | 2 +-
MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc | 2 +-
MAC/APL/StationCU/src/TBBControl/TBBControl.h | 2 +-
MAC/APL/VHECR/include/VHECR/VHECRsettings.h | 2 +-
17 files changed, 15 insertions(+), 15 deletions(-)
rename {LCS/ApplCommon/include/ApplCommon => MAC/APL/APLCommon/include/APL/APLCommon}/AntennaField.h (100%)
rename {LCS/ApplCommon => MAC/APL/APLCommon}/src/AntennaField.cc (99%)
rename {LCS/ApplCommon => MAC/APL/APLCommon}/test/tAntennaField.cc (98%)
rename {LCS/ApplCommon => MAC/APL/APLCommon}/test/tAntennaField.in (100%)
rename {LCS/ApplCommon => MAC/APL/APLCommon}/test/tAntennaField.sh (100%)
rename {LCS/ApplCommon => MAC/APL/APLCommon}/test/tAntennaField.stdout (100%)
diff --git a/.gitattributes b/.gitattributes
index 972eda9c040..aa5734fe4af 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -856,15 +856,10 @@ JAVA/MAC/jRSP/.cvsignore -text
LCS/AMC/AMCImpl/src/AMCServer.cc -text
LCS/AMC/amc_main_classes.png -text
LCS/AMC/amc_package.png -text
-LCS/ApplCommon/include/ApplCommon/AntennaField.h -text
LCS/ApplCommon/include/ApplCommon/StationDatatypes.h -text
-LCS/ApplCommon/src/AntennaField.cc -text
LCS/ApplCommon/src/StationDatatypes.cc -text
LCS/ApplCommon/test/tAntField.in_de -text
LCS/ApplCommon/test/tAntField.in_rs -text
-LCS/ApplCommon/test/tAntennaField.cc -text
-LCS/ApplCommon/test/tAntennaField.in -text
-LCS/ApplCommon/test/tAntennaField.sh -text
LCS/ApplCommon/test/tAntennaUse.cc -text
LCS/ApplCommon/test/tAntennaUse.in_1 -text
LCS/ApplCommon/test/tAntennaUse.in_2 -text
@@ -1070,9 +1065,14 @@ LCU/StationTest/xc_160_setup.sh eol=lf
LCU/StationTest/xc_160_verify.sh eol=lf
LCU/StationTest/xc_200_setup.sh eol=lf
LCU/StationTest/xc_200_verify.sh eol=lf
+MAC/APL/APLCommon/include/APL/APLCommon/AntennaField.h -text
+MAC/APL/APLCommon/src/AntennaField.cc -text
MAC/APL/APLCommon/src/StartDaemon_Protocol.prot -text svneol=native#application/octet-stream
MAC/APL/APLCommon/test/ControllerProtMenu.cc -text
MAC/APL/APLCommon/test/ControllerProtMenu.h -text
+MAC/APL/APLCommon/test/tAntennaField.cc -text
+MAC/APL/APLCommon/test/tAntennaField.in -text
+MAC/APL/APLCommon/test/tAntennaField.sh -text
MAC/APL/APLCommon/test/tParentControl.cc -text
MAC/APL/APLCommon/test/tParentControl.h -text
MAC/APL/APLCommon/test/tParentControl.log_prop -text
diff --git a/LCS/ApplCommon/src/CMakeLists.txt b/LCS/ApplCommon/src/CMakeLists.txt
index b98b8fa899c..b5f596ea609 100644
--- a/LCS/ApplCommon/src/CMakeLists.txt
+++ b/LCS/ApplCommon/src/CMakeLists.txt
@@ -5,7 +5,6 @@ include(LofarPackageVersion)
lofar_add_library(applcommon
Package__Version.cc
AntField.cc
- AntennaField.cc
AntennaSets.cc
Observation.cc
StationConfig.cc
diff --git a/LCS/ApplCommon/test/CMakeLists.txt b/LCS/ApplCommon/test/CMakeLists.txt
index 7537906ae79..0db098b7d07 100644
--- a/LCS/ApplCommon/test/CMakeLists.txt
+++ b/LCS/ApplCommon/test/CMakeLists.txt
@@ -3,6 +3,5 @@
include(LofarCTest)
lofar_add_test(tAntField tAntField.cc)
-lofar_add_test(tAntennaField tAntennaField.cc)
lofar_add_test(tAntennaSet tAntennaSet.cc)
lofar_add_test(tObservation tObservation.cc)
diff --git a/LCS/ApplCommon/include/ApplCommon/AntennaField.h b/MAC/APL/APLCommon/include/APL/APLCommon/AntennaField.h
similarity index 100%
rename from LCS/ApplCommon/include/ApplCommon/AntennaField.h
rename to MAC/APL/APLCommon/include/APL/APLCommon/AntennaField.h
diff --git a/LCS/ApplCommon/src/AntennaField.cc b/MAC/APL/APLCommon/src/AntennaField.cc
similarity index 99%
rename from LCS/ApplCommon/src/AntennaField.cc
rename to MAC/APL/APLCommon/src/AntennaField.cc
index 389607d1ede..645fd708e93 100644
--- a/LCS/ApplCommon/src/AntennaField.cc
+++ b/MAC/APL/APLCommon/src/AntennaField.cc
@@ -24,7 +24,7 @@
#include <lofar_config.h>
//# Includes
-#include <ApplCommon/AntennaField.h>
+#include <APL/APLCommon/AntennaField.h>
#include <Common/LofarLogger.h>
using namespace blitz;
diff --git a/MAC/APL/APLCommon/src/CMakeLists.txt b/MAC/APL/APLCommon/src/CMakeLists.txt
index e9023faab3c..834db3dd4d9 100644
--- a/MAC/APL/APLCommon/src/CMakeLists.txt
+++ b/MAC/APL/APLCommon/src/CMakeLists.txt
@@ -11,6 +11,7 @@ lofar_add_library(aplcommon
Package__Version.cc
StartDaemon_Protocol.cc
Controller_Protocol.cc
+ AntennaField.cc
APLUtilities.cc
ControllerDefines.cc
CTState.cc
diff --git a/MAC/APL/APLCommon/test/CMakeLists.txt b/MAC/APL/APLCommon/test/CMakeLists.txt
index 9af2ba2dc19..f7aec8dbd25 100644
--- a/MAC/APL/APLCommon/test/CMakeLists.txt
+++ b/MAC/APL/APLCommon/test/CMakeLists.txt
@@ -6,6 +6,7 @@ include(LofarCTest)
include_directories(${PACKAGE_BINARY_DIR}/src)
lofar_add_test(tControllerDefines tControllerDefines.cc)
+lofar_add_test(tAntennaField tAntennaField.cc)
lofar_add_test(tAPLUtilities tAPLUtilities.cc)
lofar_add_test(tbitsetUtil tbitsetUtil.cc)
lofar_add_test(tOutOfBand tOutOfBand.cc)
diff --git a/LCS/ApplCommon/test/tAntennaField.cc b/MAC/APL/APLCommon/test/tAntennaField.cc
similarity index 98%
rename from LCS/ApplCommon/test/tAntennaField.cc
rename to MAC/APL/APLCommon/test/tAntennaField.cc
index 497e7b8ab4d..db80c0572c2 100644
--- a/LCS/ApplCommon/test/tAntennaField.cc
+++ b/MAC/APL/APLCommon/test/tAntennaField.cc
@@ -26,7 +26,7 @@
//# Includes
#include <Common/LofarLogger.h>
#include <Common/StreamUtil.h>
-#include <ApplCommon/AntennaField.h>
+#include <APL/APLCommon/AntennaField.h>
using namespace LOFAR;
diff --git a/LCS/ApplCommon/test/tAntennaField.in b/MAC/APL/APLCommon/test/tAntennaField.in
similarity index 100%
rename from LCS/ApplCommon/test/tAntennaField.in
rename to MAC/APL/APLCommon/test/tAntennaField.in
diff --git a/LCS/ApplCommon/test/tAntennaField.sh b/MAC/APL/APLCommon/test/tAntennaField.sh
similarity index 100%
rename from LCS/ApplCommon/test/tAntennaField.sh
rename to MAC/APL/APLCommon/test/tAntennaField.sh
diff --git a/LCS/ApplCommon/test/tAntennaField.stdout b/MAC/APL/APLCommon/test/tAntennaField.stdout
similarity index 100%
rename from LCS/ApplCommon/test/tAntennaField.stdout
rename to MAC/APL/APLCommon/test/tAntennaField.stdout
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc b/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc
index 27e5a71069f..8701cc89fbc 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc
@@ -25,7 +25,7 @@
#include <Common/LofarLocators.h>
#include <Common/LofarConstants.h>
#include <ApplCommon/AntennaSets.h>
-#include <ApplCommon/AntennaField.h>
+#include <APL/APLCommon/AntennaField.h>
#include <APL/RTCCommon/PSAccess.h> // ParameterSet macros
#include <APL/RSP_Protocol/RSP_Protocol.ph>
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
index b87f3bfaf80..83ad0185b11 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
@@ -29,11 +29,11 @@
#include <Common/ParameterSet.h>
#include <Common/StreamUtil.h>
#include <ApplCommon/StationConfig.h>
-#include <ApplCommon/AntennaField.h>
#include <ApplCommon/AntennaSets.h>
#include <MACIO/MACServiceInfo.h>
+#include <APL/APLCommon/AntennaField.h>
#include <APL/IBS_Protocol/IBS_Protocol.ph>
#include <APL/RSP_Protocol/RSP_Protocol.ph>
#include <APL/CAL_Protocol/CAL_Protocol.ph>
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc b/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc
index 1811ed2bb61..ec52d06ec82 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc
@@ -26,8 +26,8 @@
#include <Common/LofarLocators.h>
#include <Common/lofar_complex.h>
#include <Common/StringUtil.h>
-#include <ApplCommon/AntennaField.h>
#include <ApplCommon/AntennaSets.h>
+#include <APL/APLCommon/AntennaField.h>
#include <APL/CAL_Protocol/SpectralWindow.h>
#include <blitz/array.h>
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc b/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc
index 1e79fdc15b3..f4511a5de9f 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc
@@ -26,8 +26,8 @@
#include <Common/LofarLocators.h>
#include <Common/lofar_complex.h>
#include <Common/StringUtil.h>
-#include <ApplCommon/AntennaField.h>
#include <ApplCommon/AntennaSets.h>
+#include <APL/APLCommon/AntennaField.h>
#include <APL/CAL_Protocol/SpectralWindow.h>
#include <blitz/array.h>
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBControl.h b/MAC/APL/StationCU/src/TBBControl/TBBControl.h
index 33d93e5aed7..6647a4c50e9 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBControl.h
+++ b/MAC/APL/StationCU/src/TBBControl/TBBControl.h
@@ -27,7 +27,7 @@
#include <Common/LofarLogger.h>
#include <Common/lofar_string.h>
#include <Common/lofar_datetime.h>
-#include <ApplCommon/AntennaField.h>
+#include <APL/APLCommon/AntennaField.h>
//# ACC Includes
#include <Common/ParameterSet.h>
diff --git a/MAC/APL/VHECR/include/VHECR/VHECRsettings.h b/MAC/APL/VHECR/include/VHECR/VHECRsettings.h
index 2ce05000f98..a14f3c7e6b3 100644
--- a/MAC/APL/VHECR/include/VHECR/VHECRsettings.h
+++ b/MAC/APL/VHECR/include/VHECR/VHECRsettings.h
@@ -33,7 +33,7 @@
#include <Common/LofarTypes.h>
#include <Common/lofar_bitset.h>
#include <Common/LofarConstants.h>
-#include <ApplCommon/AntennaField.h>
+#include <APL/APLCommon/AntennaField.h>
namespace LOFAR {
namespace VHECR {
--
GitLab