From 00559881c256c4a0159cb055e22d68a0ea10b66a Mon Sep 17 00:00:00 2001
From: Bram Veenboer <bram.veenboer@gmail.com>
Date: Fri, 24 Jan 2020 14:27:49 +0100
Subject: [PATCH] Move all hamaker related files to hamaker subdirectory

---
 CMakeLists.txt                                |  20 ++++++++----------
 DualDipoleAntenna.cc                          |   1 -
 Station.cc                                    |   2 +-
 TileAntenna.cc                                |   1 -
 hamaker/CMakeLists.txt                        |  12 +++++++++++
 HamakerCoeff.cc => hamaker/HamakerCoeff.cc    |   0
 HamakerCoeff.h => hamaker/HamakerCoeff.h      |   0
 .../HamakerElementResponse.cc                 |   0
 .../HamakerElementResponse.h                  |   2 +-
 .../HamakerHBACoeff.h5                        | Bin
 .../HamakerLBACoeff.h5                        | Bin
 11 files changed, 23 insertions(+), 15 deletions(-)
 create mode 100644 hamaker/CMakeLists.txt
 rename HamakerCoeff.cc => hamaker/HamakerCoeff.cc (100%)
 rename HamakerCoeff.h => hamaker/HamakerCoeff.h (100%)
 rename HamakerElementResponse.cc => hamaker/HamakerElementResponse.cc (100%)
 rename HamakerElementResponse.h => hamaker/HamakerElementResponse.h (95%)
 rename HamakerHBACoeff.h5 => hamaker/HamakerHBACoeff.h5 (100%)
 rename HamakerLBACoeff.h5 => hamaker/HamakerLBACoeff.h5 (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18309141..63af6037 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,15 @@ cmake_minimum_required(VERSION 3.0.0)
 
 project(lofarbeam)
 
+# Configure directory for data files
+set(CMAKE_INSTALL_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
+message("Storing data in: " ${CMAKE_INSTALL_DATA_DIR})
+configure_file(${CMAKE_SOURCE_DIR}/CMake/config.h.in ${CMAKE_BINARY_DIR}/config.h)
+
 add_subdirectory(external)
 
+# Add element models
+add_subdirectory(hamaker)
 add_subdirectory(lobes)
 add_subdirectory(oskar)
 
@@ -12,13 +19,6 @@ cmake_policy(SET CMP0074 NEW)
 find_package(HDF5 COMPONENTS CXX REQUIRED)
 include_directories(${HDF5_INCLUDE_DIR})
 
-set(CMAKE_INSTALL_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
-message("Storing data in: " ${CMAKE_INSTALL_DATA_DIR})
-install(FILES "${CMAKE_SOURCE_DIR}/HamakerHBACoeff.h5" DESTINATION ${CMAKE_INSTALL_DATA_DIR})
-install(FILES "${CMAKE_SOURCE_DIR}/HamakerLBACoeff.h5" DESTINATION ${CMAKE_INSTALL_DATA_DIR})
-
-configure_file(${CMAKE_SOURCE_DIR}/CMake/config.h.in ${CMAKE_BINARY_DIR}/config.h)
-include_directories(${CMAKE_BINARY_DIR})
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake)
 
@@ -36,21 +36,19 @@ add_library(stationresponse SHARED
   AntennaModelLBA.cc
   DualDipoleAntenna.cc
   ElementResponseModel.cc
-  HamakerElementResponse.cc
   ITRFConverter.cc
   ITRFDirection.cc
   LofarMetaDataUtil.cc
   MathUtil.cc
   Station.cc
   TileAntenna.cc
-  Types.cc
-  HamakerCoeff.cc)
+  Types.cc)
 
 set_target_properties(stationresponse PROPERTIES VERSION 3)
 
 target_link_libraries(stationresponse ${CASACORE_LIBRARIES})
 
-target_link_libraries(stationresponse oskar)
+target_link_libraries(stationresponse hamaker oskar)
 
 install (TARGETS stationresponse DESTINATION lib)
 
diff --git a/DualDipoleAntenna.cc b/DualDipoleAntenna.cc
index a327867e..d80e805e 100644
--- a/DualDipoleAntenna.cc
+++ b/DualDipoleAntenna.cc
@@ -24,7 +24,6 @@
 #include "DualDipoleAntenna.h"
 #include "Constants.h"
 #include "MathUtil.h"
-#include "HamakerElementResponse.h"
 
 namespace LOFAR
 {
diff --git a/Station.cc b/Station.cc
index 5a1c98b3..8395b8ca 100644
--- a/Station.cc
+++ b/Station.cc
@@ -23,7 +23,7 @@
 #include "Station.h"
 #include "MathUtil.h"
 
-#include "HamakerElementResponse.h"
+#include "hamaker/HamakerElementResponse.h"
 #include "oskar/OSKARElementResponse.h"
 #include "DualDipoleAntenna.h"
 #include "TileAntenna.h"
diff --git a/TileAntenna.cc b/TileAntenna.cc
index a8b97192..cd5878a8 100644
--- a/TileAntenna.cc
+++ b/TileAntenna.cc
@@ -23,7 +23,6 @@
 #include "TileAntenna.h"
 #include "Constants.h"
 #include "MathUtil.h"
-#include "HamakerElementResponse.h"
 
 namespace LOFAR
 {
diff --git a/hamaker/CMakeLists.txt b/hamaker/CMakeLists.txt
new file mode 100644
index 00000000..0afc29a8
--- /dev/null
+++ b/hamaker/CMakeLists.txt
@@ -0,0 +1,12 @@
+# directory for config.h
+include_directories(${CMAKE_BINARY_DIR})
+
+# build libhamaker.so
+add_library(hamaker SHARED
+  HamakerElementResponse.cc
+  HamakerCoeff.cc)
+
+# install coefficients
+message("install hamaker in: " ${CMAKE_INSTALL_DATA_DIR})
+install(FILES "${CMAKE_SOURCE_DIR}/hamaker/HamakerHBACoeff.h5" DESTINATION ${CMAKE_INSTALL_DATA_DIR})
+install(FILES "${CMAKE_SOURCE_DIR}/hamaker/HamakerLBACoeff.h5" DESTINATION ${CMAKE_INSTALL_DATA_DIR})
\ No newline at end of file
diff --git a/HamakerCoeff.cc b/hamaker/HamakerCoeff.cc
similarity index 100%
rename from HamakerCoeff.cc
rename to hamaker/HamakerCoeff.cc
diff --git a/HamakerCoeff.h b/hamaker/HamakerCoeff.h
similarity index 100%
rename from HamakerCoeff.h
rename to hamaker/HamakerCoeff.h
diff --git a/HamakerElementResponse.cc b/hamaker/HamakerElementResponse.cc
similarity index 100%
rename from HamakerElementResponse.cc
rename to hamaker/HamakerElementResponse.cc
diff --git a/HamakerElementResponse.h b/hamaker/HamakerElementResponse.h
similarity index 95%
rename from HamakerElementResponse.h
rename to hamaker/HamakerElementResponse.h
index ba5ec052..682e0911 100644
--- a/HamakerElementResponse.h
+++ b/hamaker/HamakerElementResponse.h
@@ -1,4 +1,4 @@
-#include "ElementResponse.h"
+#include "../ElementResponse.h"
 #include "HamakerCoeff.h"
 
 #include <memory>
diff --git a/HamakerHBACoeff.h5 b/hamaker/HamakerHBACoeff.h5
similarity index 100%
rename from HamakerHBACoeff.h5
rename to hamaker/HamakerHBACoeff.h5
diff --git a/HamakerLBACoeff.h5 b/hamaker/HamakerLBACoeff.h5
similarity index 100%
rename from HamakerLBACoeff.h5
rename to hamaker/HamakerLBACoeff.h5
-- 
GitLab