diff --git a/.gitattributes b/.gitattributes
index 2b0a8ce75b50da10eb37a8b3908aa7c76a1dbc17..c6ea2c76dbeeebe6837ffbff25ec50dcecf72c36 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -852,6 +852,7 @@ CEP/DP3/DPPP/include/DPPP/SourceDBUtil.h -text
CEP/DP3/DPPP/include/DPPP/Stokes.h -text
CEP/DP3/DPPP/include/DPPP/SubtractMixed.h -text
CEP/DP3/DPPP/include/DPPP/SubtractNew.h -text
+CEP/DP3/DPPP/include/DPPP/UVWCalculator.h -text
CEP/DP3/DPPP/package.dox -text
CEP/DP3/DPPP/share/HBAdefault -text
CEP/DP3/DPPP/share/LBAdefault -text
diff --git a/CEP/DP3/DPPP/include/DPPP/UVWCalculator.h b/CEP/DP3/DPPP/include/DPPP/UVWCalculator.h
deleted file mode 100644
index f737d8a48ca97947b228bc8148ecbf69dda309bf..0000000000000000000000000000000000000000
--- a/CEP/DP3/DPPP/include/DPPP/UVWCalculator.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//# UVWCalculator.h: Class to calculate UVW coordinates
-//# Copyright (C) 2010
-//# ASTRON (Netherlands Institute for Radio Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
-//#
-//# This file is part of the LOFAR software suite.
-//# The LOFAR software suite 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 3 of the License, or
-//# (at your option) any later version.
-//#
-//# The LOFAR software suite 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 the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
-//#
-//# $Id$
-//#
-//# @author Ger van Diepen
-
-#ifndef DPPP_UVWCALCULATOR_H
-#define DPPP_UVWCALCULATOR_H
-
-// @file
-// @brief Class to calculate UVW coordinates
-
-#include <Common/LofarLogger.h>
-#include <Common/lofar_vector.h>
-#include <measures/Measures/MeasFrame.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MBaseline.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/Measures/MCPosition.h>
-#include <measures/Measures/MCBaseline.h>
-#include <casa/Arrays/Vector.h>
-
-namespace LOFAR {
- namespace DPPP {
-
- // @ingroup NDPPP
-
- // This class calculates the UVW coordinates for a given baseline and
- // time stamp in the same way as done in LofarStMan.
- //
- // It calculates and caches the UVW coordinates per antenna and combines
- // them to get the baseline UVW coordinates. This is much faster than
- // calculating baseline UVW coordinates directly.
-
- class UVWCalculator
- {
- public:
- // The default constructor creates an empty object.
- UVWCalculator();
-
- // Construct the object for the given phase direction, array position,
- // and station positions.
- UVWCalculator (const casa::MDirection& phaseDir,
- const casa::MPosition& arrayPosition,
- const vector<casa::MPosition>& stationPositions);
-
- // get the UVW coordinates for the given baseline and time.
- casa::Vector<double> getUVW (uint ant1, uint ant2, double time);
-
- private:
- casa::MDirection itsPhaseDir;
- bool itsMovingPhaseDir;
- casa::MDirection::Convert itsDirToJ2000; //# direction to J2000
- casa::MBaseline::Convert itsBLToJ2000; //# convert ITRF to J2000
- casa::MeasFrame itsFrame;
- vector<casa::MBaseline> itsAntMB;
- vector<casa::Vector<double> > itsAntUvw;
- casa::Block<bool> itsUvwFilled;
- double itsLastTime;
- };
-
- } //# end namespace
-}
-
-#endif
diff --git a/CEP/DP3/DPPP/include/DPPP/UVWCalculator.h b/CEP/DP3/DPPP/include/DPPP/UVWCalculator.h
new file mode 120000
index 0000000000000000000000000000000000000000..a38d43b2609036f867340ecec65b0aa5e596fbb1
--- /dev/null
+++ b/CEP/DP3/DPPP/include/DPPP/UVWCalculator.h
@@ -0,0 +1 @@
+../../src/UVWCalculator/UVWCalculator.h
\ No newline at end of file
diff --git a/CEP/DP3/DPPP/src/CMakeLists.txt b/CEP/DP3/DPPP/src/CMakeLists.txt
index cde98ecee4427072b27f1c80fbe978408828eef2..f4409dd72c576d4ba26d2b92c0ed72db9599e07f 100644
--- a/CEP/DP3/DPPP/src/CMakeLists.txt
+++ b/CEP/DP3/DPPP/src/CMakeLists.txt
@@ -7,7 +7,7 @@ lofar_add_library(dppp
Package__Version.cc
DPRun.cc DPStep.cc DPInput.cc DPBuffer.cc DPInfo.cc
DPLogger.cc ProgressMeter.cc FlagCounter.cc
- UVWCalculator.cc BaselineSelection.cc ApplyCal.cc
+ UVWCalculator/UVWCalculator.cc BaselineSelection.cc ApplyCal.cc
MSReader.cc MultiMSReader.cc MSWriter.cc MSUpdater.cc Counter.cc
Averager.cc MedFlagger.cc PreFlagger.cc UVWFlagger.cc
StationAdder.cc ScaleData.cc Filter.cc PhaseShift.cc
diff --git a/CEP/DP3/DPPP/src/UVWCalculator.cc b/CEP/DP3/DPPP/src/UVWCalculator/UVWCalculator.cc
similarity index 98%
rename from CEP/DP3/DPPP/src/UVWCalculator.cc
rename to CEP/DP3/DPPP/src/UVWCalculator/UVWCalculator.cc
index 22fbfdc290cf8037b09f49de1c6dc52677281900..e6041c83eef53e4a1b83799fcdaba108c78a7073 100644
--- a/CEP/DP3/DPPP/src/UVWCalculator.cc
+++ b/CEP/DP3/DPPP/src/UVWCalculator/UVWCalculator.cc
@@ -21,6 +21,8 @@
//#
//# @author Ger van Diepen
+// Note: this code is used by LOFAR and APERTIF software.
+
#include <DPPP/UVWCalculator.h>
#include <measures/Measures/MEpoch.h>
#include <measures/Measures/Muvw.h>
diff --git a/CEP/DP3/DPPP/src/UVWCalculator/UVWCalculator.h b/CEP/DP3/DPPP/src/UVWCalculator/UVWCalculator.h
new file mode 100644
index 0000000000000000000000000000000000000000..2cc9c3f5de2a0a8bb849dc33f7f477e98de56095
--- /dev/null
+++ b/CEP/DP3/DPPP/src/UVWCalculator/UVWCalculator.h
@@ -0,0 +1,86 @@
+//# UVWCalculator.h: Class to calculate UVW coordinates
+//# Copyright (C) 2010
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite 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 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite 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 the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
+//#
+//# @author Ger van Diepen
+
+// Note: this code is used by LOFAR and APERTIF software.
+
+#ifndef DPPP_UVWCALCULATOR_H
+#define DPPP_UVWCALCULATOR_H
+
+// @file
+// @brief Class to calculate UVW coordinates
+
+#include <Common/LofarLogger.h>
+#include <Common/lofar_vector.h>
+#include <measures/Measures/MeasFrame.h>
+#include <measures/Measures/MDirection.h>
+#include <measures/Measures/MPosition.h>
+#include <measures/Measures/MBaseline.h>
+#include <measures/Measures/MeasConvert.h>
+#include <measures/Measures/MCDirection.h>
+#include <measures/Measures/MCPosition.h>
+#include <measures/Measures/MCBaseline.h>
+#include <casa/Arrays/Vector.h>
+
+namespace LOFAR {
+ namespace DPPP {
+
+ // @ingroup NDPPP
+
+ // This class calculates the UVW coordinates for a given baseline and
+ // time stamp in the same way as done in LofarStMan.
+ //
+ // It calculates and caches the UVW coordinates per antenna and combines
+ // them to get the baseline UVW coordinates. This is much faster than
+ // calculating baseline UVW coordinates directly.
+
+ class UVWCalculator
+ {
+ public:
+ // The default constructor creates an empty object.
+ UVWCalculator();
+
+ // Construct the object for the given phase direction, array position,
+ // and station positions.
+ UVWCalculator (const casa::MDirection& phaseDir,
+ const casa::MPosition& arrayPosition,
+ const vector<casa::MPosition>& stationPositions);
+
+ // get the UVW coordinates for the given baseline and time.
+ casa::Vector<double> getUVW (uint ant1, uint ant2, double time);
+
+ private:
+ casa::MDirection itsPhaseDir;
+ bool itsMovingPhaseDir;
+ casa::MDirection::Convert itsDirToJ2000; //# direction to J2000
+ casa::MBaseline::Convert itsBLToJ2000; //# convert ITRF to J2000
+ casa::MeasFrame itsFrame;
+ vector<casa::MBaseline> itsAntMB;
+ vector<casa::Vector<double> > itsAntUvw;
+ casa::Block<bool> itsUvwFilled;
+ double itsLastTime;
+ };
+
+ } //# end namespace
+}
+
+#endif
diff --git a/INSTALL b/INSTALL
index bcf3bbc806415c84bf227640066d7e94b6fbd9e3..e6ec66a18b2b828f9d95fcd32af1227fdcaf48ce 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,7 +7,7 @@ Installation instructions for LOFAR software.
Supported Systems
-----------------
-- Linux (most in use at ASTRON are Ubuntu/Mint and CentOS)
+- Linux (most in use at ASTRON are Ubuntu, CentOS, and SUSE Linux Enterprise)
- Mac OS X (reasonably recent should work, also with LLVM/Clang)
@@ -32,18 +32,17 @@ Dependencies for Manual Build from Source
Please first try to install as many dependencies as possible using your OS
package manager. For almost all cases, you also need the development packages
-('pkgname-dev' for Ubuntu/Mint, or 'pkgname-devel' for CentOS/Fedora).
+('pkgname-dev' for Debian/Ubuntu, or 'pkgname-devel' for CentOS/Fedora).
-For Ubuntu/Mint (likely incomplete list, but goes a long way):
+For Debian/Ubuntu (likely incomplete list, but goes a long way):
apt-get install subversion cmake make g++ gfortran python-dev python-numpy
apt-get install libboost-dev libblitz0-dev libfftw3-dev libcfitsio3-dev libxml2-dev
- apt-get install libpng12-dev # or a newer version (for AOFlagger)
-
+ apt-get install libpng-dev # for AOFlagger
apt-get install libreadline-dev libpqxx-dev doxygen # optional
- apt-get install libunittest++-dev # optional, for tests that use UnitTest++
apt-get install libgsl0-dev # optional, for AOFlagger's RayleighFitter
- apt-get install libgtkmm-2.4-dev libsigc++-2.0-dev # optional, for AOFlagger's rficonsole
+ apt-get install libgtkmm-[2.4|3.0]-dev libsigc++-2.0-dev # optional, for AOFlagger's rficonsole
+ apt-get install libunittest++-dev # optional, for tests that use UnitTest++
For CentOS/Fedora (likely incomplete list, but goes a long way):
@@ -53,7 +52,7 @@ For CentOS/Fedora (likely incomplete list, but goes a long way):
yum install readline-devel libpqxx-devel doxygen # optional
yum install gsl-devel # optional, for AOFlagger's RayleighFitter
- yum install gtkmm24-devel libsigc++20-devel # optional, for AOFlagger's rficonsole
+ yum install gtkmm[24|30]-devel libsigc++20-devel # optional, for AOFlagger's rficonsole
The blitz and blitz-devel pkgs are available on some distros, but not on e.g. CentOS 7.
If required for your build, but not in your repo, take the two RPMs from CentOS 6 (or build from source).
@@ -70,6 +69,8 @@ NOTE (any OS): For manual builds, the most prominent dependency you likely need
IERS/measures tables: https://github.com/casacore/casacore-data-update
casarest: https://svn.astron.nl/casarest
+ AOFlagger: http://sourceforge.net/projects/aoflagger/
+
Instructions for Manual Build from Source
-----------------------------------------