From 16d6dc1c0ff02831b78a91c78d4e9f7a24906f8b Mon Sep 17 00:00:00 2001
From: Ger van Diepen <diepen@astron.nl>
Date: Wed, 21 Mar 2012 13:42:25 +0000
Subject: [PATCH] Task #2699 Moved addImagingInfo to LofarFT to make ImageLofar
obsolete
---
.gitattributes | 2 +-
CEP/Imager/CMakeLists.txt | 1 -
CEP/Imager/LofarFT/TODO.txt | 5 ++---
CEP/Imager/LofarFT/src/CMakeLists.txt | 4 ++++
CEP/Imager/{ImageLofar => LofarFT}/src/addImagingInfo | 0
5 files changed, 7 insertions(+), 5 deletions(-)
rename CEP/Imager/{ImageLofar => LofarFT}/src/addImagingInfo (100%)
diff --git a/.gitattributes b/.gitattributes
index 09d5e2adb0e..9d938e2e0aa 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -793,7 +793,6 @@ CEP/GSM/src/gsmutils.py -text
CEP/GSM/src/lsm.py -text
CEP/GSM/src/ms3_script.py -text
CEP/GSM/src/msssprocess.py -text
-CEP/Imager/ImageLofar/src/addImagingInfo -text
CEP/Imager/LofarFT/TODO.txt -text
CEP/Imager/LofarFT/include/LofarFT/LofarATerm.h -text
CEP/Imager/LofarFT/include/LofarFT/LofarCFDefs.h -text
@@ -808,6 +807,7 @@ CEP/Imager/LofarFT/src/LofarCFStore.cc -text
CEP/Imager/LofarFT/src/LofarCubeSkyEquation.cc -text
CEP/Imager/LofarFT/src/LofarVisibilityResampler.cc -text
CEP/Imager/LofarFT/src/LofarVisibilityResamplerBase.cc -text
+CEP/Imager/LofarFT/src/addImagingInfo -text
CEP/Imager/MWControl/test/tMWControl.in_mpi_out3 -text
CEP/Imager/MWControl/test/tMWControl.in_mpi_out4 -text
CEP/Imager/MWControl/test/tMWControl.in_ms -text
diff --git a/CEP/Imager/CMakeLists.txt b/CEP/Imager/CMakeLists.txt
index 37314bba2ef..dd2d83eb340 100644
--- a/CEP/Imager/CMakeLists.txt
+++ b/CEP/Imager/CMakeLists.txt
@@ -6,4 +6,3 @@ lofar_add_package(MWImager)
#lofar_add_package(LofarGridder)
lofar_add_package(ASKAPsoft)
lofar_add_package(LofarFT)
-lofar_add_package(ImageLofar)
diff --git a/CEP/Imager/LofarFT/TODO.txt b/CEP/Imager/LofarFT/TODO.txt
index 8643f443141..5acccb61671 100644
--- a/CEP/Imager/LofarFT/TODO.txt
+++ b/CEP/Imager/LofarFT/TODO.txt
@@ -4,7 +4,6 @@ TODO
Things that still have to be done (in arbitrary order).
* Code clean-up.
-* Remove unnecessary copy-ing of arrays in LofarConvolutionFunction.
* Proper support for MS with multiple channels / bands (MF in FTMachine).
- How to determine reference frequencies?
- LofarATerm needs to correct the A-term for the response at the phase center for each channel.
@@ -15,11 +14,11 @@ Things that still have to be done (in arbitrary order).
* Allow a facet to be put at the location of a corrupting source.
* MFS from Sanjay (?)
* Parallelisation
-* Gridder optimisation
* Make sure convolution functions are not too large
* Use WEIGHT_SPECTRUM
* Support for multiple image channels
-* Store average PB, etc. in properly named files
* Distributed weighting and gridding (multiple subbands on different nodes)
* Grid PSF and data simultaneously (to reduce data access and conv.func. calculation)
+* Get rid of multiple times writing avgpb and spheriod_cut_im for csclean
+* Implement (de)gridding on GPU
diff --git a/CEP/Imager/LofarFT/src/CMakeLists.txt b/CEP/Imager/LofarFT/src/CMakeLists.txt
index 462d30cd5dd..1846507abf7 100644
--- a/CEP/Imager/LofarFT/src/CMakeLists.txt
+++ b/CEP/Imager/LofarFT/src/CMakeLists.txt
@@ -23,3 +23,7 @@ lofar_add_library(lofarft
lofar_add_bin_program(versionlofarft versionlofarft.cc)
lofar_add_bin_program(awimager awimager.cc)
lofar_add_bin_program(makefftwisdom2d makefftwisdom2d.cc)
+
+install(PROGRAMS
+ addImagingInfo
+ DESTINATION bin)
diff --git a/CEP/Imager/ImageLofar/src/addImagingInfo b/CEP/Imager/LofarFT/src/addImagingInfo
similarity index 100%
rename from CEP/Imager/ImageLofar/src/addImagingInfo
rename to CEP/Imager/LofarFT/src/addImagingInfo
--
GitLab