diff --git a/CEP/Calibration/BBSControl/include/BBSControl/CommandHandlerReducer.h b/CEP/Calibration/BBSControl/include/BBSControl/CommandHandlerReducer.h
index b10f8a7247a6c90bfed66dfad8d2fed8ea8883f6..ed84f4a31eefd0b9cb037ed33ddcde930709a927 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/CommandHandlerReducer.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/CommandHandlerReducer.h
@@ -39,7 +39,7 @@
#include <Common/lofar_map.h>
#include <Common/lofar_string.h>
#include <Common/lofar_vector.h>
-#include <casa/OS/Path.h>
+#include <casacore/casa/OS/Path.h>
namespace LOFAR
{
@@ -55,7 +55,7 @@ class CommandHandlerReducer: public CommandVisitor
public:
CommandHandlerReducer(const ProcessGroup &group,
const Measurement::Ptr &measurement, const ParmDB &parmDB,
- const SourceDB &sourceDB, const casa::Path &logPath);
+ const SourceDB &sourceDB, const casacore::Path &logPath);
// Returns true if a FinalizeCommand has been received.
bool hasFinished() const;
@@ -96,7 +96,7 @@ private:
Measurement::Ptr itsMeasurement;
ParmDB itsParmDB;
SourceDB itsSourceDB;
- casa::Path itsLogPath;
+ casacore::Path itsLogPath;
bool itsHasFinished;
int itsChunkCount;
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/GlobalProcessControl.h b/CEP/Calibration/BBSControl/include/BBSControl/GlobalProcessControl.h
index 57b8d0ab431dd2ae8b883068f91e673c9bac7b58..b4498f6b3f2b3db81ea9b603b5c039f6a332a488 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/GlobalProcessControl.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/GlobalProcessControl.h
@@ -80,7 +80,7 @@ namespace LOFAR
N_State
};
- // Compare two axes for equality within a tolerance (using casa::near()).
+ // Compare two axes for equality within a tolerance (using casacore::near()).
bool equal(const Axis::ShPtr &lhs, const Axis::ShPtr &rhs) const;
// Get the global time axis and verify consistency across all parts.
diff --git a/CEP/Calibration/BBSControl/include/BBSControl/SolveStep.h b/CEP/Calibration/BBSControl/include/BBSControl/SolveStep.h
index ac0c0b3ae94ee53767af05cfd55ddf8c49d48715..79fb82b0d214cdfba62572e0eb2e3e497c6a5f42 100644
--- a/CEP/Calibration/BBSControl/include/BBSControl/SolveStep.h
+++ b/CEP/Calibration/BBSControl/include/BBSControl/SolveStep.h
@@ -33,7 +33,7 @@
#include <Common/lofar_vector.h>
#include <Common/lofar_string.h>
-#include <measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MDirection.h>
namespace LOFAR
@@ -116,7 +116,7 @@ namespace LOFAR
bool shift() const
{ return itsShiftFlag; }
- casa::MDirection direction() const
+ casacore::MDirection direction() const
{ return itsDirection; }
unsigned int maxIter() const
@@ -197,7 +197,7 @@ namespace LOFAR
// TODO: Extend casacore with I/O stream operators for MDirection
// instances (alla MVAngle but including the reference type, e.g. J2000).
vector<string> itsDirectionASCII;
- casa::MDirection itsDirection;
+ casacore::MDirection itsDirection;
// Maximum number of iterations.
unsigned int itsMaxIter;
diff --git a/CEP/Calibration/BBSControl/src/CommandHandlerReducer.cc b/CEP/Calibration/BBSControl/src/CommandHandlerReducer.cc
index 798b833e36f5a569be61d3b6186892b337045fda..ec6c5094ae7eafae99c7ccf6c5c8d8d8d2069143 100644
--- a/CEP/Calibration/BBSControl/src/CommandHandlerReducer.cc
+++ b/CEP/Calibration/BBSControl/src/CommandHandlerReducer.cc
@@ -60,7 +60,7 @@ namespace
CommandHandlerReducer::CommandHandlerReducer(const ProcessGroup &group,
const Measurement::Ptr &measurement, const ParmDB &parmDB,
- const SourceDB &sourceDB, const casa::Path &logPath)
+ const SourceDB &sourceDB, const casacore::Path &logPath)
: itsProcessGroup(group),
itsMeasurement(measurement),
itsParmDB(parmDB),
@@ -138,9 +138,9 @@ CommandResult CommandHandlerReducer::visit(const NextChunkCommand &command)
itsMeasurement->grid()[FREQ]->range();
ASSERT((freqRangeObs.first >= freqRangeCmd.first
- || casa::near(freqRangeObs.first, freqRangeCmd.first))
+ || casacore::near(freqRangeObs.first, freqRangeCmd.first))
&& (freqRangeObs.second <= freqRangeCmd.second
- || casa::near(freqRangeObs.second, freqRangeCmd.second)));
+ || casacore::near(freqRangeObs.second, freqRangeCmd.second)));
// Update domain.
const pair<double, double> timeRangeCmd(command.getTimeRange());
@@ -470,7 +470,7 @@ CommandResult CommandHandlerReducer::visit(const SolveStep &command)
options.setEpsilon(command.epsilon().begin(), command.epsilon().end());
// Open solution log.
- casa::Path path(itsLogPath);
+ casacore::Path path(itsLogPath);
path.append(command.logName());
ParmDBLog log(path.expandedName(), ParmDBLoglevel(command.logLevel()).get(),
itsChunkCount == 0);
diff --git a/CEP/Calibration/BBSControl/src/GlobalProcessControl.cc b/CEP/Calibration/BBSControl/src/GlobalProcessControl.cc
index 314b519910ff4f24df1827f46c5f211d2676582b..cc1d54dd0a668300ffa803c6b993631b6cba220f 100644
--- a/CEP/Calibration/BBSControl/src/GlobalProcessControl.cc
+++ b/CEP/Calibration/BBSControl/src/GlobalProcessControl.cc
@@ -36,8 +36,8 @@
#include <Common/LofarLogger.h>
#include <Common/lofar_algorithm.h>
-#include <casa/Quanta/Quantum.h>
-#include <casa/Quanta/MVTime.h>
+#include <casacore/casa/Quanta/Quantum.h>
+#include <casacore/casa/Quanta/MVTime.h>
// sleep()
#include <unistd.h>
@@ -170,8 +170,8 @@ namespace LOFAR
const vector<string> &window = itsStrategy.timeRange();
- casa::Quantity time;
- if(!window.empty() && casa::MVTime::read(time, window[0])) {
+ casacore::Quantity time;
+ if(!window.empty() && casacore::MVTime::read(time, window[0])) {
const pair<size_t, bool> result =
itsGlobalTimeAxis->find(time.getValue("s"));
@@ -180,7 +180,7 @@ namespace LOFAR
}
}
- if(window.size() > 1 && casa::MVTime::read(time, window[1])) {
+ if(window.size() > 1 && casacore::MVTime::read(time, window[1])) {
const pair<size_t, bool> result =
itsGlobalTimeAxis->find(time.getValue("s"), false);
@@ -444,7 +444,7 @@ namespace LOFAR
//##-------- P r i v a t e m e t h o d s --------##//
- // Compare two axes for equality within a tolerance (using casa::near()).
+ // Compare two axes for equality within a tolerance (using casacore::near()).
bool GlobalProcessControl::equal(const Axis::ShPtr &lhs,
const Axis::ShPtr &rhs) const
{
@@ -453,14 +453,14 @@ namespace LOFAR
}
if(lhs->isRegular() && rhs->isRegular()) {
- return casa::near(lhs->start(), rhs->start())
- && casa::near(lhs->end(), rhs->end());
+ return casacore::near(lhs->start(), rhs->start())
+ && casacore::near(lhs->end(), rhs->end());
}
for(size_t i = 0, end = lhs->size(); i < end; ++i)
{
- if(casa::near(lhs->center(i), rhs->center(i))
- && casa::near(lhs->width(i), rhs->width(i))) {
+ if(casacore::near(lhs->center(i), rhs->center(i))
+ && casacore::near(lhs->width(i), rhs->width(i))) {
continue;
}
diff --git a/CEP/Calibration/BBSControl/src/KernelProcessControl.cc b/CEP/Calibration/BBSControl/src/KernelProcessControl.cc
index c1f8df8c1cd545f4262fdd7d6c672f830bed12ab..a1a73326b36efb8314be270c594799a4d3d23396 100644
--- a/CEP/Calibration/BBSControl/src/KernelProcessControl.cc
+++ b/CEP/Calibration/BBSControl/src/KernelProcessControl.cc
@@ -76,7 +76,7 @@
#include <BBSKernel/Apply.h>
#include <BBSKernel/Estimate.h>
-#include <casa/OS/Path.h>
+#include <casacore/casa/OS/Path.h>
namespace LOFAR
{
@@ -399,9 +399,9 @@ namespace LOFAR
itsMeasurement->grid()[FREQ]->range();
ASSERT((freqRangeObs.first >= freqRangeCmd.first
- || casa::near(freqRangeObs.first, freqRangeCmd.first))
+ || casacore::near(freqRangeObs.first, freqRangeCmd.first))
&& (freqRangeObs.second <= freqRangeCmd.second
- || casa::near(freqRangeObs.second, freqRangeCmd.second)));
+ || casacore::near(freqRangeObs.second, freqRangeCmd.second)));
// Update domain.
const pair<double, double> timeRangeCmd(command.getTimeRange());
@@ -923,7 +923,7 @@ namespace LOFAR
options.setEpsilon(command.epsilon().begin(), command.epsilon().end());
// Open solution log.
- casa::Path path(itsPath);
+ casacore::Path path(itsPath);
path.append(command.logName());
ParmDBLog log(path.absoluteName(),
ParmDBLoglevel(command.logLevel()).get(), itsChunkCount == 0);
diff --git a/CEP/Calibration/BBSControl/src/Messages.cc b/CEP/Calibration/BBSControl/src/Messages.cc
index 0d98b55de9ee63d9d74ecc51fc0268078126fa78..0b9fa2f324aacac1b8308ad485ed829d0a7f09ed 100644
--- a/CEP/Calibration/BBSControl/src/Messages.cc
+++ b/CEP/Calibration/BBSControl/src/Messages.cc
@@ -31,9 +31,9 @@
#include <Blob/BlobAipsIO.h>
#include <Blob/BlobSTL.h>
-#include <casa/Containers/Record.h>
-#include <casa/IO/AipsIO.h>
-#include <casa/BasicSL/String.h>
+#include <casacore/casa/Containers/Record.h>
+#include <casacore/casa/IO/AipsIO.h>
+#include <casacore/casa/BasicSL/String.h>
namespace LOFAR
{
diff --git a/CEP/Calibration/BBSControl/src/NextChunkCommand.cc b/CEP/Calibration/BBSControl/src/NextChunkCommand.cc
index 623810e39d04437d4576b653ec3fefad432c4a75..2faec75990bdc748c0ce42d95ff84e33e3e0707f 100644
--- a/CEP/Calibration/BBSControl/src/NextChunkCommand.cc
+++ b/CEP/Calibration/BBSControl/src/NextChunkCommand.cc
@@ -28,8 +28,8 @@
#include <Common/lofar_iomanip.h>
#include <Common/ParameterSet.h>
-#include <casa/Quanta/Quantum.h>
-#include <casa/Quanta/MVTime.h>
+#include <casacore/casa/Quanta/Quantum.h>
+#include <casacore/casa/Quanta/MVTime.h>
namespace LOFAR
{
@@ -71,11 +71,11 @@ namespace LOFAR
<< " - " << setprecision(3) << itsFreqRange.second / 1e6 << " MHz"
<< endl;
os << "Time: "
- << casa::MVTime::Format(casa::MVTime::YMD, 6)
- << casa::MVTime(casa::Quantum<casa::Double>(itsTimeRange.first, "s"))
+ << casacore::MVTime::Format(casacore::MVTime::YMD, 6)
+ << casacore::MVTime(casacore::Quantum<casacore::Double>(itsTimeRange.first, "s"))
<< " - "
- << casa::MVTime::Format(casa::MVTime::YMD, 6)
- << casa::MVTime(casa::Quantum<casa::Double>(itsTimeRange.second, "s"))
+ << casacore::MVTime::Format(casacore::MVTime::YMD, 6)
+ << casacore::MVTime(casacore::Quantum<casacore::Double>(itsTimeRange.second, "s"))
<< endl;
}
diff --git a/CEP/Calibration/BBSControl/src/SolveStep.cc b/CEP/Calibration/BBSControl/src/SolveStep.cc
index 3c07d32bb2892d4449190edffba8be70bb05413a..c8e8e1d2decad753efa513b42f68b5743309dde6 100644
--- a/CEP/Calibration/BBSControl/src/SolveStep.cc
+++ b/CEP/Calibration/BBSControl/src/SolveStep.cc
@@ -30,7 +30,7 @@
#include <Common/LofarLogger.h>
#include <Common/lofar_iomanip.h>
-#include <casa/Quanta/MVAngle.h>
+#include <casacore/casa/Quanta/MVAngle.h>
#include <limits>
@@ -266,7 +266,7 @@ namespace LOFAR
vector<double>(defThreshold, defThreshold + 10));
}
- itsDirection = casa::MDirection();
+ itsDirection = casacore::MDirection();
itsDirectionASCII = vector<string>();
itsShiftFlag = ps.getBool(sp+"PhaseShift.Enable", false);
if(itsShiftFlag) {
@@ -331,7 +331,7 @@ namespace LOFAR
void SolveStep::setDirection(const ParameterSet& ps, const string prefix)
{
- // Parse PhaseShift.Direction value and convert to casa::MDirection.
+ // Parse PhaseShift.Direction value and convert to casacore::MDirection.
itsDirectionASCII = ps.getStringVector(prefix+"PhaseShift.Direction");
if(itsDirectionASCII.size() != 3)
{
@@ -339,14 +339,14 @@ namespace LOFAR
<< name());
}
- casa::Bool status = true;
- casa::MDirection::Types refType;
- status = status && casa::MDirection::getType(refType,
+ casacore::Bool status = true;
+ casacore::MDirection::Types refType;
+ status = status && casacore::MDirection::getType(refType,
itsDirectionASCII[0]);
- casa::Quantity ra, dec;
- status = status && casa::MVAngle::read(ra, itsDirectionASCII[1]);
- status = status && casa::MVAngle::read(dec, itsDirectionASCII[2]);
+ casacore::Quantity ra, dec;
+ status = status && casacore::MVAngle::read(ra, itsDirectionASCII[1]);
+ status = status && casacore::MVAngle::read(dec, itsDirectionASCII[2]);
if(!status)
{
@@ -354,7 +354,7 @@ namespace LOFAR
<< name());
}
- itsDirection = casa::MDirection(ra, dec, refType);
+ itsDirection = casacore::MDirection(ra, dec, refType);
}
diff --git a/CEP/Calibration/BBSControl/src/Util.cc b/CEP/Calibration/BBSControl/src/Util.cc
index 6e7dd0e458fbe63060ce698ed1f4a8dac0706d3a..b60f07ff786898cddf0f4711df8fff070f35c809 100644
--- a/CEP/Calibration/BBSControl/src/Util.cc
+++ b/CEP/Calibration/BBSControl/src/Util.cc
@@ -22,9 +22,9 @@
#include <lofar_config.h>
#include <BBSControl/Util.h>
-#include <casa/Quanta/Quantum.h>
-#include <casa/Quanta/MVTime.h>
-#include <casa/BasicMath/Math.h>
+#include <casacore/casa/Quanta/Quantum.h>
+#include <casacore/casa/Quanta/MVTime.h>
+#include <casacore/casa/BasicMath/Math.h>
namespace LOFAR
{
@@ -83,8 +83,8 @@ pair<size_t, size_t> parseTimeRange(const Axis::ShPtr &axis,
double start = axis->start(), end = axis->end();
if(range.size() > 0)
{
- casa::Quantity time;
- if(!casa::MVTime::read(time, range[0]))
+ casacore::Quantity time;
+ if(!casacore::MVTime::read(time, range[0]))
{
THROW(BBSControlException, errorMessage << range[0]);
}
@@ -94,8 +94,8 @@ pair<size_t, size_t> parseTimeRange(const Axis::ShPtr &axis,
if(range.size() > 1)
{
- casa::Quantity time;
- if(!casa::MVTime::read(time, range[1]))
+ casacore::Quantity time;
+ if(!casacore::MVTime::read(time, range[1]))
{
THROW(BBSControlException, errorMessage << range[1]);
}
@@ -103,8 +103,8 @@ pair<size_t, size_t> parseTimeRange(const Axis::ShPtr &axis,
end = time.getValue("s");
}
- if(axis->size() == 0 || start > axis->end() || casa::near(start, axis->end())
- || end < axis->start() || casa::near(end, axis->start()))
+ if(axis->size() == 0 || start > axis->end() || casacore::near(start, axis->end())
+ || end < axis->start() || casacore::near(end, axis->start()))
{
// Axis and range do not overlap.
return pair<size_t, size_t>(1, 0);
diff --git a/CEP/Calibration/BBSControl/src/bbs-controller.cc b/CEP/Calibration/BBSControl/src/bbs-controller.cc
index ee11d46875973589f53ac0d4c8e7896b5751213e..dfd7275ee7dab5bbc9f55ba08327dec88d3fb9ae 100644
--- a/CEP/Calibration/BBSControl/src/bbs-controller.cc
+++ b/CEP/Calibration/BBSControl/src/bbs-controller.cc
@@ -35,7 +35,7 @@
#include <Common/LofarLogger.h>
#include <Common/StreamUtil.h>
#include <Common/SystemUtil.h>
-#include <casa/BasicMath/Math.h>
+#include <casacore/casa/BasicMath/Math.h>
#include <unistd.h>
using namespace LOFAR;
@@ -45,7 +45,7 @@ using LOFAR::operator<<;
// Use a terminate handler that can produce a backtrace.
Exception::TerminateHandler handler(Exception::terminate);
-// Compare two axes for equality within tolerance (using casa::near()).
+// Compare two axes for equality within tolerance (using casacore::near()).
bool equal(const Axis::ShPtr &lhs, const Axis::ShPtr &rhs);
// Try to combine the time axes of all the reducer processes into a single
@@ -337,13 +337,13 @@ bool equal(const Axis::ShPtr &lhs, const Axis::ShPtr &rhs)
if(lhs->isRegular() && rhs->isRegular())
{
- return casa::near(lhs->start(), rhs->start()) && casa::near(lhs->end(),
+ return casacore::near(lhs->start(), rhs->start()) && casacore::near(lhs->end(),
rhs->end());
}
for(size_t i = 0, end = lhs->size(); i < end; ++i)
{
- if(casa::near(lhs->center(i), rhs->center(i)) && casa::near(lhs->width(i),
+ if(casacore::near(lhs->center(i), rhs->center(i)) && casacore::near(lhs->width(i),
rhs->width(i)))
{
continue;
diff --git a/CEP/Calibration/BBSControl/src/bbs-reducer.cc b/CEP/Calibration/BBSControl/src/bbs-reducer.cc
index 3c65d21c21b7969d52c982177377e6057260f705..2ca891b679cee4d58f6a501b073a78ddad5f73e7 100644
--- a/CEP/Calibration/BBSControl/src/bbs-reducer.cc
+++ b/CEP/Calibration/BBSControl/src/bbs-reducer.cc
@@ -168,16 +168,16 @@ int main(int argc, char *argv[])
int run(const ParameterSet &options, const OptionParser::ArgumentList &args)
{
- casa::Path pathMS(args[1]);
+ casacore::Path pathMS(args[1]);
MeasurementAIPS::Ptr ms(new MeasurementAIPS(pathMS.absoluteName()));
- casa::Path pathSourceDB(pathMS);
+ casacore::Path pathSourceDB(pathMS);
pathSourceDB.append("sky");
SourceDB sourceDB(ParmDBMeta("casa", options.getString("SourceDB",
pathSourceDB.absoluteName())));
ParmManager::instance().initCategory(SKY, sourceDB.getParmDB());
- casa::Path pathParmDB(pathMS);
+ casacore::Path pathParmDB(pathMS);
pathParmDB.append("instrument");
ParmDB parmDB(ParmDBMeta("casa", options.getString("ParmDB",
pathParmDB.absoluteName())));
@@ -237,7 +237,7 @@ int run(const ParameterSet &options, const OptionParser::ArgumentList &args)
Interval<double>(msFreqRange.first, msFreqRange.second),
Interval<double>(msTimeRange.first, msTimeRange.second));
- casa::Path logPath(options.getString("LogPath", args[1]));
+ casacore::Path logPath(options.getString("LogPath", args[1]));
CommandHandlerReducer handler(group, ms, parmDB, sourceDB, logPath);
// Fake initialization.
@@ -334,16 +334,16 @@ int run(const ParameterSet &options, const OptionParser::ArgumentList &args)
int runDistributed(const ParameterSet &options,
const OptionParser::ArgumentList &args)
{
- casa::Path pathMS(args[2]);
+ casacore::Path pathMS(args[2]);
MeasurementAIPS::Ptr ms(new MeasurementAIPS(pathMS.absoluteName()));
- casa::Path pathSourceDB(pathMS);
+ casacore::Path pathSourceDB(pathMS);
pathSourceDB.append("sky");
SourceDB sourceDB(ParmDBMeta("casa", options.getString("SourceDB",
pathSourceDB.absoluteName())));
ParmManager::instance().initCategory(SKY, sourceDB.getParmDB());
- casa::Path pathParmDB(pathMS);
+ casacore::Path pathParmDB(pathMS);
pathParmDB.append("instrument");
ParmDB parmDB(ParmDBMeta("casa", options.getString("ParmDB",
pathParmDB.absoluteName())));
@@ -385,7 +385,7 @@ int runDistributed(const ParameterSet &options,
// Process commands until finished.
bool wait = false;
- casa::Path logPath(options.getString("LogPath", args[2]));
+ casacore::Path logPath(options.getString("LogPath", args[2]));
CommandHandlerReducer handler(makeProcessGroup(session), ms, parmDB, sourceDB,
logPath);
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/EstimateUtil.h b/CEP/Calibration/BBSKernel/include/BBSKernel/EstimateUtil.h
index f0fd346fc8ae758b37ad1e79654faa51df833071..ebfe316b9ba834097ca62e486bdba85955e9c976 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/EstimateUtil.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/EstimateUtil.h
@@ -37,7 +37,7 @@
#include <cmath>
-#include <scimath/Fitting/LSQFit.h>
+#include <casacore/scimath/Fitting/LSQFit.h>
//# For the definition of SolverOptions...
#include <BBSKernel/Solver.h>
@@ -63,7 +63,7 @@ Interval<size_t> findIntersection(const Axis::ShPtr &axis,
string toString(const NSTimer &timer);
// Apply the provided options to \p solver.
-void configLSQSolver(casa::LSQFit &solver, const SolverOptions &options);
+void configLSQSolver(casacore::LSQFit &solver, const SolverOptions &options);
// Functors that modify observed and simulated visibilities (and partial
// derivatives) for amplitude or phase only comparison. SampleModifierComplex
@@ -377,7 +377,7 @@ Interval<size_t> makeAxisMap(const Axis::ShPtr &from, const Axis::ShPtr &to,
Interval<double> overlap(max(from->start(), to->start()), min(from->end(),
to->end()));
- if(overlap.start >= overlap.end || casa::near(overlap.start, overlap.end))
+ if(overlap.start >= overlap.end || casacore::near(overlap.start, overlap.end))
{
return Interval<size_t>(1, 0);
}
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/AzEl.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/AzEl.h
index b3eb24fb033116e8a7805de578d3ef76a574597f..e86934097532132a60121fdb374ccd123dc8303b 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/AzEl.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/AzEl.h
@@ -28,7 +28,7 @@
#include <BBSKernel/Expr/BasicExpr.h>
-#include <measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MPosition.h>
namespace LOFAR
{
@@ -46,7 +46,7 @@ public:
typedef shared_ptr<AzEl> Ptr;
typedef shared_ptr<const AzEl> ConstPtr;
- AzEl(const casa::MPosition &position,
+ AzEl(const casacore::MPosition &position,
const Expr<Vector<2> >::ConstPtr &direction);
protected:
@@ -54,7 +54,7 @@ protected:
const Vector<2>::View &direction) const;
private:
- casa::MPosition itsPosition;
+ casacore::MPosition itsPosition;
};
// @}
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprVisData.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprVisData.h
index d7da107bd5717f4ea159366acf7efbc256dd1b3f..aa4ba86b7b22bb8d84728fe72fecc5f2df628d5c 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprVisData.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprVisData.h
@@ -95,7 +95,7 @@ void ExprVisData::makeAxisMapping(const Axis::ShPtr &from,
Interval<double> overlap(std::max(from->start(), to->start()),
std::min(from->end(), to->end()));
- if(overlap.start >= overlap.end || casa::near(overlap.start, overlap.end))
+ if(overlap.start >= overlap.end || casacore::near(overlap.start, overlap.end))
{
return;
}
@@ -111,7 +111,7 @@ void ExprVisData::makeAxisMapping(const Axis::ShPtr &from,
// the overlap between the "from" and "to" axis.
size_t target = 0;
double center = from->center(domain.start);
- if(center > overlap.start || casa::near(center, overlap.start))
+ if(center > overlap.start || casacore::near(center, overlap.start))
{
target = to->locate(center);
*out++ = make_pair(domain.start, target);
@@ -128,7 +128,7 @@ void ExprVisData::makeAxisMapping(const Axis::ShPtr &from,
// Special case for the last cell: cell center may be located outside of
// the overlap between the "from" and "to" axis.
center = from->center(domain.end);
- if(center < overlap.end && !casa::near(center, overlap.end))
+ if(center < overlap.end && !casacore::near(center, overlap.end))
{
target = to->locate(center, false, target);
*out++ = make_pair(domain.end, target);
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExternalFunction.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExternalFunction.h
index 84cdc68ebef490f819e206cd6ebe87e743294ee8..dbe226dc6a4ccca4cdbfb5bc8c10ea06ddb45136 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExternalFunction.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExternalFunction.h
@@ -45,7 +45,7 @@ namespace BBS
class ExternalFunction
{
public:
- ExternalFunction(const casa::Path &module, const string &name);
+ ExternalFunction(const casacore::Path &module, const string &name);
~ExternalFunction();
unsigned int nArguments() const;
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ITRFDirection.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ITRFDirection.h
index aff41ee11eeaedf3e3b255202c0545ce7cc4c083..93cf150f6ff74ab4f22be34aa04537d9315ec4de 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ITRFDirection.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ITRFDirection.h
@@ -28,7 +28,7 @@
// Compute ITRF direction vector for a J2000 direction (RA, DEC) on the sky.
#include <BBSKernel/Expr/BasicExpr.h>
-#include <measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MPosition.h>
namespace LOFAR
{
@@ -45,7 +45,7 @@ public:
typedef shared_ptr<ITRFDirection> Ptr;
typedef shared_ptr<const ITRFDirection> ConstPtr;
- ITRFDirection(const casa::MPosition &position,
+ ITRFDirection(const casacore::MPosition &position,
const Expr<Vector<2> >::ConstPtr &direction);
protected:
@@ -53,7 +53,7 @@ protected:
const Vector<2>::View &direction) const;
private:
- casa::MPosition itsPosition;
+ casacore::MPosition itsPosition;
};
// @}
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/LMN.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/LMN.h
index d88a5ca2764ab8756a12b8bb4e461a9bec4574ff..ca04dee7cf7fbcdd4be393430705fb09c969b246 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/LMN.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/LMN.h
@@ -28,7 +28,7 @@
#include <BBSKernel/Expr/BasicExpr.h>
-#include <measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MDirection.h>
namespace LOFAR
{
@@ -44,7 +44,7 @@ public:
typedef shared_ptr<LMN> Ptr;
typedef shared_ptr<const LMN> ConstPtr;
- LMN(const casa::MDirection &reference,
+ LMN(const casacore::MDirection &reference,
const Expr<Vector<2> >::ConstPtr &direction);
protected:
@@ -52,7 +52,7 @@ protected:
const Vector<2>::View &direction) const;
private:
- casa::MDirection itsPhaseReference;
+ casacore::MDirection itsPhaseReference;
};
// @}
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Matrix.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Matrix.h
index bc4ae24328b2ff1c241e0078034be9035e745109..6eb7b6a6126659cb6055e4e4b37e87e65d35d316 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Matrix.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Matrix.h
@@ -80,8 +80,8 @@ public:
// @{
Matrix (const double* values, int nx, int ny);
Matrix (const dcomplex* values, int nx, int ny);
-//# Matrix (const casa::Matrix<double>&);
-//# Matrix (const casa::Matrix<dcomplex>&);
+//# Matrix (const casacore::Matrix<double>&);
+//# Matrix (const casacore::Matrix<dcomplex>&);
// @}
// Create a Matrix from a MatrixRep.
@@ -144,8 +144,8 @@ public:
bool isComplex() const
{ return itsRep->isComplex(); }
-//# casa::Matrix<double> getDoubleMatrix() const;
-//# casa::Matrix<dcomplex> getDComplexMatrix() const;
+//# casacore::Matrix<double> getDoubleMatrix() const;
+//# casacore::Matrix<dcomplex> getDComplexMatrix() const;
const double* doubleStorage() const
{ return itsRep->doubleStorage(); }
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixRep.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixRep.h
index e2de2438b56e6d20f9c80b63edd915675d98dc11..f554522e5fbdbfd014eead74356d12ea0c875bb3 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixRep.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixRep.h
@@ -30,7 +30,7 @@
#include <Common/lofar_complex.h>
//#include <Common/lofar_iostream.h>
#include <iostream>
-#include <casa/iosfwd.h>
+#include <casacore/casa/iosfwd.h>
#if defined _OPENMP
#include <omp.h>
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/PiercePoint.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/PiercePoint.h
index 41886dc2988c3ea67a719e43fa5daa8563da3a58..8a390dada8ac48315f139a19923c7ed8ea62176d 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/PiercePoint.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/PiercePoint.h
@@ -35,7 +35,7 @@
#include <BBSKernel/Expr/BasicExpr.h>
-#include <measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MPosition.h>
namespace LOFAR
{
@@ -51,7 +51,7 @@ public:
typedef shared_ptr<PiercePoint> Ptr;
typedef shared_ptr<const PiercePoint> ConstPtr;
- PiercePoint(const casa::MPosition &position,
+ PiercePoint(const casacore::MPosition &position,
const Expr<Vector<3> >::ConstPtr &direction,
const Expr<Scalar>::ConstPtr &height);
@@ -61,7 +61,7 @@ protected:
private:
// Station position in ITRF coordinates.
- casa::MPosition itsPosition;
+ casacore::MPosition itsPosition;
// Geodetic longitude (rad), geodetic latittude (rad), and height above the
// ellipsoid (m) (WGS84) of the station.
double itsLon, itsLat, itsHeight;
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/PolynomialLayer.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/PolynomialLayer.h
index 480e691cdc5f690aa95c8fd019293e0be2bc085f..831a82bff1c93009feffb2761b909abea3a5df8c 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/PolynomialLayer.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/PolynomialLayer.h
@@ -30,9 +30,9 @@
#include <BBSKernel/Expr/Expr.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MCPosition.h>
-#include <measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/measures/Measures/MeasConvert.h>
namespace LOFAR
{
@@ -49,7 +49,7 @@ public:
typedef shared_ptr<const PolynomialLayer> ConstPtr;
template <typename T_ITER>
- PolynomialLayer(const casa::MPosition &refStation,
+ PolynomialLayer(const casacore::MPosition &refStation,
const Expr<Vector<4> >::ConstPtr &pp, T_ITER first, T_ITER last);
virtual ~PolynomialLayer();
@@ -65,7 +65,7 @@ protected:
const Vector<4>::View &pp, const vector<Scalar::View> &coeff) const;
private:
- casa::MPosition itsRefStation;
+ casacore::MPosition itsRefStation;
Expr<Vector<4> >::ConstPtr itsPiercePoint;
vector<Expr<Scalar>::ConstPtr> itsCoeff;
};
@@ -77,10 +77,10 @@ private:
// -------------------------------------------------------------------------- //
template <typename T_ITER>
-PolynomialLayer::PolynomialLayer(const casa::MPosition &refStation,
+PolynomialLayer::PolynomialLayer(const casacore::MPosition &refStation,
const Expr<Vector<4> >::ConstPtr &pp, T_ITER first, T_ITER last)
- : itsRefStation(casa::MPosition::Convert(refStation,
- casa::MPosition::ITRF)()),
+ : itsRefStation(casacore::MPosition::Convert(refStation,
+ casacore::MPosition::ITRF)()),
itsPiercePoint(pp),
itsCoeff(first, last)
{
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Resampler.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Resampler.h
index b688ba9f87557f9e330bd946d3726d2a674cf921..af882c8dac9bb9e93db2c640d94c4def21bd4459 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Resampler.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Resampler.h
@@ -28,7 +28,7 @@
#include <BBSKernel/Expr/Expr.h>
-#include <casa/BasicMath/Math.h>
+#include <casacore/casa/BasicMath/Math.h>
#include <iterator>
namespace LOFAR
@@ -84,8 +84,8 @@ void Resampler::makeAxisMap(const Axis::ShPtr &from, const Axis::ShPtr &to,
// is guaranteed because the domains of the two grid has to be the same) and
// they should contain at least a single cell.
DBGASSERT(from->size() > 0 && to->size() > 0);
- DBGASSERT(casa::near(from->lower(0), to->lower(0)));
- DBGASSERT(casa::near(from->upper(from->size() - 1),
+ DBGASSERT(casacore::near(from->lower(0), to->lower(0)));
+ DBGASSERT(casacore::near(from->upper(from->size() - 1),
to->upper(to->size() - 1)));
const size_t nFrom = from->size();
@@ -99,7 +99,7 @@ void Resampler::makeAxisMap(const Axis::ShPtr &from, const Axis::ShPtr &to,
span.src = i;
span.dst = j;
- if(casa::near(from->upper(i), to->upper(j)))
+ if(casacore::near(from->upper(i), to->upper(j)))
{
span.weight = (to->upper(j) - lower) / from->width(i);
lower = to->upper(j);
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ShapeletCoherence.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ShapeletCoherence.h
index eed6cbf4f1222f0fd3784b401c8acddd49e80807..a85a7676238d132e5c916125036b117b65c2a824 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ShapeletCoherence.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ShapeletCoherence.h
@@ -31,7 +31,7 @@
#include <BBSKernel/Expr/BasicExpr.h>
#include <Common/lofar_complex.h>
-#include <casa/Arrays.h>
+#include <casacore/casa/Arrays.h>
namespace LOFAR
{
@@ -49,7 +49,7 @@ public:
typedef shared_ptr<const ShapeletCoherence> ConstPtr;
ShapeletCoherence(const Expr<Vector<4> >::ConstPtr stokes, double scaleI,
- const casa::Array<double> &coeffI,
+ const casacore::Array<double> &coeffI,
const Expr<Vector<3> >::ConstPtr &uvwA,
const Expr<Vector<3> >::ConstPtr &uvwB);
@@ -60,11 +60,11 @@ protected:
virtual const JonesMatrix::View evaluateImplI(const Grid &grid,
const Vector<4>::View &stokes, double scaleI,
- const casa::Array<double> &coeffI, const Vector<3>::View &uvwA,
+ const casacore::Array<double> &coeffI, const Vector<3>::View &uvwA,
const Vector<3>::View &uvwB) const;
double itsShapeletScaleI_;
- casa::Array<double> itsShapeletCoeffI_;
+ casacore::Array<double> itsShapeletCoeffI_;
};
// @}
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ShapeletSource.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ShapeletSource.h
index 4a6f842f81dc497166e0faa1bc1ca1b1dc720c44..7ada619651762f97ee449e3b915a0f143ffc677b 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ShapeletSource.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ShapeletSource.h
@@ -29,7 +29,7 @@
#include <BBSKernel/Expr/Source.h>
#include <Common/lofar_complex.h>
-#include <casa/Arrays.h>
+#include <casacore/casa/Arrays.h>
namespace LOFAR
{
@@ -56,10 +56,10 @@ private:
double itsShapeletScaleU;
double itsShapeletScaleV;
- casa::Array<double> itsShapeletCoeffI; // shapelet coefficients I-flux
- casa::Array<double> itsShapeletCoeffQ;
- casa::Array<double> itsShapeletCoeffU;
- casa::Array<double> itsShapeletCoeffV;
+ casacore::Array<double> itsShapeletCoeffI; // shapelet coefficients I-flux
+ casacore::Array<double> itsShapeletCoeffQ;
+ casacore::Array<double> itsShapeletCoeffU;
+ casacore::Array<double> itsShapeletCoeffV;
};
// @}
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/StationUVW.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/StationUVW.h
index 87a57fcd194dbae8bd94881d8bbf684053ed90fc..a74b394b79a05d30c0a65a90704ee807f992cc2a 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/StationUVW.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/StationUVW.h
@@ -28,8 +28,8 @@
#include <BBSKernel/Expr/Expr.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MDirection.h>
namespace LOFAR
{
@@ -45,18 +45,18 @@ public:
typedef shared_ptr<StationUVW> Ptr;
typedef shared_ptr<const StationUVW> ConstPtr;
- StationUVW(const casa::MPosition &arrayPosition,
- const casa::MPosition &stationPosition,
- const casa::MDirection &direction);
+ StationUVW(const casacore::MPosition &arrayPosition,
+ const casacore::MPosition &stationPosition,
+ const casacore::MDirection &direction);
protected:
virtual const Vector<3> evaluateExpr(const Request &request, Cache &cache,
unsigned int grid) const;
private:
- casa::MPosition itsArrayPosition;
- casa::MPosition itsStationPosition;
- casa::MDirection itsDirection;
+ casacore::MPosition itsArrayPosition;
+ casacore::MPosition itsStationPosition;
+ casacore::MDirection itsDirection;
};
// @}
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Instrument.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Instrument.h
index 6ed563c52cae169458c6c0adf4a695bd3947d8ed..bada96b1ec41bdabce72e17c7832f592fa232a55 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Instrument.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Instrument.h
@@ -32,7 +32,7 @@
#include <Common/lofar_smartptr.h>
#include <Common/lofar_string.h>
#include <Common/lofar_vector.h>
-#include <measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MPosition.h>
namespace LOFAR
{
@@ -48,15 +48,15 @@ public:
typedef shared_ptr<Station> Ptr;
typedef shared_ptr<const Station> ConstPtr;
- Station(const string &name, const casa::MPosition &position);
+ Station(const string &name, const casacore::MPosition &position);
virtual ~Station();
const string &name() const;
- const casa::MPosition &position() const;
+ const casacore::MPosition &position() const;
private:
string itsName;
- casa::MPosition itsPosition;
+ casacore::MPosition itsPosition;
};
class Instrument
@@ -65,14 +65,14 @@ public:
typedef shared_ptr<Instrument> Ptr;
typedef shared_ptr<const Instrument> ConstPtr;
- Instrument(const string &name, const casa::MPosition &position);
+ Instrument(const string &name, const casacore::MPosition &position);
template <typename T>
- Instrument(const string &name, const casa::MPosition &position, T first,
+ Instrument(const string &name, const casacore::MPosition &position, T first,
T last);
const string &name() const;
- const casa::MPosition &position() const;
+ const casacore::MPosition &position() const;
unsigned int nStations() const;
Station::ConstPtr station(unsigned int i) const;
@@ -82,7 +82,7 @@ public:
private:
string itsName;
- casa::MPosition itsPosition;
+ casacore::MPosition itsPosition;
map<string, unsigned int> itsIndex;
vector<Station::Ptr> itsStations;
};
@@ -94,7 +94,7 @@ private:
// -------------------------------------------------------------------------- //
template <typename T>
-Instrument::Instrument(const string &name, const casa::MPosition &position,
+Instrument::Instrument(const string &name, const casacore::MPosition &position,
T first, T last)
: itsName(name),
itsPosition(position),
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/IonosphereExpr.h b/CEP/Calibration/BBSKernel/include/BBSKernel/IonosphereExpr.h
index 8a6a6090731bdc09eb7c99e2c962168d33293ad5..15c1b5d5df84aa112e0ffbcb0e9d64539e16d32e 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/IonosphereExpr.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/IonosphereExpr.h
@@ -61,8 +61,8 @@ public:
virtual ~IonosphereExpr();
- virtual Expr<JonesMatrix>::Ptr construct(const casa::MPosition &refPosition,
- const casa::MPosition &station, const Expr<Vector<3> >::ConstPtr &direction)
+ virtual Expr<JonesMatrix>::Ptr construct(const casacore::MPosition &refPosition,
+ const casacore::MPosition &station, const Expr<Vector<3> >::ConstPtr &direction)
const = 0;
};
@@ -74,8 +74,8 @@ public:
MIMExpr(const IonosphereConfig &config, Scope &scope);
- virtual Expr<JonesMatrix>::Ptr construct(const casa::MPosition &refPosition,
- const casa::MPosition &station, const Expr<Vector<3> >::ConstPtr &direction)
+ virtual Expr<JonesMatrix>::Ptr construct(const casacore::MPosition &refPosition,
+ const casacore::MPosition &station, const Expr<Vector<3> >::ConstPtr &direction)
const;
private:
@@ -91,8 +91,8 @@ public:
ExpIonExpr(const IonosphereConfig&, Scope &scope);
- virtual Expr<JonesMatrix>::Ptr construct(const casa::MPosition &refPosition,
- const casa::MPosition &station, const Expr<Vector<3> >::ConstPtr &direction)
+ virtual Expr<JonesMatrix>::Ptr construct(const casacore::MPosition &refPosition,
+ const casacore::MPosition &station, const Expr<Vector<3> >::ConstPtr &direction)
const;
private:
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Measurement.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Measurement.h
index eadb414c15a1835a1e19ae0914ec6a9973908a0a..8e7c0afbd239f9c7552b9ce95a1f26b0d4c4eea8 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Measurement.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Measurement.h
@@ -29,7 +29,7 @@
#include <BBSKernel/VisDimensions.h>
#include <BBSKernel/VisSelection.h>
-#include <measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MDirection.h>
namespace LOFAR
{
@@ -70,9 +70,9 @@ public:
virtual BaselineMask asMask(const string &filter) const = 0;
double getReferenceFreq() const;
- const casa::MDirection &getPhaseReference() const;
- const casa::MDirection &getDelayReference() const;
- const casa::MDirection &getTileReference() const;
+ const casacore::MDirection &getPhaseReference() const;
+ const casacore::MDirection &getDelayReference() const;
+ const casacore::MDirection &getTileReference() const;
Instrument::ConstPtr instrument() const;
const VisDimensions &dims() const;
@@ -93,9 +93,9 @@ public:
protected:
double itsReferenceFreq;
- casa::MDirection itsPhaseReference;
- casa::MDirection itsDelayReference;
- casa::MDirection itsTileReference;
+ casacore::MDirection itsPhaseReference;
+ casacore::MDirection itsDelayReference;
+ casacore::MDirection itsTileReference;
Instrument::Ptr itsInstrument;
VisDimensions itsDims;
};
@@ -120,17 +120,17 @@ inline double Measurement::getReferenceFreq() const
return itsReferenceFreq;
}
-inline const casa::MDirection &Measurement::getPhaseReference() const
+inline const casacore::MDirection &Measurement::getPhaseReference() const
{
return itsPhaseReference;
}
-inline const casa::MDirection &Measurement::getDelayReference() const
+inline const casacore::MDirection &Measurement::getDelayReference() const
{
return itsDelayReference;
}
-inline const casa::MDirection &Measurement::getTileReference() const
+inline const casacore::MDirection &Measurement::getTileReference() const
{
return itsTileReference;
}
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/MeasurementAIPS.h b/CEP/Calibration/BBSKernel/include/BBSKernel/MeasurementAIPS.h
index 7c41318b1cfa64cdf5c0e4227dc04d134346c5a5..98a36a980a3d644a64b7673889bcee0e09f86fe6 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/MeasurementAIPS.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/MeasurementAIPS.h
@@ -28,9 +28,9 @@
#include <Common/LofarTypes.h>
#include <Common/ParameterSet.h>
-#include <casa/Arrays/Slicer.h>
-#include <ms/MeasurementSets/MeasurementSet.h>
-#include <tables/Tables/ExprNodeSet.h>
+#include <casacore/casa/Arrays/Slicer.h>
+#include <casacore/ms/MeasurementSets/MeasurementSet.h>
+#include <casacore/tables/TaQL/ExprNodeSet.h>
namespace LOFAR
{
@@ -80,17 +80,17 @@ private:
void createVisibilityColumn(const string &name);
void createCovarianceColumn(const string &name);
- casa::MDirection getColumnPhaseReference(const string &column) const;
+ casacore::MDirection getColumnPhaseReference(const string &column) const;
- casa::Table getVisSelection(casa::Table table,
+ casacore::Table getVisSelection(casacore::Table table,
const VisSelection &selection) const;
- casa::Table getBaselineSelection(const casa::Table &table,
+ casacore::Table getBaselineSelection(const casacore::Table &table,
const string &pattern) const;
BaselineMask getBaselineMask(const VisSelection &selection) const;
Interval<size_t> getChannelRange(const VisSelection &selection) const;
- casa::Slicer getCellSlicer(const VisSelection &selection) const;
- casa::Slicer getCovarianceSlicer(const VisSelection &selection,
+ casacore::Slicer getCellSlicer(const VisSelection &selection) const;
+ casacore::Slicer getCovarianceSlicer(const VisSelection &selection,
const string &column) const;
string getLinkedCovarianceColumn(const string &column,
@@ -98,16 +98,16 @@ private:
void setLinkedCovarianceColumn(const string &column,
const string &linkedColumn);
- casa::Array<casa::Float>
- reformatCovarianceArray(const casa::Array<casa::Float> &in,
+ casacore::Array<casacore::Float>
+ reformatCovarianceArray(const casacore::Array<casacore::Float> &in,
unsigned int nCorrelations, unsigned int nFreq, unsigned int nRows)
const;
- VisDimensions getDimensionsImpl(const casa::Table &tab_selection,
- const casa::Slicer &slicer) const;
+ VisDimensions getDimensionsImpl(const casacore::Table &tab_selection,
+ const casacore::Slicer &slicer) const;
- casa::MeasurementSet itsMS;
- casa::Table itsMainTableView;
+ casacore::MeasurementSet itsMS;
+ casacore::Table itsMainTableView;
bool itsFreqAxisReversed;
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/MeasurementExprLOFAR.h b/CEP/Calibration/BBSKernel/include/BBSKernel/MeasurementExprLOFAR.h
index 53f55c6a5166001c2d3ef442aa8f4fd7a41d1841..3d4e53daa790e320927b76f43b18b7ee6805d339 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/MeasurementExprLOFAR.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/MeasurementExprLOFAR.h
@@ -45,7 +45,7 @@
#include <Common/lofar_vector.h>
#include <Common/lofar_map.h>
-#include <measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MDirection.h>
namespace LOFAR
{
@@ -66,9 +66,9 @@ public:
const Instrument::ConstPtr &instrument,
const BaselineSeq &baselines,
double refFreq,
- const casa::MDirection &refPhase,
- const casa::MDirection &refDelay,
- const casa::MDirection &refTile,
+ const casacore::MDirection &refPhase,
+ const casacore::MDirection &refDelay,
+ const casacore::MDirection &refTile,
bool circular = false);
MeasurementExprLOFAR(SourceDB &sourceDB,
@@ -108,9 +108,9 @@ private:
const ModelConfig &config,
const Instrument::ConstPtr &instrument,
double refFreq,
- const casa::MDirection &refPhase,
- const casa::MDirection &refDelay,
- const casa::MDirection &refTile,
+ const casacore::MDirection &refPhase,
+ const casacore::MDirection &refDelay,
+ const casacore::MDirection &refTile,
bool circular);
void makeInverseExpr(SourceDB &sourceDB,
@@ -125,7 +125,7 @@ private:
vector<string> makePatchList(SourceDB &sourceDB, vector<string> patterns);
PatchExprBase::Ptr makePatchExpr(const string &name,
- const casa::MDirection &phaseRef,
+ const casacore::MDirection &phaseRef,
SourceDB &sourceDB,
const BufferMap &buffers);
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/MeasurementExprLOFARUtil.h b/CEP/Calibration/BBSKernel/include/BBSKernel/MeasurementExprLOFARUtil.h
index 45b8cd2ed948f8aed955e104cd91ee30c4563ea2..9dcd8cd55cab3921119ef13c728895af8ef65eef 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/MeasurementExprLOFARUtil.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/MeasurementExprLOFARUtil.h
@@ -36,8 +36,8 @@
#include <BBSKernel/Expr/Source.h>
#include <Common/lofar_string.h>
#include <Common/lofar_vector.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MPosition.h>
namespace LOFAR
{
@@ -47,24 +47,24 @@ namespace BBS
// @{
Expr<Vector<2> >::Ptr
-makeDirectionExpr(const casa::MDirection &direction);
+makeDirectionExpr(const casacore::MDirection &direction);
Expr<Vector<2> >::Ptr
-makeAzElExpr(const casa::MPosition &position,
+makeAzElExpr(const casacore::MPosition &position,
const Expr<Vector<2> >::Ptr &direction);
Expr<Vector<3> >::Ptr
-makeITRFExpr(const casa::MPosition &position,
+makeITRFExpr(const casacore::MPosition &position,
const Expr<Vector<2> >::Ptr &direction);
Expr<Vector<3> >::Ptr
-makeLMNExpr(const casa::MDirection &reference,
+makeLMNExpr(const casacore::MDirection &reference,
const Expr<Vector<2> >::Ptr &direction);
Expr<Vector<3> >::Ptr
-makeStationUVWExpr(const casa::MPosition &arrayPosition,
- const casa::MPosition &stationPosition,
- const casa::MDirection &direction);
+makeStationUVWExpr(const casacore::MPosition &arrayPosition,
+ const casacore::MPosition &stationPosition,
+ const casacore::MDirection &direction);
Expr<Vector<2> >::Ptr
makeStationShiftExpr(const Expr<Vector<3> >::Ptr &exprUVW,
@@ -138,7 +138,7 @@ makeScalarPhaseExpr(Scope &scope,
Expr<JonesMatrix>::Ptr
makeIonosphereExpr(const Station::ConstPtr &station,
- const casa::MPosition &refPosition,
+ const casacore::MPosition &refPosition,
const Expr<Vector<3> >::Ptr &exprDirection,
const IonosphereExpr::Ptr &exprIonosphere);
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/ParmManager.h b/CEP/Calibration/BBSKernel/include/BBSKernel/ParmManager.h
index 7c412c118db2870b8ec666975a2e81e0095454c4..3ce913dc2c5c93951fdd8aac0b419e73a8a9fc31 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/ParmManager.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/ParmManager.h
@@ -94,8 +94,8 @@ private:
friend class Singleton<ParmManagerImpl>;
- bool isIncluded(const string &candidate, const vector<casa::Regex> &include,
- const vector<casa::Regex> &exclude) const;
+ bool isIncluded(const string &candidate, const vector<casacore::Regex> &include,
+ const vector<casacore::Regex> &exclude) const;
const ParmDB &getParmDBForCategory(unsigned int category) const;
ParmDB &getParmDBForCategory(unsigned int category);
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/ParmProxy.h b/CEP/Calibration/BBSKernel/include/BBSKernel/ParmProxy.h
index aa3b514a225d48662390d81051c58b8f34cce0aa..f19ac42e6d2d4222c2c590600d8bbf7bc95ba6f8 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/ParmProxy.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/ParmProxy.h
@@ -79,10 +79,10 @@ public:
void setGrid(const Grid &grid)
{ itsParm.setSolveGrid(grid); }
- void getResult(casa::Array<double> &result, const Grid &grid) const
+ void getResult(casacore::Array<double> &result, const Grid &grid) const
{ itsParm.getResult(result, grid); }
- void getResult(vector<casa::Array<double> > &result, const Grid &grid,
+ void getResult(vector<casacore::Array<double> > &result, const Grid &grid,
bool perturbed = false) const
{ itsParm.getResult(result, grid, perturbed); }
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/PatchExpr.h b/CEP/Calibration/BBSKernel/include/BBSKernel/PatchExpr.h
index e99f875fa2a78b27c1b291f2a7ddcb85db210f77..637b2ed1ae20cc0ea976e416a1c0394e0a756778 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/PatchExpr.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/PatchExpr.h
@@ -32,7 +32,7 @@
#include <BBSKernel/Expr/Expr.h>
#include <BBSKernel/Expr/Source.h>
#include <ParmDB/SourceDB.h>
-#include <measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MDirection.h>
namespace LOFAR
{
@@ -71,7 +71,7 @@ public:
typedef shared_ptr<const PatchExpr> ConstPtr;
PatchExpr(Scope &scope, SourceDB &sourceDB, const string &name,
- const casa::MDirection &refPhase);
+ const casacore::MDirection &refPhase);
// \name PatchExprBase interface implementation.
// These methods form an implementation of the PatchExprBase interface. See
@@ -90,7 +90,7 @@ private:
void initSourceList(Scope &scope, SourceDB &sourceDB, const string &name);
void initPositionExpr(const vector<Source::Ptr> &sources);
void initLMNExpr(const vector<Source::Ptr> &sources,
- const casa::MDirection &refPhase);
+ const casacore::MDirection &refPhase);
Expr<Vector<2> >::Ptr makeStationShiftExpr(unsigned int station,
unsigned int source, const Expr<Vector<3> >::Ptr &uvw) const;
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Solver.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Solver.h
index 55065c23379fa20478c8bf89d95eac8c8d26f9d4..01ff61e5726c9849d40018b155897db7d23efa71 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Solver.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Solver.h
@@ -29,7 +29,7 @@
#include <Common/lofar_map.h>
#include <Common/LofarLogger.h>
-#include <scimath/Fitting/LSQFit.h>
+#include <casacore/scimath/Fitting/LSQFit.h>
namespace LOFAR
{
@@ -99,19 +99,19 @@ private:
//# which is worked around by #define-ing the values explicitly. There must
//# be a better way to do this, e.g. check for the casacore version in the
//# build system and dealing with the problem there.
- static const unsigned int NONREADY = 0; //# casa::LSQFit::NONREADY
- static const unsigned int NC = 0; //# casa::LSQFit::NC
- static const unsigned int SUMLL = 2; //# casa::LSQFit::SUMLL
+ static const unsigned int NONREADY = 0; //# casacore::LSQFit::NONREADY
+ static const unsigned int NC = 0; //# casacore::LSQFit::NC
+ static const unsigned int SUMLL = 2; //# casacore::LSQFit::SUMLL
struct Cell
{
- casa::LSQFit solver;
+ casacore::LSQFit solver;
vector<double> coeff;
};
map<size_t, Cell> itsCells;
CoeffIndex itsCoeffIndex;
- map<size_t, vector<casa::uInt> > itsCoeffMapping;
+ map<size_t, vector<casacore::uInt> > itsCoeffMapping;
double itsEpsValue;
double itsEpsDerivative;
@@ -130,10 +130,10 @@ void Solver::setCoeff(size_t kernelId, T_ITER first, T_ITER last)
{
const size_t nCoeff = itsCoeffIndex.getCoeffCount();
- map<size_t, vector<casa::uInt> >::const_iterator it =
+ map<size_t, vector<casacore::uInt> >::const_iterator it =
itsCoeffMapping.find(kernelId);
ASSERT(it != itsCoeffMapping.end());
- const vector<casa::uInt> &mapping = it->second;
+ const vector<casacore::uInt> &mapping = it->second;
for(; first != last; ++first)
{
@@ -146,7 +146,7 @@ void Solver::setCoeff(size_t kernelId, T_ITER first, T_ITER last)
// Initialize cell if this is the first time it is referenced.
ASSERT(cell.solver.nUnknowns() == 0);
cell.coeff.resize(nCoeff);
- cell.solver.set(static_cast<casa::uInt>(nCoeff));
+ cell.solver.set(static_cast<casacore::uInt>(nCoeff));
cell.solver.setEpsValue(itsEpsValue);
cell.solver.setEpsDerivative(itsEpsDerivative);
cell.solver.setMaxIter(itsMaxIter);
@@ -168,10 +168,10 @@ void Solver::setCoeff(size_t kernelId, T_ITER first, T_ITER last)
template <typename T_ITER>
void Solver::setEquations(size_t kernelId, T_ITER first, T_ITER last)
{
- map<size_t, vector<casa::uInt> >::const_iterator it =
+ map<size_t, vector<casacore::uInt> >::const_iterator it =
itsCoeffMapping.find(kernelId);
ASSERT(it != itsCoeffMapping.end());
- const vector<casa::uInt> &mapping = it->second;
+ const vector<casacore::uInt> &mapping = it->second;
for(; first != last; ++first)
{
@@ -184,7 +184,7 @@ void Solver::setEquations(size_t kernelId, T_ITER first, T_ITER last)
Cell &cell = it->second;
ASSERT(first->equation.nUnknowns() == mapping.size());
const bool ok = cell.solver.merge(first->equation,
- mapping.size(), const_cast<casa::uInt*>(&mapping[0]));
+ mapping.size(), const_cast<casacore::uInt*>(&mapping[0]));
ASSERT(ok);
}
}
@@ -203,8 +203,8 @@ bool Solver::iterate(T_OUTPUT_ITER out)
// valid for the _previous_ iteration. The solver cannot compute the
// chi squared directly after an iteration, because it needs the new
// condition equations for that and these are computed by the kernel.
- casa::uInt rank, nun, np, ncon, ner, *piv;
- casa::Double *nEq, *known, *constr, *er, *sEq, *sol, prec, nonlin;
+ casacore::uInt rank, nun, np, ncon, ner, *piv;
+ casacore::Double *nEq, *known, *constr, *er, *sEq, *sol, prec, nonlin;
cell.solver.debugIt(nun, np, ncon, ner, rank, nEq, known, constr, er,
piv, sEq, sol, prec, nonlin);
ASSERT(er && ner > Solver::SUMLL);
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/SolverInterfaceTypes.h b/CEP/Calibration/BBSKernel/include/BBSKernel/SolverInterfaceTypes.h
index d19d60ffde6a6d56b73a3da9ce8bd0e321a87a52..2c73e3850e530418061006f1c558dc041e7e6037 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/SolverInterfaceTypes.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/SolverInterfaceTypes.h
@@ -28,7 +28,7 @@
#include <Common/lofar_vector.h>
#include <Common/lofar_string.h>
-#include <scimath/Fitting/LSQFit.h>
+#include <casacore/scimath/Fitting/LSQFit.h>
namespace LOFAR
@@ -154,7 +154,7 @@ public:
{}
uint32 id;
- casa::LSQFit equation;
+ casacore::LSQFit equation;
};
// BlobStream I/O
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/StationExprLOFAR.h b/CEP/Calibration/BBSKernel/include/BBSKernel/StationExprLOFAR.h
index f4828ef92f0688c7e53c1bb0c8a26f1dde840bd8..e5c64e428c53c1f9555cb5c24afc74a2d257e0b0 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/StationExprLOFAR.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/StationExprLOFAR.h
@@ -38,7 +38,7 @@
#include <BBSKernel/Expr/ExprValue.h>
#include <BBSKernel/Expr/Scope.h>
#include <ParmDB/SourceDB.h>
-#include <measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MDirection.h>
namespace LOFAR
{
@@ -56,8 +56,8 @@ public:
StationExprLOFAR(SourceDB &sourceDB, const BufferMap &buffers,
const ModelConfig &config, const Instrument::ConstPtr &instrument,
- double refFreq, const casa::MDirection &refPhase,
- const casa::MDirection &refDelay, const casa::MDirection &refTile,
+ double refFreq, const casacore::MDirection &refPhase,
+ const casacore::MDirection &refDelay, const casacore::MDirection &refTile,
bool inverse = false, bool useMMSE = false, double sigmaMMSE = 0.0);
StationExprLOFAR(SourceDB &sourceDB, const BufferMap &buffers,
@@ -88,15 +88,15 @@ private:
const ModelConfig &config,
const Instrument::ConstPtr &instrument,
double refFreq,
- const casa::MDirection &refPhase,
- const casa::MDirection &refDelay,
- const casa::MDirection &refTile,
+ const casacore::MDirection &refPhase,
+ const casacore::MDirection &refDelay,
+ const casacore::MDirection &refTile,
bool inverse,
bool useMMSE,
double sigmaMMSE);
PatchExprBase::Ptr makePatchExpr(const string &name,
- const casa::MDirection &refPhase,
+ const casacore::MDirection &refPhase,
SourceDB &sourceDB,
const BufferMap &buffers);
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/StationLOFAR.h b/CEP/Calibration/BBSKernel/include/BBSKernel/StationLOFAR.h
index 92b88582a11da60a8f09e778ec75cfa0a940d581..a9242180dcac58f6de8d05d878b92112c431716b 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/StationLOFAR.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/StationLOFAR.h
@@ -43,7 +43,7 @@ public:
typedef shared_ptr<StationLOFAR> Ptr;
typedef shared_ptr<const StationLOFAR> ConstPtr;
- StationLOFAR(const string &name, const casa::MPosition &position,
+ StationLOFAR(const string &name, const casacore::MPosition &position,
const StationResponse::Station::ConstPtr &station);
StationResponse::Station::ConstPtr station() const;
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/VisBuffer.h b/CEP/Calibration/BBSKernel/include/BBSKernel/VisBuffer.h
index 6006242b23bb7a4b6080ded48da6e1adcb845c08..59d46137508faa691223d29b0a76b3abdee9cf35 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/VisBuffer.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/VisBuffer.h
@@ -33,7 +33,7 @@
#include <BBSKernel/Instrument.h>
#include <BBSKernel/Types.h>
#include <BBSKernel/VisDimensions.h>
-#include <measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MDirection.h>
#include <boost/multi_array.hpp>
namespace LOFAR
@@ -61,14 +61,14 @@ public:
void setReferenceFreq(double freq);
double getReferenceFreq() const;
- void setPhaseReference(const casa::MDirection &reference);
- const casa::MDirection &getPhaseReference() const;
+ void setPhaseReference(const casacore::MDirection &reference);
+ const casacore::MDirection &getPhaseReference() const;
- void setDelayReference(const casa::MDirection &reference);
- const casa::MDirection &getDelayReference() const;
+ void setDelayReference(const casacore::MDirection &reference);
+ const casacore::MDirection &getDelayReference() const;
- void setTileReference(const casa::MDirection &reference);
- const casa::MDirection &getTileReference() const;
+ void setTileReference(const casacore::MDirection &reference);
+ const casacore::MDirection &getTileReference() const;
// Convenience functions that delegate to VisDimensions (refer to the
// documentation of VisDimensions for their documentation).
@@ -122,11 +122,11 @@ private:
// Information about the instrument (e.g. station positions).
Instrument::ConstPtr itsInstrument;
// Phase reference direction (J2000).
- casa::MDirection itsPhaseReference;
+ casacore::MDirection itsPhaseReference;
// Delay reference direction (J2000).
- casa::MDirection itsDelayReference;
+ casacore::MDirection itsDelayReference;
// Tile beam reference direction (J2000).
- casa::MDirection itsTileReference;
+ casacore::MDirection itsTileReference;
// Reference frequency (Hz).
double itsReferenceFreq;
@@ -164,17 +164,17 @@ inline size_t VisBuffer::nStations() const
return itsInstrument->nStations();
}
-inline const casa::MDirection &VisBuffer::getPhaseReference() const
+inline const casacore::MDirection &VisBuffer::getPhaseReference() const
{
return itsPhaseReference;
}
-inline const casa::MDirection &VisBuffer::getDelayReference() const
+inline const casacore::MDirection &VisBuffer::getDelayReference() const
{
return itsDelayReference;
}
-inline const casa::MDirection &VisBuffer::getTileReference() const
+inline const casacore::MDirection &VisBuffer::getTileReference() const
{
return itsTileReference;
}
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/VisEquator.h b/CEP/Calibration/BBSKernel/include/BBSKernel/VisEquator.h
index ffcb48586371e2b0ef6ef3465c224cf74d01642f..126604503045ee834d9e188479b4f9271d09e241 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/VisEquator.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/VisEquator.h
@@ -272,7 +272,7 @@ Interval<size_t> VisEquator::makeAxisMap(const Axis::ShPtr &from,
Interval<double> overlap(std::max(from->start(), to->start()),
std::min(from->end(), to->end()));
- if(overlap.start >= overlap.end || casa::near(overlap.start, overlap.end))
+ if(overlap.start >= overlap.end || casacore::near(overlap.start, overlap.end))
{
return Interval<size_t>(1, 0);
}
@@ -447,7 +447,7 @@ void VisEquator::procExpr(ProcContext &context,
continue;
}
- casa::LSQFit &equation = (out + eqIdx +
+ casacore::LSQFit &equation = (out + eqIdx +
(itsFreqMap[itsEvalReqStart.first + f]
- itsEvalSelStart.first))->equation;
diff --git a/CEP/Calibration/BBSKernel/src/Estimate.cc b/CEP/Calibration/BBSKernel/src/Estimate.cc
index 492290d0f708fbefd6b5ccc31969e144b8bc1677..b72b3c7261f3ce64d84a650231f342898dd19405 100644
--- a/CEP/Calibration/BBSKernel/src/Estimate.cc
+++ b/CEP/Calibration/BBSKernel/src/Estimate.cc
@@ -95,7 +95,7 @@ namespace
bool done;
// LSQ solver and current estimates for the coefficients.
- casa::LSQFit solver;
+ casacore::LSQFit solver;
vector<double> coeff;
// RMS difference of model and data in this iteration.
@@ -205,7 +205,7 @@ namespace
const Location &start, const Location &end, const ParmGroup &solvables,
const EstimateOptions &options, vector<Cell> &cells);
- // Decode casa::LSQFit ready codes and update the status counts.
+ // Decode casacore::LSQFit ready codes and update the status counts.
void updateIterationStatus(const Cell &cell, IterationStatus &status);
// Write a map that maps parameter names to positions in the solution vector
@@ -727,7 +727,7 @@ namespace
// equations are singular. This can also be seen from the result
// of LSQFit::isReady(), so we don't update the iteration status
// here but do skip the update of the solvables.
- casa::uInt rank;
+ casacore::uInt rank;
if(cell.solver.solveLoop(rank, &(cell.coeff[0]),
options.lsqOptions().useSVD))
{
@@ -749,7 +749,7 @@ namespace
// Re-initialize LSQ solver.
size_t nCoeff = cell.coeff.size();
cell.solver =
- casa::LSQFit(static_cast<casa::uInt>(nCoeff));
+ casacore::LSQFit(static_cast<casacore::uInt>(nCoeff));
configLSQSolver(cell.solver, options.lsqOptions());
// Update epsilon value.
@@ -764,7 +764,7 @@ namespace
{
// Re-initialize LSQ solver.
size_t nCoeff = cell.coeff.size();
- cell.solver = casa::LSQFit(static_cast<casa::uInt>(nCoeff));
+ cell.solver = casacore::LSQFit(static_cast<casacore::uInt>(nCoeff));
configLSQSolver(cell.solver, options.lsqOptions());
// Reset L1 state.
@@ -819,38 +819,38 @@ namespace
void updateIterationStatus(const Cell &cell, IterationStatus &status)
{
- // casa::LSQFit::isReady() is incorrectly labelled non-const.
- casa::LSQFit &solver = const_cast<casa::LSQFit&>(cell.solver);
+ // casacore::LSQFit::isReady() is incorrectly labelled non-const.
+ casacore::LSQFit &solver = const_cast<casacore::LSQFit&>(cell.solver);
// Decode and record the solver status.
switch(solver.isReady())
{
- case casa::LSQFit::NONREADY:
+ case casacore::LSQFit::NONREADY:
++status.nActive;
break;
- case casa::LSQFit::SOLINCREMENT:
- case casa::LSQFit::DERIVLEVEL:
+ case casacore::LSQFit::SOLINCREMENT:
+ case casacore::LSQFit::DERIVLEVEL:
++status.nConverged;
break;
- case casa::LSQFit::MAXITER:
+ case casacore::LSQFit::MAXITER:
++status.nStopped;
break;
- case casa::LSQFit::NOREDUCTION:
+ case casacore::LSQFit::NOREDUCTION:
++status.nNoReduction;
break;
- case casa::LSQFit::SINGULAR:
+ case casacore::LSQFit::SINGULAR:
++status.nSingular;
break;
default:
- // This assert triggers if an casa::LSQFit ready
+ // This assert triggers if an casacore::LSQFit ready
// code is encountered that is not covered above.
// The most likely cause is that the
- // casa::LSQFit::ReadyCode enumeration has changes
+ // casacore::LSQFit::ReadyCode enumeration has changes
// in which case the code above needs to be changed
// accordingly.
ASSERT(false);
@@ -889,8 +889,8 @@ namespace
// valid for the _previous_ iteration. The solver cannot compute the chi
// squared directly after an iteration, because it needs the new
// condition equations for that and these are computed by the kernel.
- casa::uInt rank, nun, np, ncon, ner, *piv;
- casa::Double *nEq, *known, *constr, *er, *sEq, *sol, prec, nonlin;
+ casacore::uInt rank, nun, np, ncon, ner, *piv;
+ casacore::Double *nEq, *known, *constr, *er, *sEq, *sol, prec, nonlin;
cell.solver.debugIt(nun, np, ncon, ner, rank, nEq, known, constr, er,
piv, sEq, sol, prec, nonlin);
@@ -909,7 +909,7 @@ namespace
&& (level.is(ParmDBLoglevel::PERSOLUTION_CORRMATRIX)
|| level.is(ParmDBLoglevel::PERITERATION_CORRMATRIX)))
{
- casa::Array<double> corrMatrix(casa::IPosition(1,
+ casacore::Array<double> corrMatrix(casacore::IPosition(1,
cell.solver.nUnknowns() * cell.solver.nUnknowns()));
bool status = cell.solver.getCovariance(corrMatrix.data());
@@ -934,7 +934,7 @@ namespace
cell->done = false;
// Initalize LSQ solver.
- cell->solver = casa::LSQFit(static_cast<casa::uInt>(nCoeff));
+ cell->solver = casacore::LSQFit(static_cast<casacore::uInt>(nCoeff));
configLSQSolver(cell->solver, options.lsqOptions());
// Initialize coefficients.
diff --git a/CEP/Calibration/BBSKernel/src/EstimateUtil.cc b/CEP/Calibration/BBSKernel/src/EstimateUtil.cc
index d6f145d6d9ff349290a55cbf5bb37ca8024507dc..3212f014436b6d917dc7acae99c756bec8ff4526 100644
--- a/CEP/Calibration/BBSKernel/src/EstimateUtil.cc
+++ b/CEP/Calibration/BBSKernel/src/EstimateUtil.cc
@@ -35,7 +35,7 @@ Interval<size_t> findIntersection(const Axis::ShPtr &axis,
Interval<double> overlap(max(axis->start(), range.start), min(axis->end(),
range.end));
- if(overlap.start >= overlap.end || casa::near(overlap.start, overlap.end))
+ if(overlap.start >= overlap.end || casacore::near(overlap.start, overlap.end))
{
return Interval<size_t>(1, 0);
}
@@ -58,7 +58,7 @@ string toString(const NSTimer &timer)
return oss.str();
}
-void configLSQSolver(casa::LSQFit &solver, const SolverOptions &options)
+void configLSQSolver(casacore::LSQFit &solver, const SolverOptions &options)
{
solver.setEpsValue(options.epsValue);
solver.setEpsDerivative(options.epsDerivative);
diff --git a/CEP/Calibration/BBSKernel/src/Expr/AzEl.cc b/CEP/Calibration/BBSKernel/src/Expr/AzEl.cc
index f3ad0f9eaa851308ee85d8057e088518880fe479..736341c1205b03288f0a99d17ebb11babd60f331 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/AzEl.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/AzEl.cc
@@ -25,23 +25,23 @@
#include <BBSKernel/Expr/AzEl.h>
#include <Common/LofarLogger.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/Measures/MEpoch.h>
-#include <measures/Measures/MCPosition.h>
-#include <measures/Measures/MeasFrame.h>
-#include <measures/Measures/MeasConvert.h>
-#include <casa/Quanta/Quantum.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/measures/Measures/MeasFrame.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/casa/Quanta/Quantum.h>
namespace LOFAR
{
namespace BBS
{
-AzEl::AzEl(const casa::MPosition &position,
+AzEl::AzEl(const casacore::MPosition &position,
const Expr<Vector<2> >::ConstPtr &direction)
: BasicUnaryExpr<Vector<2>, Vector<2> >(direction),
- itsPosition(casa::MPosition::Convert(position, casa::MPosition::ITRF)())
+ itsPosition(casacore::MPosition::Convert(position, casacore::MPosition::ITRF)())
{
}
@@ -54,24 +54,24 @@ const Vector<2>::View AzEl::evaluateImpl(const Grid &grid,
ASSERTSTR(!direction(0).isComplex() && !direction(1).isComplex(), "Source"
" directions should be real valued.");
- casa::Quantum<casa::Double> qEpoch(0.0, "s");
- casa::MEpoch mEpoch(qEpoch, casa::MEpoch::UTC);
+ casacore::Quantum<casacore::Double> qEpoch(0.0, "s");
+ casacore::MEpoch mEpoch(qEpoch, casacore::MEpoch::UTC);
// Create and initialize a frame.
- casa::MeasFrame frame;
+ casacore::MeasFrame frame;
frame.set(itsPosition);
frame.set(mEpoch);
// Create conversion engine.
- casa::MDirection mDirection(casa::MVDirection(direction(0).getDouble(),
+ casacore::MDirection mDirection(casacore::MVDirection(direction(0).getDouble(),
direction(1).getDouble()),
- casa::MDirection::Ref(casa::MDirection::J2000));
+ casacore::MDirection::Ref(casacore::MDirection::J2000));
// TODO: Do we need to use AZEL or AZELGEO here?
-// casa::MDirection::Convert converter = casa::MDirection::Convert(mDirection,
-// casa::MDirection::Ref(casa::MDirection::AZEL, frame));
- casa::MDirection::Convert converter = casa::MDirection::Convert(mDirection,
- casa::MDirection::Ref(casa::MDirection::AZELGEO, frame));
+// casacore::MDirection::Convert converter = casacore::MDirection::Convert(mDirection,
+// casacore::MDirection::Ref(casacore::MDirection::AZEL, frame));
+ casacore::MDirection::Convert converter = casacore::MDirection::Convert(mDirection,
+ casacore::MDirection::Ref(casacore::MDirection::AZELGEO, frame));
// Allocate space for the result.
// TODO: This is a hack! The Matrix class does not support 1xN or Nx1
@@ -93,8 +93,8 @@ const Vector<2>::View AzEl::evaluateImpl(const Grid &grid,
frame.set(mEpoch);
// Compute azimuth and elevation.
- casa::MVDirection mvAzel(converter().getValue());
- const casa::Vector<casa::Double> azel =
+ casacore::MVDirection mvAzel(converter().getValue());
+ const casacore::Vector<casacore::Double> azel =
mvAzel.getAngle("rad").getValue();
*az_p++ = azel(0);
*el_p++ = azel(1);
diff --git a/CEP/Calibration/BBSKernel/src/Expr/Delay.cc b/CEP/Calibration/BBSKernel/src/Expr/Delay.cc
index 82054e6d4c167f3e56d09561b685705a957b28fb..2742c30d64262839fc3e0d1e93911b9a94288532 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/Delay.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/Delay.cc
@@ -22,7 +22,7 @@
#include <lofar_config.h>
#include <BBSKernel/Expr/Delay.h>
-#include <casa/BasicSL/Constants.h>
+#include <casacore/casa/BasicSL/Constants.h>
namespace LOFAR
{
@@ -52,7 +52,7 @@ const Scalar::View Delay::evaluateImpl(const Grid &grid,
}
}
- Matrix phase = freq * (delay() * casa::C::_2pi);
+ Matrix phase = freq * (delay() * casacore::C::_2pi);
Matrix shift = tocomplex(cos(phase), sin(phase));
return Scalar::View(shift);
diff --git a/CEP/Calibration/BBSKernel/src/Expr/ElevationCut.cc b/CEP/Calibration/BBSKernel/src/Expr/ElevationCut.cc
index 8aee5c3f80cb7a1a571867de2b55b0a8fd8a526e..0e2f94d6a6055ccbc766b8038ae8aac42c7f8f03 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/ElevationCut.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/ElevationCut.cc
@@ -23,7 +23,7 @@
#include <lofar_config.h>
#include <BBSKernel/Expr/ElevationCut.h>
-#include <casa/BasicSL/Constants.h>
+#include <casacore/casa/BasicSL/Constants.h>
namespace LOFAR
{
@@ -33,7 +33,7 @@ namespace BBS
ElevationCut::ElevationCut(const Expr<Vector<2> >::ConstPtr &azel,
double threshold)
: BasicUnaryExpr<Vector<2>, JonesMatrix>(azel),
- itsThreshold(casa::C::pi * threshold / 180.0)
+ itsThreshold(casacore::C::pi * threshold / 180.0)
{
}
diff --git a/CEP/Calibration/BBSKernel/src/Expr/ExprParm.cc b/CEP/Calibration/BBSKernel/src/Expr/ExprParm.cc
index 35acc71edb891e8f431d1476af62431f4b9a512b..ac766afbdc14b6000fcb810561fc874ba3b8b236 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/ExprParm.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/ExprParm.cc
@@ -61,7 +61,7 @@ const Scalar ExprParm::evaluateExpr(const Request &request, Cache&,
EXPR_TIMER_START();
// Get the result from the Parm.
- vector<casa::Array<double> > buffers;
+ vector<casacore::Array<double> > buffers;
itsParm->getResult(buffers, request[grid], getPValueFlag()); //false);
ASSERT(buffers.size() > 0);
@@ -80,7 +80,7 @@ const Scalar ExprParm::evaluateExpr(const Request &request, Cache&,
}
else
{
- const casa::IPosition &shape = buffers[0].shape();
+ const casacore::IPosition &shape = buffers[0].shape();
DBGASSERT(static_cast<unsigned int>(shape(0)) == request[grid][FREQ]->size()
&& static_cast<unsigned int>(shape(1)) == request[grid][TIME]->size());
result.assign(Matrix(storage, shape(0), shape(1)));
@@ -106,7 +106,7 @@ const Scalar ExprParm::evaluateExpr(const Request &request, Cache&,
}
else
{
- const casa::IPosition &shape = buffers[i + 1].shape();
+ const casacore::IPosition &shape = buffers[i + 1].shape();
result.assign(PValueKey(itsParm->getId(), i), Matrix(storage,
shape(0), shape(1)));
}
diff --git a/CEP/Calibration/BBSKernel/src/Expr/ExternalFunction.cc b/CEP/Calibration/BBSKernel/src/Expr/ExternalFunction.cc
index 43502a022b64aeb9227a19bea33da6a7260e7814..58213e72d98d70558889defdbd0ce6d65792b937 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/ExternalFunction.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/ExternalFunction.cc
@@ -25,7 +25,7 @@
#include <BBSKernel/Expr/ExternalFunction.h>
#include <BBSKernel/Exceptions.h>
-#include <casa/OS/Path.h>
+#include <casacore/casa/OS/Path.h>
#include <dlfcn.h>
namespace LOFAR
@@ -33,10 +33,10 @@ namespace LOFAR
namespace BBS
{
-ExternalFunction::ExternalFunction(const casa::Path &module, const string &name)
+ExternalFunction::ExternalFunction(const casacore::Path &module, const string &name)
: itsModule(0)
{
- casa::String path = module.expandedName();
+ casacore::String path = module.expandedName();
itsModule = dlopen(path.c_str(), RTLD_LAZY);
if(!itsModule)
{
diff --git a/CEP/Calibration/BBSKernel/src/Expr/FaradayRotation.cc b/CEP/Calibration/BBSKernel/src/Expr/FaradayRotation.cc
index 1091f0ee74f9169321eb0646760e0a6928a5f1ad..78e6e2752f7f42c392668b97abeeb004a5c79464 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/FaradayRotation.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/FaradayRotation.cc
@@ -22,9 +22,9 @@
#include <lofar_config.h>
#include <BBSKernel/Expr/FaradayRotation.h>
-#include <casa/BasicSL/Constants.h>
+#include <casacore/casa/BasicSL/Constants.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR
{
diff --git a/CEP/Calibration/BBSKernel/src/Expr/GaussianCoherence.cc b/CEP/Calibration/BBSKernel/src/Expr/GaussianCoherence.cc
index eac08f0de0a2225b9a2152f9fb7a60a4cbadcf0e..f131c9ca5fbea3dcb4dd1eeaee9cc514aa07bce6 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/GaussianCoherence.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/GaussianCoherence.cc
@@ -29,9 +29,9 @@
#include <Common/lofar_math.h>
#include <Common/LofarLogger.h>
-#include <casa/BasicSL/Constants.h>
+#include <casacore/casa/BasicSL/Constants.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR
{
@@ -69,13 +69,13 @@ const JonesMatrix::View GaussianCoherence::evaluateImpl(const Grid &grid,
// Convert orientation from degrees to radians and convert to positive
// North over East, East is +90 degrees.
// TODO: Can probably optimize by changing the rotation matrix instead.
- Matrix phi = -orientation() * (-casa::C::pi/180.0) + casa::C::pi + casa::C::pi_2;
+ Matrix phi = -orientation() * (-casacore::C::pi/180.0) + casacore::C::pi + casacore::C::pi_2;
Matrix cosPhi(cos(phi));
Matrix sinPhi(sin(phi));
// Rotate (u, v) by the orientation and scale with the major and minor axis
// lengths (FWHM). Take care of the conversion of FWHM to sigma.
- const double arcsec2rad = (casa::C::pi / 3600.0) / 180.0;
+ const double arcsec2rad = (casacore::C::pi / 3600.0) / 180.0;
const double fwhm2sigma = 1.0 / (2.0 * std::sqrt(2.0 * std::log(2.0)));
Matrix uPrime =
@@ -86,7 +86,7 @@ const JonesMatrix::View GaussianCoherence::evaluateImpl(const Grid &grid,
// Compute uPrime^2 + vPrime^2 and pre-multiply with -2.0 * PI^2 / C^2.
Matrix uvPrime =
- (-2.0 * casa::C::pi * casa::C::pi) * (sqr(uPrime) + sqr(vPrime));
+ (-2.0 * casacore::C::pi * casacore::C::pi) * (sqr(uPrime) + sqr(vPrime));
// Compute spatial coherence (2D).
const unsigned int nFreq = grid[FREQ]->size();
@@ -101,7 +101,7 @@ const JonesMatrix::View GaussianCoherence::evaluateImpl(const Grid &grid,
const double uv = uvPrime.getDouble(0, ts);
for(unsigned int ch = 0; ch < nFreq; ++ch)
{
- const double lambda_inv = grid[FREQ]->center(ch) / casa::C::c;
+ const double lambda_inv = grid[FREQ]->center(ch) / casacore::C::c;
*it++ = std::exp(lambda_inv * lambda_inv * uv);
}
}
diff --git a/CEP/Calibration/BBSKernel/src/Expr/ITRFDirection.cc b/CEP/Calibration/BBSKernel/src/Expr/ITRFDirection.cc
index f112eca6103a165bac86edd56c1a7606cedc197c..d2ef08be4c5f61c79679665e5063f5d549028f83 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/ITRFDirection.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/ITRFDirection.cc
@@ -25,23 +25,23 @@
#include <BBSKernel/Expr/ITRFDirection.h>
#include <Common/LofarLogger.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/Measures/MEpoch.h>
-#include <measures/Measures/MCPosition.h>
-#include <measures/Measures/MeasFrame.h>
-#include <measures/Measures/MeasConvert.h>
-#include <casa/Quanta/Quantum.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/measures/Measures/MeasFrame.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/casa/Quanta/Quantum.h>
namespace LOFAR
{
namespace BBS
{
-ITRFDirection::ITRFDirection(const casa::MPosition &position,
+ITRFDirection::ITRFDirection(const casacore::MPosition &position,
const Expr<Vector<2> >::ConstPtr &direction)
: BasicUnaryExpr<Vector<2>, Vector<3> >(direction),
- itsPosition(casa::MPosition::Convert(position, casa::MPosition::ITRF)())
+ itsPosition(casacore::MPosition::Convert(position, casacore::MPosition::ITRF)())
{
}
@@ -55,18 +55,18 @@ const Vector<3>::View ITRFDirection::evaluateImpl(const Grid &grid,
" directions should be real valued.");
// Initialize reference frame.
- casa::Quantum<casa::Double> qEpoch(0.0, "s");
- casa::MEpoch mEpoch(qEpoch, casa::MEpoch::UTC);
- casa::MeasFrame mFrame(mEpoch, itsPosition);
+ casacore::Quantum<casacore::Double> qEpoch(0.0, "s");
+ casacore::MEpoch mEpoch(qEpoch, casacore::MEpoch::UTC);
+ casacore::MeasFrame mFrame(mEpoch, itsPosition);
// Create conversion engine.
- casa::MDirection mDirection(casa::MVDirection(direction(0).getDouble(),
+ casacore::MDirection mDirection(casacore::MVDirection(direction(0).getDouble(),
direction(1).getDouble()),
- casa::MDirection::Ref(casa::MDirection::J2000));
+ casacore::MDirection::Ref(casacore::MDirection::J2000));
// Setup coordinate transformation engine.
- casa::MDirection::Convert convertor(mDirection,
- casa::MDirection::Ref(casa::MDirection::ITRF, mFrame));
+ casacore::MDirection::Convert convertor(mDirection,
+ casacore::MDirection::Ref(casacore::MDirection::ITRF, mFrame));
// Allocate space for the result.
// TODO: This is a hack! The Matrix class does not support 1xN or Nx1
@@ -86,7 +86,7 @@ const Vector<3>::View ITRFDirection::evaluateImpl(const Grid &grid,
mFrame.set(mEpoch);
// Compute ITRF direction vector.
- casa::MVDirection mvITRF(convertor().getValue());
+ casacore::MVDirection mvITRF(convertor().getValue());
*x_p++ = mvITRF(0);
*y_p++ = mvITRF(1);
*z_p++ = mvITRF(2);
diff --git a/CEP/Calibration/BBSKernel/src/Expr/LMN.cc b/CEP/Calibration/BBSKernel/src/Expr/LMN.cc
index ebdb3d1c22a5e9590a5438cf54f39f8422a0c667..2bf297a3112c3fb93f109ddbcaef33cb2be50869 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/LMN.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/LMN.cc
@@ -25,8 +25,8 @@
#include <BBSKernel/Expr/LMN.h>
#include <Common/lofar_math.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MCDirection.h>
namespace LOFAR
{
@@ -35,18 +35,18 @@ namespace BBS
using LOFAR::sin;
using LOFAR::cos;
-LMN::LMN(const casa::MDirection &reference,
+LMN::LMN(const casacore::MDirection &reference,
const Expr<Vector<2> >::ConstPtr &direction)
: BasicUnaryExpr<Vector<2>, Vector<3> >(direction),
- itsPhaseReference(casa::MDirection::Convert(reference,
- casa::MDirection::J2000)())
+ itsPhaseReference(casacore::MDirection::Convert(reference,
+ casacore::MDirection::J2000)())
{
}
const Vector<3>::View LMN::evaluateImpl(const Grid&,
const Vector<2>::View &direction) const
{
- casa::Quantum<casa::Vector<casa::Double> > angles =
+ casacore::Quantum<casacore::Vector<casacore::Double> > angles =
itsPhaseReference.getAngle();
const double refRa = angles.getBaseValue()(0);
const double refDec = angles.getBaseValue()(1);
diff --git a/CEP/Calibration/BBSKernel/src/Expr/Matrix.cc b/CEP/Calibration/BBSKernel/src/Expr/Matrix.cc
index e06ee2f6467beabfbb2ea180284b51a4e393055f..0b5652d2a7d692d9d0f0562b36664964fa10ab65 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/Matrix.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/Matrix.cc
@@ -31,9 +31,9 @@
#include <Blob/BlobOStream.h>
#include <Blob/BlobIStream.h>
#include <Common/LofarLogger.h>
-//#include <casa/Arrays/Matrix.h>
+//#include <casacore/casa/Arrays/Matrix.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR
{
@@ -508,16 +508,16 @@ LOFAR::BlobIStream& operator>> (LOFAR::BlobIStream& bs, Matrix& vec)
} // namespace LOFAR
/*
//# Instantiate the AIPS++ templates needed for Matrix<dcomplex>
-//# This is needed because dcomplex is usually not the same as casa::DComplex.
+//# This is needed because dcomplex is usually not the same as casacore::DComplex.
//# The inclusion of the other .cc files is needed for the automatic
//# instantiation of the templates used by Matrix.
#ifdef AIPS_NO_TEMPLATE_SRC
-#include <casa/Arrays/Matrix.cc>
-#include <casa/Arrays/Vector.cc>
-#include <casa/Arrays/Array.cc>
-#include <casa/Arrays/MaskedArray.cc>
-#include <casa/Utilities/Copy.cc>
-#include <casa/Utilities/CountedPtr.cc>
+#include <casacore/casa/Arrays/Matrix.cc>
+#include <casacore/casa/Arrays/Vector.cc>
+#include <casacore/casa/Arrays/Array.cc>
+#include <casacore/casa/Arrays/MaskedArray.cc>
+#include <casacore/casa/Utilities/Copy.cc>
+#include <casacore/casa/Utilities/CountedPtr.cc>
template class Matrix<LOFAR::dcomplex>;
#endif
*/
diff --git a/CEP/Calibration/BBSKernel/src/Expr/MatrixRealArr.cc b/CEP/Calibration/BBSKernel/src/Expr/MatrixRealArr.cc
index 21a7bf098db89e1388c46dc79225f3f05924bc61..e141543f988c453b2d0c9a3e361c8029afe9f3e5 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/MatrixRealArr.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/MatrixRealArr.cc
@@ -30,7 +30,7 @@
//#include <BBSKernel/Expr/Pool.h>
#include <Common/LofarLogger.h>
#include <Common/lofar_algorithm.h>
-#include <casa/BasicSL/Constants.h>
+#include <casacore/casa/BasicSL/Constants.h>
#include <cmath>
#if defined TIMER
@@ -42,7 +42,7 @@
#include <xmmintrin.h>
#endif
-using namespace casa;
+using namespace casacore;
namespace LOFAR
{
diff --git a/CEP/Calibration/BBSKernel/src/Expr/MatrixRealSca.cc b/CEP/Calibration/BBSKernel/src/Expr/MatrixRealSca.cc
index bc0310b497976eb9dc38c3692aa965da537fe3f0..f218de71f06280b4f91667cd5b8d820f32e3362d 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/MatrixRealSca.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/MatrixRealSca.cc
@@ -25,12 +25,12 @@
#include <BBSKernel/Expr/MatrixRealArr.h>
#include <BBSKernel/Expr/MatrixComplexSca.h>
#include <BBSKernel/Expr/MatrixComplexArr.h>
-#include <casa/BasicMath/Math.h>
-#include <casa/BasicSL/Constants.h>
+#include <casacore/casa/BasicMath/Math.h>
+#include <casacore/casa/BasicSL/Constants.h>
#include <Common/lofar_iostream.h>
#include <Common/lofar_algorithm.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR
{
diff --git a/CEP/Calibration/BBSKernel/src/Expr/MatrixRep.cc b/CEP/Calibration/BBSKernel/src/Expr/MatrixRep.cc
index b5634e0c00838de2c6bb0f228b3a15ed7cccbd6c..07fda95df72b7d94bb0f4c86a5fb1b67a4647e35 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/MatrixRep.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/MatrixRep.cc
@@ -22,9 +22,9 @@
#include <lofar_config.h>
#include <BBSKernel/Expr/MatrixRep.h>
-#include <casa/Exceptions/Error.h>
+#include <casacore/casa/Exceptions/Error.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR
{
diff --git a/CEP/Calibration/BBSKernel/src/Expr/PiercePoint.cc b/CEP/Calibration/BBSKernel/src/Expr/PiercePoint.cc
index 3e884ec3f2eb801b37cd0b8a930e138aefa48b11..1edbc26689b950684f24fee6462c22c60915a0cf 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/PiercePoint.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/PiercePoint.cc
@@ -28,14 +28,14 @@
#include <BBSKernel/Expr/PiercePoint.h>
-#include <casa/BasicSL/Constants.h>
-#include <measures/Measures/MCPosition.h>
-#include <measures/Measures/MeasConvert.h>
+#include <casacore/casa/BasicSL/Constants.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/measures/Measures/MeasConvert.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/Measures/MEpoch.h>
-#include <measures/Measures/MeasFrame.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MeasFrame.h>
#include <Common/lofar_iomanip.h>
@@ -51,12 +51,12 @@ const double earth_ellipsoid_b2 = earth_ellipsoid_b*earth_ellipsoid_b;
const double earth_ellipsoid_e2 = (earth_ellipsoid_a2 - earth_ellipsoid_b2) / earth_ellipsoid_a2;
-PiercePoint::PiercePoint(const casa::MPosition &position,
+PiercePoint::PiercePoint(const casacore::MPosition &position,
const Expr<Vector<3> >::ConstPtr &direction,
const Expr<Scalar>::ConstPtr &height)
: BasicBinaryExpr<Vector<3>, Scalar, Vector<4> >(direction, height),
- itsPosition(casa::MPosition::Convert(position,
- casa::MPosition::ITRF)())
+ itsPosition(casacore::MPosition::Convert(position,
+ casacore::MPosition::ITRF)())
{
}
@@ -81,7 +81,7 @@ const Vector<4>::View PiercePoint::evaluateImpl(const Grid &grid,
double h = height().getDouble();
// Get station position in ITRF coordinates.
- const casa::MVPosition &mPosition = itsPosition.getValue();
+ const casacore::MVPosition &mPosition = itsPosition.getValue();
double stationX = mPosition(0);
double stationY = mPosition(1);
double stationZ = mPosition(2);
diff --git a/CEP/Calibration/BBSKernel/src/Expr/PolynomialLayer.cc b/CEP/Calibration/BBSKernel/src/Expr/PolynomialLayer.cc
index fac09f1ba17bf13d05db061e89334b620f0dabbf..438c088017ca9c0403404f5e8047e75aa2d99e30 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/PolynomialLayer.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/PolynomialLayer.cc
@@ -158,7 +158,7 @@ const Scalar::View PolynomialLayer::evaluateImpl(const Grid &grid,
ASSERT(degree >= 1);
// Get reference station position (ITRF).
- const casa::MVPosition &ref_pos = itsRefStation.getValue();
+ const casacore::MVPosition &ref_pos = itsRefStation.getValue();
// Calculate rotation matrix. Actually we only need to do this once for
// all PolynomialLayer nodes. Some optimization could be done here.
diff --git a/CEP/Calibration/BBSKernel/src/Expr/Request.cc b/CEP/Calibration/BBSKernel/src/Expr/Request.cc
index 8522ad78843e1edb5d0f16702144d9581009a170..1ab558049ecc8a3c620b8b6d5c850227d2b70a42 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/Request.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/Request.cc
@@ -46,10 +46,10 @@ void Request::append(const Grid &grid)
{
#ifdef LOFAR_DEBUG
const Box &box = grid.getBoundingBox();
- DBGASSERT(casa::near(box.lowerX(), itsDomain.lowerX())
- && casa::near(box.lowerY(), itsDomain.lowerY())
- && casa::near(box.upperX(), itsDomain.upperX())
- && casa::near(box.upperY(), itsDomain.upperY()));
+ DBGASSERT(casacore::near(box.lowerX(), itsDomain.lowerX())
+ && casacore::near(box.lowerY(), itsDomain.lowerY())
+ && casacore::near(box.upperX(), itsDomain.upperX())
+ && casacore::near(box.upperY(), itsDomain.upperY()));
#endif
itsGrid.push_back(grid);
diff --git a/CEP/Calibration/BBSKernel/src/Expr/Resampler.cc b/CEP/Calibration/BBSKernel/src/Expr/Resampler.cc
index c28f3f8b972f64503a9ada4e8e7e5916f0bd75c4..31f6eadc04acf830527fa3e48b693aed367d2c0a 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/Resampler.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/Resampler.cc
@@ -22,7 +22,7 @@
#include <lofar_config.h>
#include <BBSKernel/Expr/Resampler.h>
-#include <casa/Arrays.h>
+#include <casacore/casa/Arrays.h>
namespace LOFAR
{
@@ -131,8 +131,8 @@ FlagArray Resampler::resampleFlags(const FlagArray &in,
// Allocate temporary 2-D arrays to store the number of samples per output
// cell and the number of flagged samples per output cell.
- casa::Matrix<unsigned int> count(nFreq, nTime, 0);
- casa::Matrix<unsigned int> flagged(nFreq, nTime, 0);
+ casacore::Matrix<unsigned int> count(nFreq, nTime, 0);
+ casacore::Matrix<unsigned int> flagged(nFreq, nTime, 0);
for(vector<Span>::const_iterator itTime = map[TIME].begin(),
itTimeEnd = map[TIME].end(); itTime != itTimeEnd; ++itTime)
@@ -208,7 +208,7 @@ Matrix Resampler::resampleWithFlags(const Matrix &in, const FlagArray &flags,
out.dcomplexStorage(outRe, outIm);
// Allocate a temporary 2-D array to store the sum of the weights.
- casa::Matrix<double> weight(nFreq, nTime, 0.0);
+ casacore::Matrix<double> weight(nFreq, nTime, 0.0);
for(vector<Span>::const_iterator itTime = map[TIME].begin(),
itTimeEnd = map[TIME].end(); itTime != itTimeEnd; ++itTime)
@@ -233,7 +233,7 @@ Matrix Resampler::resampleWithFlags(const Matrix &in, const FlagArray &flags,
out.dcomplexStorage(outRe, outIm);
// Normalize the output samples by dividing by the sum of the weights.
- for(casa::Matrix<double>::const_iterator weightIt = weight.begin(),
+ for(casacore::Matrix<double>::const_iterator weightIt = weight.begin(),
weightItEnd = weight.end(); weightIt != weightItEnd;
++weightIt, ++outRe, ++outIm)
{
@@ -274,7 +274,7 @@ Matrix Resampler::resample(const Matrix &in, const vector<Span> (&map)[2]) const
out.dcomplexStorage(outRe, outIm);
// Allocate a temporary 2-D array to store the sum of the weights.
- casa::Matrix<double> weight(nFreq, nTime, 0.0);
+ casacore::Matrix<double> weight(nFreq, nTime, 0.0);
for(vector<Span>::const_iterator itTime = map[TIME].begin(),
itTimeEnd = map[TIME].end(); itTime != itTimeEnd; ++itTime)
@@ -296,7 +296,7 @@ Matrix Resampler::resample(const Matrix &in, const vector<Span> (&map)[2]) const
out.dcomplexStorage(outRe, outIm);
// Normalize the output samples by dividing by the sum of the weights.
- for(casa::Matrix<double>::const_iterator weightIt = weight.begin(),
+ for(casacore::Matrix<double>::const_iterator weightIt = weight.begin(),
weightItEnd = weight.end(); weightIt != weightItEnd;
++weightIt, ++outRe, ++outIm)
{
diff --git a/CEP/Calibration/BBSKernel/src/Expr/Rotation.cc b/CEP/Calibration/BBSKernel/src/Expr/Rotation.cc
index 127dd2d7530ffdbdf209ed43315a2cc86d499be0..36181dacb50599291e3757f1f2864a3ed72335da 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/Rotation.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/Rotation.cc
@@ -23,7 +23,7 @@
#include <lofar_config.h>
#include <BBSKernel/Expr/Rotation.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR
{
diff --git a/CEP/Calibration/BBSKernel/src/Expr/ShapeletCoherence.cc b/CEP/Calibration/BBSKernel/src/Expr/ShapeletCoherence.cc
index a81a7ffb9872c781be17a66411ee524eef6c72e9..54ba47f5f30c9009e381eee4deb0093776d3e9fb 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/ShapeletCoherence.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/ShapeletCoherence.cc
@@ -29,9 +29,9 @@
#include <Common/lofar_math.h>
#include <Common/LofarLogger.h>
-#include <casa/BasicSL/Constants.h>
+#include <casacore/casa/BasicSL/Constants.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR
{
@@ -364,7 +364,7 @@ static int calculate_uv_mode_vectors_bi(double *u, double *v, int N,
ShapeletCoherence::ShapeletCoherence(const Expr<Vector<4> >::ConstPtr stokes,
- double scaleI, const casa::Array<double> &coeffI,
+ double scaleI, const casacore::Array<double> &coeffI,
const Expr<Vector<3> >::ConstPtr &uvwA,
const Expr<Vector<3> >::ConstPtr &uvwB)
: BasicTernaryExpr<Vector<4>, Vector<3>, Vector<3>, JonesMatrix>(stokes,
@@ -384,7 +384,7 @@ const JonesMatrix::View ShapeletCoherence::evaluateImpl(const Grid &grid,
const JonesMatrix::View ShapeletCoherence::evaluateImplI(const Grid &grid,
const Vector<4>::View &stokes, double itsShapeletScaleI,
- const casa::Array<double> &itsShapeletCoeffI, const Vector<3>::View &uvwA,
+ const casacore::Array<double> &itsShapeletCoeffI, const Vector<3>::View &uvwA,
const Vector<3>::View &uvwB) const
{
JonesMatrix::View result;
@@ -407,7 +407,7 @@ const JonesMatrix::View ShapeletCoherence::evaluateImplI(const Grid &grid,
ul=new double[nTime];
vl=new double[nTime];
- casa::IPosition cshape=itsShapeletCoeffI.shape();
+ casacore::IPosition cshape=itsShapeletCoeffI.shape();
ASSERT(cshape(0)==cshape(1));
double *Av=0; int *cplx=0;
@@ -416,7 +416,7 @@ const JonesMatrix::View ShapeletCoherence::evaluateImplI(const Grid &grid,
for(unsigned int ch = 0; ch < nFreq; ++ch)
{
- const double lambda_inv = grid[FREQ]->center(ch) / casa::C::c;
+ const double lambda_inv = grid[FREQ]->center(ch) / casacore::C::c;
for(unsigned int ts = 0; ts < nTime; ++ts)
{
ul[ts]=u.getDouble(0,ts)*lambda_inv;
@@ -434,11 +434,11 @@ const JonesMatrix::View ShapeletCoherence::evaluateImplI(const Grid &grid,
//y=a*x+y
if (cplx[ny*cshape(0)+nx]) {
for(unsigned int ts=0; ts<nTime; ++ts) {
- impsum[ts]+=Av[(ny*cshape(0)+nx)*nTime+ts]*itsShapeletCoeffI(casa::IPosition(2,nx,ny));
+ impsum[ts]+=Av[(ny*cshape(0)+nx)*nTime+ts]*itsShapeletCoeffI(casacore::IPosition(2,nx,ny));
}
} else {
for(unsigned int ts=0; ts<nTime; ++ts) {
- repsum[ts]+=Av[(ny*cshape(0)+nx)*nTime+ts]*itsShapeletCoeffI(casa::IPosition(2,nx,ny));
+ repsum[ts]+=Av[(ny*cshape(0)+nx)*nTime+ts]*itsShapeletCoeffI(casacore::IPosition(2,nx,ny));
}
}
}
diff --git a/CEP/Calibration/BBSKernel/src/Expr/StationShift.cc b/CEP/Calibration/BBSKernel/src/Expr/StationShift.cc
index 52278759da2d07ee5bf9a53e5c3fd3f3c5beaf41..4597069524625a18688635c5eb8d13143303239c 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/StationShift.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/StationShift.cc
@@ -25,9 +25,9 @@
#include <BBSKernel/Expr/StationShift.h>
#include <Common/LofarLogger.h>
-#include <casa/BasicSL/Constants.h>
+#include <casacore/casa/BasicSL/Constants.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR
{
diff --git a/CEP/Calibration/BBSKernel/src/Expr/StationUVW.cc b/CEP/Calibration/BBSKernel/src/Expr/StationUVW.cc
index 305edd1c4f4b0d2c0a5a88ac786610e2d765ca19..037818d5c59351c7e3a8d227da026bc06a651b18 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/StationUVW.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/StationUVW.cc
@@ -23,29 +23,29 @@
#include <lofar_config.h>
#include <BBSKernel/Expr/StationUVW.h>
-#include <measures/Measures/MBaseline.h>
-#include <measures/Measures/MEpoch.h>
-#include <measures/Measures/MeasFrame.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/Measures/MCPosition.h>
-#include <measures/Measures/MCBaseline.h>
-#include <casa/Quanta/MVuvw.h>
+#include <casacore/measures/Measures/MBaseline.h>
+#include <casacore/measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MeasFrame.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/measures/Measures/MCBaseline.h>
+#include <casacore/casa/Quanta/MVuvw.h>
namespace LOFAR
{
namespace BBS
{
-StationUVW::StationUVW(const casa::MPosition &arrayPosition,
- const casa::MPosition &stationPosition,
- const casa::MDirection &direction)
- : itsArrayPosition(casa::MPosition::Convert(arrayPosition,
- casa::MPosition::ITRF)()),
- itsStationPosition(casa::MPosition::Convert(stationPosition,
- casa::MPosition::ITRF)()),
- itsDirection(casa::MDirection::Convert(direction,
- casa::MDirection::J2000)())
+StationUVW::StationUVW(const casacore::MPosition &arrayPosition,
+ const casacore::MPosition &stationPosition,
+ const casacore::MDirection &direction)
+ : itsArrayPosition(casacore::MPosition::Convert(arrayPosition,
+ casacore::MPosition::ITRF)()),
+ itsStationPosition(casacore::MPosition::Convert(stationPosition,
+ casacore::MPosition::ITRF)()),
+ itsDirection(casacore::MDirection::Convert(direction,
+ casacore::MDirection::J2000)())
{
}
@@ -55,21 +55,21 @@ const Vector<3> StationUVW::evaluateExpr(const Request &request, Cache&,
EXPR_TIMER_START();
// Initialize reference frame.
- casa::Quantum<casa::Double> qEpoch(0.0, "s");
- casa::MEpoch mEpoch(qEpoch, casa::MEpoch::UTC);
- casa::MeasFrame mFrame(mEpoch, itsArrayPosition, itsDirection);
+ casacore::Quantum<casacore::Double> qEpoch(0.0, "s");
+ casacore::MEpoch mEpoch(qEpoch, casacore::MEpoch::UTC);
+ casacore::MeasFrame mFrame(mEpoch, itsArrayPosition, itsDirection);
// Use baseline coordinates relative to the array reference position (to
// keep values small). The array reference position will drop out when
// computing baseline UVW coordinates from a pair of "station" UVW
// coordinates.
- casa::MVBaseline mvBaseline(itsStationPosition.getValue(),
+ casacore::MVBaseline mvBaseline(itsStationPosition.getValue(),
itsArrayPosition.getValue());
- casa::MBaseline mBaseline(mvBaseline,
- casa::MBaseline::Ref(casa::MBaseline::ITRF, mFrame));
+ casacore::MBaseline mBaseline(mvBaseline,
+ casacore::MBaseline::Ref(casacore::MBaseline::ITRF, mFrame));
// Setup coordinate transformation engine.
- casa::MBaseline::Convert convertor(mBaseline, casa::MBaseline::J2000);
+ casacore::MBaseline::Convert convertor(mBaseline, casacore::MBaseline::J2000);
// Allocate space for the result.
// TODO: This is a hack! The Matrix class does not support 1xN or Nx1
@@ -91,8 +91,8 @@ const Vector<3> StationUVW::evaluateExpr(const Request &request, Cache&,
mFrame.set(mEpoch);
// Compute UVW coordinates (J2000).
- casa::MBaseline mBaselineJ2000(convertor());
- casa::MVuvw mvUVW(mBaselineJ2000.getValue(), itsDirection.getValue());
+ casacore::MBaseline mBaselineJ2000(convertor());
+ casacore::MVuvw mvUVW(mBaselineJ2000.getValue(), itsDirection.getValue());
*u++ = mvUVW(0);
*v++ = mvUVW(1);
diff --git a/CEP/Calibration/BBSKernel/src/Expr/StokesRM.cc b/CEP/Calibration/BBSKernel/src/Expr/StokesRM.cc
index 487357d13fbbd23d9a84e28f272c31e2d0a61061..7e68abaacd8074cc05af21b0e76ad249a39ffe55 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/StokesRM.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/StokesRM.cc
@@ -23,9 +23,9 @@
#include <lofar_config.h>
#include <BBSKernel/Expr/StokesRM.h>
-#include <casa/BasicSL/Constants.h>
+#include <casacore/casa/BasicSL/Constants.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR
{
diff --git a/CEP/Calibration/BBSKernel/src/Instrument.cc b/CEP/Calibration/BBSKernel/src/Instrument.cc
index 1140f2a3a295c3d981ab2842379b869804322464..f2489962fb5c38501a16263e630c76dad58dd332 100644
--- a/CEP/Calibration/BBSKernel/src/Instrument.cc
+++ b/CEP/Calibration/BBSKernel/src/Instrument.cc
@@ -29,7 +29,7 @@ namespace LOFAR
namespace BBS
{
-Station::Station(const string &name, const casa::MPosition &position)
+Station::Station(const string &name, const casacore::MPosition &position)
: itsName(name),
itsPosition(position)
{
@@ -44,12 +44,12 @@ const string &Station::name() const
return itsName;
}
-const casa::MPosition &Station::position() const
+const casacore::MPosition &Station::position() const
{
return itsPosition;
}
-Instrument::Instrument(const string &name, const casa::MPosition &position)
+Instrument::Instrument(const string &name, const casacore::MPosition &position)
: itsName(name),
itsPosition(position)
{
@@ -60,7 +60,7 @@ const string &Instrument::name() const
return itsName;
}
-const casa::MPosition &Instrument::position() const
+const casacore::MPosition &Instrument::position() const
{
return itsPosition;
}
diff --git a/CEP/Calibration/BBSKernel/src/IonosphereExpr.cc b/CEP/Calibration/BBSKernel/src/IonosphereExpr.cc
index 3e1ed42e6f4cf0a5ae30efa61a42f30ed546fa1e..5fd64887af71db17fd8191d3b8adc05c82a67970 100644
--- a/CEP/Calibration/BBSKernel/src/IonosphereExpr.cc
+++ b/CEP/Calibration/BBSKernel/src/IonosphereExpr.cc
@@ -38,7 +38,7 @@
#include <Common/lofar_string.h>
#include <Common/lofar_vector.h>
-#include <measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MPosition.h>
namespace LOFAR
{
@@ -110,8 +110,8 @@ MIMExpr::MIMExpr(const IonosphereConfig &config, Scope &scope)
<< itsCoeff.size());
}
-Expr<JonesMatrix>::Ptr MIMExpr::construct(const casa::MPosition &refPosition,
- const casa::MPosition &station, const Expr<Vector<3> >::ConstPtr &direction)
+Expr<JonesMatrix>::Ptr MIMExpr::construct(const casacore::MPosition &refPosition,
+ const casacore::MPosition &station, const Expr<Vector<3> >::ConstPtr &direction)
const
{
PiercePoint::Ptr piercePoint(new PiercePoint(station, direction, itsHeight));
@@ -165,8 +165,8 @@ ExpIonExpr::ExpIonExpr(const IonosphereConfig&, Scope &scope)
}
}
-Expr<JonesMatrix>::Ptr ExpIonExpr::construct(const casa::MPosition&,
- const casa::MPosition &station, const Expr<Vector<3> >::ConstPtr &direction)
+Expr<JonesMatrix>::Ptr ExpIonExpr::construct(const casacore::MPosition&,
+ const casacore::MPosition &station, const Expr<Vector<3> >::ConstPtr &direction)
const
{
PiercePoint::Ptr piercePoint(new PiercePoint(station, direction, itsHeight));
diff --git a/CEP/Calibration/BBSKernel/src/MeasurementAIPS.cc b/CEP/Calibration/BBSKernel/src/MeasurementAIPS.cc
index 3863d0f2aef41889cf99607649a425be32ab07af..71f12ec364dddc7d3ed8dc96ee53ec5a07fcf4ab 100644
--- a/CEP/Calibration/BBSKernel/src/MeasurementAIPS.cc
+++ b/CEP/Calibration/BBSKernel/src/MeasurementAIPS.cc
@@ -33,44 +33,44 @@
#include <Common/StreamUtil.h>
#include <Common/Version.h>
#include <StationResponse/LofarMetaDataUtil.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/Cube.h>
-#include <casa/BasicMath/Math.h>
-#include <casa/Utilities/GenSort.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/Measures/MCPosition.h>
-#include <measures/Measures/MeasTable.h>
-#include <measures/Measures/MeasConvert.h>
-#include <ms/MeasurementSets/MSAntenna.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/Cube.h>
+#include <casacore/casa/BasicMath/Math.h>
+#include <casacore/casa/Utilities/GenSort.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/measures/Measures/MeasTable.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/ms/MeasurementSets/MSAntenna.h>
#if defined(casacore)
-#include <ms/MSSel/MSAntennaParse.h>
-#include <ms/MSSel/MSSelection.h>
+#include <casacore/ms/MSSel/MSAntennaParse.h>
+#include <casacore/ms/MSSel/MSSelection.h>
#else
-#include <ms/MeasurementSets/MSAntennaParse.h>
-#include <ms/MeasurementSets/MSSelection.h>
+#include <casacore/ms/MSSel/MSAntennaParse.h>
+#include <casacore/ms/MSSel/MSSelection.h>
#endif
-#include <ms/MeasurementSets/MSAntennaColumns.h>
-#include <ms/MeasurementSets/MSDataDescription.h>
-#include <ms/MeasurementSets/MSDataDescColumns.h>
-#include <ms/MeasurementSets/MSField.h>
-#include <ms/MeasurementSets/MSFieldColumns.h>
-#include <ms/MeasurementSets/MSObservation.h>
-#include <ms/MeasurementSets/MSObsColumns.h>
-#include <ms/MeasurementSets/MSPolarization.h>
-#include <ms/MeasurementSets/MSPolColumns.h>
-#include <ms/MeasurementSets/MSSpectralWindow.h>
-#include <ms/MeasurementSets/MSSpWindowColumns.h>
-#include <tables/Tables/ArrayColumn.h>
-#include <tables/Tables/ArrColDesc.h>
-#include <tables/Tables/ExprNode.h>
-#include <tables/Tables/ExprNodeSet.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/TableIter.h>
-#include <tables/Tables/TiledColumnStMan.h>
-
-using namespace casa;
+#include <casacore/ms/MeasurementSets/MSAntennaColumns.h>
+#include <casacore/ms/MeasurementSets/MSDataDescription.h>
+#include <casacore/ms/MeasurementSets/MSDataDescColumns.h>
+#include <casacore/ms/MeasurementSets/MSField.h>
+#include <casacore/ms/MeasurementSets/MSFieldColumns.h>
+#include <casacore/ms/MeasurementSets/MSObservation.h>
+#include <casacore/ms/MeasurementSets/MSObsColumns.h>
+#include <casacore/ms/MeasurementSets/MSPolarization.h>
+#include <casacore/ms/MeasurementSets/MSPolColumns.h>
+#include <casacore/ms/MeasurementSets/MSSpectralWindow.h>
+#include <casacore/ms/MeasurementSets/MSSpWindowColumns.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
+#include <casacore/tables/Tables/ArrColDesc.h>
+#include <casacore/tables/TaQL/ExprNode.h>
+#include <casacore/tables/TaQL/ExprNodeSet.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/TableIter.h>
+#include <casacore/tables/DataMan/TiledColumnStMan.h>
+
+using namespace casacore;
namespace LOFAR
{
@@ -855,7 +855,7 @@ void MeasurementAIPS::createCovarianceColumn(const string &name)
{
// Store dimensions in local variables to improve code readability. The
// dimensions are converted to int because that is what is used by
- // casa::Array.
+ // casacore::Array.
const int nFreq = this->nFreq();
const int nCorrelations = this->nCorrelations();
diff --git a/CEP/Calibration/BBSKernel/src/MeasurementExprLOFAR.cc b/CEP/Calibration/BBSKernel/src/MeasurementExprLOFAR.cc
index 489acad11c92af6e3358d3120814b3f915deb483..95fdeb1e3b5b20d64dc3e6b9f983740b9c8191e2 100644
--- a/CEP/Calibration/BBSKernel/src/MeasurementExprLOFAR.cc
+++ b/CEP/Calibration/BBSKernel/src/MeasurementExprLOFAR.cc
@@ -48,11 +48,11 @@
#include <Common/lofar_algorithm.h>
#include <Common/lofar_smartptr.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/Quanta/Quantum.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MCDirection.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/Quanta/Quantum.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MCDirection.h>
namespace LOFAR
{
@@ -62,8 +62,8 @@ namespace BBS
MeasurementExprLOFAR::MeasurementExprLOFAR(SourceDB &sourceDB,
const BufferMap &buffers, const ModelConfig &config,
const Instrument::ConstPtr &instrument, const BaselineSeq &baselines,
- double refFreq, const casa::MDirection &refPhase,
- const casa::MDirection &refDelay, const casa::MDirection &refTile,
+ double refFreq, const casacore::MDirection &refPhase,
+ const casacore::MDirection &refDelay, const casacore::MDirection &refTile,
bool circular)
: itsBaselines(baselines),
itsCachePolicy(new DefaultCachePolicy())
@@ -107,8 +107,8 @@ void MeasurementExprLOFAR::solvablesChanged()
void MeasurementExprLOFAR::makeForwardExpr(SourceDB &sourceDB,
const BufferMap &buffers, const ModelConfig &config,
const Instrument::ConstPtr &instrument, double refFreq,
- const casa::MDirection &refPhase, const casa::MDirection &refDelay,
- const casa::MDirection &refTile, bool circular)
+ const casacore::MDirection &refPhase, const casacore::MDirection &refDelay,
+ const casacore::MDirection &refTile, bool circular)
{
NSTimer timer;
timer.start();
@@ -910,7 +910,7 @@ MeasurementExprLOFAR::makePatchList(SourceDB &sourceDB, vector<string> patterns)
}
PatchExprBase::Ptr MeasurementExprLOFAR::makePatchExpr(const string &name,
- const casa::MDirection &refPhase,
+ const casacore::MDirection &refPhase,
SourceDB &sourceDB,
const BufferMap &buffers)
{
diff --git a/CEP/Calibration/BBSKernel/src/MeasurementExprLOFARUtil.cc b/CEP/Calibration/BBSKernel/src/MeasurementExprLOFARUtil.cc
index 9f08c6a77a61825e8dfb6f3006231a01ab1839bf..6ae52de44f8b4f1757a76c2be007feac98ef0c6c 100644
--- a/CEP/Calibration/BBSKernel/src/MeasurementExprLOFARUtil.cc
+++ b/CEP/Calibration/BBSKernel/src/MeasurementExprLOFARUtil.cc
@@ -43,8 +43,8 @@
#include <BBSKernel/Expr/StationShift.h>
#include <BBSKernel/Expr/StationUVW.h>
#include <BBSKernel/Expr/TECU2Phase.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MCDirection.h>
namespace LOFAR
{
@@ -52,11 +52,11 @@ namespace BBS
{
Expr<Vector<2> >::Ptr
-makeDirectionExpr(const casa::MDirection &direction)
+makeDirectionExpr(const casacore::MDirection &direction)
{
- casa::MDirection dirJ2000(casa::MDirection::Convert(direction,
- casa::MDirection::J2000)());
- casa::Quantum<casa::Vector<casa::Double> > angles = dirJ2000.getAngle();
+ casacore::MDirection dirJ2000(casacore::MDirection::Convert(direction,
+ casacore::MDirection::J2000)());
+ casacore::Quantum<casacore::Vector<casacore::Double> > angles = dirJ2000.getAngle();
Literal::Ptr ra(new Literal(angles.getBaseValue()(0)));
Literal::Ptr dec(new Literal(angles.getBaseValue()(1)));
@@ -68,30 +68,30 @@ makeDirectionExpr(const casa::MDirection &direction)
}
Expr<Vector<2> >::Ptr
-makeAzElExpr(const casa::MPosition &position,
+makeAzElExpr(const casacore::MPosition &position,
const Expr<Vector<2> >::Ptr &direction)
{
return Expr<Vector<2> >::Ptr(new AzEl(position, direction));
}
Expr<Vector<3> >::Ptr
-makeITRFExpr(const casa::MPosition &position,
+makeITRFExpr(const casacore::MPosition &position,
const Expr<Vector<2> >::Ptr &direction)
{
return Expr<Vector<3> >::Ptr(new ITRFDirection(position, direction));
}
Expr<Vector<3> >::Ptr
-makeLMNExpr(const casa::MDirection &reference,
+makeLMNExpr(const casacore::MDirection &reference,
const Expr<Vector<2> >::Ptr &direction)
{
return Expr<Vector<3> >::Ptr(new LMN(reference, direction));
}
Expr<Vector<3> >::Ptr
-makeStationUVWExpr(const casa::MPosition &arrayPosition,
- const casa::MPosition &stationPosition,
- const casa::MDirection &direction)
+makeStationUVWExpr(const casacore::MPosition &arrayPosition,
+ const casacore::MPosition &stationPosition,
+ const casacore::MDirection &direction)
{
return Expr<Vector<3> >::Ptr(new StationUVW(arrayPosition, stationPosition,
direction));
@@ -357,7 +357,7 @@ makeScalarPhaseExpr(Scope &scope,
Expr<JonesMatrix>::Ptr
makeIonosphereExpr(const Station::ConstPtr &station,
- const casa::MPosition &refPosition,
+ const casacore::MPosition &refPosition,
const Expr<Vector<3> >::Ptr &exprDirection,
const IonosphereExpr::Ptr &exprIonosphere)
{
diff --git a/CEP/Calibration/BBSKernel/src/ParmManager.cc b/CEP/Calibration/BBSKernel/src/ParmManager.cc
index 253e6dd3251e2a56a23082b68d313191138f0b85..26f1d3962e92fdadb48e36a93c22aea250899744 100644
--- a/CEP/Calibration/BBSKernel/src/ParmManager.cc
+++ b/CEP/Calibration/BBSKernel/src/ParmManager.cc
@@ -26,8 +26,8 @@
#include <BBSKernel/Exceptions.h>
#include <ParmDB/Grid.h>
-#include <casa/Utilities/Regex.h>
-#include <casa/Exceptions/Error.h>
+#include <casacore/casa/Utilities/Regex.h>
+#include <casacore/casa/Exceptions/Error.h>
namespace LOFAR
@@ -63,9 +63,9 @@ double ParmManagerImpl::getDefaultValue(unsigned int category,
ParmValueSet valueSet = parmDB.getDefValue(name, ParmValue(value));
ASSERT(valueSet.empty() && valueSet.getType() == ParmValue::Scalar);
- const casa::Array<double> &values = valueSet.getDefParmValue().getValues();
+ const casacore::Array<double> &values = valueSet.getDefParmValue().getValues();
ASSERT(values.size() == 1);
- return values(casa::IPosition(values.ndim(), 0));
+ return values(casacore::IPosition(values.ndim(), 0));
}
ParmProxy::Ptr ParmManagerImpl::get(unsigned int category, const string &name)
@@ -142,18 +142,18 @@ void ParmManagerImpl::flush()
ParmGroup ParmManagerImpl::makeSubset(const vector<string> &include,
const vector<string> &exclude, const ParmGroup &group) const
{
- vector<casa::Regex> includeRegex(include.size());
- vector<casa::Regex> excludeRegex(exclude.size());
+ vector<casacore::Regex> includeRegex(include.size());
+ vector<casacore::Regex> excludeRegex(exclude.size());
try
{
transform(include.begin(), include.end(), includeRegex.begin(),
- ptr_fun(casa::Regex::fromPattern));
+ ptr_fun(casacore::Regex::fromPattern));
transform(exclude.begin(), exclude.end(), excludeRegex.begin(),
- ptr_fun(casa::Regex::fromPattern));
+ ptr_fun(casacore::Regex::fromPattern));
}
- catch(casa::AipsError &ex)
+ catch(casacore::AipsError &ex)
{
THROW(BBSKernelException, "Error parsing include/exclude pattern"
" (exception: " << ex.what() << ")");
@@ -187,13 +187,13 @@ ParmGroup ParmManagerImpl::makeSubset(const vector<string> &include,
}
bool ParmManagerImpl::isIncluded(const string &candidate,
- const vector<casa::Regex> &include, const vector<casa::Regex> &exclude)
+ const vector<casacore::Regex> &include, const vector<casacore::Regex> &exclude)
const
{
- casa::String name(candidate);
+ casacore::String name(candidate);
bool flag = false;
- vector<casa::Regex>::const_iterator inc_it = include.begin();
+ vector<casacore::Regex>::const_iterator inc_it = include.begin();
while(inc_it != include.end())
{
if(name.matches(*inc_it))
@@ -206,7 +206,7 @@ bool ParmManagerImpl::isIncluded(const string &candidate,
if(flag)
{
- vector<casa::Regex>::const_iterator exc_it = exclude.begin();
+ vector<casacore::Regex>::const_iterator exc_it = exclude.begin();
while(exc_it != exclude.end())
{
if(name.matches(*exc_it))
diff --git a/CEP/Calibration/BBSKernel/src/PatchExpr.cc b/CEP/Calibration/BBSKernel/src/PatchExpr.cc
index b310253b23f21cb6716e6c51fdabb79e849e36f2..41e848d36020b7fda7075c9212369cdc2148526f 100644
--- a/CEP/Calibration/BBSKernel/src/PatchExpr.cc
+++ b/CEP/Calibration/BBSKernel/src/PatchExpr.cc
@@ -42,7 +42,7 @@ PatchExprBase::~PatchExprBase()
}
PatchExpr::PatchExpr(Scope &scope, SourceDB &sourceDB, const string &name,
- const casa::MDirection &refPhase)
+ const casacore::MDirection &refPhase)
: itsName(name)
{
initSourceList(scope, sourceDB, name);
@@ -151,7 +151,7 @@ void PatchExpr::initPositionExpr(const vector<Source::Ptr> &sources)
}
void PatchExpr::initLMNExpr(const vector<Source::Ptr> &sources,
- const casa::MDirection &refPhase)
+ const casacore::MDirection &refPhase)
{
itsLMN.reserve(sources.size());
for(vector<Source::Ptr>::const_iterator it = sources.begin(),
diff --git a/CEP/Calibration/BBSKernel/src/Solver.cc b/CEP/Calibration/BBSKernel/src/Solver.cc
index 6a697e9a56731405ede72d1b980126090bea8a32..da750665bfe2ae7c24157ca2b2b69bd2baedb70a 100644
--- a/CEP/Calibration/BBSKernel/src/Solver.cc
+++ b/CEP/Calibration/BBSKernel/src/Solver.cc
@@ -91,7 +91,7 @@ void Solver::reset(const SolverOptions &options)
void Solver::setCoeffIndex(size_t kernelId, const CoeffIndex &local)
{
- vector<casa::uInt> &mapping = itsCoeffMapping[kernelId];
+ vector<casacore::uInt> &mapping = itsCoeffMapping[kernelId];
mapping.resize(local.getCoeffCount());
for(CoeffIndex::const_iterator it = local.begin(), end = local.end();
it != end; ++it)
diff --git a/CEP/Calibration/BBSKernel/src/SolverInterfaceTypes.cc b/CEP/Calibration/BBSKernel/src/SolverInterfaceTypes.cc
index 4fd4c5fe4d58366a7c4a8a9bf471163ed6caf1f7..930da10e7ee7b2e06b6221c6654c6a256f6334df 100644
--- a/CEP/Calibration/BBSKernel/src/SolverInterfaceTypes.cc
+++ b/CEP/Calibration/BBSKernel/src/SolverInterfaceTypes.cc
@@ -32,9 +32,9 @@
#include <Blob/BlobAipsIO.h>
#include <Blob/BlobSTL.h>
-#include <casa/IO/AipsIO.h>
-#include <casa/BasicSL/String.h>
-#include <casa/Containers/Record.h>
+#include <casacore/casa/IO/AipsIO.h>
+#include <casacore/casa/BasicSL/String.h>
+#include <casacore/casa/Containers/Record.h>
namespace LOFAR
@@ -157,9 +157,9 @@ BlobIStream &operator>>(BlobIStream &in, CellEquation &obj)
in >> obj.id;
BlobAipsIO aipsBuffer(in);
- casa::AipsIO aipsStream(&aipsBuffer);
- casa::String aipsErrorMessage;
- casa::Record aipsRecord;
+ casacore::AipsIO aipsStream(&aipsBuffer);
+ casacore::String aipsErrorMessage;
+ casacore::Record aipsRecord;
aipsStream >> aipsRecord;
if(!obj.equation.fromRecord(aipsErrorMessage, aipsRecord))
@@ -177,9 +177,9 @@ BlobOStream &operator<<(BlobOStream &out, const CellEquation &obj)
out << obj.id;
BlobAipsIO aipsBuffer(out);
- casa::AipsIO aipsStream(&aipsBuffer);
- casa::String aipsErrorMessage;
- casa::Record aipsRecord;
+ casacore::AipsIO aipsStream(&aipsBuffer);
+ casacore::String aipsErrorMessage;
+ casacore::Record aipsRecord;
if(!obj.equation.toRecord(aipsErrorMessage, aipsRecord))
{
diff --git a/CEP/Calibration/BBSKernel/src/StationExprLOFAR.cc b/CEP/Calibration/BBSKernel/src/StationExprLOFAR.cc
index 70cc0a141c8270db29e849f4f79f7331cd851644..e67b1b0c68deec9e53ace22dd60e258a818dde94 100644
--- a/CEP/Calibration/BBSKernel/src/StationExprLOFAR.cc
+++ b/CEP/Calibration/BBSKernel/src/StationExprLOFAR.cc
@@ -40,8 +40,8 @@ namespace BBS
StationExprLOFAR::StationExprLOFAR(SourceDB &sourceDB, const BufferMap &buffers,
const ModelConfig &config, const Instrument::ConstPtr &instrument,
- double refFreq, const casa::MDirection &refPhase,
- const casa::MDirection &refDelay, const casa::MDirection &refTile,
+ double refFreq, const casacore::MDirection &refPhase,
+ const casacore::MDirection &refDelay, const casacore::MDirection &refTile,
bool inverse, bool useMMSE, double sigmaMMSE)
{
initialize(sourceDB, buffers, config, instrument, refFreq, refPhase,
@@ -60,8 +60,8 @@ StationExprLOFAR::StationExprLOFAR(SourceDB &sourceDB, const BufferMap &buffers,
void StationExprLOFAR::initialize(SourceDB &sourceDB, const BufferMap &buffers,
const ModelConfig &config, const Instrument::ConstPtr &instrument,
- double refFreq, const casa::MDirection &refPhase,
- const casa::MDirection &refDelay, const casa::MDirection &refTile,
+ double refFreq, const casacore::MDirection &refPhase,
+ const casacore::MDirection &refDelay, const casacore::MDirection &refTile,
bool inverse, bool useMMSE, double sigmaMMSE)
{
// Allocate space for the station response expressions.
@@ -450,7 +450,7 @@ const JonesMatrix StationExprLOFAR::evaluate(unsigned int i)
}
PatchExprBase::Ptr StationExprLOFAR::makePatchExpr(const string &name,
- const casa::MDirection &refPhase,
+ const casacore::MDirection &refPhase,
SourceDB &sourceDB,
const BufferMap &buffers)
{
diff --git a/CEP/Calibration/BBSKernel/src/StationLOFAR.cc b/CEP/Calibration/BBSKernel/src/StationLOFAR.cc
index 8980ee45c9c1374afeb415b4b0273cb9cdb8464f..2a1240fd3b11f3d02ce174dff857f261e7efb0d6 100644
--- a/CEP/Calibration/BBSKernel/src/StationLOFAR.cc
+++ b/CEP/Calibration/BBSKernel/src/StationLOFAR.cc
@@ -28,7 +28,7 @@ namespace LOFAR
namespace BBS
{
-StationLOFAR::StationLOFAR(const string &name, const casa::MPosition &position,
+StationLOFAR::StationLOFAR(const string &name, const casacore::MPosition &position,
const StationResponse::Station::ConstPtr &station)
: Station(name, position),
itsStation(station)
diff --git a/CEP/Calibration/BBSKernel/src/UVWFlagger.cc b/CEP/Calibration/BBSKernel/src/UVWFlagger.cc
index 09ad6e21d2089f7b24b55f1f6384f117dd96cc07..8c52ce2f8342fdb77ac035ffd1500791b6ae9d6f 100644
--- a/CEP/Calibration/BBSKernel/src/UVWFlagger.cc
+++ b/CEP/Calibration/BBSKernel/src/UVWFlagger.cc
@@ -25,7 +25,7 @@
#include <Common/lofar_iomanip.h>
#include <BBSKernel/VisBuffer.h>
-#include <casa/BasicSL/Constants.h>
+#include <casacore/casa/BasicSL/Constants.h>
#include <limits>
namespace LOFAR
@@ -93,7 +93,7 @@ void UVWFlagger::process()
for(size_t i = 0; i < itsBuffer->nFreq(); ++i)
{
const double freq = itsBuffer->grid()[FREQ]->center(i);
- invLambdaSqr[i] = (freq * freq) / (casa::C::c * casa::C::c);
+ invLambdaSqr[i] = (freq * freq) / (casacore::C::c * casacore::C::c);
}
for(size_t i = 0; i < itsBuffer->nBaselines(); ++i)
diff --git a/CEP/Calibration/BBSKernel/src/VisBuffer.cc b/CEP/Calibration/BBSKernel/src/VisBuffer.cc
index 8c5e70f812497922d6f32811bd15b3cca1c47b15..baa1fa0e81d148f9195609973acc774f2d9542a3 100644
--- a/CEP/Calibration/BBSKernel/src/VisBuffer.cc
+++ b/CEP/Calibration/BBSKernel/src/VisBuffer.cc
@@ -29,15 +29,15 @@
#include <Common/lofar_algorithm.h>
#include <Common/LofarLogger.h>
-#include <measures/Measures/MBaseline.h>
-#include <measures/Measures/MEpoch.h>
-#include <measures/Measures/MeasFrame.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/Measures/MCPosition.h>
-#include <measures/Measures/MCBaseline.h>
-#include <casa/Quanta/MVuvw.h>
-#include <casa/BasicSL/Complex.h>
+#include <casacore/measures/Measures/MBaseline.h>
+#include <casacore/measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MeasFrame.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/measures/Measures/MCBaseline.h>
+#include <casacore/casa/Quanta/MVuvw.h>
+#include <casacore/casa/BasicSL/Complex.h>
namespace LOFAR
{
@@ -70,22 +70,22 @@ VisBuffer::VisBuffer(const VisDimensions &dims, bool hasCovariance,
<< " MB.");
}
-void VisBuffer::setPhaseReference(const casa::MDirection &reference)
+void VisBuffer::setPhaseReference(const casacore::MDirection &reference)
{
- itsPhaseReference = casa::MDirection::Convert(reference,
- casa::MDirection::J2000)();
+ itsPhaseReference = casacore::MDirection::Convert(reference,
+ casacore::MDirection::J2000)();
}
-void VisBuffer::setDelayReference(const casa::MDirection &reference)
+void VisBuffer::setDelayReference(const casacore::MDirection &reference)
{
- itsDelayReference = casa::MDirection::Convert(reference,
- casa::MDirection::J2000)();
+ itsDelayReference = casacore::MDirection::Convert(reference,
+ casacore::MDirection::J2000)();
}
-void VisBuffer::setTileReference(const casa::MDirection &reference)
+void VisBuffer::setTileReference(const casacore::MDirection &reference)
{
- itsTileReference = casa::MDirection::Convert(reference,
- casa::MDirection::J2000)();
+ itsTileReference = casacore::MDirection::Convert(reference,
+ casacore::MDirection::J2000)();
}
bool VisBuffer::isLinear() const
@@ -126,26 +126,26 @@ void VisBuffer::computeUVW()
uvw.resize(boost::extents[nStations()][nTime()][3]);
// Initialize reference frame.
- casa::Quantum<casa::Double> qEpoch(0.0, "s");
- casa::MEpoch mEpoch(qEpoch, casa::MEpoch::UTC);
- casa::MeasFrame mFrame(mEpoch, itsInstrument->position(),
+ casacore::Quantum<casacore::Double> qEpoch(0.0, "s");
+ casacore::MEpoch mEpoch(qEpoch, casacore::MEpoch::UTC);
+ casacore::MeasFrame mFrame(mEpoch, itsInstrument->position(),
itsPhaseReference);
// Compute UVW.
- casa::MVPosition mvArrayPosition = itsInstrument->position().getValue();
+ casacore::MVPosition mvArrayPosition = itsInstrument->position().getValue();
for(size_t i = 0; i < nStations(); ++i)
{
// Use station positions relative to the array reference position (to
// keep values small).
- casa::MVPosition mvPosition =
+ casacore::MVPosition mvPosition =
itsInstrument->station(i)->position().getValue();
- casa::MVBaseline mvBaseline(mvPosition, mvArrayPosition);
+ casacore::MVBaseline mvBaseline(mvPosition, mvArrayPosition);
- casa::MBaseline mBaseline(mvBaseline,
- casa::MBaseline::Ref(casa::MBaseline::ITRF, mFrame));
+ casacore::MBaseline mBaseline(mvBaseline,
+ casacore::MBaseline::Ref(casacore::MBaseline::ITRF, mFrame));
// Setup coordinate transformation engine.
- casa::MBaseline::Convert convertor(mBaseline, casa::MBaseline::J2000);
+ casacore::MBaseline::Convert convertor(mBaseline, casacore::MBaseline::J2000);
// Compute UVW coordinates.
for(size_t j = 0; j < nTime(); ++j)
@@ -157,8 +157,8 @@ void VisBuffer::computeUVW()
// Create MVuvw from a baseline (MVBaseline) and a reference
// direction (MVDirection). Baseline and reference direction are
// _assumed_ to be in the same frame (see casacore documentation).
- casa::MBaseline mBaselineJ2000(convertor());
- casa::MVuvw mvUVW(mBaselineJ2000.getValue(),
+ casacore::MBaseline mBaselineJ2000(convertor());
+ casacore::MVuvw mvUVW(mBaselineJ2000.getValue(),
itsPhaseReference.getValue());
uvw[i][j][0] = mvUVW(0);
@@ -225,7 +225,7 @@ void VisBuffer::flagsNaN()
// If any of the correlations is NaN, flag all correlations.
for(size_t i = 0; i < nCorrelations(); i++)
{
- if(casa::isNaN(sample_it[i]))
+ if(casacore::isNaN(sample_it[i]))
{
for(size_t j = 0; j < nCorrelations(); j++)
{
diff --git a/CEP/Calibration/BBSKernel/src/VisDimensions.cc b/CEP/Calibration/BBSKernel/src/VisDimensions.cc
index 622f8611edb397911b77a18dfa21dc465441c9d5..46a110acaa51d18c086c9ee599776c7d5b1b05ce 100644
--- a/CEP/Calibration/BBSKernel/src/VisDimensions.cc
+++ b/CEP/Calibration/BBSKernel/src/VisDimensions.cc
@@ -26,8 +26,8 @@
#include <BBSKernel/VisDimensions.h>
#include <Common/lofar_iomanip.h>
-#include <casa/Quanta/Quantum.h>
-#include <casa/Quanta/MVTime.h>
+#include <casacore/casa/Quanta/Quantum.h>
+#include <casacore/casa/Quanta/MVTime.h>
namespace LOFAR
{
@@ -64,11 +64,11 @@ ostream &operator<<(ostream &out, const VisDimensions &obj)
<< " MHz (" << obj.nFreq() << " channel(s) of " << setprecision(3)
<< (freqRange.second - freqRange.first) / obj.nFreq() << " Hz)" << endl;
out << "Time : "
- << casa::MVTime::Format(casa::MVTime::YMD, 6)
- << casa::MVTime(casa::Quantum<casa::Double>(timeRange.first, "s"))
+ << casacore::MVTime::Format(casacore::MVTime::YMD, 6)
+ << casacore::MVTime(casacore::Quantum<casacore::Double>(timeRange.first, "s"))
<< " - "
- << casa::MVTime::Format(casa::MVTime::YMD, 6)
- << casa::MVTime(casa::Quantum<casa::Double>(timeRange.second, "s"))
+ << casacore::MVTime::Format(casacore::MVTime::YMD, 6)
+ << casacore::MVTime(casacore::Quantum<casacore::Double>(timeRange.second, "s"))
<< endl;
out << "Duration : "
<< setprecision(3) << (timeRange.second - timeRange.first) / 3600.0
diff --git a/CEP/Calibration/BBSKernel/src/VisEquator.cc b/CEP/Calibration/BBSKernel/src/VisEquator.cc
index cc695a25f9f9cc8866edd86a4aced6b1acc0de05..e5bbcf52944d6d376f81a7ee25671122cde8c5a2 100644
--- a/CEP/Calibration/BBSKernel/src/VisEquator.cc
+++ b/CEP/Calibration/BBSKernel/src/VisEquator.cc
@@ -262,7 +262,7 @@ Interval<size_t> VisEquator::findContainedCellRange(const Axis::ShPtr &axis,
Interval<double> overlap(std::max(axis->start(), interval.start),
std::min(axis->end(), interval.end));
- if(overlap.start >= overlap.end || casa::near(overlap.start, overlap.end))
+ if(overlap.start >= overlap.end || casacore::near(overlap.start, overlap.end))
{
return Interval<size_t>(1, 0);
}
@@ -273,7 +273,7 @@ Interval<size_t> VisEquator::findContainedCellRange(const Axis::ShPtr &axis,
// Check for special case: start cell is not completely contained in the
// provided interval.
- if(!casa::near(axis->lower(start), overlap.start))
+ if(!casacore::near(axis->lower(start), overlap.start))
{
if(start == end)
{
@@ -285,7 +285,7 @@ Interval<size_t> VisEquator::findContainedCellRange(const Axis::ShPtr &axis,
// Check for special case: end cell is not completely contained in the
// provided interval.
- if(!casa::near(axis->upper(end), overlap.end))
+ if(!casacore::near(axis->upper(end), overlap.end))
{
if(end == start)
{
diff --git a/CEP/Calibration/BBSKernel/src/VisSelection.cc b/CEP/Calibration/BBSKernel/src/VisSelection.cc
index e66572dc5219aa551fade3ecbbca836329c39620..f7aec8d1064db4424a7a1b74a5b4da0d1307401b 100644
--- a/CEP/Calibration/BBSKernel/src/VisSelection.cc
+++ b/CEP/Calibration/BBSKernel/src/VisSelection.cc
@@ -26,16 +26,16 @@
#include <BBSKernel/VisSelection.h>
#include <Common/lofar_algorithm.h>
-#include <casa/Quanta/Quantum.h>
-#include <casa/Quanta/MVTime.h>
+#include <casacore/casa/Quanta/Quantum.h>
+#include <casacore/casa/Quanta/MVTime.h>
namespace LOFAR
{
namespace BBS
{
-using casa::Quantum;
-using casa::MVTime;
-using casa::Double;
+using casacore::Quantum;
+using casacore::MVTime;
+using casacore::Double;
VisSelection::VisSelection()
{
@@ -165,9 +165,9 @@ bool VisSelection::convertTime(const string &in, double &out) const
{
//# TODO: Convert from default epoch to MS epoch (as it may differ from
//# the default!)
- casa::Quantity time;
+ casacore::Quantity time;
- if(in.empty() || !casa::MVTime::read(time, in))
+ if(in.empty() || !casacore::MVTime::read(time, in))
return false;
out = time.getValue("s");
diff --git a/CEP/Calibration/BBSKernel/test/t3C343.cc b/CEP/Calibration/BBSKernel/test/t3C343.cc
index f8a0828617e515281e07bf04ca93f08bf48ad5e9..1febd44d0f160be61ebf23ce37d1dbeb2c184ec9 100644
--- a/CEP/Calibration/BBSKernel/test/t3C343.cc
+++ b/CEP/Calibration/BBSKernel/test/t3C343.cc
@@ -71,7 +71,7 @@ void doSolveAll (Prediffer& pre1, const vector<string>& solv,
for (int it=0; it<maxniter; ++it) {
// Get the fitter from the prediffer and give them to the solver.
- vector<casa::LSQFit> fitters;
+ vector<casacore::LSQFit> fitters;
pre1.fillFitters (fitters, "DATA");
solver.mergeFitters (fitters, 0);
// Do the solve.
@@ -127,7 +127,7 @@ void doSolveStep (Prediffer& pre1, const vector<string>& solv,
for (int it=0; it<maxniter; ++it) {
// Get the fitter from the prediffer and give them to the solver.
- vector<casa::LSQFit> fitters;
+ vector<casacore::LSQFit> fitters;
pre1.fillFitters (fitters, "DATA");
solver.mergeFitters (fitters, 0);
// Do the solve.
diff --git a/CEP/Calibration/BBSKernel/test/tCorrect.cc b/CEP/Calibration/BBSKernel/test/tCorrect.cc
index 400266ae024fbeae00a6f755a26068c9959fc7dc..25c1e1b3a6e99cd0b280dd702e8fcdf71bad20ad 100644
--- a/CEP/Calibration/BBSKernel/test/tCorrect.cc
+++ b/CEP/Calibration/BBSKernel/test/tCorrect.cc
@@ -23,17 +23,17 @@
#include <lofar_config.h>
#include <BBSKernel/Prediffer.h>
#include <Common/LofarLogger.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/ArrayColumn.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
#ifdef AIPS_NO_TEMPLATE_SRC
-#include <casa/Arrays/ArrayLogical.cc> //include .cc for template
+#include <casacore/casa/Arrays/ArrayLogical.cc> //include .cc for template
#endif
#include <stdexcept>
using namespace LOFAR;
using namespace LOFAR::BBS;
using namespace std;
-using namespace casa;
+using namespace casacore;
// Note:
// demo3.MS contains 50 frequency channels of 500000 Hz with
diff --git a/CEP/Calibration/BBSKernel/test/tDFT.cc b/CEP/Calibration/BBSKernel/test/tDFT.cc
index 9e03dc7305d1fc41c46234387e87284163515f01..8ffa08d4a24729257470e6408b14126f9ccfc3c3 100644
--- a/CEP/Calibration/BBSKernel/test/tDFT.cc
+++ b/CEP/Calibration/BBSKernel/test/tDFT.cc
@@ -24,14 +24,14 @@
#include <Common/LofarLogger.h>
#include <Common/LofarTypes.h>
#include <Common/Timer.h>
-#include <casa/BasicSL/Constants.h>
+#include <casacore/casa/BasicSL/Constants.h>
#include <vector>
#include <cmath>
#include <stdexcept>
using namespace LOFAR;
using namespace std;
-using namespace casa;
+using namespace casacore;
// Do for each visibility the DFT to each l.m point.
// vis * exp(2*pi*(ul+vm+wn))
diff --git a/CEP/Calibration/BBSKernel/test/tFillRow.cc b/CEP/Calibration/BBSKernel/test/tFillRow.cc
index 070fd92516e094499a3bd09a473d6ece78ddc567..cc335a1195927a2a1bc9649516f3b7ed8297c8a4 100644
--- a/CEP/Calibration/BBSKernel/test/tFillRow.cc
+++ b/CEP/Calibration/BBSKernel/test/tFillRow.cc
@@ -23,7 +23,7 @@
#include <lofar_config.h>
#include <BBSKernel/Expr/Matrix.h>
#include <Common/LofarLogger.h>
-#include <casa/BasicMath/Math.h>
+#include <casacore/casa/BasicMath/Math.h>
using namespace LOFAR;
@@ -48,7 +48,7 @@ void doTest (int nx, int ny)
dcomplex v = v0+double(i);
dcomplex f = fact*(0.1+i/10.);
for (int j=0; j<nx; ++j) {
- ASSERTSTR (casa::near(real(v),*realp) && casa::near(imag(v),*imagp),
+ ASSERTSTR (casacore::near(real(v),*realp) && casacore::near(imag(v),*imagp),
"result=" << *realp << ',' << *imagp << ", expected=" << v);
realp++;
imagp++;
diff --git a/CEP/Calibration/BBSKernel/test/tMSData.cc b/CEP/Calibration/BBSKernel/test/tMSData.cc
index 2e8f87c09de27855d19d52853a54691f8e7e7990..784145cc74c8633c632edc5951b40968b9951256 100644
--- a/CEP/Calibration/BBSKernel/test/tMSData.cc
+++ b/CEP/Calibration/BBSKernel/test/tMSData.cc
@@ -27,20 +27,20 @@
#include <Blob/BlobIBufStream.h>
#include <Common/LofarLogger.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/ExprNode.h>
-#include <tables/Tables/TableIter.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <tables/Tables/ArrayColumn.h>
-#include <casa/Arrays/Array.h>
-#include <casa/Arrays/Slicer.h>
-#include <casa/Arrays/ArrayLogical.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/TaQL/ExprNode.h>
+#include <casacore/tables/Tables/TableIter.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/casa/Arrays/Slicer.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
#include <fstream>
#include <sstream>
using namespace LOFAR;
using namespace LOFAR::BBS;
-using namespace casa;
+using namespace casacore;
using namespace std;
void doIt (const string& msName, Prediffer& prediff, const string& column,
diff --git a/CEP/Calibration/BBSKernel/test/tMeqParm.cc b/CEP/Calibration/BBSKernel/test/tMeqParm.cc
index 52f276e433cc95e4c8839f2863a2b7a8b5738523..f14574fc287955639e3a903bea283ac7d3b10fb4 100644
--- a/CEP/Calibration/BBSKernel/test/tMeqParm.cc
+++ b/CEP/Calibration/BBSKernel/test/tMeqParm.cc
@@ -31,7 +31,7 @@
using namespace LOFAR;
using namespace LOFAR::BBS;
-using namespace casa;
+using namespace casacore;
bool compare (const MeqMatrix& m1, const MeqMatrix& m2)
diff --git a/CEP/Calibration/BBSKernel/test/tMeqPolc.cc b/CEP/Calibration/BBSKernel/test/tMeqPolc.cc
index ce79fb648886e6c70c6194a00a58b928bdd3e745..d04037c0488fdfd3d3549a2710bc486db63df01e 100644
--- a/CEP/Calibration/BBSKernel/test/tMeqPolc.cc
+++ b/CEP/Calibration/BBSKernel/test/tMeqPolc.cc
@@ -30,7 +30,7 @@
using namespace LOFAR;
using namespace LOFAR::BBS;
-using namespace casa;
+using namespace casacore;
bool compare (const MeqMatrix& m1, const MeqMatrix& m2)
diff --git a/CEP/Calibration/BBSKernel/test/tMeqPolcLog.cc b/CEP/Calibration/BBSKernel/test/tMeqPolcLog.cc
index fd1f921c7bb07f115f4e72aea1cd1a7c319cc15b..0ba586fdfb49ffc4de77a8dac2bddafb3590ced4 100644
--- a/CEP/Calibration/BBSKernel/test/tMeqPolcLog.cc
+++ b/CEP/Calibration/BBSKernel/test/tMeqPolcLog.cc
@@ -30,7 +30,7 @@
using namespace LOFAR;
using namespace LOFAR::BBS;
-using namespace casa;
+using namespace casacore;
/*
diff --git a/CEP/Calibration/BBSKernel/test/tMeqTabular.cc b/CEP/Calibration/BBSKernel/test/tMeqTabular.cc
index 4e5463ac3dcb28d6c8491119fb91ae4414c1be6e..060ec4a9fa3b397040e9930da0e4a1621068f34c 100644
--- a/CEP/Calibration/BBSKernel/test/tMeqTabular.cc
+++ b/CEP/Calibration/BBSKernel/test/tMeqTabular.cc
@@ -30,7 +30,7 @@
using namespace LOFAR;
using namespace LOFAR::BBS;
-using namespace casa;
+using namespace casacore;
#define EPSILON 1.0e-12
diff --git a/CEP/Calibration/BBSKernel/test/tPerturbed.cc b/CEP/Calibration/BBSKernel/test/tPerturbed.cc
index 1f2d4f907ef35a1606e88aeb450d14414b356932..bc104bbac31f2fe1002feb940998da6972fa647a 100644
--- a/CEP/Calibration/BBSKernel/test/tPerturbed.cc
+++ b/CEP/Calibration/BBSKernel/test/tPerturbed.cc
@@ -26,7 +26,7 @@
#include <BBSKernel/MNS/MeqMatrix.h>
#include <Common/StreamUtil.h>
#include <Common/LofarLogger.h>
-#include <casa/BasicMath/Math.h>
+#include <casacore/casa/BasicMath/Math.h>
#include <stdexcept>
#include <iostream>
#include <iomanip>
@@ -108,8 +108,8 @@ void doTest (Prediffer& pre1, const StepProp& stepProp,
const dcomplex* resv1 = resm1->dcomplexStorage();
const dcomplex* resv2 = resm2->dcomplexStorage();
for (int k=0; k<resm1->nelements(); ++k) {
- ASSERTSTR (casa::near(real(resv1[k]),real(resv2[k])) &&
- casa::near(imag(resv1[k]),imag(resv2[k])),
+ ASSERTSTR (casacore::near(real(resv1[k]),real(resv2[k])) &&
+ casacore::near(imag(resv1[k]),imag(resv2[k])),
"res1=" << std::setprecision(10) << resv1[k]
<< " res2=" << std::setprecision(10) << resv2[k]
<< " rnr=" << k
@@ -119,8 +119,8 @@ void doTest (Prediffer& pre1, const StepProp& stepProp,
resm1->dcomplexStorage(resv1_r, resv1_i);
resm2->dcomplexStorage(resv2_r, resv2_i);
for (int k=0; k<resm1->nelements(); ++k) {
- ASSERTSTR (casa::near(resv1_r[k],resv2_r[k]) &&
- casa::near(resv1_i[k],resv2_i[k]),
+ ASSERTSTR (casacore::near(resv1_r[k],resv2_r[k]) &&
+ casacore::near(resv1_i[k],resv2_i[k]),
"res1=(" << std::setprecision(10) << resv1_r[k] << ',' <<
resv1_i[k] << ") res2=" << std::setprecision(10) <<
resv2_r[k] << ',' << resv2_i[k] << ") rnr=" << k <<
diff --git a/CEP/Calibration/BBSKernel/test/tPredSolv.cc b/CEP/Calibration/BBSKernel/test/tPredSolv.cc
index bc964b59aad5e6c75ac2ce7a7cd7ecb2f7200081..7dc6db14997d3d8240802bfc21ede8cc666dd11c 100644
--- a/CEP/Calibration/BBSKernel/test/tPredSolv.cc
+++ b/CEP/Calibration/BBSKernel/test/tPredSolv.cc
@@ -72,7 +72,7 @@ void doSolve (Prediffer& pre1,
for (int it=0; it<sprop.getMaxIter(); ++it) {
// Get the fitter from the prediffer and give it to the solver.
- vector<casa::LSQFit> fitters;
+ vector<casacore::LSQFit> fitters;
cout << ">>>" << endl;
pre1.fillFitters (fitters);
solver.mergeFitters (fitters, 0);
@@ -114,7 +114,7 @@ void doSolve2 (Prediffer& pre1, Prediffer& pre2,
<< endl;
for (int it=0; it<sprop.getMaxIter(); ++it) {
// Get the fitter from the prediffer and give it to the solver.
- vector<casa::LSQFit> fitters;
+ vector<casacore::LSQFit> fitters;
cout << ">>>" << endl;
pre1.fillFitters (fitters);
solver.mergeFitters (fitters, 0);
@@ -160,7 +160,7 @@ void doSolve1 (Prediffer& pre1,
for (int it=0; it<sprop.getMaxIter(); ++it) {
// Get the fitter from the prediffer and give it to the solver.
- vector<casa::LSQFit> fitters;
+ vector<casacore::LSQFit> fitters;
cout << ">>>" << endl;
pre1.fillFitters (fitters);
solver.mergeFitters (fitters, 0);
diff --git a/CEP/Calibration/BBSKernel/test/tPredict.cc b/CEP/Calibration/BBSKernel/test/tPredict.cc
index 520d95ae64e1e7128cb01e5d3bba7997471c8ff2..1cd14c15e631040389a4864543c13bacfac8b586 100644
--- a/CEP/Calibration/BBSKernel/test/tPredict.cc
+++ b/CEP/Calibration/BBSKernel/test/tPredict.cc
@@ -23,17 +23,17 @@
#include <lofar_config.h>
#include <BBSKernel/Prediffer.h>
#include <Common/LofarLogger.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/ArrayColumn.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
#ifdef AIPS_NO_TEMPLATE_SRC
-#include <casa/Arrays/ArrayLogical.cc> //include .cc for template
+#include <casacore/casa/Arrays/ArrayLogical.cc> //include .cc for template
#endif
#include <stdexcept>
using namespace LOFAR;
using namespace LOFAR::BBS;
using namespace std;
-using namespace casa;
+using namespace casacore;
// Note:
// demo3.MS contains 50 frequency channels of 500000 Hz with
diff --git a/CEP/Calibration/BBSKernel/test/tShift.cc b/CEP/Calibration/BBSKernel/test/tShift.cc
index eacbb84ca92574b45db6c95c809bc2ee6a295434..c52578fc28663fb13cc5937308ceb4762781245b 100644
--- a/CEP/Calibration/BBSKernel/test/tShift.cc
+++ b/CEP/Calibration/BBSKernel/test/tShift.cc
@@ -24,14 +24,14 @@
#include <Common/LofarLogger.h>
#include <Common/LofarTypes.h>
#include <Common/Timer.h>
-#include <casa/BasicSL/Constants.h>
+#include <casacore/casa/BasicSL/Constants.h>
#include <vector>
#include <cmath>
#include <stdexcept>
using namespace LOFAR;
using namespace std;
-using namespace casa;
+using namespace casacore;
// Define some constants.
diff --git a/CEP/Calibration/BBSKernel/test/tSubtract.cc b/CEP/Calibration/BBSKernel/test/tSubtract.cc
index ef3c2b5743acd724dc2bf7367f09cdc63ccbeb17..1f4f4a5eb6ce1dd14559e5dbba633ef4519fe019 100644
--- a/CEP/Calibration/BBSKernel/test/tSubtract.cc
+++ b/CEP/Calibration/BBSKernel/test/tSubtract.cc
@@ -23,17 +23,17 @@
#include <lofar_config.h>
#include <BBSKernel/Prediffer.h>
#include <Common/LofarLogger.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/ArrayColumn.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
#ifdef AIPS_NO_TEMPLATE_SRC
-#include <casa/Arrays/ArrayLogical.cc> //include .cc for template
+#include <casacore/casa/Arrays/ArrayLogical.cc> //include .cc for template
#endif
#include <stdexcept>
using namespace LOFAR;
using namespace LOFAR::BBS;
using namespace std;
-using namespace casa;
+using namespace casacore;
// Note:
// demo3.MS contains 50 frequency channels of 500000 Hz with
diff --git a/CEP/Calibration/BBSTools/include/BBSTools/addUV2MS.h b/CEP/Calibration/BBSTools/include/BBSTools/addUV2MS.h
index efd352de8176c343df44f8246edba5b6de389787..6986f88f07c6cb024f498dd2f6f563382ae33474 100644
--- a/CEP/Calibration/BBSTools/include/BBSTools/addUV2MS.h
+++ b/CEP/Calibration/BBSTools/include/BBSTools/addUV2MS.h
@@ -26,32 +26,32 @@
#define LOFAR_BBSTOOLS_ADDUV2MS_H
//#include <vector>
-#include <casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/Vector.h>
#include <synthesis/MeasurementEquations/Imager.h> // casarest ft()
void parseOptions(const vector<string> &arguments,
string &msName,
- casa::Vector<casa::String> &patchNames,
+ casacore::Vector<casacore::String> &patchNames,
unsigned int &nwplanes);
-casa::MDirection getPatchDirection(const string &patchName);
-void addDirectionKeyword( casa::Table LofarMS,
+casacore::MDirection getPatchDirection(const string &patchName);
+void addDirectionKeyword( casacore::Table LofarMS,
const std::string &patchName);
-void addChannelSelectionKeyword(casa::Table &LofarTable,
+void addChannelSelectionKeyword(casacore::Table &LofarTable,
const std::string &columnName);
-string createColumnName(const casa::String &);
+string createColumnName(const casacore::String &);
void removeExistingColumns( const std::string &MSfilename,
- const casa::Vector<casa::String> &patchNames);
-void addImagerColumns (casa::MeasurementSet& ms);
-void addModelColumn ( casa::MeasurementSet &ms,
- const casa::String &dataManName);
-casa::Double getMSReffreq(const casa::MeasurementSet &ms);
-casa::Double getMSChanwidth(const casa::MeasurementSet &ms);
-map<string, double> patchFrequency(casa::MeasurementSet &ms,
- const casa::Vector<casa::String> &patchNames);
-bool validModelImage(const casa::String &imageName, string &error);
-unsigned int makeTempImages(const casa::Vector<casa::String> &patchNames,
+ const casacore::Vector<casacore::String> &patchNames);
+void addImagerColumns (casacore::MeasurementSet& ms);
+void addModelColumn ( casacore::MeasurementSet &ms,
+ const casacore::String &dataManName);
+casacore::Double getMSReffreq(const casacore::MeasurementSet &ms);
+casacore::Double getMSChanwidth(const casacore::MeasurementSet &ms);
+map<string, double> patchFrequency(casacore::MeasurementSet &ms,
+ const casacore::Vector<casacore::String> &patchNames);
+bool validModelImage(const casacore::String &imageName, string &error);
+unsigned int makeTempImages(const casacore::Vector<casacore::String> &patchNames,
const std::string &prefix="tmp");
-unsigned int removeTempImages(const casa::Vector<casa::String> &patchNames,
+unsigned int removeTempImages(const casacore::Vector<casacore::String> &patchNames,
const std::string &prefix="tmp");
double updateFrequency(const std::string &imageName,
double reffreq);
@@ -59,14 +59,14 @@ void restoreFrequency(const std::map<std::string,
double> &refFrequencies);
void getImageOptions( const string &patchName,
unsigned int &imSizeX, unsigned int &imSizeY,
- casa::Quantity &cellSizeX, casa::Quantity &cellSizeY,
+ casacore::Quantity &cellSizeX, casacore::Quantity &cellSizeY,
unsigned int &nchan, unsigned int &npol, string &stokes);
//--------------------------------------------------------------
// Function declarations (debug functions)
//
-casa::Vector<casa::String> getColumnNames(const casa::Table &table);
-void showColumnNames(casa::Table &table);
+casacore::Vector<casacore::String> getColumnNames(const casacore::Table &table);
+void showColumnNames(casacore::Table &table);
void usage(const string &);
void showVector(const vector<string> &v, const string &key="");
diff --git a/CEP/Calibration/BBSTools/src/addUV2MS.cc b/CEP/Calibration/BBSTools/src/addUV2MS.cc
index 8b5d9eafce1e33e9b6d510d80ce9d5560e6d071c..23b2af2e16fd6dc34472317cf9e56fd4a866874b 100644
--- a/CEP/Calibration/BBSTools/src/addUV2MS.cc
+++ b/CEP/Calibration/BBSTools/src/addUV2MS.cc
@@ -50,28 +50,28 @@
#include <boost/lexical_cast.hpp> // convert string to number
// casacore includes
-#include <tables/Tables/Table.h>
-#include <tables/Tables/ArrayColumn.h>
-#include <tables/Tables/ArrColDesc.h>
-#include <tables/Tables/ArrayColumnFunc.h>
-#include <tables/Tables/TableRecord.h>
-#include <tables/Tables/TiledColumnStMan.h>
-#include <tables/Tables/TableRecord.h>
-
-#include <casa/Arrays/IPosition.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/Arrays/VectorSTLIterator.h>
-#include <coordinates/Coordinates/Coordinate.h>
-#include <coordinates/Coordinates/DirectionCoordinate.h> // DirectionCoordinate needed for patch direction
-#include <images/Images/PagedImage.h> // we need to open the image to determine patch centre direction
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
+#include <casacore/tables/Tables/ArrColDesc.h>
+#include <casacore/tables/Tables/ArrayColumnFunc.h>
+#include <casacore/tables/Tables/TableRecord.h>
+#include <casacore/tables/DataMan/TiledColumnStMan.h>
+#include <casacore/tables/Tables/TableRecord.h>
+
+#include <casacore/casa/Arrays/IPosition.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/VectorSTLIterator.h>
+#include <casacore/coordinates/Coordinates/Coordinate.h>
+#include <casacore/coordinates/Coordinates/DirectionCoordinate.h> // DirectionCoordinate needed for patch direction
+#include <casacore/images/Images/PagedImage.h> // we need to open the image to determine patch centre direction
#include <synthesis/MeasurementEquations/Imager.h> // casarest ft()
-#include <ms/MeasurementSets/MSSpWindowColumns.h>
+#include <casacore/ms/MeasurementSets/MSSpWindowColumns.h>
#include <BBSTools/addUV2MS.h>
-//using namespace casa;
+//using namespace casacore;
using namespace std;
-using namespace casa;
+using namespace casacore;
using namespace LOFAR;
// Use a terminate handler that can produce a backtrace.
@@ -87,7 +87,7 @@ function declarations now in include/BBSTools/addUV2MS.h
int main(int argc, char *argv[])
{
vector<string> arguments; // vector to keep arguments for arg parsing
- casa::String MSfilename; // Filename of LafarMS
+ casacore::String MSfilename; // Filename of LafarMS
Vector<String> patchNames; // vector with filenames of patches used as models
unsigned int nwplanes=0; // got to see how to export this feature to the outside
@@ -114,12 +114,12 @@ int main(int argc, char *argv[])
if(MSfilename=="")
{
- casa::AbortError("No MS filename given"); // raise exception
+ casacore::AbortError("No MS filename given"); // raise exception
exit(0);
}
if(patchNames.size()==0)
{
- casa::AbortError("No patch image filename given");
+ casacore::AbortError("No patch image filename given");
exit(0);
}
@@ -183,7 +183,7 @@ int main(int argc, char *argv[])
//showColumnNames(LofarMS);
// Do a predict with the casarest ft() function, complist="", because we only use the model images
// Casarest Imager object which has ft method
- // (last parameter casa::True "use MODEL_DATA column")
+ // (last parameter casacore::True "use MODEL_DATA column")
// i.e. Imager imager(LofarMS, True, True);
// Get image options
@@ -475,19 +475,19 @@ void getImageOptions( const string &patchName,
// Get the patch direction, i.e. RA/Dec of the central image pixel
//
-casa::MDirection getPatchDirection(const string &patchName)
+casacore::MDirection getPatchDirection(const string &patchName)
{
- casa::IPosition imageShape; // shape of image
- casa::Vector<casa::Double> Pixel(2); // pixel coords vector of image centre
- casa::MDirection MDirWorld(casa::MDirection::J2000); // astronomical direction in J2000
- casa::PagedImage<casa::Float> image(patchName); // open image
+ casacore::IPosition imageShape; // shape of image
+ casacore::Vector<casacore::Double> Pixel(2); // pixel coords vector of image centre
+ casacore::MDirection MDirWorld(casacore::MDirection::J2000); // astronomical direction in J2000
+ casacore::PagedImage<casacore::Float> image(patchName); // open image
imageShape=image.shape(); // get centre pixel
Pixel[0]=floor(imageShape[0]/2);
Pixel[1]=floor(imageShape[1]/2);
// Determine DirectionCoordinate
- casa::DirectionCoordinate dir(image.coordinates().directionCoordinate (image.coordinates().findCoordinate(casa::Coordinate::DIRECTION)));
+ casacore::DirectionCoordinate dir(image.coordinates().directionCoordinate (image.coordinates().findCoordinate(casacore::Coordinate::DIRECTION)));
dir.toWorld(MDirWorld, Pixel);
return MDirWorld;
@@ -496,24 +496,24 @@ casa::MDirection getPatchDirection(const string &patchName)
// Add keyword "LOFAR_DIRECTION" containing a 2-valued vector of type double with J2000 RA and DEC of patch
// center in radians.
//
-void addDirectionKeyword(casa::Table LofarTable, const string &patchName)
+void addDirectionKeyword(casacore::Table LofarTable, const string &patchName)
{
- casa::MDirection direction(casa::MDirection::J2000);
+ casacore::MDirection direction(casacore::MDirection::J2000);
string columnName=createColumnName(patchName);
// write it to the columnDesc
- casa::TableColumn LofarModelColumn(LofarTable, columnName);
- casa::TableRecord &Model_keywords = LofarModelColumn.rwKeywordSet();
- casa::TableRecord MDirectionRecord;
- casa::String error="";
+ casacore::TableColumn LofarModelColumn(LofarTable, columnName);
+ casacore::TableRecord &Model_keywords = LofarModelColumn.rwKeywordSet();
+ casacore::TableRecord MDirectionRecord;
+ casacore::String error="";
direction=getPatchDirection(patchName);
// Use MeasureHolder class to convert MDirection to a keyword-compatible format
- casa::MeasureHolder mHolder(direction);
+ casacore::MeasureHolder mHolder(direction);
if(!mHolder.toRecord(error, MDirectionRecord))
{
- casa::AbortError("addDirectionKeyword()");
+ casacore::AbortError("addDirectionKeyword()");
}
else
{
@@ -524,12 +524,12 @@ void addDirectionKeyword(casa::Table LofarTable, const string &patchName)
// Create a column name based on the Modelfilename of the form
// modelfilename (minus any file extension)
//
-string createColumnName(const casa::String &ModelFilename)
+string createColumnName(const casacore::String &ModelFilename)
{
string columnName;
string patchName;
- casa::String Filename;
- casa::Path Path(ModelFilename); // casa Path object to allow basename stripping
+ casacore::String Filename;
+ casacore::Path Path(ModelFilename); // casa Path object to allow basename stripping
Filename=Path.baseName(); // remove path from ModelFilename
@@ -560,7 +560,7 @@ string createColumnName(const casa::String &ModelFilename)
// Check that input model image has Jy/pixel flux
//
-bool validModelImage(const casa::String &imageName, string &error)
+bool validModelImage(const casacore::String &imageName, string &error)
{
size_t pos=string::npos;
bool valid=false;
@@ -621,7 +621,7 @@ bool validModelImage(const casa::String &imageName, string &error)
void removeExistingColumns(const string &MSfilename, const Vector<String> &patchNames)
{
string columnName;
- casa::Table LofarTable(MSfilename, casa::Table::Update);
+ casacore::Table LofarTable(MSfilename, casacore::Table::Update);
// Remove existing Patchnames, but only those that are specified in the list of current run
// it preserves other patch columns
@@ -729,7 +729,7 @@ void addModelColumn (MeasurementSet& ms, const String& dataManName)
}
TiledColumnStMan stMan(dataManName, dataTileShape);
ms.addColumn (td, stMan);
- // Set MODEL_DATA keyword for casa::VisSet.
+ // Set MODEL_DATA keyword for casacore::VisSet.
// Sort out the channel selection.
MSSpWindowColumns msSpW(ms.spectralWindow());
Matrix<Int> selection(2, msSpW.nrow());
diff --git a/CEP/Calibration/BBSTools/src/patchCasaFreq.cc b/CEP/Calibration/BBSTools/src/patchCasaFreq.cc
index 6cdb17803aa42712f6a8be4bf9d53359d3478da1..84a4c18a31163cdad36fa16d3c8aaf86cfeb9bfa 100644
--- a/CEP/Calibration/BBSTools/src/patchCasaFreq.cc
+++ b/CEP/Calibration/BBSTools/src/patchCasaFreq.cc
@@ -21,25 +21,25 @@
#include <boost/lexical_cast.hpp> // convert string to number
// casacore includes
-#include <tables/Tables/Table.h>
-#include <tables/Tables/ArrayColumn.h>
-#include <tables/Tables/ArrColDesc.h>
-#include <tables/Tables/ArrayColumnFunc.h>
-#include <tables/Tables/TableRecord.h>
-#include <tables/Tables/TiledColumnStMan.h>
-#include <tables/Tables/TableRecord.h>
-
-#include <casa/Arrays/IPosition.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/Arrays/VectorSTLIterator.h>
-#include <coordinates/Coordinates/Coordinate.h>
-#include <coordinates/Coordinates/DirectionCoordinate.h> // DirectionCoordinate needed for patch direction
-#include <images/Images/PagedImage.h> // we need to open the image to determine patch centre direction
-#include <ms/MeasurementSets/MSSpWindowColumns.h>
-
-//using namespace casa;
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
+#include <casacore/tables/Tables/ArrColDesc.h>
+#include <casacore/tables/Tables/ArrayColumnFunc.h>
+#include <casacore/tables/Tables/TableRecord.h>
+#include <casacore/tables/DataMan/TiledColumnStMan.h>
+#include <casacore/tables/Tables/TableRecord.h>
+
+#include <casacore/casa/Arrays/IPosition.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/VectorSTLIterator.h>
+#include <casacore/coordinates/Coordinates/Coordinate.h>
+#include <casacore/coordinates/Coordinates/DirectionCoordinate.h> // DirectionCoordinate needed for patch direction
+#include <casacore/images/Images/PagedImage.h> // we need to open the image to determine patch centre direction
+#include <casacore/ms/MeasurementSets/MSSpWindowColumns.h>
+
+//using namespace casacore;
using namespace std;
-using namespace casa;
+using namespace casacore;
using namespace LOFAR;
// Use a terminate handler that can produce a backtrace.
diff --git a/CEP/Calibration/ExpIon/src/baselinefitting.cc b/CEP/Calibration/ExpIon/src/baselinefitting.cc
index 7d7b482835283c7406ef687e6ff3191ef29612b0..95e868433c5cdf821d8349dfaf0ce21f9055ca6f 100644
--- a/CEP/Calibration/ExpIon/src/baselinefitting.cc
+++ b/CEP/Calibration/ExpIon/src/baselinefitting.cc
@@ -24,16 +24,16 @@
#include <lofar_config.h>
#include <Common/OpenMP.h>
-#include <casa/Containers/ValueHolder.h>
-#include <casa/Containers/Record.h>
-#include <casa/Utilities/CountedPtr.h>
-#include <scimath/Fitting/LSQFit.h>
+#include <casacore/casa/Containers/ValueHolder.h>
+#include <casacore/casa/Containers/Record.h>
+#include <casacore/casa/Utilities/CountedPtr.h>
+#include <casacore/scimath/Fitting/LSQFit.h>
#if defined(casacore)
-#include <python/Converters/PycExcp.h>
-#include <python/Converters/PycBasicData.h>
-#include <python/Converters/PycValueHolder.h>
-#include <python/Converters/PycRecord.h>
+#include <casacore/python/Converters/PycExcp.h>
+#include <casacore/python/Converters/PycBasicData.h>
+#include <casacore/python/Converters/PycValueHolder.h>
+#include <casacore/python/Converters/PycRecord.h>
#define pyrap python
#else
#include <pyrap/Converters/PycExcp.h>
@@ -45,7 +45,7 @@
#include <boost/python.hpp>
#include <boost/python/args.hpp>
-using namespace casa;
+using namespace casacore;
using namespace boost::python;
namespace LOFAR
@@ -219,10 +219,10 @@ ValueHolder fit(const ValueHolder &phases_vh, const ValueHolder &A_vh, const Val
BOOST_PYTHON_MODULE(_baselinefitting)
{
- casa::pyrap::register_convert_excp();
- casa::pyrap::register_convert_basicdata();
- casa::pyrap::register_convert_casa_valueholder();
- casa::pyrap::register_convert_casa_record();
+ casacore::pyrap::register_convert_excp();
+ casacore::pyrap::register_convert_basicdata();
+ casacore::pyrap::register_convert_casa_valueholder();
+ casacore::pyrap::register_convert_casa_record();
def("fit", LOFAR::ExpIon::fit);
}
diff --git a/CEP/Calibration/StationResponse/src/makeresponseimage.cc b/CEP/Calibration/StationResponse/src/makeresponseimage.cc
index aa545ed0ca194e826fd40a80e320758ca6855a62..36a4276ffc95ecc460f1433b4a1f86000c1f80a3 100644
--- a/CEP/Calibration/StationResponse/src/makeresponseimage.cc
+++ b/CEP/Calibration/StationResponse/src/makeresponseimage.cc
@@ -51,7 +51,7 @@
#include <casacore/ms/MeasurementSets/MSObsColumns.h>
#include <casacore/ms/MeasurementSets/MSSpectralWindow.h>
#include <casacore/ms/MeasurementSets/MSSpWindowColumns.h>
-#include <casacore/tables/Tables/ExprNode.h>
+#include <casacore/tables/TaQL/ExprNode.h>
// There is no wrapped include file lofar_iterator.h.
#include <iterator>
diff --git a/CEP/Calibration/pystationresponse/src/pystationresponse.cc b/CEP/Calibration/pystationresponse/src/pystationresponse.cc
index 6e890d176d59c0f08a966a817a3807f3706cc45e..26cfe2b992baab9516c4518916bbdc4631c6c953 100755
--- a/CEP/Calibration/pystationresponse/src/pystationresponse.cc
+++ b/CEP/Calibration/pystationresponse/src/pystationresponse.cc
@@ -27,23 +27,23 @@
#include <StationResponse/LofarMetaDataUtil.h>
#include <StationResponse/Station.h>
-#include <casa/Arrays/Array.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/Cube.h>
-#include <casa/Containers/ValueHolder.h>
-#include <ms/MeasurementSets/MeasurementSet.h>
-#include <ms/MeasurementSets/MSColumns.h>
-#include <measures/Measures/MeasTable.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MCPosition.h>
-#include <measures/Measures/MCDirection.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/Cube.h>
+#include <casacore/casa/Containers/ValueHolder.h>
+#include <casacore/ms/MeasurementSets/MeasurementSet.h>
+#include <casacore/ms/MeasurementSets/MSColumns.h>
+#include <casacore/measures/Measures/MeasTable.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/measures/Measures/MCDirection.h>
#if defined(casacore)
-#include <python/Converters/PycExcp.h>
-#include <python/Converters/PycBasicData.h>
-#include <python/Converters/PycValueHolder.h>
+#include <casacore/python/Converters/PycExcp.h>
+#include <casacore/python/Converters/PycBasicData.h>
+#include <casacore/python/Converters/PycValueHolder.h>
#define pyrap python
#else
#include <pyrap/Converters/PycExcp.h>
@@ -56,7 +56,7 @@
#include "Package__Version.cc"
-using namespace casa;
+using namespace casacore;
using namespace boost::python;
using namespace LOFAR::StationResponse;
@@ -68,18 +68,18 @@ namespace BBS
{
/*!
* \brief Convert an ITRF position given as a StationResponse::vector3r_t
- * instance to a casa::MPosition.
+ * instance to a casacore::MPosition.
*/
MPosition toMPositionITRF(const vector3r_t &position);
/*!
- * \brief Convert a casa::MPosition instance to a
+ * \brief Convert a casacore::MPosition instance to a
# StationResponse::vector3r_t instance.
*/
vector3r_t fromMPosition(const MPosition &position);
/*!
- * \brief Convert a casa::MDirection instance to a
+ * \brief Convert a casacore::MDirection instance to a
* StationResponse::vector3r_t instance.
*/
vector3r_t fromMDirection(const MDirection &direction);
@@ -761,9 +761,9 @@ namespace BBS
// Define the python module itself.
BOOST_PYTHON_MODULE(_stationresponse)
{
- casa::pyrap::register_convert_excp();
- casa::pyrap::register_convert_basicdata();
- casa::pyrap::register_convert_casa_valueholder();
+ casacore::pyrap::register_convert_excp();
+ casacore::pyrap::register_convert_basicdata();
+ casacore::pyrap::register_convert_casa_valueholder();
LOFAR::BBS::pystationresponse();
}
diff --git a/CEP/DP3/DPPP/src/Upsample.cc b/CEP/DP3/DPPP/src/Upsample.cc
index edcad116ad8fb5cd7273b4c21708ec5a7f7571be..b15280b32baf5f90ab657f9294be675622e690d7 100644
--- a/CEP/DP3/DPPP/src/Upsample.cc
+++ b/CEP/DP3/DPPP/src/Upsample.cc
@@ -27,8 +27,8 @@
#include <iostream>
#include <Common/ParameterSet.h>
-#include <casa/BasicMath/Math.h> // nearAbs
-#include <casa/Arrays/ArrayLogical.h> // anyTrue
+#include <casacore/casa/BasicMath/Math.h> // nearAbs
+#include <casacore/casa/Arrays/ArrayLogical.h> // anyTrue
#include <iomanip>
#include <stddef.h>
diff --git a/CEP/DP3/DPPP/test/tApplyCal.cc b/CEP/DP3/DPPP/test/tApplyCal.cc
index 276b133e0ea3f6d841e7c5a7582df4a55e065ee1..36ee1c1f08d4fc6b588f5a1344579af6d04cd719 100644
--- a/CEP/DP3/DPPP/test/tApplyCal.cc
+++ b/CEP/DP3/DPPP/test/tApplyCal.cc
@@ -29,14 +29,14 @@
#include <Common/ParameterSet.h>
#include <Common/StringUtil.h>
#include <Common/StreamUtil.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::DPPP;
-using namespace casa;
+using namespace casacore;
using namespace std;
// Simple class to generate input arrays.
diff --git a/CEP/DP3/DPPP/test/tApplyCalH5.cc b/CEP/DP3/DPPP/test/tApplyCalH5.cc
index fe081058ad93b6a7eebaf3af35a2808207f3b2e0..9a5ebe79d0882bb8844f64af4fd8a2431304c8e3 100644
--- a/CEP/DP3/DPPP/test/tApplyCalH5.cc
+++ b/CEP/DP3/DPPP/test/tApplyCalH5.cc
@@ -30,14 +30,14 @@
#include <Common/ParameterSet.h>
#include <Common/StringUtil.h>
#include <Common/StreamUtil.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::DPPP;
-using namespace casa;
+using namespace casacore;
using namespace std;
// Simple class to generate input arrays.
diff --git a/CEP/DP3/DPPP/test/tAverager.cc b/CEP/DP3/DPPP/test/tAverager.cc
index fa8d6856e6b6699929f97d32aa1d1cf9ac7db6b7..31a0bd2a20b0a6c576a07f859b3628582e9944a5 100644
--- a/CEP/DP3/DPPP/test/tAverager.cc
+++ b/CEP/DP3/DPPP/test/tAverager.cc
@@ -27,16 +27,16 @@
#include <DPPP/DPInfo.h>
#include <Common/ParameterSet.h>
#include <Common/StringUtil.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
-#include <casa/Quanta/Quantum.h>
+#include <casacore/casa/Quanta/Quantum.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::DPPP;
-using namespace casa;
+using namespace casacore;
using namespace std;
@@ -227,12 +227,12 @@ private:
return true;
}
- virtual void getUVW (const casa::RefRows&, double, DPBuffer& buf)
+ virtual void getUVW (const casacore::RefRows&, double, DPBuffer& buf)
{
buf.getUVW().resize (3, itsNrBl);
indgen (buf.getUVW());
}
- virtual bool getFullResFlags (const casa::RefRows&, DPBuffer& buf)
+ virtual bool getFullResFlags (const casacore::RefRows&, DPBuffer& buf)
{
buf.getFullResFlags().assign (itsFullResFlags);
return true;
diff --git a/CEP/DP3/DPPP/test/tBaselineSelection.cc b/CEP/DP3/DPPP/test/tBaselineSelection.cc
index 486a0b42e277dfa1df07659172be27f3b62452b6..81a9ab12a06d1cd2dffbade1ab09591962d902eb 100644
--- a/CEP/DP3/DPPP/test/tBaselineSelection.cc
+++ b/CEP/DP3/DPPP/test/tBaselineSelection.cc
@@ -27,12 +27,12 @@
#include <Common/ParameterSet.h>
#include <Common/LofarLogger.h>
#include <Common/StreamUtil.h>
-#include <casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::DPPP;
-using namespace casa;
+using namespace casacore;
using namespace std;
diff --git a/CEP/DP3/DPPP/test/tDemixer.cc b/CEP/DP3/DPPP/test/tDemixer.cc
index 97540f1524cb3aa9a15cbd2b45e2e34aec5e487d..463b22753e30694e6f962da17bd8db2e9e764a33 100644
--- a/CEP/DP3/DPPP/test/tDemixer.cc
+++ b/CEP/DP3/DPPP/test/tDemixer.cc
@@ -27,14 +27,14 @@
#include <DPPP/DPInfo.h>
#include <Common/ParameterSet.h>
#include <Common/StringUtil.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::DPPP;
-using namespace casa;
+using namespace casacore;
using namespace std;
diff --git a/CEP/DP3/DPPP/test/tFilter.cc b/CEP/DP3/DPPP/test/tFilter.cc
index 4a049517e1a9d2497057c4109d278c9766a906ca..daf4cffde4584f5fa9d6a02ac249218d3c2a6506 100644
--- a/CEP/DP3/DPPP/test/tFilter.cc
+++ b/CEP/DP3/DPPP/test/tFilter.cc
@@ -27,14 +27,14 @@
#include <DPPP/DPInfo.h>
#include <Common/ParameterSet.h>
#include <Common/StringUtil.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::DPPP;
-using namespace casa;
+using namespace casacore;
using namespace std;
diff --git a/CEP/DP3/DPPP/test/tH5Parm.cc b/CEP/DP3/DPPP/test/tH5Parm.cc
index 544cca60261576050058219e06d72ce914cd678e..886369b302fe40eb58a244b25b835d791e6d53f1 100644
--- a/CEP/DP3/DPPP/test/tH5Parm.cc
+++ b/CEP/DP3/DPPP/test/tH5Parm.cc
@@ -130,19 +130,19 @@ int main(int, char**) {
hsize_t starttimeindex = soltab.getTimeIndex(starttime);
cout<<"starttimeindex="<<starttimeindex<<endl;
vector<double> val = soltab.getValues("Antenna2", starttimeindex, ntimes);
- ASSERT(casa::near(val[0],10.));
- ASSERT(casa::near(val[1],11.));
- ASSERT(casa::near(val[2],12.));
- ASSERT(casa::near(val[3],13.));
+ ASSERT(casacore::near(val[0],10.));
+ ASSERT(casacore::near(val[1],11.));
+ ASSERT(casacore::near(val[2],12.));
+ ASSERT(casacore::near(val[3],13.));
cout<<"read some data with stride 2"<<endl;
starttime = 57880.5;
starttimeindex = soltab.getTimeIndex(starttime);
ASSERT(starttimeindex==1);
vector<double> val2 = soltab.getValues("Antenna3", starttimeindex, 2, 2);
- ASSERT(casa::near(val2[0],21.));
- ASSERT(casa::near(val2[1],23.));
+ ASSERT(casacore::near(val2[0],21.));
+ ASSERT(casacore::near(val2[1],23.));
cout<<"testing stride"<<endl;
- ASSERT(casa::near(soltab.getTimeInterval(),2.));
+ ASSERT(casacore::near(soltab.getTimeInterval(),2.));
cout<<"reading the antennas into a vector"<<endl;
vector<string> antennas = soltab.getStringAxis("ant");
ASSERT(antennas.size()==3);
@@ -150,9 +150,9 @@ int main(int, char**) {
ASSERT(antennas[1]=="Antenna2");
ASSERT(antennas[2]=="Antenna3");
cout<<"Check frequency widths"<<endl;
- ASSERT(casa::near(soltab.getFreqInterval(0),1e6));
- ASSERT(casa::near(soltab.getFreqInterval(1),4e6));
- ASSERT(casa::near(soltab.getFreqInterval(2),2e6));
+ ASSERT(casacore::near(soltab.getFreqInterval(0),1e6));
+ ASSERT(casacore::near(soltab.getFreqInterval(1),4e6));
+ ASSERT(casacore::near(soltab.getFreqInterval(2),2e6));
cout<<"Checking interpolation (on input time axis)"<<endl;
vector<double> freqs;
@@ -170,7 +170,7 @@ int main(int, char**) {
size_t idx=0;
for (size_t time=0; time<times.size(); ++time) {
for (size_t freq=0; freq<freqs.size(); ++freq) {
- ASSERT(casa::near(newgridvals[idx++], double(time)));
+ ASSERT(casacore::near(newgridvals[idx++], double(time)));
}
}
@@ -185,7 +185,7 @@ int main(int, char**) {
idx=0;
for (int time=0; time<int(times.size()); ++time) {
for (size_t freq=0; freq<freqs.size(); ++freq) {
- ASSERT(casa::near(newgridvals[idx++], min(double((time+1)/3),double(ntimes-1))));
+ ASSERT(casacore::near(newgridvals[idx++], min(double((time+1)/3),double(ntimes-1))));
}
}
diff --git a/CEP/DP3/DPPP/test/tMedFlagger.cc b/CEP/DP3/DPPP/test/tMedFlagger.cc
index 76c36db5bd5a156ea15ca8cd6a352354d02e2934..ffe71936cc8b681e9dbc7b198d6cfe8cf08836aa 100644
--- a/CEP/DP3/DPPP/test/tMedFlagger.cc
+++ b/CEP/DP3/DPPP/test/tMedFlagger.cc
@@ -28,14 +28,14 @@
#include <DPPP/DPInfo.h>
#include <Common/ParameterSet.h>
#include <Common/StringUtil.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::DPPP;
-using namespace casa;
+using namespace casacore;
using namespace std;
// Simple class to generate input arrays.
diff --git a/CEP/DP3/DPPP/test/tMedian.cc b/CEP/DP3/DPPP/test/tMedian.cc
index 3a1f9ff73a8133b1f51ed23d3b2ce17ea7aa0aec..5d318ef9bd2beb3f0fbe29544badf3357a0d2249 100644
--- a/CEP/DP3/DPPP/test/tMedian.cc
+++ b/CEP/DP3/DPPP/test/tMedian.cc
@@ -22,13 +22,13 @@
//# @author Ger van Diepen
#include <lofar_config.h>
-#include <casa/OS/Timer.h>
-#include <casa/Utilities/GenSort.h>
+#include <casacore/casa/OS/Timer.h>
+#include <casacore/casa/Utilities/GenSort.h>
#include <vector>
#include <algorithm>
#include <iostream>
-using namespace casa;
+using namespace casacore;
using namespace std;
void testCasa (size_t sz, size_t n)
diff --git a/CEP/DP3/DPPP/test/tMirror.cc b/CEP/DP3/DPPP/test/tMirror.cc
index b4fc2ac4a9484b63936df72c7b18734abfbcaf5c..c32d9f091c9e6ac6fdd2a36e1258b4b6375d9eac 100644
--- a/CEP/DP3/DPPP/test/tMirror.cc
+++ b/CEP/DP3/DPPP/test/tMirror.cc
@@ -25,12 +25,12 @@
#include <Common/LofarTypes.h>
#include <Common/LofarLogger.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Utilities/LinearSearch.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Utilities/LinearSearch.h>
#include <Common/StreamUtil.h>
#include <Common/lofar_vector.h>
-using namespace casa;
+using namespace casacore;
using namespace std;
using namespace LOFAR;
diff --git a/CEP/DP3/DPPP/test/tNDPPP.cc b/CEP/DP3/DPPP/test/tNDPPP.cc
index 0a73e4e08d0914e58d84fee93237f60b0dbf1412..a42b0916993ae83c241450d090721ee7954e7d6f 100644
--- a/CEP/DP3/DPPP/test/tNDPPP.cc
+++ b/CEP/DP3/DPPP/test/tNDPPP.cc
@@ -23,17 +23,17 @@
#include <lofar_config.h>
#include <DPPP/DPRun.h>
-#include <tables/Tables.h>
-#include <tables/Tables/TableIter.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayPartMath.h>
+#include <casacore/tables/Tables.h>
+#include <casacore/tables/Tables/TableIter.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayPartMath.h>
#include <Common/LofarLogger.h>
#include <iostream>
#include <stdexcept>
using namespace LOFAR::DPPP;
-using namespace casa;
+using namespace casacore;
// This test program uses the MS in tNDPPP.in_MS.tgz.
// The MS contains 4 corr, 16 freq, 6 baselines, 18 time slots of 30 sec.
diff --git a/CEP/DP3/DPPP/test/tPSet.cc b/CEP/DP3/DPPP/test/tPSet.cc
index eefd705445b6083f3beb4e63010d70ae071e3a56..0e24a6d301f57864dbc83b7d357c5927f469a8ff 100644
--- a/CEP/DP3/DPPP/test/tPSet.cc
+++ b/CEP/DP3/DPPP/test/tPSet.cc
@@ -26,13 +26,13 @@
#include <DPPP/DPInfo.h>
#include <Common/ParameterSet.h>
#include <Common/LofarLogger.h>
-#include <casa/Arrays/ArrayIO.h>
-#include <casa/Quanta/MVTime.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Quanta/MVTime.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::DPPP;
-using namespace casa;
+using namespace casacore;
using namespace std;
// Simple class to generate input arrays.
diff --git a/CEP/DP3/DPPP/test/tPhaseShift.cc b/CEP/DP3/DPPP/test/tPhaseShift.cc
index a98f76c42b3bd6aebc533a8bd17afd8cce5ad4c4..7638d5549a40b9a0f1b1320d282da01a59528394 100644
--- a/CEP/DP3/DPPP/test/tPhaseShift.cc
+++ b/CEP/DP3/DPPP/test/tPhaseShift.cc
@@ -27,14 +27,14 @@
#include <DPPP/DPInfo.h>
#include <Common/ParameterSet.h>
#include <Common/StringUtil.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::DPPP;
-using namespace casa;
+using namespace casacore;
using namespace std;
diff --git a/CEP/DP3/DPPP/test/tPreFlagger.cc b/CEP/DP3/DPPP/test/tPreFlagger.cc
index 2722080150d2f53583c712045e1e0bd6df3f2e4d..f080f77abb4893522c3f47305a67d3d96f12d5bd 100644
--- a/CEP/DP3/DPPP/test/tPreFlagger.cc
+++ b/CEP/DP3/DPPP/test/tPreFlagger.cc
@@ -29,14 +29,14 @@
#include <DPPP/DPInfo.h>
#include <Common/ParameterSet.h>
#include <Common/StringUtil.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::DPPP;
-using namespace casa;
+using namespace casacore;
using namespace std;
// Execute steps.
diff --git a/CEP/DP3/DPPP/test/tScaleData.cc b/CEP/DP3/DPPP/test/tScaleData.cc
index 0bfc3cca0868e2081a832c946c3641171dc2d4f9..4f6b31fdd14573b7542b2966e7fb3257b96baff7 100644
--- a/CEP/DP3/DPPP/test/tScaleData.cc
+++ b/CEP/DP3/DPPP/test/tScaleData.cc
@@ -29,14 +29,14 @@
#include <Common/ParameterSet.h>
#include <Common/StringUtil.h>
#include <Common/StreamUtil.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::DPPP;
-using namespace casa;
+using namespace casacore;
using namespace std;
// Simple class to generate input arrays.
diff --git a/CEP/DP3/DPPP/test/tStationAdder.cc b/CEP/DP3/DPPP/test/tStationAdder.cc
index dfe6bbdb0b9c1f31b98ca5590572672ffc72578d..82eb1524ed2b4a6182f9261488c43c951a5f5716 100644
--- a/CEP/DP3/DPPP/test/tStationAdder.cc
+++ b/CEP/DP3/DPPP/test/tStationAdder.cc
@@ -29,14 +29,14 @@
#include <Common/ParameterSet.h>
#include <Common/StringUtil.h>
#include <Common/StreamUtil.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::DPPP;
-using namespace casa;
+using namespace casacore;
using namespace std;
// Simple class to generate input arrays.
diff --git a/CEP/DP3/DPPP/test/tUVWFlagger.cc b/CEP/DP3/DPPP/test/tUVWFlagger.cc
index d555e104165af7fb86e44ac0c8b0e9121aa4657a..56da782026f50e4dfdb935882f926891144c7aa0 100644
--- a/CEP/DP3/DPPP/test/tUVWFlagger.cc
+++ b/CEP/DP3/DPPP/test/tUVWFlagger.cc
@@ -28,14 +28,14 @@
#include <DPPP/DPInfo.h>
#include <Common/ParameterSet.h>
#include <Common/StringUtil.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::DPPP;
-using namespace casa;
+using namespace casacore;
using namespace std;
// Simple class to generate input arrays.
diff --git a/CEP/DP3/DPPP/test/tUpsample.cc b/CEP/DP3/DPPP/test/tUpsample.cc
index 859c8f8d6b15388f830d00ea4cc5b98af1e8a149..649f641c364c9fa64dbc05a16fa95af95a01a4a6 100644
--- a/CEP/DP3/DPPP/test/tUpsample.cc
+++ b/CEP/DP3/DPPP/test/tUpsample.cc
@@ -27,16 +27,16 @@
#include <DPPP/DPInfo.h>
#include <Common/ParameterSet.h>
#include <Common/StringUtil.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
-#include <casa/Quanta/Quantum.h>
+#include <casacore/casa/Quanta/Quantum.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::DPPP;
-using namespace casa;
+using namespace casacore;
using namespace std;
diff --git a/CEP/DP3/DPPP_AOFlag/include/DPPP_AOFlag/AOFlaggerStep.h b/CEP/DP3/DPPP_AOFlag/include/DPPP_AOFlag/AOFlaggerStep.h
index 082065d7de052454b8c1bcf89116be71304e6398..3d2800dd8d182a2cf655db954f8d0fd048df8b29 100644
--- a/CEP/DP3/DPPP_AOFlag/include/DPPP_AOFlag/AOFlaggerStep.h
+++ b/CEP/DP3/DPPP_AOFlag/include/DPPP_AOFlag/AOFlaggerStep.h
@@ -148,7 +148,7 @@ namespace LOFAR {
double itsMoveTime; //# data move timer (sum all threads)
double itsFlagTime; //# flag timer (sum of all threads)
double itsQualTime; //# quality timer (sum of all threads)
- casa::Vector<double> itsFreqs;
+ casacore::Vector<double> itsFreqs;
aoflagger::AOFlagger itsAOFlagger;
boost::scoped_ptr<aoflagger::Strategy> itsStrategy;
boost::scoped_ptr<aoflagger::QualityStatistics> itsRfiStats;
diff --git a/CEP/DP3/DPPP_AOFlag/include/DPPP_AOFlag/SlidingFlagger.h b/CEP/DP3/DPPP_AOFlag/include/DPPP_AOFlag/SlidingFlagger.h
index 276d978f19b74089d3813bd06cc648787d3f22a2..350ab3aea6130d3ca7f487630ecd6b64a4035652 100644
--- a/CEP/DP3/DPPP_AOFlag/include/DPPP_AOFlag/SlidingFlagger.h
+++ b/CEP/DP3/DPPP_AOFlag/include/DPPP_AOFlag/SlidingFlagger.h
@@ -132,7 +132,7 @@ namespace LOFAR {
NSTimer itsComputeTimer; //# move/flag timer
mutable FlagCounter itsFlagCounter;
vector<ThreadData> itsTD;
- casa::Vector<double> itsFreqs;
+ casacore::Vector<double> itsFreqs;
aoflagger::AOFlagger itsAOFlagger;
boost::scoped_ptr<aoflagger::Strategy> itsStrategy;
};
diff --git a/CEP/DP3/DPPP_AOFlag/src/AOFlaggerStep.cc b/CEP/DP3/DPPP_AOFlag/src/AOFlaggerStep.cc
index 68f6561db7ba217718470ffa52009edd9bb97b54..33e711fbc5f85450065af19da5a7643fb2495fb7 100644
--- a/CEP/DP3/DPPP_AOFlag/src/AOFlaggerStep.cc
+++ b/CEP/DP3/DPPP_AOFlag/src/AOFlaggerStep.cc
@@ -30,15 +30,15 @@
#include <Common/StreamUtil.h>
#include <Common/OpenMP.h>
-#include <casa/OS/HostInfo.h>
-#include <casa/OS/File.h>
+#include <casacore/casa/OS/HostInfo.h>
+#include <casacore/casa/OS/File.h>
#include <aoflagger.h>
#include <iostream>
#include <algorithm>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
namespace DPPP {
diff --git a/CEP/DP3/DPPP_AOFlag/src/SlidingFlagger.cc b/CEP/DP3/DPPP_AOFlag/src/SlidingFlagger.cc
index 5dbcc0d69c2741cbd0d560c200eca914e077e935..11f20c4c67e6d7c3610a8a37b220146e69006429 100644
--- a/CEP/DP3/DPPP_AOFlag/src/SlidingFlagger.cc
+++ b/CEP/DP3/DPPP_AOFlag/src/SlidingFlagger.cc
@@ -30,8 +30,8 @@
#include <Common/StreamUtil.h>
#include <Common/OpenMP.h>
-#include <casa/OS/File.h>
-#include <casa/OS/HostInfo.h>
+#include <casacore/casa/OS/File.h>
+#include <casacore/casa/OS/HostInfo.h>
#include <AOFlagger/msio/image2d.h>
#include <AOFlagger/msio/mask2d.h>
@@ -55,7 +55,7 @@
#include <iostream>
#include <algorithm>
-using namespace casa;
+using namespace casacore;
using namespace rfiStrategy;
namespace LOFAR {
diff --git a/CEP/DP3/DPPP_AOFlag/test/tAOFlaggerStep.cc b/CEP/DP3/DPPP_AOFlag/test/tAOFlaggerStep.cc
index 833ae99044445cbf88929a3bac96f39b31771541..98bbae18d7de84615fa588410cb60da56054ba11 100644
--- a/CEP/DP3/DPPP_AOFlag/test/tAOFlaggerStep.cc
+++ b/CEP/DP3/DPPP_AOFlag/test/tAOFlaggerStep.cc
@@ -29,14 +29,14 @@
#include <DPPP/DPInfo.h>
#include <Common/ParameterSet.h>
#include <Common/StringUtil.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::DPPP;
-using namespace casa;
+using namespace casacore;
using namespace std;
// Simple class to generate input arrays.
diff --git a/CEP/DP3/DPPP_Interpolate/test/tInterpolateStep.cc b/CEP/DP3/DPPP_Interpolate/test/tInterpolateStep.cc
index ec28beb48f226c86c5f7f7417ac298ad5a59308a..1dd558c5621ba0f6bf700e0d568cc05160a0d703 100644
--- a/CEP/DP3/DPPP_Interpolate/test/tInterpolateStep.cc
+++ b/CEP/DP3/DPPP_Interpolate/test/tInterpolateStep.cc
@@ -29,14 +29,14 @@
#include <DPPP/DPInfo.h>
#include <Common/ParameterSet.h>
#include <Common/StringUtil.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::DPPP;
-using namespace casa;
+using namespace casacore;
using namespace std;
// Simple class to generate input arrays.
diff --git a/CEP/DP3/PythonDPPP/include/PythonDPPP/DPStepBase.h b/CEP/DP3/PythonDPPP/include/PythonDPPP/DPStepBase.h
index 0c89836a7b6f4b309b798da8c5b124f7ec75daa8..ebb7b50cdd96822eca287d81766cba720ac4337f 100644
--- a/CEP/DP3/PythonDPPP/include/PythonDPPP/DPStepBase.h
+++ b/CEP/DP3/PythonDPPP/include/PythonDPPP/DPStepBase.h
@@ -57,35 +57,35 @@ namespace LOFAR {
// Get the visibility data into the ValueHolder array.
// The array must have the correct type and shape.
- void _getData (const casa::ValueHolder& vh)
+ void _getData (const casacore::ValueHolder& vh)
{
itsStep->getData (vh);
}
// Get the flags into the ValueHolder array.
// The array must have the correct type and shape.
- void _getFlags (const casa::ValueHolder& vh)
+ void _getFlags (const casacore::ValueHolder& vh)
{
itsStep->getFlags (vh);
}
// Get the weights into the ValueHolder array.
// The array must have the correct type and shape.
- void _getWeights (const casa::ValueHolder& vh)
+ void _getWeights (const casacore::ValueHolder& vh)
{
itsStep->getWeights (vh);
}
// Get the UVW coordinates data into the ValueHolder array.
// The array must have the correct type and shape.
- void _getUVW (const casa::ValueHolder& vh)
+ void _getUVW (const casacore::ValueHolder& vh)
{
itsStep->getUVW (vh);
}
// Get the model data into the ValueHolder array.
// The array must have the correct type and shape.
- void _getModelData (const casa::ValueHolder& vh)
+ void _getModelData (const casacore::ValueHolder& vh)
{
itsStep->getModelData (vh);
}
@@ -93,7 +93,7 @@ namespace LOFAR {
// Call the process function in the next DPPP step.
// The record must contain the changed data fields which will be
// stored in the output buffer before calling the next step.
- bool _processNext (const casa::Record& rec)
+ bool _processNext (const casacore::Record& rec)
{
return itsStep->processNext (rec);
}
diff --git a/CEP/DP3/PythonDPPP/include/PythonDPPP/PythonStep.h b/CEP/DP3/PythonDPPP/include/PythonDPPP/PythonStep.h
index 13a84854f12c421b503c106e010af387591b6207..665802bed7408d8e9d0920cc7f71763046aba687 100644
--- a/CEP/DP3/PythonDPPP/include/PythonDPPP/PythonStep.h
+++ b/CEP/DP3/PythonDPPP/include/PythonDPPP/PythonStep.h
@@ -33,8 +33,8 @@
#include <Common/ParameterSet.h>
#include <Common/Timer.h>
-#include <casa/Containers/ValueHolder.h>
-#include <casa/Containers/Record.h>
+#include <casacore/casa/Containers/ValueHolder.h>
+#include <casacore/casa/Containers/Record.h>
#include <boost/python.hpp>
namespace LOFAR {
@@ -120,18 +120,18 @@ namespace LOFAR {
// Tell that the Python step needs data to be written.
void setNeedWrite();
// Get the data into the given Complex array.
- void getData (const casa::ValueHolder&);
+ void getData (const casacore::ValueHolder&);
// Get the flags into the given bool array.
- void getFlags (const casa::ValueHolder&);
+ void getFlags (const casacore::ValueHolder&);
// Get the weights into the given float array.
- void getWeights (const casa::ValueHolder&);
+ void getWeights (const casacore::ValueHolder&);
// Get the UVWs into the given double array.
- void getUVW (const casa::ValueHolder&);
+ void getUVW (const casacore::ValueHolder&);
// Get the model data into the given Complex array.
- void getModelData (const casa::ValueHolder&);
+ void getModelData (const casacore::ValueHolder&);
// Execute the process function of the next step.
// The record should contain the changed buffer fields.
- bool processNext (const casa::Record&);
+ bool processNext (const casacore::Record&);
// </group>
private:
diff --git a/CEP/DP3/PythonDPPP/src/PythonDPPP.cc b/CEP/DP3/PythonDPPP/src/PythonDPPP.cc
index f9de820a1f0b7e86deeb5eba0bceb9c28f8464ea..c443d166afa7e68441f4ec1615215faba11177ff 100644
--- a/CEP/DP3/PythonDPPP/src/PythonDPPP.cc
+++ b/CEP/DP3/PythonDPPP/src/PythonDPPP.cc
@@ -23,10 +23,10 @@
#include <PythonDPPP/DPStepBase.h>
#if defined(casacore)
-#include <python/Converters/PycExcp.h>
-#include <python/Converters/PycBasicData.h>
-#include <python/Converters/PycValueHolder.h>
-#include <python/Converters/PycRecord.h>
+#include <casacore/python/Converters/PycExcp.h>
+#include <casacore/python/Converters/PycBasicData.h>
+#include <casacore/python/Converters/PycValueHolder.h>
+#include <casacore/python/Converters/PycRecord.h>
#define pyrap python
#else
#include <pyrap/Converters/PycExcp.h>
@@ -86,10 +86,10 @@ namespace LOFAR {
// Define the python module itself.
BOOST_PYTHON_MODULE(_pythondppp)
{
- casa::pyrap::register_convert_excp();
- casa::pyrap::register_convert_basicdata();
- casa::pyrap::register_convert_casa_valueholder();
- casa::pyrap::register_convert_casa_record();
+ casacore::pyrap::register_convert_excp();
+ casacore::pyrap::register_convert_basicdata();
+ casacore::pyrap::register_convert_casa_valueholder();
+ casacore::pyrap::register_convert_casa_record();
LOFAR::DPPP::dpstepbase();
}
diff --git a/CEP/DP3/PythonDPPP/src/PythonStep.cc b/CEP/DP3/PythonDPPP/src/PythonStep.cc
index 2badb164da685a5c492b5eb9f25a0415a1fc1aab..ec633d6ee0bf2ef1b5dde872a03c195f5ad713c3 100644
--- a/CEP/DP3/PythonDPPP/src/PythonStep.cc
+++ b/CEP/DP3/PythonDPPP/src/PythonStep.cc
@@ -30,11 +30,11 @@
#include <Common/ParameterSet.h>
#if defined(casacore)
-#include <python/Converters/PycExcp.h>
-#include <python/Converters/PycBasicData.h>
-#include <python/Converters/PycValueHolder.h>
-#include <python/Converters/PycRecord.h>
-#include <python/Converters/PycArray.h>
+#include <casacore/python/Converters/PycExcp.h>
+#include <casacore/python/Converters/PycBasicData.h>
+#include <casacore/python/Converters/PycValueHolder.h>
+#include <casacore/python/Converters/PycRecord.h>
+#include <casacore/python/Converters/PycArray.h>
#define pyrap python
#else
#include <pyrap/Converters/PycExcp.h>
@@ -44,10 +44,10 @@
#include <pyrap/Converters/PycArray.h>
#endif
-#include <casa/OS/Path.h>
+#include <casacore/casa/OS/Path.h>
#include <unistd.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
namespace DPPP {
@@ -78,10 +78,10 @@ namespace LOFAR {
PyList_Insert (sysPath, 0, PyUnicode_FromString(workingDir.c_str()));
#endif
// Register converters for casa types from/to python types
- casa::pyrap::register_convert_excp();
- casa::pyrap::register_convert_basicdata();
- casa::pyrap::register_convert_casa_valueholder();
- casa::pyrap::register_convert_casa_record();
+ casacore::pyrap::register_convert_excp();
+ casacore::pyrap::register_convert_basicdata();
+ casacore::pyrap::register_convert_casa_valueholder();
+ casacore::pyrap::register_convert_casa_record();
try {
// First import main
boost::python::object mainModule = boost::python::import
diff --git a/CEP/DP3/SPWCombine/include/SPWCombine/CombinerProcessControl.h b/CEP/DP3/SPWCombine/include/SPWCombine/CombinerProcessControl.h
index 20629234f86f3f01a04017cff5024f7cf4b0a328..0ef280bbec8b7b0799d0605efb266b654e45639f 100644
--- a/CEP/DP3/SPWCombine/include/SPWCombine/CombinerProcessControl.h
+++ b/CEP/DP3/SPWCombine/include/SPWCombine/CombinerProcessControl.h
@@ -46,7 +46,7 @@ namespace LOFAR
private:
vector<std::string> itsInMS;
std::string itsOutMS;
- vector<casa::MeasurementSet*> inMS;
+ vector<casacore::MeasurementSet*> inMS;
SPWCombine* itsCombiner;
public:
CombinerProcessControl(void);
diff --git a/CEP/DP3/SPWCombine/include/SPWCombine/SPWCombine.h b/CEP/DP3/SPWCombine/include/SPWCombine/SPWCombine.h
index 7f3cc44baedfa36fd9c32917ba64a91cab011649..b4bc0aaef1307c339233c598512751491ad1fff0 100644
--- a/CEP/DP3/SPWCombine/include/SPWCombine/SPWCombine.h
+++ b/CEP/DP3/SPWCombine/include/SPWCombine/SPWCombine.h
@@ -29,16 +29,16 @@
#include <iostream>
#include <cstdlib>
#include <string>
-#include <ms/MeasurementSets.h>
-#include <casa/Arrays.h>
-#include <tables/Tables.h>
-#include <tables/Tables/TableIter.h>
+#include <casacore/ms/MeasurementSets.h>
+#include <casacore/casa/Arrays.h>
+#include <casacore/tables/Tables.h>
+#include <casacore/tables/Tables/TableIter.h>
namespace LOFAR
{
namespace CS1
{
- using namespace casa;
+ using namespace casacore;
class SPWCombine
{
diff --git a/CEP/DP3/SPWCombine/src/CombinerProcessControl.cc b/CEP/DP3/SPWCombine/src/CombinerProcessControl.cc
index 541295ffc5a571473e1c622390a67ca6a0e43a1a..308f1b3be841f154a924cd837a936ca68e839dcb 100644
--- a/CEP/DP3/SPWCombine/src/CombinerProcessControl.cc
+++ b/CEP/DP3/SPWCombine/src/CombinerProcessControl.cc
@@ -25,10 +25,10 @@
#include <cstdlib>
#include <string>
#include <limits>
-#include <tables/Tables.h>
-#include <tables/Tables/TableParse.h>
-#include <ms/MeasurementSets.h>
-#include <casa/Exceptions.h>
+#include <casacore/tables/Tables.h>
+#include <casacore/tables/TaQL/TableParse.h>
+#include <casacore/ms/MeasurementSets.h>
+#include <casacore/casa/Exceptions.h>
#include <SPWCombine/CombinerProcessControl.h>
#include <SPWCombine/SPWCombine.h>
@@ -43,7 +43,7 @@ namespace LOFAR
{
namespace CS1
{
- using namespace casa;
+ using namespace casacore;
//===============>>> CombinerProcessControl::CombinerProcessControl <<<===============
CombinerProcessControl::CombinerProcessControl()
: ProcessControl()
@@ -188,7 +188,7 @@ namespace LOFAR
//Do the real stuff
itsCombiner->Combine(inMS, outMS, "DATA");
}
- catch(casa::AipsError& err)
+ catch(casacore::AipsError& err)
{
std::cerr << "Aips++ error detected: " << err.getMesg() << std::endl;
return false;
@@ -225,7 +225,7 @@ namespace LOFAR
}
itsCombiner = new SPWCombine();
}
- catch(casa::AipsError& err)
+ catch(casacore::AipsError& err)
{
std::cerr << "Aips++ error detected: " << err.getMesg() << std::endl;
return false;
diff --git a/CEP/DP3/SPWCombine/src/SPWCombine.cc b/CEP/DP3/SPWCombine/src/SPWCombine.cc
index 2317fed293a7df2f10265a001eaae6500c47ed04..3f946f6d04cb92c33529c8a27f319f4af0a7cdc2 100644
--- a/CEP/DP3/SPWCombine/src/SPWCombine.cc
+++ b/CEP/DP3/SPWCombine/src/SPWCombine.cc
@@ -27,7 +27,7 @@ namespace LOFAR
{
namespace CS1
{
- using namespace casa;
+ using namespace casacore;
//===============>>> SPWCombine::SPWCombine <<<===============
diff --git a/CEP/DP3/TestDynDPPP/test/tTestDynStep.cc b/CEP/DP3/TestDynDPPP/test/tTestDynStep.cc
index a77c09bd4263c64ecc6f202d982222748bf72395..71ce22b953d9891bdcacf1b64839c34021106522 100644
--- a/CEP/DP3/TestDynDPPP/test/tTestDynStep.cc
+++ b/CEP/DP3/TestDynDPPP/test/tTestDynStep.cc
@@ -33,14 +33,14 @@
#include <Common/ParameterSet.h>
#include <Common/StringUtil.h>
#include <Common/LofarLogger.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::DPPP;
-using namespace casa;
+using namespace casacore;
using namespace std;
@@ -231,12 +231,12 @@ private:
return true;
}
- virtual void getUVW (const casa::RefRows&, double, DPBuffer& buf)
+ virtual void getUVW (const casacore::RefRows&, double, DPBuffer& buf)
{
buf.getUVW().resize (3, itsNrBl);
indgen (buf.getUVW());
}
- virtual bool getFullResFlags (const casa::RefRows&, DPBuffer& buf)
+ virtual bool getFullResFlags (const casacore::RefRows&, DPBuffer& buf)
{
buf.getFullResFlags().assign (itsFullResFlags);
return true;
diff --git a/CEP/Imager/AWImager2/include/AWImager2/ATerm.h b/CEP/Imager/AWImager2/include/AWImager2/ATerm.h
index e330ff099eced74eb9bb4c0b720855ed44824494..7dd8bb816a6ebf9e4374dc185fd226478c193580 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/ATerm.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/ATerm.h
@@ -84,7 +84,7 @@ public:
/*!
* \brief ITRF coordinates for a grid of points on the sky.
*/
- casa::Matrix<StationResponse::vector3r_t> directions;
+ casacore::Matrix<StationResponse::vector3r_t> directions;
};
class Polarization
@@ -98,21 +98,21 @@ public:
};
};
- static casa::CountedPtr<ATerm> create(const casa::MeasurementSet &ms, ParameterSet& parset);
+ static casacore::CountedPtr<ATerm> create(const casacore::MeasurementSet &ms, ParameterSet& parset);
virtual Polarization::Type image_polarization() const = 0;
- virtual void setDirection(const casa::DirectionCoordinate &coordinates, const casa::IPosition &shape) = 0;
+ virtual void setDirection(const casacore::DirectionCoordinate &coordinates, const casacore::IPosition &shape) = 0;
- virtual void setEpoch(const casa::MEpoch &epoch) = 0;
+ virtual void setEpoch(const casacore::MEpoch &epoch) = 0;
// Compute an ITRF direction vector for each pixel at the given epoch. This
// map can then be used to call any of the evaluate* functions.
virtual ITRFDirectionMap
makeDirectionMap(
- const casa::DirectionCoordinate &coordinates,
- const casa::IPosition &shape,
- const casa::MEpoch &epoch) const = 0;
+ const casacore::DirectionCoordinate &coordinates,
+ const casacore::IPosition &shape,
+ const casacore::MEpoch &epoch) const = 0;
// Compute the LOFAR station response for the given station. This includes
// the effects of paralactic rotation, the dual dipole LOFAR antenna, the
@@ -124,10 +124,10 @@ public:
// the response to be multiplied by the inverse of the response at the
// central pixel.
- virtual vector<casa::Cube<casa::Complex> > evaluate(
+ virtual vector<casacore::Cube<casacore::Complex> > evaluate(
uint idStation,
- const casa::Vector<casa::Double> &freq,
- const casa::Vector<casa::Double> &reference,
+ const casacore::Vector<casacore::Double> &freq,
+ const casacore::Vector<casacore::Double> &reference,
bool normalize = false)
const = 0;
@@ -140,19 +140,19 @@ public:
// the response to be multiplied by the inverse of the array factor at the
// central pixel.
- virtual vector<casa::Matrix<casa::Complex> > evaluateStationScalarFactor(
+ virtual vector<casacore::Matrix<casacore::Complex> > evaluateStationScalarFactor(
uint idStation,
uint idPolarization,
- const casa::Vector<casa::Double> &freq,
- const casa::Vector<casa::Double> &freq0,
+ const casacore::Vector<casacore::Double> &freq,
+ const casacore::Vector<casacore::Double> &freq0,
bool normalize = false)
const = 0;
- virtual vector<casa::Matrix<casa::Complex> > evaluateArrayFactor(
+ virtual vector<casacore::Matrix<casacore::Complex> > evaluateArrayFactor(
uint idStation,
uint idPolarization,
- const casa::Vector<casa::Double> &freq,
- const casa::Vector<casa::Double> &reference,
+ const casacore::Vector<casacore::Double> &freq,
+ const casacore::Vector<casacore::Double> &reference,
bool normalize = false) const = 0;
// Compute the LOFAR element response for the given station and antenna
@@ -162,19 +162,19 @@ public:
// The freq argument is a list of frequencies at which the response will be
// evaluated. The normalize argument, when set to true, causes the response
// to be multiplied by the inverse of the response at the central pixel.
- virtual vector<casa::Cube<casa::Complex> > evaluateElementResponse(
+ virtual vector<casacore::Cube<casacore::Complex> > evaluateElementResponse(
uint idStation,
uint idField,
- const casa::Vector<casa::Double> &freq,
+ const casacore::Vector<casacore::Double> &freq,
bool normalize = false) const = 0;
- virtual casa::Cube<casa::DComplex> evaluateIonosphere(
+ virtual casacore::Cube<casacore::DComplex> evaluateIonosphere(
const uint station,
- const casa::Vector<casa::Double> &freq) const = 0;
+ const casacore::Vector<casacore::Double> &freq) const = 0;
};
-typedef Singleton<DynamicObjectFactory<ATerm*(const casa::MeasurementSet& ms, const ParameterSet& parset)> > ATermFactory;
+typedef Singleton<DynamicObjectFactory<ATerm*(const casacore::MeasurementSet& ms, const ParameterSet& parset)> > ATermFactory;
} // namespace LofarFT
} // namespace LOFAR
diff --git a/CEP/Imager/AWImager2/include/AWImager2/ATermLofar.h b/CEP/Imager/AWImager2/include/AWImager2/ATermLofar.h
index a15024e5e75f50cd6466523da50f5e78b86a8beb..97d9785dc0fc28b2d7c1b3144f48511170a92cdf 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/ATermLofar.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/ATermLofar.h
@@ -49,15 +49,15 @@ namespace LofarFT {
class ATermLofar : public ATerm
{
public:
- ATermLofar(const casa::MeasurementSet &ms, const ParameterSet& parset, bool read_stations=true);
+ ATermLofar(const casacore::MeasurementSet &ms, const ParameterSet& parset, bool read_stations=true);
virtual ~ATermLofar() {};
virtual Polarization::Type image_polarization() const {return Polarization::LINEAR;}
- void setDirection(const casa::DirectionCoordinate &coordinates, const casa::IPosition &shape);
+ void setDirection(const casacore::DirectionCoordinate &coordinates, const casacore::IPosition &shape);
- void setEpoch(const casa::MEpoch &epoch);
+ void setEpoch(const casacore::MEpoch &epoch);
/*!
* \brief Compute an ITRF direction vector for each pixel at the given
@@ -71,9 +71,9 @@ public:
* \param tile0 Tile beam former reference direction (pointing).
*/
ITRFDirectionMap
- makeDirectionMap(const casa::DirectionCoordinate &coordinates,
- const casa::IPosition &shape,
- const casa::MEpoch &epoch) const;
+ makeDirectionMap(const casacore::DirectionCoordinate &coordinates,
+ const casacore::IPosition &shape,
+ const casacore::MEpoch &epoch) const;
// Compute the LOFAR station response for the given station. This includes
// the effects of paralactic rotation, the dual dipole LOFAR antenna, the
@@ -84,10 +84,10 @@ public:
// reference frequencies. The normalize argument, when set to true, causes
// the response to be multiplied by the inverse of the response at the
// central pixel.
- virtual vector<casa::Cube<casa::Complex> > evaluate(
+ virtual vector<casacore::Cube<casacore::Complex> > evaluate(
uint idStation,
- const casa::Vector<casa::Double> &freq,
- const casa::Vector<casa::Double> &reference,
+ const casacore::Vector<casacore::Double> &freq,
+ const casacore::Vector<casacore::Double> &reference,
bool normalize = false)
const;
@@ -100,19 +100,19 @@ public:
// the response to be multiplied by the inverse of the array factor at the
// central pixel.
- virtual vector<casa::Matrix<casa::Complex> > evaluateStationScalarFactor(
+ virtual vector<casacore::Matrix<casacore::Complex> > evaluateStationScalarFactor(
uint idStation,
uint idPolarization,
- const casa::Vector<casa::Double> &freq,
- const casa::Vector<casa::Double> &freq0,
+ const casacore::Vector<casacore::Double> &freq,
+ const casacore::Vector<casacore::Double> &freq0,
bool normalize = false)
const;
- virtual vector<casa::Matrix<casa::Complex> > evaluateArrayFactor(
+ virtual vector<casacore::Matrix<casacore::Complex> > evaluateArrayFactor(
uint idStation,
uint idPolarization,
- const casa::Vector<casa::Double> &freq,
- const casa::Vector<casa::Double> &freq0,
+ const casacore::Vector<casacore::Double> &freq,
+ const casacore::Vector<casacore::Double> &freq0,
bool normalize = false)
const;
@@ -123,43 +123,43 @@ public:
// The freq argument is a list of frequencies at which the response will be
// evaluated. The normalize argument, when set to true, causes the response
// to be multiplied by the inverse of the response at the central pixel.
- virtual vector<casa::Cube<casa::Complex> > evaluateElementResponse(
+ virtual vector<casacore::Cube<casacore::Complex> > evaluateElementResponse(
uint idStation,
uint idField,
- const casa::Vector<casa::Double> &freq,
+ const casacore::Vector<casacore::Double> &freq,
bool normalize = false) const;
- virtual casa::Cube<casa::DComplex> evaluateIonosphere(
+ virtual casacore::Cube<casacore::DComplex> evaluateIonosphere(
const uint station,
- const casa::Vector<casa::Double> &freq) const;
+ const casacore::Vector<casacore::Double> &freq) const;
protected:
- void initParmDB(const casa::String &parmdbname);
- double get_parmvalue( const casa::Record &parms, const string &parmname );
+ void initParmDB(const casacore::String &parmdbname);
+ double get_parmvalue( const casacore::Record &parms, const string &parmname );
- casa::Record itsParmValues;
+ casacore::Record itsParmValues;
vector<StationResponse::Station::ConstPtr> itsStations;
- const casa::DirectionCoordinate *itsDirectionCoordinates;
- const casa::IPosition *itsShape;
- casa::MPosition itsPosition0;
- casa::MDirection itsStation0, itsTile0;
+ const casacore::DirectionCoordinate *itsDirectionCoordinates;
+ const casacore::IPosition *itsShape;
+ casacore::MPosition itsPosition0;
+ casacore::MDirection itsStation0, itsTile0;
ITRFDirectionMap itsITRFDirectionMap;
// state variables for ionosphere
- casa::Bool itsApplyBeam;
- casa::Bool itsApplyIonosphere;
+ casacore::Bool itsApplyBeam;
+ casacore::Bool itsApplyIonosphere;
LOFAR::BBS::ParmFacade *itsPDB;
double itsTime;
double itsR0;
double itsBeta;
double itsHeight;
- casa::Vector<casa::String> itsCal_pp_names;
- casa::Matrix<casa::Double> itsCal_pp;
- casa::Vector<casa::Double> itsTec_white;
- casa::Int itsVerbose;
+ casacore::Vector<casacore::String> itsCal_pp_names;
+ casacore::Matrix<casacore::Double> itsCal_pp;
+ casacore::Vector<casacore::Double> itsTec_white;
+ casacore::Int itsVerbose;
};
} // namespace LofarFT
diff --git a/CEP/Imager/AWImager2/include/AWImager2/ATermPython.h b/CEP/Imager/AWImager2/include/AWImager2/ATermPython.h
index 873801362d016dd158d86a3eab413b1fd269cfc6..85a0eb235fa706f6ca1c5b844a8327440d64962c 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/ATermPython.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/ATermPython.h
@@ -49,18 +49,18 @@ namespace LofarFT {
class ATermPython : public ATermLofar
{
public:
- ATermPython(const casa::MeasurementSet &ms, const ParameterSet& parameters);
+ ATermPython(const casacore::MeasurementSet &ms, const ParameterSet& parameters);
- virtual vector<casa::Cube<casa::Complex> > evaluate(
+ virtual vector<casacore::Cube<casacore::Complex> > evaluate(
uint idStation,
- const casa::Vector<casa::Double> &freq,
- const casa::Vector<casa::Double> &reference,
+ const casacore::Vector<casacore::Double> &freq,
+ const casacore::Vector<casacore::Double> &reference,
bool normalize = false)
const;
- void setDirection(const casa::DirectionCoordinate &coordinates, const casa::IPosition &shape);
+ void setDirection(const casacore::DirectionCoordinate &coordinates, const casacore::IPosition &shape);
- void setEpoch(const casa::MEpoch &epoch);
+ void setEpoch(const casacore::MEpoch &epoch);
protected:
boost::python::object itsPyaterm;
diff --git a/CEP/Imager/AWImager2/include/AWImager2/CFDefs.h b/CEP/Imager/AWImager2/include/AWImager2/CFDefs.h
index 40cf53d37446d6ea2c086f42e88a8fa1daf5d266..13eae241f772f492693df471affa9f7a1a222420 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/CFDefs.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/CFDefs.h
@@ -31,9 +31,9 @@ namespace LofarFT {
namespace CFDefs { //# NAMESPACE CFDefs - BEGIN
// freq, mueller_x, mueller_y
-typedef vector< vector< vector < casa::Matrix<casa::Complex> > > > CFTypeVec ;
-typedef casa::Array<casa::Complex> CFType ;
-typedef casa::Array<casa::Double> CFTypeReal ;
+typedef vector< vector< vector < casacore::Matrix<casacore::Complex> > > > CFTypeVec ;
+typedef casacore::Array<casacore::Complex> CFType ;
+typedef casacore::Array<casacore::Double> CFTypeReal ;
enum CACHETYPE {NOTCACHED=0,DISKCACHE, MEMCACHE};
enum CFARRAYSHAPE {NXPOS=0,NYPOS,NWPOS,NPOLPOS,NBASEPOS,CFNDIM};
diff --git a/CEP/Imager/AWImager2/include/AWImager2/CFStore.h b/CEP/Imager/AWImager2/include/AWImager2/CFStore.h
index 2deaeea1df82e131d8069d1ce84bd3555abc9cfe..1670a09cf080739c0e5ca4c705a9939addb7b004 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/CFStore.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/CFStore.h
@@ -45,86 +45,86 @@ public:
CFStore();
- CFStore(const casa::CountedPtr<CFType>& dataPtr,
- casa::CoordinateSystem& cs,
- casa::Vector<casa::Float>& samp,
- casa::Vector<casa::Int>& xsup,
- casa::Vector<casa::Int>& ysup,
- casa::Int maxXSup,
- casa::Int maxYSup,
- casa::Quantity PA,
- casa::Int mosPointing,
- casa::Bool conjugated = casa::False);
+ CFStore(const casacore::CountedPtr<CFType>& dataPtr,
+ casacore::CoordinateSystem& cs,
+ casacore::Vector<casacore::Float>& samp,
+ casacore::Vector<casacore::Int>& xsup,
+ casacore::Vector<casacore::Int>& ysup,
+ casacore::Int maxXSup,
+ casacore::Int maxYSup,
+ casacore::Quantity PA,
+ casacore::Int mosPointing,
+ casacore::Bool conjugated = casacore::False);
- CFStore(const casa::CountedPtr<CFTypeVec>& dataPtr,
- casa::CoordinateSystem& cs,
- casa::Vector<casa::Float>& samp,
- casa::Vector<casa::Int>& xsup,
- casa::Vector<casa::Int>& ysup,
- casa::Int maxXSup,
- casa::Int maxYSup,
- casa::Quantity PA,
- casa::Int mosPointing,
- casa::Bool conjugated = casa::False);
+ CFStore(const casacore::CountedPtr<CFTypeVec>& dataPtr,
+ casacore::CoordinateSystem& cs,
+ casacore::Vector<casacore::Float>& samp,
+ casacore::Vector<casacore::Int>& xsup,
+ casacore::Vector<casacore::Int>& ysup,
+ casacore::Int maxXSup,
+ casacore::Int maxYSup,
+ casacore::Quantity PA,
+ casacore::Int mosPointing,
+ casacore::Bool conjugated = casacore::False);
~CFStore() {};
CFStore& operator=(const CFStore& other);
- void show(const char *Mesg=NULL, casa::ostream &os=casa::cerr);
+ void show(const char *Mesg=NULL, casacore::ostream &os=casacore::cerr);
- casa::Bool isNull() {return itsData.null();}
+ casacore::Bool isNull() {return itsData.null();}
- casa::Bool isConjugated() {return itsConjugated;}
+ casacore::Bool isConjugated() {return itsConjugated;}
void set(const CFStore& other);
void set(CFType *dataPtr,
- casa::CoordinateSystem& cs,
- casa::Vector<casa::Float>& samp,
- casa::Vector<casa::Int>& xsup,
- casa::Vector<casa::Int>& ysup,
- casa::Int maxXSup,
- casa::Int maxYSup,
- casa::Quantity PA,
- const casa::Int mosPointing=0,
- casa::Bool conjugated = casa::False);
+ casacore::CoordinateSystem& cs,
+ casacore::Vector<casacore::Float>& samp,
+ casacore::Vector<casacore::Int>& xsup,
+ casacore::Vector<casacore::Int>& ysup,
+ casacore::Int maxXSup,
+ casacore::Int maxYSup,
+ casacore::Quantity PA,
+ const casacore::Int mosPointing=0,
+ casacore::Bool conjugated = casacore::False);
void set(CFTypeVec *dataPtr,
- casa::CoordinateSystem& cs,
- casa::Vector<casa::Float>& samp,
- casa::Vector<casa::Int>& xsup,
- casa::Vector<casa::Int>& ysup,
- casa::Int maxXSup,
- casa::Int maxYSup,
- casa::Quantity PA,
- const casa::Int mosPointing=0,
- casa::Bool conjugated=casa::False);
+ casacore::CoordinateSystem& cs,
+ casacore::Vector<casacore::Float>& samp,
+ casacore::Vector<casacore::Int>& xsup,
+ casacore::Vector<casacore::Int>& ysup,
+ casacore::Int maxXSup,
+ casacore::Int maxYSup,
+ casacore::Quantity PA,
+ const casacore::Int mosPointing=0,
+ casacore::Bool conjugated=casacore::False);
- void resize(casa::Int nw,
- casa::Bool retainValues=casa::False);
+ void resize(casacore::Int nw,
+ casacore::Bool retainValues=casacore::False);
- void resize(casa::IPosition imShape,
- casa::Bool retainValues=casa::False);
+ void resize(casacore::IPosition imShape,
+ casacore::Bool retainValues=casacore::False);
CFTypeVec& vdata() {return *itsVData;}
- casa::Vector<casa::Float>& sampling() {return itsSampling;}
- casa::Vector<casa::Int>& xSupport() {return itsXSupport;}
- casa::Vector<casa::Int>& ySupport() {return itsYSupport;}
+ casacore::Vector<casacore::Float>& sampling() {return itsSampling;}
+ casacore::Vector<casacore::Int>& xSupport() {return itsXSupport;}
+ casacore::Vector<casacore::Int>& ySupport() {return itsYSupport;}
- casa::CountedPtr<CFType> itsData;
- casa::CountedPtr<CFTypeReal> itsRData;
- casa::CountedPtr<CFTypeVec> itsVData;
- casa::CoordinateSystem itsCoordSys;
- casa::Vector<casa::Float> itsSampling;
- casa::Vector<casa::Int> itsXSupport;
- casa::Vector<casa::Int> itsYSupport;
- casa::Int itsMaxXSupport;
- casa::Int itsMaxYSupport;
- casa::Quantity itsPA;
- casa::Int itsMosPointingPos;
- casa::Bool itsConjugated;
+ casacore::CountedPtr<CFType> itsData;
+ casacore::CountedPtr<CFTypeReal> itsRData;
+ casacore::CountedPtr<CFTypeVec> itsVData;
+ casacore::CoordinateSystem itsCoordSys;
+ casacore::Vector<casacore::Float> itsSampling;
+ casacore::Vector<casacore::Int> itsXSupport;
+ casacore::Vector<casacore::Int> itsYSupport;
+ casacore::Int itsMaxXSupport;
+ casacore::Int itsMaxYSupport;
+ casacore::Quantity itsPA;
+ casacore::Int itsMosPointingPos;
+ casacore::Bool itsConjugated;
};
} //# NAMESPACE LofarFT - END
diff --git a/CEP/Imager/AWImager2/include/AWImager2/ConvolutionFunction.h b/CEP/Imager/AWImager2/include/AWImager2/ConvolutionFunction.h
index 085850b68e392d0c9d7bfd1281678b964db64293..91e432c00a7bad8041a8aff4ffd5be25e71586c2 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/ConvolutionFunction.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/ConvolutionFunction.h
@@ -56,24 +56,24 @@ public:
typedef ATerm::Polarization Polarization;
ConvolutionFunction(
- const casa::MeasurementSet& ms,
+ const casacore::MeasurementSet& ms,
double wmax,
- casa::uInt oversample,
- casa::Int verbose,
- casa::Int maxsupport,
+ casacore::uInt oversample,
+ casacore::Int verbose,
+ casacore::Int maxsupport,
ParameterSet& parset);
void init(
- const casa::IPosition& shape,
- const casa::DirectionCoordinate& coordinates,
- const casa::String& imgName);
+ const casacore::IPosition& shape,
+ const casacore::DirectionCoordinate& coordinates,
+ const casacore::String& imgName);
virtual ~ConvolutionFunction () {};
Polarization::Type image_polarization() const;
// set frequency channels, creates itsChanMap
- casa::Vector<casa::Int> set_frequency(const casa::Vector<casa::Double> &frequency);
+ casacore::Vector<casacore::Int> set_frequency(const casacore::Vector<casacore::Double> &frequency);
// Show the relative timings of the various steps.
void showTimings (std::ostream&, double duration, double timeCF) const;
@@ -85,21 +85,21 @@ public:
void store_all_W_images();
// // Get the spheroidal cut.
-// const casa::Matrix<casa::Float>& getSpheroidCut();
+// const casacore::Matrix<casacore::Float>& getSpheroidCut();
// Get the spheroidal cut from the file.
- static casa::Matrix<casa::Float> getSpheroidCut (const casa::String& imgName);
+ static casacore::Matrix<casacore::Float> getSpheroidCut (const casacore::String& imgName);
// Get the average PB from the file.
- static casa::Matrix<casa::Float> getAveragePB (const casa::String& imgName);
+ static casacore::Matrix<casacore::Float> getAveragePB (const casacore::String& imgName);
// Compute the fft of the beam at the minimal resolution for all antennas,
// and append it to a map object with a (double time) key.
- void computeAterm(casa::Double time);
+ void computeAterm(casacore::Double time);
-// void computeElementBeam(const casa::DirectionCoordinate &coordinates, const casa::IPosition &shape, casa::Double time);
- void computeElementBeam(casa::Double time);
+// void computeElementBeam(const casacore::DirectionCoordinate &coordinates, const casacore::IPosition &shape, casacore::Double time);
+ void computeElementBeam(casacore::Double time);
// Compute the convolution function for all channel, for the polarisations
// specified in the Mueller_mask matrix
@@ -110,143 +110,143 @@ public:
// RETURNS in a LofarCFStore: result[channel][Mueller row][Mueller column]
virtual CFStore makeConvolutionFunction(
- casa::uInt stationA,
- casa::uInt stationB,
- casa::Double time,
- casa::Double w,
- const casa::Matrix<casa::Float> &sum_weight,
+ casacore::uInt stationA,
+ casacore::uInt stationB,
+ casacore::Double time,
+ casacore::Double w,
+ const casacore::Matrix<casacore::Float> &sum_weight,
const vector<bool> &channel_selection,
double w_offset);
// Returns the average Primary Beam from the disk
- casa::Matrix<float> give_avg_pb();
+ casacore::Matrix<float> give_avg_pb();
// Compute the average Primary Beam from the Stack of convolution functions
- casa::Matrix<casa::Float> getAveragePB();
+ casacore::Matrix<casacore::Float> getAveragePB();
- casa::Matrix<casa::Float> getSpheroidal();
+ casacore::Matrix<casacore::Float> getSpheroidal();
- casa::Matrix<casa::Float> getSpheroidalCF();
+ casacore::Matrix<casacore::Float> getSpheroidalCF();
// Zero padding of a Cube
- casa::Cube<casa::Complex> zero_padding(
- const casa::Cube<casa::Complex>& Image,
+ casacore::Cube<casacore::Complex> zero_padding(
+ const casacore::Cube<casacore::Complex>& Image,
int npixel_out);
// Zero padding of a Matrix
- casa::Matrix<casa::Complex> zero_padding(
- const casa::Matrix<casa::Complex>& Image,
+ casacore::Matrix<casacore::Complex> zero_padding(
+ const casacore::Matrix<casacore::Complex>& Image,
int npixel_out);
// Get the W scale.
const WScale& wScale() const
{ return itsWScale; }
- casa::Vector< casa::Double > &get_frequency_list()
+ casacore::Vector< casacore::Double > &get_frequency_list()
{return itsFrequencyList;}
- void applyWterm(casa::Array<casa::Complex>& grid, double w);
+ void applyWterm(casacore::Array<casacore::Complex>& grid, double w);
- void applyElementBeam(casa::Array<casa::Complex>& grid, casa::Bool conjugate = casa::False);
+ void applyElementBeam(casacore::Array<casacore::Complex>& grid, casacore::Bool conjugate = casacore::False);
// Get the reference frequency
- const casa::Double refFrequency() const
+ const casacore::Double refFrequency() const
{ return itsRefFrequency;}
- casa::Double get_w_from_support(casa::Int support = 0) const;
+ casacore::Double get_w_from_support(casacore::Int support = 0) const;
protected:
- casa::Matrix<casa::Float> itsSumCF;
- casa::Float itsSumWeight;
+ casacore::Matrix<casacore::Float> itsSumCF;
+ casacore::Float itsSumWeight;
- casa::Int itsSupportCF;
- casa::Matrix<casa::Float> itsAveragePB;
- casa::Matrix<casa::Float> itsSpheroidal;
- casa::Matrix<casa::Float> itsSpheroidalCF;
- casa::Cube<casa::Complex> itsElementBeam;
+ casacore::Int itsSupportCF;
+ casacore::Matrix<casacore::Float> itsAveragePB;
+ casacore::Matrix<casacore::Float> itsSpheroidal;
+ casacore::Matrix<casacore::Float> itsSpheroidalCF;
+ casacore::Cube<casacore::Complex> itsElementBeam;
void FindNWplanes();
void normalized_fft (
- casa::Matrix<casa::Complex>&,
+ casacore::Matrix<casacore::Complex>&,
bool toFreq=true);
void normalized_fft (
- casa::PrecTimer& timer,
- casa::Matrix<casa::Complex>&, bool toFreq=true);
+ casacore::PrecTimer& timer,
+ casacore::Matrix<casacore::Complex>&, bool toFreq=true);
- casa::MEpoch observationStartTime(
- const casa::MeasurementSet &ms,
- casa::uInt idObservation) const;
+ casacore::MEpoch observationStartTime(
+ const casacore::MeasurementSet &ms,
+ casacore::uInt idObservation) const;
- casa::Double observationReferenceFreq(
- const casa::MeasurementSet &ms,
- casa::uInt idDataDescription);
+ casacore::Double observationReferenceFreq(
+ const casacore::MeasurementSet &ms,
+ casacore::uInt idDataDescription);
// Estime spheroidal convolution function from the support of the fft
// of the spheroidal in the image plane
- casa::Double makeSpheroidCut();
+ casacore::Double makeSpheroidCut();
// Return the angular resolution required for making the image of the
// angular size determined by coordinates and shape.
// The resolution is assumed to be the same on both direction axes.
- casa::Double estimateWResolution(
- const casa::IPosition &shape,
- casa::Double pixelSize,
- casa::Double w) const;
+ casacore::Double estimateWResolution(
+ const casacore::IPosition &shape,
+ casacore::Double pixelSize,
+ casacore::Double w) const;
// Return the angular resolution required for making the image of the
// angular size determined by coordinates and shape.
// The resolution is assumed to be the same on both direction axes.
- casa::Double estimateAResolution(
- const casa::IPosition &shape,
- const casa::DirectionCoordinate &coordinates) const;
+ casacore::Double estimateAResolution(
+ const casacore::IPosition &shape,
+ const casacore::DirectionCoordinate &coordinates) const;
//# Data members.
- casa::IPosition itsShape;
- casa::DirectionCoordinate itsCoordinates;
+ casacore::IPosition itsShape;
+ casacore::DirectionCoordinate itsCoordinates;
WScale itsWScale;
WTerm itsWTerm;
- casa::CountedPtr<ATerm> itsATerm;
- casa::Double itsMaxW;
- casa::Double itsPixelSizeSpheroidal;
- casa::uInt itsNWPlanes;
- casa::uInt itsNStations;
- casa::uInt itsOversampling;
- casa::uInt itsNChannel;
- casa::Double itsRefFrequency;
+ casacore::CountedPtr<ATerm> itsATerm;
+ casacore::Double itsMaxW;
+ casacore::Double itsPixelSizeSpheroidal;
+ casacore::uInt itsNWPlanes;
+ casacore::uInt itsNStations;
+ casacore::uInt itsOversampling;
+ casacore::uInt itsNChannel;
+ casacore::Double itsRefFrequency;
//# Stack of the convolution functions for the average PB calculation
- casa::Matrix<casa::Complex> itsSpheroid_cut;
+ casacore::Matrix<casacore::Complex> itsSpheroid_cut;
//# Stack of the convolution functions for the average PB calculation
- casa::Matrix<casa::Float> itsSpheroid_cut_im;
+ casacore::Matrix<casacore::Float> itsSpheroid_cut_im;
//# List of the ferquencies the CF have to be caluclated for
- casa::Vector< casa::Double > itsFrequencyList;
- casa::Vector< casa::Int > itsChanMap;
- vector< casa::Matrix<casa::Complex> > itsWplanesStore;
+ casacore::Vector< casacore::Double > itsFrequencyList;
+ casacore::Vector< casacore::Int > itsChanMap;
+ vector< casacore::Matrix<casacore::Complex> > itsWplanesStore;
//# Aterm_store[double time][antenna][channel]=Cube[Npix,Npix,4]
- map<casa::Double, vector< vector< casa::Cube<casa::Complex> > > > itsAtermStore;
+ map<casacore::Double, vector< vector< casacore::Cube<casacore::Complex> > > > itsAtermStore;
//# Average primary beam
- casa::Matrix<casa::Float> itsIm_Stack_PB_CF0;
- casa::Int itsVerbose;
- casa::Int itsMaxSupport;
- casa::String itsImgName;
+ casacore::Matrix<casacore::Float> itsIm_Stack_PB_CF0;
+ casacore::Int itsVerbose;
+ casacore::Int itsMaxSupport;
+ casacore::String itsImgName;
vector<FFTCMatrix> itsFFTMachines;
- casa::Double itsTimeW;
- casa::Double itsTimeWpar;
- casa::Double itsTimeWfft;
+ casacore::Double itsTimeW;
+ casacore::Double itsTimeWpar;
+ casacore::Double itsTimeWfft;
unsigned long long itsTimeWcnt;
- casa::Double itsTimeA;
- casa::Double itsTimeApar;
- casa::Double itsTimeAfft;
+ casacore::Double itsTimeA;
+ casacore::Double itsTimeApar;
+ casacore::Double itsTimeAfft;
unsigned long long itsTimeAcnt;
- casa::Double itsTimeCFpar;
- casa::Double itsTimeCFfft;
+ casacore::Double itsTimeCFpar;
+ casacore::Double itsTimeCFfft;
unsigned long long itsTimeCFcnt;
- casa::Int itsChan_block_size;
+ casacore::Int itsChan_block_size;
};
diff --git a/CEP/Imager/AWImager2/include/AWImager2/ConvolutionFunctionDiagonal.h b/CEP/Imager/AWImager2/include/AWImager2/ConvolutionFunctionDiagonal.h
index 5533d813c3e767d4c4e9c59be3bbf513d3ecd1cf..d396e7ead9464146099dbde1542049c8f1d0965c 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/ConvolutionFunctionDiagonal.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/ConvolutionFunctionDiagonal.h
@@ -55,18 +55,18 @@ class ConvolutionFunctionDiagonal : public ConvolutionFunction
public:
ConvolutionFunctionDiagonal(
- const casa::MeasurementSet& ms,
+ const casacore::MeasurementSet& ms,
double wmax,
- casa::uInt oversample,
- casa::Int verbose,
- casa::Int maxsupport,
+ casacore::uInt oversample,
+ casacore::Int verbose,
+ casacore::Int maxsupport,
ParameterSet& parset);
virtual ~ConvolutionFunctionDiagonal () {};
// Compute the fft of the beam at the minimal resolution for all antennas,
// and append it to a map object with a (double time) key.
- void computeAterm(casa::Double time);
+ void computeAterm(casacore::Double time);
// Compute the convolution function for all channel, for the polarisations
// specified in the Mueller_mask matrix
@@ -77,11 +77,11 @@ public:
// RETURNS in a LofarCFStore: result[channel][Mueller row][Mueller column]
virtual CFStore makeConvolutionFunction(
- casa::uInt stationA,
- casa::uInt stationB,
- casa::Double time,
- casa::Double w,
- const casa::Matrix<casa::Float> &sum_weight,
+ casacore::uInt stationA,
+ casacore::uInt stationB,
+ casacore::Double time,
+ casacore::Double w,
+ const casacore::Matrix<casacore::Float> &sum_weight,
const vector<bool> &channel_selection,
double w_offset);
};
diff --git a/CEP/Imager/AWImager2/include/AWImager2/ConvolutionFunctionWsplit.h b/CEP/Imager/AWImager2/include/AWImager2/ConvolutionFunctionWsplit.h
index 316e73babf1969606a36e4e9db3d863c7fcffef9..d2c8378e7bcb0483c00dd73194561c07dd3b918f 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/ConvolutionFunctionWsplit.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/ConvolutionFunctionWsplit.h
@@ -53,37 +53,37 @@ namespace LOFAR
// Functions to store a 2D or 3D array in an PagedImage file.
template <class T>
- void store(const casa::DirectionCoordinate &dir, const casa::Matrix<T> &data, const string &name);
+ void store(const casacore::DirectionCoordinate &dir, const casacore::Matrix<T> &data, const string &name);
template <class T>
- void store(const casa::DirectionCoordinate &dir, const casa::Cube<T> &data, const string &name);
+ void store(const casacore::DirectionCoordinate &dir, const casacore::Cube<T> &data, const string &name);
template <class T>
- void store(const casa::Matrix<T> &data, const string &name);
+ void store(const casacore::Matrix<T> &data, const string &name);
template <class T>
- void store(const casa::Cube<T> &data, const string &name);
+ void store(const casacore::Cube<T> &data, const string &name);
class LofarConvolutionFunction
{
public:
- LofarConvolutionFunction(const casa::IPosition& shape, //# padded shape
- const casa::IPosition& imageShape,
- const casa::DirectionCoordinate& coordinates,
- const casa::MeasurementSet& ms,
- casa::uInt nW,
+ LofarConvolutionFunction(const casacore::IPosition& shape, //# padded shape
+ const casacore::IPosition& imageShape,
+ const casacore::DirectionCoordinate& coordinates,
+ const casacore::MeasurementSet& ms,
+ casacore::uInt nW,
double Wmax,
- casa::uInt oversample,
- casa::Int verbose,
- casa::Int maxsupport,
- const casa::String& imgName,
- casa::Bool Use_EJones,
- casa::Bool Apply_Element,
+ casacore::uInt oversample,
+ casacore::Int verbose,
+ casacore::Int maxsupport,
+ const casacore::String& imgName,
+ casacore::Bool Use_EJones,
+ casacore::Bool Apply_Element,
int ApplyBeamCode,
- const casa::Record& parameters,
- vector< vector< vector < casa::Matrix<casa::Complex> > > > & StackMuellerNew
+ const casacore::Record& parameters,
+ vector< vector< vector < casacore::Matrix<casacore::Complex> > > > & StackMuellerNew
);
//,
// Int TaylorTerm,
@@ -104,27 +104,27 @@ namespace LOFAR
void store_all_W_images();
// Get the spheroidal cut.
- const casa::Matrix<casa::Float>& getSpheroidCut();
- casa::Matrix<casa::Float> getSpheroid(casa::uInt npix);
+ const casacore::Matrix<casacore::Float>& getSpheroidCut();
+ casacore::Matrix<casacore::Float> getSpheroid(casacore::uInt npix);
// Get the spheroidal cut from the file.
- static casa::Matrix<casa::Float> getSpheroidCut (const casa::String& imgName);
+ static casacore::Matrix<casacore::Float> getSpheroidCut (const casacore::String& imgName);
// Get the average PB from the file.
- static casa::Matrix<casa::Float> getAveragePB (const casa::String& imgName);
+ static casacore::Matrix<casacore::Float> getAveragePB (const casacore::String& imgName);
// Compute the fft of the beam at the minimal resolution for all antennas,
// and append it to a map object with a (double time) key.
- void computeAterm(casa::Double time);
+ void computeAterm(casacore::Double time);
- vector<casa::Double> VecTimesAterm;
+ vector<casacore::Double> VecTimesAterm;
- void computeVecAterm(casa::Double t0, casa::Double t1, casa::Double dt)
+ void computeVecAterm(casacore::Double t0, casacore::Double t1, casacore::Double dt)
{
- casa::Double tmax(0.);
- for(casa::uInt i=0; i<VecTimesAterm.size(); ++i){
+ casacore::Double tmax(0.);
+ for(casacore::uInt i=0; i<VecTimesAterm.size(); ++i){
if(VecTimesAterm[i]>tmax){
tmax=VecTimesAterm[i];
}
@@ -132,7 +132,7 @@ namespace LOFAR
if(t0>tmax){
double d = std::min(dt, t1-t0);
- for(casa::Double tat=t0+d/2.;tat<t1; tat+=d)
+ for(casacore::Double tat=t0+d/2.;tat<t1; tat+=d)
{
computeAterm(tat);
VecTimesAterm.push_back(tat);
@@ -141,12 +141,12 @@ namespace LOFAR
}
- casa::Double GiveClosestTimeAterm(casa::Double tat)
+ casacore::Double GiveClosestTimeAterm(casacore::Double tat)
{
- casa::Double dtmin(1e30);
- casa::Double tmin(0.);
- casa::Double dt;
- for(casa::uInt ind=0; ind <VecTimesAterm.size(); ++ind)
+ casacore::Double dtmin(1e30);
+ casacore::Double tmin(0.);
+ casacore::Double dt;
+ for(casacore::uInt ind=0; ind <VecTimesAterm.size(); ++ind)
{
dt=abs(tat-VecTimesAterm[ind]);
if(dt<dtmin){
@@ -164,72 +164,72 @@ namespace LOFAR
// implemented, by specifying the beam correcting to the given baseline
// and timeslot.
// RETURNS in a LofarCFStore: result[channel][Mueller row][Mueller column]
- LofarCFStore makeConvolutionFunction(casa::uInt stationA, casa::uInt stationB,
- casa::Double time, casa::Double w,
- const casa::Matrix<bool>& Mask_Mueller,
+ LofarCFStore makeConvolutionFunction(casacore::uInt stationA, casacore::uInt stationB,
+ casacore::Double time, casacore::Double w,
+ const casacore::Matrix<bool>& Mask_Mueller,
bool degridding_step,
double Append_average_PB_CF,
- casa::Matrix<casa::Complex>& Stack_PB_CF,
+ casacore::Matrix<casacore::Complex>& Stack_PB_CF,
double& sum_weight_square,
- casa::Vector<casa::uInt> ChanBlock, casa::Int TaylorTerm, double RefFreq,
- vector< vector < casa::Matrix<casa::Complex> > > & StackMuellerNew,
- casa::Int ImposeSupport, casa::Bool UseWTerm);
+ casacore::Vector<casacore::uInt> ChanBlock, casacore::Int TaylorTerm, double RefFreq,
+ vector< vector < casacore::Matrix<casacore::Complex> > > & StackMuellerNew,
+ casacore::Int ImposeSupport, casacore::Bool UseWTerm);
- LofarCFStore makeConvolutionFunctionAterm(casa::uInt stationA, casa::uInt stationB,
- casa::Double time, casa::Double w,
- const casa::Matrix<bool>& Mask_Mueller,
+ LofarCFStore makeConvolutionFunctionAterm(casacore::uInt stationA, casacore::uInt stationB,
+ casacore::Double time, casacore::Double w,
+ const casacore::Matrix<bool>& Mask_Mueller,
bool degridding_step,
double Append_average_PB_CF,
- casa::Matrix<casa::Complex>& Stack_PB_CF,
+ casacore::Matrix<casacore::Complex>& Stack_PB_CF,
double& sum_weight_square,
- casa::uInt spw, casa::Int TaylorTerm, double RefFreq,
- vector< vector < casa::Matrix<casa::Complex> > > & StackMuellerNew,
- casa::Int ImposeSupport);
+ casacore::uInt spw, casacore::Int TaylorTerm, double RefFreq,
+ vector< vector < casacore::Matrix<casacore::Complex> > > & StackMuellerNew,
+ casacore::Int ImposeSupport);
- casa::Int GiveWSupport(casa::Double w, casa::uInt spw);
- casa::uInt GiveWindex(casa::Double w, casa::uInt spw);
- casa::Int GiveWindexIncludeNegative(casa::Double w, casa::uInt spw);
+ casacore::Int GiveWSupport(casacore::Double w, casacore::uInt spw);
+ casacore::uInt GiveWindex(casacore::Double w, casacore::uInt spw);
+ casacore::Int GiveWindexIncludeNegative(casacore::Double w, casacore::uInt spw);
void initMeanWStepsGridder();
- casa::Int FindNWplanes();
-
- casa::Array<casa::Complex> ApplyElementBeam(casa::Array<casa::Complex> input_grid, casa::Double time, casa::uInt spw, const casa::Matrix<bool>& Mask_Mueller_in, bool degridding_step);
- casa::Array<casa::Complex> ApplyElementBeam_Image(casa::Array<casa::Complex>& input_grid, casa::Double timeIn, casa::uInt spw, const casa::Matrix<bool>& Mask_Mueller_in2, bool degridding_step);
- casa::Array<casa::Complex> ApplyElementBeam2(casa::Array<casa::Complex>& input_grid, casa::Double time, casa::uInt spw, const casa::Matrix<bool>& Mask_Mueller_in, bool degridding_step, casa::Int UsedMask=-1);
- casa::Array<casa::Complex> ApplyElementBeam3(casa::Array<casa::Complex>& input_grid, casa::Double time, casa::uInt spw, const casa::Matrix<bool>& Mask_Mueller_in, bool degridding_step, vector< casa::Array<casa::Complex> >& gridsparalel, casa::Int UsedMask);
- casa::Array<casa::Complex> ApplyWterm(casa::Array<casa::Complex>& input_grid, casa::uInt spw, bool degridding_step, casa::Int w_index, vector< casa::Array<casa::Complex> >& gridsparalel, casa::Int TnumMask, casa::Int WnumMask);
- void ApplyWterm_Image(casa::Array<casa::Complex>& input_grid, casa::Array<casa::Complex>& output_grid, casa::uInt spw, bool degridding_step, casa::Int w_index);
- void ConvolveArrayArrayParallel( const casa::Array<casa::Complex>& gridin, casa::Array<casa::Complex>& gridout,
- const casa::Matrix<casa::Complex>& ConvFunc, vector< casa::Array<casa::Complex> >& GridsParallel);
- void ConvolveArrayArrayParallel2( const casa::Array<casa::Complex>& gridin, casa::Array<casa::Complex>& gridout,
- const casa::Matrix<casa::Complex>& ConvFunc, vector< casa::Array<casa::Complex> >& GridsParallel);
- void ConvolveArrayArrayParallel2( const casa::Array<casa::Complex>& gridin, casa::Array<casa::Complex>& gridout,
- const casa::Matrix<casa::Complex>& ConvFunc, vector< casa::Array<casa::Complex> >& GridsParallel, casa::Matrix<casa::Bool> MaskIn);
- void ConvolveArrayArrayParallel3( const casa::Array<casa::Complex>& gridin, casa::Array<casa::Complex>& gridout,
- const casa::Matrix<casa::Complex>& ConvFunc, vector< casa::Array<casa::Complex> >& GridsParallel);
- void ConvolveArrayArrayParallel3( const casa::Array<casa::Complex>& gridin, casa::Array<casa::Complex>& gridout,
- const casa::Matrix<casa::Complex>& ConvFunc, vector< casa::Array<casa::Complex> >& GridsParallel, casa::Matrix<casa::Bool> MaskIn);
- void ConvolveArrayArrayParallel4( const casa::Array<casa::Complex>& gridin, casa::Array<casa::Complex>& gridout,
- const casa::Matrix<casa::Complex>& ConvFunc, vector< casa::Array<casa::Complex> >& GridsParallel, casa::Matrix<casa::uShort> MaskIn);
- void ConvolveArrayArrayParallel4( const casa::Array<casa::Complex>& gridin, casa::Array<casa::Complex>& gridout, casa::uInt polNum,
- const casa::Matrix<casa::Complex>& ConvFunc, vector< casa::Array<casa::Complex> >& GridsParallel, casa::Matrix<casa::uShort> MaskIn);
- void SumGridsOMP(casa::Array<casa::Complex>& grid, const vector< casa::Array<casa::Complex> >& GridToAdd0 );
- void SumGridsOMP(casa::Array<casa::Complex>& grid, const vector< casa::Array<casa::Complex> >& GridToAdd0 , casa::uInt PolNumIn, casa::uInt PolNumOut);
- void SumGridsOMP(casa::Array<casa::Complex>& grid, const casa::Array<casa::Complex> & GridToAdd0 , casa::uInt PolNumIn, casa::uInt PolNumOut);
+ casacore::Int FindNWplanes();
+
+ casacore::Array<casacore::Complex> ApplyElementBeam(casacore::Array<casacore::Complex> input_grid, casacore::Double time, casacore::uInt spw, const casacore::Matrix<bool>& Mask_Mueller_in, bool degridding_step);
+ casacore::Array<casacore::Complex> ApplyElementBeam_Image(casacore::Array<casacore::Complex>& input_grid, casacore::Double timeIn, casacore::uInt spw, const casacore::Matrix<bool>& Mask_Mueller_in2, bool degridding_step);
+ casacore::Array<casacore::Complex> ApplyElementBeam2(casacore::Array<casacore::Complex>& input_grid, casacore::Double time, casacore::uInt spw, const casacore::Matrix<bool>& Mask_Mueller_in, bool degridding_step, casacore::Int UsedMask=-1);
+ casacore::Array<casacore::Complex> ApplyElementBeam3(casacore::Array<casacore::Complex>& input_grid, casacore::Double time, casacore::uInt spw, const casacore::Matrix<bool>& Mask_Mueller_in, bool degridding_step, vector< casacore::Array<casacore::Complex> >& gridsparalel, casacore::Int UsedMask);
+ casacore::Array<casacore::Complex> ApplyWterm(casacore::Array<casacore::Complex>& input_grid, casacore::uInt spw, bool degridding_step, casacore::Int w_index, vector< casacore::Array<casacore::Complex> >& gridsparalel, casacore::Int TnumMask, casacore::Int WnumMask);
+ void ApplyWterm_Image(casacore::Array<casacore::Complex>& input_grid, casacore::Array<casacore::Complex>& output_grid, casacore::uInt spw, bool degridding_step, casacore::Int w_index);
+ void ConvolveArrayArrayParallel( const casacore::Array<casacore::Complex>& gridin, casacore::Array<casacore::Complex>& gridout,
+ const casacore::Matrix<casacore::Complex>& ConvFunc, vector< casacore::Array<casacore::Complex> >& GridsParallel);
+ void ConvolveArrayArrayParallel2( const casacore::Array<casacore::Complex>& gridin, casacore::Array<casacore::Complex>& gridout,
+ const casacore::Matrix<casacore::Complex>& ConvFunc, vector< casacore::Array<casacore::Complex> >& GridsParallel);
+ void ConvolveArrayArrayParallel2( const casacore::Array<casacore::Complex>& gridin, casacore::Array<casacore::Complex>& gridout,
+ const casacore::Matrix<casacore::Complex>& ConvFunc, vector< casacore::Array<casacore::Complex> >& GridsParallel, casacore::Matrix<casacore::Bool> MaskIn);
+ void ConvolveArrayArrayParallel3( const casacore::Array<casacore::Complex>& gridin, casacore::Array<casacore::Complex>& gridout,
+ const casacore::Matrix<casacore::Complex>& ConvFunc, vector< casacore::Array<casacore::Complex> >& GridsParallel);
+ void ConvolveArrayArrayParallel3( const casacore::Array<casacore::Complex>& gridin, casacore::Array<casacore::Complex>& gridout,
+ const casacore::Matrix<casacore::Complex>& ConvFunc, vector< casacore::Array<casacore::Complex> >& GridsParallel, casacore::Matrix<casacore::Bool> MaskIn);
+ void ConvolveArrayArrayParallel4( const casacore::Array<casacore::Complex>& gridin, casacore::Array<casacore::Complex>& gridout,
+ const casacore::Matrix<casacore::Complex>& ConvFunc, vector< casacore::Array<casacore::Complex> >& GridsParallel, casacore::Matrix<casacore::uShort> MaskIn);
+ void ConvolveArrayArrayParallel4( const casacore::Array<casacore::Complex>& gridin, casacore::Array<casacore::Complex>& gridout, casacore::uInt polNum,
+ const casacore::Matrix<casacore::Complex>& ConvFunc, vector< casacore::Array<casacore::Complex> >& GridsParallel, casacore::Matrix<casacore::uShort> MaskIn);
+ void SumGridsOMP(casacore::Array<casacore::Complex>& grid, const vector< casacore::Array<casacore::Complex> >& GridToAdd0 );
+ void SumGridsOMP(casacore::Array<casacore::Complex>& grid, const vector< casacore::Array<casacore::Complex> >& GridToAdd0 , casacore::uInt PolNumIn, casacore::uInt PolNumOut);
+ void SumGridsOMP(casacore::Array<casacore::Complex>& grid, const casacore::Array<casacore::Complex> & GridToAdd0 , casacore::uInt PolNumIn, casacore::uInt PolNumOut);
// Returns the average Primary Beam from the disk
- casa::Matrix<float> Give_avg_pb();
+ casacore::Matrix<float> Give_avg_pb();
// Compute the average Primary Beam from the Stack of convolution functions
- casa::Matrix<casa::Float> Compute_avg_pb(casa::Matrix<casa::Complex> &Sum_Stack_PB_CF,
+ casacore::Matrix<casacore::Float> Compute_avg_pb(casacore::Matrix<casacore::Complex> &Sum_Stack_PB_CF,
double sum_weight_square);
// Zero padding of a Cube
- casa::Cube<casa::Complex> zero_padding(const casa::Cube<casa::Complex>& Image, int Npixel_Out);
+ casacore::Cube<casacore::Complex> zero_padding(const casacore::Cube<casacore::Complex>& Image, int Npixel_Out);
// Zero padding of a Matrix
- casa::Matrix<casa::Complex> zero_padding(const casa::Matrix<casa::Complex>& Image, int Npixel_Out);
- casa::Matrix<casa::Complex> zero_padding(const casa::Matrix<casa::Complex>& Image, casa::Matrix<casa::Complex>& Image_Enlarged, bool tozero);
+ casacore::Matrix<casacore::Complex> zero_padding(const casacore::Matrix<casacore::Complex>& Image, int Npixel_Out);
+ casacore::Matrix<casacore::Complex> zero_padding(const casacore::Matrix<casacore::Complex>& Image, casacore::Matrix<casacore::Complex>& Image_Enlarged, bool tozero);
@@ -237,29 +237,29 @@ namespace LOFAR
const WScale& wScale() const
{ return m_wScale; }
- casa::Float wStep()
+ casacore::Float wStep()
{ return its_wStep; }
- vector<casa::Complex> wCorrGridder()
+ vector<casacore::Complex> wCorrGridder()
{ return its_wCorrGridder; }
- vector<casa::Complex> its_wCorrGridder;
- vector<casa::Matrix< casa::Complex > > its_wCorrGridderMatrix;
- casa::Float its_wStep;
- casa::Bool its_UseWSplit;
-
- vector< casa::Matrix< casa::Bool > > itsVectorMasksDegridElement;
- vector< vector< casa::Matrix< casa::Bool > > > itsVecMasks;
- vector< vector< casa::Matrix< casa::uShort > > > itsVecMasksNew;
- vector< vector< casa::Matrix< casa::uShort > > > itsVecMasksNewW;
- vector< casa::Matrix< casa::uShort > > itsVecMasksNewElement;
- casa::uInt NBigChunks;
+ vector<casacore::Complex> its_wCorrGridder;
+ vector<casacore::Matrix< casacore::Complex > > its_wCorrGridderMatrix;
+ casacore::Float its_wStep;
+ casacore::Bool its_UseWSplit;
+
+ vector< casacore::Matrix< casacore::Bool > > itsVectorMasksDegridElement;
+ vector< vector< casacore::Matrix< casacore::Bool > > > itsVecMasks;
+ vector< vector< casacore::Matrix< casacore::uShort > > > itsVecMasksNew;
+ vector< vector< casacore::Matrix< casacore::uShort > > > itsVecMasksNewW;
+ vector< casacore::Matrix< casacore::uShort > > itsVecMasksNewElement;
+ casacore::uInt NBigChunks;
void initStoreMasks()
{
NBigChunks=20;
- casa::Int sizeVec(2*m_nWPlanes);
+ casacore::Int sizeVec(2*m_nWPlanes);
itsVecMasks.resize(NBigChunks);
- for(casa::uInt i=0; i<NBigChunks; ++i)
+ for(casacore::uInt i=0; i<NBigChunks; ++i)
{
itsVecMasks[i].resize(sizeVec);
}
@@ -268,29 +268,29 @@ namespace LOFAR
void initStoreMasksNew()
{
NBigChunks=20;
- casa::Int sizeVec(2*m_nWPlanes);
+ casacore::Int sizeVec(2*m_nWPlanes);
itsVecMasksNew.resize(NBigChunks);
itsVecMasksNewW.resize(NBigChunks);
itsVecMasksNewElement.resize(0);
- for(casa::uInt i=0; i<NBigChunks; ++i)
+ for(casacore::uInt i=0; i<NBigChunks; ++i)
{
itsVecMasksNew[i].resize(sizeVec);
itsVecMasksNewW[i].resize(sizeVec);
}
}
- void MakeMaskDegrid( const casa::Array<casa::Complex>& gridin, casa::Int NumMask)
+ void MakeMaskDegrid( const casacore::Array<casacore::Complex>& gridin, casacore::Int NumMask)
{
- casa::String MaskName("JAWS_products/Mask" + casa::String::toString(NumMask) + ".boolim");
- casa::File MaskFile(MaskName);
+ casacore::String MaskName("JAWS_products/Mask" + casacore::String::toString(NumMask) + ".boolim");
+ casacore::File MaskFile(MaskName);
if(!MaskFile.exists()){
//cout<<"... Making Masks ..."<<endl;
- casa::Matrix<casa::Bool> Mask(casa::IPosition(2,gridin.shape()[0],gridin.shape()[0]),false);
- casa::Matrix<casa::Int> IntMask(casa::IPosition(2,gridin.shape()[0],gridin.shape()[0]),false);
+ casacore::Matrix<casacore::Bool> Mask(casacore::IPosition(2,gridin.shape()[0],gridin.shape()[0]),false);
+ casacore::Matrix<casacore::Int> IntMask(casacore::IPosition(2,gridin.shape()[0],gridin.shape()[0]),false);
int GridSize(gridin.shape()[0]);
- const casa::Complex* inPtr = gridin.data();
- casa::Bool* outPtr = Mask.data();
+ const casacore::Complex* inPtr = gridin.data();
+ casacore::Bool* outPtr = Mask.data();
for (int i=0; i<GridSize; ++i) {
for (int j=0; j<GridSize; ++j) {
if (inPtr->real() != 0 || inPtr->imag() != 0) {
@@ -308,19 +308,19 @@ namespace LOFAR
}
- void MakeVectorMaskWplanes( const casa::Array<casa::Complex>& gridin, casa::Int NumTime, casa::Int NumWplane)
+ void MakeVectorMaskWplanes( const casacore::Array<casacore::Complex>& gridin, casacore::Int NumTime, casacore::Int NumWplane)
{
- casa::String MaskName("JAWS_products/Mask.T" + casa::String::toString(NumTime) + ".W" + casa::String::toString(NumWplane) + ".boolim");
- casa::File MaskFile(MaskName);
+ casacore::String MaskName("JAWS_products/Mask.T" + casacore::String::toString(NumTime) + ".W" + casacore::String::toString(NumWplane) + ".boolim");
+ casacore::File MaskFile(MaskName);
if(!MaskFile.exists()){
//cout<<"... Making Masks ..."<<endl;
- casa::Matrix<casa::Bool> Mask(casa::IPosition(2,gridin.shape()[0],gridin.shape()[0]),false);
- casa::Matrix<casa::Int> IntMask(casa::IPosition(2,gridin.shape()[0],gridin.shape()[0]),false);
+ casacore::Matrix<casacore::Bool> Mask(casacore::IPosition(2,gridin.shape()[0],gridin.shape()[0]),false);
+ casacore::Matrix<casacore::Int> IntMask(casacore::IPosition(2,gridin.shape()[0],gridin.shape()[0]),false);
int GridSize(gridin.shape()[0]);
- const casa::Complex* inPtr = gridin.data();
- casa::Bool* outPtr = Mask.data();
+ const casacore::Complex* inPtr = gridin.data();
+ casacore::Bool* outPtr = Mask.data();
for (int i=0; i<GridSize; ++i) {
for (int j=0; j<GridSize; ++j) {
if (inPtr->real() != 0 || inPtr->imag() != 0) {
@@ -336,32 +336,32 @@ namespace LOFAR
}
}
- void MakeVectorMaskWplanesNew( const casa::Array<casa::Complex>& gridin, casa::Int NumTime, casa::Int NumWplane, casa::Bool /*grid*/, casa::Bool /*Element*/, casa::Int MaskType)
+ void MakeVectorMaskWplanesNew( const casacore::Array<casacore::Complex>& gridin, casacore::Int NumTime, casacore::Int NumWplane, casacore::Bool /*grid*/, casacore::Bool /*Element*/, casacore::Int MaskType)
{
//cout<<"make mask "<<grid<<endl;
- casa::String MaskName;
- casa::File MaskFile;
+ casacore::String MaskName;
+ casacore::File MaskFile;
if(MaskType==0){
- MaskName="JAWS_products/MaskGrid.T"+casa::String::toString(NumTime)+".W"+casa::String::toString(NumWplane)+".boolim";
- casa::File MaskFilein(MaskName);
+ MaskName="JAWS_products/MaskGrid.T"+casacore::String::toString(NumTime)+".W"+casacore::String::toString(NumWplane)+".boolim";
+ casacore::File MaskFilein(MaskName);
MaskFile=MaskFilein;
}
if(MaskType==1){
- MaskName="JAWS_products/MaskDeGrid.T"+casa::String::toString(NumTime)+".W"+casa::String::toString(NumWplane)+".boolim";
- casa::File MaskFilein(MaskName);
+ MaskName="JAWS_products/MaskDeGrid.T"+casacore::String::toString(NumTime)+".W"+casacore::String::toString(NumWplane)+".boolim";
+ casacore::File MaskFilein(MaskName);
MaskFile=MaskFilein;
}
if(MaskType==2){
- MaskName="JAWS_products/MaskGrid.Element.T"+casa::String::toString(NumTime)+".boolim";
- casa::File MaskFilein(MaskName);
+ MaskName="JAWS_products/MaskGrid.Element.T"+casacore::String::toString(NumTime)+".boolim";
+ casacore::File MaskFilein(MaskName);
MaskFile=MaskFilein;
}
if(!MaskFile.exists()){
- casa::Matrix<casa::Int> IntMask(casa::IPosition(2,gridin.shape()[0],gridin.shape()[0]),false);
+ casacore::Matrix<casacore::Int> IntMask(casacore::IPosition(2,gridin.shape()[0],gridin.shape()[0]),false);
int GridSize(gridin.shape()[0]);
- const casa::Complex* inPtr = gridin.data();
- casa::uInt Nnonzero(0);
+ const casacore::Complex* inPtr = gridin.data();
+ casacore::uInt Nnonzero(0);
for (int i=0; i<GridSize; ++i) {
for (int j=0; j<GridSize; ++j) {
if (inPtr->real() != 0 || inPtr->imag() != 0) {
@@ -372,9 +372,9 @@ namespace LOFAR
}
inPtr = gridin.data();
Nnonzero=std::max(1,int(Nnonzero));
- casa::Matrix<casa::uShort> Mask(casa::IPosition(2,Nnonzero,2));
+ casacore::Matrix<casacore::uShort> Mask(casacore::IPosition(2,Nnonzero,2));
Mask=0;
- casa::uInt indec(0);
+ casacore::uInt indec(0);
for (int i=0; i<GridSize; ++i) {
for (int j=0; j<GridSize; ++j) {
if (inPtr->real() != 0 || inPtr->imag() != 0) {
@@ -402,25 +402,25 @@ namespace LOFAR
}
- void Make_MuellerAvgPB(vector< vector< vector < casa::Matrix<casa::Complex> > > > & StackMueller, double sum_weight_square);
+ void Make_MuellerAvgPB(vector< vector< vector < casacore::Matrix<casacore::Complex> > > > & StackMueller, double sum_weight_square);
- casa::Array< casa::Complex > Correct_CC(casa::Array< casa::Complex > & ModelImage);
+ casacore::Array< casacore::Complex > Correct_CC(casacore::Array< casacore::Complex > & ModelImage);
- casa::Bool itsFilledVectorMasks;
+ casacore::Bool itsFilledVectorMasks;
//vector< Matrix< Bool > > itsVectorMasksDegridElement;
void ReadMaskDegrid()
{
- casa::Int NumMask(0);
+ casacore::Int NumMask(0);
while(true){
- casa::String MaskName("JAWS_products/Mask"+casa::String::toString(NumMask)+".boolim");
- casa::File MaskFile(MaskName);
+ casacore::String MaskName("JAWS_products/Mask"+casacore::String::toString(NumMask)+".boolim");
+ casacore::File MaskFile(MaskName);
if(MaskFile.exists())
{
//cout<<"Reading:"<<MaskName<<endl;
- casa::PagedImage<casa::Bool> pim(MaskName);
- casa::Array<casa::Bool> arr = pim.get();
- casa::Matrix<casa::Bool> Mask;
+ casacore::PagedImage<casacore::Bool> pim(MaskName);
+ casacore::Array<casacore::Bool> arr = pim.get();
+ casacore::Matrix<casacore::Bool> Mask;
Mask.reference (arr.nonDegenerate(2));
itsVectorMasksDegridElement.push_back(Mask);
NumMask+=1;
@@ -436,17 +436,17 @@ namespace LOFAR
void ReadMaskDegridW()
{
initStoreMasks();
- casa::Int Wc(0);
- for(casa::uInt Tnum=0;Tnum<NBigChunks;++Tnum){
- for(casa::uInt Wnum=0;Wnum<2*m_nWPlanes;++Wnum){
+ casacore::Int Wc(0);
+ for(casacore::uInt Tnum=0;Tnum<NBigChunks;++Tnum){
+ for(casacore::uInt Wnum=0;Wnum<2*m_nWPlanes;++Wnum){
- casa::Int Wsearch(Wnum-m_nWPlanes);
- casa::String MaskName("JAWS_products/Mask.T"+casa::String::toString(Tnum)+".W"+casa::String::toString(Wsearch)+".boolim");
- casa::File MaskFile(MaskName);
+ casacore::Int Wsearch(Wnum-m_nWPlanes);
+ casacore::String MaskName("JAWS_products/Mask.T"+casacore::String::toString(Tnum)+".W"+casacore::String::toString(Wsearch)+".boolim");
+ casacore::File MaskFile(MaskName);
if(MaskFile.exists())
{
- casa::PagedImage<casa::Bool> pim(MaskName);
- casa::Array<casa::Bool> arr = pim.get();
+ casacore::PagedImage<casacore::Bool> pim(MaskName);
+ casacore::Array<casacore::Bool> arr = pim.get();
itsVecMasks[Tnum][Wnum].reference (arr.nonDegenerate(2));
//cout<<" ... read t="<<Tnum<<" w="<<Wsearch<<" put at:"<<Wnum<<endl;
Wc+=1;
@@ -460,7 +460,7 @@ namespace LOFAR
void ReadMaskDegridWNew()
{
//cout<<"...reading masks degrid"<<endl;
- casa::Int Wc(0);
+ casacore::Int Wc(0);
initStoreMasksNew();
/* MaskName="JAWS_products/MaskGrid.T"+String::toString(NumTime)+".W"+String::toString(NumWplane)+".boolim"; */
@@ -470,39 +470,39 @@ namespace LOFAR
/* vector< vector< Matrix< uInt > > > itsVecMasksNewW; */
/* vector< Matrix< uInt > > itsVecMasksNewElement; */
- for(casa::uInt Tnum=0;Tnum<NBigChunks;++Tnum){
- for(casa::uInt Wnum=0;Wnum<2*m_nWPlanes;++Wnum){
+ for(casacore::uInt Tnum=0;Tnum<NBigChunks;++Tnum){
+ for(casacore::uInt Wnum=0;Wnum<2*m_nWPlanes;++Wnum){
- casa::Int Wsearch(Wnum-m_nWPlanes);
- casa::String MaskName("JAWS_products/MaskGrid.T"+casa::String::toString(Tnum)+".W"+casa::String::toString(Wsearch)+".boolim");
- casa::File MaskFile(MaskName);
+ casacore::Int Wsearch(Wnum-m_nWPlanes);
+ casacore::String MaskName("JAWS_products/MaskGrid.T"+casacore::String::toString(Tnum)+".W"+casacore::String::toString(Wsearch)+".boolim");
+ casacore::File MaskFile(MaskName);
if(MaskFile.exists())
{
//cout<<".. reading "<<MaskName<<endl;
- casa::PagedImage<casa::uShort> pim(MaskName);
- casa::Array<casa::uShort> arr = pim.get();
+ casacore::PagedImage<casacore::uShort> pim(MaskName);
+ casacore::Array<casacore::uShort> arr = pim.get();
itsVecMasksNew[Tnum][Wnum].reference (arr.nonDegenerate(2));
Wc+=1;
}
- casa::String MaskName2("JAWS_products/MaskDeGrid.T"+casa::String::toString(Tnum)+".W"+casa::String::toString(Wsearch)+".boolim");
- casa::File MaskFile2(MaskName);
+ casacore::String MaskName2("JAWS_products/MaskDeGrid.T"+casacore::String::toString(Tnum)+".W"+casacore::String::toString(Wsearch)+".boolim");
+ casacore::File MaskFile2(MaskName);
if(MaskFile2.exists())
{
//cout<<".. reading "<<MaskName2<<endl;
- casa::PagedImage<casa::uShort> pim(MaskName2);
- casa::Array<casa::uShort> arr = pim.get();
+ casacore::PagedImage<casacore::uShort> pim(MaskName2);
+ casacore::Array<casacore::uShort> arr = pim.get();
itsVecMasksNewW[Tnum][Wnum].reference (arr.nonDegenerate(2));
Wc+=1;
}
}
- casa::String MaskName("JAWS_products/MaskGrid.Element.T"+casa::String::toString(Tnum)+".boolim");
- casa::File MaskFile(MaskName);
+ casacore::String MaskName("JAWS_products/MaskGrid.Element.T"+casacore::String::toString(Tnum)+".boolim");
+ casacore::File MaskFile(MaskName);
if(MaskFile.exists())
{
//cout<<".. reading "<<MaskName<<endl;
- casa::PagedImage<casa::uShort> pim(MaskName);
- casa::Array<casa::uShort> arr = pim.get();
- casa::Matrix<casa::uShort> Mask;
+ casacore::PagedImage<casacore::uShort> pim(MaskName);
+ casacore::Array<casacore::uShort> arr = pim.get();
+ casacore::Matrix<casacore::uShort> Mask;
Mask.reference(arr.nonDegenerate(2));
itsVecMasksNewElement.push_back(Mask);
}
@@ -513,91 +513,91 @@ namespace LOFAR
}
- casa::Bool VectorMaskIsFilled(){return itsFilledVectorMasks;}
+ casacore::Bool VectorMaskIsFilled(){return itsFilledVectorMasks;}
- void normalized_fft (casa::Matrix<casa::Complex>&, bool toFreq=true);
- void normalized_fft_parallel(casa::Matrix<casa::Complex> &im, bool toFreq=true);
- void normalized_fft (casa::PrecTimer& timer, casa::Matrix<casa::Complex>&, bool toFreq=true);
+ void normalized_fft (casacore::Matrix<casacore::Complex>&, bool toFreq=true);
+ void normalized_fft_parallel(casacore::Matrix<casacore::Complex> &im, bool toFreq=true);
+ void normalized_fft (casacore::PrecTimer& timer, casacore::Matrix<casacore::Complex>&, bool toFreq=true);
- casa::Vector< casa::Double > list_freq_spw;
- casa::Vector< casa::Double > list_freq_chanBlock;
- casa::Vector< casa::uInt > map_chan_chanBlock;
- casa::Vector< casa::uInt > map_chanBlock_spw;
- vector<casa::Vector< casa::uInt > > map_spw_chanBlock;
- casa::Vector< casa::uInt > map_chan_Block_buffer;
- casa::uInt m_nWPlanes;
+ casacore::Vector< casacore::Double > list_freq_spw;
+ casacore::Vector< casacore::Double > list_freq_chanBlock;
+ casacore::Vector< casacore::uInt > map_chan_chanBlock;
+ casacore::Vector< casacore::uInt > map_chanBlock_spw;
+ vector<casacore::Vector< casacore::uInt > > map_spw_chanBlock;
+ casacore::Vector< casacore::uInt > map_chan_Block_buffer;
+ casacore::uInt m_nWPlanes;
private:
- casa::Matrix<casa::Complex> give_normalized_fft_lapack(const casa::Matrix<casa::Complex> &im, bool toFreq=true)
+ casacore::Matrix<casacore::Complex> give_normalized_fft_lapack(const casacore::Matrix<casacore::Complex> &im, bool toFreq=true)
{
- casa::Matrix<casa::Complex> result(im.copy());
- casa::ArrayLattice<casa::Complex> lattice(result);
- casa::LatticeFFT::cfft2d(lattice, toFreq);
+ casacore::Matrix<casacore::Complex> result(im.copy());
+ casacore::ArrayLattice<casacore::Complex> lattice(result);
+ casacore::LatticeFFT::cfft2d(lattice, toFreq);
if(toFreq){
- result/=static_cast<casa::Float>(result.shape()(0)*result.shape()(1));
+ result/=static_cast<casacore::Float>(result.shape()(0)*result.shape()(1));
}
else{
- result*=static_cast<casa::Float>(result.shape()(0)*result.shape()(1));
+ result*=static_cast<casacore::Float>(result.shape()(0)*result.shape()(1));
};
return result;
}
- casa::MEpoch observationStartTime (const casa::MeasurementSet &ms,
- casa::uInt idObservation) const;
+ casacore::MEpoch observationStartTime (const casacore::MeasurementSet &ms,
+ casacore::uInt idObservation) const;
// Estime spheroidal convolution function from the support of the fft
// of the spheroidal in the image plane
- casa::Double makeSpheroidCut();
+ casacore::Double makeSpheroidCut();
// Return the angular resolution required for making the image of the
// angular size determined by coordinates and shape.
// The resolution is assumed to be the same on both direction axes.
- casa::Double estimateWResolution(const casa::IPosition &shape,
- casa::Double pixelSize,
- casa::Double w) const;
+ casacore::Double estimateWResolution(const casacore::IPosition &shape,
+ casacore::Double pixelSize,
+ casacore::Double w) const;
// Return the angular resolution required for making the image of the
// angular size determined by coordinates and shape.
// The resolution is assumed to be the same on both direction axes.
- casa::Double estimateAResolution(const casa::IPosition &shape,
- const casa::DirectionCoordinate &coordinates, double station_diam = 70.) const;
+ casacore::Double estimateAResolution(const casacore::IPosition &shape,
+ const casacore::DirectionCoordinate &coordinates, double station_diam = 70.) const;
// Apply a spheroidal taper to the input function.
template <typename T>
- void taper (casa::Matrix<T> &function) const
+ void taper (casacore::Matrix<T> &function) const
{
-// AlwaysAssert(function.shape()[0] == function.shape()[1], casa::SynthesisError);
- casa::uInt size = function.shape()[0];
- casa::Double halfSize = (size-1) / 2.0;
- casa::Vector<casa::Double> x(size);
- for (casa::uInt i=0; i<size; ++i) {
+// AlwaysAssert(function.shape()[0] == function.shape()[1], casacore::SynthesisError);
+ casacore::uInt size = function.shape()[0];
+ casacore::Double halfSize = (size-1) / 2.0;
+ casacore::Vector<casacore::Double> x(size);
+ for (casacore::uInt i=0; i<size; ++i) {
x[i] = spheroidal(abs(i - halfSize) / halfSize);
}
- for (casa::uInt i=0; i<size; ++i) {
- for (casa::uInt j=0; j<size; ++j) {
+ for (casacore::uInt i=0; i<size; ++i) {
+ for (casacore::uInt j=0; j<size; ++j) {
function(j, i) *= x[i] * x[j];
}
}
}
template <typename T>
- void taper_parallel (casa::Matrix<T> &function) const
+ void taper_parallel (casacore::Matrix<T> &function) const
{
// AlwaysAssert(function.shape()[0] == function.shape()[1], SynthesisError);
- casa::uInt size = function.shape()[0];
- casa::Double halfSize = (size-1) / 2.0;
- casa::Vector<casa::Double> x(size);
- for (casa::uInt i=0; i<size; ++i) {
+ casacore::uInt size = function.shape()[0];
+ casacore::Double halfSize = (size-1) / 2.0;
+ casacore::Vector<casacore::Double> x(size);
+ for (casacore::uInt i=0; i<size; ++i) {
x[i] = spheroidal(abs(i - halfSize) / halfSize);
}
- casa::uInt j;
+ casacore::uInt j;
#pragma omp parallel
{
#pragma omp for private(j) schedule(dynamic)
- for (casa::uInt i=0; i<size; ++i)
+ for (casacore::uInt i=0; i<size; ++i)
{
for (j=0; j<size; ++j)
{
@@ -610,19 +610,19 @@ namespace LOFAR
// Linear interpolation
template <typename T>
- casa::Matrix< T > LinearInterpol(casa::Matrix<T> ImageIn, casa::Int NpixOut)
+ casacore::Matrix< T > LinearInterpol(casacore::Matrix<T> ImageIn, casacore::Int NpixOut)
{
- casa::Matrix<T> ImageOut(casa::IPosition(2,NpixOut,NpixOut),0.);
+ casacore::Matrix<T> ImageOut(casacore::IPosition(2,NpixOut,NpixOut),0.);
float d0(1./(NpixOut-1.));
float d1(1./(ImageIn.shape()[0]-1.));
float dd(d0/d1);
float dx,dy,dxd,dyd,xin,yin;
float onef(1.);
- for(casa::Int i=0;i<(NpixOut);++i){
+ for(casacore::Int i=0;i<(NpixOut);++i){
dxd=i*dd;
xin=floor(dxd);
dx=dxd-xin;
- for(casa::Int j=0;j<(NpixOut);++j){
+ for(casacore::Int j=0;j<(NpixOut);++j){
dyd=j*dd;
yin=floor(dyd);
dy=dyd-yin;
@@ -632,16 +632,16 @@ namespace LOFAR
return ImageOut;
}
- void Convolve(casa::Matrix<casa::Complex> gridin, casa::Matrix<casa::Complex> gridout, casa::Matrix<casa::Complex> ConvFunc){
- casa::uInt Support(ConvFunc.shape()[0]);
- casa::uInt GridSize(gridin.shape()[0]);
- casa::uInt off(Support/2);
- for(casa::uInt i=Support/2;i<GridSize-Support/2;++i){
- for(casa::uInt j=Support/2;j<GridSize-Support/2;++j){
- if((gridin(i,j))!=casa::Complex(0.,0.)){
- casa::Complex val(gridin(i,j));
- for(casa::uInt ii=0;ii<Support;++ii){
- for(casa::uInt jj=0;jj<Support;++jj){
+ void Convolve(casacore::Matrix<casacore::Complex> gridin, casacore::Matrix<casacore::Complex> gridout, casacore::Matrix<casacore::Complex> ConvFunc){
+ casacore::uInt Support(ConvFunc.shape()[0]);
+ casacore::uInt GridSize(gridin.shape()[0]);
+ casacore::uInt off(Support/2);
+ for(casacore::uInt i=Support/2;i<GridSize-Support/2;++i){
+ for(casacore::uInt j=Support/2;j<GridSize-Support/2;++j){
+ if((gridin(i,j))!=casacore::Complex(0.,0.)){
+ casacore::Complex val(gridin(i,j));
+ for(casacore::uInt ii=0;ii<Support;++ii){
+ for(casacore::uInt jj=0;jj<Support;++jj){
gridout(i-off+ii,j-off+jj)+=ConvFunc(ii,jj)*val;
}
}
@@ -650,22 +650,22 @@ namespace LOFAR
}
}
- void ConvolveOpt(casa::Matrix<casa::Complex> gridin, casa::Matrix<casa::Complex> gridout, casa::Matrix<casa::Complex> ConvFunc){
- casa::uInt Support(ConvFunc.shape()[0]);
- casa::uInt GridSize(gridin.shape()[0]);
- casa::uInt off(Support/2);
+ void ConvolveOpt(casacore::Matrix<casacore::Complex> gridin, casacore::Matrix<casacore::Complex> gridout, casacore::Matrix<casacore::Complex> ConvFunc){
+ casacore::uInt Support(ConvFunc.shape()[0]);
+ casacore::uInt GridSize(gridin.shape()[0]);
+ casacore::uInt off(Support/2);
- casa::Complex* __restrict__ gridInPtr = gridin.data();
- casa::Complex* __restrict__ gridOutPtr = gridout.data();
- casa::Complex* __restrict__ ConvFuncPtr = ConvFunc.data();
+ casacore::Complex* __restrict__ gridInPtr = gridin.data();
+ casacore::Complex* __restrict__ gridOutPtr = gridout.data();
+ casacore::Complex* __restrict__ ConvFuncPtr = ConvFunc.data();
- for(casa::uInt i=Support/2;i<GridSize-Support/2;++i){
- for(casa::uInt j=Support/2;j<GridSize-Support/2;++j){
+ for(casacore::uInt i=Support/2;i<GridSize-Support/2;++i){
+ for(casacore::uInt j=Support/2;j<GridSize-Support/2;++j){
gridInPtr=gridin.data()+GridSize*i+j;
if (gridInPtr->real() != 0 || gridInPtr->imag() != 0) {//if((*gridInPtr)!=Complex(0.,0.)){
ConvFuncPtr = ConvFunc.data();
- for(casa::uInt jj=0;jj<Support;++jj){
- for(casa::uInt ii=0;ii<Support;++ii){
+ for(casacore::uInt jj=0;jj<Support;++jj){
+ for(casacore::uInt ii=0;ii<Support;++ii){
gridOutPtr = gridout.data()+(j-off+jj)*GridSize+i-off+ii;
(*gridOutPtr) += (*ConvFuncPtr)*(*gridInPtr);
ConvFuncPtr++;//=ConvFunc.data()+Support*ii+jj;
@@ -678,20 +678,20 @@ namespace LOFAR
}
- void ConvolveGer( const casa::Matrix<casa::Complex>& gridin, casa::Matrix<casa::Complex>& gridout,
- const casa::Matrix<casa::Complex>& ConvFunc)
+ void ConvolveGer( const casacore::Matrix<casacore::Complex>& gridin, casacore::Matrix<casacore::Complex>& gridout,
+ const casacore::Matrix<casacore::Complex>& ConvFunc)
{
- casa::uInt Support(ConvFunc.shape()[0]);
- casa::uInt GridSize(gridin.shape()[0]);
- casa::uInt off(Support/2);
- const casa::Complex* inPtr = gridin.data() + off*GridSize + off;
- for (casa::uInt i=0; i<GridSize-Support; ++i) {
- for (casa::uInt j=0; j<GridSize-Support; ++j) {
+ casacore::uInt Support(ConvFunc.shape()[0]);
+ casacore::uInt GridSize(gridin.shape()[0]);
+ casacore::uInt off(Support/2);
+ const casacore::Complex* inPtr = gridin.data() + off*GridSize + off;
+ for (casacore::uInt i=0; i<GridSize-Support; ++i) {
+ for (casacore::uInt j=0; j<GridSize-Support; ++j) {
if (inPtr->real() != 0 || inPtr->imag() != 0) {
- const casa::Complex* cfPtr = ConvFunc.data();
- for (casa::uInt ii=0; ii<Support; ++ii) {
- casa::Complex* outPtr = gridout.data() + (i+ii)*GridSize + j;
- for (casa::uInt jj=0; jj<Support; ++jj) {
+ const casacore::Complex* cfPtr = ConvFunc.data();
+ for (casacore::uInt ii=0; ii<Support; ++ii) {
+ casacore::Complex* outPtr = gridout.data() + (i+ii)*GridSize + j;
+ for (casacore::uInt jj=0; jj<Support; ++jj) {
outPtr[jj] += *cfPtr++ * *inPtr;
}
}
@@ -702,21 +702,21 @@ namespace LOFAR
}
}
- void ConvolveGerArray( const casa::Array<casa::Complex>& gridin, casa::Int ConvPol, casa::Matrix<casa::Complex>& gridout,
- const casa::Matrix<casa::Complex>& ConvFunc)
+ void ConvolveGerArray( const casacore::Array<casacore::Complex>& gridin, casacore::Int ConvPol, casacore::Matrix<casacore::Complex>& gridout,
+ const casacore::Matrix<casacore::Complex>& ConvFunc)
{
- casa::uInt Support(ConvFunc.shape()[0]);
- casa::uInt GridSize(gridin.shape()[0]);
- casa::uInt off(Support/2);
+ casacore::uInt Support(ConvFunc.shape()[0]);
+ casacore::uInt GridSize(gridin.shape()[0]);
+ casacore::uInt off(Support/2);
- const casa::Complex* inPtr = gridin.data() + ConvPol*GridSize*GridSize + off*GridSize + off;
- for (casa::uInt i=0; i<GridSize-Support; ++i) {
- for (casa::uInt j=0; j<GridSize-Support; ++j) {
+ const casacore::Complex* inPtr = gridin.data() + ConvPol*GridSize*GridSize + off*GridSize + off;
+ for (casacore::uInt i=0; i<GridSize-Support; ++i) {
+ for (casacore::uInt j=0; j<GridSize-Support; ++j) {
if (inPtr->real() != 0 || inPtr->imag() != 0) {
- const casa::Complex* cfPtr = ConvFunc.data();
- for (casa::uInt ii=0; ii<Support; ++ii) {
- casa::Complex* outPtr = gridout.data() + (i+ii)*GridSize + j;
- for (casa::uInt jj=0; jj<Support; ++jj) {
+ const casacore::Complex* cfPtr = ConvFunc.data();
+ for (casacore::uInt ii=0; ii<Support; ++ii) {
+ casacore::Complex* outPtr = gridout.data() + (i+ii)*GridSize + j;
+ for (casacore::uInt jj=0; jj<Support; ++jj) {
outPtr[jj] += *cfPtr++ * *inPtr;
}
}
@@ -727,8 +727,8 @@ namespace LOFAR
}
}
- void ConvolveArrayArray( const casa::Array<casa::Complex>& gridin, casa::Array<casa::Complex>& gridout,
- const casa::Matrix<casa::Complex>& ConvFunc)
+ void ConvolveArrayArray( const casacore::Array<casacore::Complex>& gridin, casacore::Array<casacore::Complex>& gridout,
+ const casacore::Matrix<casacore::Complex>& ConvFunc)
{
int Support(ConvFunc.shape()[0]);
int GridSize(gridin.shape()[0]);
@@ -736,17 +736,17 @@ namespace LOFAR
- for(casa::uInt ConvPol=0; ConvPol<gridin.shape()[2];++ConvPol){
+ for(casacore::uInt ConvPol=0; ConvPol<gridin.shape()[2];++ConvPol){
- casa::Int offPol(ConvPol*GridSize*GridSize);
- const casa::Complex* inPtr = gridin.data() + ConvPol*GridSize*GridSize + off*GridSize + off;
- for (casa::Int i=0; i<GridSize-Support; ++i) {
- for (casa::Int j=0; j<GridSize-Support; ++j) {
+ casacore::Int offPol(ConvPol*GridSize*GridSize);
+ const casacore::Complex* inPtr = gridin.data() + ConvPol*GridSize*GridSize + off*GridSize + off;
+ for (casacore::Int i=0; i<GridSize-Support; ++i) {
+ for (casacore::Int j=0; j<GridSize-Support; ++j) {
if (inPtr->real() != 0 || inPtr->imag() != 0) {
- const casa::Complex* cfPtr = ConvFunc.data();
- for (casa::Int ii=0; ii<Support; ++ii) {
- casa::Complex* outPtr = gridout.data() + (i+ii)*GridSize + j +offPol;
- for (casa::Int jj=0; jj<Support; ++jj) {
+ const casacore::Complex* cfPtr = ConvFunc.data();
+ for (casacore::Int ii=0; ii<Support; ++ii) {
+ casacore::Complex* outPtr = gridout.data() + (i+ii)*GridSize + j +offPol;
+ for (casacore::Int jj=0; jj<Support; ++jj) {
outPtr[jj] += *cfPtr++ * *inPtr;
}
}
@@ -761,22 +761,22 @@ namespace LOFAR
- void ConvolveGerArrayMask( const casa::Array<casa::Complex>& gridin, casa::Int ConvPol, casa::Matrix<casa::Complex>& gridout,
- const casa::Matrix<casa::Complex>& ConvFunc, casa::Int UsedMask)
+ void ConvolveGerArrayMask( const casacore::Array<casacore::Complex>& gridin, casacore::Int ConvPol, casacore::Matrix<casacore::Complex>& gridout,
+ const casacore::Matrix<casacore::Complex>& ConvFunc, casacore::Int UsedMask)
{
- casa::uInt Support(ConvFunc.shape()[0]);
- casa::uInt GridSize(gridin.shape()[0]);
- casa::uInt off(Support/2);
-
- const casa::Complex* inPtr = gridin.data() + ConvPol*GridSize*GridSize + off*GridSize + off;
- const casa::Bool* MaskPtr = itsVectorMasksDegridElement[UsedMask].data() + off*GridSize + off;
- for (casa::uInt i=0; i<GridSize-Support; ++i) {
- for (casa::uInt j=0; j<GridSize-Support; ++j) {
+ casacore::uInt Support(ConvFunc.shape()[0]);
+ casacore::uInt GridSize(gridin.shape()[0]);
+ casacore::uInt off(Support/2);
+
+ const casacore::Complex* inPtr = gridin.data() + ConvPol*GridSize*GridSize + off*GridSize + off;
+ const casacore::Bool* MaskPtr = itsVectorMasksDegridElement[UsedMask].data() + off*GridSize + off;
+ for (casacore::uInt i=0; i<GridSize-Support; ++i) {
+ for (casacore::uInt j=0; j<GridSize-Support; ++j) {
if ((*MaskPtr)==true) {
- const casa::Complex* cfPtr = ConvFunc.data();
- for (casa::uInt ii=0; ii<Support; ++ii) {
- casa::Complex* outPtr = gridout.data() + (i+ii)*GridSize + j;
- for (casa::uInt jj=0; jj<Support; ++jj) {
+ const casacore::Complex* cfPtr = ConvFunc.data();
+ for (casacore::uInt ii=0; ii<Support; ++ii) {
+ casacore::Complex* outPtr = gridout.data() + (i+ii)*GridSize + j;
+ for (casacore::uInt jj=0; jj<Support; ++jj) {
outPtr[jj] += *cfPtr++ * *inPtr;
}
}
@@ -793,20 +793,20 @@ namespace LOFAR
// Linear interpolation
template <typename T>
- casa::Matrix< T > LinearInterpol2(casa::Matrix<T> ImageIn, casa::Int NpixOut)
+ casacore::Matrix< T > LinearInterpol2(casacore::Matrix<T> ImageIn, casacore::Int NpixOut)
{
- casa::Matrix<T> ImageOut(casa::IPosition(2,NpixOut,NpixOut),1e-7);
+ casacore::Matrix<T> ImageOut(casacore::IPosition(2,NpixOut,NpixOut),1e-7);
int nd(ImageIn.shape()[0]);
int ni(NpixOut);
float off(-.5);//-(((1.+1./(nd-1.))-1.)/2.)*(nd-1));
float a(nd/(ni-1.));//((1.+1./(nd-1.))/(ni-1.))*(nd-1));
float dx,dy,dxd,dyd,xin,yin;
float onef(1.);
- for(casa::Int i=0;i<(NpixOut);++i){
+ for(casacore::Int i=0;i<(NpixOut);++i){
dxd=i*a+off;
xin=floor(dxd);
dx=dxd-xin;
- for(casa::Int j=0;j<(NpixOut);++j){
+ for(casacore::Int j=0;j<(NpixOut);++j){
dyd=j*a+off;
yin=floor(dyd);
dy=dyd-yin;
@@ -821,14 +821,14 @@ namespace LOFAR
return ImageOut;
}
- void EstimateCoordShape(casa::IPosition shape, casa::DirectionCoordinate coordinate, double station_diameter=70.){
+ void EstimateCoordShape(casacore::IPosition shape, casacore::DirectionCoordinate coordinate, double station_diameter=70.){
coordinate = m_coordinates;
- casa::Double aPixelAngSize = min(m_pixelSizeSpheroidal,
+ casacore::Double aPixelAngSize = min(m_pixelSizeSpheroidal,
estimateAResolution(m_shape, m_coordinates, station_diameter));
- casa::Double pixelSize = abs(m_coordinates.increment()[0]);
- casa::Double imageDiameter = pixelSize * m_shape(0);
- casa::Int nPixelsConv = imageDiameter / aPixelAngSize;
+ casacore::Double pixelSize = abs(m_coordinates.increment()[0]);
+ casacore::Double imageDiameter = pixelSize * m_shape(0);
+ casacore::Int nPixelsConv = imageDiameter / aPixelAngSize;
if (nPixelsConv > itsMaxSupport) {
nPixelsConv = itsMaxSupport;
}
@@ -836,20 +836,20 @@ namespace LOFAR
nPixelsConv = FFTCMatrix::optimalOddFFTSize (nPixelsConv);
aPixelAngSize = imageDiameter / nPixelsConv;
- shape=casa::IPosition(2, nPixelsConv, nPixelsConv);
- casa::Vector<casa::Double> increment_old(coordinate.increment());
- casa::Vector<casa::Double> increment(2);
- increment[0] = aPixelAngSize*casa::sign(increment_old[0]);
- increment[1] = aPixelAngSize*casa::sign(increment_old[1]);
+ shape=casacore::IPosition(2, nPixelsConv, nPixelsConv);
+ casacore::Vector<casacore::Double> increment_old(coordinate.increment());
+ casacore::Vector<casacore::Double> increment(2);
+ increment[0] = aPixelAngSize*casacore::sign(increment_old[0]);
+ increment[1] = aPixelAngSize*casacore::sign(increment_old[1]);
coordinate.setIncrement(increment);
- casa::Vector<casa::Double> refpix(2, 0.5*(nPixelsConv-1));
+ casacore::Vector<casacore::Double> refpix(2, 0.5*(nPixelsConv-1));
coordinate.setReferencePixel(refpix);
}
- casa::Double spheroidal(casa::Double nu) const;
+ casacore::Double spheroidal(casacore::Double nu) const;
@@ -857,13 +857,13 @@ namespace LOFAR
template <typename T>
- casa::uInt findSupport(casa::Matrix<T> &function, casa::Double threshold) const
+ casacore::uInt findSupport(casacore::Matrix<T> &function, casacore::Double threshold) const
{
/// Double peak = abs(max(abs(function)));
- casa::Double peak = max(amplitude(function));
+ casacore::Double peak = max(amplitude(function));
threshold *= peak;
- casa::uInt halfSize = function.shape()[0] / 2;
- casa::uInt x = 0;
+ casacore::uInt halfSize = function.shape()[0] / 2;
+ casacore::uInt x = 0;
while (x < halfSize && abs(function(x, halfSize)) < threshold) {
++x;
}
@@ -872,66 +872,66 @@ namespace LOFAR
//# Data members.
- casa::Record itsParameters;
- casa::Array<casa::Complex> its_output_grid_element;
- casa::Matrix<casa::Complex> its_ArrMatrix_out_element;
- casa::IPosition m_shape;
- casa::DirectionCoordinate m_coordinates;
+ casacore::Record itsParameters;
+ casacore::Array<casacore::Complex> its_output_grid_element;
+ casacore::Matrix<casacore::Complex> its_ArrMatrix_out_element;
+ casacore::IPosition m_shape;
+ casacore::DirectionCoordinate m_coordinates;
WScale m_wScale;
LofarWTerm m_wTerm;
LofarATerm m_aTerm;
- casa::Double m_maxW;
- casa::Double m_pixelSizeSpheroidal;
- casa::uInt m_nStations;
- casa::uInt m_oversampling;
- casa::uInt m_nChannelBlocks;
- casa::uInt m_NPixATerm;
- casa::Double m_refFrequency;
- casa::uInt m_maxCFSupport;
- vector<casa::Double> its_VectorThreadsSumWeights;
+ casacore::Double m_maxW;
+ casacore::Double m_pixelSizeSpheroidal;
+ casacore::uInt m_nStations;
+ casacore::uInt m_oversampling;
+ casacore::uInt m_nChannelBlocks;
+ casacore::uInt m_NPixATerm;
+ casacore::Double m_refFrequency;
+ casacore::uInt m_maxCFSupport;
+ vector<casacore::Double> its_VectorThreadsSumWeights;
//# Stack of the convolution functions for the average PB calculation
- casa::Matrix<casa::Complex> Spheroid_cut;
+ casacore::Matrix<casacore::Complex> Spheroid_cut;
//# Stack of the convolution functions for the average PB calculation
- casa::Matrix<casa::Float> Spheroid_cut_im;
- casa::Matrix<casa::Float> Spheroid_cut_im_element;
+ casacore::Matrix<casacore::Float> Spheroid_cut_im;
+ casacore::Matrix<casacore::Float> Spheroid_cut_im_element;
//# List of the ferquencies the CF have to be caluclated for
- vector< casa::Matrix<casa::Complex> > m_WplanesStore;
+ vector< casacore::Matrix<casacore::Complex> > m_WplanesStore;
//# Aterm_store[double time][antenna][channel]=Cube[Npix,Npix,4]
- map<casa::Double, vector< vector< casa::Cube<casa::Complex> > > > m_AtermStore;
- map<casa::Double, vector< vector< casa::Cube<casa::Complex> > > > m_AtermStore_element;
- map<casa::Double, vector< vector< casa::Cube<casa::Complex> > > > m_AtermStore_station;
+ map<casacore::Double, vector< vector< casacore::Cube<casacore::Complex> > > > m_AtermStore;
+ map<casacore::Double, vector< vector< casacore::Cube<casacore::Complex> > > > m_AtermStore_element;
+ map<casacore::Double, vector< vector< casacore::Cube<casacore::Complex> > > > m_AtermStore_station;
//# Average primary beam
- casa::Matrix<casa::Float> Im_Stack_PB_CF0;
- casa::Int itsVerbose;
- casa::Int itsMaxSupport;
+ casacore::Matrix<casacore::Float> Im_Stack_PB_CF0;
+ casacore::Int itsVerbose;
+ casacore::Int itsMaxSupport;
// Int itsTaylorTerm;
//Double itsRefFreq;
- casa::String itsImgName;
+ casacore::String itsImgName;
vector<FFTCMatrix> itsFFTMachines;
- casa::Double itsTimeW;
- casa::Double itsTimeWpar;
- casa::Double itsTimeWfft;
+ casacore::Double itsTimeW;
+ casacore::Double itsTimeWpar;
+ casacore::Double itsTimeWfft;
unsigned long long itsTimeWcnt;
- casa::Double itsTimeA;
- casa::Double itsTimeApar;
- casa::Double itsTimeAfft;
+ casacore::Double itsTimeA;
+ casacore::Double itsTimeApar;
+ casacore::Double itsTimeAfft;
unsigned long long itsTimeAcnt;
- casa::Double itsTimeCF;
- casa::Double itsTimeCFpar;
- casa::Double itsTimeCFfft;
+ casacore::Double itsTimeCF;
+ casacore::Double itsTimeCFpar;
+ casacore::Double itsTimeCFfft;
unsigned long long itsTimeCFcnt;
- casa::Bool its_Use_EJones;
- casa::Bool its_Apply_Element;
- casa::Bool its_NotApplyElement;
- casa::Bool its_NotApplyArray;
- casa::uInt its_MaxWSupport;
- casa::uInt its_count_time;
- mutable casa::LogIO m_logIO;
- casa::Int its_ChanBlockSize;
- casa::Matrix<casa::Complex> spheroid_cut_element_fft;
- vector< vector< casa::Matrix< casa::Complex > > > GridsMueller;
- casa::LogIO &logIO() const
+ casacore::Bool its_Use_EJones;
+ casacore::Bool its_Apply_Element;
+ casacore::Bool its_NotApplyElement;
+ casacore::Bool its_NotApplyArray;
+ casacore::uInt its_MaxWSupport;
+ casacore::uInt its_count_time;
+ mutable casacore::LogIO m_logIO;
+ casacore::Int its_ChanBlockSize;
+ casacore::Matrix<casacore::Complex> spheroid_cut_element_fft;
+ vector< vector< casacore::Matrix< casacore::Complex > > > GridsMueller;
+ casacore::LogIO &logIO() const
{
return m_logIO;
}
@@ -941,69 +941,69 @@ namespace LOFAR
//# =================================================
template <class T>
- void store(const casa::Matrix<T> &data, const string &name)
+ void store(const casacore::Matrix<T> &data, const string &name)
{
- casa::Matrix<casa::Double> xform(2, 2);
+ casacore::Matrix<casacore::Double> xform(2, 2);
xform = 0.0;
xform.diagonal() = 1.0;
- casa::Quantum<casa::Double> incLon((8.0 / data.shape()(0)) * casa::C::pi / 180.0, "rad");
- casa::Quantum<casa::Double> incLat((8.0 / data.shape()(1)) * casa::C::pi / 180.0, "rad");
- casa::Quantum<casa::Double> refLatLon(45.0 * casa::C::pi / 180.0, "rad");
- casa::DirectionCoordinate dir(casa::MDirection::J2000, casa::Projection(casa::Projection::SIN),
+ casacore::Quantum<casacore::Double> incLon((8.0 / data.shape()(0)) * casacore::C::pi / 180.0, "rad");
+ casacore::Quantum<casacore::Double> incLat((8.0 / data.shape()(1)) * casacore::C::pi / 180.0, "rad");
+ casacore::Quantum<casacore::Double> refLatLon(45.0 * casacore::C::pi / 180.0, "rad");
+ casacore::DirectionCoordinate dir(casacore::MDirection::J2000, casacore::Projection(casacore::Projection::SIN),
refLatLon, refLatLon, incLon, incLat,
xform, data.shape()(0) / 2, data.shape()(1) / 2);
store(dir, data, name);
}
template <class T>
- void store (const casa::DirectionCoordinate &dir, const casa::Matrix<T> &data,
+ void store (const casacore::DirectionCoordinate &dir, const casacore::Matrix<T> &data,
const string &name)
{
//cout<<"Saving... "<<name<<endl;
- casa::Vector<casa::Int> stokes(1);
- stokes(0) = casa::Stokes::I;
- casa::CoordinateSystem csys;
+ casacore::Vector<casacore::Int> stokes(1);
+ stokes(0) = casacore::Stokes::I;
+ casacore::CoordinateSystem csys;
csys.addCoordinate(dir);
- csys.addCoordinate(casa::StokesCoordinate(stokes));
- csys.addCoordinate(casa::SpectralCoordinate(casa::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
- casa::PagedImage<T> im(casa::TiledShape(casa::IPosition(4, data.shape()(0), data.shape()(1), 1, 1)), csys, name);
- im.putSlice(data, casa::IPosition(4, 0, 0, 0, 0));
+ csys.addCoordinate(casacore::StokesCoordinate(stokes));
+ csys.addCoordinate(casacore::SpectralCoordinate(casacore::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
+ casacore::PagedImage<T> im(casacore::TiledShape(casacore::IPosition(4, data.shape()(0), data.shape()(1), 1, 1)), csys, name);
+ im.putSlice(data, casacore::IPosition(4, 0, 0, 0, 0));
}
template <class T>
- void store(const casa::Cube<T> &data, const string &name)
+ void store(const casacore::Cube<T> &data, const string &name)
{
- casa::Matrix<casa::Double> xform(2, 2);
+ casacore::Matrix<casacore::Double> xform(2, 2);
xform = 0.0;
xform.diagonal() = 1.0;
- casa::Quantum<casa::Double> incLon((8.0 / data.shape()(0)) * casa::C::pi / 180.0, "rad");
- casa::Quantum<casa::Double> incLat((8.0 / data.shape()(1)) * casa::C::pi / 180.0, "rad");
- casa::Quantum<casa::Double> refLatLon(45.0 * casa::C::pi / 180.0, "rad");
- casa::DirectionCoordinate dir(casa::MDirection::J2000, casa::Projection(casa::Projection::SIN),
+ casacore::Quantum<casacore::Double> incLon((8.0 / data.shape()(0)) * casacore::C::pi / 180.0, "rad");
+ casacore::Quantum<casacore::Double> incLat((8.0 / data.shape()(1)) * casacore::C::pi / 180.0, "rad");
+ casacore::Quantum<casacore::Double> refLatLon(45.0 * casacore::C::pi / 180.0, "rad");
+ casacore::DirectionCoordinate dir(casacore::MDirection::J2000, casacore::Projection(casacore::Projection::SIN),
refLatLon, refLatLon, incLon, incLat,
xform, data.shape()(0) / 2, data.shape()(1) / 2);
store(dir, data, name);
}
template <class T>
- void store(const casa::DirectionCoordinate &dir, const casa::Cube<T> &data,
+ void store(const casacore::DirectionCoordinate &dir, const casacore::Cube<T> &data,
const string &name)
{
// AlwaysAssert(data.shape()(2) == 4, SynthesisError);
//cout<<"Saving... "<<name<<endl;
- casa::Vector<casa::Int> stokes(4);
- stokes(0) = casa::Stokes::XX;
- stokes(1) = casa::Stokes::XY;
- stokes(2) = casa::Stokes::YX;
- stokes(3) = casa::Stokes::YY;
- casa::CoordinateSystem csys;
+ casacore::Vector<casacore::Int> stokes(4);
+ stokes(0) = casacore::Stokes::XX;
+ stokes(1) = casacore::Stokes::XY;
+ stokes(2) = casacore::Stokes::YX;
+ stokes(3) = casacore::Stokes::YY;
+ casacore::CoordinateSystem csys;
csys.addCoordinate(dir);
- csys.addCoordinate(casa::StokesCoordinate(stokes));
- csys.addCoordinate(casa::SpectralCoordinate(casa::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
- casa::PagedImage<T>
- im(casa::TiledShape(casa::IPosition(4, data.shape()(0), data.shape()(1), 4, 1)),
+ csys.addCoordinate(casacore::StokesCoordinate(stokes));
+ csys.addCoordinate(casacore::SpectralCoordinate(casacore::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
+ casacore::PagedImage<T>
+ im(casacore::TiledShape(casacore::IPosition(4, data.shape()(0), data.shape()(1), 4, 1)),
csys, name);
- im.putSlice(data, casa::IPosition(4, 0, 0, 0, 0));
+ im.putSlice(data, casacore::IPosition(4, 0, 0, 0, 0));
}
} //# end namespace LOFAR
diff --git a/CEP/Imager/AWImager2/include/AWImager2/CubeSkyEquation.h b/CEP/Imager/AWImager2/include/AWImager2/CubeSkyEquation.h
index ba355cd7e1bbe24baed9a7c1f50f23d68285d82f..488a2d4833f8ea2f4c5e1649d5e76bf0e34c7b45 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/CubeSkyEquation.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/CubeSkyEquation.h
@@ -33,7 +33,7 @@
//Forward
-namespace casa {
+namespace casacore {
class ROVisibilityIterator;
template <class T> class ImageInterface;
template <class T> class TempImage;
@@ -47,100 +47,100 @@ namespace LofarFT { //# NAMESPACE LOFAR - BEGIN
class VisibilityIterator;
class VisBuffer;
-class CubeSkyEquation : public casa::SkyEquation {
+class CubeSkyEquation : public casacore::SkyEquation {
public:
CubeSkyEquation(
- casa::SkyModel& sm,
- casa::VisSet& vs,
- casa::FTMachine& ft,
- casa::ComponentFTMachine& cft,
- casa::Bool noModelCol = casa::False);
+ casacore::SkyModel& sm,
+ casacore::VisSet& vs,
+ casacore::FTMachine& ft,
+ casacore::ComponentFTMachine& cft,
+ casacore::Bool noModelCol = casacore::False);
//Read only iterator...hence no scratch col
CubeSkyEquation(
- casa::SkyModel& sm,
+ casacore::SkyModel& sm,
VisibilityIterator& vi,
- casa::FTMachine& ft,
- casa::ComponentFTMachine& cft,
- casa::Bool noModelCol = casa::False);
+ casacore::FTMachine& ft,
+ casacore::ComponentFTMachine& cft,
+ casacore::Bool noModelCol = casacore::False);
virtual ~CubeSkyEquation();
virtual void predict(
- casa::Bool incremental = casa::False,
- casa::MS::PredefinedColumns Type = casa::MS::MODEL_DATA);
+ casacore::Bool incremental = casacore::False,
+ casacore::MS::PredefinedColumns Type = casacore::MS::MODEL_DATA);
- virtual void gradientsChiSquared(casa::Bool incremental, casa::Bool commitModel=casa::False);
+ virtual void gradientsChiSquared(casacore::Bool incremental, casacore::Bool commitModel=casacore::False);
virtual void initializePutSlice(
const VisBuffer& vb,
- casa::Bool dopsf,
- casa::Int cubeSlice=0,
- casa::Int nCubeSlice=1);
+ casacore::Bool dopsf,
+ casacore::Int cubeSlice=0,
+ casacore::Int nCubeSlice=1);
- virtual void putSlice(VisBuffer& vb, casa::Bool dopsf,
- casa::FTMachine::Type col, casa::Int cubeSlice=0,
- casa::Int nCubeSlice=1);
- virtual void finalizePutSlice(const VisBuffer& vb, casa::Bool dopsf,
- casa::Int cubeSlice=0, casa::Int nCubeSlice=1);
- void initializeGetSlice(const VisBuffer& vb, casa::Int row,
- casa::Bool incremental, casa::Int cubeSlice=0,
- casa::Int nCubeSlice=1);
+ virtual void putSlice(VisBuffer& vb, casacore::Bool dopsf,
+ casacore::FTMachine::Type col, casacore::Int cubeSlice=0,
+ casacore::Int nCubeSlice=1);
+ virtual void finalizePutSlice(const VisBuffer& vb, casacore::Bool dopsf,
+ casacore::Int cubeSlice=0, casacore::Int nCubeSlice=1);
+ void initializeGetSlice(const VisBuffer& vb, casacore::Int row,
+ casacore::Bool incremental, casacore::Int cubeSlice=0,
+ casacore::Int nCubeSlice=1);
virtual VisBuffer& getSlice(VisBuffer& vb,
- casa::Bool incremental, casa::Int cubeSlice=0,
- casa::Int nCubeSlice=1);
+ casacore::Bool incremental, casacore::Int cubeSlice=0,
+ casacore::Int nCubeSlice=1);
void finalizeGetSlice();
- void isLargeCube(casa::ImageInterface<casa::Complex>& theIm, casa::Int& nCubeSlice);
+ void isLargeCube(casacore::ImageInterface<casacore::Complex>& theIm, casacore::Int& nCubeSlice);
//void makeApproxPSF(Int model, ImageInterface<Float>& psf);
//virtual void makeApproxPSF(Int model, ImageInterface<Float>& psf);
- void makeApproxPSF(casa::PtrBlock<casa::ImageInterface<casa::Float> * >& psfs);
+ void makeApproxPSF(casacore::PtrBlock<casacore::ImageInterface<casacore::Float> * >& psfs);
//Get the flux scale that the ftmachines have if they have
- virtual void getCoverageImage(casa::Int model, casa::ImageInterface<casa::Float>& im);
+ virtual void getCoverageImage(casacore::Int model, casacore::ImageInterface<casacore::Float>& im);
//get the weight image from the ftmachines
- virtual void getWeightImage(const casa::Int model, casa::ImageInterface<casa::Float>& weightim);
- void tmpWBNormalizeImage(casa::Bool& dopsf, const casa::Float& pbLimit);
+ virtual void getWeightImage(const casacore::Int model, casacore::ImageInterface<casacore::Float>& weightim);
+ void tmpWBNormalizeImage(casacore::Bool& dopsf, const casacore::Float& pbLimit);
protected:
//Different versions of psf making
- void makeSimplePSF(casa::PtrBlock<casa::ImageInterface<casa::Float> * >& psfs);
- void makeMosaicPSF(casa::PtrBlock<casa::ImageInterface<casa::Float> * >& psfs);
+ void makeSimplePSF(casacore::PtrBlock<casacore::ImageInterface<casacore::Float> * >& psfs);
+ void makeMosaicPSF(casacore::PtrBlock<casacore::ImageInterface<casacore::Float> * >& psfs);
virtual void fixImageScale();
- casa::Block<casa::CountedPtr<casa::ImageInterface<casa::Complex> > >imGetSlice_p;
- casa::Block<casa::CountedPtr<casa::ImageInterface<casa::Complex> > >imPutSlice_p;
- casa::Block<casa::Matrix<casa::Float> >weightSlice_p;
- casa::Slicer sl_p;
- casa::Int nchanPerSlice_p;
+ casacore::Block<casacore::CountedPtr<casacore::ImageInterface<casacore::Complex> > >imGetSlice_p;
+ casacore::Block<casacore::CountedPtr<casacore::ImageInterface<casacore::Complex> > >imPutSlice_p;
+ casacore::Block<casacore::Matrix<casacore::Float> >weightSlice_p;
+ casacore::Slicer sl_p;
+ casacore::Int nchanPerSlice_p;
// Type of copy
// 0 => a independent image just with coordinates gotten from cImage
// 1 => a subImage referencing cImage ...no image copy
- void sliceCube(casa::CountedPtr<casa::ImageInterface<casa::Complex> >& slice, casa::Int model, casa::Int cubeSlice, casa::Int nCubeSlice, casa::Int typeOfCopy=0);
- void sliceCube(casa::SubImage<casa::Float>*& slice, casa::ImageInterface<casa::Float>& image, casa::Int cubeSlice, casa::Int nCubeSlice);
+ void sliceCube(casacore::CountedPtr<casacore::ImageInterface<casacore::Complex> >& slice, casacore::Int model, casacore::Int cubeSlice, casacore::Int nCubeSlice, casacore::Int typeOfCopy=0);
+ void sliceCube(casacore::SubImage<casacore::Float>*& slice, casacore::ImageInterface<casacore::Float>& image, casacore::Int cubeSlice, casacore::Int nCubeSlice);
//frequency range from image
- casa::Bool getFreqRange(VisibilityIterator& vi, const casa::CoordinateSystem& coords,
- casa::Int slice, casa::Int nslice);
+ casacore::Bool getFreqRange(VisibilityIterator& vi, const casacore::CoordinateSystem& coords,
+ casacore::Int slice, casacore::Int nslice);
- casa::Bool isNewFTM(casa::FTMachine *);
+ casacore::Bool isNewFTM(casacore::FTMachine *);
private:
// if skyjones changed in get or put we need to tell put or get respectively
// about it
- void init(casa::FTMachine& ft);
+ void init(casacore::FTMachine& ft);
- casa::Bool destroyVisibilityIterator_p;
+ casacore::Bool destroyVisibilityIterator_p;
- casa::Bool internalChangesPut_p;
- casa::Bool internalChangesGet_p;
- casa::Bool firstOneChangesPut_p;
- casa::Bool firstOneChangesGet_p;
+ casacore::Bool internalChangesPut_p;
+ casacore::Bool internalChangesGet_p;
+ casacore::Bool firstOneChangesPut_p;
+ casacore::Bool firstOneChangesGet_p;
- casa::Block< casa::Vector<casa::Int> >blockNumChanGroup_p, blockChanStart_p;
- casa::Block< casa::Vector<casa::Int> > blockChanWidth_p, blockChanInc_p;
- casa::Block<casa::Vector<casa::Int> > blockSpw_p;
- casa::Block<casa::CountedPtr<casa::FTMachine> > ftm_p;
- casa::Block<casa::CountedPtr<casa::FTMachine> > iftm_p;
+ casacore::Block< casacore::Vector<casacore::Int> >blockNumChanGroup_p, blockChanStart_p;
+ casacore::Block< casacore::Vector<casacore::Int> > blockChanWidth_p, blockChanInc_p;
+ casacore::Block<casacore::Vector<casacore::Int> > blockSpw_p;
+ casacore::Block<casacore::CountedPtr<casacore::FTMachine> > ftm_p;
+ casacore::Block<casacore::CountedPtr<casacore::FTMachine> > iftm_p;
VisibilityIterator * rvi_p;
VisibilityIterator * wvi_p;
diff --git a/CEP/Imager/AWImager2/include/AWImager2/DynamicObjectFactory.h b/CEP/Imager/AWImager2/include/AWImager2/DynamicObjectFactory.h
index 9510b660717071b757e0640d2840eef521382ffb..d5578d81483cbab8ad9dc5cde50e0050a72d26be 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/DynamicObjectFactory.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/DynamicObjectFactory.h
@@ -152,7 +152,7 @@ namespace LOFAR
template<typename Derived>
bool registerClass(const string& id)
{
- casa::ScopedMutexLock lock(itsMutex);
+ casacore::ScopedMutexLock lock(itsMutex);
return itsCreatorMap.insert(value_type(id, static_cast<CreatorFunc>(&doCreate<Derived>))).second;
}
@@ -161,7 +161,7 @@ namespace LOFAR
// \return \c true if deregistration was successful; otherwise \c false.
bool unregisterClass(const string& id)
{
- casa::ScopedMutexLock lock(itsMutex);
+ casacore::ScopedMutexLock lock(itsMutex);
return (itsCreatorMap.erase(id));
}
@@ -169,7 +169,7 @@ namespace LOFAR
// classes.
vector<string> registeredClassIds()
{
- casa::ScopedMutexLock lock(itsMutex);
+ casacore::ScopedMutexLock lock(itsMutex);
vector<string> ids;
const_iterator end = itsCreatorMap.end();
for (const_iterator it = itsCreatorMap.begin(); it != end; ++it) {
@@ -182,7 +182,7 @@ namespace LOFAR
// If \a id is not found in \c itsCreatorMap a null pointer is returned.
Base* create(string id BOOST_PP_ENUM_TRAILING_BINARY_PARAMS(n, A, a))
{
- casa::ScopedMutexLock lock(itsMutex);
+ casacore::ScopedMutexLock lock(itsMutex);
const_iterator iter = itsCreatorMap.find(id);
if (iter != itsCreatorMap.end())
{
@@ -192,10 +192,10 @@ namespace LOFAR
{
// try to load dynamical library
- casa::String libname(id);
+ casacore::String libname(id);
libname.downcase();
LOG_DEBUG_STR("Trying to load dynamic library " << libname << "...");
- casa::DynLib dl(libname, string(""), string(""), casa::False);
+ casacore::DynLib dl(libname, string(""), string(""), casacore::False);
if (dl.getHandle())
{
LOG_DEBUG_STR("Loading dynamic library " << libname << " was successful");
@@ -219,7 +219,7 @@ namespace LOFAR
// Map binding the unique class id and its creator function.
CreatorMap itsCreatorMap;
string itsRegisterFunctionName;
- casa::Mutex itsMutex;
+ casacore::Mutex itsMutex;
// Return a pointer to a new instance of class \c Derived. This is the
// method that's being registered as the creator function when a class of
diff --git a/CEP/Imager/AWImager2/include/AWImager2/FFTCMatrix.h b/CEP/Imager/AWImager2/include/AWImager2/FFTCMatrix.h
index 8525bc48fab24c065dd7cb3054b0a96936c19b6b..1c01b3f72d81627ca37748132fae97eaf8386dd1 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/FFTCMatrix.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/FFTCMatrix.h
@@ -153,12 +153,12 @@ namespace LOFAR {
unsigned flags=FFTW_ESTIMATE);
void init_padding(size_t n, int padding);
- casa::Matrix<casa::Complex> padded_forward (casa::Matrix<casa::Complex> data,
+ casacore::Matrix<casacore::Complex> padded_forward (casacore::Matrix<casacore::Complex> data,
int padding,
int nthreads=1,
unsigned flags=FFTW_ESTIMATE);
- casa::Matrix<casa::Complex> padded_backward (casa::Matrix<casa::Complex> data,
+ casacore::Matrix<casacore::Complex> padded_backward (casacore::Matrix<casacore::Complex> data,
int padding,
int nthreads=1,
unsigned flags=FFTW_ESTIMATE);
diff --git a/CEP/Imager/AWImager2/include/AWImager2/FTMachine.h b/CEP/Imager/AWImager2/include/AWImager2/FTMachine.h
index c5ec92f841777b046f29e2cf72ad4a127c890174..469eb30fcc8d3dba89dabb816afdbb420a89069e 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/FTMachine.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/FTMachine.h
@@ -57,7 +57,7 @@ namespace LofarFT {
-class FTMachine : public casa::FTMachine {
+class FTMachine : public casacore::FTMachine {
public:
// Constructor: cachesize is the size of the cache in words
@@ -80,7 +80,7 @@ public:
};
FTMachine(
- const casa::MeasurementSet& ms,
+ const casacore::MeasurementSet& ms,
const LOFAR::ParameterSet& parset);
// Copy constructor
@@ -93,8 +93,8 @@ public:
virtual FTMachine* clone() const = 0;
// Clone
- // casa::FTMachine declares the virtual clone method as cloneFTM
- virtual casa::FTMachine* cloneFTM() {return clone();}
+ // casacore::FTMachine declares the virtual clone method as cloneFTM
+ virtual casacore::FTMachine* cloneFTM() {return clone();}
~FTMachine();
@@ -105,8 +105,8 @@ public:
// Initialize transform to Visibility plane using the image
// as a template. The image is loaded and Fourier transformed.
virtual void initializeToVis(
- casa::PtrBlock<casa::ImageInterface<casa::Float>* > &model_images,
- casa::Bool normalize);
+ casacore::PtrBlock<casacore::ImageInterface<casacore::Float>* > &model_images,
+ casacore::Bool normalize);
// Finalize transform to Visibility plane: flushes the image
// cache and shows statistics if it is being used.
@@ -115,8 +115,8 @@ public:
// Initialize transform to Sky plane: initializes the image
virtual void initializeToSky(
- casa::PtrBlock<casa::ImageInterface<casa::Float>* > &images,
- casa::Bool doPSF);
+ casacore::PtrBlock<casacore::ImageInterface<casacore::Float>* > &images,
+ casacore::Bool doPSF);
// Finalize transform to Sky plane: flushes the image
// cache and shows statistics if it is being used.
@@ -124,57 +124,57 @@ public:
virtual void finalizeToSky();
virtual void initializeResidual(
- casa::PtrBlock<casa::ImageInterface<casa::Float>* > model_images,
- casa::PtrBlock<casa::ImageInterface<casa::Float>* > images,
- casa::Bool normalize);
+ casacore::PtrBlock<casacore::ImageInterface<casacore::Float>* > model_images,
+ casacore::PtrBlock<casacore::ImageInterface<casacore::Float>* > images,
+ casacore::Bool normalize);
virtual void finalizeResidual();
- virtual void get(casa::VisBuffer& vb, casa::Int row=-1);
- virtual void get(VisBuffer& vb, casa::Int row=-1)=0;
+ virtual void get(casacore::VisBuffer& vb, casacore::Int row=-1);
+ virtual void get(VisBuffer& vb, casacore::Int row=-1)=0;
virtual void put(
- const casa::VisBuffer& vb,
- casa::Int row = -1,
- casa::Bool dopsf = casa::False,
- casa::FTMachine::Type type = casa::FTMachine::OBSERVED);
+ const casacore::VisBuffer& vb,
+ casacore::Int row = -1,
+ casacore::Bool dopsf = casacore::False,
+ casacore::FTMachine::Type type = casacore::FTMachine::OBSERVED);
virtual void put(
const VisBuffer& vb,
- casa::Int row = -1,
- casa::Bool dopsf = casa::False,
- casa::FTMachine::Type type = casa::FTMachine::OBSERVED)=0;
+ casacore::Int row = -1,
+ casacore::Bool dopsf = casacore::False,
+ casacore::FTMachine::Type type = casacore::FTMachine::OBSERVED)=0;
virtual void residual(
VisBuffer& vb,
- casa::Int row = -1,
- casa::FTMachine::Type type = casa::FTMachine::OBSERVED);
+ casacore::Int row = -1,
+ casacore::FTMachine::Type type = casacore::FTMachine::OBSERVED);
// Make the entire image
- using casa::FTMachine::makeImage;
+ using casacore::FTMachine::makeImage;
void makeImage(
- casa::FTMachine::Type type,
- casa::ROVisibilityIterator& vi,
- casa::ImageInterface<casa::Float>& image,
- casa::Matrix<casa::Float>& weight);
+ casacore::FTMachine::Type type,
+ casacore::ROVisibilityIterator& vi,
+ casacore::ImageInterface<casacore::Float>& image,
+ casacore::Matrix<casacore::Float>& weight);
// Get the final image: do the Fourier transform and
// grid-correct, then optionally normalize by the summed weights
virtual void getImages(
- casa::Matrix<casa::Float>& weights,
- casa::Bool normalize);
+ casacore::Matrix<casacore::Float>& weights,
+ casacore::Bool normalize);
// Get the average primary beam.
- virtual casa::Matrix<casa::Float> getAveragePB();
+ virtual casacore::Matrix<casacore::Float> getAveragePB();
// Get the spheroidal cut.
- virtual casa::Matrix<casa::Float> getSpheroidal();
+ virtual casacore::Matrix<casacore::Float> getSpheroidal();
- inline virtual casa::Float pbFunc(
- const casa::Float& a,
- const casa::Float& limit)
+ inline virtual casacore::Float pbFunc(
+ const casacore::Float& a,
+ const casacore::Float& limit)
{
if (abs(a) >= limit)
{
@@ -186,9 +186,9 @@ public:
};
}
- inline virtual casa::Complex pbFunc(
- const casa::Complex& a,
- const casa::Float& limit)
+ inline virtual casacore::Complex pbFunc(
+ const casacore::Complex& a,
+ const casacore::Float& limit)
{
if (abs(a)>=limit)
{
@@ -196,166 +196,166 @@ public:
}
else
{
- return casa::Complex(1.0,0.0);
+ return casacore::Complex(1.0,0.0);
};
}
// Can this FTMachine be represented by Fourier convolutions?
- virtual casa::Bool isFourier()
+ virtual casacore::Bool isFourier()
{
- return casa::True;
+ return casacore::True;
}
- virtual void setMiscInfo(const casa::Int qualifier){(void)qualifier;};
+ virtual void setMiscInfo(const casacore::Int qualifier){(void)qualifier;};
- void getWeightImage(casa::ImageInterface<casa::Float>& weightImage, casa::Matrix<casa::Float>& weights);
+ void getWeightImage(casacore::ImageInterface<casacore::Float>& weightImage, casacore::Matrix<casacore::Float>& weights);
// pure virtual functions that we do not use,
// implementation only throws a not implemented exception
- virtual void initializeToVis(casa::ImageInterface<casa::Complex>& image, const casa::VisBuffer& vb);
- virtual void initializeToSky(casa::ImageInterface<casa::Complex>& image, casa::Matrix<casa::Float>& weight, const casa::VisBuffer& vb);
+ virtual void initializeToVis(casacore::ImageInterface<casacore::Complex>& image, const casacore::VisBuffer& vb);
+ virtual void initializeToSky(casacore::ImageInterface<casacore::Complex>& image, casacore::Matrix<casacore::Float>& weight, const casacore::VisBuffer& vb);
- virtual casa::ImageInterface<casa::Complex>& getImage(
- casa::Matrix<casa::Float>&,
- casa::Bool normalize = casa::True);
+ virtual casacore::ImageInterface<casacore::Complex>& getImage(
+ casacore::Matrix<casacore::Float>&,
+ casacore::Bool normalize = casacore::True);
virtual void ComputeResiduals(
- casa::VisBuffer&vb,
- casa::Bool useCorrected);
+ casacore::VisBuffer&vb,
+ casacore::Bool useCorrected);
protected:
- virtual void initialize_model_grids(casa::Bool normalize);
+ virtual void initialize_model_grids(casacore::Bool normalize);
void finalize_model_grids();
void initialize_grids();
- void normalize(casa::ImageInterface<casa::Complex> &image, casa::Bool normalize, casa::Bool spheroidal);
+ void normalize(casacore::ImageInterface<casacore::Complex> &image, casacore::Bool normalize, casacore::Bool spheroidal);
- casa::StokesCoordinate get_stokes_coordinates();
+ casacore::StokesCoordinate get_stokes_coordinates();
// the images and model images are owned by SkyModel
// can use a raw pointer here
- casa::PtrBlock<casa::ImageInterface<casa::Float> *> itsModelImages;
- casa::PtrBlock<casa::ImageInterface<casa::Float>*> itsImages;
+ casacore::PtrBlock<casacore::ImageInterface<casacore::Float> *> itsModelImages;
+ casacore::PtrBlock<casacore::ImageInterface<casacore::Float>*> itsImages;
// the complex images and complex model images are created locally
// use a counted pointer to ensure proper desctruction
- casa::Block<casa::CountedPtr<casa::ImageInterface<casa::Complex> > > itsComplexModelImages;
- casa::Block<casa::CountedPtr<casa::ImageInterface<casa::Complex> > > itsComplexImages;
+ casacore::Block<casacore::CountedPtr<casacore::ImageInterface<casacore::Complex> > > itsComplexModelImages;
+ casacore::Block<casacore::CountedPtr<casacore::ImageInterface<casacore::Complex> > > itsComplexImages;
- casa::Block<casa::Array<casa::Complex> > itsModelGrids;
+ casacore::Block<casacore::Array<casacore::Complex> > itsModelGrids;
// Arrays for non-tiled gridding (one per thread).
- vector< casa::Array<casa::Complex> > itsGriddedData;
- vector< casa::Array<casa::DComplex> > itsGriddedData2;
+ vector< casacore::Array<casacore::Complex> > itsGriddedData;
+ vector< casacore::Array<casacore::DComplex> > itsGriddedData2;
domain itsGriddedDataDomain;
- casa::Bool itsNormalizeModel;
- casa::Int itsNX;
- casa::Int itsNY;
- casa::Int itsPaddedNX;
- casa::Int itsPaddedNY;
- casa::Int itsNPol;
- casa::Int itsNChan;
+ casacore::Bool itsNormalizeModel;
+ casacore::Int itsNX;
+ casacore::Int itsNY;
+ casacore::Int itsPaddedNX;
+ casacore::Int itsPaddedNY;
+ casacore::Int itsNPol;
+ casacore::Int itsNChan;
- casa::Bool itsUseDoubleGrid;
- casa::Vector<casa::Int> itsChanMap;
- casa::Vector<casa::Int> itsPolMap;
+ casacore::Bool itsUseDoubleGrid;
+ casacore::Vector<casacore::Int> itsChanMap;
+ casacore::Vector<casacore::Int> itsPolMap;
// Padding in FFT
- casa::Float itsPadding;
+ casacore::Float itsPadding;
void ok();
- void init(const casa::ImageInterface<casa::Float> &image);
+ void init(const casacore::ImageInterface<casacore::Float> &image);
// Is this record on Grid? check both ends. This assumes that the
// ends bracket the middle
- casa::Bool recordOnGrid(const casa::VisBuffer& vb, casa::Int rownr) const;
+ casacore::Bool recordOnGrid(const casacore::VisBuffer& vb, casacore::Int rownr) const;
// Image cache
- casa::LatticeCache<casa::Complex> * itsImageCache;
+ casacore::LatticeCache<casacore::Complex> * itsImageCache;
- casa::CountedPtr<casa::Lattice<casa::Complex> > itsLattice;
+ casacore::CountedPtr<casacore::Lattice<casacore::Complex> > itsLattice;
- casa::String itsConvType;
+ casacore::String itsConvType;
- casa::Float itsMaxAbsData;
+ casacore::Float itsMaxAbsData;
// Useful IPositions
- casa::IPosition itsCenterLoc;
- casa::IPosition itsOffsetLoc;
+ casacore::IPosition itsCenterLoc;
+ casacore::IPosition itsOffsetLoc;
// Image Scaling and offset
- casa::Vector<casa::Double> itsUVScale;
- casa::Vector<casa::Double> itsUVOffset;
+ casacore::Vector<casacore::Double> itsUVScale;
+ casacore::Vector<casacore::Double> itsUVOffset;
- vector< casa::Matrix<casa::Complex> > itsSumPB;
- vector< casa::Matrix<casa::Double> > itsSumWeight;
+ vector< casacore::Matrix<casacore::Complex> > itsSumPB;
+ vector< casacore::Matrix<casacore::Double> > itsSumWeight;
vector< double > itsSumCFWeight;
- mutable casa::Matrix<casa::Float> itsAveragePB;
- mutable casa::Matrix<casa::Float> itsSpheroidal;
+ mutable casacore::Matrix<casacore::Float> itsAveragePB;
+ mutable casacore::Matrix<casacore::Float> itsSpheroidal;
- casa::Int itsPriorCacheSize;
+ casacore::Int itsPriorCacheSize;
//Check if using put that avoids non-necessary reads
- casa::Bool itsUsePut2;
+ casacore::Bool itsUsePut2;
LOFAR::ParameterSet itsParset;
//machine name
- casa::String itsMachineName;
+ casacore::String itsMachineName;
// Shape of the padded image
- casa::IPosition itsPaddedShape;
-
- casa::Int convSampling;
- casa::Float pbLimit_p;
- casa::Int sensitivityPatternQualifier_p;
- casa::String sensitivityPatternQualifierStr_p;
- casa::Vector<casa::Float> pbPeaks;
- casa::Bool pbNormalized_p;
+ casacore::IPosition itsPaddedShape;
+
+ casacore::Int convSampling;
+ casacore::Float pbLimit_p;
+ casacore::Int sensitivityPatternQualifier_p;
+ casacore::String sensitivityPatternQualifierStr_p;
+ casacore::Vector<casacore::Float> pbPeaks;
+ casacore::Bool pbNormalized_p;
// The average PB for sky image normalization
//
- casa::CountedPtr<casa::ImageInterface<casa::Float> > itsAvgPBImage;
- casa::CountedPtr<casa::ImageInterface<casa::Complex> > itsAvgPBSqImage;
+ casacore::CountedPtr<casacore::ImageInterface<casacore::Float> > itsAvgPBImage;
+ casacore::CountedPtr<casacore::ImageInterface<casacore::Complex> > itsAvgPBSqImage;
- casa::CountedPtr<VisResampler> itsVisResampler;
+ casacore::CountedPtr<VisResampler> itsVisResampler;
virtual VisResampler* visresampler() {return &*itsVisResampler;}
- casa::MeasurementSet itsMS;
- casa::Int itsNWPlanes;
+ casacore::MeasurementSet itsMS;
+ casacore::Int itsNWPlanes;
double itsWMax;
int itsNThread;
int itsNGrid;
- casa::CountedPtr<ConvolutionFunction> itsConvFunc;
- casa::Vector<casa::Int> itsConjCFMap;
- casa::Vector<casa::Int> itsCFMap;
- casa::String itsBeamPath;
+ casacore::CountedPtr<ConvolutionFunction> itsConvFunc;
+ casacore::Vector<casacore::Int> itsConjCFMap;
+ casacore::Vector<casacore::Int> itsCFMap;
+ casacore::String itsBeamPath;
int itsVerbose;
int itsMaxSupport;
- casa::Int itsOversample;
- casa::String itsImageName;
-// casa::Matrix<casa::Bool> itsGridMuellerMask;
-// casa::Matrix<casa::Bool> itsDegridMuellerMask;
+ casacore::Int itsOversample;
+ casacore::String itsImageName;
+// casacore::Matrix<casacore::Bool> itsGridMuellerMask;
+// casacore::Matrix<casacore::Bool> itsDegridMuellerMask;
double itsGriddingTime;
double itsDegriddingTime;
double itsCFTime;
- casa::PrecTimer itsTotalTimer;
+ casacore::PrecTimer itsTotalTimer;
};
// Factory that can be used to generate new FTMachine objects.
// The factory is defined as a singleton.
-typedef Singleton<DynamicObjectFactory<FTMachine*(const casa::MeasurementSet& ms, const ParameterSet& parset)> > FTMachineFactory;
+typedef Singleton<DynamicObjectFactory<FTMachine*(const casacore::MeasurementSet& ms, const ParameterSet& parset)> > FTMachineFactory;
} //# end namespace LofarFT
diff --git a/CEP/Imager/AWImager2/include/AWImager2/FTMachineIDG.h b/CEP/Imager/AWImager2/include/AWImager2/FTMachineIDG.h
index 15d727b75ef2de7a8e8118a21815a67ddf2c23ee..2c2bc8ad16bbe73d308dbeba93f7d0a8c6eb9830 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/FTMachineIDG.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/FTMachineIDG.h
@@ -40,10 +40,10 @@ class VisBuffer;
class FTMachineIDG : public FTMachine {
public:
- static const casa::String theirName;
+ static const casacore::String theirName;
FTMachineIDG(
- const casa::MeasurementSet& ms,
+ const casacore::MeasurementSet& ms,
const ParameterSet& parset);
virtual ~FTMachineIDG();
@@ -57,62 +57,62 @@ public:
// Clone
FTMachineIDG* clone() const;
- virtual casa::String name() const { return theirName;}
+ virtual casacore::String name() const { return theirName;}
- virtual casa::Matrix<casa::Float> getAveragePB();
-// virtual casa::Matrix<casa::Float> getSpheroidal();
+ virtual casacore::Matrix<casacore::Float> getAveragePB();
+// virtual casacore::Matrix<casacore::Float> getSpheroidal();
// Get actual coherence from grid by degridding
- virtual void get(VisBuffer& vb, casa::Int row=-1);
+ virtual void get(VisBuffer& vb, casacore::Int row=-1);
// Put coherence to grid by gridding.
virtual void put(
const VisBuffer& vb,
- casa::Int row = -1,
- casa::Bool dopsf = casa::False,
- casa::FTMachine::Type type = casa::FTMachine::OBSERVED);
+ casacore::Int row = -1,
+ casacore::Bool dopsf = casacore::False,
+ casacore::FTMachine::Type type = casacore::FTMachine::OBSERVED);
virtual void residual(
VisBuffer& vb,
- casa::Int row = -1,
- casa::FTMachine::Type type = casa::FTMachine::OBSERVED);
+ casacore::Int row = -1,
+ casacore::FTMachine::Type type = casacore::FTMachine::OBSERVED);
protected:
- virtual void initialize_model_grids(casa::Bool normalize);
+ virtual void initialize_model_grids(casacore::Bool normalize);
virtual void getput(
VisBuffer& vb,
- casa::Int row=-1,
- casa::Bool doget = casa::True,
- casa::Bool doput = casa::True,
- casa::Bool dopsf = casa::False,
- casa::FTMachine::Type type = casa::FTMachine::OBSERVED);
+ casacore::Int row=-1,
+ casacore::Bool doget = casacore::True,
+ casacore::Bool doput = casacore::True,
+ casacore::Bool dopsf = casacore::False,
+ casacore::FTMachine::Type type = casacore::FTMachine::OBSERVED);
- casa::CountedPtr<Xeon> itsProxy;
+ casacore::CountedPtr<Xeon> itsProxy;
// Get the appropriate data pointer
- casa::Array<casa::Complex>* getDataPointer(const casa::IPosition&, casa::Bool);
+ casacore::Array<casacore::Complex>* getDataPointer(const casacore::IPosition&, casacore::Bool);
// Gridder
- casa::String convType;
+ casacore::String convType;
- casa::Float maxAbsData;
+ casacore::Float maxAbsData;
// Useful IPositions
- casa::IPosition centerLoc;
- casa::IPosition offsetLoc;
+ casacore::IPosition centerLoc;
+ casacore::IPosition offsetLoc;
// Shape of the padded image
- casa::IPosition padded_shape;
+ casacore::IPosition padded_shape;
- casa::Int convSampling;
- casa::Float pbLimit_p;
+ casacore::Int convSampling;
+ casacore::Float pbLimit_p;
int itsNThread;
- casa::Int itsRefFreq;
- casa::Float itsTimeWindow;
+ casacore::Int itsRefFreq;
+ casacore::Float itsTimeWindow;
private:
diff --git a/CEP/Imager/AWImager2/include/AWImager2/FTMachineSimple.h b/CEP/Imager/AWImager2/include/AWImager2/FTMachineSimple.h
index 4eacf240e3df5231a03ae785cffab88887e58697..3a19ff9306c36f014e61f2822c8e621195fc423d 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/FTMachineSimple.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/FTMachineSimple.h
@@ -110,7 +110,7 @@ class VisBuffer;
class FTMachineSimple : public FTMachine {
public:
- static const casa::String theirName;
+ static const casacore::String theirName;
// Constructor: cachesize is the size of the cache in words
// (e.g. a few million is a good number), tilesize is the
@@ -125,12 +125,12 @@ public:
// LofarFTMachineOld(Long cachesize, Int tilesize, CountedPtr<VisibilityResamplerBase>& visResampler,
// String convType="SF", Float padding=1.0, Bool usezero=True, Bool useDoublePrec=False);
FTMachineSimple(
- const casa::MeasurementSet& ms,
-// casa::Int nwPlanes,
-// casa::MPosition mLocation,
-// casa::Float padding,
-// casa::Bool useDoublePrec,
- const casa::Record& parameters,
+ const casacore::MeasurementSet& ms,
+// casacore::Int nwPlanes,
+// casacore::MPosition mLocation,
+// casacore::Float padding,
+// casacore::Bool useDoublePrec,
+ const casacore::Record& parameters,
ParameterSet& parset);
virtual ~FTMachineSimple();
@@ -144,55 +144,55 @@ public:
// Clone
FTMachineSimple* clone() const;
- virtual casa::String name() const { return theirName;}
+ virtual casacore::String name() const { return theirName;}
// Get actual coherence from grid by degridding
- virtual void get(casa::VisBuffer& vb, casa::Int row=-1);
- virtual void get(VisBuffer& vb, casa::Int row=-1);
+ virtual void get(casacore::VisBuffer& vb, casacore::Int row=-1);
+ virtual void get(VisBuffer& vb, casacore::Int row=-1);
// Put coherence to grid by gridding.
- using casa::FTMachine::put;
+ using casacore::FTMachine::put;
virtual void put(
- const casa::VisBuffer& vb,
- casa::Int row = -1,
- casa::Bool dopsf = casa::False,
- casa::FTMachine::Type type = casa::FTMachine::OBSERVED);
+ const casacore::VisBuffer& vb,
+ casacore::Int row = -1,
+ casacore::Bool dopsf = casacore::False,
+ casacore::FTMachine::Type type = casacore::FTMachine::OBSERVED);
virtual void put(
const VisBuffer& vb,
- casa::Int row = -1,
- casa::Bool dopsf = casa::False,
- casa::FTMachine::Type type = casa::FTMachine::OBSERVED);
+ casacore::Int row = -1,
+ casacore::Bool dopsf = casacore::False,
+ casacore::FTMachine::Type type = casacore::FTMachine::OBSERVED);
// Finalize transform to Sky plane: flushes the image
// cache and shows statistics if it is being used. DOES NOT
// DO THE FINAL TRANSFORM!
- using casa::FTMachine::finalizeToSky;
+ using casacore::FTMachine::finalizeToSky;
virtual void finalizeToSky() {};
protected:
// Get the appropriate data pointer
- casa::Array<casa::Complex>* getDataPointer(const casa::IPosition&, casa::Bool);
+ casacore::Array<casacore::Complex>* getDataPointer(const casacore::IPosition&, casacore::Bool);
// Gridder
- casa::String convType;
+ casacore::String convType;
- casa::Float maxAbsData;
+ casacore::Float maxAbsData;
// Useful IPositions
- casa::IPosition centerLoc;
- casa::IPosition offsetLoc;
+ casacore::IPosition centerLoc;
+ casacore::IPosition offsetLoc;
// Arrays for non-tiled gridding (one per thread).
// Shape of the padded image
- casa::IPosition padded_shape;
+ casacore::IPosition padded_shape;
- casa::Int convSampling;
- casa::Float pbLimit_p;
+ casacore::Int convSampling;
+ casacore::Float pbLimit_p;
// The average PB for sky image normalization
//
int itsNThread;
diff --git a/CEP/Imager/AWImager2/include/AWImager2/FTMachineSimpleWB.h b/CEP/Imager/AWImager2/include/AWImager2/FTMachineSimpleWB.h
index 116fc31b30880b64d5ddc0aa01b95259f5d987d0..42def4adb9765289bf18a3200a852bd7490df037 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/FTMachineSimpleWB.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/FTMachineSimpleWB.h
@@ -111,7 +111,7 @@ class VisBuffer;
class FTMachineSimpleWB : public FTMachine {
public:
- static const casa::String theirName;
+ static const casacore::String theirName;
// Constructor: cachesize is the size of the cache in words
// (e.g. a few million is a good number), tilesize is the
@@ -126,11 +126,11 @@ public:
// LofarFTMachineOld(Long cachesize, Int tilesize, CountedPtr<VisibilityResamplerBase>& visResampler,
// String convType="SF", Float padding=1.0, Bool usezero=True, Bool useDoublePrec=False);
FTMachineSimpleWB(
- const casa::MeasurementSet& ms,
-// casa::Int nwPlanes,
-// casa::MPosition mLocation,
-// casa::Float padding,
-// casa::Bool useDoublePrec,
+ const casacore::MeasurementSet& ms,
+// casacore::Int nwPlanes,
+// casacore::MPosition mLocation,
+// casacore::Float padding,
+// casacore::Bool useDoublePrec,
LOFAR::ParameterSet& parset);
virtual ~FTMachineSimpleWB();
@@ -144,55 +144,55 @@ public:
// Clone
FTMachineSimpleWB* clone() const;
- virtual casa::String name() const { return theirName;}
+ virtual casacore::String name() const { return theirName;}
// Get actual coherence from grid by degridding
- virtual void get(casa::VisBuffer& vb, casa::Int row=-1);
- virtual void get(VisBuffer& vb, casa::Int row=-1);
+ virtual void get(casacore::VisBuffer& vb, casacore::Int row=-1);
+ virtual void get(VisBuffer& vb, casacore::Int row=-1);
// Put coherence to grid by gridding.
- using casa::FTMachine::put;
+ using casacore::FTMachine::put;
virtual void put(
- const casa::VisBuffer& vb,
- casa::Int row = -1,
- casa::Bool dopsf = casa::False,
- casa::FTMachine::Type type = casa::FTMachine::OBSERVED);
+ const casacore::VisBuffer& vb,
+ casacore::Int row = -1,
+ casacore::Bool dopsf = casacore::False,
+ casacore::FTMachine::Type type = casacore::FTMachine::OBSERVED);
virtual void put(
const VisBuffer& vb,
- casa::Int row = -1,
- casa::Bool dopsf = casa::False,
- casa::FTMachine::Type type = casa::FTMachine::OBSERVED);
+ casacore::Int row = -1,
+ casacore::Bool dopsf = casacore::False,
+ casacore::FTMachine::Type type = casacore::FTMachine::OBSERVED);
protected:
// Get the appropriate data pointer
- casa::Array<casa::Complex>* getDataPointer(const casa::IPosition&, casa::Bool);
+ casacore::Array<casacore::Complex>* getDataPointer(const casacore::IPosition&, casacore::Bool);
// Gridder
- casa::String convType;
+ casacore::String convType;
- casa::Float maxAbsData;
+ casacore::Float maxAbsData;
// Useful IPositions
- casa::IPosition centerLoc;
- casa::IPosition offsetLoc;
+ casacore::IPosition centerLoc;
+ casacore::IPosition offsetLoc;
// Arrays for non-tiled gridding (one per thread).
// Shape of the padded image
- casa::IPosition padded_shape;
+ casacore::IPosition padded_shape;
- casa::Int convSampling;
- casa::Float pbLimit_p;
+ casacore::Int convSampling;
+ casacore::Float pbLimit_p;
// The average PB for sky image normalization
//
int itsNThread;
- casa::Int itsRefFreq;
+ casacore::Int itsRefFreq;
- casa::CountedPtr<VisResamplerWB> itsVisResampler;
+ casacore::CountedPtr<VisResamplerWB> itsVisResampler;
virtual VisResampler* visresampler() {return &*itsVisResampler;}
diff --git a/CEP/Imager/AWImager2/include/AWImager2/FTMachineSplitBeam.h b/CEP/Imager/AWImager2/include/AWImager2/FTMachineSplitBeam.h
index b53dfdf1c3e550cbce97d431be444166f5bfa5a0..1554786f8c8df0a9d9857dc4adf9b34a2182ef73 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/FTMachineSplitBeam.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/FTMachineSplitBeam.h
@@ -50,7 +50,7 @@
namespace LOFAR {
-class FTMachineWsplit : public casa::FTMachine {
+class FTMachineWsplit : public casacore::FTMachine {
public:
// Constructor: cachesize is the size of the cache in words
@@ -63,40 +63,40 @@ public:
// mTangent is specified then the uvw rotation is done for
// that location iso the image center.
// <group>
-// FTMachineWsplit(casa::Long cachesize, casa::Int tilesize, casa::CountedPtr<VisibilityResamplerBase>& visResampler,
-// casa::String convType="SF", casa::Float padding=1.0, casa::Bool usezero=casa::True, casa::Bool useDoublePrec=casa::False);
+// FTMachineWsplit(casacore::Long cachesize, casacore::Int tilesize, casacore::CountedPtr<VisibilityResamplerBase>& visResampler,
+// casacore::String convType="SF", casacore::Float padding=1.0, casacore::Bool usezero=casacore::True, casacore::Bool useDoublePrec=casacore::False);
FTMachineWsplit(
- casa::Long cachesize,
- casa::Int tilesize,
- casa::CountedPtr<casa::VisibilityResamplerBase>& visResampler,
- casa::String convType,
- const casa::MeasurementSet& ms,
- casa::Int nwPlanes,
- casa::MPosition mLocation,
- casa::Float padding,
- casa::Bool usezero,
- casa::Bool useDoublePrec,
+ casacore::Long cachesize,
+ casacore::Int tilesize,
+ casacore::CountedPtr<casacore::VisibilityResamplerBase>& visResampler,
+ casacore::String convType,
+ const casacore::MeasurementSet& ms,
+ casacore::Int nwPlanes,
+ casacore::MPosition mLocation,
+ casacore::Float padding,
+ casacore::Bool usezero,
+ casacore::Bool useDoublePrec,
double wmax,
- casa::Int verbose,
- casa::Int maxsupport,
- casa::Int oversample,
- const casa::String& imageName,
- const casa::Matrix<casa::Bool>& gridMuellerMask,
- const casa::Matrix<casa::Bool>& degridMuellerMask,
- casa::Double refFreq,
- casa::Bool use_Linear_Interp_Gridder,
- casa::Bool use_EJones,
+ casacore::Int verbose,
+ casacore::Int maxsupport,
+ casacore::Int oversample,
+ const casacore::String& imageName,
+ const casacore::Matrix<casacore::Bool>& gridMuellerMask,
+ const casacore::Matrix<casacore::Bool>& degridMuellerMask,
+ casacore::Double refFreq,
+ casacore::Bool use_Linear_Interp_Gridder,
+ casacore::Bool use_EJones,
int stepApplyElement,
int applyBeamCode,
- casa::Double pbCut,
- casa::Bool predictFT,
- casa::String psfOnDisk,
- casa::Bool useMasksDegrid,
- casa::Bool reallyDoPSF,
- casa::Double uvMin,
- casa::Double uvMax,
- casa::Bool makeDirtyCorr,
- const casa::Record& parameters,
+ casacore::Double pbCut,
+ casacore::Bool predictFT,
+ casacore::String psfOnDisk,
+ casacore::Bool useMasksDegrid,
+ casacore::Bool reallyDoPSF,
+ casacore::Double uvMin,
+ casacore::Double uvMax,
+ casacore::Bool makeDirtyCorr,
+ const casacore::Record& parameters,
LOFAR::ParameterSet& parset);//,
// Copy constructor
@@ -111,7 +111,7 @@ public:
~FTMachineWsplit();
- virtual casa::String name() const { return "FTMachineWsplit";};
+ virtual casacore::String name() const { return "FTMachineWsplit";};
// Show the relative timings of the various steps.
void showTimings (
@@ -121,44 +121,44 @@ public:
// Initialize transform to Visibility plane using the image
// as a template. The image is loaded and Fourier transformed.
void initializeToVis(
- casa::ImageInterface<casa::Complex>& image,
- const casa::VisBuffer& vb);
+ casacore::ImageInterface<casacore::Complex>& image,
+ const casacore::VisBuffer& vb);
// Finalize transform to Visibility plane: flushes the image
// cache and shows statistics if it is being used.
void finalizeToVis();
void getSplitWplanes(
- casa::VisBuffer& vb,
- casa::Int row);
+ casacore::VisBuffer& vb,
+ casacore::Int row);
void getTraditional(
- casa::VisBuffer& vb,
- casa::Int row);
+ casacore::VisBuffer& vb,
+ casacore::Int row);
void putSplitWplanesOverlap(
- const casa::VisBuffer& vb,
- casa::Int row,
- casa::Bool dopsf,
+ const casacore::VisBuffer& vb,
+ casacore::Int row,
+ casacore::Bool dopsf,
FTMachine::Type type);
void putSplitWplanes(
- const casa::VisBuffer& vb,
- casa::Int row,
- casa::Bool dopsf,
+ const casacore::VisBuffer& vb,
+ casacore::Int row,
+ casacore::Bool dopsf,
FTMachine::Type type);
void putTraditional(
- const casa::VisBuffer& vb,
- casa::Int row,
- casa::Bool dopsf,
+ const casacore::VisBuffer& vb,
+ casacore::Int row,
+ casacore::Bool dopsf,
FTMachine::Type type);
// Initialize transform to Sky plane: initializes the image
void initializeToSky(
- casa::ImageInterface<casa::Complex>& image,
- casa::Matrix<casa::Float>& weight,
- const casa::VisBuffer& vb);
+ casacore::ImageInterface<casacore::Complex>& image,
+ casacore::Matrix<casacore::Float>& weight,
+ const casacore::VisBuffer& vb);
// Finalize transform to Sky plane: flushes the image
@@ -168,76 +168,76 @@ public:
// Get actual coherence from grid by degridding
void get(
- casa::VisBuffer& vb,
- casa::Int row=-1);
+ casacore::VisBuffer& vb,
+ casacore::Int row=-1);
// Put coherence to grid by gridding.
void put(
- const casa::VisBuffer& vb,
- casa::Int row=-1,
- casa::Bool dopsf=casa::False,
- casa::FTMachine::Type type = casa::FTMachine::OBSERVED);
+ const casacore::VisBuffer& vb,
+ casacore::Int row=-1,
+ casacore::Bool dopsf=casacore::False,
+ casacore::FTMachine::Type type = casacore::FTMachine::OBSERVED);
// Make the entire image
- void makeImage(casa::FTMachine::Type type,
- casa::VisSet& vs,
- casa::ImageInterface<casa::Complex>& image,
- casa::Matrix<casa::Float>& weight);
+ void makeImage(casacore::FTMachine::Type type,
+ casacore::VisSet& vs,
+ casacore::ImageInterface<casacore::Complex>& image,
+ casacore::Matrix<casacore::Float>& weight);
// Get the final image: do the Fourier transform and
// grid-correct, then optionally normalize by the summed weights
- casa::ImageInterface<casa::Complex>& getImage(casa::Matrix<casa::Float>&, casa::Bool normalize=casa::True);
+ casacore::ImageInterface<casacore::Complex>& getImage(casacore::Matrix<casacore::Float>&, casacore::Bool normalize=casacore::True);
// Get the average primary beam.
- virtual const casa::Matrix<casa::Float>& getAveragePB() const;
+ virtual const casacore::Matrix<casacore::Float>& getAveragePB() const;
// Get the spheroidal cut.
- const casa::Matrix<casa::Float>& getSpheroidCut() const
+ const casacore::Matrix<casacore::Float>& getSpheroidCut() const
{ return itsConvFunc->getSpheroidCut(); }
- /// virtual void normalizeImage(Lattice<casa::Complex>& skyImage,
- /// const casa::Matrix<casa::Double>& sumOfWts,
- /// Lattice<casa::Float>& sensitivityImage,
- /// casa::Bool fftNorm)
+ /// virtual void normalizeImage(Lattice<casacore::Complex>& skyImage,
+ /// const casacore::Matrix<casacore::Double>& sumOfWts,
+ /// Lattice<casacore::Float>& sensitivityImage,
+ /// casacore::Bool fftNorm)
/// {throw(AipsError("FTMachineWsplit::normalizeImage() called"));}
void normalizeAvgPB();
void normalizeAvgPB(
- casa::ImageInterface<casa::Complex>& inImage,
- casa::ImageInterface<casa::Float>& outImage);
+ casacore::ImageInterface<casacore::Complex>& inImage,
+ casacore::ImageInterface<casacore::Float>& outImage);
//
// Make a sensitivity image (sensitivityImage), given the gridded
// weights (wtImage). These are related to each other by a
// Fourier transform and normalization by the sum-of-weights
// (sumWt) and normalization by the product of the 2D FFT size
- // along each axis. If doFFTNorm=casa::False, normalization by the FFT
+ // along each axis. If doFFTNorm=casacore::False, normalization by the FFT
// size is not done. If sumWt is not provided, normalization by
// the sum of weights is also not done.
//
- virtual void makeSensitivityImage(casa::Lattice<casa::Complex>&,
- casa::ImageInterface<casa::Float>&,
- const casa::Matrix<casa::Float>& =casa::Matrix<casa::Float>(),
- const casa::Bool& = casa::True) {}
+ virtual void makeSensitivityImage(casacore::Lattice<casacore::Complex>&,
+ casacore::ImageInterface<casacore::Float>&,
+ const casacore::Matrix<casacore::Float>& =casacore::Matrix<casacore::Float>(),
+ const casacore::Bool& = casacore::True) {}
virtual void makeSensitivityImage(
- const casa::VisBuffer& vb,
- const casa::ImageInterface<casa::Complex>& imageTemplate,
- casa::ImageInterface<casa::Float>& sensitivityImage);
+ const casacore::VisBuffer& vb,
+ const casacore::ImageInterface<casacore::Complex>& imageTemplate,
+ casacore::ImageInterface<casacore::Float>& sensitivityImage);
- inline virtual casa::Float pbFunc(
- const casa::Float& a,
- const casa::Float& limit)
+ inline virtual casacore::Float pbFunc(
+ const casacore::Float& a,
+ const casacore::Float& limit)
{if (abs(a) >= limit) return (a);else return 1.0;};
- inline virtual casa::Complex pbFunc(
- const casa::Complex& a,
- const casa::Float& limit)
- {if (abs(a)>=limit) return (a); else return casa::Complex(1.0,0.0);};
+ inline virtual casacore::Complex pbFunc(
+ const casacore::Complex& a,
+ const casacore::Float& limit)
+ {if (abs(a)>=limit) return (a); else return casacore::Complex(1.0,0.0);};
//
// Given the sky image (Fourier transform of the visibilities),
@@ -245,110 +245,110 @@ public:
// the skyImage with the normalized image of the sky.
//
virtual void normalizeImage(
- casa::Lattice<casa::Complex>& skyImage,
- const casa::Matrix<casa::Double>& sumOfWts,
- casa::Lattice<casa::Float>& sensitivityImage,
- casa::Bool fftNorm=casa::True);
+ casacore::Lattice<casacore::Complex>& skyImage,
+ const casacore::Matrix<casacore::Double>& sumOfWts,
+ casacore::Lattice<casacore::Float>& sensitivityImage,
+ casacore::Bool fftNorm=casacore::True);
virtual void normalizeImage(
- casa::Lattice<casa::Complex>& skyImage,
- const casa::Matrix<casa::Double>& sumOfWts,
- casa::Lattice<casa::Float>& sensitivityImage,
- casa::Lattice<casa::Complex>& sensitivitySqImage,
- casa::Bool fftNorm=casa::True);
+ casacore::Lattice<casacore::Complex>& skyImage,
+ const casacore::Matrix<casacore::Double>& sumOfWts,
+ casacore::Lattice<casacore::Float>& sensitivityImage,
+ casacore::Lattice<casacore::Complex>& sensitivitySqImage,
+ casacore::Bool fftNorm=casacore::True);
- virtual casa::ImageInterface<casa::Float>& getSensitivityImage() {return *avgPB_p;}
- virtual casa::Matrix<casa::Double>& getSumOfWeights() {return sumWeight;};
- virtual casa::Matrix<casa::Double>& getSumOfCFWeights() {return sumCFWeight;};
+ virtual casacore::ImageInterface<casacore::Float>& getSensitivityImage() {return *avgPB_p;}
+ virtual casacore::Matrix<casacore::Double>& getSumOfWeights() {return sumWeight;};
+ virtual casacore::Matrix<casacore::Double>& getSumOfCFWeights() {return sumCFWeight;};
// Get the final weights image
void getWeightImage(
- casa::ImageInterface<casa::Float>&,
- casa::Matrix<casa::Float>&);
+ casacore::ImageInterface<casacore::Float>&,
+ casacore::Matrix<casacore::Float>&);
// Save and restore the FTMachineWsplit to and from a record
- virtual casa::Bool toRecord(
- casa::String& error,
- casa::RecordInterface& outRec,
- casa::Bool withImage=casa::False);
+ virtual casacore::Bool toRecord(
+ casacore::String& error,
+ casacore::RecordInterface& outRec,
+ casacore::Bool withImage=casacore::False);
- virtual casa::Bool fromRecord(
- casa::String& error,
- const casa::RecordInterface& inRec);
+ virtual casacore::Bool fromRecord(
+ casacore::String& error,
+ const casacore::RecordInterface& inRec);
// Can this FTMachine be represented by Fourier convolutions?
- virtual casa::Bool isFourier() {return casa::True;}
+ virtual casacore::Bool isFourier() {return casacore::True;}
- virtual void setNoPadding(casa::Bool nopad){noPadding_p=nopad;};
+ virtual void setNoPadding(casacore::Bool nopad){noPadding_p=nopad;};
- virtual casa::String name();
+ virtual casacore::String name();
//Cyr: The FTMachine has got to know the order of the Taylor term
- virtual void setMiscInfo(const casa::Int qualifier){thisterm_p=qualifier;};
+ virtual void setMiscInfo(const casacore::Int qualifier){thisterm_p=qualifier;};
virtual void ComputeResiduals(
- casa::VisBuffer&vb,
- casa::Bool useCorrected);
+ casacore::VisBuffer&vb,
+ casacore::Bool useCorrected);
void makeConjPolMap(
- const casa::VisBuffer& vb,
- const casa::Vector<casa::Int> cfPolMap,
- casa::Vector<casa::Int>& conjPolMap);
+ const casacore::VisBuffer& vb,
+ const casacore::Vector<casacore::Int> cfPolMap,
+ casacore::Vector<casacore::Int>& conjPolMap);
void makeCFPolMap(
- const casa::VisBuffer& vb,
- const casa::Vector<casa::Int>& cfstokes,
- casa::Vector<casa::Int>& polM);
+ const casacore::VisBuffer& vb,
+ const casacore::Vector<casacore::Int>& cfstokes,
+ casacore::Vector<casacore::Int>& polM);
- void setPsfOnDisk(casa::String NamePsf){itsNamePsfOnDisk=NamePsf;}
+ void setPsfOnDisk(casacore::String NamePsf){itsNamePsfOnDisk=NamePsf;}
- virtual casa::String giveNamePsfOnDisk(){return itsNamePsfOnDisk;}
+ virtual casacore::String giveNamePsfOnDisk(){return itsNamePsfOnDisk;}
// Arrays for non-tiled gridding (one per thread).
void initGridThreads(
- vector< casa::Array<casa::Complex> >& otherGriddedData,
- vector< casa::Array<casa::DComplex> >& otherGriddedData2);
+ vector< casacore::Array<casacore::Complex> >& otherGriddedData,
+ vector< casacore::Array<casacore::DComplex> >& otherGriddedData2);
- casa::Matrix<casa::Bool> giveMaskGrid()
+ casacore::Matrix<casacore::Bool> giveMaskGrid()
{
return itsMaskGridCS;
}
protected:
- vector< casa::Array<casa::Complex> >* itsGriddedData;
- vector< casa::Array<casa::DComplex> >* itsGriddedData2;
- mutable casa::Matrix<casa::Float> itsAvgPB;
+ vector< casacore::Array<casacore::Complex> >* itsGriddedData;
+ vector< casacore::Array<casacore::DComplex> >* itsGriddedData2;
+ mutable casacore::Matrix<casacore::Float> itsAvgPB;
// Padding in FFT
- casa::Float padding_p;
- casa::Int thisterm_p;
- casa::Double itsRefFreq;
- casa::Bool itsPredictFT;
+ casacore::Float padding_p;
+ casacore::Int thisterm_p;
+ casacore::Double itsRefFreq;
+ casacore::Bool itsPredictFT;
double its_tot_time_grid;
double its_tot_time_cf;
double its_tot_time_w;
double its_tot_time_el;
double its_tot_time_tot;
- casa::Matrix<casa::Bool> itsMaskGridCS;
- casa::String itsNamePsfOnDisk;
- vector< vector< vector < casa::Matrix<casa::Complex> > > > itsStackMuellerNew;
+ casacore::Matrix<casacore::Bool> itsMaskGridCS;
+ casacore::String itsNamePsfOnDisk;
+ vector< vector< vector < casacore::Matrix<casacore::Complex> > > > itsStackMuellerNew;
- casa::Int itsTotalStepsGrid;
- casa::Int itsTotalStepsDeGrid;
- casa::Bool itsMasksGridAllDone;
- casa::Bool itsMasksAllDone;
- casa::Bool itsAllAtermsDone;
- casa::Bool its_UseMasksDegrid;
- casa::Bool its_SingleGridMode;
- casa::Bool its_makeDirtyCorr;
- casa::uInt its_NGrids;
-
- casa::Timer itsSeconds;
- //casa::Float its_FillFactor;
+ casacore::Int itsTotalStepsGrid;
+ casacore::Int itsTotalStepsDeGrid;
+ casacore::Bool itsMasksGridAllDone;
+ casacore::Bool itsMasksAllDone;
+ casacore::Bool itsAllAtermsDone;
+ casacore::Bool its_UseMasksDegrid;
+ casacore::Bool its_SingleGridMode;
+ casacore::Bool its_makeDirtyCorr;
+ casacore::uInt its_NGrids;
+
+ casacore::Timer itsSeconds;
+ //casacore::Float its_FillFactor;
// Get the appropriate data pointer
- casa::Array<casa::Complex>* getDataPointer(const casa::IPosition&, casa::Bool);
+ casacore::Array<casacore::Complex>* getDataPointer(const casacore::IPosition&, casacore::Bool);
void ok();
@@ -356,155 +356,155 @@ protected:
// Is this record on Grid? check both ends. This assumes that the
// ends bracket the middle
- casa::Bool recordOnGrid(const casa::VisBuffer& vb, casa::Int rownr) const;
+ casacore::Bool recordOnGrid(const casacore::VisBuffer& vb, casacore::Int rownr) const;
// Image cache
- casa::LatticeCache<casa::Complex> * imageCache;
+ casacore::LatticeCache<casacore::Complex> * imageCache;
// Sizes
- casa::Long cachesize;
- casa::Int tilesize;
+ casacore::Long cachesize;
+ casacore::Int tilesize;
// Gridder
- casa::ConvolveGridder<casa::Double, casa::Complex>* gridder;
+ casacore::ConvolveGridder<casacore::Double, casacore::Complex>* gridder;
- casa::Bool itsUseLinearInterpGridder;
- casa::Bool itsUseWSplit;
+ casacore::Bool itsUseLinearInterpGridder;
+ casacore::Bool itsUseWSplit;
// Is this tiled?
- casa::Bool isTiled;
+ casacore::Bool isTiled;
// Array lattice
- casa::CountedPtr<casa::Lattice<casa::Complex> > arrayLattice;
+ casacore::CountedPtr<casacore::Lattice<casacore::Complex> > arrayLattice;
// Lattice. For non-tiled gridding, this will point to arrayLattice,
// whereas for tiled gridding, this points to the image
- casa::CountedPtr<casa::Lattice<casa::Complex> > lattice;
+ casacore::CountedPtr<casacore::Lattice<casacore::Complex> > lattice;
- casa::String convType;
+ casacore::String convType;
- casa::Float maxAbsData;
+ casacore::Float maxAbsData;
// Useful IPositions
- casa::IPosition centerLoc, offsetLoc;
+ casacore::IPosition centerLoc, offsetLoc;
// Image Scaling and offset
- casa::Vector<casa::Double> uvScale, uvOffset;
+ casacore::Vector<casacore::Double> uvScale, uvOffset;
- casa::Array<casa::Complex> its_stacked_GriddedData;
- casa::Array<casa::DComplex> its_stacked_GriddedData2;
- casa::uInt itsNumCycle;
+ casacore::Array<casacore::Complex> its_stacked_GriddedData;
+ casacore::Array<casacore::DComplex> its_stacked_GriddedData2;
+ casacore::uInt itsNumCycle;
- //vector< casa::Array<casa::DComplex> > itsGriddedData2;
- vector< casa::Matrix<casa::Complex> > itsSumPB;
- vector< casa::Matrix<casa::Double> > itsSumWeight;
+ //vector< casacore::Array<casacore::DComplex> > itsGriddedData2;
+ vector< casacore::Matrix<casacore::Complex> > itsSumPB;
+ vector< casacore::Matrix<casacore::Double> > itsSumWeight;
vector< double > itsSumCFWeight;
- ///casa::Array<casa::Complex> griddedData;
- ///casa::Array<casa::DComplex> griddedData2;
- ///casa::Matrix<casa::Complex> itsSumPB;
+ ///casacore::Array<casacore::Complex> griddedData;
+ ///casacore::Array<casacore::DComplex> griddedData2;
+ ///casacore::Matrix<casacore::Complex> itsSumPB;
///double itsSumWeight;
- casa::Int priorCacheSize;
+ casacore::Int priorCacheSize;
// Grid/degrid zero spacing points?
- casa::Bool usezero_p;
+ casacore::Bool usezero_p;
//force no padding
- casa::Bool noPadding_p;
+ casacore::Bool noPadding_p;
//Check if using put that avoids non-necessary reads
- casa::Bool usePut2_p;
+ casacore::Bool usePut2_p;
//machine name
- casa::String machineName_p;
+ casacore::String machineName_p;
// Shape of the padded image
- casa::IPosition padded_shape;
-
- casa::Int convSampling;
- casa::Float pbLimit_p;
- casa::Int sensitivityPatternQualifier_p;
- casa::String sensitivityPatternQualifierStr_p;
- casa::Vector<casa::Float> pbPeaks;
- casa::Bool pbNormalized_p;
+ casacore::IPosition padded_shape;
+
+ casacore::Int convSampling;
+ casacore::Float pbLimit_p;
+ casacore::Int sensitivityPatternQualifier_p;
+ casacore::String sensitivityPatternQualifierStr_p;
+ casacore::Vector<casacore::Float> pbPeaks;
+ casacore::Bool pbNormalized_p;
// The average PB for sky image normalization
//
- casa::CountedPtr<casa::ImageInterface<casa::Float> > avgPB_p;
- casa::CountedPtr<casa::ImageInterface<casa::Complex> > avgPBSq_p;
+ casacore::CountedPtr<casacore::ImageInterface<casacore::Float> > avgPB_p;
+ casacore::CountedPtr<casacore::ImageInterface<casacore::Complex> > avgPBSq_p;
LofarVisResampler visResamplers_p;
- casa::Record itsParameters;
- casa::MeasurementSet itsMS;
- casa::Int itsNWPlanes;
+ casacore::Record itsParameters;
+ casacore::MeasurementSet itsMS;
+ casacore::Int itsNWPlanes;
double itsWMax;
- casa::Double its_PBCut;
+ casacore::Double its_PBCut;
int itsNThread;
- casa::Bool its_Use_EJones;
- casa::Double its_TimeWindow;
+ casacore::Bool its_Use_EJones;
+ casacore::Double its_TimeWindow;
//ofstream outFile;
- casa::Bool its_Apply_Element;
+ casacore::Bool its_Apply_Element;
int its_ApplyBeamCode;
- casa::Bool its_Already_Initialized;
- casa::Bool its_reallyDoPSF;
- casa::Bool itsDonePB;
- casa::Double itsUVmin;
- casa::Double itsUVmax;
- casa::CountedPtr<LofarConvolutionFunction> itsConvFunc;
- casa::Vector<casa::Int> ConjCFMap_p, CFMap_p;
+ casacore::Bool its_Already_Initialized;
+ casacore::Bool its_reallyDoPSF;
+ casacore::Bool itsDonePB;
+ casacore::Double itsUVmin;
+ casacore::Double itsUVmax;
+ casacore::CountedPtr<LofarConvolutionFunction> itsConvFunc;
+ casacore::Vector<casacore::Int> ConjCFMap_p, CFMap_p;
int itsVerbose;
int itsMaxSupport;
- casa::Int itsOversample;
- casa::Vector< casa::Double > itsListFreq;
- casa::String itsImgName;
- casa::Matrix<casa::Bool> itsGridMuellerMask;
- casa::Matrix<casa::Bool> itsDegridMuellerMask;
+ casacore::Int itsOversample;
+ casacore::Vector< casacore::Double > itsListFreq;
+ casacore::String itsImgName;
+ casacore::Matrix<casacore::Bool> itsGridMuellerMask;
+ casacore::Matrix<casacore::Bool> itsDegridMuellerMask;
double itsGriddingTime;
double itsDegriddingTime;
double itsCFTime;
- casa::PrecTimer itsTotalTimer;
- casa::PrecTimer itsCyrilTimer;
+ casacore::PrecTimer itsTotalTimer;
+ casacore::PrecTimer itsCyrilTimer;
double itsNextApplyTime;
int itsCounterTimes;
int itsStepApplyElement;
double itsTStartObs;
double itsDeltaTime;
- casa::Array<casa::Complex> itsTmpStackedGriddedData;
- casa::Array<casa::Complex> itsGridToDegrid;
+ casacore::Array<casacore::Complex> itsTmpStackedGriddedData;
+ casacore::Array<casacore::Complex> itsGridToDegrid;
- casa::Vector<casa::uInt> blIndex;
+ casacore::Vector<casacore::uInt> blIndex;
vector<int> blStart, blEnd;
- casa::Vector<casa::Int> ant1;
- casa::Vector<casa::Int> ant2;
+ casacore::Vector<casacore::Int> ant1;
+ casacore::Vector<casacore::Int> ant2;
- void make_mapping(const casa::VisBuffer& vb)
+ void make_mapping(const casacore::VisBuffer& vb)
{
ant1 = vb.antenna1();
ant2 = vb.antenna2();
// Determine the baselines in the VisBuffer.
int nrant = 1 + max(max(ant1), max(ant2));
// Sort on baseline (use a baseline nr which is faster to sort).
- casa::Vector<casa::Int> blnr(nrant*ant1);
+ casacore::Vector<casacore::Int> blnr(nrant*ant1);
blnr += ant2; // This is faster than nrant*ant1+ant2 in a single line
- casa::GenSortIndirect<casa::Int>::sort (blIndex, blnr);
+ casacore::GenSortIndirect<casacore::Int>::sort (blIndex, blnr);
// Now determine nr of unique baselines and their start index.
blStart.reserve (nrant*(nrant+1)/2);
blEnd.reserve (nrant*(nrant+1)/2);
- casa::Int lastbl = -1;
- casa::Int lastIndex = 0;
+ casacore::Int lastbl = -1;
+ casacore::Int lastIndex = 0;
bool usebl = false;
bool allFlagged = true;
- const casa::Vector<casa::Bool>& flagRow = vb.flagRow();
+ const casacore::Vector<casacore::Bool>& flagRow = vb.flagRow();
for (uint i=0; i<blnr.size(); ++i) {
- casa::Int inx = blIndex[i];
- casa::Int bl = blnr[inx];
+ casacore::Int inx = blIndex[i];
+ casacore::Int bl = blnr[inx];
if (bl != lastbl) {
// New baseline. Write the previous end index if applicable.
@@ -557,36 +557,36 @@ protected:
}
- vector<vector<casa::uInt> > make_mapping_time(const casa::VisBuffer& vb, casa::uInt spw)
+ vector<vector<casacore::uInt> > make_mapping_time(const casacore::VisBuffer& vb, casacore::uInt spw)
{
// Determine the baselines in the VisBuffer.
ant1.assign(vb.antenna1());
ant2.assign(vb.antenna2());
- const casa::Vector<casa::Double>& times = vb.timeCentroid();
+ const casacore::Vector<casacore::Double>& times = vb.timeCentroid();
int nrant = 1 + max(max(ant1), max(ant2));
// Sort on baseline (use a baseline nr which is faster to sort).
- casa::Vector<casa::Int> blnr(nrant*ant1);
+ casacore::Vector<casacore::Int> blnr(nrant*ant1);
blnr += ant2; // This is faster than nrant*ant1+ant2 in a single line
- casa::GenSortIndirect<casa::Int>::sort (blIndex, blnr);
+ casacore::GenSortIndirect<casacore::Int>::sort (blIndex, blnr);
// Now determine nr of unique baselines and their start index.
- casa::Float dtime(its_TimeWindow);
- vector<casa::uInt> MapChunck;
- vector<vector<casa::uInt> > Map;
- casa::Double time0(times[0]);
- casa::Int bl_now(blnr[blIndex[0]]);
- for(casa::uInt RowNum=0; RowNum<blIndex.size();++RowNum){
- casa::uInt irow=blIndex[RowNum];
+ casacore::Float dtime(its_TimeWindow);
+ vector<casacore::uInt> MapChunck;
+ vector<vector<casacore::uInt> > Map;
+ casacore::Double time0(times[0]);
+ casacore::Int bl_now(blnr[blIndex[0]]);
+ for(casacore::uInt RowNum=0; RowNum<blIndex.size();++RowNum){
+ casacore::uInt irow=blIndex[RowNum];
- casa::Double timeRow(times[irow]);
+ casacore::Double timeRow(times[irow]);
double u=vb.uvw()[irow](0);
double v=vb.uvw()[irow](1);
double w=vb.uvw()[irow](2);
double uvdistance=(0.001)*sqrt(u*u+v*v)/(2.99e8/itsListFreq[spw]);
- casa::Bool cond0((uvdistance>itsUVmin)&(uvdistance<itsUVmax));
- casa::Bool cond1(abs(w)<itsWMax);
+ casacore::Bool cond0((uvdistance>itsUVmin)&(uvdistance<itsUVmax));
+ casacore::Bool cond1(abs(w)<itsWMax);
if(!(cond0&cond1)){continue;}
if(((timeRow-time0)>dtime)|(blnr[irow]!=bl_now))
@@ -604,61 +604,61 @@ protected:
}
- vector<casa::Int> WIndexMap;
- vector<casa::uInt> TimesMap;
- casa::Double its_t0;
- casa::Double its_tSel0;
- casa::Double its_tSel1;
+ vector<casacore::Int> WIndexMap;
+ vector<casacore::uInt> TimesMap;
+ casacore::Double its_t0;
+ casacore::Double its_tSel0;
+ casacore::Double its_tSel1;
- vector<vector<vector<casa::uInt> > > make_mapping_time_W(const casa::VisBuffer& vb, casa::uInt spw)
+ vector<vector<vector<casacore::uInt> > > make_mapping_time_W(const casacore::VisBuffer& vb, casacore::uInt spw)
{
// Determine the baselines in the VisBuffer.
ant1.assign(vb.antenna1());
ant2.assign(vb.antenna2());
- const casa::Vector<casa::Double>& times = vb.timeCentroid();
+ const casacore::Vector<casacore::Double>& times = vb.timeCentroid();
if(its_t0<0.){its_t0=times[0];}
WIndexMap.resize(0);
int nrant = 1 + max(max(ant1), max(ant2));
- casa::Vector<casa::Int> WPCoord;
+ casacore::Vector<casacore::Int> WPCoord;
WPCoord.resize(ant1.size());
- for(casa::uInt irow=0;irow<WPCoord.size();++irow){
+ for(casacore::uInt irow=0;irow<WPCoord.size();++irow){
WPCoord[irow]=itsConvFunc->GiveWindexIncludeNegative(vb.uvw()[irow](2),spw);
}
// Sort on baseline (use a baseline nr which is faster to sort).
- casa::Vector<casa::Int> blnr(ant2+nrant*ant1+nrant*nrant*(WPCoord+itsNWPlanes));
+ casacore::Vector<casacore::Int> blnr(ant2+nrant*ant1+nrant*nrant*(WPCoord+itsNWPlanes));
//blnr += ant2; // This is faster than nrant*ant1+ant2 in a single line
- casa::GenSortIndirect<casa::Int>::sort (blIndex, blnr);
+ casacore::GenSortIndirect<casacore::Int>::sort (blIndex, blnr);
// Now determine nr of unique baselines and their start index.
- casa::Float dtime(its_TimeWindow);
- vector<casa::uInt> MapChunck;
- vector<vector<casa::uInt> > MapW;
- vector<vector<vector<casa::uInt> > > Map;
- casa::Double time0(-1.);//times[blIndex[0]]);
- casa::Int bl_now;//blnr[blIndex[0]]);
- casa::Int iwcoord;//=WPCoord[blIndex[0]]-itsNWPlanes;
+ casacore::Float dtime(its_TimeWindow);
+ vector<casacore::uInt> MapChunck;
+ vector<vector<casacore::uInt> > MapW;
+ vector<vector<vector<casacore::uInt> > > Map;
+ casacore::Double time0(-1.);//times[blIndex[0]]);
+ casacore::Int bl_now;//blnr[blIndex[0]]);
+ casacore::Int iwcoord;//=WPCoord[blIndex[0]]-itsNWPlanes;
- for(casa::uInt RowNum=0; RowNum<blIndex.size();++RowNum){
- casa::uInt irow=blIndex[RowNum];
+ for(casacore::uInt RowNum=0; RowNum<blIndex.size();++RowNum){
+ casacore::uInt irow=blIndex[RowNum];
//cout<<ant1[irow]<<" "<<ant2[irow]<<" "<<times[irow]<<" "<<WPCoord[irow]<<endl;
double u=vb.uvw()[irow](0);
double v=vb.uvw()[irow](1);
double w=vb.uvw()[irow](2);
double uvdistance=(0.001)*sqrt(u*u+v*v)/(2.99e8/itsListFreq[spw]);
- casa::Bool cond0(((uvdistance>itsUVmin)&(uvdistance<itsUVmax)));
- casa::Bool cond1(abs(w)<itsWMax);
- //casa::Bool cond2(((ant1[irow]==8)&(ant2[irow]==0)));
+ casacore::Bool cond0(((uvdistance>itsUVmin)&(uvdistance<itsUVmax)));
+ casacore::Bool cond1(abs(w)<itsWMax);
+ //casacore::Bool cond2(((ant1[irow]==8)&(ant2[irow]==0)));
//if
- //casa::Bool cond2(((ant1[irow]==7)&(ant2[irow]==1)));
- casa::Bool cond2(((ant1[irow]==5)&(ant2[irow]==40)));
- //casa::Bool cond2((ant1[irow]==7));
- //casa::Bool cond2((ant2[irow]==0));
- casa::Double timeRow(times[irow]);
- casa::Bool cond3((timeRow-its_t0)/60.>its_tSel0);
- casa::Bool cond4((timeRow-its_t0)/60.<its_tSel1);
- casa::Bool cond34(cond3&cond4);
+ //casacore::Bool cond2(((ant1[irow]==7)&(ant2[irow]==1)));
+ casacore::Bool cond2(((ant1[irow]==5)&(ant2[irow]==40)));
+ //casacore::Bool cond2((ant1[irow]==7));
+ //casacore::Bool cond2((ant2[irow]==0));
+ casacore::Double timeRow(times[irow]);
+ casacore::Bool cond3((timeRow-its_t0)/60.>its_tSel0);
+ casacore::Bool cond4((timeRow-its_t0)/60.<its_tSel1);
+ casacore::Bool cond34(cond3&cond4);
if(its_tSel0==-1.){cond34=true;}
//if(!(cond0&cond1&cond2&cond34)){continue;}
if(!(cond0&cond1&cond34)){continue;}
@@ -691,19 +691,19 @@ protected:
Map.push_back(MapW);
- /* for(casa::uInt i=0; i<Map.size();++i) */
+ /* for(casacore::uInt i=0; i<Map.size();++i) */
/* { */
- /* for(casa::uInt j=0; j<Map[i].size();++j) */
+ /* for(casacore::uInt j=0; j<Map[i].size();++j) */
/* { */
- /* for(casa::uInt k=0; k<Map[i][j].size();++k) */
+ /* for(casacore::uInt k=0; k<Map[i][j].size();++k) */
/* { */
- /* casa::uInt irow=Map[i][j][k]; */
+ /* casacore::uInt irow=Map[i][j][k]; */
/* cout<<i<<" "<<j<<" "<<k<<" A="<<ant1[irow]<<","<<ant2[irow]<<" w="<<vb.uvw()[irow](2)<<" windex="<<WIndexMap[i]<<" t="<<times[irow]<<endl; */
/* } */
/* } */
/* } */
- /* for(casa::uInt i=0; i<WIndexMap.size();++i) */
+ /* for(casacore::uInt i=0; i<WIndexMap.size();++i) */
/* { */
/* cout<<" windex="<<WIndexMap[i]<<endl; */
/* } */
@@ -714,67 +714,67 @@ protected:
double itsSupport_Speroidal;
- vector<vector<vector<vector<casa::uInt> > > > make_mapping_time_W_grid(const casa::VisBuffer& vb, casa::uInt spw)
+ vector<vector<vector<vector<casacore::uInt> > > > make_mapping_time_W_grid(const casacore::VisBuffer& vb, casacore::uInt spw)
{
// Determine the baselines in the VisBuffer.
ant1.assign(vb.antenna1());
ant2.assign(vb.antenna2());
- const casa::Vector<casa::Double>& times = vb.timeCentroid();
+ const casacore::Vector<casacore::Double>& times = vb.timeCentroid();
if(its_t0<0.){its_t0=times[0];}
WIndexMap.resize(0);
- casa::Double recipWvl = itsListFreq[spw] / 2.99e8;
+ casacore::Double recipWvl = itsListFreq[spw] / 2.99e8;
int nrant = 1 + max(max(ant1), max(ant2));
- casa::Vector<casa::Int> WPCoord;
+ casacore::Vector<casacore::Int> WPCoord;
WPCoord.resize(ant1.size());
- for(casa::uInt irow=0;irow<WPCoord.size();++irow){
+ for(casacore::uInt irow=0;irow<WPCoord.size();++irow){
WPCoord[irow]=itsConvFunc->GiveWindexIncludeNegative(vb.uvw()[irow](2),spw);
}
// Sort on baseline (use a baseline nr which is faster to sort).
- casa::Vector<casa::Int> blnr(ant2+nrant*ant1+nrant*nrant*(WPCoord+itsNWPlanes));
+ casacore::Vector<casacore::Int> blnr(ant2+nrant*ant1+nrant*nrant*(WPCoord+itsNWPlanes));
//blnr += ant2; // This is faster than nrant*ant1+ant2 in a single line
- casa::GenSortIndirect<casa::Int>::sort (blIndex, blnr);
+ casacore::GenSortIndirect<casacore::Int>::sort (blIndex, blnr);
// Now determine nr of unique baselines and their start index.
- casa::Float dtime(its_TimeWindow);
- vector<casa::uInt> MapChunck;
- vector<vector<casa::uInt> > MapW;
- vector<vector<vector<casa::uInt> > > Map;
+ casacore::Float dtime(its_TimeWindow);
+ vector<casacore::uInt> MapChunck;
+ vector<vector<casacore::uInt> > MapW;
+ vector<vector<vector<casacore::uInt> > > Map;
- vector<casa::Int > xminBL;
- vector<vector<casa::Int> > xminW;
- vector<casa::Int > xmaxBL;
- vector<vector<casa::Int> > xmaxW;
- vector<casa::Int > yminBL;
- vector<vector<casa::Int> > yminW;
- vector<casa::Int > ymaxBL;
- vector<vector<casa::Int> > ymaxW;
+ vector<casacore::Int > xminBL;
+ vector<vector<casacore::Int> > xminW;
+ vector<casacore::Int > xmaxBL;
+ vector<vector<casacore::Int> > xmaxW;
+ vector<casacore::Int > yminBL;
+ vector<vector<casacore::Int> > yminW;
+ vector<casacore::Int > ymaxBL;
+ vector<vector<casacore::Int> > ymaxW;
- casa::Double time0(-1.);//times[blIndex[0]]);
- casa::Int bl_now;//blnr[blIndex[0]]);
- casa::Int iwcoord;//=WPCoord[blIndex[0]]-itsNWPlanes;
+ casacore::Double time0(-1.);//times[blIndex[0]]);
+ casacore::Int bl_now;//blnr[blIndex[0]]);
+ casacore::Int iwcoord;//=WPCoord[blIndex[0]]-itsNWPlanes;
float scaling(2.);
float support((itsSupport_Speroidal-1)/2+1);
- casa::Int xmin=2147483647;
- casa::Int xmax=-2147483647;
- casa::Int ymin=2147483647;
- casa::Int ymax=-2147483647;
+ casacore::Int xmin=2147483647;
+ casacore::Int xmax=-2147483647;
+ casacore::Int ymin=2147483647;
+ casacore::Int ymax=-2147483647;
- for(casa::uInt RowNum=0; RowNum<blIndex.size();++RowNum){
- casa::uInt irow=blIndex[RowNum];
+ for(casacore::uInt RowNum=0; RowNum<blIndex.size();++RowNum){
+ casacore::uInt irow=blIndex[RowNum];
double u=vb.uvw()[irow](0);
double v=vb.uvw()[irow](1);
double w=vb.uvw()[irow](2);
double uvdistance=(0.001)*sqrt(u*u+v*v)/(2.99e8/itsListFreq[spw]);
- casa::Bool cond0(((uvdistance>itsUVmin)&(uvdistance<itsUVmax)));
- casa::Bool cond1(abs(w)<itsWMax);
- casa::Bool cond2(((ant1[irow]==5)&(ant2[irow]==40)));
- casa::Double timeRow(times[irow]);
- casa::Bool cond3((timeRow-its_t0)/60.>its_tSel0);
- casa::Bool cond4((timeRow-its_t0)/60.<its_tSel1);
- casa::Bool cond34(cond3&cond4);
+ casacore::Bool cond0(((uvdistance>itsUVmin)&(uvdistance<itsUVmax)));
+ casacore::Bool cond1(abs(w)<itsWMax);
+ casacore::Bool cond2(((ant1[irow]==5)&(ant2[irow]==40)));
+ casacore::Double timeRow(times[irow]);
+ casacore::Bool cond3((timeRow-its_t0)/60.>its_tSel0);
+ casacore::Bool cond4((timeRow-its_t0)/60.<its_tSel1);
+ casacore::Bool cond34(cond3&cond4);
if(its_tSel0==-1.){cond34=true;}
if(!(cond0&cond1&cond34)){continue;}
//if(!(cond0&cond1&cond34&cond2)){continue;}
@@ -822,8 +822,8 @@ protected:
MapChunck.push_back(irow);
- casa::Int xrow = int(u * uvScale(0) * recipWvl + uvOffset(0));
- casa::Int yrow = int(v * uvScale(1) * recipWvl + uvOffset(1));
+ casacore::Int xrow = int(u * uvScale(0) * recipWvl + uvOffset(0));
+ casacore::Int yrow = int(v * uvScale(1) * recipWvl + uvOffset(1));
if(xrow-support<xmin){xmin=xrow-support;};
if(xrow+support>xmax){xmax=xrow+support;};
if(yrow-support<ymin){ymin=yrow-support;};
@@ -843,19 +843,19 @@ protected:
WIndexMap.push_back(iwcoord);
- /* for(casa::uInt i=0; i<Map.size();++i) */
+ /* for(casacore::uInt i=0; i<Map.size();++i) */
/* { */
- /* for(casa::uInt j=0; j<Map[i].size();++j) */
+ /* for(casacore::uInt j=0; j<Map[i].size();++j) */
/* { */
- /* for(casa::uInt k=0; k<Map[i][j].size();++k) */
+ /* for(casacore::uInt k=0; k<Map[i][j].size();++k) */
/* { */
- /* casa::uInt irow=Map[i][j][k]; */
+ /* casacore::uInt irow=Map[i][j][k]; */
/* cout<<"iw="<<i<<" ibl="<<j<<" imap="<<k<<" A="<<ant1[irow]<<","<<ant2[irow]<<" w="<<vb.uvw()[irow](2)<<" windex="<<WIndexMap[i]<<" t="<<times[irow]<<endl; */
/* double u=vb.uvw()[irow](0); */
/* double v=vb.uvw()[irow](1); */
- /* casa::Int xrow=int(float(u)*scaling); */
- /* casa::Int yrow=int(float(v)*scaling); */
+ /* casacore::Int xrow=int(float(u)*scaling); */
+ /* casacore::Int yrow=int(float(v)*scaling); */
/* cout<<" "<<xminW[i][j]<<" ("<<xrow-support<<")"<<endl; */
/* cout<<" "<<xmaxW[i][j]<<" ("<<xrow+support<<")"<<endl; */
/* cout<<" "<<yminW[i][j]<<" ("<<yrow-support<<")"<<endl; */
@@ -867,27 +867,27 @@ protected:
// ofstream outFile("output_grids.txt");
- vector<casa::uInt> MapChunckOut;
- vector<vector<casa::uInt> > MapWGridOut;
- vector<vector<vector<casa::uInt> > > MapWOut;
- vector<vector<vector<vector<casa::uInt> > > > MapOut;
+ vector<casacore::uInt> MapChunckOut;
+ vector<vector<casacore::uInt> > MapWGridOut;
+ vector<vector<vector<casacore::uInt> > > MapWOut;
+ vector<vector<vector<vector<casacore::uInt> > > > MapOut;
- casa::vector<casa::IPosition > posBlock;
+ casacore::vector<casacore::IPosition > posBlock;
- for(casa::uInt i=0; i<Map.size();++i)
+ for(casacore::uInt i=0; i<Map.size();++i)
{
MapWGridOut.resize(0);
MapWOut.resize(0);
- casa::Vector<casa::Bool> done;
+ casacore::Vector<casacore::Bool> done;
done.resize(Map[i].size());
done=false;
- casa::Bool alldone(false);
- casa::Bool cond_xmin,cond_xmax,cond_ymin,cond_ymax;
- casa::uInt iblock(0);
+ casacore::Bool alldone(false);
+ casacore::Bool cond_xmin,cond_xmax,cond_ymin,cond_ymax;
+ casacore::uInt iblock(0);
//MapWGridOut.push_back(Map[i][0]);
posBlock.resize(0);
- casa::IPosition pos(2,1,1);
+ casacore::IPosition pos(2,1,1);
//pos(0)=i;
//pos(1)=0;
//posBlock.push_back(pos);
@@ -896,18 +896,18 @@ protected:
while(!alldone){
- for(casa::uInt j=0; j<Map[i].size();++j)
+ for(casacore::uInt j=0; j<Map[i].size();++j)
{
// Find if baseline j has overlap with the current grid
if(done[j]==true){continue;}
- casa::Bool NoOverlap(true);
- for(casa::uInt jj=0; jj<MapWGridOut.size();++jj)
+ casacore::Bool NoOverlap(true);
+ for(casacore::uInt jj=0; jj<MapWGridOut.size();++jj)
{
cond_xmin=xminW[i][j]<=xmaxW[posBlock[jj](0)][posBlock[jj](1)];
cond_xmax=xmaxW[i][j]>=xminW[posBlock[jj](0)][posBlock[jj](1)];
cond_ymin=yminW[i][j]<=ymaxW[posBlock[jj](0)][posBlock[jj](1)];
cond_ymax=ymaxW[i][j]>=yminW[posBlock[jj](0)][posBlock[jj](1)];
- casa::Bool condIsOverlap(cond_xmin&&cond_xmax&&cond_ymin&&cond_ymax);
+ casacore::Bool condIsOverlap(cond_xmin&&cond_xmax&&cond_ymin&&cond_ymax);
if(condIsOverlap){
NoOverlap=false;
break;
@@ -923,14 +923,14 @@ protected:
}
alldone=true;
- for(casa::uInt j=0; j<done.size();++j)
+ for(casacore::uInt j=0; j<done.size();++j)
{
if(done[j]==false){alldone=false;break;}
}
- /* for(casa::uInt iii=0; iii<MapWGridOut.size();++iii){ */
- /* casa::uInt icoord(posBlock[iii](0)); */
- /* casa::uInt jcoord(posBlock[iii](1)); */
+ /* for(casacore::uInt iii=0; iii<MapWGridOut.size();++iii){ */
+ /* casacore::uInt icoord(posBlock[iii](0)); */
+ /* casacore::uInt jcoord(posBlock[iii](1)); */
/* outFile<<" "<<i<<" "<<iblock<<" "<<xminW[icoord][jcoord]<<" "<<xmaxW[icoord][jcoord]<<" "<<yminW[icoord][jcoord]<<" "<<ymaxW[icoord][jcoord]<<endl; */
/* } */
@@ -946,10 +946,10 @@ protected:
}
- /* for(casa::uInt i=0; i<MapOut.size();++i){ */
- /* for(casa::uInt j=0; j<MapOut[i].size();++j){ */
- /* casa::uInt icoord(posBlock[iii](0)); */
- /* casa::uInt jcoord(posBlock[iii](1)); */
+ /* for(casacore::uInt i=0; i<MapOut.size();++i){ */
+ /* for(casacore::uInt j=0; j<MapOut[i].size();++j){ */
+ /* casacore::uInt icoord(posBlock[iii](0)); */
+ /* casacore::uInt jcoord(posBlock[iii](1)); */
/* outFile<<" "<<i<<" "<<iblock<<" "<<xminW[icoord][jcoord]<<" "<<xmaxW[icoord][jcoord]<<" "<<yminW[icoord][jcoord]<<" "<<ymaxW[icoord][jcoord]<<endl; */
/* } */
/* } */
@@ -963,7 +963,7 @@ protected:
FFTCMatrix FFTMachine;
- void dofft(casa::Matrix<casa::Complex>& arr, bool direction)
+ void dofft(casacore::Matrix<casacore::Complex>& arr, bool direction)
{
int sz(arr.nrow());
int nthreads(OpenMP::maxThreads());
@@ -982,7 +982,7 @@ protected:
///////////////////////////////////////
vector<FFTCMatrix> VecFFTMachine;
- void dofftVec(casa::Matrix<casa::Complex>& arr, bool direction, int nth=0, int pol=0)
+ void dofftVec(casacore::Matrix<casacore::Complex>& arr, bool direction, int nth=0, int pol=0)
{
int sz(arr.nrow());
int nthreads(OpenMP::maxThreads());
@@ -1006,92 +1006,92 @@ protected:
////////////////////////////////////////
template <class T>
- void store (const casa::DirectionCoordinate &dir, const casa::Matrix<T> &data,
+ void store (const casacore::DirectionCoordinate &dir, const casacore::Matrix<T> &data,
const string &name)
{
//cout<<"Saving... "<<name<<endl;
- casa::Vector<casa::Int> stokes(1);
- stokes(0) = casa::Stokes::I;
- casa::CoordinateSystem csys;
+ casacore::Vector<casacore::Int> stokes(1);
+ stokes(0) = casacore::Stokes::I;
+ casacore::CoordinateSystem csys;
csys.addCoordinate(dir);
- csys.addCoordinate(casa::StokesCoordinate(stokes));
- csys.addCoordinate(casa::SpectralCoordinate(casa::MFrequency::TOPO, 60e6, 1.0, 0.0, 60e6));
- casa::PagedImage<T> im(casa::TiledShape(casa::IPosition(4, data.shape()(0), data.shape()(1), 1, 1)), csys, name);
- im.putSlice(data, casa::IPosition(4, 0, 0, 0, 0));
+ csys.addCoordinate(casacore::StokesCoordinate(stokes));
+ csys.addCoordinate(casacore::SpectralCoordinate(casacore::MFrequency::TOPO, 60e6, 1.0, 0.0, 60e6));
+ casacore::PagedImage<T> im(casacore::TiledShape(casacore::IPosition(4, data.shape()(0), data.shape()(1), 1, 1)), csys, name);
+ im.putSlice(data, casacore::IPosition(4, 0, 0, 0, 0));
}
template <class T>
- void store(const casa::Matrix<T> &data, const string &name)
+ void store(const casacore::Matrix<T> &data, const string &name)
{
- casa::Matrix<casa::Double> xform(2, 2);
+ casacore::Matrix<casacore::Double> xform(2, 2);
xform = 0.0;
xform.diagonal() = 1.0;
- casa::Quantum<casa::Double> incLon((8.0 / data.shape()(0)) * casa::C::pi / 180.0, "rad");
- casa::Quantum<casa::Double> incLat((8.0 / data.shape()(1)) * casa::C::pi / 180.0, "rad");
- casa::Quantum<casa::Double> refLatLon(45.0 * casa::C::pi / 180.0, "rad");
- casa::DirectionCoordinate dir(casa::MDirection::J2000, casa::Projection(casa::Projection::SIN),
+ casacore::Quantum<casacore::Double> incLon((8.0 / data.shape()(0)) * casacore::C::pi / 180.0, "rad");
+ casacore::Quantum<casacore::Double> incLat((8.0 / data.shape()(1)) * casacore::C::pi / 180.0, "rad");
+ casacore::Quantum<casacore::Double> refLatLon(45.0 * casacore::C::pi / 180.0, "rad");
+ casacore::DirectionCoordinate dir(casacore::MDirection::J2000, casacore::Projection(casacore::Projection::SIN),
refLatLon, refLatLon, incLon, incLat,
xform, data.shape()(0) / 2, data.shape()(1) / 2);
store(dir, data, name);
}
template <class T>
- void store(const casa::Cube<T> &data, const string &name)
+ void store(const casacore::Cube<T> &data, const string &name)
{
- casa::Matrix<casa::Double> xform(2, 2);
+ casacore::Matrix<casacore::Double> xform(2, 2);
xform = 0.0;
xform.diagonal() = 1.0;
- casa::Quantum<casa::Double> incLon((8.0 / data.shape()(0)) * casa::C::pi / 180.0, "rad");
- casa::Quantum<casa::Double> incLat((8.0 / data.shape()(1)) * casa::C::pi / 180.0, "rad");
- casa::Quantum<casa::Double> refLatLon(45.0 * casa::C::pi / 180.0, "rad");
- casa::DirectionCoordinate dir(casa::MDirection::J2000, casa::Projection(casa::Projection::SIN),
+ casacore::Quantum<casacore::Double> incLon((8.0 / data.shape()(0)) * casacore::C::pi / 180.0, "rad");
+ casacore::Quantum<casacore::Double> incLat((8.0 / data.shape()(1)) * casacore::C::pi / 180.0, "rad");
+ casacore::Quantum<casacore::Double> refLatLon(45.0 * casacore::C::pi / 180.0, "rad");
+ casacore::DirectionCoordinate dir(casacore::MDirection::J2000, casacore::Projection(casacore::Projection::SIN),
refLatLon, refLatLon, incLon, incLat,
xform, data.shape()(0) / 2, data.shape()(1) / 2);
store(dir, data, name);
}
template <class T>
- void store(const casa::DirectionCoordinate &dir, const casa::Cube<T> &data,
+ void store(const casacore::DirectionCoordinate &dir, const casacore::Cube<T> &data,
const string &name)
{
// AlwaysAssert(data.shape()(2) == 4, SynthesisError);
//cout<<"Saving... "<<name<<endl;
- casa::Vector<casa::Int> stokes(4);
- stokes(0) = casa::Stokes::XX;
- stokes(1) = casa::Stokes::XY;
- stokes(2) = casa::Stokes::YX;
- stokes(3) = casa::Stokes::YY;
- casa::CoordinateSystem csys;
+ casacore::Vector<casacore::Int> stokes(4);
+ stokes(0) = casacore::Stokes::XX;
+ stokes(1) = casacore::Stokes::XY;
+ stokes(2) = casacore::Stokes::YX;
+ stokes(3) = casacore::Stokes::YY;
+ casacore::CoordinateSystem csys;
csys.addCoordinate(dir);
- csys.addCoordinate(casa::StokesCoordinate(stokes));
- csys.addCoordinate(casa::SpectralCoordinate(casa::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
- casa::PagedImage<T>
- im(casa::TiledShape(casa::IPosition(4, data.shape()(0), data.shape()(1), 4, 1)),
+ csys.addCoordinate(casacore::StokesCoordinate(stokes));
+ csys.addCoordinate(casacore::SpectralCoordinate(casacore::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
+ casacore::PagedImage<T>
+ im(casacore::TiledShape(casacore::IPosition(4, data.shape()(0), data.shape()(1), 4, 1)),
csys, name);
- im.putSlice(data, casa::IPosition(4, 0, 0, 0, 0));
+ im.putSlice(data, casacore::IPosition(4, 0, 0, 0, 0));
}
/* template <class T> */
/* void store(const Cube<T> &data, const string &name) */
/* { */
/* CoordinateSystem csys; */
- /* casa::Matrix<casa::Double> xform(2, 2); */
+ /* casacore::Matrix<casacore::Double> xform(2, 2); */
/* xform = 0.0; */
/* xform.diagonal() = 1.0; */
- /* Quantum<casa::Double> incLon((8.0 / data.shape()(0)) * C::pi / 180.0, "rad"); */
- /* Quantum<casa::Double> incLat((8.0 / data.shape()(1)) * C::pi / 180.0, "rad"); */
- /* Quantum<casa::Double> refLatLon(45.0 * C::pi / 180.0, "rad"); */
+ /* Quantum<casacore::Double> incLon((8.0 / data.shape()(0)) * C::pi / 180.0, "rad"); */
+ /* Quantum<casacore::Double> incLat((8.0 / data.shape()(1)) * C::pi / 180.0, "rad"); */
+ /* Quantum<casacore::Double> refLatLon(45.0 * C::pi / 180.0, "rad"); */
/* csys.addCoordinate(DirectionCoordinate(MDirection::J2000, Projection(Projection::SIN), */
/* refLatLon, refLatLon, incLon, incLat, */
/* xform, data.shape()(0) / 2, data.shape()(1) / 2)); */
- /* casa::Vector<casa::Int> stokes(4); */
+ /* casacore::Vector<casacore::Int> stokes(4); */
/* stokes(0) = Stokes::XX; */
/* stokes(1) = Stokes::XY; */
/* stokes(2) = Stokes::YX; */
/* stokes(3) = Stokes::YY; */
/* csys.addCoordinate(StokesCoordinate(stokes)); */
- /* csys.addCoordinate(SpectralCoordinate(casa::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6)); */
+ /* csys.addCoordinate(SpectralCoordinate(casacore::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6)); */
/* PagedImage<T> im(TiledShape(IPosition(4, data.shape()(0), data.shape()(1), 4, 1)), csys, name); */
/* im.putSlice(data, IPosition(4, 0, 0, 0, 0)); */
diff --git a/CEP/Imager/AWImager2/include/AWImager2/FTMachineWStack.h b/CEP/Imager/AWImager2/include/AWImager2/FTMachineWStack.h
index 90a58fc08484770c4324c4aae70857cb208d71bd..ada6f4cfea1ad56bf85da2d5362f240d99133645 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/FTMachineWStack.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/FTMachineWStack.h
@@ -121,7 +121,7 @@ namespace LOFAR {
// <ul> Deal with large VLA spectral line case
// </todo>
-class FTMachineWsplit : public casa::FTMachine {
+class FTMachineWsplit : public casacore::FTMachine {
public:
// Constructor: cachesize is the size of the cache in words
@@ -134,40 +134,40 @@ public:
// mTangent is specified then the uvw rotation is done for
// that location iso the image center.
// <group>
-// FTMachineWsplit(casa::Long cachesize, casa::Int tilesize, casa::CountedPtr<VisibilityResamplerBase>& visResampler,
-// casa::String convType="SF", casa::Float padding=1.0, casa::Bool usezero=casa::True, casa::Bool useDoublePrec=casa::False);
+// FTMachineWsplit(casacore::Long cachesize, casacore::Int tilesize, casacore::CountedPtr<VisibilityResamplerBase>& visResampler,
+// casacore::String convType="SF", casacore::Float padding=1.0, casacore::Bool usezero=casacore::True, casacore::Bool useDoublePrec=casacore::False);
FTMachineWsplit(
- casa::Long cachesize,
- casa::Int tilesize,
- casa::CountedPtr<casa::VisibilityResamplerBase>& visResampler,
- casa::String convType,
- const casa::MeasurementSet& ms,
- casa::Int nwPlanes,
- casa::MPosition mLocation,
- casa::Float padding,
- casa::Bool usezero,
- casa::Bool useDoublePrec,
+ casacore::Long cachesize,
+ casacore::Int tilesize,
+ casacore::CountedPtr<casacore::VisibilityResamplerBase>& visResampler,
+ casacore::String convType,
+ const casacore::MeasurementSet& ms,
+ casacore::Int nwPlanes,
+ casacore::MPosition mLocation,
+ casacore::Float padding,
+ casacore::Bool usezero,
+ casacore::Bool useDoublePrec,
double wmax,
- casa::Int verbose,
- casa::Int maxsupport,
- casa::Int oversample,
- const casa::String& imageName,
- const casa::Matrix<casa::Bool>& gridMuellerMask,
- const casa::Matrix<casa::Bool>& degridMuellerMask,
- casa::Double refFreq,
- casa::Bool use_Linear_Interp_Gridder,
- casa::Bool use_EJones,
+ casacore::Int verbose,
+ casacore::Int maxsupport,
+ casacore::Int oversample,
+ const casacore::String& imageName,
+ const casacore::Matrix<casacore::Bool>& gridMuellerMask,
+ const casacore::Matrix<casacore::Bool>& degridMuellerMask,
+ casacore::Double refFreq,
+ casacore::Bool use_Linear_Interp_Gridder,
+ casacore::Bool use_EJones,
int stepApplyElement,
int applyBeamCode,
- casa::Double pbCut,
- casa::Bool predictFT,
- casa::String psfOnDisk,
- casa::Bool useMasksDegrid,
- casa::Bool reallyDoPSF,
- casa::Double uvMin,
- casa::Double uvMax,
- casa::Bool makeDirtyCorr,
- const casa::Record& parameters);//,
+ casacore::Double pbCut,
+ casacore::Bool predictFT,
+ casacore::String psfOnDisk,
+ casacore::Bool useMasksDegrid,
+ casacore::Bool reallyDoPSF,
+ casacore::Double uvMin,
+ casacore::Double uvMax,
+ casacore::Bool makeDirtyCorr,
+ const casacore::Record& parameters);//,
// Copy constructor
FTMachineWsplit(const FTMachineWsplit &other);
@@ -181,7 +181,7 @@ public:
~FTMachineWsplit();
- virtual casa::String name() const { return "FTMachineWsplit";};
+ virtual casacore::String name() const { return "FTMachineWsplit";};
// Show the relative timings of the various steps.
void showTimings (
@@ -191,44 +191,44 @@ public:
// Initialize transform to Visibility plane using the image
// as a template. The image is loaded and Fourier transformed.
void initializeToVis(
- casa::ImageInterface<casa::Complex>& image,
- const casa::VisBuffer& vb);
+ casacore::ImageInterface<casacore::Complex>& image,
+ const casacore::VisBuffer& vb);
// Finalize transform to Visibility plane: flushes the image
// cache and shows statistics if it is being used.
void finalizeToVis();
void getSplitWplanes(
- casa::VisBuffer& vb,
- casa::Int row);
+ casacore::VisBuffer& vb,
+ casacore::Int row);
void getTraditional(
- casa::VisBuffer& vb,
- casa::Int row);
+ casacore::VisBuffer& vb,
+ casacore::Int row);
void putSplitWplanesOverlap(
- const casa::VisBuffer& vb,
- casa::Int row,
- casa::Bool dopsf,
+ const casacore::VisBuffer& vb,
+ casacore::Int row,
+ casacore::Bool dopsf,
FTMachine::Type type);
void putSplitWplanes(
- const casa::VisBuffer& vb,
- casa::Int row,
- casa::Bool dopsf,
+ const casacore::VisBuffer& vb,
+ casacore::Int row,
+ casacore::Bool dopsf,
FTMachine::Type type);
void putTraditional(
- const casa::VisBuffer& vb,
- casa::Int row,
- casa::Bool dopsf,
+ const casacore::VisBuffer& vb,
+ casacore::Int row,
+ casacore::Bool dopsf,
FTMachine::Type type);
// Initialize transform to Sky plane: initializes the image
void initializeToSky(
- casa::ImageInterface<casa::Complex>& image,
- casa::Matrix<casa::Float>& weight,
- const casa::VisBuffer& vb);
+ casacore::ImageInterface<casacore::Complex>& image,
+ casacore::Matrix<casacore::Float>& weight,
+ const casacore::VisBuffer& vb);
// Finalize transform to Sky plane: flushes the image
@@ -238,76 +238,76 @@ public:
// Get actual coherence from grid by degridding
void get(
- casa::VisBuffer& vb,
- casa::Int row=-1);
+ casacore::VisBuffer& vb,
+ casacore::Int row=-1);
// Put coherence to grid by gridding.
void put(
- const casa::VisBuffer& vb,
- casa::Int row=-1,
- casa::Bool dopsf=casa::False,
- casa::FTMachine::Type type = casa::FTMachine::OBSERVED);
+ const casacore::VisBuffer& vb,
+ casacore::Int row=-1,
+ casacore::Bool dopsf=casacore::False,
+ casacore::FTMachine::Type type = casacore::FTMachine::OBSERVED);
// Make the entire image
- void makeImage(casa::FTMachine::Type type,
- casa::VisSet& vs,
- casa::ImageInterface<casa::Complex>& image,
- casa::Matrix<casa::Float>& weight);
+ void makeImage(casacore::FTMachine::Type type,
+ casacore::VisSet& vs,
+ casacore::ImageInterface<casacore::Complex>& image,
+ casacore::Matrix<casacore::Float>& weight);
// Get the final image: do the Fourier transform and
// grid-correct, then optionally normalize by the summed weights
- casa::ImageInterface<casa::Complex>& getImage(casa::Matrix<casa::Float>&, casa::Bool normalize=casa::True);
+ casacore::ImageInterface<casacore::Complex>& getImage(casacore::Matrix<casacore::Float>&, casacore::Bool normalize=casacore::True);
// Get the average primary beam.
- virtual const casa::Matrix<casa::Float>& getAveragePB() const;
+ virtual const casacore::Matrix<casacore::Float>& getAveragePB() const;
// Get the spheroidal cut.
- const casa::Matrix<casa::Float>& getSpheroidCut() const
+ const casacore::Matrix<casacore::Float>& getSpheroidCut() const
{ return itsConvFunc->getSpheroidCut(); }
- /// virtual void normalizeImage(Lattice<casa::Complex>& skyImage,
- /// const casa::Matrix<casa::Double>& sumOfWts,
- /// Lattice<casa::Float>& sensitivityImage,
- /// casa::Bool fftNorm)
+ /// virtual void normalizeImage(Lattice<casacore::Complex>& skyImage,
+ /// const casacore::Matrix<casacore::Double>& sumOfWts,
+ /// Lattice<casacore::Float>& sensitivityImage,
+ /// casacore::Bool fftNorm)
/// {throw(AipsError("FTMachineWsplit::normalizeImage() called"));}
void normalizeAvgPB();
void normalizeAvgPB(
- casa::ImageInterface<casa::Complex>& inImage,
- casa::ImageInterface<casa::Float>& outImage);
+ casacore::ImageInterface<casacore::Complex>& inImage,
+ casacore::ImageInterface<casacore::Float>& outImage);
//
// Make a sensitivity image (sensitivityImage), given the gridded
// weights (wtImage). These are related to each other by a
// Fourier transform and normalization by the sum-of-weights
// (sumWt) and normalization by the product of the 2D FFT size
- // along each axis. If doFFTNorm=casa::False, normalization by the FFT
+ // along each axis. If doFFTNorm=casacore::False, normalization by the FFT
// size is not done. If sumWt is not provided, normalization by
// the sum of weights is also not done.
//
- virtual void makeSensitivityImage(casa::Lattice<casa::Complex>&,
- casa::ImageInterface<casa::Float>&,
- const casa::Matrix<casa::Float>& =casa::Matrix<casa::Float>(),
- const casa::Bool& = casa::True) {}
+ virtual void makeSensitivityImage(casacore::Lattice<casacore::Complex>&,
+ casacore::ImageInterface<casacore::Float>&,
+ const casacore::Matrix<casacore::Float>& =casacore::Matrix<casacore::Float>(),
+ const casacore::Bool& = casacore::True) {}
virtual void makeSensitivityImage(
- const casa::VisBuffer& vb,
- const casa::ImageInterface<casa::Complex>& imageTemplate,
- casa::ImageInterface<casa::Float>& sensitivityImage);
+ const casacore::VisBuffer& vb,
+ const casacore::ImageInterface<casacore::Complex>& imageTemplate,
+ casacore::ImageInterface<casacore::Float>& sensitivityImage);
- inline virtual casa::Float pbFunc(
- const casa::Float& a,
- const casa::Float& limit)
+ inline virtual casacore::Float pbFunc(
+ const casacore::Float& a,
+ const casacore::Float& limit)
{if (abs(a) >= limit) return (a);else return 1.0;};
- inline virtual casa::Complex pbFunc(
- const casa::Complex& a,
- const casa::Float& limit)
- {if (abs(a)>=limit) return (a); else return casa::Complex(1.0,0.0);};
+ inline virtual casacore::Complex pbFunc(
+ const casacore::Complex& a,
+ const casacore::Float& limit)
+ {if (abs(a)>=limit) return (a); else return casacore::Complex(1.0,0.0);};
//
// Given the sky image (Fourier transform of the visibilities),
@@ -315,110 +315,110 @@ public:
// the skyImage with the normalized image of the sky.
//
virtual void normalizeImage(
- casa::Lattice<casa::Complex>& skyImage,
- const casa::Matrix<casa::Double>& sumOfWts,
- casa::Lattice<casa::Float>& sensitivityImage,
- casa::Bool fftNorm=casa::True);
+ casacore::Lattice<casacore::Complex>& skyImage,
+ const casacore::Matrix<casacore::Double>& sumOfWts,
+ casacore::Lattice<casacore::Float>& sensitivityImage,
+ casacore::Bool fftNorm=casacore::True);
virtual void normalizeImage(
- casa::Lattice<casa::Complex>& skyImage,
- const casa::Matrix<casa::Double>& sumOfWts,
- casa::Lattice<casa::Float>& sensitivityImage,
- casa::Lattice<casa::Complex>& sensitivitySqImage,
- casa::Bool fftNorm=casa::True);
+ casacore::Lattice<casacore::Complex>& skyImage,
+ const casacore::Matrix<casacore::Double>& sumOfWts,
+ casacore::Lattice<casacore::Float>& sensitivityImage,
+ casacore::Lattice<casacore::Complex>& sensitivitySqImage,
+ casacore::Bool fftNorm=casacore::True);
- virtual casa::ImageInterface<casa::Float>& getSensitivityImage() {return *avgPB_p;}
- virtual casa::Matrix<casa::Double>& getSumOfWeights() {return sumWeight;};
- virtual casa::Matrix<casa::Double>& getSumOfCFWeights() {return sumCFWeight;};
+ virtual casacore::ImageInterface<casacore::Float>& getSensitivityImage() {return *avgPB_p;}
+ virtual casacore::Matrix<casacore::Double>& getSumOfWeights() {return sumWeight;};
+ virtual casacore::Matrix<casacore::Double>& getSumOfCFWeights() {return sumCFWeight;};
// Get the final weights image
void getWeightImage(
- casa::ImageInterface<casa::Float>&,
- casa::Matrix<casa::Float>&);
+ casacore::ImageInterface<casacore::Float>&,
+ casacore::Matrix<casacore::Float>&);
// Save and restore the FTMachineWsplit to and from a record
- virtual casa::Bool toRecord(
- casa::String& error,
- casa::RecordInterface& outRec,
- casa::Bool withImage=casa::False);
+ virtual casacore::Bool toRecord(
+ casacore::String& error,
+ casacore::RecordInterface& outRec,
+ casacore::Bool withImage=casacore::False);
- virtual casa::Bool fromRecord(
- casa::String& error,
- const casa::RecordInterface& inRec);
+ virtual casacore::Bool fromRecord(
+ casacore::String& error,
+ const casacore::RecordInterface& inRec);
// Can this FTMachine be represented by Fourier convolutions?
- virtual casa::Bool isFourier() {return casa::True;}
+ virtual casacore::Bool isFourier() {return casacore::True;}
- virtual void setNoPadding(casa::Bool nopad){noPadding_p=nopad;};
+ virtual void setNoPadding(casacore::Bool nopad){noPadding_p=nopad;};
- virtual casa::String name();
+ virtual casacore::String name();
//Cyr: The FTMachine has got to know the order of the Taylor term
- virtual void setMiscInfo(const casa::Int qualifier){thisterm_p=qualifier;};
+ virtual void setMiscInfo(const casacore::Int qualifier){thisterm_p=qualifier;};
virtual void ComputeResiduals(
- casa::VisBuffer&vb,
- casa::Bool useCorrected);
+ casacore::VisBuffer&vb,
+ casacore::Bool useCorrected);
void makeConjPolMap(
- const casa::VisBuffer& vb,
- const casa::Vector<casa::Int> cfPolMap,
- casa::Vector<casa::Int>& conjPolMap);
+ const casacore::VisBuffer& vb,
+ const casacore::Vector<casacore::Int> cfPolMap,
+ casacore::Vector<casacore::Int>& conjPolMap);
void makeCFPolMap(
- const casa::VisBuffer& vb,
- const casa::Vector<casa::Int>& cfstokes,
- casa::Vector<casa::Int>& polM);
+ const casacore::VisBuffer& vb,
+ const casacore::Vector<casacore::Int>& cfstokes,
+ casacore::Vector<casacore::Int>& polM);
- void setPsfOnDisk(casa::String NamePsf){itsNamePsfOnDisk=NamePsf;}
+ void setPsfOnDisk(casacore::String NamePsf){itsNamePsfOnDisk=NamePsf;}
- virtual casa::String giveNamePsfOnDisk(){return itsNamePsfOnDisk;}
+ virtual casacore::String giveNamePsfOnDisk(){return itsNamePsfOnDisk;}
// Arrays for non-tiled gridding (one per thread).
void initGridThreads(
- vector< casa::Array<casa::Complex> >& otherGriddedData,
- vector< casa::Array<casa::DComplex> >& otherGriddedData2);
+ vector< casacore::Array<casacore::Complex> >& otherGriddedData,
+ vector< casacore::Array<casacore::DComplex> >& otherGriddedData2);
- casa::Matrix<casa::Bool> giveMaskGrid()
+ casacore::Matrix<casacore::Bool> giveMaskGrid()
{
return itsMaskGridCS;
}
protected:
- vector< casa::Array<casa::Complex> >* itsGriddedData;
- vector< casa::Array<casa::DComplex> >* itsGriddedData2;
- mutable casa::Matrix<casa::Float> itsAvgPB;
+ vector< casacore::Array<casacore::Complex> >* itsGriddedData;
+ vector< casacore::Array<casacore::DComplex> >* itsGriddedData2;
+ mutable casacore::Matrix<casacore::Float> itsAvgPB;
// Padding in FFT
- casa::Float padding_p;
- casa::Int thisterm_p;
- casa::Double itsRefFreq;
- casa::Bool itsPredictFT;
+ casacore::Float padding_p;
+ casacore::Int thisterm_p;
+ casacore::Double itsRefFreq;
+ casacore::Bool itsPredictFT;
double its_tot_time_grid;
double its_tot_time_cf;
double its_tot_time_w;
double its_tot_time_el;
double its_tot_time_tot;
- casa::Matrix<casa::Bool> itsMaskGridCS;
- casa::String itsNamePsfOnDisk;
- vector< vector< vector < casa::Matrix<casa::Complex> > > > itsStackMuellerNew;
+ casacore::Matrix<casacore::Bool> itsMaskGridCS;
+ casacore::String itsNamePsfOnDisk;
+ vector< vector< vector < casacore::Matrix<casacore::Complex> > > > itsStackMuellerNew;
- casa::Int itsTotalStepsGrid;
- casa::Int itsTotalStepsDeGrid;
- casa::Bool itsMasksGridAllDone;
- casa::Bool itsMasksAllDone;
- casa::Bool itsAllAtermsDone;
- casa::Bool its_UseMasksDegrid;
- casa::Bool its_SingleGridMode;
- casa::Bool its_makeDirtyCorr;
- casa::uInt its_NGrids;
-
- casa::Timer itsSeconds;
- //casa::Float its_FillFactor;
+ casacore::Int itsTotalStepsGrid;
+ casacore::Int itsTotalStepsDeGrid;
+ casacore::Bool itsMasksGridAllDone;
+ casacore::Bool itsMasksAllDone;
+ casacore::Bool itsAllAtermsDone;
+ casacore::Bool its_UseMasksDegrid;
+ casacore::Bool its_SingleGridMode;
+ casacore::Bool its_makeDirtyCorr;
+ casacore::uInt its_NGrids;
+
+ casacore::Timer itsSeconds;
+ //casacore::Float its_FillFactor;
// Get the appropriate data pointer
- casa::Array<casa::Complex>* getDataPointer(const casa::IPosition&, casa::Bool);
+ casacore::Array<casacore::Complex>* getDataPointer(const casacore::IPosition&, casacore::Bool);
void ok();
@@ -426,155 +426,155 @@ protected:
// Is this record on Grid? check both ends. This assumes that the
// ends bracket the middle
- casa::Bool recordOnGrid(const casa::VisBuffer& vb, casa::Int rownr) const;
+ casacore::Bool recordOnGrid(const casacore::VisBuffer& vb, casacore::Int rownr) const;
// Image cache
- casa::LatticeCache<casa::Complex> * imageCache;
+ casacore::LatticeCache<casacore::Complex> * imageCache;
// Sizes
- casa::Long cachesize;
- casa::Int tilesize;
+ casacore::Long cachesize;
+ casacore::Int tilesize;
// Gridder
- casa::ConvolveGridder<casa::Double, casa::Complex>* gridder;
+ casacore::ConvolveGridder<casacore::Double, casacore::Complex>* gridder;
- casa::Bool itsUseLinearInterpGridder;
- casa::Bool itsUseWSplit;
+ casacore::Bool itsUseLinearInterpGridder;
+ casacore::Bool itsUseWSplit;
// Is this tiled?
- casa::Bool isTiled;
+ casacore::Bool isTiled;
// Array lattice
- casa::CountedPtr<casa::Lattice<casa::Complex> > arrayLattice;
+ casacore::CountedPtr<casacore::Lattice<casacore::Complex> > arrayLattice;
// Lattice. For non-tiled gridding, this will point to arrayLattice,
// whereas for tiled gridding, this points to the image
- casa::CountedPtr<casa::Lattice<casa::Complex> > lattice;
+ casacore::CountedPtr<casacore::Lattice<casacore::Complex> > lattice;
- casa::String convType;
+ casacore::String convType;
- casa::Float maxAbsData;
+ casacore::Float maxAbsData;
// Useful IPositions
- casa::IPosition centerLoc, offsetLoc;
+ casacore::IPosition centerLoc, offsetLoc;
// Image Scaling and offset
- casa::Vector<casa::Double> uvScale, uvOffset;
+ casacore::Vector<casacore::Double> uvScale, uvOffset;
- casa::Array<casa::Complex> its_stacked_GriddedData;
- casa::Array<casa::DComplex> its_stacked_GriddedData2;
- casa::uInt itsNumCycle;
+ casacore::Array<casacore::Complex> its_stacked_GriddedData;
+ casacore::Array<casacore::DComplex> its_stacked_GriddedData2;
+ casacore::uInt itsNumCycle;
- //vector< casa::Array<casa::DComplex> > itsGriddedData2;
- vector< casa::Matrix<casa::Complex> > itsSumPB;
- vector< casa::Matrix<casa::Double> > itsSumWeight;
+ //vector< casacore::Array<casacore::DComplex> > itsGriddedData2;
+ vector< casacore::Matrix<casacore::Complex> > itsSumPB;
+ vector< casacore::Matrix<casacore::Double> > itsSumWeight;
vector< double > itsSumCFWeight;
- ///casa::Array<casa::Complex> griddedData;
- ///casa::Array<casa::DComplex> griddedData2;
- ///casa::Matrix<casa::Complex> itsSumPB;
+ ///casacore::Array<casacore::Complex> griddedData;
+ ///casacore::Array<casacore::DComplex> griddedData2;
+ ///casacore::Matrix<casacore::Complex> itsSumPB;
///double itsSumWeight;
- casa::Int priorCacheSize;
+ casacore::Int priorCacheSize;
// Grid/degrid zero spacing points?
- casa::Bool usezero_p;
+ casacore::Bool usezero_p;
//force no padding
- casa::Bool noPadding_p;
+ casacore::Bool noPadding_p;
//Check if using put that avoids non-necessary reads
- casa::Bool usePut2_p;
+ casacore::Bool usePut2_p;
//machine name
- casa::String machineName_p;
+ casacore::String machineName_p;
// Shape of the padded image
- casa::IPosition padded_shape;
-
- casa::Int convSampling;
- casa::Float pbLimit_p;
- casa::Int sensitivityPatternQualifier_p;
- casa::String sensitivityPatternQualifierStr_p;
- casa::Vector<casa::Float> pbPeaks;
- casa::Bool pbNormalized_p;
+ casacore::IPosition padded_shape;
+
+ casacore::Int convSampling;
+ casacore::Float pbLimit_p;
+ casacore::Int sensitivityPatternQualifier_p;
+ casacore::String sensitivityPatternQualifierStr_p;
+ casacore::Vector<casacore::Float> pbPeaks;
+ casacore::Bool pbNormalized_p;
// The average PB for sky image normalization
//
- casa::CountedPtr<casa::ImageInterface<casa::Float> > avgPB_p;
- casa::CountedPtr<casa::ImageInterface<casa::Complex> > avgPBSq_p;
+ casacore::CountedPtr<casacore::ImageInterface<casacore::Float> > avgPB_p;
+ casacore::CountedPtr<casacore::ImageInterface<casacore::Complex> > avgPBSq_p;
LofarVisResampler visResamplers_p;
- casa::Record itsParameters;
- casa::MeasurementSet itsMS;
- casa::Int itsNWPlanes;
+ casacore::Record itsParameters;
+ casacore::MeasurementSet itsMS;
+ casacore::Int itsNWPlanes;
double itsWMax;
- casa::Double its_PBCut;
+ casacore::Double its_PBCut;
int itsNThread;
- casa::Bool its_Use_EJones;
- casa::Double its_TimeWindow;
+ casacore::Bool its_Use_EJones;
+ casacore::Double its_TimeWindow;
//ofstream outFile;
- casa::Bool its_Apply_Element;
+ casacore::Bool its_Apply_Element;
int its_ApplyBeamCode;
- casa::Bool its_Already_Initialized;
- casa::Bool its_reallyDoPSF;
- casa::Bool itsDonePB;
- casa::Double itsUVmin;
- casa::Double itsUVmax;
- casa::CountedPtr<LofarConvolutionFunction> itsConvFunc;
- casa::Vector<casa::Int> ConjCFMap_p, CFMap_p;
+ casacore::Bool its_Already_Initialized;
+ casacore::Bool its_reallyDoPSF;
+ casacore::Bool itsDonePB;
+ casacore::Double itsUVmin;
+ casacore::Double itsUVmax;
+ casacore::CountedPtr<LofarConvolutionFunction> itsConvFunc;
+ casacore::Vector<casacore::Int> ConjCFMap_p, CFMap_p;
int itsVerbose;
int itsMaxSupport;
- casa::Int itsOversample;
- casa::Vector< casa::Double > itsListFreq;
- casa::String itsImgName;
- casa::Matrix<casa::Bool> itsGridMuellerMask;
- casa::Matrix<casa::Bool> itsDegridMuellerMask;
+ casacore::Int itsOversample;
+ casacore::Vector< casacore::Double > itsListFreq;
+ casacore::String itsImgName;
+ casacore::Matrix<casacore::Bool> itsGridMuellerMask;
+ casacore::Matrix<casacore::Bool> itsDegridMuellerMask;
double itsGriddingTime;
double itsDegriddingTime;
double itsCFTime;
- casa::PrecTimer itsTotalTimer;
- casa::PrecTimer itsCyrilTimer;
+ casacore::PrecTimer itsTotalTimer;
+ casacore::PrecTimer itsCyrilTimer;
double itsNextApplyTime;
int itsCounterTimes;
int itsStepApplyElement;
double itsTStartObs;
double itsDeltaTime;
- casa::Array<casa::Complex> itsTmpStackedGriddedData;
- casa::Array<casa::Complex> itsGridToDegrid;
+ casacore::Array<casacore::Complex> itsTmpStackedGriddedData;
+ casacore::Array<casacore::Complex> itsGridToDegrid;
- casa::Vector<casa::uInt> blIndex;
+ casacore::Vector<casacore::uInt> blIndex;
vector<int> blStart, blEnd;
- casa::Vector<casa::Int> ant1;
- casa::Vector<casa::Int> ant2;
+ casacore::Vector<casacore::Int> ant1;
+ casacore::Vector<casacore::Int> ant2;
- void make_mapping(const casa::VisBuffer& vb)
+ void make_mapping(const casacore::VisBuffer& vb)
{
ant1 = vb.antenna1();
ant2 = vb.antenna2();
// Determine the baselines in the VisBuffer.
int nrant = 1 + max(max(ant1), max(ant2));
// Sort on baseline (use a baseline nr which is faster to sort).
- casa::Vector<casa::Int> blnr(nrant*ant1);
+ casacore::Vector<casacore::Int> blnr(nrant*ant1);
blnr += ant2; // This is faster than nrant*ant1+ant2 in a single line
- casa::GenSortIndirect<casa::Int>::sort (blIndex, blnr);
+ casacore::GenSortIndirect<casacore::Int>::sort (blIndex, blnr);
// Now determine nr of unique baselines and their start index.
blStart.reserve (nrant*(nrant+1)/2);
blEnd.reserve (nrant*(nrant+1)/2);
- casa::Int lastbl = -1;
- casa::Int lastIndex = 0;
+ casacore::Int lastbl = -1;
+ casacore::Int lastIndex = 0;
bool usebl = false;
bool allFlagged = true;
- const casa::Vector<casa::Bool>& flagRow = vb.flagRow();
+ const casacore::Vector<casacore::Bool>& flagRow = vb.flagRow();
for (uint i=0; i<blnr.size(); ++i) {
- casa::Int inx = blIndex[i];
- casa::Int bl = blnr[inx];
+ casacore::Int inx = blIndex[i];
+ casacore::Int bl = blnr[inx];
if (bl != lastbl) {
// New baseline. Write the previous end index if applicable.
@@ -627,36 +627,36 @@ protected:
}
- vector<vector<casa::uInt> > make_mapping_time(const casa::VisBuffer& vb, casa::uInt spw)
+ vector<vector<casacore::uInt> > make_mapping_time(const casacore::VisBuffer& vb, casacore::uInt spw)
{
// Determine the baselines in the VisBuffer.
ant1.assign(vb.antenna1());
ant2.assign(vb.antenna2());
- const casa::Vector<casa::Double>& times = vb.timeCentroid();
+ const casacore::Vector<casacore::Double>& times = vb.timeCentroid();
int nrant = 1 + max(max(ant1), max(ant2));
// Sort on baseline (use a baseline nr which is faster to sort).
- casa::Vector<casa::Int> blnr(nrant*ant1);
+ casacore::Vector<casacore::Int> blnr(nrant*ant1);
blnr += ant2; // This is faster than nrant*ant1+ant2 in a single line
- casa::GenSortIndirect<casa::Int>::sort (blIndex, blnr);
+ casacore::GenSortIndirect<casacore::Int>::sort (blIndex, blnr);
// Now determine nr of unique baselines and their start index.
- casa::Float dtime(its_TimeWindow);
- vector<casa::uInt> MapChunck;
- vector<vector<casa::uInt> > Map;
- casa::Double time0(times[0]);
- casa::Int bl_now(blnr[blIndex[0]]);
- for(casa::uInt RowNum=0; RowNum<blIndex.size();++RowNum){
- casa::uInt irow=blIndex[RowNum];
+ casacore::Float dtime(its_TimeWindow);
+ vector<casacore::uInt> MapChunck;
+ vector<vector<casacore::uInt> > Map;
+ casacore::Double time0(times[0]);
+ casacore::Int bl_now(blnr[blIndex[0]]);
+ for(casacore::uInt RowNum=0; RowNum<blIndex.size();++RowNum){
+ casacore::uInt irow=blIndex[RowNum];
- casa::Double timeRow(times[irow]);
+ casacore::Double timeRow(times[irow]);
double u=vb.uvw()[irow](0);
double v=vb.uvw()[irow](1);
double w=vb.uvw()[irow](2);
double uvdistance=(0.001)*sqrt(u*u+v*v)/(2.99e8/itsListFreq[spw]);
- casa::Bool cond0((uvdistance>itsUVmin)&(uvdistance<itsUVmax));
- casa::Bool cond1(abs(w)<itsWMax);
+ casacore::Bool cond0((uvdistance>itsUVmin)&(uvdistance<itsUVmax));
+ casacore::Bool cond1(abs(w)<itsWMax);
if(!(cond0&cond1)){continue;}
if(((timeRow-time0)>dtime)|(blnr[irow]!=bl_now))
@@ -671,11 +671,11 @@ protected:
Map.push_back(MapChunck);
/* cout.precision(20); */
- /* for(casa::uInt i=0; i<Map.size();++i) */
+ /* for(casacore::uInt i=0; i<Map.size();++i) */
/* { */
- /* for(casa::uInt j=0; j<Map[i].size();++j) */
+ /* for(casacore::uInt j=0; j<Map[i].size();++j) */
/* { */
- /* casa::uInt irow=Map[i][j]; */
+ /* casacore::uInt irow=Map[i][j]; */
/* cout<<i<<" "<<j<<" A="<<ant1[irow]<<","<<ant2[irow]<<" w="<<vb.uvw()[irow](2)<<" t="<<times[irow]<<endl; */
/* } */
/* } */
@@ -684,63 +684,63 @@ protected:
}
- vector<casa::Int> WIndexMap;
- vector<casa::uInt> TimesMap;
- //casa::uInt itsSelAnt0;
- //casa::uInt itsSelAnt1;
- casa::Double its_t0;
- casa::Double its_tSel0;
- casa::Double its_tSel1;
+ vector<casacore::Int> WIndexMap;
+ vector<casacore::uInt> TimesMap;
+ //casacore::uInt itsSelAnt0;
+ //casacore::uInt itsSelAnt1;
+ casacore::Double its_t0;
+ casacore::Double its_tSel0;
+ casacore::Double its_tSel1;
- vector<vector<vector<casa::uInt> > > make_mapping_time_W(const casa::VisBuffer& vb, casa::uInt spw)
+ vector<vector<vector<casacore::uInt> > > make_mapping_time_W(const casacore::VisBuffer& vb, casacore::uInt spw)
{
// Determine the baselines in the VisBuffer.
ant1.assign(vb.antenna1());
ant2.assign(vb.antenna2());
- const casa::Vector<casa::Double>& times = vb.timeCentroid();
+ const casacore::Vector<casacore::Double>& times = vb.timeCentroid();
if(its_t0<0.){its_t0=times[0];}
WIndexMap.resize(0);
int nrant = 1 + max(max(ant1), max(ant2));
- casa::Vector<casa::Int> WPCoord;
+ casacore::Vector<casacore::Int> WPCoord;
WPCoord.resize(ant1.size());
- for(casa::uInt irow=0;irow<WPCoord.size();++irow){
+ for(casacore::uInt irow=0;irow<WPCoord.size();++irow){
WPCoord[irow]=itsConvFunc->GiveWindexIncludeNegative(vb.uvw()[irow](2),spw);
}
// Sort on baseline (use a baseline nr which is faster to sort).
- casa::Vector<casa::Int> blnr(ant2+nrant*ant1+nrant*nrant*(WPCoord+itsNWPlanes));
+ casacore::Vector<casacore::Int> blnr(ant2+nrant*ant1+nrant*nrant*(WPCoord+itsNWPlanes));
//blnr += ant2; // This is faster than nrant*ant1+ant2 in a single line
- casa::GenSortIndirect<casa::Int>::sort (blIndex, blnr);
+ casacore::GenSortIndirect<casacore::Int>::sort (blIndex, blnr);
// Now determine nr of unique baselines and their start index.
- casa::Float dtime(its_TimeWindow);
- vector<casa::uInt> MapChunck;
- vector<vector<casa::uInt> > MapW;
- vector<vector<vector<casa::uInt> > > Map;
- casa::Double time0(-1.);//times[blIndex[0]]);
- casa::Int bl_now;//blnr[blIndex[0]]);
- casa::Int iwcoord;//=WPCoord[blIndex[0]]-itsNWPlanes;
+ casacore::Float dtime(its_TimeWindow);
+ vector<casacore::uInt> MapChunck;
+ vector<vector<casacore::uInt> > MapW;
+ vector<vector<vector<casacore::uInt> > > Map;
+ casacore::Double time0(-1.);//times[blIndex[0]]);
+ casacore::Int bl_now;//blnr[blIndex[0]]);
+ casacore::Int iwcoord;//=WPCoord[blIndex[0]]-itsNWPlanes;
- for(casa::uInt RowNum=0; RowNum<blIndex.size();++RowNum){
- casa::uInt irow=blIndex[RowNum];
+ for(casacore::uInt RowNum=0; RowNum<blIndex.size();++RowNum){
+ casacore::uInt irow=blIndex[RowNum];
//cout<<ant1[irow]<<" "<<ant2[irow]<<" "<<times[irow]<<" "<<WPCoord[irow]<<endl;
double u=vb.uvw()[irow](0);
double v=vb.uvw()[irow](1);
double w=vb.uvw()[irow](2);
double uvdistance=(0.001)*sqrt(u*u+v*v)/(2.99e8/itsListFreq[spw]);
- casa::Bool cond0(((uvdistance>itsUVmin)&(uvdistance<itsUVmax)));
- casa::Bool cond1(abs(w)<itsWMax);
- //casa::Bool cond2(((ant1[irow]==8)&(ant2[irow]==0)));
+ casacore::Bool cond0(((uvdistance>itsUVmin)&(uvdistance<itsUVmax)));
+ casacore::Bool cond1(abs(w)<itsWMax);
+ //casacore::Bool cond2(((ant1[irow]==8)&(ant2[irow]==0)));
//if
- //casa::Bool cond2(((ant1[irow]==7)&(ant2[irow]==1)));
- casa::Bool cond2(((ant1[irow]==5)&(ant2[irow]==40)));
- //casa::Bool cond2((ant1[irow]==7));
- //casa::Bool cond2((ant2[irow]==0));
- casa::Double timeRow(times[irow]);
- casa::Bool cond3((timeRow-its_t0)/60.>its_tSel0);
- casa::Bool cond4((timeRow-its_t0)/60.<its_tSel1);
- casa::Bool cond34(cond3&cond4);
+ //casacore::Bool cond2(((ant1[irow]==7)&(ant2[irow]==1)));
+ casacore::Bool cond2(((ant1[irow]==5)&(ant2[irow]==40)));
+ //casacore::Bool cond2((ant1[irow]==7));
+ //casacore::Bool cond2((ant2[irow]==0));
+ casacore::Double timeRow(times[irow]);
+ casacore::Bool cond3((timeRow-its_t0)/60.>its_tSel0);
+ casacore::Bool cond4((timeRow-its_t0)/60.<its_tSel1);
+ casacore::Bool cond34(cond3&cond4);
if(its_tSel0==-1.){cond34=true;}
//if(!(cond0&cond1&cond2&cond34)){continue;}
if(!(cond0&cond1&cond34)){continue;}
@@ -773,19 +773,19 @@ protected:
Map.push_back(MapW);
- /* for(casa::uInt i=0; i<Map.size();++i) */
+ /* for(casacore::uInt i=0; i<Map.size();++i) */
/* { */
- /* for(casa::uInt j=0; j<Map[i].size();++j) */
+ /* for(casacore::uInt j=0; j<Map[i].size();++j) */
/* { */
- /* for(casa::uInt k=0; k<Map[i][j].size();++k) */
+ /* for(casacore::uInt k=0; k<Map[i][j].size();++k) */
/* { */
- /* casa::uInt irow=Map[i][j][k]; */
+ /* casacore::uInt irow=Map[i][j][k]; */
/* cout<<i<<" "<<j<<" "<<k<<" A="<<ant1[irow]<<","<<ant2[irow]<<" w="<<vb.uvw()[irow](2)<<" windex="<<WIndexMap[i]<<" t="<<times[irow]<<endl; */
/* } */
/* } */
/* } */
- /* for(casa::uInt i=0; i<WIndexMap.size();++i) */
+ /* for(casacore::uInt i=0; i<WIndexMap.size();++i) */
/* { */
/* cout<<" windex="<<WIndexMap[i]<<endl; */
/* } */
@@ -796,27 +796,27 @@ protected:
/* } */
/* else { */
- /* casa::Float dtime(its_TimeWindow); */
- /* casa::Double time0(times[blIndex[blStart[i]]]); */
-
- /* vector<casa::uInt> RowChunckStart; */
- /* vector<casa::uInt> RowChunckEnd; */
- /* vector<vector< casa::Float > > WsChunck; */
- /* vector< casa::Float > WChunck; */
- /* vector<casa::Float> WCFforChunck; */
- /* casa::Float wmin(1.e6); */
- /* casa::Float wmax(-1.e6); */
- /* casa::uInt NRow(blEnd[i]-blStart[i]+1); */
- /* casa::Int NpixMax=0; */
- /* casa::uInt WindexLast=itsConvFunc->GiveWindex(vbs.uvw()(2,blIndex[blStart[i]]),spw); */
- /* casa::uInt Windex; */
+ /* casacore::Float dtime(its_TimeWindow); */
+ /* casacore::Double time0(times[blIndex[blStart[i]]]); */
+
+ /* vector<casacore::uInt> RowChunckStart; */
+ /* vector<casacore::uInt> RowChunckEnd; */
+ /* vector<vector< casacore::Float > > WsChunck; */
+ /* vector< casacore::Float > WChunck; */
+ /* vector<casacore::Float> WCFforChunck; */
+ /* casacore::Float wmin(1.e6); */
+ /* casacore::Float wmax(-1.e6); */
+ /* casacore::uInt NRow(blEnd[i]-blStart[i]+1); */
+ /* casacore::Int NpixMax=0; */
+ /* casacore::uInt WindexLast=itsConvFunc->GiveWindex(vbs.uvw()(2,blIndex[blStart[i]]),spw); */
+ /* casacore::uInt Windex; */
/* RowChunckStart.push_back(blStart[i]); */
- /* for(casa::uInt Row=0; Row<NRow; ++Row){ */
- /* casa::uInt irow(blIndex[blStart[i]+Row]); */
- /* casa::Double timeRow(times[irow]); */
- /* casa::Int Npix1=itsConvFunc->GiveWSupport(vbs.uvw()(2,irow),spw); */
+ /* for(casacore::uInt Row=0; Row<NRow; ++Row){ */
+ /* casacore::uInt irow(blIndex[blStart[i]+Row]); */
+ /* casacore::Double timeRow(times[irow]); */
+ /* casacore::Int Npix1=itsConvFunc->GiveWSupport(vbs.uvw()(2,irow),spw); */
/* NpixMax=std::max(NpixMax,Npix1); */
- /* casa::Float w(vbs.uvw()(2,irow)); */
+ /* casacore::Float w(vbs.uvw()(2,irow)); */
/* Windex=itsConvFunc->GiveWindex(vbs.uvw()(2,irow),spw); */
/* //if(WindexLast!=Windex) */
@@ -841,15 +841,15 @@ protected:
/* WsChunck.push_back(WChunck); */
/* RowChunckEnd.push_back(blEnd[i]); */
/* WCFforChunck.push_back((itsConvFunc->wScale()).center(Windex)); */
- /* casa::uInt irow(blIndex[blEnd[i]]); */
- /* casa::Int Npix1=itsConvFunc->GiveWSupport(vbs.uvw()(2,irow),spw); */
+ /* casacore::uInt irow(blIndex[blEnd[i]]); */
+ /* casacore::Int Npix1=itsConvFunc->GiveWSupport(vbs.uvw()(2,irow),spw); */
/* NpixMax=std::max(NpixMax,Npix1); */
- /* // for(casa::uInt chunk=0; chunk<RowChunckStart.size();++chunk){ */
+ /* // for(casacore::uInt chunk=0; chunk<RowChunckStart.size();++chunk){ */
/* // cout<<NRow<<" bl: "<<i<<" || Start("<<RowChunckStart.size()<<"): "<<RowChunckStart[chunk]<<" , End("<<RowChunckEnd.size()<<"): "<<RowChunckEnd[chunk] */
/* // <<" w="<< 0.5*(vbs.uvw()(2,blIndex[RowChunckEnd[chunk]])+vbs.uvw()(2,blIndex[RowChunckStart[chunk]])) */
/* // <<" size="<< WsChunck[chunk].size()<<" wCF="<< WCFforChunck[chunk]<<endl; */
- /* // // for(casa::uInt iii=0; iii< WsChunck[chunk].size();++iii){ */
+ /* // // for(casacore::uInt iii=0; iii< WsChunck[chunk].size();++iii){ */
/* // // cout<<WsChunck[chunk][iii]<<" "<<vbs.uvw()(2,blIndex[RowChunckEnd[chunk]]<<endl; */
/* // // } */
@@ -857,8 +857,8 @@ protected:
- /* for(casa::uInt chunk=0; chunk<RowChunckStart.size();++chunk){ */
- /* casa::Float WmeanChunk(0.5*(vbs.uvw()(2,blIndex[RowChunckEnd[chunk]])+vbs.uvw()(2,blIndex[RowChunckStart[chunk]]))); */
+ /* for(casacore::uInt chunk=0; chunk<RowChunckStart.size();++chunk){ */
+ /* casacore::Float WmeanChunk(0.5*(vbs.uvw()(2,blIndex[RowChunckEnd[chunk]])+vbs.uvw()(2,blIndex[RowChunckStart[chunk]]))); */
/* cout<<times[blIndex[RowChunckEnd[chunk]]]-times[blIndex[RowChunckStart[chunk]]]<<" "<<WmeanChunk<<endl; */
/* cfStore= itsConvFunc->makeConvolutionFunction (ant1[ist], ant2[ist], timeChunk,//MaxTime, */
/* WmeanChunk, */
@@ -884,67 +884,67 @@ protected:
double itsSupport_Speroidal;
- vector<vector<vector<vector<casa::uInt> > > > make_mapping_time_W_grid(const casa::VisBuffer& vb, casa::uInt spw)
+ vector<vector<vector<vector<casacore::uInt> > > > make_mapping_time_W_grid(const casacore::VisBuffer& vb, casacore::uInt spw)
{
// Determine the baselines in the VisBuffer.
ant1.assign(vb.antenna1());
ant2.assign(vb.antenna2());
- const casa::Vector<casa::Double>& times = vb.timeCentroid();
+ const casacore::Vector<casacore::Double>& times = vb.timeCentroid();
if(its_t0<0.){its_t0=times[0];}
WIndexMap.resize(0);
- casa::Double recipWvl = itsListFreq[spw] / 2.99e8;
+ casacore::Double recipWvl = itsListFreq[spw] / 2.99e8;
int nrant = 1 + max(max(ant1), max(ant2));
- casa::Vector<casa::Int> WPCoord;
+ casacore::Vector<casacore::Int> WPCoord;
WPCoord.resize(ant1.size());
- for(casa::uInt irow=0;irow<WPCoord.size();++irow){
+ for(casacore::uInt irow=0;irow<WPCoord.size();++irow){
WPCoord[irow]=itsConvFunc->GiveWindexIncludeNegative(vb.uvw()[irow](2),spw);
}
// Sort on baseline (use a baseline nr which is faster to sort).
- casa::Vector<casa::Int> blnr(ant2+nrant*ant1+nrant*nrant*(WPCoord+itsNWPlanes));
+ casacore::Vector<casacore::Int> blnr(ant2+nrant*ant1+nrant*nrant*(WPCoord+itsNWPlanes));
//blnr += ant2; // This is faster than nrant*ant1+ant2 in a single line
- casa::GenSortIndirect<casa::Int>::sort (blIndex, blnr);
+ casacore::GenSortIndirect<casacore::Int>::sort (blIndex, blnr);
// Now determine nr of unique baselines and their start index.
- casa::Float dtime(its_TimeWindow);
- vector<casa::uInt> MapChunck;
- vector<vector<casa::uInt> > MapW;
- vector<vector<vector<casa::uInt> > > Map;
+ casacore::Float dtime(its_TimeWindow);
+ vector<casacore::uInt> MapChunck;
+ vector<vector<casacore::uInt> > MapW;
+ vector<vector<vector<casacore::uInt> > > Map;
- vector<casa::Int > xminBL;
- vector<vector<casa::Int> > xminW;
- vector<casa::Int > xmaxBL;
- vector<vector<casa::Int> > xmaxW;
- vector<casa::Int > yminBL;
- vector<vector<casa::Int> > yminW;
- vector<casa::Int > ymaxBL;
- vector<vector<casa::Int> > ymaxW;
+ vector<casacore::Int > xminBL;
+ vector<vector<casacore::Int> > xminW;
+ vector<casacore::Int > xmaxBL;
+ vector<vector<casacore::Int> > xmaxW;
+ vector<casacore::Int > yminBL;
+ vector<vector<casacore::Int> > yminW;
+ vector<casacore::Int > ymaxBL;
+ vector<vector<casacore::Int> > ymaxW;
- casa::Double time0(-1.);//times[blIndex[0]]);
- casa::Int bl_now;//blnr[blIndex[0]]);
- casa::Int iwcoord;//=WPCoord[blIndex[0]]-itsNWPlanes;
+ casacore::Double time0(-1.);//times[blIndex[0]]);
+ casacore::Int bl_now;//blnr[blIndex[0]]);
+ casacore::Int iwcoord;//=WPCoord[blIndex[0]]-itsNWPlanes;
float scaling(2.);
float support((itsSupport_Speroidal-1)/2+1);
- casa::Int xmin=2147483647;
- casa::Int xmax=-2147483647;
- casa::Int ymin=2147483647;
- casa::Int ymax=-2147483647;
+ casacore::Int xmin=2147483647;
+ casacore::Int xmax=-2147483647;
+ casacore::Int ymin=2147483647;
+ casacore::Int ymax=-2147483647;
- for(casa::uInt RowNum=0; RowNum<blIndex.size();++RowNum){
- casa::uInt irow=blIndex[RowNum];
+ for(casacore::uInt RowNum=0; RowNum<blIndex.size();++RowNum){
+ casacore::uInt irow=blIndex[RowNum];
double u=vb.uvw()[irow](0);
double v=vb.uvw()[irow](1);
double w=vb.uvw()[irow](2);
double uvdistance=(0.001)*sqrt(u*u+v*v)/(2.99e8/itsListFreq[spw]);
- casa::Bool cond0(((uvdistance>itsUVmin)&(uvdistance<itsUVmax)));
- casa::Bool cond1(abs(w)<itsWMax);
- casa::Bool cond2(((ant1[irow]==5)&(ant2[irow]==40)));
- casa::Double timeRow(times[irow]);
- casa::Bool cond3((timeRow-its_t0)/60.>its_tSel0);
- casa::Bool cond4((timeRow-its_t0)/60.<its_tSel1);
- casa::Bool cond34(cond3&cond4);
+ casacore::Bool cond0(((uvdistance>itsUVmin)&(uvdistance<itsUVmax)));
+ casacore::Bool cond1(abs(w)<itsWMax);
+ casacore::Bool cond2(((ant1[irow]==5)&(ant2[irow]==40)));
+ casacore::Double timeRow(times[irow]);
+ casacore::Bool cond3((timeRow-its_t0)/60.>its_tSel0);
+ casacore::Bool cond4((timeRow-its_t0)/60.<its_tSel1);
+ casacore::Bool cond34(cond3&cond4);
if(its_tSel0==-1.){cond34=true;}
if(!(cond0&cond1&cond34)){continue;}
//if(!(cond0&cond1&cond34&cond2)){continue;}
@@ -992,8 +992,8 @@ protected:
MapChunck.push_back(irow);
- casa::Int xrow = int(u * uvScale(0) * recipWvl + uvOffset(0));
- casa::Int yrow = int(v * uvScale(1) * recipWvl + uvOffset(1));
+ casacore::Int xrow = int(u * uvScale(0) * recipWvl + uvOffset(0));
+ casacore::Int yrow = int(v * uvScale(1) * recipWvl + uvOffset(1));
if(xrow-support<xmin){xmin=xrow-support;};
if(xrow+support>xmax){xmax=xrow+support;};
if(yrow-support<ymin){ymin=yrow-support;};
@@ -1013,19 +1013,19 @@ protected:
WIndexMap.push_back(iwcoord);
- /* for(casa::uInt i=0; i<Map.size();++i) */
+ /* for(casacore::uInt i=0; i<Map.size();++i) */
/* { */
- /* for(casa::uInt j=0; j<Map[i].size();++j) */
+ /* for(casacore::uInt j=0; j<Map[i].size();++j) */
/* { */
- /* for(casa::uInt k=0; k<Map[i][j].size();++k) */
+ /* for(casacore::uInt k=0; k<Map[i][j].size();++k) */
/* { */
- /* casa::uInt irow=Map[i][j][k]; */
+ /* casacore::uInt irow=Map[i][j][k]; */
/* cout<<"iw="<<i<<" ibl="<<j<<" imap="<<k<<" A="<<ant1[irow]<<","<<ant2[irow]<<" w="<<vb.uvw()[irow](2)<<" windex="<<WIndexMap[i]<<" t="<<times[irow]<<endl; */
/* double u=vb.uvw()[irow](0); */
/* double v=vb.uvw()[irow](1); */
- /* casa::Int xrow=int(float(u)*scaling); */
- /* casa::Int yrow=int(float(v)*scaling); */
+ /* casacore::Int xrow=int(float(u)*scaling); */
+ /* casacore::Int yrow=int(float(v)*scaling); */
/* cout<<" "<<xminW[i][j]<<" ("<<xrow-support<<")"<<endl; */
/* cout<<" "<<xmaxW[i][j]<<" ("<<xrow+support<<")"<<endl; */
/* cout<<" "<<yminW[i][j]<<" ("<<yrow-support<<")"<<endl; */
@@ -1037,27 +1037,27 @@ protected:
// ofstream outFile("output_grids.txt");
- vector<casa::uInt> MapChunckOut;
- vector<vector<casa::uInt> > MapWGridOut;
- vector<vector<vector<casa::uInt> > > MapWOut;
- vector<vector<vector<vector<casa::uInt> > > > MapOut;
+ vector<casacore::uInt> MapChunckOut;
+ vector<vector<casacore::uInt> > MapWGridOut;
+ vector<vector<vector<casacore::uInt> > > MapWOut;
+ vector<vector<vector<vector<casacore::uInt> > > > MapOut;
- casa::vector<casa::IPosition > posBlock;
+ casacore::vector<casacore::IPosition > posBlock;
- for(casa::uInt i=0; i<Map.size();++i)
+ for(casacore::uInt i=0; i<Map.size();++i)
{
MapWGridOut.resize(0);
MapWOut.resize(0);
- casa::Vector<casa::Bool> done;
+ casacore::Vector<casacore::Bool> done;
done.resize(Map[i].size());
done=false;
- casa::Bool alldone(false);
- casa::Bool cond_xmin,cond_xmax,cond_ymin,cond_ymax;
- casa::uInt iblock(0);
+ casacore::Bool alldone(false);
+ casacore::Bool cond_xmin,cond_xmax,cond_ymin,cond_ymax;
+ casacore::uInt iblock(0);
//MapWGridOut.push_back(Map[i][0]);
posBlock.resize(0);
- casa::IPosition pos(2,1,1);
+ casacore::IPosition pos(2,1,1);
//pos(0)=i;
//pos(1)=0;
//posBlock.push_back(pos);
@@ -1066,18 +1066,18 @@ protected:
while(!alldone){
- for(casa::uInt j=0; j<Map[i].size();++j)
+ for(casacore::uInt j=0; j<Map[i].size();++j)
{
// Find if baseline j has overlap with the current grid
if(done[j]==true){continue;}
- casa::Bool NoOverlap(true);
- for(casa::uInt jj=0; jj<MapWGridOut.size();++jj)
+ casacore::Bool NoOverlap(true);
+ for(casacore::uInt jj=0; jj<MapWGridOut.size();++jj)
{
cond_xmin=xminW[i][j]<=xmaxW[posBlock[jj](0)][posBlock[jj](1)];
cond_xmax=xmaxW[i][j]>=xminW[posBlock[jj](0)][posBlock[jj](1)];
cond_ymin=yminW[i][j]<=ymaxW[posBlock[jj](0)][posBlock[jj](1)];
cond_ymax=ymaxW[i][j]>=yminW[posBlock[jj](0)][posBlock[jj](1)];
- casa::Bool condIsOverlap(cond_xmin&&cond_xmax&&cond_ymin&&cond_ymax);
+ casacore::Bool condIsOverlap(cond_xmin&&cond_xmax&&cond_ymin&&cond_ymax);
if(condIsOverlap){
NoOverlap=false;
break;
@@ -1093,14 +1093,14 @@ protected:
}
alldone=true;
- for(casa::uInt j=0; j<done.size();++j)
+ for(casacore::uInt j=0; j<done.size();++j)
{
if(done[j]==false){alldone=false;break;}
}
- /* for(casa::uInt iii=0; iii<MapWGridOut.size();++iii){ */
- /* casa::uInt icoord(posBlock[iii](0)); */
- /* casa::uInt jcoord(posBlock[iii](1)); */
+ /* for(casacore::uInt iii=0; iii<MapWGridOut.size();++iii){ */
+ /* casacore::uInt icoord(posBlock[iii](0)); */
+ /* casacore::uInt jcoord(posBlock[iii](1)); */
/* outFile<<" "<<i<<" "<<iblock<<" "<<xminW[icoord][jcoord]<<" "<<xmaxW[icoord][jcoord]<<" "<<yminW[icoord][jcoord]<<" "<<ymaxW[icoord][jcoord]<<endl; */
/* } */
@@ -1116,10 +1116,10 @@ protected:
}
- /* for(casa::uInt i=0; i<MapOut.size();++i){ */
- /* for(casa::uInt j=0; j<MapOut[i].size();++j){ */
- /* casa::uInt icoord(posBlock[iii](0)); */
- /* casa::uInt jcoord(posBlock[iii](1)); */
+ /* for(casacore::uInt i=0; i<MapOut.size();++i){ */
+ /* for(casacore::uInt j=0; j<MapOut[i].size();++j){ */
+ /* casacore::uInt icoord(posBlock[iii](0)); */
+ /* casacore::uInt jcoord(posBlock[iii](1)); */
/* outFile<<" "<<i<<" "<<iblock<<" "<<xminW[icoord][jcoord]<<" "<<xmaxW[icoord][jcoord]<<" "<<yminW[icoord][jcoord]<<" "<<ymaxW[icoord][jcoord]<<endl; */
/* } */
/* } */
@@ -1133,7 +1133,7 @@ protected:
FFTCMatrix FFTMachine;
- void dofft(casa::Matrix<casa::Complex>& arr, bool direction)
+ void dofft(casacore::Matrix<casacore::Complex>& arr, bool direction)
{
int sz(arr.nrow());
int nthreads(OpenMP::maxThreads());
@@ -1152,7 +1152,7 @@ protected:
///////////////////////////////////////
vector<FFTCMatrix> VecFFTMachine;
- void dofftVec(casa::Matrix<casa::Complex>& arr, bool direction, int nth=0, int pol=0)
+ void dofftVec(casacore::Matrix<casacore::Complex>& arr, bool direction, int nth=0, int pol=0)
{
int sz(arr.nrow());
int nthreads(OpenMP::maxThreads());
@@ -1176,92 +1176,92 @@ protected:
////////////////////////////////////////
template <class T>
- void store (const casa::DirectionCoordinate &dir, const casa::Matrix<T> &data,
+ void store (const casacore::DirectionCoordinate &dir, const casacore::Matrix<T> &data,
const string &name)
{
//cout<<"Saving... "<<name<<endl;
- casa::Vector<casa::Int> stokes(1);
- stokes(0) = casa::Stokes::I;
- casa::CoordinateSystem csys;
+ casacore::Vector<casacore::Int> stokes(1);
+ stokes(0) = casacore::Stokes::I;
+ casacore::CoordinateSystem csys;
csys.addCoordinate(dir);
- csys.addCoordinate(casa::StokesCoordinate(stokes));
- csys.addCoordinate(casa::SpectralCoordinate(casa::MFrequency::TOPO, 60e6, 1.0, 0.0, 60e6));
- casa::PagedImage<T> im(casa::TiledShape(casa::IPosition(4, data.shape()(0), data.shape()(1), 1, 1)), csys, name);
- im.putSlice(data, casa::IPosition(4, 0, 0, 0, 0));
+ csys.addCoordinate(casacore::StokesCoordinate(stokes));
+ csys.addCoordinate(casacore::SpectralCoordinate(casacore::MFrequency::TOPO, 60e6, 1.0, 0.0, 60e6));
+ casacore::PagedImage<T> im(casacore::TiledShape(casacore::IPosition(4, data.shape()(0), data.shape()(1), 1, 1)), csys, name);
+ im.putSlice(data, casacore::IPosition(4, 0, 0, 0, 0));
}
template <class T>
- void store(const casa::Matrix<T> &data, const string &name)
+ void store(const casacore::Matrix<T> &data, const string &name)
{
- casa::Matrix<casa::Double> xform(2, 2);
+ casacore::Matrix<casacore::Double> xform(2, 2);
xform = 0.0;
xform.diagonal() = 1.0;
- casa::Quantum<casa::Double> incLon((8.0 / data.shape()(0)) * casa::C::pi / 180.0, "rad");
- casa::Quantum<casa::Double> incLat((8.0 / data.shape()(1)) * casa::C::pi / 180.0, "rad");
- casa::Quantum<casa::Double> refLatLon(45.0 * casa::C::pi / 180.0, "rad");
- casa::DirectionCoordinate dir(casa::MDirection::J2000, casa::Projection(casa::Projection::SIN),
+ casacore::Quantum<casacore::Double> incLon((8.0 / data.shape()(0)) * casacore::C::pi / 180.0, "rad");
+ casacore::Quantum<casacore::Double> incLat((8.0 / data.shape()(1)) * casacore::C::pi / 180.0, "rad");
+ casacore::Quantum<casacore::Double> refLatLon(45.0 * casacore::C::pi / 180.0, "rad");
+ casacore::DirectionCoordinate dir(casacore::MDirection::J2000, casacore::Projection(casacore::Projection::SIN),
refLatLon, refLatLon, incLon, incLat,
xform, data.shape()(0) / 2, data.shape()(1) / 2);
store(dir, data, name);
}
template <class T>
- void store(const casa::Cube<T> &data, const string &name)
+ void store(const casacore::Cube<T> &data, const string &name)
{
- casa::Matrix<casa::Double> xform(2, 2);
+ casacore::Matrix<casacore::Double> xform(2, 2);
xform = 0.0;
xform.diagonal() = 1.0;
- casa::Quantum<casa::Double> incLon((8.0 / data.shape()(0)) * casa::C::pi / 180.0, "rad");
- casa::Quantum<casa::Double> incLat((8.0 / data.shape()(1)) * casa::C::pi / 180.0, "rad");
- casa::Quantum<casa::Double> refLatLon(45.0 * casa::C::pi / 180.0, "rad");
- casa::DirectionCoordinate dir(casa::MDirection::J2000, casa::Projection(casa::Projection::SIN),
+ casacore::Quantum<casacore::Double> incLon((8.0 / data.shape()(0)) * casacore::C::pi / 180.0, "rad");
+ casacore::Quantum<casacore::Double> incLat((8.0 / data.shape()(1)) * casacore::C::pi / 180.0, "rad");
+ casacore::Quantum<casacore::Double> refLatLon(45.0 * casacore::C::pi / 180.0, "rad");
+ casacore::DirectionCoordinate dir(casacore::MDirection::J2000, casacore::Projection(casacore::Projection::SIN),
refLatLon, refLatLon, incLon, incLat,
xform, data.shape()(0) / 2, data.shape()(1) / 2);
store(dir, data, name);
}
template <class T>
- void store(const casa::DirectionCoordinate &dir, const casa::Cube<T> &data,
+ void store(const casacore::DirectionCoordinate &dir, const casacore::Cube<T> &data,
const string &name)
{
// AlwaysAssert(data.shape()(2) == 4, SynthesisError);
//cout<<"Saving... "<<name<<endl;
- casa::Vector<casa::Int> stokes(4);
- stokes(0) = casa::Stokes::XX;
- stokes(1) = casa::Stokes::XY;
- stokes(2) = casa::Stokes::YX;
- stokes(3) = casa::Stokes::YY;
- casa::CoordinateSystem csys;
+ casacore::Vector<casacore::Int> stokes(4);
+ stokes(0) = casacore::Stokes::XX;
+ stokes(1) = casacore::Stokes::XY;
+ stokes(2) = casacore::Stokes::YX;
+ stokes(3) = casacore::Stokes::YY;
+ casacore::CoordinateSystem csys;
csys.addCoordinate(dir);
- csys.addCoordinate(casa::StokesCoordinate(stokes));
- csys.addCoordinate(casa::SpectralCoordinate(casa::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
- casa::PagedImage<T>
- im(casa::TiledShape(casa::IPosition(4, data.shape()(0), data.shape()(1), 4, 1)),
+ csys.addCoordinate(casacore::StokesCoordinate(stokes));
+ csys.addCoordinate(casacore::SpectralCoordinate(casacore::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
+ casacore::PagedImage<T>
+ im(casacore::TiledShape(casacore::IPosition(4, data.shape()(0), data.shape()(1), 4, 1)),
csys, name);
- im.putSlice(data, casa::IPosition(4, 0, 0, 0, 0));
+ im.putSlice(data, casacore::IPosition(4, 0, 0, 0, 0));
}
/* template <class T> */
/* void store(const Cube<T> &data, const string &name) */
/* { */
/* CoordinateSystem csys; */
- /* casa::Matrix<casa::Double> xform(2, 2); */
+ /* casacore::Matrix<casacore::Double> xform(2, 2); */
/* xform = 0.0; */
/* xform.diagonal() = 1.0; */
- /* Quantum<casa::Double> incLon((8.0 / data.shape()(0)) * C::pi / 180.0, "rad"); */
- /* Quantum<casa::Double> incLat((8.0 / data.shape()(1)) * C::pi / 180.0, "rad"); */
- /* Quantum<casa::Double> refLatLon(45.0 * C::pi / 180.0, "rad"); */
+ /* Quantum<casacore::Double> incLon((8.0 / data.shape()(0)) * C::pi / 180.0, "rad"); */
+ /* Quantum<casacore::Double> incLat((8.0 / data.shape()(1)) * C::pi / 180.0, "rad"); */
+ /* Quantum<casacore::Double> refLatLon(45.0 * C::pi / 180.0, "rad"); */
/* csys.addCoordinate(DirectionCoordinate(MDirection::J2000, Projection(Projection::SIN), */
/* refLatLon, refLatLon, incLon, incLat, */
/* xform, data.shape()(0) / 2, data.shape()(1) / 2)); */
- /* casa::Vector<casa::Int> stokes(4); */
+ /* casacore::Vector<casacore::Int> stokes(4); */
/* stokes(0) = Stokes::XX; */
/* stokes(1) = Stokes::XY; */
/* stokes(2) = Stokes::YX; */
/* stokes(3) = Stokes::YY; */
/* csys.addCoordinate(StokesCoordinate(stokes)); */
- /* csys.addCoordinate(SpectralCoordinate(casa::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6)); */
+ /* csys.addCoordinate(SpectralCoordinate(casacore::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6)); */
/* PagedImage<T> im(TiledShape(IPosition(4, data.shape()(0), data.shape()(1), 4, 1)), csys, name); */
/* im.putSlice(data, IPosition(4, 0, 0, 0, 0)); */
diff --git a/CEP/Imager/AWImager2/include/AWImager2/FTMachineWStackWB.h b/CEP/Imager/AWImager2/include/AWImager2/FTMachineWStackWB.h
index 15d16c0624ab309f2fd0d559fcd581acd50e0c16..8f078ec3b6163210113678de4ebefeddd22f49c8 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/FTMachineWStackWB.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/FTMachineWStackWB.h
@@ -39,10 +39,10 @@ class VisBuffer;
class FTMachineWStackWB : public FTMachine {
public:
- static const casa::String theirName;
+ static const casacore::String theirName;
FTMachineWStackWB(
- const casa::MeasurementSet& ms,
+ const casacore::MeasurementSet& ms,
const ParameterSet& parset);
virtual ~FTMachineWStackWB();
@@ -56,50 +56,50 @@ public:
// Clone
FTMachineWStackWB* clone() const;
- virtual casa::String name() const { return theirName;}
+ virtual casacore::String name() const { return theirName;}
// Get actual coherence from grid by degridding
- virtual void get(casa::VisBuffer& vb, casa::Int row=-1);
- virtual void get(VisBuffer& vb, casa::Int row=-1);
+ virtual void get(casacore::VisBuffer& vb, casacore::Int row=-1);
+ virtual void get(VisBuffer& vb, casacore::Int row=-1);
// Put coherence to grid by gridding.
- using casa::FTMachine::put;
+ using casacore::FTMachine::put;
virtual void put(
const VisBuffer& vb,
- casa::Int row = -1,
- casa::Bool dopsf = casa::False,
- casa::FTMachine::Type type = casa::FTMachine::OBSERVED);
+ casacore::Int row = -1,
+ casacore::Bool dopsf = casacore::False,
+ casacore::FTMachine::Type type = casacore::FTMachine::OBSERVED);
protected:
- virtual void initialize_model_grids(casa::Bool normalize);
+ virtual void initialize_model_grids(casacore::Bool normalize);
// Get the appropriate data pointer
- casa::Array<casa::Complex>* getDataPointer(const casa::IPosition&, casa::Bool);
+ casacore::Array<casacore::Complex>* getDataPointer(const casacore::IPosition&, casacore::Bool);
// Gridder
- casa::String convType;
+ casacore::String convType;
- casa::Float maxAbsData;
+ casacore::Float maxAbsData;
// Useful IPositions
- casa::IPosition centerLoc;
- casa::IPosition offsetLoc;
+ casacore::IPosition centerLoc;
+ casacore::IPosition offsetLoc;
// Shape of the padded image
- casa::IPosition padded_shape;
+ casacore::IPosition padded_shape;
- casa::Int convSampling;
- casa::Float pbLimit_p;
- casa::Bool itsSplitBeam;
+ casacore::Int convSampling;
+ casacore::Float pbLimit_p;
+ casacore::Bool itsSplitBeam;
int itsNThread;
- casa::Int itsRefFreq;
- casa::Float itsTimeWindow;
+ casacore::Int itsRefFreq;
+ casacore::Float itsTimeWindow;
- casa::CountedPtr<VisResamplerWB> itsVisResampler;
+ casacore::CountedPtr<VisResamplerWB> itsVisResampler;
virtual VisResampler* visresampler() {return &*itsVisResampler;}
private:
@@ -110,7 +110,7 @@ private:
int end;
double time;
double w;
- casa::Matrix<casa::Float> sum_weight;
+ casacore::Matrix<casacore::Float> sum_weight;
vector<int> wplane_map;
};
@@ -118,21 +118,21 @@ private:
{
VisibilityMap() : max_w_plane(0) {}
vector<Chunk> chunks;
- casa::Vector<casa::uInt> baseline_index_map;
+ casacore::Vector<casacore::uInt> baseline_index_map;
int max_w_plane;
};
VisibilityMap make_mapping(
const VisBuffer& vb,
- const casa::Vector< casa::Double > &frequency_list_CF,
+ const casacore::Vector< casacore::Double > &frequency_list_CF,
double dtime,
double w_step);
bool put_on_w_plane(
const VisBuffer &vb,
const VBStore &vbs,
- const casa::Vector<casa::Double> &lsr_frequency,
- vector< casa::Array<casa::Complex> > &w_plane_grids,
+ const casacore::Vector<casacore::Double> &lsr_frequency,
+ vector< casacore::Array<casacore::Complex> > &w_plane_grids,
const VisibilityMap &v,
int w_plane,
double w_offset,
diff --git a/CEP/Imager/AWImager2/include/AWImager2/Imager.h b/CEP/Imager/AWImager2/include/AWImager2/Imager.h
index df3642d198d193c955f0d72b458fdd761d5e4ad7..e90747cc6f49c33c24d12b2284d89a7929ad6a53 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/Imager.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/Imager.h
@@ -38,7 +38,7 @@ namespace LofarFT {
// @brief Imager for LOFAR data correcting for DD effects
- class Imager : public casa::Imager
+ class Imager : public casacore::Imager
// TODO
// override Imager::operator= to copy LofarImager data members
// override Imager::defaults to set lofar_imwgt_p
@@ -48,75 +48,75 @@ namespace LofarFT {
public:
// Construct from the Imager object.
- explicit Imager (casa::MeasurementSet&,
+ explicit Imager (casacore::MeasurementSet&,
LOFAR::ParameterSet& parset);
virtual ~Imager();
// Create the LofarFTMachine and fill ft_p in the parent.
- virtual casa::Bool createFTMachine();
+ virtual casacore::Bool createFTMachine();
virtual void setSkyEquation();
virtual void makeVisSet(
- casa::MeasurementSet& ms,
- casa::Bool compress,
- casa::Bool mosaicOrder);
+ casacore::MeasurementSet& ms,
+ casacore::Bool compress,
+ casacore::Bool mosaicOrder);
// Get the average primary beam.
- const casa::Matrix<casa::Float>& getAveragePB() const
+ const casacore::Matrix<casacore::Float>& getAveragePB() const
{
return itsFTMachine->getAveragePB();
}
// Get the spheroidal cut.
- const casa::Matrix<casa::Float>& getSpheroidal() const
+ const casacore::Matrix<casacore::Float>& getSpheroidal() const
{
return itsFTMachine->getSpheroidal();
}
- casa::Bool makeimage(const casa::String& type, const casa::String& image);
+ casacore::Bool makeimage(const casacore::String& type, const casacore::String& image);
// Show the relative timings of the various steps.
void showTimings (std::ostream&, double duration) const;
- casa::Bool restoreImages(const casa::Vector<casa::String>& restored, casa::Bool modresiduals=casa::True);
+ casacore::Bool restoreImages(const casacore::Vector<casacore::String>& restored, casacore::Bool modresiduals=casacore::True);
- virtual casa::Bool checkCoord(const casa::CoordinateSystem& coordsys,
- const casa::String& imageName);
+ virtual casacore::Bool checkCoord(const casacore::CoordinateSystem& coordsys,
+ const casacore::String& imageName);
- casa::Record initClean(
- const casa::String& algorithm,
- const casa::Int niter,
- const casa::Float gain,
- const casa::Quantity& threshold,
- const casa::Vector<casa::String>& model,
- const casa::Vector<casa::Bool>& fixed,
- const casa::String& complist,
- const casa::Vector<casa::String>& mask,
- const casa::Vector<casa::String>& restored,
- const casa::Vector<casa::String>& residual,
- const casa::Vector<casa::String>& psf = casa::Vector<casa::String>(0),
- const casa::Bool firstrun=true);
-
- casa::Record doClean(const casa::Bool firstrun=true);
+ casacore::Record initClean(
+ const casacore::String& algorithm,
+ const casacore::Int niter,
+ const casacore::Float gain,
+ const casacore::Quantity& threshold,
+ const casacore::Vector<casacore::String>& model,
+ const casacore::Vector<casacore::Bool>& fixed,
+ const casacore::String& complist,
+ const casacore::Vector<casacore::String>& mask,
+ const casacore::Vector<casacore::String>& restored,
+ const casacore::Vector<casacore::String>& residual,
+ const casacore::Vector<casacore::String>& psf = casacore::Vector<casacore::String>(0),
+ const casacore::Bool firstrun=true);
+
+ casacore::Record doClean(const casacore::Bool firstrun=true);
- void initPredict(const casa::Vector<casa::String>& modelNames);
+ void initPredict(const casacore::Vector<casacore::String>& modelNames);
void predict();
- casa::Bool set_imaging_weight(const ParameterSet& parset);
+ casacore::Bool set_imaging_weight(const ParameterSet& parset);
private:
//# Data members.
ParameterSet &itsParset;
FTMachine* itsFTMachine;
- vector<casa::Array<casa::Complex> > itsGridsParallel;
- vector<casa::Array<casa::DComplex> > itsGridsParallel2;
+ vector<casacore::Array<casacore::Complex> > itsGridsParallel;
+ vector<casacore::Array<casacore::DComplex> > itsGridsParallel2;
VisibilityIterator* lofar_rvi_p;
- casa::CountedPtr<VisImagingWeight> lofar_imwgt_p;
- casa::Vector<casa::String> itsPSFNames;
+ casacore::CountedPtr<VisImagingWeight> lofar_imwgt_p;
+ casacore::Vector<casacore::String> itsPSFNames;
};
diff --git a/CEP/Imager/AWImager2/include/AWImager2/Operation.h b/CEP/Imager/AWImager2/include/AWImager2/Operation.h
index 1ac0d908380eca37da9aa4b09ab84ef7ba75d422..f7685d9eb7603e73506b520cc891bbf1b20e89c2 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/Operation.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/Operation.h
@@ -66,34 +66,34 @@ namespace LOFAR {
void initFTMachine();
- void makeEmptyImage(const casa::String& imgName, casa::Int fieldid);
+ void makeEmptyImage(const casacore::String& imgName, casacore::Int fieldid);
virtual void run() {}; // Only derived classes will do something useful in run()
virtual void showHelp (ostream& os, const string& name);
- static casa::IPosition readIPosition (const casa::String& in);
+ static casacore::IPosition readIPosition (const casacore::String& in);
- static casa::Quantity readQuantity (const casa::String& in);
+ static casacore::Quantity readQuantity (const casacore::String& in);
- static casa::MDirection readDirection (const casa::String& in);
+ static casacore::MDirection readDirection (const casacore::String& in);
static void readFilter (
- const casa::String& filter,
- casa::Quantity& bmajor,
- casa::Quantity& bminor,
- casa::Quantity& bpa);
+ const casacore::String& filter,
+ casacore::Quantity& bmajor,
+ casacore::Quantity& bminor,
+ casacore::Quantity& bpa);
static void normalize(
- casa::String imagename_in,
- casa::String avgpb_name,
- casa::String imagename_out);
+ casacore::String imagename_in,
+ casacore::String avgpb_name,
+ casacore::String imagename_out);
protected:
ParameterSet &itsParset;
- casa::String itsMSName;
- casa::MeasurementSet itsMS;
- casa::CountedPtr<Imager> itsImager;
+ casacore::String itsMSName;
+ casacore::MeasurementSet itsMS;
+ casacore::CountedPtr<Imager> itsImager;
bool needsData;
bool needsImage;
bool needsFTMachine;
@@ -104,9 +104,9 @@ namespace LOFAR {
void showHelpImage (ostream& os, const string& name);
void showHelpFTMachine (ostream& os, const string& name);
void showHelpWeight (ostream& os, const string& name);
- casa::Double observationReferenceFreq(
- const casa::MeasurementSet &ms,
- casa::uInt idDataDescription);
+ casacore::Double observationReferenceFreq(
+ const casacore::MeasurementSet &ms,
+ casacore::uInt idDataDescription);
};
// Factory that can be used to generate new Operation objects.
diff --git a/CEP/Imager/AWImager2/include/AWImager2/OperationClean.h b/CEP/Imager/AWImager2/include/AWImager2/OperationClean.h
index 13c1a95baaff8ec8d1c207e1b92b879493a12aff..3ba7cc41c638fb2258aae7052283bef56641a7ce 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/OperationClean.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/OperationClean.h
@@ -37,14 +37,14 @@ namespace LofarFT {
private:
- casa::String itsAvgpbName;
- casa::Vector<casa::String> itsModelNames;
- casa::Vector<casa::String> itsResidualNames;
- casa::Vector<casa::String> itsRestoredNames;
- casa::Vector<casa::String> itsModelNames_normalized;
- casa::Vector<casa::String> itsResidualNames_normalized;
- casa::Vector<casa::String> itsRestoredNames_normalized;
- casa::Vector<casa::String> itsPsfNames;
+ casacore::String itsAvgpbName;
+ casacore::Vector<casacore::String> itsModelNames;
+ casacore::Vector<casacore::String> itsResidualNames;
+ casacore::Vector<casacore::String> itsRestoredNames;
+ casacore::Vector<casacore::String> itsModelNames_normalized;
+ casacore::Vector<casacore::String> itsResidualNames_normalized;
+ casacore::Vector<casacore::String> itsRestoredNames_normalized;
+ casacore::Vector<casacore::String> itsPsfNames;
};
diff --git a/CEP/Imager/AWImager2/include/AWImager2/OperationImage.h b/CEP/Imager/AWImager2/include/AWImager2/OperationImage.h
index 77a793e308a5f271261742183f6821f19b6131fc..bcce89a69bcb3279f385465df3b7aca43af59ff0 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/OperationImage.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/OperationImage.h
@@ -37,7 +37,7 @@ namespace LofarFT {
virtual void showHelp (ostream& os, const std::string& name);
protected:
- casa::String itsImageName;
+ casacore::String itsImageName;
};
} //# namespace LofarFT
diff --git a/CEP/Imager/AWImager2/include/AWImager2/ScopedTimer.h b/CEP/Imager/AWImager2/include/AWImager2/ScopedTimer.h
index 794047ff91be73f9b14f57e12d645911d9836637..b912f0bcd6ba9a78780ceef6e7a6e3f1060af185 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/ScopedTimer.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/ScopedTimer.h
@@ -36,7 +36,7 @@ class ScopedTimer
{
public:
- ScopedTimer(casa::String id);
+ ScopedTimer(casacore::String id);
virtual ~ScopedTimer();
@@ -45,11 +45,11 @@ public:
private:
- casa::PrecTimer itsPrecTimer;
+ casacore::PrecTimer itsPrecTimer;
- casa::Double* itsTime;
+ casacore::Double* itsTime;
- static std::map<casa::String, casa::Double>& timings();
+ static std::map<casacore::String, casacore::Double>& timings();
};
diff --git a/CEP/Imager/AWImager2/include/AWImager2/SkyEquation.h b/CEP/Imager/AWImager2/include/AWImager2/SkyEquation.h
index df85cfeb0262f179034d82d359f0bc951c2a8302..4e8eb5beb667478a0672fd5b96edf397ca4ca1b9 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/SkyEquation.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/SkyEquation.h
@@ -30,7 +30,7 @@
#include <synthesis/MeasurementEquations/SkyEquation.h>
//Forward
-namespace casa
+namespace casacore
{
class ROVisibilityIterator;
template <class T> class ImageInterface;
@@ -46,31 +46,31 @@ class FTMachine;
class VisibilityIterator;
class VisBuffer;
-class SkyEquation : public casa::SkyEquation
+class SkyEquation : public casacore::SkyEquation
{
public:
//Read only iterator...hence no scratch col
SkyEquation(
- casa::SkyModel& sm,
+ casacore::SkyModel& sm,
VisibilityIterator& vi,
FTMachine& ft,
- casa::ComponentFTMachine& cft,
- casa::Bool noModelCol = casa::False);
+ casacore::ComponentFTMachine& cft,
+ casacore::Bool noModelCol = casacore::False);
virtual ~SkyEquation();
virtual void predict(
- casa::Bool incremental = casa::False,
- casa::MS::PredefinedColumns Type = casa::MS::MODEL_DATA);
+ casacore::Bool incremental = casacore::False,
+ casacore::MS::PredefinedColumns Type = casacore::MS::MODEL_DATA);
- virtual void gradientsChiSquared(casa::Bool incremental, casa::Bool commitModel=casa::False);
+ virtual void gradientsChiSquared(casacore::Bool incremental, casacore::Bool commitModel=casacore::False);
- void makeApproxPSF(casa::PtrBlock<casa::ImageInterface<casa::Float> * >& psfs);
+ void makeApproxPSF(casacore::PtrBlock<casacore::ImageInterface<casacore::Float> * >& psfs);
private:
- casa::Block<casa::CountedPtr<casa::FTMachine> > ftm_p;
- casa::Block<casa::CountedPtr<casa::FTMachine> > iftm_p;
+ casacore::Block<casacore::CountedPtr<casacore::FTMachine> > ftm_p;
+ casacore::Block<casacore::CountedPtr<casacore::FTMachine> > iftm_p;
FTMachine * itsFTMachine;
VisibilityIterator * rvi_p;
diff --git a/CEP/Imager/AWImager2/include/AWImager2/VBStore.h b/CEP/Imager/AWImager2/include/AWImager2/VBStore.h
index 38d5d6dfb48cfae82b2c9eb6c37925da849f520b..02494ab0e777dd8521c36a57d2ee67378f32754e 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/VBStore.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/VBStore.h
@@ -36,47 +36,47 @@ namespace LofarFT {
class VBStore
{
public:
- VBStore() : itsDoPSF(casa::False) {};
+ VBStore() : itsDoPSF(casacore::False) {};
~VBStore() {};
- casa::Int nRow() const {return itsNRow;}
- void nRow(casa::Int nrow) {itsNRow = nrow;}
+ casacore::Int nRow() const {return itsNRow;}
+ void nRow(casacore::Int nrow) {itsNRow = nrow;}
- casa::Int beginRow() const {return itsBeginRow;}
- void beginRow(casa::Int beginrow) {itsBeginRow = beginrow;}
+ casacore::Int beginRow() const {return itsBeginRow;}
+ void beginRow(casacore::Int beginrow) {itsBeginRow = beginrow;}
- casa::Int endRow() const {return itsEndRow;}
- void endRow(casa::Int endrow) {itsEndRow = endrow;}
+ casacore::Int endRow() const {return itsEndRow;}
+ void endRow(casacore::Int endrow) {itsEndRow = endrow;}
- casa::Bool dopsf() const {return itsDoPSF;}
- void dopsf(casa::Bool do_psf) {itsDoPSF = do_psf;}
+ casacore::Bool dopsf() const {return itsDoPSF;}
+ void dopsf(casacore::Bool do_psf) {itsDoPSF = do_psf;}
- const casa::Vector<casa::uInt>& selection() const {return itsSelection;};
+ const casacore::Vector<casacore::uInt>& selection() const {return itsSelection;};
- const casa::Matrix<casa::Double>& uvw() const {return itsUVW;}
- void uvw(const casa::Matrix<casa::Double>& v) {itsUVW.reference(v);}
+ const casacore::Matrix<casacore::Double>& uvw() const {return itsUVW;}
+ void uvw(const casacore::Matrix<casacore::Double>& v) {itsUVW.reference(v);}
- const casa::Vector<casa::Bool>& rowFlag() const {return itsRowFlag;}
- void rowFlag(const casa::Vector<casa::Bool>& v) {itsRowFlag.reference(v);}
+ const casacore::Vector<casacore::Bool>& rowFlag() const {return itsRowFlag;}
+ void rowFlag(const casacore::Vector<casacore::Bool>& v) {itsRowFlag.reference(v);}
- const casa::Cube<casa::Bool>& flagCube() const {return itsFlagCube;}
- void flagCube(const casa::Cube<casa::Bool>& v) {itsFlagCube.reference(v);}
+ const casacore::Cube<casacore::Bool>& flagCube() const {return itsFlagCube;}
+ void flagCube(const casacore::Cube<casacore::Bool>& v) {itsFlagCube.reference(v);}
- const casa::Matrix<casa::Float>& imagingWeight() const {return itsImagingWeight;}
- void imagingWeight(const casa::Matrix<casa::Float>& v) {itsImagingWeight.reference(v);}
+ const casacore::Matrix<casacore::Float>& imagingWeight() const {return itsImagingWeight;}
+ void imagingWeight(const casacore::Matrix<casacore::Float>& v) {itsImagingWeight.reference(v);}
- const casa::Cube<casa::Float>& imagingWeightCube() const {return itsImagingWeightCube;}
- void imagingWeightCube(const casa::Cube<casa::Float>& v) {itsImagingWeightCube.reference(v);}
+ const casacore::Cube<casacore::Float>& imagingWeightCube() const {return itsImagingWeightCube;}
+ void imagingWeightCube(const casacore::Cube<casacore::Float>& v) {itsImagingWeightCube.reference(v);}
- casa::Cube<casa::Complex>& visCube() {return itsVisCube;}
- const casa::Cube<casa::Complex>& visCube() const {return itsVisCube;}
- void visCube(casa::Cube<casa::Complex>& viscube) {itsVisCube.reference(viscube);}
+ casacore::Cube<casacore::Complex>& visCube() {return itsVisCube;}
+ const casacore::Cube<casacore::Complex>& visCube() const {return itsVisCube;}
+ void visCube(casacore::Cube<casacore::Complex>& viscube) {itsVisCube.reference(viscube);}
- casa::Cube<casa::Complex>& modelVisCube() {return itsModelVisCube;}
- void modelVisCube(casa::Cube<casa::Complex>& modelviscube) {itsModelVisCube.reference(modelviscube);}
+ casacore::Cube<casacore::Complex>& modelVisCube() {return itsModelVisCube;}
+ void modelVisCube(casacore::Cube<casacore::Complex>& modelviscube) {itsModelVisCube.reference(modelviscube);}
- const casa::Vector<casa::Double>& freq() const {return itsFreq;}
- void freq(const casa::Vector<casa::Double>& v) {itsFreq.reference(v);}
+ const casacore::Vector<casacore::Double>& freq() const {return itsFreq;}
+ void freq(const casacore::Vector<casacore::Double>& v) {itsFreq.reference(v);}
void reference(const VBStore& other)
{
@@ -97,19 +97,19 @@ namespace LofarFT {
private:
- casa::Int itsNRow;
- casa::Int itsBeginRow;
- casa::Int itsEndRow;
- casa::Matrix<casa::Double> itsUVW;
- casa::Vector<casa::uInt> itsSelection;
- casa::Vector<casa::Bool> itsRowFlag;
- casa::Cube<casa::Bool> itsFlagCube;
- casa::Matrix<casa::Float> itsImagingWeight;
- casa::Cube<casa::Float> itsImagingWeightCube;
- casa::Cube<casa::Complex> itsVisCube;
- casa::Cube<casa::Complex> itsModelVisCube;
- casa::Vector<casa::Double> itsFreq;
- casa::Bool itsDoPSF;
+ casacore::Int itsNRow;
+ casacore::Int itsBeginRow;
+ casacore::Int itsEndRow;
+ casacore::Matrix<casacore::Double> itsUVW;
+ casacore::Vector<casacore::uInt> itsSelection;
+ casacore::Vector<casacore::Bool> itsRowFlag;
+ casacore::Cube<casacore::Bool> itsFlagCube;
+ casacore::Matrix<casacore::Float> itsImagingWeight;
+ casacore::Cube<casacore::Float> itsImagingWeightCube;
+ casacore::Cube<casacore::Complex> itsVisCube;
+ casacore::Cube<casacore::Complex> itsModelVisCube;
+ casacore::Vector<casacore::Double> itsFreq;
+ casacore::Bool itsDoPSF;
};
} // end namespace LofarFT
diff --git a/CEP/Imager/AWImager2/include/AWImager2/VisBuffer.h b/CEP/Imager/AWImager2/include/AWImager2/VisBuffer.h
index 4180f8a0c69ee7285514b38443382b1690855f52..93e278f2ccfe3b5bc00f924027178435b1a8cf21 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/VisBuffer.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/VisBuffer.h
@@ -36,38 +36,38 @@
namespace LOFAR {
namespace LofarFT {
- class VisBuffer : public casa::VisBuffer
+ class VisBuffer : public casacore::VisBuffer
{
public:
// Create empty VisBuffer you can assign to or attach.
- VisBuffer() : casa::VisBuffer() {};
+ VisBuffer() : casacore::VisBuffer() {};
// Construct VisBuffer for a particular VisibilityIterator
// The buffer will remain synchronized with the iterator.
VisBuffer(VisibilityIterator &iter);
// Copy construct, looses synchronization with iterator: only use buffer for
// current iteration (or reattach).
- VisBuffer(const VisBuffer & vb) : casa::VisBuffer(vb) {};
+ VisBuffer(const VisBuffer & vb) : casacore::VisBuffer(vb) {};
// Invalidate the cache
virtual void invalidate();
- virtual const casa::Matrix<casa::Float>& imagingWeight() const;
- virtual const casa::Cube<casa::Float>& imagingWeightCube() const;
+ virtual const casacore::Matrix<casacore::Float>& imagingWeight() const;
+ virtual const casacore::Cube<casacore::Float>& imagingWeightCube() const;
protected:
- virtual const casa::Matrix<casa::Float>& imagingWeight(const VisImagingWeight & weightGenerator) const;
- virtual const casa::Cube<casa::Float>& imagingWeightCube(const VisImagingWeight & weightGenerator) const;
+ virtual const casacore::Matrix<casacore::Float>& imagingWeight(const VisImagingWeight & weightGenerator) const;
+ virtual const casacore::Cube<casacore::Float>& imagingWeightCube(const VisImagingWeight & weightGenerator) const;
virtual VisibilityIterator * getVisibilityIterator () const;
private:
VisibilityIterator * visIter_p;
- virtual casa::Bool lofarImagingWeightOK () const { return lofarImagingWeightOK_p;}
- virtual casa::Bool lofarImagingWeightCubeOK () const { return lofarImagingWeightCubeOK_p;}
- mutable casa::Bool lofarImagingWeightOK_p;
- mutable casa::Bool lofarImagingWeightCubeOK_p;
- mutable casa::Matrix<casa::Float> lofarImagingWeight_p;
- mutable casa::Cube<casa::Float> lofarImagingWeightCube_p;
+ virtual casacore::Bool lofarImagingWeightOK () const { return lofarImagingWeightOK_p;}
+ virtual casacore::Bool lofarImagingWeightCubeOK () const { return lofarImagingWeightCubeOK_p;}
+ mutable casacore::Bool lofarImagingWeightOK_p;
+ mutable casacore::Bool lofarImagingWeightCubeOK_p;
+ mutable casacore::Matrix<casacore::Float> lofarImagingWeight_p;
+ mutable casacore::Cube<casacore::Float> lofarImagingWeightCube_p;
};
diff --git a/CEP/Imager/AWImager2/include/AWImager2/VisImagingWeight.h b/CEP/Imager/AWImager2/include/AWImager2/VisImagingWeight.h
index 60c801e5044cf115883d4537304ea8e6746121bb..13702d0790cff7e10adc0824384a74478670e85d 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/VisImagingWeight.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/VisImagingWeight.h
@@ -73,15 +73,15 @@ namespace LofarFT { //# NAMESPACE LOFAR - BEGIN
// </todo>
-class VisImagingWeight : public casa::VisImagingWeight
+class VisImagingWeight : public casacore::VisImagingWeight
{
public:
- VisImagingWeight() : casa::VisImagingWeight() {};
- VisImagingWeight(const casa::String& type);
- virtual void weight(casa::Cube<casa::Float>& imagingWeight, const casa::VisBuffer& vb) const;
+ VisImagingWeight() : casacore::VisImagingWeight() {};
+ VisImagingWeight(const casacore::String& type);
+ virtual void weight(casacore::Cube<casacore::Float>& imagingWeight, const casacore::VisBuffer& vb) const;
private:
- casa::String itsType;
+ casacore::String itsType;
};
diff --git a/CEP/Imager/AWImager2/include/AWImager2/VisImagingWeightRobust.h b/CEP/Imager/AWImager2/include/AWImager2/VisImagingWeightRobust.h
index ed2c6e2df2224e2c66d11be1093d5bccd11f5977..54d73bae7a52441fcabbc72d5bb3fe75565801e3 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/VisImagingWeightRobust.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/VisImagingWeightRobust.h
@@ -52,33 +52,33 @@ class VisImagingWeightRobust : public VisImagingWeight
public:
VisImagingWeightRobust(
- casa::ROVisibilityIterator& vi,
- const casa::String& rmode,
- const casa::Quantity& noise,
- casa::Double robust,
- casa::Int nx,
- casa::Int ny,
- const casa::Quantity& cellx,
- const casa::Quantity& celly,
- casa::Int uBox = 0,
- casa::Int vBox = 0,
- casa::Bool multiField = casa::False);
+ casacore::ROVisibilityIterator& vi,
+ const casacore::String& rmode,
+ const casacore::Quantity& noise,
+ casacore::Double robust,
+ casacore::Int nx,
+ casacore::Int ny,
+ const casacore::Quantity& cellx,
+ const casacore::Quantity& celly,
+ casacore::Int uBox = 0,
+ casacore::Int vBox = 0,
+ casacore::Bool multiField = casacore::False);
virtual void weight(
- casa::Cube<casa::Float>& imagingWeight,
- const casa::VisBuffer& vb) const;
+ casacore::Cube<casacore::Float>& imagingWeight,
+ const casacore::VisBuffer& vb) const;
private:
- casa::Float itsF2;
- casa::Float itsD2;
- casa::Int itsNX;
- casa::Int itsNY;
- casa::Int itsUOrigin;
- casa::Int itsVOrigin;
- casa::Float itsUScale;
- casa::Float itsVScale;
+ casacore::Float itsF2;
+ casacore::Float itsD2;
+ casacore::Int itsNX;
+ casacore::Int itsNY;
+ casacore::Int itsUOrigin;
+ casacore::Int itsVOrigin;
+ casacore::Float itsUScale;
+ casacore::Float itsVScale;
- casa::Matrix<casa::Float> itsWeightMap;
+ casacore::Matrix<casacore::Float> itsWeightMap;
};
diff --git a/CEP/Imager/AWImager2/include/AWImager2/VisResampler.h b/CEP/Imager/AWImager2/include/AWImager2/VisResampler.h
index 2c4a9a06e0b3e0109e2823b74768948fa9eee17d..de2cea50cfeaac6da791d48cde4589bfbd53a0fb 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/VisResampler.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/VisResampler.h
@@ -35,7 +35,7 @@
namespace LOFAR { //# NAMESPACE LOFAR - BEGIN
namespace LofarFT {
-class VisResampler: public casa::AWVisResampler
+class VisResampler: public casacore::AWVisResampler
{
public:
VisResampler(): AWVisResampler() {}
@@ -46,57 +46,57 @@ public:
// void copy(const VisResampler& other)
// {AWVisResampler::copy(other); }
//
- void set_chan_map(const casa::Vector<casa::Int> &map);
+ void set_chan_map(const casacore::Vector<casacore::Int> &map);
- void set_chan_map_CF(const casa::Vector<casa::Int> &map);
+ void set_chan_map_CF(const casacore::Vector<casacore::Int> &map);
// Re-sample the griddedData on the VisBuffer (a.k.a gridding).
virtual void DataToGrid (
- casa::Array<casa::Complex>& griddedData,
+ casacore::Array<casacore::Complex>& griddedData,
const VBStore& vbs,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
- casa::Matrix<casa::Double>& sumwt,
- const casa::Bool& dopsf,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
+ casacore::Matrix<casacore::Double>& sumwt,
+ const casacore::Bool& dopsf,
CFStore& cfs) {};
virtual void DataToGrid (
- casa::Array<casa::DComplex>& griddedData,
+ casacore::Array<casacore::DComplex>& griddedData,
const VBStore& vbs,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
- casa::Matrix<casa::Double>& sumwt,
- const casa::Bool& dopsf,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
+ casacore::Matrix<casacore::Double>& sumwt,
+ const casacore::Bool& dopsf,
CFStore& cfs) {};
virtual void GridToData(
VBStore& vbs,
- const casa::Array<casa::Complex>& grid,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
+ const casacore::Array<casacore::Complex>& grid,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
CFStore& cfs) {};
void ComputeResiduals(VBStore& vbs);
void sgrid(
- casa::Vector<casa::Double>& pos,
- casa::Vector<casa::Int>& loc,
- casa::Vector<casa::Int>& off,
- casa::Complex& phasor,
- const casa::Int& irow,
- const casa::Matrix<casa::Double>& uvw,
- const casa::Double& dphase,
- const casa::Double& freq,
- const casa::Vector<casa::Double>& scale,
- const casa::Vector<casa::Double>& offset,
- const casa::Vector<casa::Float>& sampling);
+ casacore::Vector<casacore::Double>& pos,
+ casacore::Vector<casacore::Int>& loc,
+ casacore::Vector<casacore::Int>& off,
+ casacore::Complex& phasor,
+ const casacore::Int& irow,
+ const casacore::Matrix<casacore::Double>& uvw,
+ const casacore::Double& dphase,
+ const casacore::Double& freq,
+ const casacore::Vector<casacore::Double>& scale,
+ const casacore::Vector<casacore::Double>& offset,
+ const casacore::Vector<casacore::Float>& sampling);
protected:
- casa::Vector<casa::Int> itsChanMap;
- casa::Vector<casa::Int> itsChanMapCF;
+ casacore::Vector<casacore::Int> itsChanMap;
+ casacore::Vector<casacore::Int> itsChanMapCF;
};
diff --git a/CEP/Imager/AWImager2/include/AWImager2/VisResamplerDiagonalWB.h b/CEP/Imager/AWImager2/include/AWImager2/VisResamplerDiagonalWB.h
index 7b1287ba4cf7ff8467f6d2f1fa32913808c72a35..0022fa2a70cb098ee2b0f4dd32a1a3857dd7f34c 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/VisResamplerDiagonalWB.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/VisResamplerDiagonalWB.h
@@ -41,41 +41,41 @@ public:
// Re-sample the griddedData on the VisBuffer (a.k.a gridding).
virtual void DataToGrid (
- casa::Array<casa::Complex>& griddedData,
+ casacore::Array<casacore::Complex>& griddedData,
const VBStore& vbs,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
- casa::Matrix<casa::Double>& sumwt,
- const casa::Bool& dopsf,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
+ casacore::Matrix<casacore::Double>& sumwt,
+ const casacore::Bool& dopsf,
CFStore& cfs,
- casa::Vector<casa::Double> &taylor_weight)
+ casacore::Vector<casacore::Double> &taylor_weight)
{
DataToGridImpl_p(griddedData, vbs, rows, rbeg, rend, sumwt,dopsf,cfs,taylor_weight);
}
virtual void DataToGrid (
- casa::Array<casa::DComplex>& griddedData,
+ casacore::Array<casacore::DComplex>& griddedData,
const VBStore& vbs,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
- casa::Matrix<casa::Double>& sumwt,
- const casa::Bool& dopsf,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
+ casacore::Matrix<casacore::Double>& sumwt,
+ const casacore::Bool& dopsf,
CFStore& cfs,
- casa::Vector<casa::Double> &taylor_weight)
+ casacore::Vector<casacore::Double> &taylor_weight)
{
DataToGridImpl_p(griddedData, vbs, rows, rbeg, rend, sumwt,dopsf,cfs, taylor_weight);
}
virtual void GridToData(
VBStore& vbs,
- const casa::Array<casa::Complex>& grid,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
+ const casacore::Array<casacore::Complex>& grid,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
CFStore& cfs,
- casa::Vector<casa::Double> &taylor_weight);
+ casacore::Vector<casacore::Double> &taylor_weight);
private:
@@ -83,15 +83,15 @@ private:
//
template <class T>
void DataToGridImpl_p(
- casa::Array<T>& griddedData,
+ casacore::Array<T>& griddedData,
const VBStore& vb,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
- casa::Matrix<casa::Double>& sumwt,
- const casa::Bool& dopsf,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
+ casacore::Matrix<casacore::Double>& sumwt,
+ const casacore::Bool& dopsf,
CFStore& cfs,
- casa::Vector<casa::Double> &taylor_weight);
+ casacore::Vector<casacore::Double> &taylor_weight);
};
diff --git a/CEP/Imager/AWImager2/include/AWImager2/VisResamplerImagingWeightCube.h b/CEP/Imager/AWImager2/include/AWImager2/VisResamplerImagingWeightCube.h
index f5c92fb2e924a628547ff1423d5f9937b9621bd2..9f311d40eb221ed600a9d721fcb5a60e1dd1fab6 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/VisResamplerImagingWeightCube.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/VisResamplerImagingWeightCube.h
@@ -48,26 +48,26 @@ public:
// Re-sample the griddedData on the VisBuffer (a.k.a gridding).
virtual void DataToGrid (
- casa::Array<casa::Complex>& griddedData,
+ casacore::Array<casacore::Complex>& griddedData,
VBStore& vbs,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
- casa::Matrix<casa::Double>& sumwt,
- const casa::Bool& dopsf,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
+ casacore::Matrix<casacore::Double>& sumwt,
+ const casacore::Bool& dopsf,
CFStore& cfs)
{
DataToGridImpl_p(griddedData, vbs, rows, rbeg, rend, sumwt,dopsf,cfs);
}
virtual void DataToGrid (
- casa::Array<casa::DComplex>& griddedData,
+ casacore::Array<casacore::DComplex>& griddedData,
VBStore& vbs,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
- casa::Matrix<casa::Double>& sumwt,
- const casa::Bool& dopsf,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
+ casacore::Matrix<casacore::Double>& sumwt,
+ const casacore::Bool& dopsf,
CFStore& cfs)
{
DataToGridImpl_p(griddedData, vbs, rows, rbeg, rend, sumwt,dopsf,cfs);
@@ -78,10 +78,10 @@ private:
// Re-sample the griddedData on the VisBuffer (a.k.a de-gridding).
//
template <class T>
- void DataToGridImpl_p(casa::Array<T>& griddedData, VBStore& vb,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg, casa::Int rend,
- casa::Matrix<casa::Double>& sumwt,const casa::Bool& dopsf,
+ void DataToGridImpl_p(casacore::Array<T>& griddedData, VBStore& vb,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg, casacore::Int rend,
+ casacore::Matrix<casacore::Double>& sumwt,const casacore::Bool& dopsf,
CFStore& cfs);
};
diff --git a/CEP/Imager/AWImager2/include/AWImager2/VisResamplerMatrix.h b/CEP/Imager/AWImager2/include/AWImager2/VisResamplerMatrix.h
index 60ceec1358ed02260bc53b00fa7d449166502bb1..bff24d68f9ee94a43e7ca532b4413366bdeb2091 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/VisResamplerMatrix.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/VisResamplerMatrix.h
@@ -41,26 +41,26 @@ public:
// Re-sample the griddedData on the VisBuffer (a.k.a gridding).
virtual void DataToGrid (
- casa::Array<casa::Complex>& griddedData,
+ casacore::Array<casacore::Complex>& griddedData,
VBStore& vbs,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
- casa::Matrix<casa::Double>& sumwt,
- const casa::Bool& dopsf,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
+ casacore::Matrix<casacore::Double>& sumwt,
+ const casacore::Bool& dopsf,
CFStore& cfs)
{
DataToGridImpl_p(griddedData, vbs, rows, rbeg, rend, sumwt,dopsf,cfs);
}
virtual void DataToGrid (
- casa::Array<casa::DComplex>& griddedData,
+ casacore::Array<casacore::DComplex>& griddedData,
VBStore& vbs,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
- casa::Matrix<casa::Double>& sumwt,
- const casa::Bool& dopsf,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
+ casacore::Matrix<casacore::Double>& sumwt,
+ const casacore::Bool& dopsf,
CFStore& cfs)
{
DataToGridImpl_p(griddedData, vbs, rows, rbeg, rend, sumwt,dopsf,cfs);
@@ -68,10 +68,10 @@ public:
virtual void GridToData(
VBStore& vbs,
- const casa::Array<casa::Complex>& grid,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
+ const casacore::Array<casacore::Complex>& grid,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
CFStore& cfs);
private:
@@ -80,12 +80,12 @@ private:
//
template <class T>
void DataToGridImpl_p(
- casa::Array<T>& griddedData, VBStore& vb,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
- casa::Matrix<casa::Double>& sumwt,
- const casa::Bool& dopsf,
+ casacore::Array<T>& griddedData, VBStore& vb,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
+ casacore::Matrix<casacore::Double>& sumwt,
+ const casacore::Bool& dopsf,
CFStore& cfs);
};
diff --git a/CEP/Imager/AWImager2/include/AWImager2/VisResamplerMatrixWB.h b/CEP/Imager/AWImager2/include/AWImager2/VisResamplerMatrixWB.h
index ea6e19bff7a3a0d0488fcc9065437068cf0d0381..32159ea60c3b6ad2d4238610355594f8f1bccb04 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/VisResamplerMatrixWB.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/VisResamplerMatrixWB.h
@@ -41,41 +41,41 @@ public:
// Re-sample the griddedData on the VisBuffer (a.k.a gridding).
virtual void DataToGrid (
- casa::Array<casa::Complex>& griddedData,
+ casacore::Array<casacore::Complex>& griddedData,
const VBStore& vbs,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
- casa::Matrix<casa::Double>& sumwt,
- const casa::Bool& dopsf,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
+ casacore::Matrix<casacore::Double>& sumwt,
+ const casacore::Bool& dopsf,
CFStore& cfs,
- casa::Vector<casa::Double> &taylor_weight)
+ casacore::Vector<casacore::Double> &taylor_weight)
{
DataToGridImpl_p(griddedData, vbs, rows, rbeg, rend, sumwt,dopsf,cfs,taylor_weight);
}
virtual void DataToGrid (
- casa::Array<casa::DComplex>& griddedData,
+ casacore::Array<casacore::DComplex>& griddedData,
const VBStore& vbs,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
- casa::Matrix<casa::Double>& sumwt,
- const casa::Bool& dopsf,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
+ casacore::Matrix<casacore::Double>& sumwt,
+ const casacore::Bool& dopsf,
CFStore& cfs,
- casa::Vector<casa::Double> &taylor_weight)
+ casacore::Vector<casacore::Double> &taylor_weight)
{
DataToGridImpl_p(griddedData, vbs, rows, rbeg, rend, sumwt,dopsf,cfs, taylor_weight);
}
virtual void GridToData(
VBStore& vbs,
- const casa::Array<casa::Complex>& grid,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
+ const casacore::Array<casacore::Complex>& grid,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
CFStore& cfs,
- casa::Vector<casa::Double> &taylor_weight);
+ casacore::Vector<casacore::Double> &taylor_weight);
private:
@@ -83,15 +83,15 @@ private:
//
template <class T>
void DataToGridImpl_p(
- casa::Array<T>& griddedData,
+ casacore::Array<T>& griddedData,
const VBStore& vb,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
- casa::Matrix<casa::Double>& sumwt,
- const casa::Bool& dopsf,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
+ casacore::Matrix<casacore::Double>& sumwt,
+ const casacore::Bool& dopsf,
CFStore& cfs,
- casa::Vector<casa::Double> &taylor_weight);
+ casacore::Vector<casacore::Double> &taylor_weight);
};
diff --git a/CEP/Imager/AWImager2/include/AWImager2/VisResamplerScalar.h b/CEP/Imager/AWImager2/include/AWImager2/VisResamplerScalar.h
index 8757c827da89f459bd2431d49c07a4ebb8d0fe18..0ba7fa52748c61b7ce4a7633c3300ac963a346fc 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/VisResamplerScalar.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/VisResamplerScalar.h
@@ -41,26 +41,26 @@ public:
// Re-sample the griddedData on the VisBuffer (a.k.a gridding).
virtual void DataToGrid (
- casa::Array<casa::Complex>& griddedData,
+ casacore::Array<casacore::Complex>& griddedData,
VBStore& vbs,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
- casa::Matrix<casa::Double>& sumwt,
- const casa::Bool& dopsf,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
+ casacore::Matrix<casacore::Double>& sumwt,
+ const casacore::Bool& dopsf,
CFStore& cfs)
{
DataToGridImpl_p(griddedData, vbs, rows, rbeg, rend, sumwt,dopsf,cfs);
}
virtual void DataToGrid (
- casa::Array<casa::DComplex>& griddedData,
+ casacore::Array<casacore::DComplex>& griddedData,
VBStore& vbs,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
- casa::Matrix<casa::Double>& sumwt,
- const casa::Bool& dopsf,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
+ casacore::Matrix<casacore::Double>& sumwt,
+ const casacore::Bool& dopsf,
CFStore& cfs)
{
DataToGridImpl_p(griddedData, vbs, rows, rbeg, rend, sumwt,dopsf,cfs);
@@ -68,10 +68,10 @@ public:
virtual void GridToData(
VBStore& vbs,
- const casa::Array<casa::Complex>& grid,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
+ const casacore::Array<casacore::Complex>& grid,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
CFStore& cfs);
private:
@@ -79,13 +79,13 @@ private:
// Re-sample the griddedData on the VisBuffer (a.k.a de-gridding).
//
template <class T>
- void DataToGridImpl_p(casa::Array<T>& griddedData, VBStore& vb,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg, casa::Int rend,
- casa::Matrix<casa::Double>& sumwt,const casa::Bool& dopsf,
+ void DataToGridImpl_p(casacore::Array<T>& griddedData, VBStore& vb,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg, casacore::Int rend,
+ casacore::Matrix<casacore::Double>& sumwt,const casacore::Bool& dopsf,
CFStore& cfs);
- casa::Vector<casa::Int> cfMap_p, conjCFMap_p;
+ casacore::Vector<casacore::Int> cfMap_p, conjCFMap_p;
};
diff --git a/CEP/Imager/AWImager2/include/AWImager2/VisResamplerWB.h b/CEP/Imager/AWImager2/include/AWImager2/VisResamplerWB.h
index 73c94b0e8ce74552deef19667ad7e1f94909b8fd..f959cff2bac70051943de2ed21d6d1fd135396ea 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/VisResamplerWB.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/VisResamplerWB.h
@@ -43,35 +43,35 @@ public:
// Re-sample the griddedData on the VisBuffer (a.k.a gridding).
virtual void DataToGrid (
- casa::Array<casa::Complex>& griddedData,
+ casacore::Array<casacore::Complex>& griddedData,
const VBStore& vbs,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
- casa::Matrix<casa::Double>& sumwt,
- const casa::Bool& dopsf,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
+ casacore::Matrix<casacore::Double>& sumwt,
+ const casacore::Bool& dopsf,
CFStore& cfs,
- casa::Vector<casa::Double> &taylor_weight) = 0;
+ casacore::Vector<casacore::Double> &taylor_weight) = 0;
virtual void DataToGrid (
- casa::Array<casa::DComplex>& griddedData,
+ casacore::Array<casacore::DComplex>& griddedData,
const VBStore& vbs,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
- casa::Matrix<casa::Double>& sumwt,
- const casa::Bool& dopsf,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
+ casacore::Matrix<casacore::Double>& sumwt,
+ const casacore::Bool& dopsf,
CFStore& cfs,
- casa::Vector<casa::Double> &taylor_weight) = 0;
+ casacore::Vector<casacore::Double> &taylor_weight) = 0;
virtual void GridToData(
VBStore& vbs,
- const casa::Array<casa::Complex>& grid,
- const casa::Vector<casa::uInt>& rows,
- casa::Int rbeg,
- casa::Int rend,
+ const casacore::Array<casacore::Complex>& grid,
+ const casacore::Vector<casacore::uInt>& rows,
+ casacore::Int rbeg,
+ casacore::Int rend,
CFStore& cfs,
- casa::Vector<casa::Double> &taylor_weight) = 0;
+ casacore::Vector<casacore::Double> &taylor_weight) = 0;
};
} // end namespace LofarFT
diff --git a/CEP/Imager/AWImager2/include/AWImager2/VisibilityIterator.h b/CEP/Imager/AWImager2/include/AWImager2/VisibilityIterator.h
index 3acde051753407896d2fa62a04fc939d15fda03a..fc25bd9181b80336761b6b5911a914ee825ef474 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/VisibilityIterator.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/VisibilityIterator.h
@@ -39,24 +39,24 @@
namespace LOFAR { //# NAMESPACE LOFAR - BEGIN
namespace LofarFT {
-class VisibilityIterator : public casa::VisibilityIterator
+class VisibilityIterator : public casacore::VisibilityIterator
{
public:
// Constructors.
// Note: The VisibilityIterator is not initialized correctly by default, you
// need to call origin() before using it to iterate.
VisibilityIterator();
- VisibilityIterator(casa::MeasurementSet & ms, const casa::Block<casa::Int>& sortColumns,
- casa::Double timeInterval=0);
+ VisibilityIterator(casacore::MeasurementSet & ms, const casacore::Block<casacore::Int>& sortColumns,
+ casacore::Double timeInterval=0);
VisibilityIterator & operator= (const VisibilityIterator & other);
//assign a LofarVisImagingWeight object to this iterator
- void useImagingWeight(casa::CountedPtr<VisImagingWeight> imWgt);
+ void useImagingWeight(casacore::CountedPtr<VisImagingWeight> imWgt);
const VisImagingWeight & getImagingWeightGenerator () const;
private:
- casa::CountedPtr<VisImagingWeight> lofar_imwgt_p; // object to calculate imaging weight
+ casacore::CountedPtr<VisImagingWeight> lofar_imwgt_p; // object to calculate imaging weight
};
diff --git a/CEP/Imager/AWImager2/include/AWImager2/WTerm.h b/CEP/Imager/AWImager2/include/AWImager2/WTerm.h
index 9772d4ce9cfe952a65d43a86489845305bffbb44..ff14aae795849e433a46434d5e7c3d301f1d3b8c 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/WTerm.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/WTerm.h
@@ -187,23 +187,23 @@ public:
// logIO << LogIO::NORMAL << "Scaling in W (at maximum W): " << 1.0 / m_scale
// << " wavelengths/pixel." << LogIO::POST;
- casa::Matrix<casa::Complex> evaluate (
- const casa::IPosition &shape,
- const casa::Vector<casa::Double>& resolution,
+ casacore::Matrix<casacore::Complex> evaluate (
+ const casacore::IPosition &shape,
+ const casacore::Vector<casacore::Double>& resolution,
double w) const;
void evaluate(
- casa::Complex* buffer,
+ casacore::Complex* buffer,
int nx, int ny,
- const casa::Vector<casa::Double>& resolution,
+ const casacore::Vector<casacore::Double>& resolution,
double w) const;
- casa::Complex evaluate_pixel(
+ casacore::Complex evaluate_pixel(
int x,
int y,
int nx,
int ny,
- const casa::Vector<casa::Double>& resolution,
+ const casacore::Vector<casacore::Double>& resolution,
double w) const;
};
diff --git a/CEP/Imager/AWImager2/include/AWImager2/util.h b/CEP/Imager/AWImager2/include/AWImager2/util.h
index 6d90a2d3a9fd650a8c7b8cc2e74738cc012f9581..ceb8e4ef6ad7d955b21e56869b1ade89929bddb8 100644
--- a/CEP/Imager/AWImager2/include/AWImager2/util.h
+++ b/CEP/Imager/AWImager2/include/AWImager2/util.h
@@ -30,7 +30,7 @@
namespace LOFAR {
namespace LofarFT {
-casa::Double get_reference_frequency(ParameterSet parset, casa::MeasurementSet ms);
+casacore::Double get_reference_frequency(ParameterSet parset, casacore::MeasurementSet ms);
}
}
diff --git a/CEP/Imager/AWImager2/src/ATerm.cc b/CEP/Imager/AWImager2/src/ATerm.cc
index 4120049a91c9f907ad162a604ab5d9ef23336358..147fc811568efd6333442a8d97c60d582556fb63 100644
--- a/CEP/Imager/AWImager2/src/ATerm.cc
+++ b/CEP/Imager/AWImager2/src/ATerm.cc
@@ -26,9 +26,9 @@
namespace LOFAR {
namespace LofarFT {
-casa::CountedPtr<ATerm> ATerm::create(const casa::MeasurementSet &ms, ParameterSet& parset)
+casacore::CountedPtr<ATerm> ATerm::create(const casacore::MeasurementSet &ms, ParameterSet& parset)
{
- return casa::CountedPtr<ATerm>(LOFAR::LofarFT::ATermFactory::instance().create(parset.getString("gridding.ATerm.name","ATermLofar"), ms, parset));
+ return casacore::CountedPtr<ATerm>(LOFAR::LofarFT::ATermFactory::instance().create(parset.getString("gridding.ATerm.name","ATermLofar"), ms, parset));
}
}
diff --git a/CEP/Imager/AWImager2/src/ATermLofar.cc b/CEP/Imager/AWImager2/src/ATermLofar.cc
index 75c4d8c1174634fc0c2ba5f81281c2fc413f5623..41465ee26e79bca65ab696cf1edc0bc4511ab8fe 100644
--- a/CEP/Imager/AWImager2/src/ATermLofar.cc
+++ b/CEP/Imager/AWImager2/src/ATermLofar.cc
@@ -58,7 +58,7 @@
#include "helper_functions.tcc"
-using namespace casa;
+using namespace casacore;
using namespace LOFAR::StationResponse;
namespace LOFAR {
@@ -70,18 +70,18 @@ namespace
/*!
* \brief Convert an ITRF position given as a StationResponse::vector3r_t
- * instance to a casa::MPosition.
+ * instance to a casacore::MPosition.
*/
MPosition toMPositionITRF(const vector3r_t &position);
/*!
- * \brief Convert a casa::MPosition instance to a
+ * \brief Convert a casacore::MPosition instance to a
# StationResponse::vector3r_t instance.
*/
vector3r_t fromMPosition(const MPosition &position);
/*!
- * \brief Convert a casa::MDirection instance to a
+ * \brief Convert a casacore::MDirection instance to a
* StationResponse::vector3r_t instance.
*/
vector3r_t fromMDirection(const MDirection &direction);
@@ -225,7 +225,7 @@ ATermLofar::ATermLofar(const MeasurementSet& ms, const ParameterSet& parset, boo
}
}
-void ATermLofar::initParmDB(const casa::String &parmdbname)
+void ATermLofar::initParmDB(const casacore::String &parmdbname)
{
itsPDB = new LOFAR::BBS::ParmFacade (parmdbname);
std::string prefix = "Piercepoint:X:";
@@ -244,7 +244,7 @@ void ATermLofar::initParmDB(const casa::String &parmdbname)
}
void ATermLofar::setDirection(
- const casa::DirectionCoordinate &coordinates,
+ const casacore::DirectionCoordinate &coordinates,
const IPosition &shape)
{
itsDirectionCoordinates = &coordinates;
@@ -254,7 +254,7 @@ void ATermLofar::setDirection(
void ATermLofar::setEpoch( const MEpoch &epoch )
{
- itsTime = epoch.get(casa::Unit("s")).getValue();
+ itsTime = epoch.get(casacore::Unit("s")).getValue();
if (itsDirectionCoordinates)
{
itsITRFDirectionMap = makeDirectionMap(*itsDirectionCoordinates,
@@ -280,7 +280,7 @@ double ATermLofar::get_parmvalue( const Record &parms, const std::string &parmna
{
double r = 0.0;
if (parms.isDefined(parmname)) {
- casa::Array<double> parmvalues;
+ casacore::Array<double> parmvalues;
parms.subRecord(parmname).get("values", parmvalues);
r = parmvalues(IPosition(2,0,0));
}
@@ -586,7 +586,7 @@ Cube<DComplex> ATermLofar::evaluateIonosphere(
double z = p(2)/ion_ellipsoid_b;
double c = x*x + y*y + z*z - 1.0;
- casa::Cube<double> piercepoints(4, nX, nY, 0.0);
+ casacore::Cube<double> piercepoints(4, nX, nY, 0.0);
Matrix<Double> tec(nX, nY, 0.0);
diff --git a/CEP/Imager/AWImager2/src/ATermPython.cc b/CEP/Imager/AWImager2/src/ATermPython.cc
index 074733938c74dacd6eff987e9033d2a883131ff3..55963a29b763688c0ac18da5adef17065ad77f0a 100644
--- a/CEP/Imager/AWImager2/src/ATermPython.cc
+++ b/CEP/Imager/AWImager2/src/ATermPython.cc
@@ -31,7 +31,7 @@
#include <casacore/coordinates/Coordinates/DirectionCoordinate.h>
#include <casacore/ms/MeasurementSets/MeasurementSet.h>
-using namespace casa;
+using namespace casacore;
namespace
{
@@ -57,13 +57,13 @@ ATermPython::ATermPython(const MeasurementSet& ms, const ParameterSet& parameter
Py_Initialize();
boost::python::class_<LOFAR::LofarFT::ATerm::ITRFDirectionMap>("ITRFDirectionMap", "Hi there");
- boost::python::class_<casa::MEpoch>("MEpoch", "Mepoch");
+ boost::python::class_<casacore::MEpoch>("MEpoch", "Mepoch");
// Register converters for casa types from/to python types
- casa::python::register_convert_excp();
- casa::python::register_convert_basicdata();
- casa::python::register_convert_casa_valueholder();
- casa::python::register_convert_casa_record();
+ casacore::python::register_convert_excp();
+ casacore::python::register_convert_basicdata();
+ casacore::python::register_convert_casa_valueholder();
+ casacore::python::register_convert_casa_record();
try {
// First import main
boost::python::object main_module = boost::python::import("__main__");
@@ -94,10 +94,10 @@ ATermPython::ATermPython(const MeasurementSet& ms, const ParameterSet& parameter
}
}
-vector<casa::Cube<casa::Complex> > ATermPython::evaluate(
+vector<casacore::Cube<casacore::Complex> > ATermPython::evaluate(
uint idStation,
- const casa::Vector<casa::Double> &freq,
- const casa::Vector<casa::Double> &reference,
+ const casacore::Vector<casacore::Double> &freq,
+ const casacore::Vector<casacore::Double> &reference,
bool normalize) const
{
// call the evaluta method of the python ATerm instance
@@ -128,7 +128,7 @@ vector<casa::Cube<casa::Complex> > ATermPython::evaluate(
}
void ATermPython::setDirection(
- const casa::DirectionCoordinate &coordinates,
+ const casacore::DirectionCoordinate &coordinates,
const IPosition &shape)
{
Record r;
@@ -151,7 +151,7 @@ void ATermPython::setDirection(
void ATermPython::setEpoch( const MEpoch &epoch )
{
- Double time = epoch.get(casa::Unit("s")).getValue();
+ Double time = epoch.get(casacore::Unit("s")).getValue();
#pragma omp critical
{
diff --git a/CEP/Imager/AWImager2/src/CFStore.cc b/CEP/Imager/AWImager2/src/CFStore.cc
index b2064182420a9481431b39901036b7dcb88d3fea..2e11f337bb76baca5ff731982c6012c21dfe39fd 100644
--- a/CEP/Imager/AWImager2/src/CFStore.cc
+++ b/CEP/Imager/AWImager2/src/CFStore.cc
@@ -28,7 +28,7 @@
#include <lofar_config.h>
#include <AWImager2/CFStore.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR{
namespace LofarFT{
@@ -49,16 +49,16 @@ namespace LofarFT{
{};
CFStore::CFStore(
- const casa::CountedPtr<CFType>& dataPtr,
- casa::CoordinateSystem& cs,
- casa::Vector<casa::Float>& samp,
- casa::Vector<casa::Int>& xsup,
- casa::Vector<casa::Int>& ysup,
- casa::Int maxXSup,
- casa::Int maxYSup,
- casa::Quantity PA,
- casa::Int mosPointing,
- casa::Bool conjugated)
+ const casacore::CountedPtr<CFType>& dataPtr,
+ casacore::CoordinateSystem& cs,
+ casacore::Vector<casacore::Float>& samp,
+ casacore::Vector<casacore::Int>& xsup,
+ casacore::Vector<casacore::Int>& ysup,
+ casacore::Int maxXSup,
+ casacore::Int maxYSup,
+ casacore::Quantity PA,
+ casacore::Int mosPointing,
+ casacore::Bool conjugated)
: itsData(dataPtr),
itsRData(),
itsVData(),
@@ -74,16 +74,16 @@ namespace LofarFT{
{};
CFStore::CFStore(
- const casa::CountedPtr<CFTypeVec>& dataPtr,
- casa::CoordinateSystem& cs,
- casa::Vector<casa::Float>& samp,
- casa::Vector<casa::Int>& xsup,
- casa::Vector<casa::Int>& ysup,
- casa::Int maxXSup,
- casa::Int maxYSup,
- casa::Quantity PA,
- casa::Int mosPointing,
- casa::Bool conjugated)
+ const casacore::CountedPtr<CFTypeVec>& dataPtr,
+ casacore::CoordinateSystem& cs,
+ casacore::Vector<casacore::Float>& samp,
+ casacore::Vector<casacore::Int>& xsup,
+ casacore::Vector<casacore::Int>& ysup,
+ casacore::Int maxXSup,
+ casacore::Int maxYSup,
+ casacore::Quantity PA,
+ casacore::Int mosPointing,
+ casacore::Bool conjugated)
: itsData(),
itsRData(),
itsVData(dataPtr),
@@ -131,15 +131,15 @@ namespace LofarFT{
void CFStore::set(
CFType *dataPtr,
- casa::CoordinateSystem& cs,
- casa::Vector<casa::Float>& samp,
- casa::Vector<casa::Int>& xsup,
- casa::Vector<casa::Int>& ysup,
- casa::Int maxXSup,
- casa::Int maxYSup,
- casa::Quantity PA,
- const casa::Int mosPointing,
- casa::Bool conjugated)
+ casacore::CoordinateSystem& cs,
+ casacore::Vector<casacore::Float>& samp,
+ casacore::Vector<casacore::Int>& xsup,
+ casacore::Vector<casacore::Int>& ysup,
+ casacore::Int maxXSup,
+ casacore::Int maxYSup,
+ casacore::Quantity PA,
+ const casacore::Int mosPointing,
+ casacore::Bool conjugated)
{
itsData=dataPtr;
itsCoordSys=cs;
@@ -155,15 +155,15 @@ namespace LofarFT{
void CFStore::set(
CFTypeVec *dataPtr,
- casa::CoordinateSystem& cs,
- casa::Vector<casa::Float>& samp,
- casa::Vector<casa::Int>& xsup,
- casa::Vector<casa::Int>& ysup,
- casa::Int maxXSup,
- casa::Int maxYSup,
- casa::Quantity PA,
- const casa::Int mosPointing,
- casa::Bool conjugated)
+ casacore::CoordinateSystem& cs,
+ casacore::Vector<casacore::Float>& samp,
+ casacore::Vector<casacore::Int>& xsup,
+ casacore::Vector<casacore::Int>& ysup,
+ casacore::Int maxXSup,
+ casacore::Int maxYSup,
+ casacore::Quantity PA,
+ const casacore::Int mosPointing,
+ casacore::Bool conjugated)
{
itsVData=dataPtr;
itsCoordSys=cs;
diff --git a/CEP/Imager/AWImager2/src/ConvolutionFunction.cc b/CEP/Imager/AWImager2/src/ConvolutionFunction.cc
index ee357328b85b4ca0bd789ead81536407a2fe192f..9c31b21d0203a76ba18403ea05efc6dc81ee44d5 100644
--- a/CEP/Imager/AWImager2/src/ConvolutionFunction.cc
+++ b/CEP/Imager/AWImager2/src/ConvolutionFunction.cc
@@ -62,33 +62,33 @@
#include "helper_functions.tcc"
-using casa::IPosition;
-using casa::DirectionCoordinate;
-using casa::MeasurementSet;
-using casa::uInt;
-using casa::String;
-using casa::Int;
-using casa::MEpoch;
-using casa::Matrix;
-using casa::Cube;
-using casa::Vector;
-using casa::Float;
-using casa::Double;
-using casa::ROMSAntennaColumns;
-using casa::Complex;
-using casa::PrecTimer;
-using casa::Quantity;
-using casa::sign;
-using casa::False;
-using casa::True;
-using casa::ROMSSpWindowColumns;
-using casa::ROMSObservationColumns;
-using casa::PagedImage;
-using casa::ROMSDataDescColumns;
-using casa::CoordinateSystem;
-using casa::CountedPtr;
-using casa::Bool;
-using casa::File;
+using casacore::IPosition;
+using casacore::DirectionCoordinate;
+using casacore::MeasurementSet;
+using casacore::uInt;
+using casacore::String;
+using casacore::Int;
+using casacore::MEpoch;
+using casacore::Matrix;
+using casacore::Cube;
+using casacore::Vector;
+using casacore::Float;
+using casacore::Double;
+using casacore::ROMSAntennaColumns;
+using casacore::Complex;
+using casacore::PrecTimer;
+using casacore::Quantity;
+using casacore::sign;
+using casacore::False;
+using casacore::True;
+using casacore::ROMSSpWindowColumns;
+using casacore::ROMSObservationColumns;
+using casacore::PagedImage;
+using casacore::ROMSDataDescColumns;
+using casacore::CoordinateSystem;
+using casacore::CountedPtr;
+using casacore::Bool;
+using casacore::File;
namespace LOFAR {
namespace LofarFT {
@@ -248,7 +248,7 @@ void ConvolutionFunction::store_all_W_images()
IPosition shape(2, nPixelsConv, nPixelsConv);
//Careful with the sign of increment!!!! To check!!!!!!!
Vector<Double> increment(2, wPixelAngSize);
- double wavelength(casa::C::c / itsFrequencyList[0]);
+ double wavelength(casacore::C::c / itsFrequencyList[0]);
Matrix<Complex> wTerm = itsWTerm.evaluate(shape, increment,
w/wavelength);
normalized_fft(timerFFT, wTerm);
@@ -283,7 +283,7 @@ void ConvolutionFunction::FindNWplanes()
IPosition shape(2, nPixelsConv, nPixelsConv);
//Careful with the sign of increment!!!! To check!!!!!!!
Vector<Double> increment(2, wPixelAngSize);
- double wavelength(casa::C::c / itsFrequencyList[0]);
+ double wavelength(casacore::C::c / itsFrequencyList[0]);
Double wmax_plane(itsMaxW);
{
// Thread private variables.
@@ -441,7 +441,7 @@ CFStore ConvolutionFunction::makeConvolutionFunction(
uInt stationB,
Double time,
Double w,
- const casa::Matrix<casa::Float> &sum_weight,
+ const casacore::Matrix<casacore::Float> &sum_weight,
const vector<bool> &channel_selection,
double w_offset)
{
@@ -477,7 +477,7 @@ CFStore ConvolutionFunction::makeConvolutionFunction(
continue;
}
- double wavelength = casa::C::c/itsFrequencyList[ch];
+ double wavelength = casacore::C::c/itsFrequencyList[ch];
double w_lambda = abs(w)/wavelength - w_offset;
// compute wTerm
@@ -704,7 +704,7 @@ Matrix<Float> ConvolutionFunction::give_avg_pb()
File PBFile(PBFile_name);
if (! PBFile.exists())
{
- throw casa::SynthesisError (PBFile_name + " not found");
+ throw casacore::SynthesisError (PBFile_name + " not found");
}
PagedImage<Float> tmp(PBFile_name);
IPosition shape(tmp.shape());
@@ -1048,7 +1048,7 @@ Double ConvolutionFunction::estimateAResolution(
Double res_ini = abs(coordinates.increment()(0)); // pixel size in image in radian
Double diam_image = res_ini*shape(0); // image diameter in radian
Double station_diam = 70.; // station diameter in meters: To be adapted to the individual station size.
- Double res_beam_image= ((casa::C::c/itsRefFrequency)/station_diam)/2.; // pixel size in A-term image in radian
+ Double res_beam_image= ((casacore::C::c/itsRefFrequency)/station_diam)/2.; // pixel size in A-term image in radian
uInt Npix = floor(diam_image/res_beam_image); // Number of pixel size in A-term image
res_beam_image = diam_image/Npix;
if (Npix%2 != 1)
@@ -1095,7 +1095,7 @@ void ConvolutionFunction::showPerc1 (ostream& os,
os << std::setw(3) << perc/10 << '.' << perc%10 << '%';
}
-void ConvolutionFunction::applyWterm(casa::Array<casa::Complex>& grid, double w)
+void ConvolutionFunction::applyWterm(casacore::Array<casacore::Complex>& grid, double w)
{
Double res = abs(itsCoordinates.increment()(0));
@@ -1104,7 +1104,7 @@ void ConvolutionFunction::applyWterm(casa::Array<casa::Complex>& grid, double w)
int nx2 = nx/2;
- double twoPiW = 2.0 * casa::C::pi * w;
+ double twoPiW = 2.0 * casacore::C::pi * w;
#pragma omp parallel for schedule(dynamic)
for(uInt ii=1; ii<=nx2; ++ii)
@@ -1150,7 +1150,7 @@ void ConvolutionFunction::applyWterm(casa::Array<casa::Complex>& grid, double w)
}
}
-void ConvolutionFunction::applyElementBeam(casa::Array<casa::Complex>& grid, Bool conjugate)
+void ConvolutionFunction::applyElementBeam(casacore::Array<casacore::Complex>& grid, Bool conjugate)
{
for(uInt ch=0; ch<grid.shape()[3]; ++ch)
{
diff --git a/CEP/Imager/AWImager2/src/ConvolutionFunctionDiagonal.cc b/CEP/Imager/AWImager2/src/ConvolutionFunctionDiagonal.cc
index 81f27b2c3f7ecd6587585585ce885ef9c31c8036..fee6f7194e659ec2901f0434ab7ee570daaf21f1 100644
--- a/CEP/Imager/AWImager2/src/ConvolutionFunctionDiagonal.cc
+++ b/CEP/Imager/AWImager2/src/ConvolutionFunctionDiagonal.cc
@@ -61,33 +61,33 @@
#include "helper_functions.tcc"
-using casa::IPosition;
-using casa::DirectionCoordinate;
-using casa::MeasurementSet;
-using casa::uInt;
-using casa::String;
-using casa::Int;
-using casa::MEpoch;
-using casa::Matrix;
-using casa::Cube;
-using casa::Vector;
-using casa::Float;
-using casa::Double;
-using casa::ROMSAntennaColumns;
-using casa::Complex;
-using casa::PrecTimer;
-using casa::Quantity;
-using casa::sign;
-using casa::False;
-using casa::True;
-using casa::ROMSSpWindowColumns;
-using casa::ROMSObservationColumns;
-using casa::PagedImage;
-using casa::ROMSDataDescColumns;
-using casa::CoordinateSystem;
-using casa::CountedPtr;
-using casa::Bool;
-using casa::File;
+using casacore::IPosition;
+using casacore::DirectionCoordinate;
+using casacore::MeasurementSet;
+using casacore::uInt;
+using casacore::String;
+using casacore::Int;
+using casacore::MEpoch;
+using casacore::Matrix;
+using casacore::Cube;
+using casacore::Vector;
+using casacore::Float;
+using casacore::Double;
+using casacore::ROMSAntennaColumns;
+using casacore::Complex;
+using casacore::PrecTimer;
+using casacore::Quantity;
+using casacore::sign;
+using casacore::False;
+using casacore::True;
+using casacore::ROMSSpWindowColumns;
+using casacore::ROMSObservationColumns;
+using casacore::PagedImage;
+using casacore::ROMSDataDescColumns;
+using casacore::CoordinateSystem;
+using casacore::CountedPtr;
+using casacore::Bool;
+using casacore::File;
namespace LOFAR {
namespace LofarFT {
@@ -163,14 +163,14 @@ void ConvolutionFunctionDiagonal::computeAterm (Double time)
itsATerm->setEpoch(binEpoch);
- vector<Matrix<casa::Complex> > A0 = itsATerm->evaluateStationScalarFactor(
+ vector<Matrix<casacore::Complex> > A0 = itsATerm->evaluateStationScalarFactor(
i,
0,
itsFrequencyList,
itsFrequencyList,
true);
- vector<Matrix<casa::Complex> > A1 = itsATerm->evaluateStationScalarFactor(
+ vector<Matrix<casacore::Complex> > A1 = itsATerm->evaluateStationScalarFactor(
i,
1,
itsFrequencyList,
@@ -208,7 +208,7 @@ CFStore ConvolutionFunctionDiagonal::makeConvolutionFunction(
uInt stationB,
Double time,
Double w,
- const casa::Matrix<casa::Float> &sum_weight,
+ const casacore::Matrix<casacore::Float> &sum_weight,
const vector<bool> &channel_selection,
double w_offset)
{
@@ -244,7 +244,7 @@ CFStore ConvolutionFunctionDiagonal::makeConvolutionFunction(
continue;
}
- double wavelength = casa::C::c/itsFrequencyList[ch];
+ double wavelength = casacore::C::c/itsFrequencyList[ch];
double w_lambda = abs(w)/wavelength - w_offset;
// compute wTerm
diff --git a/CEP/Imager/AWImager2/src/ConvolutionFunctionWsplit.cc b/CEP/Imager/AWImager2/src/ConvolutionFunctionWsplit.cc
index 8d8bcd0fe1e910f31f059eda30512314153a9718..382fda40c63936bafe22c00f7fa05ee0d638b418 100644
--- a/CEP/Imager/AWImager2/src/ConvolutionFunctionWsplit.cc
+++ b/CEP/Imager/AWImager2/src/ConvolutionFunctionWsplit.cc
@@ -70,7 +70,7 @@
#include <casacore/lattices/Lattices/ArrayLattice.h>
#include <casacore/lattices/LatticeMath/LatticeFFT.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR
{
@@ -88,7 +88,7 @@ namespace LOFAR
Bool Use_EJones,
Bool Apply_Element,
int ApplyBeamCode,
- const casa::Record& parameters,
+ const casacore::Record& parameters,
vector< vector< vector < Matrix<Complex> > > > & StackMuellerNew
)
: m_nWPlanes(nW),
diff --git a/CEP/Imager/AWImager2/src/CubeSkyEquation.cc b/CEP/Imager/AWImager2/src/CubeSkyEquation.cc
index fd001053f1a6c01ccfe5d7259cdda3594fb3463d..addc75b244f40b515015778b7ebd06439769dcb8 100644
--- a/CEP/Imager/AWImager2/src/CubeSkyEquation.cc
+++ b/CEP/Imager/AWImager2/src/CubeSkyEquation.cc
@@ -80,7 +80,7 @@
#include <omp.h>
#endif
-using namespace casa;
+using namespace casacore;
namespace LOFAR { //# NAMESPACE LOFAR - BEGIN
namespace LofarFT {
@@ -88,10 +88,10 @@ namespace LofarFT {
CubeSkyEquation::CubeSkyEquation(
SkyModel& sm,
VisSet& vs,
- casa::FTMachine& ft,
+ casacore::FTMachine& ft,
ComponentFTMachine& cft,
Bool noModelCol)
-: casa::SkyEquation(sm, vs, ft, cft, noModelCol),
+: casacore::SkyEquation(sm, vs, ft, cft, noModelCol),
destroyVisibilityIterator_p (False),
internalChangesPut_p(False),
internalChangesGet_p(False),
@@ -104,7 +104,7 @@ CubeSkyEquation::CubeSkyEquation(
CubeSkyEquation::CubeSkyEquation(
SkyModel& sm,
VisibilityIterator& vi,
- casa::FTMachine& ft,
+ casacore::FTMachine& ft,
ComponentFTMachine& cft,
Bool noModelCol)
: SkyEquation(sm, vi, ft, cft, noModelCol),
@@ -119,7 +119,7 @@ CubeSkyEquation::CubeSkyEquation(
init(ft);
}
-void CubeSkyEquation::init(casa::FTMachine& ft){
+void CubeSkyEquation::init(casacore::FTMachine& ft){
Int nmod = sm_->numberOfModels()/sm_->numberOfTaylorTerms();
nmod = 1;
@@ -936,7 +936,7 @@ void CubeSkyEquation::sliceCube(
Double memoryMB=HostInfo::memoryFree()/1024.0/(5.0*(sm_->numberOfModels()));
slice=new TempImage<Complex> (TiledShape(sliceIm->shape(),
- IPosition(4, casa::min(sliceIm->shape()(0)/4, 1000), casa::min(sliceIm->shape()(1)/4, 1000),sliceIm->shape()(2) , 1)), sliceIm->coordinates(), sm_->getMemoryUse() ? memoryMB: 0);
+ IPosition(4, casacore::min(sliceIm->shape()(0)/4, 1000), casacore::min(sliceIm->shape()(1)/4, 1000),sliceIm->shape()(2) , 1)), sliceIm->coordinates(), sm_->getMemoryUse() ? memoryMB: 0);
//slice->setMaximumCacheSize((sliceIm->shape()[0])*(sliceIm->shape()[1])/4);
diff --git a/CEP/Imager/AWImager2/src/FFTCMatrix.cc b/CEP/Imager/AWImager2/src/FFTCMatrix.cc
index 31ed315bd6683fcbe84672e588e4808aa9ea5012..d1ae75d35e12f22527307b4f0aef1d14c43f9a4a 100644
--- a/CEP/Imager/AWImager2/src/FFTCMatrix.cc
+++ b/CEP/Imager/AWImager2/src/FFTCMatrix.cc
@@ -32,7 +32,7 @@
#include <stdio.h>
#include <cstring>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
@@ -61,14 +61,14 @@ namespace LOFAR {
{
if (!theirInitDone) {
fftwf_init_threads();
- FILE* file = fopen (casa::Path("$HOME/fftwisdom2d.txt").
+ FILE* file = fopen (casacore::Path("$HOME/fftwisdom2d.txt").
expandedName().c_str(), "r");
if (!file) {
- file = fopen (casa::Path("$LOFARLOCALROOT/fftwisdom2d.txt").
+ file = fopen (casacore::Path("$LOFARLOCALROOT/fftwisdom2d.txt").
expandedName().c_str(), "r");
}
if (!file) {
- file = fopen (casa::Path("$LOFARROOT/fftwisdom2d.txt").
+ file = fopen (casacore::Path("$LOFARROOT/fftwisdom2d.txt").
expandedName().c_str(), "r");
}
if (!file) {
@@ -576,8 +576,8 @@ namespace LOFAR {
std::vector<std::complex<float> > tmpcol(itsSize);
std::complex<float>* tmprowPtr = &(tmprow[0]);
std::complex<float>* tmpcolPtr = &(tmpcol[0]);
- casa::objcopy (tmprowPtr, itsData + hsz*itsSize, itsSize);
- casa::objcopy (tmpcolPtr, itsData + hsz, itsSize, 1, itsSize);
+ casacore::objcopy (tmprowPtr, itsData + hsz*itsSize, itsSize);
+ casacore::objcopy (tmpcolPtr, itsData + hsz, itsSize, 1, itsSize);
std::complex<float>* __restrict__ p1f;
std::complex<float>* __restrict__ p1t;
std::complex<float>* __restrict__ p2f;
@@ -640,10 +640,10 @@ namespace LOFAR {
p2t += incr;
}
// Put back the middle row and column while exchanging top and bottom.
- casa::objcopy (itsData + outm*itsSize + rhsz, tmprowPtr, lhsz);
- casa::objcopy (itsData + outm*itsSize, tmprowPtr + lhsz, rhsz);
- casa::objcopy (itsData + outm + rhsz*itsSize, tmpcolPtr, lhsz, itsSize, 1);
- casa::objcopy (itsData + outm, tmpcolPtr + lhsz, rhsz, itsSize, 1);
+ casacore::objcopy (itsData + outm*itsSize + rhsz, tmprowPtr, lhsz);
+ casacore::objcopy (itsData + outm*itsSize, tmprowPtr + lhsz, rhsz);
+ casacore::objcopy (itsData + outm + rhsz*itsSize, tmpcolPtr, lhsz, itsSize, 1);
+ casacore::objcopy (itsData + outm, tmpcolPtr + lhsz, rhsz, itsSize, 1);
return;
}
diff --git a/CEP/Imager/AWImager2/src/FTMachine.cc b/CEP/Imager/AWImager2/src/FTMachine.cc
index 12d74a4eb59fc45357244f0141fbfcf576792ea3..bac6200510dc8a8f8437bdf3a4c41ebf1f508ba5 100644
--- a/CEP/Imager/AWImager2/src/FTMachine.cc
+++ b/CEP/Imager/AWImager2/src/FTMachine.cc
@@ -85,7 +85,7 @@
#define DORES True
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
namespace LofarFT {
@@ -93,16 +93,16 @@ namespace LofarFT {
FTMachine::FTMachine(
const MeasurementSet& ms,
const ParameterSet& parset)
- : casa::FTMachine(),
- // Aliases for data members of casa::FTMachine
+ : casacore::FTMachine(),
+ // Aliases for data members of casacore::FTMachine
// itsImage(0),
// itsNX(0),
// itsNY(0),
// itsNPol(0),
// itsNChan(0),
itsUseDoubleGrid(False),
-// itsChanMap(casa::FTMachine::chanMap),
-// itsPolMap(casa::FTMachine::polMap),
+// itsChanMap(casacore::FTMachine::chanMap),
+// itsPolMap(casacore::FTMachine::polMap),
// ================================================
itsPadding(parset.getDouble("gridding.padding", 1.0)),
@@ -134,14 +134,14 @@ FTMachine::FTMachine(
//----------------------------------------------------------------------
FTMachine::FTMachine(const FTMachine& other) :
- casa::FTMachine(),
- itsNX(casa::FTMachine::nx),
- itsNY(casa::FTMachine::ny),
- itsNPol(casa::FTMachine::npol),
- itsNChan(casa::FTMachine::nchan),
- itsUseDoubleGrid(casa::FTMachine::useDoubleGrid_p),
- itsChanMap(casa::FTMachine::chanMap),
- itsPolMap(casa::FTMachine::polMap)
+ casacore::FTMachine(),
+ itsNX(casacore::FTMachine::nx),
+ itsNY(casacore::FTMachine::ny),
+ itsNPol(casacore::FTMachine::npol),
+ itsNChan(casacore::FTMachine::nchan),
+ itsUseDoubleGrid(casacore::FTMachine::useDoubleGrid_p),
+ itsChanMap(casacore::FTMachine::chanMap),
+ itsPolMap(casacore::FTMachine::polMap)
{
operator=(other);
}
@@ -163,7 +163,7 @@ FTMachine& FTMachine::operator=(const FTMachine& other)
if (this!=&other)
{
//Do the base parameters
- casa::FTMachine::operator=(other);
+ casacore::FTMachine::operator=(other);
//private params
itsVisResampler = other.itsVisResampler;
@@ -281,8 +281,8 @@ Matrix<Float> FTMachine::getSpheroidal()
// we grid-correct, and FFT the image
void FTMachine::initializeToVis(
- casa::PtrBlock<casa::ImageInterface<casa::Float>* > &model_images,
- casa::Bool normalize)
+ casacore::PtrBlock<casacore::ImageInterface<casacore::Float>* > &model_images,
+ casacore::Bool normalize)
{
itsModelImages = model_images;
@@ -313,8 +313,8 @@ void FTMachine::finalizeToVis()
// grid.
void FTMachine::initializeToSky(
- casa::PtrBlock<casa::ImageInterface<casa::Float> * > &images,
- casa::Bool doPSF)
+ casacore::PtrBlock<casacore::ImageInterface<casacore::Float> * > &images,
+ casacore::Bool doPSF)
{
itsImages = images;
@@ -331,9 +331,9 @@ void FTMachine::finalizeToSky()
// *****************************************************************
void FTMachine::initializeResidual(
- casa::PtrBlock<casa::ImageInterface<casa::Float>* > model_images,
- casa::PtrBlock<casa::ImageInterface<casa::Float>* > images,
- casa::Bool normalize)
+ casacore::PtrBlock<casacore::ImageInterface<casacore::Float>* > model_images,
+ casacore::PtrBlock<casacore::ImageInterface<casacore::Float>* > images,
+ casacore::Bool normalize)
{
itsModelImages = model_images;
itsImages = images;
@@ -471,8 +471,8 @@ void FTMachine::initialize_grids()
void FTMachine::residual(
VisBuffer& vb,
- casa::Int row,
- casa::FTMachine::Type type)
+ casacore::Int row,
+ casacore::FTMachine::Type type)
{
// First put the negated value of the data column in the modelviscube of vb
switch(type)
@@ -498,18 +498,18 @@ void FTMachine::residual(
put(vb, row, False, FTMachine::MODEL);
}
-void FTMachine::get(casa::VisBuffer& vb, Int row)
+void FTMachine::get(casacore::VisBuffer& vb, Int row)
{
- // do not call this FTMachine with a casa::VisBuffer
+ // do not call this FTMachine with a casacore::VisBuffer
// only use the get method which accepts a LOFAR VisBuffer
throw Exception("Not implemented.");
// put( *static_cast<VisBuffer*>(&vb), row);
}
-void FTMachine::put(const casa::VisBuffer& vb, Int row, Bool dopsf,
+void FTMachine::put(const casacore::VisBuffer& vb, Int row, Bool dopsf,
FTMachine::Type type)
{
- // do not call this FTMachine with a casa::VisBuffer
+ // do not call this FTMachine with a casacore::VisBuffer
// only use the put method which accepts a LOFAR VisBuffer
throw Exception("Not implemented.");
// put( *static_cast<const VisBuffer*>(&vb), row, dopsf, type);
@@ -569,14 +569,14 @@ void FTMachine::normalize(ImageInterface<Complex> &image, Bool do_beam, Bool do_
Array<Float> beam;
- casa::Vector<casa::Double> x;
+ casacore::Vector<casacore::Double> x;
if (do_spheroidal)
{
x.resize(itsNX);
double halfsize = floor(itsNX / 2.0);
double paddedhalfsize = floor(itsPaddedNX / 2.0);
- for (casa::uInt i=0; i<itsNX; ++i)
+ for (casacore::uInt i=0; i<itsNX; ++i)
{
x[i] = spheroidal(abs(i - halfsize) / paddedhalfsize);
}
@@ -751,18 +751,18 @@ ImageInterface<Complex>& FTMachine::getImage(Matrix<Float>&, Bool)
}
void FTMachine::ComputeResiduals(
- casa::VisBuffer&,
- casa::Bool)
+ casacore::VisBuffer&,
+ casacore::Bool)
{
throw Exception("Not implemented");
}
-void FTMachine::initializeToVis(casa::ImageInterface<casa::Complex>&, const casa::VisBuffer&)
+void FTMachine::initializeToVis(casacore::ImageInterface<casacore::Complex>&, const casacore::VisBuffer&)
{
throw Exception("Not implemented");
}
-void FTMachine::initializeToSky(casa::ImageInterface<casa::Complex>&, casa::Matrix<casa::Float>&, const casa::VisBuffer&)
+void FTMachine::initializeToSky(casacore::ImageInterface<casacore::Complex>&, casacore::Matrix<casacore::Float>&, const casacore::VisBuffer&)
{
throw Exception("Not implemented");
}
diff --git a/CEP/Imager/AWImager2/src/FTMachineIDG.cc b/CEP/Imager/AWImager2/src/FTMachineIDG.cc
index da7738312b4c384b47a79bfe623bca9cc96fe2c4..0631facdbc3c43a3bb99dc4738df0a6cbddd77ae 100644
--- a/CEP/Imager/AWImager2/src/FTMachineIDG.cc
+++ b/CEP/Imager/AWImager2/src/FTMachineIDG.cc
@@ -43,7 +43,7 @@
#define SUPPORT_SPHEROIDAL 7
-using namespace casa;
+using namespace casacore;
const String LOFAR::LofarFT::FTMachineIDG::theirName("FTMachineIDG");
@@ -134,13 +134,13 @@ struct Chunk
std::vector<float> w_min;
std::vector<float> w_max;
std::vector<bool> has_been_processed;
- casa::Matrix<casa::Float> sum_weight;
+ casacore::Matrix<casacore::Float> sum_weight;
};
struct VisibilityMap
{
vector<Chunk> chunks;
- casa::Vector<casa::uInt> baseline_index_map;
+ casacore::Vector<casacore::uInt> baseline_index_map;
int blocksize;
float min_w_max;
};
@@ -149,7 +149,7 @@ VisibilityMap make_mapping(
const VisBuffer& vb,
double dtime,
vector<vector<int> > channel_map,
- casa::Vector<casa::Double> uvscale)
+ casacore::Vector<casacore::Double> uvscale)
{
VisibilityMap v;
@@ -199,33 +199,33 @@ VisibilityMap make_mapping(
for(std::vector<vector<int> >::iterator chan_group = channel_map.begin(); chan_group != channel_map.end(); ++chan_group)
{
// in pixels, so scale with uvscale
- float min_u = float(uvw(start_idx)(0))/(float)casa::C::c*float(vb.frequency()(chan_group->front()))*(float)uvscale(0);
- min_u = min(min_u, float(uvw(start_idx)(0))/(float)casa::C::c*float(vb.frequency()(chan_group->back()))*(float)uvscale(0));
- min_u = min(min_u, float(uvw(end_idx)(0))/(float)casa::C::c*float(vb.frequency()(chan_group->front()))*(float)uvscale(0));
- min_u = min(min_u, float(uvw(end_idx)(0))/(float)casa::C::c*float(vb.frequency()(chan_group->back()))*(float)uvscale(0));
+ float min_u = float(uvw(start_idx)(0))/(float)casacore::C::c*float(vb.frequency()(chan_group->front()))*(float)uvscale(0);
+ min_u = min(min_u, float(uvw(start_idx)(0))/(float)casacore::C::c*float(vb.frequency()(chan_group->back()))*(float)uvscale(0));
+ min_u = min(min_u, float(uvw(end_idx)(0))/(float)casacore::C::c*float(vb.frequency()(chan_group->front()))*(float)uvscale(0));
+ min_u = min(min_u, float(uvw(end_idx)(0))/(float)casacore::C::c*float(vb.frequency()(chan_group->back()))*(float)uvscale(0));
// in pixels, so scale with uvscale
- float min_v = float(uvw(start_idx)(1))/(float)casa::C::c*float(vb.frequency()(chan_group->front()))*(float)uvscale(1);
- min_v = min(min_v, float(uvw(start_idx)(1))/(float)casa::C::c*float(vb.frequency()(chan_group->back()))*(float)uvscale(1));
- min_v = min(min_v, float(uvw(end_idx)(1))/(float)casa::C::c*float(vb.frequency()(chan_group->front()))*(float)uvscale(1));
- min_v = min(min_v, float(uvw(end_idx)(1))/(float)casa::C::c*float(vb.frequency()(chan_group->back()))*(float)uvscale(1));
+ float min_v = float(uvw(start_idx)(1))/(float)casacore::C::c*float(vb.frequency()(chan_group->front()))*(float)uvscale(1);
+ min_v = min(min_v, float(uvw(start_idx)(1))/(float)casacore::C::c*float(vb.frequency()(chan_group->back()))*(float)uvscale(1));
+ min_v = min(min_v, float(uvw(end_idx)(1))/(float)casacore::C::c*float(vb.frequency()(chan_group->front()))*(float)uvscale(1));
+ min_v = min(min_v, float(uvw(end_idx)(1))/(float)casacore::C::c*float(vb.frequency()(chan_group->back()))*(float)uvscale(1));
// in wavelengths, so no scaling with uvscale
- float min_w = float(uvw(start_idx)(2))/(float)casa::C::c*float(vb.frequency()(chan_group->front()));
- min_w = min(min_w, float(uvw(end_idx)(2))/(float)casa::C::c*float(vb.frequency()(chan_group->front())));
+ float min_w = float(uvw(start_idx)(2))/(float)casacore::C::c*float(vb.frequency()(chan_group->front()));
+ min_w = min(min_w, float(uvw(end_idx)(2))/(float)casacore::C::c*float(vb.frequency()(chan_group->front())));
- float max_u = float(uvw(start_idx)(0))/(float)casa::C::c*float(vb.frequency()(chan_group->front()))*(float)uvscale(0);
- max_u = max(max_u, float(uvw(start_idx)(0))/(float)casa::C::c*float(vb.frequency()(chan_group->back()))*(float)uvscale(0));
- max_u = max(max_u, float(uvw(end_idx)(0))/(float)casa::C::c*float(vb.frequency()(chan_group->front()))*(float)uvscale(0));
- max_u = max(max_u, float(uvw(end_idx)(0))/(float)casa::C::c*float(vb.frequency()(chan_group->back()))*(float)uvscale(0));
+ float max_u = float(uvw(start_idx)(0))/(float)casacore::C::c*float(vb.frequency()(chan_group->front()))*(float)uvscale(0);
+ max_u = max(max_u, float(uvw(start_idx)(0))/(float)casacore::C::c*float(vb.frequency()(chan_group->back()))*(float)uvscale(0));
+ max_u = max(max_u, float(uvw(end_idx)(0))/(float)casacore::C::c*float(vb.frequency()(chan_group->front()))*(float)uvscale(0));
+ max_u = max(max_u, float(uvw(end_idx)(0))/(float)casacore::C::c*float(vb.frequency()(chan_group->back()))*(float)uvscale(0));
- float max_v = float(uvw(start_idx)(1))/(float)casa::C::c*float(vb.frequency()(chan_group->front()))*(float)uvscale(1);
- max_v = max(max_v, float(uvw(start_idx)(1))/(float)casa::C::c*float(vb.frequency()(chan_group->back()))*(float)uvscale(1));
- max_v = max(max_v, float(uvw(end_idx)(1))/(float)casa::C::c*float(vb.frequency()(chan_group->front()))*(float)uvscale(1));
- max_v = max(max_v, float(uvw(end_idx)(1))/(float)casa::C::c*float(vb.frequency()(chan_group->back()))*(float)uvscale(1));
+ float max_v = float(uvw(start_idx)(1))/(float)casacore::C::c*float(vb.frequency()(chan_group->front()))*(float)uvscale(1);
+ max_v = max(max_v, float(uvw(start_idx)(1))/(float)casacore::C::c*float(vb.frequency()(chan_group->back()))*(float)uvscale(1));
+ max_v = max(max_v, float(uvw(end_idx)(1))/(float)casacore::C::c*float(vb.frequency()(chan_group->front()))*(float)uvscale(1));
+ max_v = max(max_v, float(uvw(end_idx)(1))/(float)casacore::C::c*float(vb.frequency()(chan_group->back()))*(float)uvscale(1));
- float max_w = float(uvw(start_idx)(2))/(float)casa::C::c*float(vb.frequency()(chan_group->back()));
- max_w = max(max_w, float(uvw(end_idx)(2))/(float)casa::C::c*float(vb.frequency()(chan_group->back())));
+ float max_w = float(uvw(start_idx)(2))/(float)casacore::C::c*float(vb.frequency()(chan_group->back()));
+ max_w = max(max_w, float(uvw(end_idx)(2))/(float)casacore::C::c*float(vb.frequency()(chan_group->back())));
// LOG_DEBUG_STR("max_u-min_u: " << (max_u-min_u));
@@ -240,7 +240,7 @@ VisibilityMap make_mapping(
max_time_frequency_support = max(max_time_frequency_support, time_frequency_support);
// LOG_DEBUG_STR("max_time_frequency_support: " << max_time_frequency_support);
-// double w_support = abs(max(uvw(2, idx_start),uvw(2, idx_end))/casa::C::c*vb.frequency()(N_chan-1)*itsUVScale(0)*itsUVScale(0));
+// double w_support = abs(max(uvw(2, idx_start),uvw(2, idx_end))/casacore::C::c*vb.frequency()(N_chan-1)*itsUVScale(0)*itsUVScale(0));
// find time and frequency support used
// assign remaining support to w
@@ -398,7 +398,7 @@ void FTMachineIDG::initialize_model_grids(Bool normalize_model)
}
}
-void FTMachineIDG::residual(VisBuffer& vb, casa::Int row, casa::FTMachine::Type type)
+void FTMachineIDG::residual(VisBuffer& vb, casacore::Int row, casacore::FTMachine::Type type)
{
getput(vb, row, True, True, False, type);
}
@@ -406,11 +406,11 @@ void FTMachineIDG::residual(VisBuffer& vb, casa::Int row, casa::FTMachine::Type
void FTMachineIDG::getput(
VisBuffer& vb,
- casa::Int row,
- casa::Bool doget,
- casa::Bool doput,
- casa::Bool dopsf,
- casa::FTMachine::Type type)
+ casacore::Int row,
+ casacore::Bool doget,
+ casacore::Bool doput,
+ casacore::Bool dopsf,
+ casacore::FTMachine::Type type)
{
// within this scope redirect messages written to clog to LofarLogger with loglevel DEBUG
ScopedRedirect<LogDebugSink> scoped_redirect(std::clog);
@@ -536,7 +536,7 @@ void FTMachineIDG::getput(
}
}
- float wavelength = casa::C::c / vb.frequency()(0);
+ float wavelength = casacore::C::c / vb.frequency()(0);
float max_u_grid = itsPaddedNX/(2 * itsUVScale(0)) * wavelength;
float max_v_grid = itsPaddedNY/(2 * itsUVScale(1)) * wavelength;
@@ -544,8 +544,8 @@ void FTMachineIDG::getput(
max_v = min(max_v, max_v_grid);
// find the maximum frequency window to stay within maximum support
- float max_bw_u = MAX_SUPPORT_FREQ / (max_u / casa::C::c * itsUVScale(0));
- float max_bw_v = MAX_SUPPORT_FREQ / (max_v / casa::C::c * itsUVScale(1));
+ float max_bw_u = MAX_SUPPORT_FREQ / (max_u / casacore::C::c * itsUVScale(0));
+ float max_bw_v = MAX_SUPPORT_FREQ / (max_v / casacore::C::c * itsUVScale(1));
float max_bw = min(max_bw_u, max_bw_v);
@@ -575,7 +575,7 @@ void FTMachineIDG::getput(
// max time = max support / (max baseline (pixels) * earth_rotation_rate (rad/s))
// min(itsTimeWindow, max time)
- float min_wavelength = casa::C::c / vb.frequency()(vb.nChannel()-1);
+ float min_wavelength = casacore::C::c / vb.frequency()(vb.nChannel()-1);
float max_l = sqrt(max_l2)/min_wavelength * abs(itsUVScale(0));
float earth_rotation_rate = 7.2921150e-5;
float max_time = MAX_SUPPORT_TIME / (max_l * earth_rotation_rate);
@@ -671,10 +671,10 @@ void FTMachineIDG::getput(
}
min_w_max = std::numeric_limits<float>::infinity();
- casa::Array<casa::Complex> w_plane_grid;
+ casacore::Array<casacore::Complex> w_plane_grid;
if (doput)
{
- w_plane_grid = casa::Array<casa::Complex>(itsGriddedData[0].shape(), casa::Complex(0));
+ w_plane_grid = casacore::Array<casacore::Complex>(itsGriddedData[0].shape(), casacore::Complex(0));
}
//iterate over channel groups
@@ -688,8 +688,8 @@ void FTMachineIDG::getput(
vector<int>::iterator chan_it;
for(chan_it = chan_group->begin(), chan=0; chan_it != chan_group->end(); ++chan_it, ++chan)
{
- double wavelength = casa::C::c / vb.frequency()(*chan_it);
- wavenumbers(chan) = 2 * casa::C::pi / wavelength;
+ double wavelength = casacore::C::c / vb.frequency()(*chan_it);
+ wavenumbers(chan) = 2 * casacore::C::pi / wavelength;
}
std::vector<Chunk>::iterator chunk = v.chunks.begin();
@@ -709,7 +709,7 @@ void FTMachineIDG::getput(
int idx_end = v.baseline_index_map[chunk->end];
double f = (vb.frequency()(chan_group->front()) + vb.frequency()(chan_group->back())) / 2;
- double wavelength = casa::C::c / f;
+ double wavelength = casacore::C::c / f;
int center_u = floor((vb.uvw()(idx_start)(0) + vb.uvw()(idx_end)(0))/2/wavelength * itsUVScale(0));
int center_v = floor((vb.uvw()(idx_start)(1) + vb.uvw()(idx_end)(1))/2/wavelength * itsUVScale(1));
@@ -727,9 +727,9 @@ void FTMachineIDG::getput(
continue;
}
- offsets (0, i) = double(center_u) / itsUVScale(0) * 2 * casa::C::pi;
- offsets (1, i) = double(center_v) / itsUVScale(1) * 2 * casa::C::pi;
- offsets (2, i) = w_offset * 2 * casa::C::pi;
+ offsets (0, i) = double(center_u) / itsUVScale(0) * 2 * casacore::C::pi;
+ offsets (1, i) = double(center_v) / itsUVScale(1) * 2 * casacore::C::pi;
+ offsets (2, i) = w_offset * 2 * casacore::C::pi;
for (int j = chunk->start; j<=chunk->end; j++)
{
@@ -1010,8 +1010,8 @@ void FTMachineIDG::get(VisBuffer& vb, Int row)
// // wavenumbers
// for(int i = 0; i<N_chan; i++)
// {
-// double wavelength = casa::C::c / vb.frequency()(i);
-// wavenumbers(i) = 2 * casa::C::pi / wavelength;
+// double wavelength = casacore::C::c / vb.frequency()(i);
+// wavenumbers(i) = 2 * casacore::C::pi / wavelength;
// }
//
// int i = 0;
@@ -1034,33 +1034,33 @@ void FTMachineIDG::get(VisBuffer& vb, Int row)
// int idx_start = v.baseline_index_map[chunk->start];
// int idx_end = v.baseline_index_map[chunk->end];
//
-// double wavelength = casa::C::c / vb.frequency()(N_chan/2);
+// double wavelength = casacore::C::c / vb.frequency()(N_chan/2);
//
-// offsets (0, i) = double(floor((vb.uvw()(idx_start)(0) + vb.uvw()(idx_end)(0))/2/wavelength * itsUVScale(0))) / itsUVScale(0) * 2 * casa::C::pi;
-// offsets (1, i) = double(floor((vb.uvw()(idx_start)(1) + vb.uvw()(idx_end)(1))/2/wavelength * itsUVScale(1))) / itsUVScale(1) * 2 * casa::C::pi;
+// offsets (0, i) = double(floor((vb.uvw()(idx_start)(0) + vb.uvw()(idx_end)(0))/2/wavelength * itsUVScale(0))) / itsUVScale(0) * 2 * casacore::C::pi;
+// offsets (1, i) = double(floor((vb.uvw()(idx_start)(1) + vb.uvw()(idx_end)(1))/2/wavelength * itsUVScale(1))) / itsUVScale(1) * 2 * casacore::C::pi;
// offsets (2, i) = 0;
//
-// // double w_support = abs(max(vb.uvw()(idx_start)(2),vb.uvw()(idx_start)(2))/casa::C::c*vb.frequency()(N_chan-1)*itsUVScale(0)*itsUVScale(0));
+// // double w_support = abs(max(vb.uvw()(idx_start)(2),vb.uvw()(idx_start)(2))/casacore::C::c*vb.frequency()(N_chan-1)*itsUVScale(0)*itsUVScale(0));
// //
-// // double min_u = vb.uvw()(idx_start)(0)/casa::C::c*vb.frequency()(0)*itsUVScale(0);
-// // min_u = min(min_u, vb.uvw()(idx_start)(0)/casa::C::c*vb.frequency()(N_chan-1)*itsUVScale(0));
-// // min_u = min(min_u, vb.uvw()(idx_end)(0)/casa::C::c*vb.frequency()(0)*itsUVScale(0));
-// // min_u = min(min_u, vb.uvw()(idx_end)(0)/casa::C::c*vb.frequency()(N_chan-1)*itsUVScale(0));
+// // double min_u = vb.uvw()(idx_start)(0)/casacore::C::c*vb.frequency()(0)*itsUVScale(0);
+// // min_u = min(min_u, vb.uvw()(idx_start)(0)/casacore::C::c*vb.frequency()(N_chan-1)*itsUVScale(0));
+// // min_u = min(min_u, vb.uvw()(idx_end)(0)/casacore::C::c*vb.frequency()(0)*itsUVScale(0));
+// // min_u = min(min_u, vb.uvw()(idx_end)(0)/casacore::C::c*vb.frequency()(N_chan-1)*itsUVScale(0));
// //
-// // double min_v = vb.uvw()(idx_start)(1)/casa::C::c*vb.frequency()(0)*itsUVScale(0);
-// // min_v = min(min_v, vb.uvw()(idx_start)(1)/casa::C::c*vb.frequency()(N_chan-1)*itsUVScale(0));
-// // min_v = min(min_v, vb.uvw()(idx_end)(1)/casa::C::c*vb.frequency()(0)*itsUVScale(0));
-// // min_v = min(min_v, vb.uvw()(idx_end)(1)/casa::C::c*vb.frequency()(N_chan-1)*itsUVScale(0));
+// // double min_v = vb.uvw()(idx_start)(1)/casacore::C::c*vb.frequency()(0)*itsUVScale(0);
+// // min_v = min(min_v, vb.uvw()(idx_start)(1)/casacore::C::c*vb.frequency()(N_chan-1)*itsUVScale(0));
+// // min_v = min(min_v, vb.uvw()(idx_end)(1)/casacore::C::c*vb.frequency()(0)*itsUVScale(0));
+// // min_v = min(min_v, vb.uvw()(idx_end)(1)/casacore::C::c*vb.frequency()(N_chan-1)*itsUVScale(0));
// //
-// // double max_u = vb.uvw()(idx_start)(0)/casa::C::c*vb.frequency()(0)*itsUVScale(0);
-// // max_u = max(max_u, vb.uvw()(idx_start)(0)/casa::C::c*vb.frequency()(N_chan-1)*itsUVScale(0));
-// // max_u = max(max_u, vb.uvw()(idx_end)(0)/casa::C::c*vb.frequency()(0)*itsUVScale(0));
-// // max_u = max(max_u, vb.uvw()(idx_end)(0)/casa::C::c*vb.frequency()(N_chan-1)*itsUVScale(0));
+// // double max_u = vb.uvw()(idx_start)(0)/casacore::C::c*vb.frequency()(0)*itsUVScale(0);
+// // max_u = max(max_u, vb.uvw()(idx_start)(0)/casacore::C::c*vb.frequency()(N_chan-1)*itsUVScale(0));
+// // max_u = max(max_u, vb.uvw()(idx_end)(0)/casacore::C::c*vb.frequency()(0)*itsUVScale(0));
+// // max_u = max(max_u, vb.uvw()(idx_end)(0)/casacore::C::c*vb.frequency()(N_chan-1)*itsUVScale(0));
// //
-// // double max_v = vb.uvw()(idx_start)(1)/casa::C::c*vb.frequency()(0)*itsUVScale(0);
-// // max_v = max(max_v, vb.uvw()(idx_start)(1)/casa::C::c*vb.frequency()(N_chan-1)*itsUVScale(0));
-// // max_v = max(max_v, vb.uvw()(idx_end)(1)/casa::C::c*vb.frequency()(0)*itsUVScale(0));
-// // max_v = max(max_v, vb.uvw()(idx_end)(1)/casa::C::c*vb.frequency()(N_chan-1)*itsUVScale(0));
+// // double max_v = vb.uvw()(idx_start)(1)/casacore::C::c*vb.frequency()(0)*itsUVScale(0);
+// // max_v = max(max_v, vb.uvw()(idx_start)(1)/casacore::C::c*vb.frequency()(N_chan-1)*itsUVScale(0));
+// // max_v = max(max_v, vb.uvw()(idx_end)(1)/casacore::C::c*vb.frequency()(0)*itsUVScale(0));
+// // max_v = max(max_v, vb.uvw()(idx_end)(1)/casacore::C::c*vb.frequency()(N_chan-1)*itsUVScale(0));
// //
// // double uv_support = max(abs(max_u-min_u), abs(max_v-min_v));
// //
@@ -1070,8 +1070,8 @@ void FTMachineIDG::get(VisBuffer& vb, Int row)
// // cout << "uv_support: " << uv_support << endl;
// // }
//
-// coordinates(0,i) = round(offsets(0,i)/2/casa::C::pi*itsUVScale(0)) + itsUVOffset(0) - blocksize/2;
-// coordinates(1,i) = round(offsets(1,i)/2/casa::C::pi*itsUVScale(1)) + itsUVOffset(1) - blocksize/2;
+// coordinates(0,i) = round(offsets(0,i)/2/casacore::C::pi*itsUVScale(0)) + itsUVOffset(0) - blocksize/2;
+// coordinates(1,i) = round(offsets(1,i)/2/casacore::C::pi*itsUVScale(1)) + itsUVOffset(1) - blocksize/2;
//
// // baselines
// int idx = v.baseline_index_map[chunk->start];
diff --git a/CEP/Imager/AWImager2/src/FTMachineSimple.cc b/CEP/Imager/AWImager2/src/FTMachineSimple.cc
index 96d816c09f3c7348d7a4a5be0473b1e02db1518b..f3a747607db850fcc2b56a0755fb74ed77f4e1a5 100644
--- a/CEP/Imager/AWImager2/src/FTMachineSimple.cc
+++ b/CEP/Imager/AWImager2/src/FTMachineSimple.cc
@@ -31,7 +31,7 @@
#include <Common/OpenMP.h>
-using namespace casa;
+using namespace casacore;
const String LOFAR::LofarFT::FTMachineSimple::theirName("FTMachineSimple");
@@ -109,7 +109,7 @@ FTMachineSimple& FTMachineSimple::operator=(const FTMachineSimple& other)
//----------------------------------------------------------------------
-void FTMachineSimple::put(const casa::VisBuffer& vb, Int row, Bool dopsf,
+void FTMachineSimple::put(const casacore::VisBuffer& vb, Int row, Bool dopsf,
FTMachine::Type type)
{
put( *static_cast<const VisBuffer*>(&vb), row, dopsf, type);
@@ -387,7 +387,7 @@ void FTMachineSimple::put(const VisBuffer& vb, Int row, Bool dopsf,
}
-void FTMachineSimple::get(casa::VisBuffer& vb, Int row)
+void FTMachineSimple::get(casacore::VisBuffer& vb, Int row)
{
get(*static_cast<VisBuffer*>(&vb), row);
}
diff --git a/CEP/Imager/AWImager2/src/FTMachineSimpleWB.cc b/CEP/Imager/AWImager2/src/FTMachineSimpleWB.cc
index 697d8026c6d73fd4b90960f2339cbe30e03cbfc4..01787b6f47bd1bac71ed05e462640aae8cd52af3 100644
--- a/CEP/Imager/AWImager2/src/FTMachineSimpleWB.cc
+++ b/CEP/Imager/AWImager2/src/FTMachineSimpleWB.cc
@@ -32,7 +32,7 @@
#include <casacore/lattices/LatticeMath/LatticeFFT.h>
-using namespace casa;
+using namespace casacore;
const String LOFAR::LofarFT::FTMachineSimpleWB::theirName("FTMachineSimpleWB");
@@ -109,7 +109,7 @@ FTMachineSimpleWB& FTMachineSimpleWB::operator=(const FTMachineSimpleWB& other)
//----------------------------------------------------------------------
-void FTMachineSimpleWB::put(const casa::VisBuffer& vb, Int row, Bool dopsf,
+void FTMachineSimpleWB::put(const casacore::VisBuffer& vb, Int row, Bool dopsf,
FTMachine::Type type)
{
put( *static_cast<const VisBuffer*>(&vb), row, dopsf, type);
@@ -405,7 +405,7 @@ void FTMachineSimpleWB::put(const VisBuffer& vb, Int row, Bool dopsf,
}
-void FTMachineSimpleWB::get(casa::VisBuffer& vb, Int row)
+void FTMachineSimpleWB::get(casacore::VisBuffer& vb, Int row)
{
get(*static_cast<VisBuffer*>(&vb), row);
}
diff --git a/CEP/Imager/AWImager2/src/FTMachineSplitBeam.cc b/CEP/Imager/AWImager2/src/FTMachineSplitBeam.cc
index 1642fded58678d7631058223a99d85555c65a1fa..b0b54f296cd52d6671e7464001bea15da865f468 100644
--- a/CEP/Imager/AWImager2/src/FTMachineSplitBeam.cc
+++ b/CEP/Imager/AWImager2/src/FTMachineSplitBeam.cc
@@ -89,14 +89,14 @@
#define DORES True
-using namespace casa;
+using namespace casacore;
namespace
{
- void sumGridsOMP(casa::Array<Complex>& grid, const vector< casa::Array<Complex> >& gridToAdd0 );
- void sumGridsOMP(casa::Array<DComplex>& grid, const vector< casa::Array<DComplex> >& gridToAdd0 );
- void sumGridsOMP(casa::Array<Complex>& grid, const casa::Array<Complex>& gridToAdd);
- void sumGridsOMP(casa::Array<DComplex>& grid, const casa::Array<DComplex>& gridToAdd);
+ void sumGridsOMP(casacore::Array<Complex>& grid, const vector< casacore::Array<Complex> >& gridToAdd0 );
+ void sumGridsOMP(casacore::Array<DComplex>& grid, const vector< casacore::Array<DComplex> >& gridToAdd0 );
+ void sumGridsOMP(casacore::Array<Complex>& grid, const casacore::Array<Complex>& gridToAdd);
+ void sumGridsOMP(casacore::Array<DComplex>& grid, const casacore::Array<DComplex>& gridToAdd);
}
namespace LOFAR { //# NAMESPACE LOFAR - BEGIN
@@ -1116,8 +1116,8 @@ void LofarFTMachine::makeImage(FTMachine::Type type,
// Temporarily disable because of
-// /home/vdtol/lofar-casapy-4.1/src/LOFAR/CEP/Imager/LofarFT/src/LofarFTMachine.cc:2493: error: incomplete type ‘casa::SkyModel’ used in nested name specifier
-// /home/vdtol/lofar-casapy-4.1/src/LOFAR/CEP/Imager/LofarFT/src/LofarFTMachine.cc:2496: error: incomplete type ‘casa::SkyModel’ used in nested name specifier
+// /home/vdtol/lofar-casapy-4.1/src/LOFAR/CEP/Imager/LofarFT/src/LofarFTMachine.cc:2493: error: incomplete type ‘casacore::SkyModel’ used in nested name specifier
+// /home/vdtol/lofar-casapy-4.1/src/LOFAR/CEP/Imager/LofarFT/src/LofarFTMachine.cc:2496: error: incomplete type ‘casacore::SkyModel’ used in nested name specifier
if(vb.polFrame()==MSIter::Linear) {
// StokesImageUtil::changeCStokesRep(theImage, SkyModel::LINEAR);
@@ -2201,8 +2201,8 @@ void LofarFTMachine::get(VisBuffer& vb, Int row)
void FTMachineWsplit::initGridThreads(
- vector< casa::Array<casa::Complex> >& otherGriddedData,
- vector< casa::Array<casa::DComplex> >& otherGriddedData2)
+ vector< casacore::Array<casacore::Complex> >& otherGriddedData,
+ vector< casacore::Array<casacore::DComplex> >& otherGriddedData2)
{
itsGriddedData=&otherGriddedData;
itsGriddedData2=&otherGriddedData2;
@@ -2216,11 +2216,11 @@ namespace
{
template <class T>
- void sumGridsOMP(casa::Array<T>& grid, const vector< casa::Array<T> >& gridToAdd0 )
+ void sumGridsOMP(casacore::Array<T>& grid, const vector< casacore::Array<T> >& gridToAdd0 )
{
- for(casa::uInt vv=0; vv<gridToAdd0.size(); vv++)
+ for(casacore::uInt vv=0; vv<gridToAdd0.size(); vv++)
{
- casa::Array<T> gridToAdd(gridToAdd0[vv]);
+ casacore::Array<T> gridToAdd(gridToAdd0[vv]);
int y,ch,pol;
int gridSize(grid.shape()[0]);
int nPol(grid.shape()[2]);
@@ -2249,7 +2249,7 @@ namespace
//Sum Grids
template <class T>
- void sumGridsOMP(casa::Array<T>& grid, const casa::Array<T>& gridToAdd){
+ void sumGridsOMP(casacore::Array<T>& grid, const casacore::Array<T>& gridToAdd){
int y,ch,pol;
int gridSize(grid.shape()[0]);
int nPol(grid.shape()[2]);
diff --git a/CEP/Imager/AWImager2/src/FTMachineWStack.cc b/CEP/Imager/AWImager2/src/FTMachineWStack.cc
index ef97dc9a87500afcc04e56748ffcb4c72fca7382..fe4cf4ba4053b75e1c992a1c327fa80f9ce789f0 100644
--- a/CEP/Imager/AWImager2/src/FTMachineWStack.cc
+++ b/CEP/Imager/AWImager2/src/FTMachineWStack.cc
@@ -89,14 +89,14 @@
#define DORES True
-using namespace casa;
+using namespace casacore;
namespace
{
- void sumGridsOMP(casa::Array<Complex>& grid, const vector< casa::Array<Complex> >& gridToAdd0 );
- void sumGridsOMP(casa::Array<DComplex>& grid, const vector< casa::Array<DComplex> >& gridToAdd0 );
- void sumGridsOMP(casa::Array<Complex>& grid, const casa::Array<Complex>& gridToAdd);
- void sumGridsOMP(casa::Array<DComplex>& grid, const casa::Array<DComplex>& gridToAdd);
+ void sumGridsOMP(casacore::Array<Complex>& grid, const vector< casacore::Array<Complex> >& gridToAdd0 );
+ void sumGridsOMP(casacore::Array<DComplex>& grid, const vector< casacore::Array<DComplex> >& gridToAdd0 );
+ void sumGridsOMP(casacore::Array<Complex>& grid, const casacore::Array<Complex>& gridToAdd);
+ void sumGridsOMP(casacore::Array<DComplex>& grid, const casacore::Array<DComplex>& gridToAdd);
}
namespace LOFAR { //# NAMESPACE LOFAR - BEGIN
@@ -2251,8 +2251,8 @@ void LofarFTMachine::makeImage(FTMachine::Type type,
// Temporarily disable because of
-// /home/vdtol/lofar-casapy-4.1/src/LOFAR/CEP/Imager/LofarFT/src/LofarFTMachine.cc:2493: error: incomplete type ‘casa::SkyModel’ used in nested name specifier
-// /home/vdtol/lofar-casapy-4.1/src/LOFAR/CEP/Imager/LofarFT/src/LofarFTMachine.cc:2496: error: incomplete type ‘casa::SkyModel’ used in nested name specifier
+// /home/vdtol/lofar-casapy-4.1/src/LOFAR/CEP/Imager/LofarFT/src/LofarFTMachine.cc:2493: error: incomplete type ‘casacore::SkyModel’ used in nested name specifier
+// /home/vdtol/lofar-casapy-4.1/src/LOFAR/CEP/Imager/LofarFT/src/LofarFTMachine.cc:2496: error: incomplete type ‘casacore::SkyModel’ used in nested name specifier
if(vb.polFrame()==MSIter::Linear) {
// StokesImageUtil::changeCStokesRep(theImage, SkyModel::LINEAR);
@@ -3774,8 +3774,8 @@ void LofarFTMachine::putSplitWplanes(const VisBuffer& vb, Int row, Bool dopsf,
}
void FTMachineWsplit::initGridThreads(
- vector< casa::Array<casa::Complex> >& otherGriddedData,
- vector< casa::Array<casa::DComplex> >& otherGriddedData2)
+ vector< casacore::Array<casacore::Complex> >& otherGriddedData,
+ vector< casacore::Array<casacore::DComplex> >& otherGriddedData2)
{
itsGriddedData=&otherGriddedData;
itsGriddedData2=&otherGriddedData2;
@@ -3797,11 +3797,11 @@ namespace
{
template <class T>
- void sumGridsOMP(casa::Array<T>& grid, const vector< casa::Array<T> >& gridToAdd0 )
+ void sumGridsOMP(casacore::Array<T>& grid, const vector< casacore::Array<T> >& gridToAdd0 )
{
- for(casa::uInt vv=0; vv<gridToAdd0.size(); vv++)
+ for(casacore::uInt vv=0; vv<gridToAdd0.size(); vv++)
{
- casa::Array<T> gridToAdd(gridToAdd0[vv]);
+ casacore::Array<T> gridToAdd(gridToAdd0[vv]);
int y,ch,pol;
int gridSize(grid.shape()[0]);
int nPol(grid.shape()[2]);
@@ -3830,7 +3830,7 @@ namespace
//Sum Grids
template <class T>
- void sumGridsOMP(casa::Array<T>& grid, const casa::Array<T>& gridToAdd){
+ void sumGridsOMP(casacore::Array<T>& grid, const casacore::Array<T>& gridToAdd){
int y,ch,pol;
int gridSize(grid.shape()[0]);
int nPol(grid.shape()[2]);
diff --git a/CEP/Imager/AWImager2/src/FTMachineWStackWB.cc b/CEP/Imager/AWImager2/src/FTMachineWStackWB.cc
index d00336ebb5c4992577b172937a2dba04d2dc3db7..5caceb86c17613daff6d8d138d15acbe064b03a0 100644
--- a/CEP/Imager/AWImager2/src/FTMachineWStackWB.cc
+++ b/CEP/Imager/AWImager2/src/FTMachineWStackWB.cc
@@ -39,7 +39,7 @@
#include "helper_functions.tcc"
-using namespace casa;
+using namespace casacore;
const String LOFAR::LofarFT::FTMachineWStackWB::theirName("FTMachineWStackWB");
@@ -158,7 +158,7 @@ void FTMachineWStackWB::initialize_model_grids(Bool normalize_model)
// Partition the visbuffer according to baseline number and time
FTMachineWStackWB::VisibilityMap FTMachineWStackWB::make_mapping(
const VisBuffer& vb,
- const casa::Vector< casa::Double > &frequency_list_CF,
+ const casacore::Vector< casacore::Double > &frequency_list_CF,
double dtime,
double w_step
)
@@ -192,7 +192,7 @@ FTMachineWStackWB::VisibilityMap FTMachineWStackWB::make_mapping(
// for (int ch=0; ch<nchan; ch++)
// {
// float freq = vb.frequency()(ch);
-// float wavelength = casa::C::c / freq;
+// float wavelength = casacore::C::c / freq;
// w(i*nchan+ch) = abs(uvw(i)(2))/wavelength;
// }
// }
@@ -229,7 +229,7 @@ FTMachineWStackWB::VisibilityMap FTMachineWStackWB::make_mapping(
for (int ch=0; ch<N_CF_chan; ch++)
{
double freq = frequency_list_CF(ch);
- double wavelength = casa::C::c / freq;
+ double wavelength = casacore::C::c / freq;
double w_lambda = chunk.w/wavelength;
int w_plane = floor(abs(w_lambda)/w_step);
chunk.wplane_map[ch] = w_plane;
@@ -359,7 +359,7 @@ void FTMachineWStackWB::put(const VisBuffer& vb, Int row, Bool dopsf,
itsVisResampler->setParams(itsUVScale, itsUVOffset, dphase);
- const casa::Vector< casa::Double > &frequency_list_CF = itsConvFunc->get_frequency_list();
+ const casacore::Vector< casacore::Double > &frequency_list_CF = itsConvFunc->get_frequency_list();
double w_step = 2*itsConvFunc->get_w_from_support();
cout << "w_step: " << w_step << endl;
@@ -388,7 +388,7 @@ void FTMachineWStackWB::put(const VisBuffer& vb, Int row, Bool dopsf,
// init the grids to zero
- vector< casa::Array<casa::Complex> > w_plane_grids(itsNGrid);
+ vector< casacore::Array<casacore::Complex> > w_plane_grids(itsNGrid);
for (int i=0; i<itsNGrid; i++)
{
w_plane_grids[i].resize(itsGriddedData[0].shape());
@@ -442,7 +442,7 @@ bool FTMachineWStackWB::put_on_w_plane(
const VisBuffer &vb,
const VBStore &vbs,
const Vector<Double> &lsr_frequency,
- vector< casa::Array<casa::Complex> > &w_plane_grids,
+ vector< casacore::Array<casacore::Complex> > &w_plane_grids,
const VisibilityMap &v,
int w_plane,
double w_offset,
@@ -532,7 +532,7 @@ bool FTMachineWStackWB::put_on_w_plane(
-void FTMachineWStackWB::get(casa::VisBuffer& vb, Int row)
+void FTMachineWStackWB::get(casacore::VisBuffer& vb, Int row)
{
get(*static_cast<VisBuffer*>(&vb), row);
}
@@ -600,7 +600,7 @@ void FTMachineWStackWB::get(VisBuffer& vb, Int row)
}
- const casa::Vector< casa::Double > &frequency_list_CF = itsConvFunc->get_frequency_list();
+ const casacore::Vector< casacore::Double > &frequency_list_CF = itsConvFunc->get_frequency_list();
double w_step = 2*itsConvFunc->get_w_from_support();
cout << "w_step: " << w_step << endl;
@@ -695,7 +695,7 @@ void FTMachineWStackWB::get(VisBuffer& vb, Int row)
int ant1 = vb.antenna1()[idx];
int ant2 = vb.antenna2()[idx];
- casa::Matrix<casa::Float> sum_weight;
+ casacore::Matrix<casacore::Float> sum_weight;
itsConvFunc->computeAterm (chunk->time);
CFStore cfStore = itsConvFunc->makeConvolutionFunction (
diff --git a/CEP/Imager/AWImager2/src/Imager.cc b/CEP/Imager/AWImager2/src/Imager.cc
index 64e539320bc4e4ba2f64b751b9f90cea585d739d..24ce170910c1678f3ffbaaf48d7d6ac057ff0d08 100644
--- a/CEP/Imager/AWImager2/src/Imager.cc
+++ b/CEP/Imager/AWImager2/src/Imager.cc
@@ -35,7 +35,7 @@
#include <casacore/tables/Tables/TableIter.h>
#include <assert.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
namespace LofarFT {
@@ -43,7 +43,7 @@ namespace LofarFT {
// @brief Imager for LOFAR data correcting for DD effects
Imager::Imager (MeasurementSet& ms, LOFAR::ParameterSet& parset)
- : casa::Imager(ms,false, true),
+ : casacore::Imager(ms,false, true),
itsParset (parset),
itsFTMachine (0)
{}
@@ -138,7 +138,7 @@ void Imager::makeVisSet(
// Weight the MeasurementSet
Bool Imager::set_imaging_weight(const ParameterSet& parset)
{
- casa::String weighttype = parset.getString("weight.type", "natural");
+ casacore::String weighttype = parset.getString("weight.type", "natural");
if (weighttype == "natural")
{
@@ -146,9 +146,9 @@ Bool Imager::set_imaging_weight(const ParameterSet& parset)
}
else if ((weighttype == "robust") || (weighttype == "uniform"))
{
- casa::String mode("");
- casa::Quantity noise;
- casa::Float robustness = 0.0;
+ casacore::String mode("");
+ casacore::Quantity noise;
+ casacore::Float robustness = 0.0;
if (weighttype == "robust")
{
@@ -158,7 +158,7 @@ Bool Imager::set_imaging_weight(const ParameterSet& parset)
if (mode == "abs")
{
- ASSERT(casa::Quantity::read(noise, parset.getString("weight.noise", "1Jy")));
+ ASSERT(casacore::Quantity::read(noise, parset.getString("weight.noise", "1Jy")));
}
else
{
@@ -189,7 +189,7 @@ Bool Imager::set_imaging_weight(const ParameterSet& parset)
Bool Imager::restoreImages(const Vector<String>& restored, Bool modresiduals)
{
- return casa::Imager::restoreImages(restored, modresiduals);
+ return casacore::Imager::restoreImages(restored, modresiduals);
}
// Show the relative timings of the various steps.
@@ -563,7 +563,7 @@ Record Imager::initClean(const String& algorithm,
return retval;
}
-casa::Record Imager::doClean(const casa::Bool firstrun) {
+casacore::Record Imager::doClean(const casacore::Bool firstrun) {
Record retval;
Bool converged=True;
retval.define("converged", False);
diff --git a/CEP/Imager/AWImager2/src/Operation.cc b/CEP/Imager/AWImager2/src/Operation.cc
index 3da3ff7c4742bd330c706df0d0924b6961b64e1e..7091e38ec5cae70b15de39622567a13c31cdafdd 100644
--- a/CEP/Imager/AWImager2/src/Operation.cc
+++ b/CEP/Imager/AWImager2/src/Operation.cc
@@ -27,7 +27,7 @@
#include <AWImager2/util.h>
#include <casacore/casa/OS/Directory.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
namespace LofarFT {
diff --git a/CEP/Imager/AWImager2/src/OperationClean.cc b/CEP/Imager/AWImager2/src/OperationClean.cc
index d7d152b2ab757291a8d9bb630763bc9fc95f5eeb..eaf00bd74e42b2d352eeeabfffdd8bb1cd92f754 100644
--- a/CEP/Imager/AWImager2/src/OperationClean.cc
+++ b/CEP/Imager/AWImager2/src/OperationClean.cc
@@ -27,7 +27,7 @@
#include <casacore/casa/OS/Directory.h>
#include <casacore/casa/OS/File.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
namespace LofarFT {
diff --git a/CEP/Imager/AWImager2/src/OperationEmpty.cc b/CEP/Imager/AWImager2/src/OperationEmpty.cc
index 0e5b734be59b2b279ebb6b9c6b236710e660dab7..287ad1cce34573279583c40b32bbaafca6bc29fc 100644
--- a/CEP/Imager/AWImager2/src/OperationEmpty.cc
+++ b/CEP/Imager/AWImager2/src/OperationEmpty.cc
@@ -26,7 +26,7 @@
#include <AWImager2/OperationEmpty.h>
#include <casacore/coordinates/Coordinates/CoordinateSystem.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
namespace LofarFT {
@@ -47,7 +47,7 @@ OperationEmpty::OperationEmpty(ParameterSet& parset): OperationImage(parset)
void OperationEmpty::run()
{
- casa::CoordinateSystem coords;
+ casacore::CoordinateSystem coords;
AlwaysAssert (itsImager->imagecoordinates(coords), AipsError);
int fieldid = 0; // TODO get from parameters
itsImager->makeEmptyImage(coords, itsImageName, fieldid);
diff --git a/CEP/Imager/AWImager2/src/OperationPredict.cc b/CEP/Imager/AWImager2/src/OperationPredict.cc
index a39c6d856ed43e5d695d8e9bbe7c7c633b8cb184..2c7f6e5bb64382b763455aa3e6a7de7348456fc4 100644
--- a/CEP/Imager/AWImager2/src/OperationPredict.cc
+++ b/CEP/Imager/AWImager2/src/OperationPredict.cc
@@ -42,8 +42,8 @@ OperationPredict::OperationPredict(ParameterSet& parset): Operation(parset)
void OperationPredict::init()
{
Operation::init();
- casa::String model = itsParset.getString("model");
- itsImager->initPredict(casa::Vector<casa::String>(1, model));
+ casacore::String model = itsParset.getString("model");
+ itsImager->initPredict(casacore::Vector<casacore::String>(1, model));
}
void OperationPredict::run()
diff --git a/CEP/Imager/AWImager2/src/ScopedTimer.cc b/CEP/Imager/AWImager2/src/ScopedTimer.cc
index 6a85facd40e8bd9cec6b0bea65a21310d6f286d2..e95ffef4d7e09eae51507ace7f1529b7c4935d9f 100644
--- a/CEP/Imager/AWImager2/src/ScopedTimer.cc
+++ b/CEP/Imager/AWImager2/src/ScopedTimer.cc
@@ -30,7 +30,7 @@
namespace LOFAR {
namespace LofarFT {
-ScopedTimer::ScopedTimer(casa::String id)
+ScopedTimer::ScopedTimer(casacore::String id)
{
#pragma omp critical(ScopedTimer)
itsTime = &ScopedTimer::timings()[id];
@@ -40,21 +40,21 @@ ScopedTimer::ScopedTimer(casa::String id)
ScopedTimer::~ScopedTimer()
{
itsPrecTimer.stop();
- casa::Double t = itsPrecTimer.getReal();
+ casacore::Double t = itsPrecTimer.getReal();
#pragma omp atomic
*itsTime += t;
}
-std::map<casa::String, casa::Double>& ScopedTimer::timings()
+std::map<casacore::String, casacore::Double>& ScopedTimer::timings()
{
- static std::map<casa::String, casa::Double> t;
+ static std::map<casacore::String, casacore::Double> t;
return t;
}
void ScopedTimer::show()
{
// show content:
- for (std::map<casa::String,casa::Double>::iterator it=timings().begin(); it!=timings().end(); ++it)
+ for (std::map<casacore::String,casacore::Double>::iterator it=timings().begin(); it!=timings().end(); ++it)
LOG_DEBUG_STR(it->first << " => " << it->second);
}
diff --git a/CEP/Imager/AWImager2/src/SkyEquation.cc b/CEP/Imager/AWImager2/src/SkyEquation.cc
index c8424da83ded2806d80b12af9db0813d9c8f538f..b8ecbe81da97120f55790bd473e9f7251210a7e8 100644
--- a/CEP/Imager/AWImager2/src/SkyEquation.cc
+++ b/CEP/Imager/AWImager2/src/SkyEquation.cc
@@ -62,7 +62,7 @@
#include <msvis/MSVis/VisSet.h>
#include <msvis/MSVis/VisibilityIterator.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR { //# NAMESPACE LOFAR - BEGIN
namespace LofarFT {
@@ -73,7 +73,7 @@ SkyEquation::SkyEquation(
FTMachine& ft,
ComponentFTMachine& cft,
Bool noModelCol)
-: casa::SkyEquation(sm, vi, ft, cft, noModelCol),
+: casacore::SkyEquation(sm, vi, ft, cft, noModelCol),
itsFTMachine(&ft),
rvi_p(&vi),
wvi_p(&vi)
diff --git a/CEP/Imager/AWImager2/src/VisBuffer.cc b/CEP/Imager/AWImager2/src/VisBuffer.cc
index e93732436b6338dea201de7e19b2d3b92af028c3..21c0a8697bba2c96061c62048f1604531f50f584 100644
--- a/CEP/Imager/AWImager2/src/VisBuffer.cc
+++ b/CEP/Imager/AWImager2/src/VisBuffer.cc
@@ -34,12 +34,12 @@ namespace LofarFT {
void VisBuffer::invalidate()
{
- lofarImagingWeightOK_p = casa::False;
- lofarImagingWeightCubeOK_p = casa::False;
- casa::VisBuffer::invalidate();
+ lofarImagingWeightOK_p = casacore::False;
+ lofarImagingWeightCubeOK_p = casacore::False;
+ casacore::VisBuffer::invalidate();
}
-VisBuffer::VisBuffer(VisibilityIterator & iter) : casa::VisBuffer(iter), visIter_p(&iter) {};
+VisBuffer::VisBuffer(VisibilityIterator & iter) : casacore::VisBuffer(iter), visIter_p(&iter) {};
VisibilityIterator *
VisBuffer::getVisibilityIterator () const
@@ -47,22 +47,22 @@ VisBuffer::getVisibilityIterator () const
return visIter_p;
}
-const casa::Matrix<casa::Float>& VisBuffer::imagingWeight () const
+const casacore::Matrix<casacore::Float>& VisBuffer::imagingWeight () const
{
const VisImagingWeight & weightGenerator = getVisibilityIterator()->getImagingWeightGenerator ();
return imagingWeight (weightGenerator);
}
-const casa::Cube<casa::Float>& VisBuffer::imagingWeightCube () const
+const casacore::Cube<casacore::Float>& VisBuffer::imagingWeightCube () const
{
const VisImagingWeight & weightGenerator = getVisibilityIterator()->getImagingWeightGenerator ();
return imagingWeightCube (weightGenerator);
}
-const casa::Matrix<casa::Float>& VisBuffer::imagingWeight (const VisImagingWeight & weightGenerator) const
+const casacore::Matrix<casacore::Float>& VisBuffer::imagingWeight (const VisImagingWeight & weightGenerator) const
{
- throw casa::AipsError("Use VisBuffer::imagingWeightCube instead of VisBuffer::imagingWeight");
+ throw casacore::AipsError("Use VisBuffer::imagingWeightCube instead of VisBuffer::imagingWeight");
// if (lofarImagingWeightOK_p)
// {
// return lofarImagingWeight_p;
@@ -70,12 +70,12 @@ const casa::Matrix<casa::Float>& VisBuffer::imagingWeight (const VisImagingWeigh
//
// weightGenerator.weight (lofarImagingWeight_p, *this);
//
-// this->lofarImagingWeightOK_p = casa::True;
+// this->lofarImagingWeightOK_p = casacore::True;
return lofarImagingWeight_p;
}
-const casa::Cube<casa::Float>& VisBuffer::imagingWeightCube (const VisImagingWeight & weightGenerator) const
+const casacore::Cube<casacore::Float>& VisBuffer::imagingWeightCube (const VisImagingWeight & weightGenerator) const
{
if (lofarImagingWeightCubeOK_p)
{
@@ -84,7 +84,7 @@ const casa::Cube<casa::Float>& VisBuffer::imagingWeightCube (const VisImagingWei
weightGenerator.weight (lofarImagingWeightCube_p, *this);
- this->lofarImagingWeightCubeOK_p = casa::True;
+ this->lofarImagingWeightCubeOK_p = casacore::True;
return lofarImagingWeightCube_p;
}
diff --git a/CEP/Imager/AWImager2/src/VisImagingWeight.cc b/CEP/Imager/AWImager2/src/VisImagingWeight.cc
index a1deea93f43615fd19dda80acc33c3786c85dbfd..1b597f3583504438afedb6f81329c0ee49c0757c 100644
--- a/CEP/Imager/AWImager2/src/VisImagingWeight.cc
+++ b/CEP/Imager/AWImager2/src/VisImagingWeight.cc
@@ -33,14 +33,14 @@
namespace LOFAR {
namespace LofarFT {
-VisImagingWeight::VisImagingWeight(const casa::String& type) :
- casa::VisImagingWeight(type),
+VisImagingWeight::VisImagingWeight(const casacore::String& type) :
+ casacore::VisImagingWeight(type),
itsType(type)
{};
void VisImagingWeight::weight(
- casa::Cube<casa::Float>& imagingWeight,
- const casa::VisBuffer& vb) const
+ casacore::Cube<casacore::Float>& imagingWeight,
+ const casacore::VisBuffer& vb) const
{
imagingWeight.assign(vb.weightSpectrum());
imagingWeight(vb.flagCube()) = 0.0;
@@ -48,17 +48,17 @@ void VisImagingWeight::weight(
if (itsType == "radial")
{
- casa::Int nPol = imagingWeight.shape()(0);
- casa::Int nChan = imagingWeight.shape()(1);
- casa::Int nRow = imagingWeight.shape()(2);
+ casacore::Int nPol = imagingWeight.shape()(0);
+ casacore::Int nChan = imagingWeight.shape()(1);
+ casacore::Int nRow = imagingWeight.shape()(2);
- for (casa::Int row=0; row<nRow; row++)
+ for (casacore::Int row=0; row<nRow; row++)
{
- for (casa::Int chn=0; chn< nChan; chn++)
+ for (casacore::Int chn=0; chn< nChan; chn++)
{
- casa::Float f=vb.frequency()(chn)/casa::C::c;
- casa::Float factor = f * sqrt(casa::square(vb.uvw()(row)(0))+casa::square(vb.uvw()(row)(1)));
- for (casa::Int pol=0; pol< nPol; pol++)
+ casacore::Float f=vb.frequency()(chn)/casacore::C::c;
+ casacore::Float factor = f * sqrt(casacore::square(vb.uvw()(row)(0))+casacore::square(vb.uvw()(row)(1)));
+ for (casacore::Int pol=0; pol< nPol; pol++)
{
imagingWeight(pol, chn,row) *= factor;
}
diff --git a/CEP/Imager/AWImager2/src/VisImagingWeightRobust.cc b/CEP/Imager/AWImager2/src/VisImagingWeightRobust.cc
index 132e34518ab4194726cce37a0453dddb10163c3d..27027bcd2126ebe37ae7230b98bf6989d4002db0 100644
--- a/CEP/Imager/AWImager2/src/VisImagingWeightRobust.cc
+++ b/CEP/Imager/AWImager2/src/VisImagingWeightRobust.cc
@@ -34,21 +34,21 @@ namespace LOFAR {
namespace LofarFT {
VisImagingWeightRobust::VisImagingWeightRobust(
- casa::ROVisibilityIterator& vi,
- const casa::String& rmode,
- const casa::Quantity& noise,
- const casa::Double robust,
- const casa::Int nx,
- const casa::Int ny,
- const casa::Quantity& cellx,
- const casa::Quantity& celly,
- const casa::Int uBox,
- const casa::Int vBox,
- const casa::Bool multiField)
+ casacore::ROVisibilityIterator& vi,
+ const casacore::String& rmode,
+ const casacore::Quantity& noise,
+ const casacore::Double robust,
+ const casacore::Int nx,
+ const casacore::Int ny,
+ const casacore::Quantity& cellx,
+ const casacore::Quantity& celly,
+ const casacore::Int uBox,
+ const casacore::Int vBox,
+ const casacore::Bool multiField)
:
VisImagingWeight()
{
- casa::VisBufferAutoPtr vb (vi);
+ casacore::VisBufferAutoPtr vb (vi);
itsUScale = (nx*cellx.get("rad").getValue());
itsVScale = (ny*celly.get("rad").getValue());
@@ -60,30 +60,30 @@ VisImagingWeightRobust::VisImagingWeightRobust(
itsWeightMap.resize(itsNX, itsNY);
itsWeightMap.set(0.0);
- casa::Float sumwt = 0.0;
+ casacore::Float sumwt = 0.0;
for (vi.originChunks();vi.moreChunks();vi.nextChunk())
{
for (vi.origin();vi.more();vi++)
{
- casa::Int nRow=vb->nRow();
- casa::Int nChan=vb->nChannel();
- for (casa::Int row=0; row<nRow; row++)
+ casacore::Int nRow=vb->nRow();
+ casacore::Int nChan=vb->nChannel();
+ for (casacore::Int row=0; row<nRow; row++)
{
- for (casa::Int chn=0; chn<nChan; chn++)
+ for (casacore::Int chn=0; chn<nChan; chn++)
{
if (!vb->flagCube()(0, chn,row) && !vb->flagCube()(3, chn,row))
{
- casa::Float f = vb->frequency()(chn)/casa::C::c;
- casa::Float u = vb->uvw()(row)(0)*f;
- casa::Float v = vb->uvw()(row)(1)*f;
- casa::Int ucell = casa::Int(itsUScale*u + itsUOrigin);
- casa::Int vcell = casa::Int(itsVScale*v + itsVOrigin);
+ casacore::Float f = vb->frequency()(chn)/casacore::C::c;
+ casacore::Float u = vb->uvw()(row)(0)*f;
+ casacore::Float v = vb->uvw()(row)(1)*f;
+ casacore::Int ucell = casacore::Int(itsUScale*u + itsUOrigin);
+ casacore::Int vcell = casacore::Int(itsVScale*v + itsVOrigin);
if (((ucell-uBox)>0) && ((ucell+uBox)<nx) && ((vcell-vBox)>0) && ((vcell+vBox)<ny))
{
- for (casa::Int iv=-vBox;iv<=vBox;iv++)
+ for (casacore::Int iv=-vBox;iv<=vBox;iv++)
{
- for (casa::Int iu=-uBox;iu<=uBox;iu++)
+ for (casacore::Int iu=-uBox;iu<=uBox;iu++)
{
itsWeightMap(ucell+iu,vcell+iv) += vb->weightSpectrum()(0, chn, row) * !vb->flagCube()(0, chn,row);
sumwt += vb->weightSpectrum()(0, chn, row) * !vb->flagCube()(0, chn,row);
@@ -92,13 +92,13 @@ VisImagingWeightRobust::VisImagingWeightRobust(
}
}
}
- ucell = casa::Int(-itsUScale*u + itsUOrigin);
- vcell = casa::Int(-itsVScale*v + itsVOrigin);
+ ucell = casacore::Int(-itsUScale*u + itsUOrigin);
+ vcell = casacore::Int(-itsVScale*v + itsVOrigin);
if (((ucell-uBox)>0) && ((ucell+uBox)<nx) && ((vcell-vBox)>0) && ((vcell+vBox)<ny))
{
- for (casa::Int iv=-vBox;iv<=vBox;iv++)
+ for (casacore::Int iv=-vBox;iv<=vBox;iv++)
{
- for (casa::Int iu=-uBox;iu<=uBox;iu++)
+ for (casacore::Int iu=-uBox;iu<=uBox;iu++)
{
itsWeightMap(ucell+iu,vcell+iv) += vb->weightSpectrum()(0, chn, row) * !vb->flagCube()(0, chn,row);
sumwt += vb->weightSpectrum()(0, chn, row) * !vb->flagCube()(0, chn,row);
@@ -121,21 +121,21 @@ VisImagingWeightRobust::VisImagingWeightRobust(
if (rmode=="norm")
{
- casa::Double sumlocwt = 0.;
- for(casa::Int vgrid=0;vgrid<ny;vgrid++)
+ casacore::Double sumlocwt = 0.;
+ for(casacore::Int vgrid=0;vgrid<ny;vgrid++)
{
- for(casa::Int ugrid=0;ugrid<nx;ugrid++)
+ for(casacore::Int ugrid=0;ugrid<nx;ugrid++)
{
- if (itsWeightMap(ugrid, vgrid)>0.0) sumlocwt += casa::square(itsWeightMap(ugrid,vgrid));
+ if (itsWeightMap(ugrid, vgrid)>0.0) sumlocwt += casacore::square(itsWeightMap(ugrid,vgrid));
}
}
- itsF2 = casa::square(5.0*pow(10.0,casa::Double(-robust))) / (sumlocwt / sumwt);
+ itsF2 = casacore::square(5.0*pow(10.0,casacore::Double(-robust))) / (sumlocwt / sumwt);
itsD2 = 1.0;
}
else if (rmode=="abs")
{
- itsF2 = casa::square(robust);
- itsD2 = 2.0 * casa::square(noise.get("Jy").getValue());
+ itsF2 = casacore::square(robust);
+ itsD2 = 2.0 * casacore::square(noise.get("Jy").getValue());
}
else // Uniform weighting
@@ -148,32 +148,32 @@ VisImagingWeightRobust::VisImagingWeightRobust(
}
void VisImagingWeightRobust::weight(
- casa::Cube<casa::Float>& imagingWeight,
- const casa::VisBuffer& vb) const
+ casacore::Cube<casacore::Float>& imagingWeight,
+ const casacore::VisBuffer& vb) const
{
std::cout << "VisImagingWeightRobust::weight" << std::endl;
imagingWeight.assign(vb.weightSpectrum());
imagingWeight(vb.flagCube()) = 0.0;
- casa::Int nRow = imagingWeight.shape()(2);
- casa::Int nChannel = imagingWeight.shape()(1);
- casa::Int nPol = imagingWeight.shape()(0);
+ casacore::Int nRow = imagingWeight.shape()(2);
+ casacore::Int nChannel = imagingWeight.shape()(1);
+ casacore::Int nPol = imagingWeight.shape()(0);
- casa::Float u, v;
- for (casa::Int row=0; row<nRow; row++)
+ casacore::Float u, v;
+ for (casacore::Int row=0; row<nRow; row++)
{
- for (casa::Int chn=0; chn<nChannel; chn++)
+ for (casacore::Int chn=0; chn<nChannel; chn++)
{
- casa::Float f = vb.frequency()(chn)/casa::C::c;
+ casacore::Float f = vb.frequency()(chn)/casacore::C::c;
u = vb.uvw()(row)(0)*f;
v = vb.uvw()(row)(1)*f;
- casa::Int ucell = casa::Int(itsUScale*u + itsUOrigin);
- casa::Int vcell = casa::Int(itsVScale*v + itsVOrigin);
+ casacore::Int ucell = casacore::Int(itsUScale*u + itsUOrigin);
+ casacore::Int vcell = casacore::Int(itsVScale*v + itsVOrigin);
if ((ucell>0) && (ucell<itsNX) && (vcell>0) && (vcell<itsNY))
{
if(itsWeightMap(ucell,vcell)>0.0)
{
- for (casa::Int pol=0; pol<nPol; pol++)
+ for (casacore::Int pol=0; pol<nPol; pol++)
{
imagingWeight(pol, chn,row) /= itsWeightMap(ucell,vcell)*itsF2 + itsD2;
}
diff --git a/CEP/Imager/AWImager2/src/VisResampler.cc b/CEP/Imager/AWImager2/src/VisResampler.cc
index 74dbbfbc02641eef7b7a9e4fdfaf36695480df15..a75ef07db9fa36c26a49f05c54b04f0e10b05297 100644
--- a/CEP/Imager/AWImager2/src/VisResampler.cc
+++ b/CEP/Imager/AWImager2/src/VisResampler.cc
@@ -28,18 +28,18 @@
#include <cassert>
#include <Common/OpenMP.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
namespace LofarFT {
-void VisResampler::set_chan_map(const casa::Vector<casa::Int> &map)
+void VisResampler::set_chan_map(const casacore::Vector<casacore::Int> &map)
{
itsChanMap.resize();
itsChanMap = map;
}
-void VisResampler::set_chan_map_CF(const casa::Vector<casa::Int> &map)
+void VisResampler::set_chan_map_CF(const casacore::Vector<casacore::Int> &map)
{
itsChanMapCF.resize();
itsChanMapCF = map;
diff --git a/CEP/Imager/AWImager2/src/VisResamplerDiagonalWB.cc b/CEP/Imager/AWImager2/src/VisResamplerDiagonalWB.cc
index bc5d3e141b1ffad48005730c7aa949cd54df7f8d..753b1352111e1d3047a63a39874dea7a534c4c85 100644
--- a/CEP/Imager/AWImager2/src/VisResamplerDiagonalWB.cc
+++ b/CEP/Imager/AWImager2/src/VisResamplerDiagonalWB.cc
@@ -28,7 +28,7 @@
#include <cassert>
#include <Common/OpenMP.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
namespace LofarFT {
diff --git a/CEP/Imager/AWImager2/src/VisResamplerMatrix.cc b/CEP/Imager/AWImager2/src/VisResamplerMatrix.cc
index b0a34ea8df2b6b0ebae289591481a820357fc59f..45f698e627504e5ea87848765e07cf5ebea1d86e 100644
--- a/CEP/Imager/AWImager2/src/VisResamplerMatrix.cc
+++ b/CEP/Imager/AWImager2/src/VisResamplerMatrix.cc
@@ -28,7 +28,7 @@
#include <cassert>
#include <Common/OpenMP.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
namespace LofarFT {
diff --git a/CEP/Imager/AWImager2/src/VisResamplerMatrixWB.cc b/CEP/Imager/AWImager2/src/VisResamplerMatrixWB.cc
index c1a192dfceca7fdb43a6549016061df549d86d5e..82f9a732d79c689fb08376b2a93ffab98058a908 100644
--- a/CEP/Imager/AWImager2/src/VisResamplerMatrixWB.cc
+++ b/CEP/Imager/AWImager2/src/VisResamplerMatrixWB.cc
@@ -29,7 +29,7 @@
#include <cassert>
#include <Common/OpenMP.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
namespace LofarFT {
diff --git a/CEP/Imager/AWImager2/src/VisResamplerScalar.cc b/CEP/Imager/AWImager2/src/VisResamplerScalar.cc
index e21b0e771eaf8afad62bfa1404e3fe38362fd2b9..baf441cc0d81f083e1495bdd65fd5b9467b13f71 100644
--- a/CEP/Imager/AWImager2/src/VisResamplerScalar.cc
+++ b/CEP/Imager/AWImager2/src/VisResamplerScalar.cc
@@ -28,7 +28,7 @@
#include <cassert>
#include <Common/OpenMP.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
namespace LofarFT {
diff --git a/CEP/Imager/AWImager2/src/VisibilityIterator.cc b/CEP/Imager/AWImager2/src/VisibilityIterator.cc
index 2b4a589b25cb8dbeb2762273e50a95cfcb9a62c2..039620385b758ab6c9e86b226c9967f14e8ac4a8 100644
--- a/CEP/Imager/AWImager2/src/VisibilityIterator.cc
+++ b/CEP/Imager/AWImager2/src/VisibilityIterator.cc
@@ -33,14 +33,14 @@
namespace LOFAR {
namespace LofarFT {
-VisibilityIterator::VisibilityIterator() : casa::VisibilityIterator() {};
+VisibilityIterator::VisibilityIterator() : casacore::VisibilityIterator() {};
VisibilityIterator::VisibilityIterator(
- casa::MeasurementSet & ms,
- const casa::Block<casa::Int>& sortColumns,
- casa::Double timeInterval)
+ casacore::MeasurementSet & ms,
+ const casacore::Block<casacore::Int>& sortColumns,
+ casacore::Double timeInterval)
:
- casa::VisibilityIterator(ms, sortColumns, timeInterval),
+ casacore::VisibilityIterator(ms, sortColumns, timeInterval),
lofar_imwgt_p(0)
{};
@@ -57,7 +57,7 @@ VisibilityIterator::operator= (const VisibilityIterator & other)
}
void
-VisibilityIterator::useImagingWeight (casa::CountedPtr<VisImagingWeight> imWgt)
+VisibilityIterator::useImagingWeight (casacore::CountedPtr<VisImagingWeight> imWgt)
{
lofar_imwgt_p = imWgt;
}
diff --git a/CEP/Imager/AWImager2/src/WTerm.cc b/CEP/Imager/AWImager2/src/WTerm.cc
index ba2cfbc17d10142049081e926980626680939776..57782340e521ae68865647c9f8256dd0cd9eb3d9 100644
--- a/CEP/Imager/AWImager2/src/WTerm.cc
+++ b/CEP/Imager/AWImager2/src/WTerm.cc
@@ -25,7 +25,7 @@
#include <casacore/casa/BasicSL/Constants.h>
#include <algorithm>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
namespace LofarFT {
diff --git a/CEP/Imager/AWImager2/src/awimager2.cc b/CEP/Imager/AWImager2/src/awimager2.cc
index 3e3b6bf301380456e1622179833a4ddbb54b228a..80f8347649909003c42ea279fdf3772b80168a81 100644
--- a/CEP/Imager/AWImager2/src/awimager2.cc
+++ b/CEP/Imager/AWImager2/src/awimager2.cc
@@ -56,7 +56,7 @@
#include <Common/OpenMP.h>
#include <boost/algorithm/string/join.hpp>
-using namespace casa;
+using namespace casacore;
using LOFAR::operator<<;
// Use a terminate handler that can produce a backtrace.
diff --git a/CEP/Imager/AWImager2/src/fillRootImageGroup.cc b/CEP/Imager/AWImager2/src/fillRootImageGroup.cc
index 4cc088cd0cdcef1baae5bb61dc006338868d4b55..388914e54e8e71e5b7ac6442ec3769237cea4283 100644
--- a/CEP/Imager/AWImager2/src/fillRootImageGroup.cc
+++ b/CEP/Imager/AWImager2/src/fillRootImageGroup.cc
@@ -41,7 +41,7 @@
#include <ostream>
#include <sstream>
-using namespace casa;
+using namespace casacore;
using namespace LOFAR;
using namespace std;
diff --git a/CEP/Imager/AWImager2/src/makebeamimage.cc b/CEP/Imager/AWImager2/src/makebeamimage.cc
index c447b988e4276433cca400d613cc4f01bbe6c001..6b5e2593c27b5f3df322057169d76d01b3fcf81b 100644
--- a/CEP/Imager/AWImager2/src/makebeamimage.cc
+++ b/CEP/Imager/AWImager2/src/makebeamimage.cc
@@ -70,7 +70,7 @@
#include <casacore/casa/iostream.h>
#include <casacore/casa/sstream.h>
-using namespace casa;
+using namespace casacore;
using namespace LOFAR;
using LOFAR::operator<<;
diff --git a/CEP/Imager/AWImager2/src/makefftwisdom2d.cc b/CEP/Imager/AWImager2/src/makefftwisdom2d.cc
index b49cb46d27835b0d682ccf260f367947512831ef..b35de5977d473df71e90695d20c75fd8017d314a 100644
--- a/CEP/Imager/AWImager2/src/makefftwisdom2d.cc
+++ b/CEP/Imager/AWImager2/src/makefftwisdom2d.cc
@@ -60,7 +60,7 @@ int main (int argc, char* argv[])
bool argparallel = false;
int st = 1;
if (argc > st) {
- casa::String arg(argv[st]);
+ casacore::String arg(argv[st]);
if (arg == "-h" || arg == "--help" || arg == "?") {
showhelp();
return 1;
@@ -73,9 +73,9 @@ int main (int argc, char* argv[])
if (!argparallel) {
// Serial FFTs.
- casa::String name = "fftwisdom2d.txt";
+ casacore::String name = "fftwisdom2d.txt";
if (argc > st) {
- name = casa::Path(argv[st]).absoluteName();
+ name = casacore::Path(argv[st]).absoluteName();
}
FILE* wisdomFile = fopen (name.c_str(), "w");
if (!wisdomFile) {
@@ -120,9 +120,9 @@ int main (int argc, char* argv[])
} else {
// Parallel FFTs
- casa::String name = "fftwisdom2d_parallel.txt";
+ casacore::String name = "fftwisdom2d_parallel.txt";
if (argc > st) {
- name = casa::Path(argv[st]).absoluteName();
+ name = casacore::Path(argv[st]).absoluteName();
}
FILE* wisdomFile = fopen (name.c_str(), "w");
if (!wisdomFile) {
diff --git a/CEP/Imager/AWImager2/src/util.cc b/CEP/Imager/AWImager2/src/util.cc
index 24c957eb388bdd11062d085c283bc844964da11d..0b8fea65f99c53c662ffd13f232f17c124094e52 100644
--- a/CEP/Imager/AWImager2/src/util.cc
+++ b/CEP/Imager/AWImager2/src/util.cc
@@ -32,21 +32,21 @@
namespace LOFAR {
namespace LofarFT {
-casa::Double get_reference_frequency(ParameterSet parset, casa::MeasurementSet ms)
+casacore::Double get_reference_frequency(ParameterSet parset, casacore::MeasurementSet ms)
{
- casa::Double reffreq = parset.getDouble("image.reffreq", 0.0);
+ casacore::Double reffreq = parset.getDouble("image.reffreq", 0.0);
if (reffreq == 0.0)
{
- casa::uInt idDataDescription = 0;
- casa::ROMSDataDescColumns desc(ms.dataDescription());
+ casacore::uInt idDataDescription = 0;
+ casacore::ROMSDataDescColumns desc(ms.dataDescription());
ASSERT(desc.nrow() > idDataDescription);
ASSERT(!desc.flagRow()(idDataDescription));
- const casa::uInt idWindow = desc.spectralWindowId()(idDataDescription);
+ const casacore::uInt idWindow = desc.spectralWindowId()(idDataDescription);
// Get spectral information.
- casa::ROMSSpWindowColumns window(ms.spectralWindow());
+ casacore::ROMSSpWindowColumns window(ms.spectralWindow());
ASSERT(window.nrow() > idWindow);
ASSERT(!window.flagRow()(idWindow));
diff --git a/CEP/Imager/LofarFT/include/LofarFT/LofarATerm.h b/CEP/Imager/LofarFT/include/LofarFT/LofarATerm.h
index d36fea6f7281910ed1a75610a9687fe35178f91f..42b307ab03db360fa2fda7c8b93fd4d07d7168cb 100644
--- a/CEP/Imager/LofarFT/include/LofarFT/LofarATerm.h
+++ b/CEP/Imager/LofarFT/include/LofarFT/LofarATerm.h
@@ -28,11 +28,11 @@
#include <Common/LofarTypes.h>
#include <ParmDB/ParmFacade.h>
#include <StationResponse/Station.h>
-#include <casa/Arrays/Array.h>
-#include <casa/Containers/Record.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MEpoch.h>
-#include <measures/Measures/MPosition.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/casa/Containers/Record.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MPosition.h>
namespace casa
{
@@ -79,15 +79,15 @@ namespace LOFAR
/*!
* \brief ITRF coordinates for a grid of points on the sky.
*/
- casa::Matrix<StationResponse::vector3r_t> directions;
+ casacore::Matrix<StationResponse::vector3r_t> directions;
};
- LofarATerm(const casa::MeasurementSet &ms, const casa::Record& parameters);
+ LofarATerm(const casacore::MeasurementSet &ms, const casacore::Record& parameters);
- void setDirection(const casa::DirectionCoordinate &coordinates,
- const casa::IPosition &shape);
+ void setDirection(const casacore::DirectionCoordinate &coordinates,
+ const casacore::IPosition &shape);
- void setEpoch(const casa::MEpoch &epoch);
+ void setEpoch(const casacore::MEpoch &epoch);
/*!
* \brief Compute an ITRF direction vector for each pixel at the given
@@ -101,8 +101,8 @@ namespace LOFAR
* \param tile0 Tile beam former reference direction (pointing).
*/
ITRFDirectionMap
- makeDirectionMap(const casa::DirectionCoordinate &coordinates,
- const casa::IPosition &shape, const casa::MEpoch &epoch) const;
+ makeDirectionMap(const casacore::DirectionCoordinate &coordinates,
+ const casacore::IPosition &shape, const casacore::MEpoch &epoch) const;
// Compute the LOFAR station response for the given station. This includes
// the effects of paralactic rotation, the dual dipole LOFAR antenna, the
@@ -113,9 +113,9 @@ namespace LOFAR
// reference frequencies. The normalize argument, when set to true, causes
// the response to be multiplied by the inverse of the response at the
// central pixel.
- vector<casa::Cube<casa::Complex> > evaluate(uint idStation,
- const casa::Vector<casa::Double> &freq,
- const casa::Vector<casa::Double> &freq0,
+ vector<casacore::Cube<casacore::Complex> > evaluate(uint idStation,
+ const casacore::Vector<casacore::Double> &freq,
+ const casacore::Vector<casacore::Double> &freq0,
bool normalize = false) const;
// Compute the array factor for the given station and polarization (0 = X,
@@ -126,16 +126,16 @@ namespace LOFAR
// reference frequencies. The normalize argument, when set to true, causes
// the response to be multiplied by the inverse of the array factor at the
// central pixel.
- casa::Cube<casa::DComplex> evaluateStationScalarFactor(uint idStation,
+ casacore::Cube<casacore::DComplex> evaluateStationScalarFactor(uint idStation,
uint idPolarization,
- const casa::Vector<casa::Double> &freq,
- const casa::Vector<casa::Double> &freq0,
+ const casacore::Vector<casacore::Double> &freq,
+ const casacore::Vector<casacore::Double> &freq0,
bool normalize = false) const;
- vector<casa::Matrix<casa::Complex> > evaluateArrayFactor(uint idStation,
+ vector<casacore::Matrix<casacore::Complex> > evaluateArrayFactor(uint idStation,
uint idPolarization,
- const casa::Vector<casa::Double> &freq,
- const casa::Vector<casa::Double> &freq0,
+ const casacore::Vector<casacore::Double> &freq,
+ const casacore::Vector<casacore::Double> &freq0,
bool normalize = false) const;
// Compute the LOFAR element response for the given station and antenna
@@ -145,33 +145,33 @@ namespace LOFAR
// The freq argument is a list of frequencies at which the response will be
// evaluated. The normalize argument, when set to true, causes the response
// to be multiplied by the inverse of the response at the central pixel.
- vector<casa::Cube<casa::Complex> > evaluateElementResponse(uint idStation,
+ vector<casacore::Cube<casacore::Complex> > evaluateElementResponse(uint idStation,
uint idField,
- const casa::Vector<casa::Double> &freq,
+ const casacore::Vector<casacore::Double> &freq,
bool normalize = false) const;
- casa::Cube<casa::DComplex> evaluateIonosphere(const uint idStation,
- const casa::Vector<casa::Double> &freq) const;
+ casacore::Cube<casacore::DComplex> evaluateIonosphere(const uint idStation,
+ const casacore::Vector<casacore::Double> &freq) const;
private:
- void initParmDB(const casa::String &parmdbname);
- double getParmValue(casa::Record &parms, const string &parmname);
+ void initParmDB(const casacore::String &parmdbname);
+ double getParmValue(casacore::Record &parms, const string &parmname);
vector<StationResponse::Station::ConstPtr> itsStations;
- const casa::DirectionCoordinate *itsDirectionCoordinates;
- const casa::IPosition *itsShape;
- casa::MPosition itsPosition0;
- casa::MDirection itsStation0, itsTile0;
+ const casacore::DirectionCoordinate *itsDirectionCoordinates;
+ const casacore::IPosition *itsShape;
+ casacore::MPosition itsPosition0;
+ casacore::MDirection itsStation0, itsTile0;
ITRFDirectionMap itsITRFDirectionMap;
- casa::Bool itsApplyBeam;
- casa::Bool itsApplyIonosphere;
+ casacore::Bool itsApplyBeam;
+ casacore::Bool itsApplyIonosphere;
LOFAR::BBS::ParmFacade *pdb;
double time, r0, beta, height;
- casa::Vector<casa::String> cal_pp_names;
- casa::Matrix<casa::Double> cal_pp;
- casa::Vector<casa::Double> tec_white;
- casa::Int itsVerbose;
+ casacore::Vector<casacore::String> cal_pp_names;
+ casacore::Matrix<casacore::Double> cal_pp;
+ casacore::Vector<casacore::Double> tec_white;
+ casacore::Int itsVerbose;
};
} // namespace LOFAR
diff --git a/CEP/Imager/LofarFT/include/LofarFT/LofarATermOld.h b/CEP/Imager/LofarFT/include/LofarFT/LofarATermOld.h
index 02d88016369279431e17636f7717d19e89fd15bc..96ff09aa955cdb3685a0156a827a293eeb70de37 100644
--- a/CEP/Imager/LofarFT/include/LofarFT/LofarATermOld.h
+++ b/CEP/Imager/LofarFT/include/LofarFT/LofarATermOld.h
@@ -27,10 +27,10 @@
#include <Common/lofar_map.h>
#include <Common/lofar_vector.h>
-#include <casa/Arrays/Array.h>
-#include <casa/BasicSL/String.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MDirection.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/casa/BasicSL/String.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MDirection.h>
namespace casa
{
@@ -74,11 +74,11 @@ namespace LOFAR
{
}
- AntennaField(const casa::String &name, const Vector3 &position,
+ AntennaField(const casacore::String &name, const Vector3 &position,
const Vector3 &p,
const Vector3 &q, const Vector3 &r);
- const casa::String &name() const;
+ const casacore::String &name() const;
const Vector3 &position() const;
const Vector3 &axis(Axis axis) const;
@@ -93,7 +93,7 @@ namespace LOFAR
inline const Element &element(uint i) const;
private:
- casa::String m_name;
+ casacore::String m_name;
Vector3 m_position;
Vector3 m_axes[N_Axis];
vector<Vector3> m_tileElements;
@@ -107,22 +107,22 @@ namespace LOFAR
{
}
- Station(const casa::String &name, const casa::MPosition &position);
- Station(const casa::String &name, const casa::MPosition &position,
+ Station(const casacore::String &name, const casacore::MPosition &position);
+ Station(const casacore::String &name, const casacore::MPosition &position,
const AntennaField &field0);
- Station(const casa::String &name, const casa::MPosition &position,
+ Station(const casacore::String &name, const casacore::MPosition &position,
const AntennaField &field0, const AntennaField &field1);
- const casa::String &name() const;
- const casa::MPosition &position() const;
+ const casacore::String &name() const;
+ const casacore::MPosition &position() const;
bool isPhasedArray() const;
uint nField() const;
const AntennaField &field(uint i) const;
private:
- casa::String m_name;
- casa::MPosition m_position;
+ casacore::String m_name;
+ casacore::MPosition m_position;
vector<AntennaField> m_fields;
};
@@ -133,25 +133,25 @@ namespace LOFAR
{
}
- Instrument(const casa::String &name, const casa::MPosition &position);
+ Instrument(const casacore::String &name, const casacore::MPosition &position);
template <typename T>
- Instrument(const casa::String &name, const casa::MPosition &position,
+ Instrument(const casacore::String &name, const casacore::MPosition &position,
T first, T last);
- const casa::String &name() const;
- const casa::MPosition &position() const;
+ const casacore::String &name() const;
+ const casacore::MPosition &position() const;
uint nStations() const;
const Station &station(uint i) const;
- const Station &station(const casa::String &name) const;
+ const Station &station(const casacore::String &name) const;
void append(const Station &station);
private:
- casa::String m_name;
- casa::MPosition m_position;
- map<casa::String, uint> m_index;
+ casacore::String m_name;
+ casacore::MPosition m_position;
+ map<casacore::String, uint> m_index;
vector<Station> m_stations;
};
@@ -176,8 +176,8 @@ namespace LOFAR
}
template <typename T>
- Instrument::Instrument(const casa::String &name,
- const casa::MPosition &position,
+ Instrument::Instrument(const casacore::String &name,
+ const casacore::MPosition &position,
T first, T last)
: m_name(name),
m_position(position),
@@ -190,7 +190,7 @@ namespace LOFAR
public:
BeamCoeff();
- void load(const casa::Path &path);
+ void load(const casacore::Path &path);
// Center frequency used to scale frequency to range [-1.0, 1.0].
double center() const
@@ -224,68 +224,68 @@ namespace LOFAR
return m_coeff.shape()(3);
}
- casa::DComplex operator()(uint i, uint freq, uint theta, uint harmonic) const
+ casacore::DComplex operator()(uint i, uint freq, uint theta, uint harmonic) const
{
- return m_coeff(casa::IPosition(4, i, freq, theta, harmonic));
+ return m_coeff(casacore::IPosition(4, i, freq, theta, harmonic));
}
private:
double m_center, m_width;
- casa::Array<casa::DComplex> m_coeff;
+ casacore::Array<casacore::DComplex> m_coeff;
};
class LofarATermOld
{
public:
- LofarATermOld(const casa::MeasurementSet &ms,
- const casa::String &beamElementPath);
+ LofarATermOld(const casacore::MeasurementSet &ms,
+ const casacore::String &beamElementPath);
- vector<casa::Cube<casa::Complex> > evaluate(const casa::IPosition &shape,
- const casa::DirectionCoordinate &coordinates,
+ vector<casacore::Cube<casacore::Complex> > evaluate(const casacore::IPosition &shape,
+ const casacore::DirectionCoordinate &coordinates,
uint station,
- const casa::MEpoch &epoch,
- const casa::Vector<casa::Double> &freq,
+ const casacore::MEpoch &epoch,
+ const casacore::Vector<casacore::Double> &freq,
bool normalize = false) const;
private:
- casa::Array<casa::DComplex>
- normalize(const casa::Array<casa::DComplex> &response) const;
+ casacore::Array<casacore::DComplex>
+ normalize(const casacore::Array<casacore::DComplex> &response) const;
- casa::Cube<casa::Double>
- computeITRFMap(const casa::DirectionCoordinate &coordinates,
- const casa::IPosition &shape,
- casa::MDirection::Convert convertor) const;
+ casacore::Cube<casacore::Double>
+ computeITRFMap(const casacore::DirectionCoordinate &coordinates,
+ const casacore::IPosition &shape,
+ casacore::MDirection::Convert convertor) const;
- casa::Array<casa::DComplex> evaluateStationBeam(const Station &station,
+ casacore::Array<casacore::DComplex> evaluateStationBeam(const Station &station,
const Vector3 &refDelay,
const Vector3 &refTile,
- const casa::Cube<casa::Double> &map,
- const casa::Vector<casa::Double> &freq) const;
+ const casacore::Cube<casacore::Double> &map,
+ const casacore::Vector<casacore::Double> &freq) const;
- casa::Cube<casa::DComplex> evaluateTileArrayFactor(const AntennaField &field,
+ casacore::Cube<casacore::DComplex> evaluateTileArrayFactor(const AntennaField &field,
const Vector3 &reference,
- const casa::Cube<casa::Double> &map,
- const casa::Vector<casa::Double> &freq) const;
+ const casacore::Cube<casacore::Double> &map,
+ const casacore::Vector<casacore::Double> &freq) const;
- casa::Array<casa::DComplex> evaluateElementBeam(const BeamCoeff &coeff,
+ casacore::Array<casacore::DComplex> evaluateElementBeam(const BeamCoeff &coeff,
const AntennaField &field,
- const casa::Cube<casa::Double> &map,
- const casa::Vector<casa::Double> &freq) const;
+ const casacore::Cube<casacore::Double> &map,
+ const casacore::Vector<casacore::Double> &freq) const;
- void initInstrument(const casa::MeasurementSet &ms);
+ void initInstrument(const casacore::MeasurementSet &ms);
- Station initStation(const casa::MeasurementSet &ms,
+ Station initStation(const casacore::MeasurementSet &ms,
uint id,
- const casa::String &name,
- const casa::MPosition &position) const;
+ const casacore::String &name,
+ const casacore::MPosition &position) const;
- void initReferenceDirections(const casa::MeasurementSet &ms, uint idField);
+ void initReferenceDirections(const casacore::MeasurementSet &ms, uint idField);
- void initReferenceFreq(const casa::MeasurementSet &ms,
+ void initReferenceFreq(const casacore::MeasurementSet &ms,
uint idDataDescription);
BeamCoeff m_coeffLBA, m_coeffHBA;
- casa::MDirection m_refDelay, m_refTile;
+ casacore::MDirection m_refDelay, m_refTile;
double m_refFreq;
Instrument m_instrument;
};
diff --git a/CEP/Imager/LofarFT/include/LofarFT/LofarCFDefs.h b/CEP/Imager/LofarFT/include/LofarFT/LofarCFDefs.h
index a01109702c4f7b280e6c8ec2bbeab91a85719d5d..1f40afded18a5f69bdfee32df69a0e57e9d25882 100644
--- a/CEP/Imager/LofarFT/include/LofarFT/LofarCFDefs.h
+++ b/CEP/Imager/LofarFT/include/LofarFT/LofarCFDefs.h
@@ -27,22 +27,22 @@
//# $Id$
#ifndef LOFARFT_CFDEFS_H
#define LOFARFT_CFDEFS_H
-#include <casa/Arrays/Array.h>
-#include <casa/aips.h>
-#include <casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/casa/aips.h>
+#include <casacore/casa/Arrays/Matrix.h>
namespace LOFAR
{
- namespace LofarCFDefs { //# NAMESPACE CASA - BEGIN
- using namespace casa;
+ namespace LofarCFDefs { //# NAMESPACE CASACORE - BEGIN
+ using namespace casacore;
// freq, mueller_x, mueller_y
typedef vector< vector< vector < Matrix<Complex> > > > CFTypeVec ;
typedef Array<Complex> CFType ;
typedef Array<Double> CFTypeReal ;
enum CACHETYPE {NOTCACHED=0,DISKCACHE, MEMCACHE};
enum CFARRAYSHAPE {NXPOS=0,NYPOS,NWPOS,NPOLPOS,NBASEPOS,CFNDIM};
- } //# NAMESPACE CASA - END
+ } //# NAMESPACE CASACORE - END
}
#endif
diff --git a/CEP/Imager/LofarFT/include/LofarFT/LofarCFStore.h b/CEP/Imager/LofarFT/include/LofarFT/LofarCFStore.h
index 653f42972f5555c01dbfd0fc9098acede82d9c80..1b19aa693e2c7a249d4b8597a139cd985773c6ae 100644
--- a/CEP/Imager/LofarFT/include/LofarFT/LofarCFStore.h
+++ b/CEP/Imager/LofarFT/include/LofarFT/LofarCFStore.h
@@ -30,14 +30,14 @@
#include <LofarFT/LofarCFDefs.h>
#include <synthesis/MeasurementComponents/SynthesisError.h>
-#include <coordinates/Coordinates/CoordinateSystem.h>
-#include <casa/Logging/LogIO.h>
-#include <casa/Logging/LogSink.h>
-#include <casa/Logging/LogOrigin.h>
-#include <casa/Utilities/CountedPtr.h>
-#include <images/Images/ImageInterface.h>
+#include <casacore/coordinates/Coordinates/CoordinateSystem.h>
+#include <casacore/casa/Logging/LogIO.h>
+#include <casacore/casa/Logging/LogSink.h>
+#include <casacore/casa/Logging/LogOrigin.h>
+#include <casacore/casa/Utilities/CountedPtr.h>
+#include <casacore/images/Images/ImageInterface.h>
#include <msvis/MSVis/VisBuffer.h>
-#include <casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/Matrix.h>
namespace LOFAR {
using namespace LofarCFDefs;
@@ -116,6 +116,6 @@ namespace LOFAR {
Int mosPointingPos;
};
-} //# NAMESPACE CASA - END
+} //# NAMESPACE CASACORE - END
#endif
diff --git a/CEP/Imager/LofarFT/include/LofarFT/LofarConvolutionFunction.h b/CEP/Imager/LofarFT/include/LofarFT/LofarConvolutionFunction.h
index e798625b76bb3650bb8916851a1519f65b7a191b..64bd04bc8c96fbb9ffcdc9ddc8200d70c6b34d40 100644
--- a/CEP/Imager/LofarFT/include/LofarFT/LofarConvolutionFunction.h
+++ b/CEP/Imager/LofarFT/include/LofarFT/LofarConvolutionFunction.h
@@ -29,27 +29,27 @@
#include <LofarFT/FFTCMatrix.h>
#include <Common/Timer.h>
-#include <casa/Arrays/Cube.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/MatrixMath.h>
-#include <casa/Arrays/ArrayIter.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <images/Images/PagedImage.h>
-#include <casa/Utilities/Assert.h>
-#include <casa/sstream.h>
-#include <ms/MeasurementSets/MeasurementSet.h>
-#include <measures/Measures/MDirection.h>
-#include <coordinates/Coordinates/CoordinateSystem.h>
-#include <coordinates/Coordinates/SpectralCoordinate.h>
-#include <coordinates/Coordinates/StokesCoordinate.h>
-#include <coordinates/Coordinates/DirectionCoordinate.h>
-#include <casa/OS/PrecTimer.h>
-
-#include <lattices/Lattices/ArrayLattice.h>
+#include <casacore/casa/Arrays/Cube.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/MatrixMath.h>
+#include <casacore/casa/Arrays/ArrayIter.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/images/Images/PagedImage.h>
+#include <casacore/casa/Utilities/Assert.h>
+#include <casacore/casa/sstream.h>
+#include <casacore/ms/MeasurementSets/MeasurementSet.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/coordinates/Coordinates/CoordinateSystem.h>
+#include <casacore/coordinates/Coordinates/SpectralCoordinate.h>
+#include <casacore/coordinates/Coordinates/StokesCoordinate.h>
+#include <casacore/coordinates/Coordinates/DirectionCoordinate.h>
+#include <casacore/casa/OS/PrecTimer.h>
+
+#include <casacore/lattices/Lattices/ArrayLattice.h>
#if defined(casacore)
-#include <lattices/LatticeMath/LatticeFFT.h>
+#include <casacore/lattices/LatticeMath/LatticeFFT.h>
#else
-#include <lattices/Lattices/LatticeFFT.h>
+#include <casacore/lattices/LatticeMath/LatticeFFT.h>
#endif
@@ -57,7 +57,7 @@
-using namespace casa;
+using namespace casacore;
namespace LOFAR
{
@@ -92,7 +92,7 @@ namespace LOFAR
Bool Use_EJones,
Bool Apply_Element,
int ApplyBeamCode,
- const casa::Record& parameters,
+ const casacore::Record& parameters,
vector< vector< vector < Matrix<Complex> > > > & StackMuellerNew
);
//,
@@ -875,7 +875,7 @@ namespace LOFAR
//# Data members.
- casa::Record itsParameters;
+ casacore::Record itsParameters;
Array<Complex> its_output_grid_element;
Matrix<Complex> its_ArrMatrix_out_element;
IPosition m_shape;
@@ -968,7 +968,7 @@ namespace LOFAR
CoordinateSystem csys;
csys.addCoordinate(dir);
csys.addCoordinate(StokesCoordinate(stokes));
- csys.addCoordinate(SpectralCoordinate(casa::MFrequency::TOPO, 60e6, 1.0, 0.0, 60e6));
+ csys.addCoordinate(SpectralCoordinate(casacore::MFrequency::TOPO, 60e6, 1.0, 0.0, 60e6));
PagedImage<T> im(TiledShape(IPosition(4, data.shape()(0), data.shape()(1), 1, 1)), csys, name);
im.putSlice(data, IPosition(4, 0, 0, 0, 0));
}
@@ -1002,7 +1002,7 @@ namespace LOFAR
CoordinateSystem csys;
csys.addCoordinate(dir);
csys.addCoordinate(StokesCoordinate(stokes));
- csys.addCoordinate(SpectralCoordinate(casa::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
+ csys.addCoordinate(SpectralCoordinate(casacore::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
PagedImage<T>
im(TiledShape(IPosition(4, data.shape()(0), data.shape()(1), 4, 1)),
csys, name);
diff --git a/CEP/Imager/LofarFT/include/LofarFT/LofarConvolutionFunctionOld.h b/CEP/Imager/LofarFT/include/LofarFT/LofarConvolutionFunctionOld.h
index 37f62ef57e5c696ee6724aa8b9147bbc13d44215..83df9bf25f33261de001a04c717fc2288cbdb2c9 100644
--- a/CEP/Imager/LofarFT/include/LofarFT/LofarConvolutionFunctionOld.h
+++ b/CEP/Imager/LofarFT/include/LofarFT/LofarConvolutionFunctionOld.h
@@ -29,23 +29,23 @@
#include <LofarFT/FFTCMatrix.h>
#include <Common/Timer.h>
-#include <casa/Arrays/Cube.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/MatrixMath.h>
-#include <casa/Arrays/ArrayIter.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <images/Images/PagedImage.h>
-#include <casa/Utilities/Assert.h>
-#include <ms/MeasurementSets/MeasurementSet.h>
-#include <measures/Measures/MDirection.h>
-#include <coordinates/Coordinates/CoordinateSystem.h>
-#include <coordinates/Coordinates/SpectralCoordinate.h>
-#include <coordinates/Coordinates/StokesCoordinate.h>
-#include <coordinates/Coordinates/DirectionCoordinate.h>
-#include <casa/OS/PrecTimer.h>
-
-
-using namespace casa;
+#include <casacore/casa/Arrays/Cube.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/MatrixMath.h>
+#include <casacore/casa/Arrays/ArrayIter.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/images/Images/PagedImage.h>
+#include <casacore/casa/Utilities/Assert.h>
+#include <casacore/ms/MeasurementSets/MeasurementSet.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/coordinates/Coordinates/CoordinateSystem.h>
+#include <casacore/coordinates/Coordinates/SpectralCoordinate.h>
+#include <casacore/coordinates/Coordinates/StokesCoordinate.h>
+#include <casacore/coordinates/Coordinates/DirectionCoordinate.h>
+#include <casacore/casa/OS/PrecTimer.h>
+
+
+using namespace casacore;
namespace LOFAR
{
diff --git a/CEP/Imager/LofarFT/include/LofarFT/LofarCubeSkyEquation.h b/CEP/Imager/LofarFT/include/LofarFT/LofarCubeSkyEquation.h
index bddbc8b330ff99552ebd903204e6354bf5720b8b..d06b1f6684844de6dd2fb59454f61aecc69d3595 100644
--- a/CEP/Imager/LofarFT/include/LofarFT/LofarCubeSkyEquation.h
+++ b/CEP/Imager/LofarFT/include/LofarFT/LofarCubeSkyEquation.h
@@ -31,7 +31,7 @@
//#include <synthesis/Utilities/ThreadTimers.h>
-namespace casa { //# NAMESPACE CASA - BEGIN
+namespace casacore { //# NAMESPACE CASACORE - BEGIN
//Forward
@@ -136,6 +136,6 @@ class LofarCubeSkyEquation : public SkyEquation {
};
-} //# NAMESPACE CASA - ENDf
+} //# NAMESPACE CASACORE - ENDf
#endif
diff --git a/CEP/Imager/LofarFT/include/LofarFT/LofarFTMachine.h b/CEP/Imager/LofarFT/include/LofarFT/LofarFTMachine.h
index 21d5bd79ebfea6eb6ff7169579e03904270877fb..b486ff8a5d83b6cd18e7ce49f43a1e9c44e2f64f 100644
--- a/CEP/Imager/LofarFT/include/LofarFT/LofarFTMachine.h
+++ b/CEP/Imager/LofarFT/include/LofarFT/LofarFTMachine.h
@@ -30,37 +30,37 @@
#define LOFARFT_LOFARFTMACHINE_H
#include <synthesis/MeasurementComponents/FTMachine.h>
-#include <casa/OS/File.h>
-#include <casa/OS/PrecTimer.h>
+#include <casacore/casa/OS/File.h>
+#include <casacore/casa/OS/PrecTimer.h>
#include <LofarFT/LofarVisResampler.h>
#include <LofarFT/LofarConvolutionFunction.h>
#include <LofarFT/LofarCFStore.h>
-#include <casa/Arrays/Matrix.h>
-#include <scimath/Mathematics/FFTServer.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/scimath/Mathematics/FFTServer.h>
#include <msvis/MSVis/VisBuffer.h>
-#include <images/Images/ImageInterface.h>
-#include <images/Images/ImageInterface.h>
-#include <casa/Containers/Block.h>
-#include <casa/Arrays/Array.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/Arrays/Matrix.h>
-#include <scimath/Mathematics/ConvolveGridder.h>
-#include <lattices/Lattices/LatticeCache.h>
-#include <lattices/Lattices/ArrayLattice.h>
-#include <casa/OS/Timer.h>
+#include <casacore/images/Images/ImageInterface.h>
+#include <casacore/images/Images/ImageInterface.h>
+#include <casacore/casa/Containers/Block.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/scimath/Mathematics/ConvolveGridder.h>
+#include <casacore/lattices/Lattices/LatticeCache.h>
+#include <casacore/lattices/Lattices/ArrayLattice.h>
+#include <casacore/casa/OS/Timer.h>
#include <fftw3.h>
-#include <scimath/Mathematics/FFTServer.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
-#include <casa/BasicSL/Complex.h>
-#include <casa/OS/Timer.h>
+#include <casacore/scimath/Mathematics/FFTServer.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
+#include <casacore/casa/BasicSL/Complex.h>
+#include <casacore/casa/OS/Timer.h>
#include <Common/OpenMP.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
@@ -136,7 +136,7 @@ namespace LOFAR {
// <ul> Deal with large VLA spectral line case
// </todo>
-class LofarFTMachine : public casa::FTMachine {
+class LofarFTMachine : public casacore::FTMachine {
public:
// Constructor: cachesize is the size of the cache in words
@@ -174,7 +174,7 @@ public:
Double UVmin,
Double UVmax,
Bool MakeDirtyCorr,
- const casa::Record& parameters
+ const casacore::Record& parameters
);//,
//Double FillFactor);
// LofarFTMachine(Long cachesize, Int tilesize, CountedPtr<VisibilityResamplerBase>& visResampler,String convType,
@@ -229,7 +229,7 @@ public:
// Finalize transform to Sky plane: flushes the image
// cache and shows statistics if it is being used. DOES NOT
// DO THE FINAL TRANSFORM!
- using casa::FTMachine::finalizeToSky;
+ using casacore::FTMachine::finalizeToSky;
void finalizeToSky();
@@ -238,7 +238,7 @@ public:
// Put coherence to grid by gridding.
- using casa::FTMachine::put;
+ using casacore::FTMachine::put;
void put(const VisBuffer& vb, Int row=-1, Bool dopsf=False,
FTMachine::Type type=FTMachine::OBSERVED);
@@ -247,7 +247,7 @@ public:
Bool its_UseWSplit;
// Make the entire image
- using casa::FTMachine::makeImage;
+ using casacore::FTMachine::makeImage;
void makeImage(FTMachine::Type type,
VisSet& vs,
ImageInterface<Complex>& image,
@@ -550,8 +550,8 @@ protected:
LofarVisResampler visResamplers_p;
- casa::Record itsParameters;
- casa::MeasurementSet itsMS;
+ casacore::Record itsParameters;
+ casacore::MeasurementSet itsMS;
Int itsNWPlanes;
double itsWMax;
Double its_PBCut;
@@ -1225,7 +1225,7 @@ protected:
CoordinateSystem csys;
csys.addCoordinate(dir);
csys.addCoordinate(StokesCoordinate(stokes));
- csys.addCoordinate(SpectralCoordinate(casa::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
+ csys.addCoordinate(SpectralCoordinate(casacore::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
PagedImage<T> im(TiledShape(IPosition(4, data.shape()(0), data.shape()(1), 1, 1)), csys, name);
im.putSlice(data, IPosition(4, 0, 0, 0, 0));
}
@@ -1274,7 +1274,7 @@ protected:
CoordinateSystem csys;
csys.addCoordinate(dir);
csys.addCoordinate(StokesCoordinate(stokes));
- csys.addCoordinate(SpectralCoordinate(casa::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
+ csys.addCoordinate(SpectralCoordinate(casacore::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
PagedImage<T>
im(TiledShape(IPosition(4, data.shape()(0), data.shape()(1), 4, 1)),
csys, name);
@@ -1301,7 +1301,7 @@ protected:
/* stokes(2) = Stokes::YX; */
/* stokes(3) = Stokes::YY; */
/* csys.addCoordinate(StokesCoordinate(stokes)); */
- /* csys.addCoordinate(SpectralCoordinate(casa::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6)); */
+ /* csys.addCoordinate(SpectralCoordinate(casacore::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6)); */
/* PagedImage<T> im(TiledShape(IPosition(4, data.shape()(0), data.shape()(1), 4, 1)), csys, name); */
/* im.putSlice(data, IPosition(4, 0, 0, 0, 0)); */
diff --git a/CEP/Imager/LofarFT/include/LofarFT/LofarFTMachineOld.h b/CEP/Imager/LofarFT/include/LofarFT/LofarFTMachineOld.h
index 70b6d875ff6dd7eb32a02ad95e412d7a61be2554..e5900609823d9e3cb7390fb891673b51fba11e6d 100644
--- a/CEP/Imager/LofarFT/include/LofarFT/LofarFTMachineOld.h
+++ b/CEP/Imager/LofarFT/include/LofarFT/LofarFTMachineOld.h
@@ -30,26 +30,26 @@
#define LOFARFT_LOFARFTMACHINEOLD_H
#include <synthesis/MeasurementComponents/FTMachine.h>
-#include <casa/OS/File.h>
-#include <casa/OS/PrecTimer.h>
+#include <casacore/casa/OS/File.h>
+#include <casacore/casa/OS/PrecTimer.h>
#include <LofarFT/LofarVisResamplerOld.h>
#include <LofarFT/LofarConvolutionFunctionOld.h>
#include <LofarFT/LofarCFStore.h>
-#include <casa/Arrays/Matrix.h>
-#include <scimath/Mathematics/FFTServer.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/scimath/Mathematics/FFTServer.h>
#include <msvis/MSVis/VisBuffer.h>
-#include <images/Images/ImageInterface.h>
-#include <images/Images/ImageInterface.h>
-#include <casa/Containers/Block.h>
-#include <casa/Arrays/Array.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/Arrays/Matrix.h>
-#include <scimath/Mathematics/ConvolveGridder.h>
-#include <lattices/Lattices/LatticeCache.h>
-#include <lattices/Lattices/ArrayLattice.h>
+#include <casacore/images/Images/ImageInterface.h>
+#include <casacore/images/Images/ImageInterface.h>
+#include <casacore/casa/Containers/Block.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/scimath/Mathematics/ConvolveGridder.h>
+#include <casacore/lattices/Lattices/LatticeCache.h>
+#include <casacore/lattices/Lattices/ArrayLattice.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
@@ -125,7 +125,7 @@ namespace LOFAR {
// <ul> Deal with large VLA spectral line case
// </todo>
-class LofarFTMachineOld : public casa::FTMachine {
+class LofarFTMachineOld : public casacore::FTMachine {
public:
// Constructor: cachesize is the size of the cache in words
@@ -193,7 +193,7 @@ public:
// Finalize transform to Sky plane: flushes the image
// cache and shows statistics if it is being used. DOES NOT
// DO THE FINAL TRANSFORM!
- using casa::FTMachine::finalizeToSky;
+ using casacore::FTMachine::finalizeToSky;
void finalizeToSky();
@@ -202,13 +202,13 @@ public:
// Put coherence to grid by gridding.
- using casa::FTMachine::put;
+ using casacore::FTMachine::put;
void put(const VisBuffer& vb, Int row=-1, Bool dopsf=False,
FTMachine::Type type=FTMachine::OBSERVED);
// Make the entire image
- using casa::FTMachine::makeImage;
+ using casacore::FTMachine::makeImage;
void makeImage(FTMachine::Type type,
VisSet& vs,
ImageInterface<Complex>& image,
@@ -387,7 +387,7 @@ protected:
LofarVisResamplerOld visResamplers_p;
- casa::MeasurementSet itsMS;
+ casacore::MeasurementSet itsMS;
Int itsNWPlanes;
double itsWMax;
int itsNThread;
@@ -428,7 +428,7 @@ protected:
stokes(2) = Stokes::YX;
stokes(3) = Stokes::YY;
csys.addCoordinate(StokesCoordinate(stokes));
- csys.addCoordinate(SpectralCoordinate(casa::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
+ csys.addCoordinate(SpectralCoordinate(casacore::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
PagedImage<T> im(TiledShape(IPosition(4, data.shape()(0), data.shape()(1), 4, 1)), csys, name);
im.putSlice(data, IPosition(4, 0, 0, 0, 0));
diff --git a/CEP/Imager/LofarFT/include/LofarFT/LofarImager.h b/CEP/Imager/LofarFT/include/LofarFT/LofarImager.h
index 7e1e5c79ce55574d809e76c3cc92b9cee07f9565..393746ab878b379e962d0e3bebc125e794e819fd 100644
--- a/CEP/Imager/LofarFT/include/LofarFT/LofarImager.h
+++ b/CEP/Imager/LofarFT/include/LofarFT/LofarImager.h
@@ -28,24 +28,24 @@
#include <LofarFT/LofarFTMachine.h>
#include <LofarFT/LofarFTMachineOld.h>
#include <synthesis/MeasurementEquations/Imager.h>
-#include <casa/Containers/Record.h>
+#include <casacore/casa/Containers/Record.h>
namespace LOFAR
{
// @brief Imager for LOFAR data correcting for DD effects
- class LofarImager : public casa::Imager
+ class LofarImager : public casacore::Imager
{
public:
// Construct from the Imager object.
- explicit LofarImager (casa::MeasurementSet&,
- const casa::Record& parameters);
+ explicit LofarImager (casacore::MeasurementSet&,
+ const casacore::Record& parameters);
virtual ~LofarImager();
// Create the LofarFTMachine and fill ft_p in the parent.
- virtual casa::Bool createFTMachine();
+ virtual casacore::Bool createFTMachine();
virtual void setSkyEquation();
@@ -62,7 +62,7 @@ namespace LOFAR
private:
//# Data members.
- casa::Record itsParameters;
+ casacore::Record itsParameters;
LofarFTMachine* itsMachine;
LofarFTMachineOld* itsMachineOld;
vector<Array<Complex> > itsGridsParallel;
diff --git a/CEP/Imager/LofarFT/include/LofarFT/LofarVBStore.h b/CEP/Imager/LofarFT/include/LofarFT/LofarVBStore.h
index 2bf3e499191779a27c348b874e77108cba6b8ed5..ab1210d7c33baec03f99cbc8d0a4f6ecec0a7c42 100644
--- a/CEP/Imager/LofarFT/include/LofarFT/LofarVBStore.h
+++ b/CEP/Imager/LofarFT/include/LofarFT/LofarVBStore.h
@@ -29,7 +29,7 @@
#define LOFARFT_LOFARVBSTORE_H
#include <synthesis/MeasurementComponents/Utils.h>
-namespace casa { //# NAMESPACE CASA - BEGIN
+namespace casacore { //# NAMESPACE CASACORE - BEGIN
class LofarVBStore
{
public:
@@ -95,5 +95,5 @@ namespace casa { //# NAMESPACE CASA - BEGIN
Bool dopsf_p,useCorrected_p;
};
-} //# NAMESPACE CASA - END
+} //# NAMESPACE CASACORE - END
#endif
diff --git a/CEP/Imager/LofarFT/include/LofarFT/LofarVisResampler.h b/CEP/Imager/LofarFT/include/LofarFT/LofarVisResampler.h
index b5728e6b4ee4f8cc5560de130084a9a5be0ba57b..7c5980286f26610f984cdf452cc40b7f66596a27 100644
--- a/CEP/Imager/LofarFT/include/LofarFT/LofarVisResampler.h
+++ b/CEP/Imager/LofarFT/include/LofarFT/LofarVisResampler.h
@@ -36,61 +36,61 @@
#include <LofarFT/LofarWTerm.h>
#include <LofarFT/LofarCFStore.h>
-#include <casa/Logging/LogIO.h>
-#include <casa/Logging/LogOrigin.h>
-#include <casa/Arrays/Cube.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/ArrayIter.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <images/Images/PagedImage.h>
-#include <casa/Utilities/Assert.h>
-
-#include <coordinates/Coordinates/CoordinateSystem.h>
-#include <coordinates/Coordinates/SpectralCoordinate.h>
-#include <coordinates/Coordinates/StokesCoordinate.h>
-
-#include <ms/MeasurementSets/MeasurementSet.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/Measures/MCPosition.h>
-#include <ms/MeasurementSets/MSAntenna.h>
+#include <casacore/casa/Logging/LogIO.h>
+#include <casacore/casa/Logging/LogOrigin.h>
+#include <casacore/casa/Arrays/Cube.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/ArrayIter.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/images/Images/PagedImage.h>
+#include <casacore/casa/Utilities/Assert.h>
+
+#include <casacore/coordinates/Coordinates/CoordinateSystem.h>
+#include <casacore/coordinates/Coordinates/SpectralCoordinate.h>
+#include <casacore/coordinates/Coordinates/StokesCoordinate.h>
+
+#include <casacore/ms/MeasurementSets/MeasurementSet.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/ms/MeasurementSets/MSAntenna.h>
#if defined(casacore)
-#include <ms/MSSel/MSAntennaParse.h>
-#include <ms/MSSel/MSSelection.h>
+#include <casacore/ms/MSSel/MSAntennaParse.h>
+#include <casacore/ms/MSSel/MSSelection.h>
#else
-#include <ms/MeasurementSets/MSAntennaParse.h>
-#include <ms/MeasurementSets/MSSelection.h>
+#include <casacore/ms/MSSel/MSAntennaParse.h>
+#include <casacore/ms/MSSel/MSSelection.h>
#endif
-#include <ms/MeasurementSets/MSAntennaColumns.h>
-#include <ms/MeasurementSets/MSDataDescription.h>
-#include <ms/MeasurementSets/MSDataDescColumns.h>
-#include <ms/MeasurementSets/MSField.h>
-#include <ms/MeasurementSets/MSFieldColumns.h>
-#include <ms/MeasurementSets/MSObservation.h>
-#include <ms/MeasurementSets/MSObsColumns.h>
-#include <ms/MeasurementSets/MSPolarization.h>
-#include <ms/MeasurementSets/MSPolColumns.h>
-#include <ms/MeasurementSets/MSSpectralWindow.h>
-#include <ms/MeasurementSets/MSSpWindowColumns.h>
-#include <measures/Measures/MeasTable.h>
-
-#include <lattices/Lattices/ArrayLattice.h>
+#include <casacore/ms/MeasurementSets/MSAntennaColumns.h>
+#include <casacore/ms/MeasurementSets/MSDataDescription.h>
+#include <casacore/ms/MeasurementSets/MSDataDescColumns.h>
+#include <casacore/ms/MeasurementSets/MSField.h>
+#include <casacore/ms/MeasurementSets/MSFieldColumns.h>
+#include <casacore/ms/MeasurementSets/MSObservation.h>
+#include <casacore/ms/MeasurementSets/MSObsColumns.h>
+#include <casacore/ms/MeasurementSets/MSPolarization.h>
+#include <casacore/ms/MeasurementSets/MSPolColumns.h>
+#include <casacore/ms/MeasurementSets/MSSpectralWindow.h>
+#include <casacore/ms/MeasurementSets/MSSpWindowColumns.h>
+#include <casacore/measures/Measures/MeasTable.h>
+
+#include <casacore/lattices/Lattices/ArrayLattice.h>
#if defined(casacore)
-#include <lattices/LatticeMath/LatticeFFT.h>
+#include <casacore/lattices/LatticeMath/LatticeFFT.h>
#else
-#include <lattices/Lattices/LatticeFFT.h>
+#include <casacore/lattices/LatticeMath/LatticeFFT.h>
#endif
#include <stdio.h>
#include <stdlib.h>
-#include <casa/vector.h>
-#include <casa/OS/Directory.h>
+#include <casacore/casa/vector.h>
+#include <casacore/casa/OS/Directory.h>
//=========
-using namespace casa;
+using namespace casacore;
-namespace LOFAR { //# NAMESPACE CASA - BEGIN
+namespace LOFAR { //# NAMESPACE CASACORE - BEGIN
class LofarVisResampler: public AWVisResampler
{
@@ -199,7 +199,7 @@ namespace LOFAR { //# NAMESPACE CASA - BEGIN
Vector<Int> stokes(1);
stokes(0) = Stokes::I;
csys.addCoordinate(StokesCoordinate(stokes));
- csys.addCoordinate(SpectralCoordinate(casa::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
+ csys.addCoordinate(SpectralCoordinate(casacore::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
PagedImage<T> im(TiledShape(IPosition(4, data.shape()(0), data.shape()(1), 1, 1)), csys, name);
im.putSlice(data, IPosition(4, 0, 0, 0, 0));
@@ -227,6 +227,6 @@ namespace LOFAR { //# NAMESPACE CASA - BEGIN
Vector<Int> cfMap_p, conjCFMap_p;
};
-} //# NAMESPACE CASA - END
+} //# NAMESPACE CASACORE - END
#endif //
diff --git a/CEP/Imager/LofarFT/include/LofarFT/LofarVisResamplerOld.h b/CEP/Imager/LofarFT/include/LofarFT/LofarVisResamplerOld.h
index da9a64437a05e84c8ac91d23f28cd3a549e79610..bf4c151005367daad4f99056e46a47e87d1e4b3f 100644
--- a/CEP/Imager/LofarFT/include/LofarFT/LofarVisResamplerOld.h
+++ b/CEP/Imager/LofarFT/include/LofarFT/LofarVisResamplerOld.h
@@ -34,61 +34,61 @@
//added
#include <LofarFT/LofarCFStore.h>
-#include <casa/Logging/LogIO.h>
-#include <casa/Logging/LogOrigin.h>
-#include <casa/Arrays/Cube.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/ArrayIter.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <images/Images/PagedImage.h>
-#include <casa/Utilities/Assert.h>
-
-#include <coordinates/Coordinates/CoordinateSystem.h>
-#include <coordinates/Coordinates/SpectralCoordinate.h>
-#include <coordinates/Coordinates/StokesCoordinate.h>
-
-#include <ms/MeasurementSets/MeasurementSet.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/Measures/MCPosition.h>
-#include <ms/MeasurementSets/MSAntenna.h>
+#include <casacore/casa/Logging/LogIO.h>
+#include <casacore/casa/Logging/LogOrigin.h>
+#include <casacore/casa/Arrays/Cube.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/ArrayIter.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/images/Images/PagedImage.h>
+#include <casacore/casa/Utilities/Assert.h>
+
+#include <casacore/coordinates/Coordinates/CoordinateSystem.h>
+#include <casacore/coordinates/Coordinates/SpectralCoordinate.h>
+#include <casacore/coordinates/Coordinates/StokesCoordinate.h>
+
+#include <casacore/ms/MeasurementSets/MeasurementSet.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/ms/MeasurementSets/MSAntenna.h>
#if defined(casacore)
-#include <ms/MSSel/MSAntennaParse.h>
-#include <ms/MSSel/MSSelection.h>
+#include <casacore/ms/MSSel/MSAntennaParse.h>
+#include <casacore/ms/MSSel/MSSelection.h>
#else
-#include <ms/MeasurementSets/MSAntennaParse.h>
-#include <ms/MeasurementSets/MSSelection.h>
+#include <casacore/ms/MSSel/MSAntennaParse.h>
+#include <casacore/ms/MSSel/MSSelection.h>
#endif
-#include <ms/MeasurementSets/MSAntennaColumns.h>
-#include <ms/MeasurementSets/MSDataDescription.h>
-#include <ms/MeasurementSets/MSDataDescColumns.h>
-#include <ms/MeasurementSets/MSField.h>
-#include <ms/MeasurementSets/MSFieldColumns.h>
-#include <ms/MeasurementSets/MSObservation.h>
-#include <ms/MeasurementSets/MSObsColumns.h>
-#include <ms/MeasurementSets/MSPolarization.h>
-#include <ms/MeasurementSets/MSPolColumns.h>
-#include <ms/MeasurementSets/MSSpectralWindow.h>
-#include <ms/MeasurementSets/MSSpWindowColumns.h>
-#include <measures/Measures/MeasTable.h>
-
-#include <lattices/Lattices/ArrayLattice.h>
+#include <casacore/ms/MeasurementSets/MSAntennaColumns.h>
+#include <casacore/ms/MeasurementSets/MSDataDescription.h>
+#include <casacore/ms/MeasurementSets/MSDataDescColumns.h>
+#include <casacore/ms/MeasurementSets/MSField.h>
+#include <casacore/ms/MeasurementSets/MSFieldColumns.h>
+#include <casacore/ms/MeasurementSets/MSObservation.h>
+#include <casacore/ms/MeasurementSets/MSObsColumns.h>
+#include <casacore/ms/MeasurementSets/MSPolarization.h>
+#include <casacore/ms/MeasurementSets/MSPolColumns.h>
+#include <casacore/ms/MeasurementSets/MSSpectralWindow.h>
+#include <casacore/ms/MeasurementSets/MSSpWindowColumns.h>
+#include <casacore/measures/Measures/MeasTable.h>
+
+#include <casacore/lattices/Lattices/ArrayLattice.h>
#if defined(casacore)
-#include <lattices/LatticeMath/LatticeFFT.h>
+#include <casacore/lattices/LatticeMath/LatticeFFT.h>
#else
-#include <lattices/Lattices/LatticeFFT.h>
+#include <casacore/lattices/LatticeMath/LatticeFFT.h>
#endif
#include <stdio.h>
#include <stdlib.h>
-#include <casa/vector.h>
-#include <casa/OS/Directory.h>
+#include <casacore/casa/vector.h>
+#include <casacore/casa/OS/Directory.h>
//=========
-using namespace casa;
+using namespace casacore;
-namespace LOFAR { //# NAMESPACE CASA - BEGIN
+namespace LOFAR { //# NAMESPACE CASACORE - BEGIN
class LofarVisResamplerOld: public AWVisResampler
{
@@ -155,7 +155,7 @@ namespace LOFAR { //# NAMESPACE CASA - BEGIN
Vector<Int> stokes(1);
stokes(0) = Stokes::I;
csys.addCoordinate(StokesCoordinate(stokes));
- csys.addCoordinate(SpectralCoordinate(casa::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
+ csys.addCoordinate(SpectralCoordinate(casacore::MFrequency::TOPO, 60e6, 0.0, 0.0, 60e6));
PagedImage<T> im(TiledShape(IPosition(4, data.shape()(0), data.shape()(1), 1, 1)), csys, name);
im.putSlice(data, IPosition(4, 0, 0, 0, 0));
@@ -176,6 +176,6 @@ namespace LOFAR { //# NAMESPACE CASA - BEGIN
Vector<Int> cfMap_p, conjCFMap_p;
};
-} //# NAMESPACE CASA - END
+} //# NAMESPACE CASACORE - END
#endif //
diff --git a/CEP/Imager/LofarFT/include/LofarFT/LofarVisibilityResampler.h b/CEP/Imager/LofarFT/include/LofarFT/LofarVisibilityResampler.h
index b6afb9787c6edd3813d78a15914b8451aad016ba..200e5c4da6844d87ab0dcc91e6d0fa282522fc90 100644
--- a/CEP/Imager/LofarFT/include/LofarFT/LofarVisibilityResampler.h
+++ b/CEP/Imager/LofarFT/include/LofarFT/LofarVisibilityResampler.h
@@ -34,15 +34,15 @@
#include <LofarFT/LofarVBStore.h>
#include <LofarFT/LofarVisibilityResamplerBase.h>
#include <msvis/MSVis/VisBuffer.h>
-#include <casa/Arrays/Array.h>
-#include <casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/casa/Arrays/Vector.h>
#include <msvis/MSVis/AsynchronousTools.h>
-#include <casa/Logging/LogIO.h>
-#include <casa/Logging/LogSink.h>
-#include <casa/Logging/LogMessage.h>
+#include <casacore/casa/Logging/LogIO.h>
+#include <casacore/casa/Logging/LogSink.h>
+#include <casacore/casa/Logging/LogMessage.h>
-namespace casa { //# NAMESPACE CASA - BEGIN
+namespace casacore { //# NAMESPACE CASACORE - BEGIN
class LofarVisibilityResampler: public LofarVisibilityResamplerBase
{
public:
@@ -203,6 +203,6 @@ namespace casa { //# NAMESPACE CASA - BEGIN
{store[iPos[0] + iPos[1]*inc1_p + iPos[2]*inc2_p +iPos[3]*inc3_p] += (nvalue*wt);}
*/
};
-}; //# NAMESPACE CASA - END
+}; //# NAMESPACE CASACORE - END
#endif //
diff --git a/CEP/Imager/LofarFT/include/LofarFT/LofarVisibilityResamplerBase.h b/CEP/Imager/LofarFT/include/LofarFT/LofarVisibilityResamplerBase.h
index 9cd61219c7d145b95e287e1722def8152e1e4ed3..ca465c8e9e04ad2c279902bd3e55b8950582a2a7 100644
--- a/CEP/Imager/LofarFT/include/LofarFT/LofarVisibilityResamplerBase.h
+++ b/CEP/Imager/LofarFT/include/LofarFT/LofarVisibilityResamplerBase.h
@@ -33,15 +33,15 @@
#include <synthesis/MeasurementComponents/Utils.h>
#include <LofarFT/LofarVBStore.h>
#include <msvis/MSVis/VisBuffer.h>
-#include <casa/Arrays/Array.h>
-#include <casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/casa/Arrays/Vector.h>
#include <msvis/MSVis/AsynchronousTools.h>
-#include <casa/Logging/LogIO.h>
-#include <casa/Logging/LogSink.h>
-#include <casa/Logging/LogMessage.h>
+#include <casacore/casa/Logging/LogIO.h>
+#include <casacore/casa/Logging/LogSink.h>
+#include <casacore/casa/Logging/LogMessage.h>
-namespace casa { //# NAMESPACE CASA - BEGIN
+namespace casacore { //# NAMESPACE CASACORE - BEGIN
class LofarVisibilityResamplerBase
{
public:
@@ -218,6 +218,6 @@ namespace casa { //# NAMESPACE CASA - BEGIN
{return store[iPos[0] + iPos[1]*inc[1] + iPos[2]*inc[2] +iPos[3]*inc[3]];};
};
-}; //# NAMESPACE CASA - END
+}; //# NAMESPACE CASACORE - END
#endif //
diff --git a/CEP/Imager/LofarFT/include/LofarFT/LofarWTerm.h b/CEP/Imager/LofarFT/include/LofarFT/LofarWTerm.h
index bb0004f019f0191bac1328a2e8afe8ff3ae7581c..a5beccd11fd1711e60c32bc448c1406b10cc01af 100644
--- a/CEP/Imager/LofarFT/include/LofarFT/LofarWTerm.h
+++ b/CEP/Imager/LofarFT/include/LofarFT/LofarWTerm.h
@@ -25,9 +25,9 @@
#include <Common/LofarTypes.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/BasicSL/Complex.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/BasicSL/Complex.h>
namespace LOFAR {
@@ -186,18 +186,18 @@ namespace LOFAR {
// logIO << LogIO::NORMAL << "Scaling in W (at maximum W): " << 1.0 / m_scale
// << " wavelengths/pixel." << LogIO::POST;
- casa::Matrix<casa::Complex> evaluate
- (const casa::IPosition &shape,
- const casa::Vector<casa::Double>& resolution,
+ casacore::Matrix<casacore::Complex> evaluate
+ (const casacore::IPosition &shape,
+ const casacore::Vector<casacore::Double>& resolution,
double w) const;
- void evaluate(casa::Complex* buffer,
+ void evaluate(casacore::Complex* buffer,
int nx, int ny,
- const casa::Vector<casa::Double>& resolution,
+ const casacore::Vector<casacore::Double>& resolution,
double w) const;
- casa::Complex evaluate_pixel(int x, int y, int nx, int ny,
- const casa::Vector<casa::Double>& resolution,
+ casacore::Complex evaluate_pixel(int x, int y, int nx, int ny,
+ const casacore::Vector<casacore::Double>& resolution,
double w) const;
};
diff --git a/CEP/Imager/LofarFT/src/CasaGridder.cc b/CEP/Imager/LofarFT/src/CasaGridder.cc
index 11167846de1606e839ae2f45551260e08731cad2..22e49efc01325d49780b90ccf27c0f2605ccd1a7 100644
--- a/CEP/Imager/LofarFT/src/CasaGridder.cc
+++ b/CEP/Imager/LofarFT/src/CasaGridder.cc
@@ -27,7 +27,7 @@
#include <ParmDB/Grid.h>
using namespace LOFAR::BBS;
-using namespace casa;
+using namespace casacore;
namespace LOFAR
{
diff --git a/CEP/Imager/LofarFT/src/FFTCMatrix.cc b/CEP/Imager/LofarFT/src/FFTCMatrix.cc
index ff6d0ec81c82e014b79d0a873b595a0d235d15ad..e0388316758c05d899e76859c0369b1859e655e9 100644
--- a/CEP/Imager/LofarFT/src/FFTCMatrix.cc
+++ b/CEP/Imager/LofarFT/src/FFTCMatrix.cc
@@ -22,8 +22,8 @@
#include <LofarFT/FFTCMatrix.h>
#include <Common/LofarLogger.h>
-#include <casa/Utilities/Copy.h>
-#include <casa/OS/Path.h>
+#include <casacore/casa/Utilities/Copy.h>
+#include <casacore/casa/OS/Path.h>
#include <vector>
#include <algorithm>
#include <stdio.h>
@@ -47,14 +47,14 @@ namespace LOFAR {
{
if (!theirInitDone) {
fftwf_init_threads();
- FILE* file = fopen (casa::Path("$HOME/fftwisdom2d.txt").
+ FILE* file = fopen (casacore::Path("$HOME/fftwisdom2d.txt").
expandedName().c_str(), "r");
if (!file) {
- file = fopen (casa::Path("$LOFARLOCALROOT/fftwisdom2d.txt").
+ file = fopen (casacore::Path("$LOFARLOCALROOT/fftwisdom2d.txt").
expandedName().c_str(), "r");
}
if (!file) {
- file = fopen (casa::Path("$LOFARROOT/fftwisdom2d.txt").
+ file = fopen (casacore::Path("$LOFARROOT/fftwisdom2d.txt").
expandedName().c_str(), "r");
}
if (!file) {
@@ -336,8 +336,8 @@ void FFTCMatrix::normalized_backward (size_t size, std::complex<float>* data,
std::vector<std::complex<float> > tmpcol(itsSize);
std::complex<float>* tmprowPtr = &(tmprow[0]);
std::complex<float>* tmpcolPtr = &(tmpcol[0]);
- casa::objcopy (tmprowPtr, itsData + hsz*itsSize, itsSize);
- casa::objcopy (tmpcolPtr, itsData + hsz, itsSize, 1, itsSize);
+ casacore::objcopy (tmprowPtr, itsData + hsz*itsSize, itsSize);
+ casacore::objcopy (tmpcolPtr, itsData + hsz, itsSize, 1, itsSize);
std::complex<float>* __restrict__ p1f;
std::complex<float>* __restrict__ p1t;
std::complex<float>* __restrict__ p2f;
@@ -400,10 +400,10 @@ void FFTCMatrix::normalized_backward (size_t size, std::complex<float>* data,
p2t += incr;
}
// Put back the middle row and column while exchanging top and bottom.
- casa::objcopy (itsData + outm*itsSize + rhsz, tmprowPtr, lhsz);
- casa::objcopy (itsData + outm*itsSize, tmprowPtr + lhsz, rhsz);
- casa::objcopy (itsData + outm + rhsz*itsSize, tmpcolPtr, lhsz, itsSize, 1);
- casa::objcopy (itsData + outm, tmpcolPtr + lhsz, rhsz, itsSize, 1);
+ casacore::objcopy (itsData + outm*itsSize + rhsz, tmprowPtr, lhsz);
+ casacore::objcopy (itsData + outm*itsSize, tmprowPtr + lhsz, rhsz);
+ casacore::objcopy (itsData + outm + rhsz*itsSize, tmpcolPtr, lhsz, itsSize, 1);
+ casacore::objcopy (itsData + outm, tmpcolPtr + lhsz, rhsz, itsSize, 1);
return;
}
diff --git a/CEP/Imager/LofarFT/src/LofarATerm.cc b/CEP/Imager/LofarFT/src/LofarATerm.cc
index 7638965d5b1db37cbc1d5cbb1c310b8975cd41a7..28281015a7bd5bc4b9691ce9cec02d87509fcd1d 100644
--- a/CEP/Imager/LofarFT/src/LofarATerm.cc
+++ b/CEP/Imager/LofarFT/src/LofarATerm.cc
@@ -25,26 +25,26 @@
#include <StationResponse/LofarMetaDataUtil.h>
#include <Common/LofarLogger.h>
#include <Common/Exception.h>
-#include <casa/Arrays/ArrayIter.h>
-#include <casa/Arrays/Cube.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/MatrixIter.h>
-#include <coordinates/Coordinates/DirectionCoordinate.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/Measures/MCEpoch.h>
-#include <measures/Measures/MCPosition.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MeasTable.h>
-#include <ms/MeasurementSets/MeasurementSet.h>
-#include <ms/MeasurementSets/MSDataDescription.h>
-#include <ms/MeasurementSets/MSDataDescColumns.h>
-#include <ms/MeasurementSets/MSField.h>
-#include <ms/MeasurementSets/MSFieldColumns.h>
-#include <ms/MeasurementSets/MSObservation.h>
-#include <ms/MeasurementSets/MSObsColumns.h>
+#include <casacore/casa/Arrays/ArrayIter.h>
+#include <casacore/casa/Arrays/Cube.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/MatrixIter.h>
+#include <casacore/coordinates/Coordinates/DirectionCoordinate.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MCEpoch.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MeasTable.h>
+#include <casacore/ms/MeasurementSets/MeasurementSet.h>
+#include <casacore/ms/MeasurementSets/MSDataDescription.h>
+#include <casacore/ms/MeasurementSets/MSDataDescColumns.h>
+#include <casacore/ms/MeasurementSets/MSField.h>
+#include <casacore/ms/MeasurementSets/MSFieldColumns.h>
+#include <casacore/ms/MeasurementSets/MSObservation.h>
+#include <casacore/ms/MeasurementSets/MSObsColumns.h>
#include <synthesis/MeasurementComponents/SynthesisError.h>
-using namespace casa;
+using namespace casacore;
using namespace LOFAR::StationResponse;
namespace LOFAR
@@ -53,18 +53,18 @@ namespace LOFAR
{
/*!
* \brief Convert an ITRF position given as a StationResponse::vector3r_t
- * instance to a casa::MPosition.
+ * instance to a casacore::MPosition.
*/
MPosition toMPositionITRF(const vector3r_t &position);
/*!
- * \brief Convert a casa::MPosition instance to a
+ * \brief Convert a casacore::MPosition instance to a
# StationResponse::vector3r_t instance.
*/
vector3r_t fromMPosition(const MPosition &position);
/*!
- * \brief Convert a casa::MDirection instance to a
+ * \brief Convert a casacore::MDirection instance to a
* StationResponse::vector3r_t instance.
*/
vector3r_t fromMDirection(const MDirection &direction);
diff --git a/CEP/Imager/LofarFT/src/LofarATermOld.cc b/CEP/Imager/LofarFT/src/LofarATermOld.cc
index e8f628174e5d7372719f2d85365f98ed13014913..4ea0c0af8be91a8f88f72f59948ff0887f2b2153 100644
--- a/CEP/Imager/LofarFT/src/LofarATermOld.cc
+++ b/CEP/Imager/LofarFT/src/LofarATermOld.cc
@@ -25,41 +25,41 @@
#include <Common/LofarLogger.h>
#include <Common/Exception.h>
-#include <casa/OS/Path.h>
-#include <casa/Arrays/ArrayIter.h>
-#include <casa/Arrays/Cube.h>
-#include <coordinates/Coordinates/DirectionCoordinate.h>
-#include <measures/Measures/MeasTable.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/Measures/MCPosition.h>
-#include <ms/MeasurementSets/MeasurementSet.h>
-#include <ms/MeasurementSets/MSAntenna.h>
+#include <casacore/casa/OS/Path.h>
+#include <casacore/casa/Arrays/ArrayIter.h>
+#include <casacore/casa/Arrays/Cube.h>
+#include <casacore/coordinates/Coordinates/DirectionCoordinate.h>
+#include <casacore/measures/Measures/MeasTable.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/ms/MeasurementSets/MeasurementSet.h>
+#include <casacore/ms/MeasurementSets/MSAntenna.h>
#if defined(casacore)
-#include <ms/MSSel/MSAntennaParse.h>
-#include <ms/MSSel/MSSelection.h>
+#include <casacore/ms/MSSel/MSAntennaParse.h>
+#include <casacore/ms/MSSel/MSSelection.h>
#else
-#include <ms/MeasurementSets/MSAntennaParse.h>
-#include <ms/MeasurementSets/MSSelection.h>
+#include <casacore/ms/MSSel/MSAntennaParse.h>
+#include <casacore/ms/MSSel/MSSelection.h>
#endif
-#include <ms/MeasurementSets/MSAntennaColumns.h>
-#include <ms/MeasurementSets/MSDataDescription.h>
-#include <ms/MeasurementSets/MSDataDescColumns.h>
-#include <ms/MeasurementSets/MSField.h>
-#include <ms/MeasurementSets/MSFieldColumns.h>
-#include <ms/MeasurementSets/MSObservation.h>
-#include <ms/MeasurementSets/MSObsColumns.h>
-#include <ms/MeasurementSets/MSPolarization.h>
-#include <ms/MeasurementSets/MSPolColumns.h>
-#include <ms/MeasurementSets/MSSpectralWindow.h>
-#include <ms/MeasurementSets/MSSpWindowColumns.h>
+#include <casacore/ms/MeasurementSets/MSAntennaColumns.h>
+#include <casacore/ms/MeasurementSets/MSDataDescription.h>
+#include <casacore/ms/MeasurementSets/MSDataDescColumns.h>
+#include <casacore/ms/MeasurementSets/MSField.h>
+#include <casacore/ms/MeasurementSets/MSFieldColumns.h>
+#include <casacore/ms/MeasurementSets/MSObservation.h>
+#include <casacore/ms/MeasurementSets/MSObsColumns.h>
+#include <casacore/ms/MeasurementSets/MSPolarization.h>
+#include <casacore/ms/MeasurementSets/MSPolColumns.h>
+#include <casacore/ms/MeasurementSets/MSSpectralWindow.h>
+#include <casacore/ms/MeasurementSets/MSSpWindowColumns.h>
#include <synthesis/MeasurementComponents/SynthesisError.h>
// DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG
#include <iomanip>
// DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG
-using namespace casa;
+using namespace casacore;
namespace LOFAR
{
@@ -121,7 +121,7 @@ namespace LOFAR
// cout << "shape: " << shape << " ref. pixel: " << refPixel << endl;
// coordinates.toWorld(world, refPixel);
-// casa::Quantum<casa::Vector<casa::Double> > refAngles = world.getAngle();
+// casacore::Quantum<casacore::Vector<casacore::Double> > refAngles = world.getAngle();
// double ra = refAngles.getBaseValue()(0);
// double dec = refAngles.getBaseValue()(1);
// cout << "ref. world: " << std::setprecision(17) << ra << " " << dec << endl;
@@ -462,7 +462,7 @@ namespace LOFAR
// Compute the delay for a plane wave approaching from the delay
// reference direction with respect to the element position.
double delay0 = (refDelay[0] * offset[0] + refDelay[1] * offset[1]
- + refDelay[2] * offset[2]) / casa::C::c;
+ + refDelay[2] * offset[2]) / casacore::C::c;
double shift0 = C::_2pi * m_refFreq * delay0;
for(uint y = 0; y < nY; ++y)
@@ -473,7 +473,7 @@ namespace LOFAR
// of interest with respect to the element position.
double delay = (map(0, x, y) * offset[0]
+ map(1, x, y) * offset[1]
- + map(2, x, y) * offset[2]) / casa::C::c;
+ + map(2, x, y) * offset[2]) / casacore::C::c;
for(uint k = 0; k < nFreq; ++k)
{
diff --git a/CEP/Imager/LofarFT/src/LofarConvolutionFunction.cc b/CEP/Imager/LofarFT/src/LofarConvolutionFunction.cc
index 2c78fcf65847abec9c051dbe7a5f84c0636c932c..262fa7ba74856abdef29bae37c8a65fda67965e3 100644
--- a/CEP/Imager/LofarFT/src/LofarConvolutionFunction.cc
+++ b/CEP/Imager/LofarFT/src/LofarConvolutionFunction.cc
@@ -25,53 +25,53 @@
#include <Common/LofarLogger.h>
#include <Common/OpenMP.h>
-#include <casa/Logging/LogIO.h>
-#include <casa/Logging/LogOrigin.h>
-#include <casa/Arrays/Cube.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/MatrixMath.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayUtil.h>
-#include <casa/Arrays/ArrayIter.h>
-#include <casa/sstream.h>
-
-#include <ms/MeasurementSets/MeasurementSet.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/Measures/MCPosition.h>
-#include <ms/MeasurementSets/MSAntenna.h>
+#include <casacore/casa/Logging/LogIO.h>
+#include <casacore/casa/Logging/LogOrigin.h>
+#include <casacore/casa/Arrays/Cube.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/MatrixMath.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayUtil.h>
+#include <casacore/casa/Arrays/ArrayIter.h>
+#include <casacore/casa/sstream.h>
+
+#include <casacore/ms/MeasurementSets/MeasurementSet.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/ms/MeasurementSets/MSAntenna.h>
#if defined(casacore)
-#include <ms/MSSel/MSAntennaParse.h>
-#include <ms/MSSel/MSSelection.h>
+#include <casacore/ms/MSSel/MSAntennaParse.h>
+#include <casacore/ms/MSSel/MSSelection.h>
#else
-#include <ms/MeasurementSets/MSAntennaParse.h>
-#include <ms/MeasurementSets/MSSelection.h>
+#include <casacore/ms/MSSel/MSAntennaParse.h>
+#include <casacore/ms/MSSel/MSSelection.h>
#endif
-#include <ms/MeasurementSets/MSAntennaColumns.h>
-#include <ms/MeasurementSets/MSDataDescription.h>
-#include <ms/MeasurementSets/MSDataDescColumns.h>
-#include <ms/MeasurementSets/MSField.h>
-#include <ms/MeasurementSets/MSFieldColumns.h>
-#include <ms/MeasurementSets/MSObservation.h>
-#include <ms/MeasurementSets/MSObsColumns.h>
-#include <ms/MeasurementSets/MSPolarization.h>
-#include <ms/MeasurementSets/MSPolColumns.h>
-#include <ms/MeasurementSets/MSSpectralWindow.h>
-#include <ms/MeasurementSets/MSSpWindowColumns.h>
-#include <measures/Measures/MeasTable.h>
-#include <coordinates/Coordinates/CoordinateSystem.h>
-#include <coordinates/Coordinates/SpectralCoordinate.h>
-#include <coordinates/Coordinates/StokesCoordinate.h>
-#include <casa/OS/PrecTimer.h>
-#include <casa/sstream.h>
+#include <casacore/ms/MeasurementSets/MSAntennaColumns.h>
+#include <casacore/ms/MeasurementSets/MSDataDescription.h>
+#include <casacore/ms/MeasurementSets/MSDataDescColumns.h>
+#include <casacore/ms/MeasurementSets/MSField.h>
+#include <casacore/ms/MeasurementSets/MSFieldColumns.h>
+#include <casacore/ms/MeasurementSets/MSObservation.h>
+#include <casacore/ms/MeasurementSets/MSObsColumns.h>
+#include <casacore/ms/MeasurementSets/MSPolarization.h>
+#include <casacore/ms/MeasurementSets/MSPolColumns.h>
+#include <casacore/ms/MeasurementSets/MSSpectralWindow.h>
+#include <casacore/ms/MeasurementSets/MSSpWindowColumns.h>
+#include <casacore/measures/Measures/MeasTable.h>
+#include <casacore/coordinates/Coordinates/CoordinateSystem.h>
+#include <casacore/coordinates/Coordinates/SpectralCoordinate.h>
+#include <casacore/coordinates/Coordinates/StokesCoordinate.h>
+#include <casacore/casa/OS/PrecTimer.h>
+#include <casacore/casa/sstream.h>
#include <iomanip>
-#include <lattices/Lattices/ArrayLattice.h>
+#include <casacore/lattices/Lattices/ArrayLattice.h>
#if defined(casacore)
-#include <lattices/LatticeMath/LatticeFFT.h>
+#include <casacore/lattices/LatticeMath/LatticeFFT.h>
#else
-#include <lattices/Lattices/LatticeFFT.h>
+#include <casacore/lattices/LatticeMath/LatticeFFT.h>
#endif
namespace LOFAR
@@ -103,7 +103,7 @@ namespace LOFAR
Bool Use_EJones,
Bool Apply_Element,
int ApplyBeamCode,
- const casa::Record& parameters,
+ const casacore::Record& parameters,
vector< vector< vector < Matrix<Complex> > > > & StackMuellerNew
)
// ,
diff --git a/CEP/Imager/LofarFT/src/LofarConvolutionFunctionOld.cc b/CEP/Imager/LofarFT/src/LofarConvolutionFunctionOld.cc
index 586e1245572b53bf17fb95da55a91968699a3a59..8a0e7b233f1829d5bcf215be5a1c3d520e997005 100644
--- a/CEP/Imager/LofarFT/src/LofarConvolutionFunctionOld.cc
+++ b/CEP/Imager/LofarFT/src/LofarConvolutionFunctionOld.cc
@@ -26,43 +26,43 @@
#include <Common/LofarLogger.h>
#include <Common/OpenMP.h>
-#include <casa/Logging/LogIO.h>
-#include <casa/Logging/LogOrigin.h>
-#include <casa/Arrays/Cube.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/MatrixMath.h>
-#include <casa/Arrays/ArrayMath.h>
-
-#include <ms/MeasurementSets/MeasurementSet.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/Measures/MCPosition.h>
-#include <ms/MeasurementSets/MSAntenna.h>
+#include <casacore/casa/Logging/LogIO.h>
+#include <casacore/casa/Logging/LogOrigin.h>
+#include <casacore/casa/Arrays/Cube.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/MatrixMath.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+
+#include <casacore/ms/MeasurementSets/MeasurementSet.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/ms/MeasurementSets/MSAntenna.h>
#if defined(casacore)
-#include <ms/MSSel/MSAntennaParse.h>
-#include <ms/MSSel/MSSelection.h>
+#include <casacore/ms/MSSel/MSAntennaParse.h>
+#include <casacore/ms/MSSel/MSSelection.h>
#else
-#include <ms/MeasurementSets/MSAntennaParse.h>
-#include <ms/MeasurementSets/MSSelection.h>
+#include <casacore/ms/MSSel/MSAntennaParse.h>
+#include <casacore/ms/MSSel/MSSelection.h>
#endif
-#include <ms/MeasurementSets/MSAntennaColumns.h>
-#include <ms/MeasurementSets/MSDataDescription.h>
-#include <ms/MeasurementSets/MSDataDescColumns.h>
-#include <ms/MeasurementSets/MSField.h>
-#include <ms/MeasurementSets/MSFieldColumns.h>
-#include <ms/MeasurementSets/MSObservation.h>
-#include <ms/MeasurementSets/MSObsColumns.h>
-#include <ms/MeasurementSets/MSPolarization.h>
-#include <ms/MeasurementSets/MSPolColumns.h>
-#include <ms/MeasurementSets/MSSpectralWindow.h>
-#include <ms/MeasurementSets/MSSpWindowColumns.h>
-#include <measures/Measures/MeasTable.h>
-#include <coordinates/Coordinates/CoordinateSystem.h>
-#include <coordinates/Coordinates/SpectralCoordinate.h>
-#include <coordinates/Coordinates/StokesCoordinate.h>
-#include <casa/OS/PrecTimer.h>
-#include <casa/sstream.h>
+#include <casacore/ms/MeasurementSets/MSAntennaColumns.h>
+#include <casacore/ms/MeasurementSets/MSDataDescription.h>
+#include <casacore/ms/MeasurementSets/MSDataDescColumns.h>
+#include <casacore/ms/MeasurementSets/MSField.h>
+#include <casacore/ms/MeasurementSets/MSFieldColumns.h>
+#include <casacore/ms/MeasurementSets/MSObservation.h>
+#include <casacore/ms/MeasurementSets/MSObsColumns.h>
+#include <casacore/ms/MeasurementSets/MSPolarization.h>
+#include <casacore/ms/MeasurementSets/MSPolColumns.h>
+#include <casacore/ms/MeasurementSets/MSSpectralWindow.h>
+#include <casacore/ms/MeasurementSets/MSSpWindowColumns.h>
+#include <casacore/measures/Measures/MeasTable.h>
+#include <casacore/coordinates/Coordinates/CoordinateSystem.h>
+#include <casacore/coordinates/Coordinates/SpectralCoordinate.h>
+#include <casacore/coordinates/Coordinates/StokesCoordinate.h>
+#include <casacore/casa/OS/PrecTimer.h>
+#include <casacore/casa/sstream.h>
#include <iomanip>
namespace LOFAR
diff --git a/CEP/Imager/LofarFT/src/LofarCubeSkyEquation.cc b/CEP/Imager/LofarFT/src/LofarCubeSkyEquation.cc
index dda9961d0988104cdbaf8ba08e6b15bcc2aa08f6..2298dd65725f8cd16f63c0cf9f3f7fb3e139f55b 100644
--- a/CEP/Imager/LofarFT/src/LofarCubeSkyEquation.cc
+++ b/CEP/Imager/LofarFT/src/LofarCubeSkyEquation.cc
@@ -26,25 +26,25 @@
//# $Id$
#include <lofar_config.h>
-#include <casa/iostream.h>
-#include <casa/Exceptions/Error.h>
-#include <casa/Utilities/Assert.h>
-#include <casa/BasicSL/Complex.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/MatrixMath.h>
-#include <casa/OS/HostInfo.h>
-#include <casa/System/ProgressMeter.h>
-#include <casa/Utilities/CountedPtr.h>
-#include <lattices/Lattices/ArrayLattice.h>
-
-#include <coordinates/Coordinates/CoordinateSystem.h>
-#include <coordinates/Coordinates/DirectionCoordinate.h>
-#include <coordinates/Coordinates/StokesCoordinate.h>
+#include <casacore/casa/iostream.h>
+#include <casacore/casa/Exceptions/Error.h>
+#include <casacore/casa/Utilities/Assert.h>
+#include <casacore/casa/BasicSL/Complex.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/MatrixMath.h>
+#include <casacore/casa/OS/HostInfo.h>
+#include <casacore/casa/System/ProgressMeter.h>
+#include <casacore/casa/Utilities/CountedPtr.h>
+#include <casacore/lattices/Lattices/ArrayLattice.h>
+
+#include <casacore/coordinates/Coordinates/CoordinateSystem.h>
+#include <casacore/coordinates/Coordinates/DirectionCoordinate.h>
+#include <casacore/coordinates/Coordinates/StokesCoordinate.h>
#if defined(casacore)
-#include <lattices/LEL/LatticeExpr.h>
+#include <casacore/lattices/LEL/LatticeExpr.h>
#else
-#include <lattices/Lattices/LatticeExpr.h>
+#include <casacore/lattices/LEL/LatticeExpr.h>
#endif
#include <synthesis/MeasurementComponents/SkyModel.h>
@@ -68,8 +68,8 @@
#include <synthesis/MeasurementComponents/SynthesisError.h>
#include <synthesis/MeasurementEquations/StokesImageUtil.h>
-#include <images/Images/ImageInterface.h>
-#include <images/Images/SubImage.h>
+#include <casacore/images/Images/ImageInterface.h>
+#include <casacore/images/Images/SubImage.h>
#include <msvis/MSVis/StokesVector.h>
#include <msvis/MSVis/VisBufferUtil.h>
@@ -80,9 +80,9 @@
#include <msvis/MSVis/VisBufferAsync.h>
//#include <synthesis/Utilities/ThreadTimers.h>
-#include <casa/OS/PrecTimer.h>
+#include <casacore/casa/OS/PrecTimer.h>
-namespace casa { //# NAMESPACE CASA - BEGIN
+namespace casacore { //# NAMESPACE CASACORE - BEGIN
LofarCubeSkyEquation::LofarCubeSkyEquation(SkyModel& sm, VisSet& vs, FTMachine& ft,
ComponentFTMachine& cft, Bool noModelCol)
@@ -775,7 +775,7 @@ void LofarCubeSkyEquation::gradientsChiSquared(Bool /*incr*/, Bool commitModel){
predictComponents(incremental, initialized);
Bool predictedComp=initialized;
- using namespace casa::asyncio;
+ using namespace casacore::asyncio;
PrefetchColumns prefetchColumns = ROVIA::prefetchColumns (Ant1,
Ant2,
@@ -800,7 +800,7 @@ void LofarCubeSkyEquation::gradientsChiSquared(Bool /*incr*/, Bool commitModel){
PhaseCenter,
PolFrame,
SpW,
- casa::asyncio::Time,
+ casacore::asyncio::Time,
Uvw,
-1);
@@ -1604,4 +1604,4 @@ void LofarCubeSkyEquation::fixImageScale()
}
}
-} //# NAMESPACE CASA - END
+} //# NAMESPACE CASACORE - END
diff --git a/CEP/Imager/LofarFT/src/LofarFTMachine.cc b/CEP/Imager/LofarFT/src/LofarFTMachine.cc
index 3f8da662609d3c9aecb86fb9bb0ada8b166f54b4..fb7c4484c7dc344e3977350079b20f82afcd28d0 100644
--- a/CEP/Imager/LofarFT/src/LofarFTMachine.cc
+++ b/CEP/Imager/LofarFT/src/LofarFTMachine.cc
@@ -25,17 +25,17 @@
// #include <omp.h>
#include <msvis/MSVis/VisibilityIterator.h>
-#include <casa/Quanta/UnitMap.h>
-#include <casa/Quanta/UnitVal.h>
-#include <measures/Measures/Stokes.h>
-#include <coordinates/Coordinates/CoordinateSystem.h>
-#include <coordinates/Coordinates/DirectionCoordinate.h>
-#include <coordinates/Coordinates/SpectralCoordinate.h>
-#include <coordinates/Coordinates/StokesCoordinate.h>
-#include <coordinates/Coordinates/Projection.h>
-#include <ms/MeasurementSets/MSColumns.h>
-#include <casa/BasicSL/Constants.h>
-#include <scimath/Mathematics/FFTServer.h>
+#include <casacore/casa/Quanta/UnitMap.h>
+#include <casacore/casa/Quanta/UnitVal.h>
+#include <casacore/measures/Measures/Stokes.h>
+#include <casacore/coordinates/Coordinates/CoordinateSystem.h>
+#include <casacore/coordinates/Coordinates/DirectionCoordinate.h>
+#include <casacore/coordinates/Coordinates/SpectralCoordinate.h>
+#include <casacore/coordinates/Coordinates/StokesCoordinate.h>
+#include <casacore/coordinates/Coordinates/Projection.h>
+#include <casacore/ms/MeasurementSets/MSColumns.h>
+#include <casacore/casa/BasicSL/Constants.h>
+#include <casacore/scimath/Mathematics/FFTServer.h>
#include <LofarFT/LofarFTMachine.h>
#include <LofarFT/LofarCFStore.h>
#include <LofarFT/LofarConvolutionFunction.h>
@@ -43,59 +43,59 @@
#include <LofarFT/LofarVisResampler.h>
#include <synthesis/MeasurementComponents/CFStore.h>
#include <LofarFT/LofarVBStore.h>
-#include <scimath/Mathematics/RigidVector.h>
+#include <casacore/scimath/Mathematics/RigidVector.h>
#include <msvis/MSVis/StokesVector.h>
#include <synthesis/MeasurementEquations/StokesImageUtil.h>
#include <msvis/MSVis/VisBuffer.h>
#include <msvis/MSVis/VisSet.h>
-#include <images/Images/ImageInterface.h>
-#include <images/Images/PagedImage.h>
-#include <casa/Containers/Block.h>
-#include <casa/Containers/Record.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/Array.h>
-#include <casa/Arrays/MaskedArray.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/Arrays/Slicer.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/Cube.h>
-#include <casa/Arrays/MatrixIter.h>
-#include <casa/BasicSL/String.h>
-#include <casa/Utilities/Assert.h>
-#include <casa/Exceptions/Error.h>
-#include <lattices/Lattices/ArrayLattice.h>
-#include <measures/Measures/UVWMachine.h>
-#include <lattices/Lattices/SubLattice.h>
+#include <casacore/images/Images/ImageInterface.h>
+#include <casacore/images/Images/PagedImage.h>
+#include <casacore/casa/Containers/Block.h>
+#include <casacore/casa/Containers/Record.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/casa/Arrays/MaskedArray.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/Slicer.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/Cube.h>
+#include <casacore/casa/Arrays/MatrixIter.h>
+#include <casacore/casa/BasicSL/String.h>
+#include <casacore/casa/Utilities/Assert.h>
+#include <casacore/casa/Exceptions/Error.h>
+#include <casacore/lattices/Lattices/ArrayLattice.h>
+#include <casacore/measures/Measures/UVWMachine.h>
+#include <casacore/lattices/Lattices/SubLattice.h>
#if defined(casacore)
-#include <lattices/LRegions/LCBox.h>
-#include <lattices/LatticeMath/LatticeFFT.h>
+#include <casacore/lattices/LRegions/LCBox.h>
+#include <casacore/lattices/LatticeMath/LatticeFFT.h>
#else
-#include <lattices/Lattices/LCBox.h>
-#include <lattices/Lattices/LatticeFFT.h>
+#include <casacore/lattices/LRegions/LCBox.h>
+#include <casacore/lattices/LatticeMath/LatticeFFT.h>
#endif
-#include <lattices/Lattices/LatticeCache.h>
-#include <lattices/Lattices/LatticeIterator.h>
-#include <lattices/Lattices/LatticeStepper.h>
-#include <scimath/Mathematics/ConvolveGridder.h>
-#include <casa/Utilities/CompositeNumber.h>
-#include <casa/OS/PrecTimer.h>
-#include <casa/sstream.h>
-#include <casa/OS/HostInfo.h>
-#include <casa/BasicMath/Random.h>
+#include <casacore/lattices/Lattices/LatticeCache.h>
+#include <casacore/lattices/Lattices/LatticeIterator.h>
+#include <casacore/lattices/Lattices/LatticeStepper.h>
+#include <casacore/scimath/Mathematics/ConvolveGridder.h>
+#include <casacore/casa/Utilities/CompositeNumber.h>
+#include <casacore/casa/OS/PrecTimer.h>
+#include <casacore/casa/sstream.h>
+#include <casacore/casa/OS/HostInfo.h>
+#include <casacore/casa/BasicMath/Random.h>
#include <time.h>
//#include <fftw3.h>
#include <LofarFT/FFTCMatrix.h>
-#include <scimath/Mathematics/Interpolate2D.h>
+#include <casacore/scimath/Mathematics/Interpolate2D.h>
#define DORES True
-using namespace casa;
+using namespace casacore;
-namespace LOFAR { //# NAMESPACE CASA - BEGIN
+namespace LOFAR { //# NAMESPACE CASACORE - BEGIN
// LofarFTMachine::LofarFTMachine(Long icachesize, Int itilesize,
// CountedPtr<VisibilityResamplerBase>&,
diff --git a/CEP/Imager/LofarFT/src/LofarFTMachineOld.cc b/CEP/Imager/LofarFT/src/LofarFTMachineOld.cc
index b5b980461a06eddc1196f06d3de0602def5c046d..be35e24d53266459a3ee4052a488d2b685c3200f 100644
--- a/CEP/Imager/LofarFT/src/LofarFTMachineOld.cc
+++ b/CEP/Imager/LofarFT/src/LofarFTMachineOld.cc
@@ -25,17 +25,17 @@
// #include <Common/Exception.h>
#include <Common/OpenMP.h>
#include <msvis/MSVis/VisibilityIterator.h>
-#include <casa/Quanta/UnitMap.h>
-#include <casa/Quanta/UnitVal.h>
-#include <measures/Measures/Stokes.h>
-#include <coordinates/Coordinates/CoordinateSystem.h>
-#include <coordinates/Coordinates/DirectionCoordinate.h>
-#include <coordinates/Coordinates/SpectralCoordinate.h>
-#include <coordinates/Coordinates/StokesCoordinate.h>
-#include <coordinates/Coordinates/Projection.h>
-#include <ms/MeasurementSets/MSColumns.h>
-#include <casa/BasicSL/Constants.h>
-#include <scimath/Mathematics/FFTServer.h>
+#include <casacore/casa/Quanta/UnitMap.h>
+#include <casacore/casa/Quanta/UnitVal.h>
+#include <casacore/measures/Measures/Stokes.h>
+#include <casacore/coordinates/Coordinates/CoordinateSystem.h>
+#include <casacore/coordinates/Coordinates/DirectionCoordinate.h>
+#include <casacore/coordinates/Coordinates/SpectralCoordinate.h>
+#include <casacore/coordinates/Coordinates/StokesCoordinate.h>
+#include <casacore/coordinates/Coordinates/Projection.h>
+#include <casacore/ms/MeasurementSets/MSColumns.h>
+#include <casacore/casa/BasicSL/Constants.h>
+#include <casacore/scimath/Mathematics/FFTServer.h>
#include <LofarFT/LofarFTMachineOld.h>
#include <LofarFT/LofarCFStore.h>
#include <LofarFT/LofarConvolutionFunctionOld.h>
@@ -43,50 +43,50 @@
#include <LofarFT/LofarVisResamplerOld.h>
#include <synthesis/MeasurementComponents/CFStore.h>
#include <LofarFT/LofarVBStore.h>
-#include <scimath/Mathematics/RigidVector.h>
+#include <casacore/scimath/Mathematics/RigidVector.h>
#include <msvis/MSVis/StokesVector.h>
#include <synthesis/MeasurementEquations/StokesImageUtil.h>
#include <msvis/MSVis/VisBuffer.h>
#include <msvis/MSVis/VisSet.h>
-#include <images/Images/ImageInterface.h>
-#include <images/Images/PagedImage.h>
-#include <casa/Containers/Block.h>
-#include <casa/Containers/Record.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/Array.h>
-#include <casa/Arrays/MaskedArray.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/Arrays/Slicer.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/Cube.h>
-#include <casa/Arrays/MatrixIter.h>
-#include <casa/BasicSL/String.h>
-#include <casa/Utilities/Assert.h>
-#include <casa/Exceptions/Error.h>
-#include <lattices/Lattices/ArrayLattice.h>
-#include <measures/Measures/UVWMachine.h>
-#include <lattices/Lattices/SubLattice.h>
+#include <casacore/images/Images/ImageInterface.h>
+#include <casacore/images/Images/PagedImage.h>
+#include <casacore/casa/Containers/Block.h>
+#include <casacore/casa/Containers/Record.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/casa/Arrays/MaskedArray.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/Slicer.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/Cube.h>
+#include <casacore/casa/Arrays/MatrixIter.h>
+#include <casacore/casa/BasicSL/String.h>
+#include <casacore/casa/Utilities/Assert.h>
+#include <casacore/casa/Exceptions/Error.h>
+#include <casacore/lattices/Lattices/ArrayLattice.h>
+#include <casacore/measures/Measures/UVWMachine.h>
+#include <casacore/lattices/Lattices/SubLattice.h>
#if defined(casacore)
-#include <lattices/LRegions/LCBox.h>
-#include <lattices/LatticeMath/LatticeFFT.h>
+#include <casacore/lattices/LRegions/LCBox.h>
+#include <casacore/lattices/LatticeMath/LatticeFFT.h>
#else
-#include <lattices/Lattices/LCBox.h>
-#include <lattices/Lattices/LatticeFFT.h>
+#include <casacore/lattices/LRegions/LCBox.h>
+#include <casacore/lattices/LatticeMath/LatticeFFT.h>
#endif
-#include <lattices/Lattices/LatticeCache.h>
-#include <lattices/Lattices/LatticeIterator.h>
-#include <lattices/Lattices/LatticeStepper.h>
-#include <scimath/Mathematics/ConvolveGridder.h>
-#include <casa/Utilities/CompositeNumber.h>
-#include <casa/OS/PrecTimer.h>
-#include <casa/sstream.h>
+#include <casacore/lattices/Lattices/LatticeCache.h>
+#include <casacore/lattices/Lattices/LatticeIterator.h>
+#include <casacore/lattices/Lattices/LatticeStepper.h>
+#include <casacore/scimath/Mathematics/ConvolveGridder.h>
+#include <casacore/casa/Utilities/CompositeNumber.h>
+#include <casacore/casa/OS/PrecTimer.h>
+#include <casacore/casa/sstream.h>
#define DORES True
-using namespace casa;
+using namespace casacore;
-namespace LOFAR { //# NAMESPACE CASA - BEGIN
+namespace LOFAR { //# NAMESPACE CASACORE - BEGIN
// LofarFTMachineOld::LofarFTMachineOld(Long icachesize, Int itilesize,
// CountedPtr<VisibilityResamplerBase>&,
diff --git a/CEP/Imager/LofarFT/src/LofarImager.cc b/CEP/Imager/LofarFT/src/LofarImager.cc
index 2ba94b40f9279848040c03269e7bc70217a0a2a6..494b3e0daff7ee8c161b3b98c962c8896f23918d 100644
--- a/CEP/Imager/LofarFT/src/LofarImager.cc
+++ b/CEP/Imager/LofarFT/src/LofarImager.cc
@@ -25,15 +25,15 @@
#include <lofar_config.h>
#include <LofarFT/LofarImager.h>
#include <LofarFT/LofarVisResampler.h>
-#include <casa/Utilities/CountedPtr.h>
+#include <casacore/casa/Utilities/CountedPtr.h>
#include <synthesis/MeasurementComponents/SimpleComponentFTMachine.h>
#include <msvis/MSVis/VisSet.h>
#include <LofarFT/LofarCubeSkyEquation.h>
-#include <tables/Tables/TableIter.h>
+#include <casacore/tables/Tables/TableIter.h>
#include <assert.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR
{
diff --git a/CEP/Imager/LofarFT/src/LofarVisResampler.cc b/CEP/Imager/LofarFT/src/LofarVisResampler.cc
index fe7ce6a54d6fdcb0e9418d75ba7031984e81ac62..524e8ed41c250cfc6fc8b115cdf70d65ee628631 100644
--- a/CEP/Imager/LofarFT/src/LofarVisResampler.cc
+++ b/CEP/Imager/LofarFT/src/LofarVisResampler.cc
@@ -23,8 +23,8 @@
#include <lofar_config.h>
#include <LofarFT/LofarVisResampler.h>
#include <synthesis/MeasurementComponents/Utils.h>
-#include <coordinates/Coordinates/SpectralCoordinate.h>
-#include <coordinates/Coordinates/CoordinateSystem.h>
+#include <casacore/coordinates/Coordinates/SpectralCoordinate.h>
+#include <casacore/coordinates/Coordinates/CoordinateSystem.h>
#include <cassert>
#include <Common/OpenMP.h>
diff --git a/CEP/Imager/LofarFT/src/LofarVisResamplerOld.cc b/CEP/Imager/LofarFT/src/LofarVisResamplerOld.cc
index de1a7a57d9c094a1422f542c173462a62b66e502..ce05b761b01b06d20db8017d536339533bc16b53 100644
--- a/CEP/Imager/LofarFT/src/LofarVisResamplerOld.cc
+++ b/CEP/Imager/LofarFT/src/LofarVisResamplerOld.cc
@@ -22,8 +22,8 @@
#include <LofarFT/LofarVisResamplerOld.h>
#include <synthesis/MeasurementComponents/Utils.h>
-#include <coordinates/Coordinates/SpectralCoordinate.h>
-#include <coordinates/Coordinates/CoordinateSystem.h>
+#include <casacore/coordinates/Coordinates/SpectralCoordinate.h>
+#include <casacore/coordinates/Coordinates/CoordinateSystem.h>
#include<cassert>
namespace LOFAR {
diff --git a/CEP/Imager/LofarFT/src/LofarWTerm.cc b/CEP/Imager/LofarFT/src/LofarWTerm.cc
index 063af831cd72baf3750ee55dfdfaa2cf5e805df3..53feecdda28a3c7357006f4c5f4195683cca8d2a 100644
--- a/CEP/Imager/LofarFT/src/LofarWTerm.cc
+++ b/CEP/Imager/LofarFT/src/LofarWTerm.cc
@@ -22,10 +22,10 @@
#include <lofar_config.h>
#include <LofarFT/LofarWTerm.h>
-#include <casa/BasicSL/Constants.h>
+#include <casacore/casa/BasicSL/Constants.h>
#include <algorithm>
-using namespace casa;
+using namespace casacore;
namespace LOFAR
{
diff --git a/CEP/Imager/LofarFT/src/awimager.cc b/CEP/Imager/LofarFT/src/awimager.cc
index 8283ca413f8725fd1802857674a35819d31d7953..02aa44f4c94670aa376d5d64b4fa45888f5720cd 100644
--- a/CEP/Imager/LofarFT/src/awimager.cc
+++ b/CEP/Imager/LofarFT/src/awimager.cc
@@ -31,23 +31,23 @@
#include <Common/InputParSet.h>
#include <Common/Exception.h>
-#include <images/Images/PagedImage.h>
-#include <images/Images/HDF5Image.h>
-#include <images/Images/ImageFITSConverter.h>
-#include <casa/Arrays/ArrayUtil.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayIter.h>
-#include <casa/Utilities/Regex.h>
-#include <casa/Utilities/Assert.h>
-#include <casa/OS/Directory.h>
-#include <casa/OS/File.h>
-#include <casa/Exceptions/Error.h>
-#include <casa/OS/Timer.h>
-#include <casa/OS/PrecTimer.h>
-#include <casa/iostream.h>
-#include <casa/sstream.h>
+#include <casacore/images/Images/PagedImage.h>
+#include <casacore/images/Images/HDF5Image.h>
+#include <casacore/images/Images/ImageFITSConverter.h>
+#include <casacore/casa/Arrays/ArrayUtil.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayIter.h>
+#include <casacore/casa/Utilities/Regex.h>
+#include <casacore/casa/Utilities/Assert.h>
+#include <casacore/casa/OS/Directory.h>
+#include <casacore/casa/OS/File.h>
+#include <casacore/casa/Exceptions/Error.h>
+#include <casacore/casa/OS/Timer.h>
+#include <casacore/casa/OS/PrecTimer.h>
+#include <casacore/casa/iostream.h>
+#include <casacore/casa/sstream.h>
-using namespace casa;
+using namespace casacore;
// Use a terminate handler that can produce a backtrace.
LOFAR::Exception::TerminateHandler t(LOFAR::Exception::terminate);
diff --git a/CEP/Imager/LofarFT/src/fillRootImageGroup.cc b/CEP/Imager/LofarFT/src/fillRootImageGroup.cc
index 93893cc485626d3b88e4bda17879336dda0b21ce..388914e54e8e71e5b7ac6442ec3769237cea4283 100644
--- a/CEP/Imager/LofarFT/src/fillRootImageGroup.cc
+++ b/CEP/Imager/LofarFT/src/fillRootImageGroup.cc
@@ -27,12 +27,12 @@
#include <lofar_config.h>
-#include <casa/Containers/Record.h>
-#include <casa/HDF5/HDF5File.h>
-#include <casa/HDF5/HDF5Group.h>
-#include <casa/HDF5/HDF5Record.h>
-#include <casa/Quanta/MVTime.h>
-#include <casa/Quanta/Quantum.h>
+#include <casacore/casa/Containers/Record.h>
+#include <casacore/casa/HDF5/HDF5File.h>
+#include <casacore/casa/HDF5/HDF5Group.h>
+#include <casacore/casa/HDF5/HDF5Record.h>
+#include <casacore/casa/Quanta/MVTime.h>
+#include <casacore/casa/Quanta/Quantum.h>
#include <Common/SystemUtil.h>
#include <Common/LofarLogger.h>
@@ -41,7 +41,7 @@
#include <ostream>
#include <sstream>
-using namespace casa;
+using namespace casacore;
using namespace LOFAR;
using namespace std;
diff --git a/CEP/Imager/LofarFT/src/makefftwisdom2d.cc b/CEP/Imager/LofarFT/src/makefftwisdom2d.cc
index e0dd7a256f7315331e860e3c68e44447628130c2..4147cdbad734757fa6c61ab83371ce7aeb30f89a 100644
--- a/CEP/Imager/LofarFT/src/makefftwisdom2d.cc
+++ b/CEP/Imager/LofarFT/src/makefftwisdom2d.cc
@@ -23,7 +23,7 @@
#include <lofar_config.h>
#include <LofarFT/FFTCMatrix.h>
#include <Common/lofar_iostream.h>
-#include <casa/OS/Path.h>
+#include <casacore/casa/OS/Path.h>
#include <stdio.h>
#include <errno.h>
#include <string.h> //# for strerror
@@ -60,7 +60,7 @@ int main (int argc, char* argv[])
bool argparallel = false;
int st = 1;
if (argc > st) {
- casa::String arg(argv[st]);
+ casacore::String arg(argv[st]);
if (arg == "-h" || arg == "--help" || arg == "?") {
showhelp();
return 1;
@@ -73,9 +73,9 @@ int main (int argc, char* argv[])
if (!argparallel) {
// Serial FFTs.
- casa::String name = "fftwisdom2d.txt";
+ casacore::String name = "fftwisdom2d.txt";
if (argc > st) {
- name = casa::Path(argv[st]).absoluteName();
+ name = casacore::Path(argv[st]).absoluteName();
}
FILE* wisdomFile = fopen (name.c_str(), "w");
if (!wisdomFile) {
@@ -120,9 +120,9 @@ int main (int argc, char* argv[])
} else {
// Parallel FFTs
- casa::String name = "fftwisdom2d_parallel.txt";
+ casacore::String name = "fftwisdom2d_parallel.txt";
if (argc > st) {
- name = casa::Path(argv[st]).absoluteName();
+ name = casacore::Path(argv[st]).absoluteName();
}
FILE* wisdomFile = fopen (name.c_str(), "w");
if (!wisdomFile) {
diff --git a/CEP/Imager/LofarFT/test/tFFTCMatrix.cc b/CEP/Imager/LofarFT/test/tFFTCMatrix.cc
index 6124970ae0066922711ba60d9fa88321ae0d0ec1..aa15eadb901c0ce36cad89aa60e10837f4d52879 100644
--- a/CEP/Imager/LofarFT/test/tFFTCMatrix.cc
+++ b/CEP/Imager/LofarFT/test/tFFTCMatrix.cc
@@ -23,15 +23,15 @@
#include <LofarFT/FFTCMatrix.h>
#include <Common/OpenMP.h>
#include <Common/LofarLogger.h>
-#include <scimath/Mathematics/FFTServer.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
-#include <casa/OS/Timer.h>
+#include <casacore/scimath/Mathematics/FFTServer.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
+#include <casacore/casa/OS/Timer.h>
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
void init (Array<Complex>& arr)
{
diff --git a/CEP/Imager/LofarFT/test/tLofarVisResampler.cc b/CEP/Imager/LofarFT/test/tLofarVisResampler.cc
index 716c5f640b57b39bf989cf2b062c2dd540f20cc2..5baae8c02bfef61f5bd28795ad686bff2d01c9c2 100644
--- a/CEP/Imager/LofarFT/test/tLofarVisResampler.cc
+++ b/CEP/Imager/LofarFT/test/tLofarVisResampler.cc
@@ -24,17 +24,17 @@
#include <LofarFT/LofarVisResampler.h>
#include <LofarFT/LofarCFStore.h>
#include <Common/OpenMP.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
-#include <casa/Utilities/GenSort.h>
-#include <casa/Utilities/CountedPtr.h>
-#include <casa/BasicSL/Constants.h>
-#include <casa/OS/Timer.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Utilities/GenSort.h>
+#include <casacore/casa/Utilities/CountedPtr.h>
+#include <casacore/casa/BasicSL/Constants.h>
+#include <casacore/casa/OS/Timer.h>
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
void fillBaselines (int nrant, Vector<Int>& ant1, Vector<Int>& ant2,
Matrix<Double>& uvw)
diff --git a/CEP/Imager/LofarFT/test/tfftw.cc b/CEP/Imager/LofarFT/test/tfftw.cc
index 5d157cecb9470a77b470720cb9e5e592c010e8c0..4f49eadd39399df84a27af7dd46f8f27bb1c2dec 100644
--- a/CEP/Imager/LofarFT/test/tfftw.cc
+++ b/CEP/Imager/LofarFT/test/tfftw.cc
@@ -1,14 +1,14 @@
#include <fftw3.h>
-#include <scimath/Mathematics/FFTServer.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
-#include <casa/BasicSL/Complex.h>
-#include <casa/OS/Timer.h>
+#include <casacore/scimath/Mathematics/FFTServer.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
+#include <casacore/casa/BasicSL/Complex.h>
+#include <casacore/casa/OS/Timer.h>
-using namespace casa;
+using namespace casacore;
#include <vector>
class X
diff --git a/CEP/LMWCommon/include/LMWCommon/MWBlobIO.h b/CEP/LMWCommon/include/LMWCommon/MWBlobIO.h
index e69b5ecd880d5d8444229442364cd6cfcacb1c78..93f4de7ba7645164f18c51e8d486f8090cb955b5 100644
--- a/CEP/LMWCommon/include/LMWCommon/MWBlobIO.h
+++ b/CEP/LMWCommon/include/LMWCommon/MWBlobIO.h
@@ -32,7 +32,7 @@
#include <Blob/BlobIBufString.h>
#include <Blob/BlobOStream.h>
#include <Blob/BlobIStream.h>
-#include <casa/OS/Timer.h>
+#include <casacore/casa/OS/Timer.h>
#include <Common/Timer.h>
namespace LOFAR { namespace CEP {
@@ -128,7 +128,7 @@ namespace LOFAR { namespace CEP {
void setOperation (int operation);
// Set the times it took to do the operation.
- void setTimes (const casa::Timer&, const LOFAR::NSTimer&);
+ void setTimes (const casacore::Timer&, const LOFAR::NSTimer&);
// Get the blobstream to write the data in.
LOFAR::BlobOStream& blobStream()
diff --git a/CEP/LMWCommon/include/LMWCommon/VdsDesc.h b/CEP/LMWCommon/include/LMWCommon/VdsDesc.h
index cbf947fa17b1724aab82950d02a00d39e92e149d..77794ca4699c5e17f74578dd4a5e4b318c29627b 100644
--- a/CEP/LMWCommon/include/LMWCommon/VdsDesc.h
+++ b/CEP/LMWCommon/include/LMWCommon/VdsDesc.h
@@ -30,7 +30,7 @@
//# Includes
#include <LMWCommon/VdsPartDesc.h>
#include <LMWCommon/ParameterHandler.h>
-#include <casa/Utilities/Regex.h>
+#include <casacore/casa/Utilities/Regex.h>
namespace LOFAR { namespace CEP {
diff --git a/CEP/LMWCommon/src/ClusterDesc.cc b/CEP/LMWCommon/src/ClusterDesc.cc
index 934fc9d1b91fc7a7ecbff36e3dd28a6f43919421..10a6b24a9ca731f2d79b244b2eb66aeab78c7de2 100644
--- a/CEP/LMWCommon/src/ClusterDesc.cc
+++ b/CEP/LMWCommon/src/ClusterDesc.cc
@@ -27,10 +27,10 @@
#include <LMWCommon/ClusterDesc.h>
#include <LMWCommon/MWError.h>
#include <Common/LofarLogger.h>
-#include <casa/OS/Path.h>
+#include <casacore/casa/OS/Path.h>
using namespace std;
-using namespace casa;
+using namespace casacore;
namespace LOFAR { namespace CEP {
diff --git a/CEP/LMWCommon/src/MWBlobIO.cc b/CEP/LMWCommon/src/MWBlobIO.cc
index 1bca4dde6e2aaf56ccff0f1d1e071497db1006bd..fcf5c2532e0082df57d1f7dc74812b071bdab061 100644
--- a/CEP/LMWCommon/src/MWBlobIO.cc
+++ b/CEP/LMWCommon/src/MWBlobIO.cc
@@ -57,7 +57,7 @@ namespace LOFAR { namespace CEP {
memcpy (ptr, &oper, sizeof(LOFAR::int32));
}
- void MWBlobOut::setTimes (const casa::Timer& low, const LOFAR::NSTimer& high)
+ void MWBlobOut::setTimes (const casacore::Timer& low, const LOFAR::NSTimer& high)
{
using LOFAR::uchar;
float t[3];
diff --git a/CEP/LMWCommon/src/VdsPartDesc.cc b/CEP/LMWCommon/src/VdsPartDesc.cc
index 27bdd91818a695dab1b941bc714c9145040d8f73..6770b4c167a9ac160fb6705f5529bdcb89752364 100644
--- a/CEP/LMWCommon/src/VdsPartDesc.cc
+++ b/CEP/LMWCommon/src/VdsPartDesc.cc
@@ -29,14 +29,14 @@
#include <Blob/BlobArray.h>
#include <Common/StreamUtil.h>
#include <Common/LofarLogger.h>
-#include <casa/Quanta/MVTime.h>
+#include <casacore/casa/Quanta/MVTime.h>
#include <ostream>
namespace std {
using LOFAR::operator<<;
}
using namespace std;
-using namespace casa;
+using namespace casacore;
namespace LOFAR { namespace CEP {
diff --git a/CEP/LMWCommon/src/WorkerProxy.cc b/CEP/LMWCommon/src/WorkerProxy.cc
index 5102767dcb4648b9bcfabfe840e10644b9c96d0b..9a21e34a78dc595a1e9ff31d94b69a0af0252e02 100644
--- a/CEP/LMWCommon/src/WorkerProxy.cc
+++ b/CEP/LMWCommon/src/WorkerProxy.cc
@@ -75,7 +75,7 @@ namespace LOFAR { namespace CEP {
// The process function can reset the operation.
// Do timings of the process functions and put them into the blob.
MWBlobOut bout(out, operation, bin.getStreamId(), itsWorkerId);
- casa::Timer timer;
+ casacore::Timer timer;
LOFAR::NSTimer precTimer;
precTimer.start();
int oper = operation;
diff --git a/CEP/LMWCommon/test/tVdsDesc.cc b/CEP/LMWCommon/test/tVdsDesc.cc
index cd9ae10b646465fcf313fb2bdf32c3b608fae14b..fa87c67c5001b73b2d7821ba74d43d0fdb4f8a8e 100644
--- a/CEP/LMWCommon/test/tVdsDesc.cc
+++ b/CEP/LMWCommon/test/tVdsDesc.cc
@@ -29,7 +29,7 @@
#include <fstream>
using namespace std;
-using namespace casa;
+using namespace casacore;
using namespace LOFAR;
using namespace LOFAR::CEP;
diff --git a/CEP/MS/include/MS/BaselineSelect.h b/CEP/MS/include/MS/BaselineSelect.h
index 540ab928f70f1cd81a05cad41cb1045d653770cb..ee7aff0f4bdd19932f7feaea1c1bcf4cdd1a5385 100644
--- a/CEP/MS/include/MS/BaselineSelect.h
+++ b/CEP/MS/include/MS/BaselineSelect.h
@@ -29,7 +29,7 @@
//# Includes
#include <Common/lofar_string.h>
-#include <ms/MSSel/MSSelectionErrorHandler.h>
+#include <casacore/ms/MSSel/MSSelectionErrorHandler.h>
#include <ostream>
@@ -59,7 +59,7 @@ public:
// Parse the MSSelection baseline string and create a Matrix telling
// which baselines are selected.
// Possible messages from the parser are written to the ostream.
- static casa::Matrix<bool> convert (const string& msName,
+ static casacore::Matrix<bool> convert (const string& msName,
const string& baselineSelection,
std::ostream&);
@@ -67,17 +67,17 @@ public:
// which baselines are selected.
// The input is a vector of station names and positions.
// Possible messages from the parser are written to the ostream.
- static casa::Matrix<bool> convert (const casa::Vector<casa::String>& names,
- const std::vector<casa::MPosition>& pos,
- const casa::Vector<casa::Int>& ant1,
- const casa::Vector<casa::Int>& ant2,
+ static casacore::Matrix<bool> convert (const casacore::Vector<casacore::String>& names,
+ const std::vector<casacore::MPosition>& pos,
+ const casacore::Vector<casacore::Int>& ant1,
+ const casacore::Vector<casacore::Int>& ant2,
const string& baselineSelection,
std::ostream&);
private:
- static casa::Matrix<bool> convert (casa::Table& anttab,
- casa::TableExprNode& a1,
- casa::TableExprNode& a2,
+ static casacore::Matrix<bool> convert (casacore::Table& anttab,
+ casacore::TableExprNode& a1,
+ casacore::TableExprNode& a2,
const string& baselineSelection,
std::ostream& os);
@@ -87,14 +87,14 @@ private:
// This class handles an error from the Casacore's MSAntennaParse.
// It adds the message to the message list of the parent BaselineSelect.
-class BaselineSelectErrorHandler : public casa::MSSelectionErrorHandler
+class BaselineSelectErrorHandler : public casacore::MSSelectionErrorHandler
{
public:
BaselineSelectErrorHandler (std::ostream& os)
: itsStream (os)
{}
virtual ~BaselineSelectErrorHandler();
- virtual void reportError (const char *token, const casa::String message);
+ virtual void reportError (const char *token, const casacore::String message);
private:
std::ostream& itsStream;
};
diff --git a/CEP/MS/include/MS/MSCreate.h b/CEP/MS/include/MS/MSCreate.h
index f35ce3dda2a2a84b4b7a93b323155aa0fa47b402..88e984912956720e05ff092745268634b4ae287d 100644
--- a/CEP/MS/include/MS/MSCreate.h
+++ b/CEP/MS/include/MS/MSCreate.h
@@ -29,7 +29,7 @@
//# Includes
#include <Common/LofarTypes.h>
-#include <casa/aips.h>
+#include <casacore/casa/aips.h>
#include <Common/lofar_vector.h>
//# Forward Declarations
@@ -74,7 +74,7 @@ public:
// created and column FLAG is mapped to it.
MSCreate (const std::string& msName,
double startTime, double timeStep, int nfreq, int ncorr,
- const casa::Matrix<double>& antPos,
+ const casacore::Matrix<double>& antPos,
const std::string& antennaTableName,
bool writeAutoCorr,
int tileSizeFreq, int tileSize,
@@ -90,10 +90,10 @@ public:
// Add the extra columns needed for lwimager for every column not existing.
// These are CORRECTED_DATA, MODEL_DATA, and IMAGING_WEIGHT.
- // Furthermore it sets the CHANNEL_SELECTION keyword for casa::VisSet.
+ // Furthermore it sets the CHANNEL_SELECTION keyword for casacore::VisSet.
void addImagerColumns()
{ addImagerColumns (*itsMS); }
- static void addImagerColumns (casa::MeasurementSet&);
+ static void addImagerColumns (casacore::MeasurementSet&);
// Add the definition of the next frequency band.
// 1, 2 or 4 polarizations can be given.
@@ -148,17 +148,17 @@ private:
// </group>
// Create the MS and fill its subtables as much as possible.
- void createMS (const casa::String& msName,
- const casa::String& antennaTableName,
- const casa::Block<casa::MPosition>& antPos,
+ void createMS (const casacore::String& msName,
+ const casacore::String& antennaTableName,
+ const casacore::Block<casacore::MPosition>& antPos,
int tileSizeFreq, int tileSize,
- const casa::String& flagColumn, int nflagBits,
+ const casacore::String& flagColumn, int nflagBits,
bool mapFlagBits);
// Set the band.
int addBand (int npolarizations, int nchannels,
- double refFreq, const casa::Vector<double>& chanFreqs,
- const casa::Vector<double>& chanWidths);
+ double refFreq, const casacore::Vector<double>& chanFreqs,
+ const casacore::Vector<double>& chanWidths);
// Add a polarization to the subtable.
// Return the row number where it is added.
@@ -166,8 +166,8 @@ private:
// Fill the various subtables (at the end).
// <group>
- void fillAntenna (const casa::Block<casa::MPosition>& antPos,
- const casa::String& antennaTableName);
+ void fillAntenna (const casacore::Block<casacore::MPosition>& antPos,
+ const casacore::String& antennaTableName);
void fillFeed();
void fillObservation();
void fillProcessor();
@@ -190,15 +190,15 @@ private:
int itsNrTimes; //# nr of exposures
double itsTimeStep; //# duration of each exposure (sec)
double itsStartTime; //# start time of observation (sec)
- casa::Block<casa::Int>* itsNrPol; //# nr of polarizations for each band
- casa::Block<casa::Int>* itsNrChan; //# nr of channels for each band
- casa::Block<casa::Int>* itsPolnr; //# rownr in POL subtable for each band
- casa::Block<casa::MBaseline>* itsAntBL; //# Baseline vector for each antenna
- casa::MPosition* itsArrayPos; //# Position of array center
- casa::MeasFrame* itsFrame; //# Frame to convert to apparent coordinates
- casa::Block<casa::MDirection>* itsPhaseDir; //# Phase directions of fields
- casa::MeasurementSet* itsMS;
- casa::MSMainColumns* itsMSCol;
+ casacore::Block<casacore::Int>* itsNrPol; //# nr of polarizations for each band
+ casacore::Block<casacore::Int>* itsNrChan; //# nr of channels for each band
+ casacore::Block<casacore::Int>* itsPolnr; //# rownr in POL subtable for each band
+ casacore::Block<casacore::MBaseline>* itsAntBL; //# Baseline vector for each antenna
+ casacore::MPosition* itsArrayPos; //# Position of array center
+ casacore::MeasFrame* itsFrame; //# Frame to convert to apparent coordinates
+ casacore::Block<casacore::MDirection>* itsPhaseDir; //# Phase directions of fields
+ casacore::MeasurementSet* itsMS;
+ casacore::MSMainColumns* itsMSCol;
};
// @}
diff --git a/CEP/MS/include/MS/VdsMaker.h b/CEP/MS/include/MS/VdsMaker.h
index 76d69f75c16646c7a16ef8f20435692599576aa7..c51bdac226f352d07c474db77af6d1ad2bdaba6a 100644
--- a/CEP/MS/include/MS/VdsMaker.h
+++ b/CEP/MS/include/MS/VdsMaker.h
@@ -31,8 +31,8 @@
#include <Common/lofar_vector.h>
#include <Common/lofar_string.h>
#include <LMWCommon/ClusterDesc.h>
-#include <ms/MeasurementSets/MeasurementSet.h>
-#include <casa/Arrays/Vector.h>
+#include <casacore/ms/MeasurementSets/MeasurementSet.h>
+#include <casacore/casa/Arrays/Vector.h>
namespace LOFAR {
@@ -75,25 +75,25 @@ namespace LOFAR {
private:
// Get the frequency info for each spectral window in the MS.
// The vectors get the start and end frequency of each channel.
- static void getFreqInfo (casa::MS& ms, vector<int>& nrchan,
- vector<casa::Vector<double> >& startFreq,
- vector<casa::Vector<double> >& endFreq);
+ static void getFreqInfo (casacore::MS& ms, vector<int>& nrchan,
+ vector<casacore::Vector<double> >& startFreq,
+ vector<casacore::Vector<double> >& endFreq);
// Get the directions of the fields.
- static void getFields (casa::MS& ms,
+ static void getFields (casacore::MS& ms,
vector<double>& ra, vector<double>& dec,
vector<string>& refType);
// Get the names of the antennae (stations).
- static void getAntNames (casa::MS& ms, vector<string>& antNames);
+ static void getAntNames (casacore::MS& ms, vector<string>& antNames);
// Get the names of the correlations (polarisations).
- static void getCorrInfo (casa::MS& ms, vector<string>& corrTypes);
+ static void getCorrInfo (casacore::MS& ms, vector<string>& corrTypes);
// Find out which file contains the DATA column.
// Determine if the DATA are stored in a TSM file of itself.
// Determine the cube and tile shape.
- static void getDataFileInfo (casa::MS& ms, string& name, bool& regular,
+ static void getDataFileInfo (casacore::MS& ms, string& name, bool& regular,
vector<int>& tileShape,
vector<int>& cubeShape);
diff --git a/CEP/MS/src/BaselineSelect.cc b/CEP/MS/src/BaselineSelect.cc
index 123085347349b3b7387646dddd6837dc8bed9207..e8088502c7598dfadf9e9b016e3290e51387edcd 100644
--- a/CEP/MS/src/BaselineSelect.cc
+++ b/CEP/MS/src/BaselineSelect.cc
@@ -24,30 +24,30 @@
#include <MS/BaselineSelect.h>
#include <Common/LofarLogger.h>
-#include <ms/MeasurementSets/MeasurementSet.h>
-#include <ms/MeasurementSets/MSAntenna.h>
-#include <ms/MeasurementSets/MSAntennaColumns.h>
+#include <casacore/ms/MeasurementSets/MeasurementSet.h>
+#include <casacore/ms/MeasurementSets/MSAntenna.h>
+#include <casacore/ms/MeasurementSets/MSAntennaColumns.h>
#if defined(casacore)
-#include <ms/MSSel/MSSelection.h>
-#include <ms/MSSel/MSAntennaParse.h>
-#include <ms/MSSel/MSAntennaGram.h>
+#include <casacore/ms/MSSel/MSSelection.h>
+#include <casacore/ms/MSSel/MSAntennaParse.h>
+#include <casacore/ms/MSSel/MSAntennaGram.h>
#else
-#include <ms/MeasurementSets/MSSelection.h>
-#include <ms/MeasurementSets/MSAntennaParse.h>
-#include <ms/MeasurementSets/MSAntennaGram.h>
+#include <casacore/ms/MSSel/MSSelection.h>
+#include <casacore/ms/MSSel/MSAntennaParse.h>
+#include <casacore/ms/MSSel/MSAntennaGram.h>
#endif
-#include <tables/Tables/Table.h>
-#include <tables/Tables/SetupNewTab.h>
-#include <tables/Tables/TableRecord.h>
-#include <tables/Tables/TableParse.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <tables/Tables/ScaColDesc.h>
-#include <measures/Measures/MPosition.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/Vector.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/SetupNewTab.h>
+#include <casacore/tables/Tables/TableRecord.h>
+#include <casacore/tables/TaQL/TableParse.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/tables/Tables/ScaColDesc.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/Vector.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
@@ -81,7 +81,7 @@ namespace LOFAR {
return convert (anttab, a1, a2, baselineSelection, os);
}
- casa::Matrix<bool> BaselineSelect::convert (const Vector<String>& names,
+ casacore::Matrix<bool> BaselineSelect::convert (const Vector<String>& names,
const vector<MPosition>& pos,
const Vector<Int>& ant1,
const Vector<Int>& ant2,
diff --git a/CEP/MS/src/MSCreate.cc b/CEP/MS/src/MSCreate.cc
index b0aca89eb9f578a725f076e6101b6456a0e51a54..102367f0c55ee61849f1d259d7b317b395ac6198 100644
--- a/CEP/MS/src/MSCreate.cc
+++ b/CEP/MS/src/MSCreate.cc
@@ -25,44 +25,44 @@
#include <MS/MSCreate.h>
#include <Common/LofarLogger.h>
-#include <ms/MeasurementSets.h>
-#include <tables/Tables/IncrementalStMan.h>
-#include <tables/Tables/StandardStMan.h>
-#include <tables/Tables/TiledColumnStMan.h>
-#include <tables/Tables/BitFlagsEngine.h>
-#include <tables/Tables/TiledStManAccessor.h>
-#include <tables/Tables/SetupNewTab.h>
-#include <tables/Tables/TableDesc.h>
-#include <tables/Tables/ArrColDesc.h>
-#include <tables/Tables/TableRecord.h>
-#include <tables/Tables/TableCopy.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/Arrays/Cube.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Containers/Block.h>
-#include <casa/Containers/Record.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MBaseline.h>
-#include <measures/Measures/Muvw.h>
-#include <measures/Measures/MeasTable.h>
-#include <measures/Measures/Stokes.h>
-#include <measures/Measures/MCBaseline.h>
-#include <measures/Measures/MeasConvert.h>
-#include <casa/Quanta/MVEpoch.h>
-#include <casa/Quanta/MVDirection.h>
-#include <casa/Quanta/MVPosition.h>
-#include <casa/Quanta/MVBaseline.h>
-#include <casa/OS/Time.h>
-#include <casa/OS/SymLink.h>
-#include <casa/BasicSL/Constants.h>
-#include <casa/Utilities/Assert.h>
-#include <casa/Exceptions/Error.h>
-#include <casa/Arrays/Slicer.h>
-#include <casa/Arrays/Slice.h>
+#include <casacore/ms/MeasurementSets.h>
+#include <casacore/tables/DataMan/IncrementalStMan.h>
+#include <casacore/tables/DataMan/StandardStMan.h>
+#include <casacore/tables/DataMan/TiledColumnStMan.h>
+#include <casacore/tables/DataMan/BitFlagsEngine.h>
+#include <casacore/tables/DataMan/TiledStManAccessor.h>
+#include <casacore/tables/Tables/SetupNewTab.h>
+#include <casacore/tables/Tables/TableDesc.h>
+#include <casacore/tables/Tables/ArrColDesc.h>
+#include <casacore/tables/Tables/TableRecord.h>
+#include <casacore/tables/Tables/TableCopy.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/Cube.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Containers/Block.h>
+#include <casacore/casa/Containers/Record.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MBaseline.h>
+#include <casacore/measures/Measures/Muvw.h>
+#include <casacore/measures/Measures/MeasTable.h>
+#include <casacore/measures/Measures/Stokes.h>
+#include <casacore/measures/Measures/MCBaseline.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/casa/Quanta/MVEpoch.h>
+#include <casacore/casa/Quanta/MVDirection.h>
+#include <casacore/casa/Quanta/MVPosition.h>
+#include <casacore/casa/Quanta/MVBaseline.h>
+#include <casacore/casa/OS/Time.h>
+#include <casacore/casa/OS/SymLink.h>
+#include <casacore/casa/BasicSL/Constants.h>
+#include <casacore/casa/Utilities/Assert.h>
+#include <casacore/casa/Exceptions/Error.h>
+#include <casacore/casa/Arrays/Slicer.h>
+#include <casacore/casa/Arrays/Slice.h>
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
MSCreate::MSCreate (const std::string& msName,
double startTime, double timeStep, int nfreq, int ncorr,
@@ -863,7 +863,7 @@ void MSCreate::addImagerColumns (MeasurementSet& ms)
}
TiledColumnStMan stMan("TiledModelData", dataTileShape);
ms.addColumn (td, stMan);
- // Set MODEL_DATA keyword for casa::VisSet.
+ // Set MODEL_DATA keyword for casacore::VisSet.
// Sort out the channel selection.
if (ms.spectralWindow().isNull()) {
ms.spectralWindow() =
diff --git a/CEP/MS/src/MSSplit.cc b/CEP/MS/src/MSSplit.cc
index 803b8808344a6fcab8566284109ecb51a0de2997..16dcd2f04d0c79d085576590acb5453dde1ff3cd 100644
--- a/CEP/MS/src/MSSplit.cc
+++ b/CEP/MS/src/MSSplit.cc
@@ -27,32 +27,32 @@
#include <Blob/BlobArray.h>
#include <Common/LofarLogger.h>
-#include <ms/MeasurementSets/MeasurementSet.h>
-#include <ms/MeasurementSets/MSAntenna.h>
-#include <ms/MeasurementSets/MSAntennaColumns.h>
-#include <ms/MeasurementSets/MSDataDescription.h>
-#include <ms/MeasurementSets/MSDataDescColumns.h>
-#include <ms/MeasurementSets/MSField.h>
-#include <ms/MeasurementSets/MSFieldColumns.h>
-#include <ms/MeasurementSets/MSSpectralWindow.h>
-#include <ms/MeasurementSets/MSSpWindowColumns.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MeasConvert.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <tables/Tables/ArrayColumn.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Utilities/GenSort.h>
-#include <casa/IO/RegularFileIO.h>
-#include <casa/Exceptions/Error.h>
+#include <casacore/ms/MeasurementSets/MeasurementSet.h>
+#include <casacore/ms/MeasurementSets/MSAntenna.h>
+#include <casacore/ms/MeasurementSets/MSAntennaColumns.h>
+#include <casacore/ms/MeasurementSets/MSDataDescription.h>
+#include <casacore/ms/MeasurementSets/MSDataDescColumns.h>
+#include <casacore/ms/MeasurementSets/MSField.h>
+#include <casacore/ms/MeasurementSets/MSFieldColumns.h>
+#include <casacore/ms/MeasurementSets/MSSpectralWindow.h>
+#include <casacore/ms/MeasurementSets/MSSpWindowColumns.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Utilities/GenSort.h>
+#include <casacore/casa/IO/RegularFileIO.h>
+#include <casacore/casa/Exceptions/Error.h>
#include <iostream>
#include <fstream>
#include <unistd.h>
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
using namespace std;
// Use a terminate handler that can produce a backtrace.
diff --git a/CEP/MS/src/VdsMaker.cc b/CEP/MS/src/VdsMaker.cc
index 06c72c4ac450b73dba5b824eb6cd4e3bb9a850e6..ad8088b261e48da90ee93d8d3359f6dc5c46fd17 100644
--- a/CEP/MS/src/VdsMaker.cc
+++ b/CEP/MS/src/VdsMaker.cc
@@ -27,37 +27,37 @@
#include <Common/StreamUtil.h>
#include <Common/LofarLogger.h>
-#include <ms/MeasurementSets/MeasurementSet.h>
-#include <ms/MeasurementSets/MSMainColumns.h>
-#include <ms/MeasurementSets/MSAntenna.h>
-#include <ms/MeasurementSets/MSAntennaColumns.h>
-#include <ms/MeasurementSets/MSField.h>
-#include <ms/MeasurementSets/MSFieldColumns.h>
-#include <ms/MeasurementSets/MSPolarization.h>
-#include <ms/MeasurementSets/MSPolColumns.h>
-#include <ms/MeasurementSets/MSDataDescription.h>
-#include <ms/MeasurementSets/MSDataDescColumns.h>
-#include <ms/MeasurementSets/MSSpectralWindow.h>
-#include <ms/MeasurementSets/MSSpWindowColumns.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MCDirection.h>
-#include <casa/Quanta/MVAngle.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Containers/Record.h>
-#include <casa/Utilities/LinearSearch.h>
-#include <casa/OS/Path.h>
-#include <casa/OS/File.h>
-#include <casa/OS/HostInfo.h>
-#include <casa/Exceptions/Error.h>
+#include <casacore/ms/MeasurementSets/MeasurementSet.h>
+#include <casacore/ms/MeasurementSets/MSMainColumns.h>
+#include <casacore/ms/MeasurementSets/MSAntenna.h>
+#include <casacore/ms/MeasurementSets/MSAntennaColumns.h>
+#include <casacore/ms/MeasurementSets/MSField.h>
+#include <casacore/ms/MeasurementSets/MSFieldColumns.h>
+#include <casacore/ms/MeasurementSets/MSPolarization.h>
+#include <casacore/ms/MeasurementSets/MSPolColumns.h>
+#include <casacore/ms/MeasurementSets/MSDataDescription.h>
+#include <casacore/ms/MeasurementSets/MSDataDescColumns.h>
+#include <casacore/ms/MeasurementSets/MSSpectralWindow.h>
+#include <casacore/ms/MeasurementSets/MSSpWindowColumns.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/casa/Quanta/MVAngle.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Containers/Record.h>
+#include <casacore/casa/Utilities/LinearSearch.h>
+#include <casacore/casa/OS/Path.h>
+#include <casacore/casa/OS/File.h>
+#include <casacore/casa/OS/HostInfo.h>
+#include <casacore/casa/Exceptions/Error.h>
#include <iostream>
#include <fstream>
#include <sstream>
using namespace LOFAR;
using namespace LOFAR::CEP;
-using namespace casa;
+using namespace casacore;
using namespace std;
void VdsMaker::getFreqInfo (MS& ms, vector<int>& nrchan,
@@ -337,7 +337,7 @@ void VdsMaker::combine (const string& gdsName,
for (uint j=0; j<vdsNames.size(); ++j) {
VdsPartDesc* vpd = new VdsPartDesc(ParameterSet(vdsNames[j]));
// Skip a VDS with an empty time (it has no data).
- casa::Path path(vdsNames[j]);
+ casacore::Path path(vdsNames[j]);
// File name gets the original MS name.
// Name gets the name of the VDS file.
vpd->setFileName (vpd->getName());
diff --git a/CEP/MS/src/makems.cc b/CEP/MS/src/makems.cc
index 2989ace240fe35eea19779a9839105edd49a99a8..54cd9e8479f95dd0829d66cf8185536a48f1bdd0 100644
--- a/CEP/MS/src/makems.cc
+++ b/CEP/MS/src/makems.cc
@@ -30,24 +30,24 @@
#include <Common/LofarLogger.h>
#include <Common/Exception.h>
-#include <casa/Quanta/MVTime.h>
-#include <casa/Quanta/MVAngle.h>
-#include <casa/Quanta/Quantum.h>
-#include <casa/Arrays/Array.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/OS/Path.h>
-#include <casa/OS/Timer.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <tables/Tables/ArrayColumn.h>
+#include <casacore/casa/Quanta/MVTime.h>
+#include <casacore/casa/Quanta/MVAngle.h>
+#include <casacore/casa/Quanta/Quantum.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/OS/Path.h>
+#include <casacore/casa/OS/Timer.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
#include <iostream>
#include <fstream>
#include <sstream>
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
using namespace std;
// Use a terminate handler that can produce a backtrace.
diff --git a/CEP/MS/src/msoverview.cc b/CEP/MS/src/msoverview.cc
index 8d2e3df428d3e08352743a599318025330e5f269..1f89b25ef66d2d023fd65e55427409253fa94755 100644
--- a/CEP/MS/src/msoverview.cc
+++ b/CEP/MS/src/msoverview.cc
@@ -20,19 +20,19 @@
//#
//# $Id$
-#include <ms/MeasurementSets/MeasurementSet.h>
+#include <casacore/ms/MeasurementSets/MeasurementSet.h>
#if defined(casacore)
-#include <ms/MSOper/MSSummary.h>
+#include <casacore/ms/MSOper/MSSummary.h>
#else
-#include <ms/MeasurementSets/MSSummary.h>
+#include <casacore/ms/MSOper/MSSummary.h>
#endif
-#include <tables/Tables/TableParse.h>
-#include <casa/Containers/Record.h>
-#include <casa/Inputs/Input.h>
+#include <casacore/tables/TaQL/TableParse.h>
+#include <casacore/casa/Containers/Record.h>
+#include <casacore/casa/Inputs/Input.h>
#include <iostream>
#include <sstream>
-using namespace casa;
+using namespace casacore;
using namespace std;
int main (int argc, char* argv[])
diff --git a/CEP/MS/src/msplay.cc b/CEP/MS/src/msplay.cc
index f742b4461719d2638c0d87a685587737646d44fe..45e525a43f6943abba2980b7307f66c09e472b46 100644
--- a/CEP/MS/src/msplay.cc
+++ b/CEP/MS/src/msplay.cc
@@ -23,21 +23,21 @@
//# Always #include <lofar_config.h> first!
#include <lofar_config.h>
-#include <ms/MeasurementSets.h>
-#include <tables/Tables/IncrementalStMan.h>
-#include <tables/Tables/StandardStMan.h>
-#include <tables/Tables/IncrStManAccessor.h>
-#include <tables/Tables/StandardStManAccessor.h>
-#include <tables/Tables/TiledColumnStMan.h>
-#include <tables/Tables/TiledStManAccessor.h>
-#include <tables/Tables/SetupNewTab.h>
-#include <tables/Tables/TableDesc.h>
-#include <casa/Arrays/Array.h>
-#include <casa/Exceptions/Error.h>
-#include <casa/OS/Timer.h>
+#include <casacore/ms/MeasurementSets.h>
+#include <casacore/tables/DataMan/IncrementalStMan.h>
+#include <casacore/tables/DataMan/StandardStMan.h>
+#include <casacore/tables/DataMan/IncrStManAccessor.h>
+#include <casacore/tables/DataMan/StandardStManAccessor.h>
+#include <casacore/tables/DataMan/TiledColumnStMan.h>
+#include <casacore/tables/DataMan/TiledStManAccessor.h>
+#include <casacore/tables/Tables/SetupNewTab.h>
+#include <casacore/tables/Tables/TableDesc.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/casa/Exceptions/Error.h>
+#include <casacore/casa/OS/Timer.h>
#include <vector>
-using namespace casa;
+using namespace casacore;
int nrcorr=4;
diff --git a/CEP/MS/src/msselect.cc b/CEP/MS/src/msselect.cc
index 03551b7af47be2c72b286c8b7a713eec72762498..4521f1b85c1bb7989b33490cb159150aed984d18 100644
--- a/CEP/MS/src/msselect.cc
+++ b/CEP/MS/src/msselect.cc
@@ -20,20 +20,20 @@
//#
//# $Id$
-#include <tables/Tables/TableRecord.h>
-#include <casa/Inputs/Input.h>
-#include <casa/OS/DirectoryIterator.h>
-#include <casa/OS/File.h>
-#include <casa/OS/SymLink.h>
-#include <casa/Arrays/ArrayMath.h>
+#include <casacore/tables/Tables/TableRecord.h>
+#include <casacore/casa/Inputs/Input.h>
+#include <casacore/casa/OS/DirectoryIterator.h>
+#include <casacore/casa/OS/File.h>
+#include <casacore/casa/OS/SymLink.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
#if defined(casacore)
-#include <ms/MSSel/MSSelection.h>
+#include <casacore/ms/MSSel/MSSelection.h>
#else
-#include <ms/MeasurementSets/MSSelection.h>
+#include <casacore/ms/MSSel/MSSelection.h>
#endif
#include <iostream>
-using namespace casa;
+using namespace casacore;
using namespace std;
void select (const String& msin, const String& out, const String& baseline,
diff --git a/CEP/MS/test/tBaselineSelect.cc b/CEP/MS/test/tBaselineSelect.cc
index 29e6089085bf40b18cdf668304571d19b138382e..6db4bc7ae1e97b5b4cf8bdb717d261f4719bacde 100644
--- a/CEP/MS/test/tBaselineSelect.cc
+++ b/CEP/MS/test/tBaselineSelect.cc
@@ -24,14 +24,14 @@
#include <MS/BaselineSelect.h>
#include <Common/LofarLogger.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MeasTable.h>
-#include <casa/Arrays/ArrayIO.h>
-#include <casa/BasicSL/STLIO.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MeasTable.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
+#include <casacore/casa/BasicSL/STLIO.h>
#include <iostream>
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
using namespace std;
void testTemp()
diff --git a/CEP/MS/test/tMSSplit.cc b/CEP/MS/test/tMSSplit.cc
index 8ac6dba227654484508b0b135a50a3b841eb4916..02304ac8b984a0d255c09b1c43a7e8e806f3add6 100644
--- a/CEP/MS/test/tMSSplit.cc
+++ b/CEP/MS/test/tMSSplit.cc
@@ -26,20 +26,20 @@
#include <Blob/BlobArray.h>
#include <Common/LofarLogger.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <tables/Tables/ArrayColumn.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/IO/RegularFileIO.h>
-#include <casa/Exceptions/Error.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/IO/RegularFileIO.h>
+#include <casacore/casa/Exceptions/Error.h>
#include <iostream>
#include <fstream>
#include <unistd.h>
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
using namespace std;
void doIt (const string& in, const string& out, const string& column)
diff --git a/CEP/MS/test/tVdsMaker.cc b/CEP/MS/test/tVdsMaker.cc
index d7af24b7b6c482dcb4e5a8957000e038de31e238..4820367eb7536f71d97c74968092f854577cf8d3 100644
--- a/CEP/MS/test/tVdsMaker.cc
+++ b/CEP/MS/test/tVdsMaker.cc
@@ -22,15 +22,15 @@
//# Includes
#include <MS/VdsMaker.h>
-#include <ms/MeasurementSets/MSColumns.h>
-#include <ms/MeasurementSets/MSFieldColumns.h>
-#include <tables/Tables/TableDesc.h>
-#include <tables/Tables/SetupNewTab.h>
-#include <casa/Quanta/MVTime.h>
+#include <casacore/ms/MeasurementSets/MSColumns.h>
+#include <casacore/ms/MeasurementSets/MSFieldColumns.h>
+#include <casacore/tables/Tables/TableDesc.h>
+#include <casacore/tables/Tables/SetupNewTab.h>
+#include <casacore/casa/Quanta/MVTime.h>
#include <iostream>
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
using namespace std;
int main()
diff --git a/CEP/ParmDB/include/ParmDB/Box.h b/CEP/ParmDB/include/ParmDB/Box.h
index 51b44a51e148efc3652695dddd463a4d580d9fb6..7116634c2008543a69036a78cda9293f2b91447c 100644
--- a/CEP/ParmDB/include/ParmDB/Box.h
+++ b/CEP/ParmDB/include/ParmDB/Box.h
@@ -31,7 +31,7 @@
#include <Common/lofar_vector.h>
#include <Common/lofar_algorithm.h>
#include <Common/LofarLogger.h>
-#include <casa/BasicMath/Math.h>
+#include <casacore/casa/BasicMath/Math.h>
namespace LOFAR {
namespace BBS {
@@ -114,13 +114,13 @@ namespace BBS {
bool intersects (const Box& other) const
{
return (other.itsStart.first < itsEnd.first
- && !casa::near(other.itsStart.first, itsEnd.first)
+ && !casacore::near(other.itsStart.first, itsEnd.first)
&& other.itsEnd.first > itsStart.first
- && !casa::near(other.itsEnd.first, itsStart.first)
+ && !casacore::near(other.itsEnd.first, itsStart.first)
&& other.itsStart.second < itsEnd.second
- && !casa::near(other.itsStart.second, itsEnd.second)
+ && !casacore::near(other.itsStart.second, itsEnd.second)
&& other.itsEnd.second > itsStart.second
- && !casa::near(other.itsEnd.second, itsStart.second));
+ && !casacore::near(other.itsEnd.second, itsStart.second));
}
// A box A contains a box B if all points within or on the border of B
@@ -128,20 +128,20 @@ namespace BBS {
bool contains (const Box& other) const
{
return ((other.itsStart.first >= itsStart.first
- || casa::near(other.itsStart.first, itsStart.first))
+ || casacore::near(other.itsStart.first, itsStart.first))
&& (other.itsEnd.first <= itsEnd.first
- || casa::near(other.itsEnd.first, itsEnd.first))
+ || casacore::near(other.itsEnd.first, itsEnd.first))
&& (other.itsStart.second >= itsStart.second
- || casa::near(other.itsStart.second, itsStart.second))
+ || casacore::near(other.itsStart.second, itsStart.second))
&& (other.itsEnd.second <= itsEnd.second
- || casa::near(other.itsEnd.second, itsEnd.second)));
+ || casacore::near(other.itsEnd.second, itsEnd.second)));
}
// Check if the box is empty.
bool empty() const
{
- return (casa::near(itsStart.first, itsEnd.first)
- || casa::near(itsStart.second, itsEnd.second));
+ return (casacore::near(itsStart.first, itsEnd.first)
+ || casacore::near(itsStart.second, itsEnd.second));
}
// Return the intersection of this and that box. An empty box is
diff --git a/CEP/ParmDB/include/ParmDB/Parm.h b/CEP/ParmDB/include/ParmDB/Parm.h
index 9eba7c77ba3f33152dd459c0acf7cead2fd18a1f..3d810c463232071e1edf4cf5dd0fe123304e981e 100644
--- a/CEP/ParmDB/include/ParmDB/Parm.h
+++ b/CEP/ParmDB/include/ParmDB/Parm.h
@@ -30,7 +30,7 @@
#include <ParmDB/Grid.h>
#include <ParmDB/ParmSet.h>
#include <Common/lofar_vector.h>
-#include <casa/Arrays/Array.h>
+#include <casacore/casa/Arrays/Array.h>
namespace LOFAR {
namespace BBS {
@@ -122,7 +122,7 @@ namespace BBS {
// The argument <src>emptyResult</src> tells if an empty result can be
// returned. Normally this is not the case (otherwise a default would
// not be picked up), but in case of ParmFacade it is used.
- void getResult (casa::Array<double>& result, const Grid& predictGrid,
+ void getResult (casacore::Array<double>& result, const Grid& predictGrid,
bool emptyResult=false);
// Get the values for the given predict grid.
@@ -132,31 +132,31 @@ namespace BBS {
// Otherwise only the first array in the vector is filled in.
// As above, the shape of the array is normally [nx,ny],
// but can be [1,1] if constant.
- void getResult (vector<casa::Array<double> >& result,
+ void getResult (vector<casacore::Array<double> >& result,
const Grid& predictGrid, bool perturb);
// Form the vector from values and mask.
- static vector<double> copyValues (const casa::Array<double>& values,
- const casa::Array<bool>& mask,
+ static vector<double> copyValues (const casacore::Array<double>& values,
+ const casacore::Array<bool>& mask,
bool useMask);
// Evaluate the result for funklet coefficients.
- static void getResultCoeff (casa::Array<double>* resultVec,
+ static void getResultCoeff (casacore::Array<double>* resultVec,
const Grid& predictGrid,
const ParmValueSet& pvset,
const vector<double>& perturbations,
AxisMappingCache& axisMappingCache);
// Get the result for a single ParmValue with an array of scalars.
- static void getResultScalar (casa::Array<double>& result,
+ static void getResultScalar (casacore::Array<double>& result,
const Grid& predictGrid,
const ParmValue& pval,
AxisMappingCache& axisMappingCache);
// Get the result for multiple ParmValues containing scalars.
// If the <src>errors</src> argument is non-zero, the errors are filled too.
- static void getResultScalar (casa::Array<double>& result,
- casa::Array<double>* errors,
+ static void getResultScalar (casacore::Array<double>& result,
+ casacore::Array<double>* errors,
const Grid& predictGrid,
const ParmValueSet& pvset,
AxisMappingCache& axisMappingCache);
diff --git a/CEP/ParmDB/include/ParmDB/ParmDBCasa.h b/CEP/ParmDB/include/ParmDB/ParmDBCasa.h
index 02bfca1b6af7694f376a79713e2795f6f29268f6..522da4b13db1faec162f814b96a581eaabe5baf4 100644
--- a/CEP/ParmDB/include/ParmDB/ParmDBCasa.h
+++ b/CEP/ParmDB/include/ParmDB/ParmDBCasa.h
@@ -29,9 +29,9 @@
//# Includes
#include <ParmDB/ParmDB.h>
-#include <casa/Arrays/Array.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/ArrayColumn.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
namespace LOFAR {
@@ -119,25 +119,25 @@ namespace BBS {
// If not empty, put the domain into the table.
// The DOMAIN column is added to the table if it does not exist.
- void putDefDomain (const Box& domain, casa::Table& tab, uint rownr);
+ void putDefDomain (const Box& domain, casacore::Table& tab, uint rownr);
// If defined in the table, set the scale domain in the ParmValue.
- Box getDefDomain (const casa::Table& tab, uint row);
+ Box getDefDomain (const casacore::Table& tab, uint row);
// Get a selection from the NAME table.
// <group>
- casa::Table getNameSel (const std::string& parmNamePattern) const;
- casa::Vector<uint> getNameIds (const std::string& parmNamePattern) const;
- casa::Vector<uint> getNameIds (const std::vector<std::string>& parmNames) const;
+ casacore::Table getNameSel (const std::string& parmNamePattern) const;
+ casacore::Vector<uint> getNameIds (const std::string& parmNamePattern) const;
+ casacore::Vector<uint> getNameIds (const std::vector<std::string>& parmNames) const;
// </group>
// Find the minmax range in the table.
- Box findRange (const casa::Table& table) const;
+ Box findRange (const casacore::Table& table) const;
// Extract the parm values from a table selection with a single parm name.
// <group>
- //void extractValues (ParmMap& result, const casa::Table& table);
- pair<string,ParmValueSet> extractDefValue (const casa::Table& sel, int row);
+ //void extractValues (ParmMap& result, const casacore::Table& table);
+ pair<string,ParmValueSet> extractDefValue (const casacore::Table& sel, int row);
// </group>
// Do the actual put of a value.
@@ -159,29 +159,29 @@ namespace BBS {
void putNewDefValue (const string& parmName, const ParmValueSet& value);
// Put the begin/end of an irregular axis.
- void putInterval (const Axis& axis, casa::ArrayColumn<double>& col,
+ void putInterval (const Axis& axis, casacore::ArrayColumn<double>& col,
uint rownr);
// Form an axis from the interval array in the given row.
// If no interval array, return a regular axis made from (st,end,n).
- Axis::ShPtr getInterval (casa::ROArrayColumn<double>& col, uint rownr,
+ Axis::ShPtr getInterval (casacore::ROArrayColumn<double>& col, uint rownr,
double st, double end, uint n);
// Find the table subset containing the parameter values for the
// requested domain.
- casa::Table find (const std::string& parmName,
+ casacore::Table find (const std::string& parmName,
const Box& domain);
// Create a select expression node on domain.
- casa::TableExprNode makeExpr (const casa::Table& table,
+ casacore::TableExprNode makeExpr (const casacore::Table& table,
const Box& domain) const;
// And two table select expressions, where the first one can be null.
- void andExpr (casa::TableExprNode& expr,
- const casa::TableExprNode& right) const;
+ void andExpr (casacore::TableExprNode& expr,
+ const casacore::TableExprNode& right) const;
//# Data members
- casa::Table itsTables[3]; //# normal,names,default
+ casacore::Table itsTables[3]; //# normal,names,default
};
// @}
diff --git a/CEP/ParmDB/include/ParmDB/ParmDBLog.h b/CEP/ParmDB/include/ParmDB/ParmDBLog.h
index f1c429209359073c344a62cf5b0356d06683dd28..566def8e36643c859c90181e23d13727968227b6 100644
--- a/CEP/ParmDB/include/ParmDB/ParmDBLog.h
+++ b/CEP/ParmDB/include/ParmDB/ParmDBLog.h
@@ -28,11 +28,11 @@
#define LOFAR_PARMDB_PARMDBLOG_H
//# Includes
-#include <casa/Containers/Map.h>
-#include <casa/Arrays/Array.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <tables/Tables/ArrayColumn.h>
+#include <casacore/casa/Containers/Map.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
#include <Common/lofar_map.h>
#include <ParmDB/ParmDBLogLevel.h>
@@ -89,7 +89,7 @@ namespace BBS {
uint rank, uint rankDeficiency,
double chiSquare, double lmFactor,
const vector<double>& solution, const string& message,
- const casa::Array<double>& correlationMatrix);
+ const casacore::Array<double>& correlationMatrix);
// Get or set the logging level of solver parameters
// <group>
@@ -122,20 +122,20 @@ namespace BBS {
//# Data members
ParmDBLoglevel::LoggingLevel itsLoggingLevel;
- casa::Table itsTable;
- casa::ScalarColumn<casa::Double> itsStartFreq;
- casa::ScalarColumn<casa::Double> itsEndFreq;
- casa::ScalarColumn<casa::Double> itsStartTime;
- casa::ScalarColumn<casa::Double> itsEndTime;
- casa::ScalarColumn<casa::uInt> itsIter;
- casa::ScalarColumn<casa::Bool> itsLastIter;
- casa::ScalarColumn<casa::uInt> itsRank;
- casa::ScalarColumn<casa::uInt> itsRankDef;
- casa::ScalarColumn<casa::Double> itsChiSqr;
- casa::ScalarColumn<casa::Double> itsLMFactor;
- casa::ScalarColumn<casa::String> itsMessage;
- casa::ArrayColumn<casa::Double> itsSolution;
- casa::ArrayColumn<casa::Double> itsCorrMat;
+ casacore::Table itsTable;
+ casacore::ScalarColumn<casacore::Double> itsStartFreq;
+ casacore::ScalarColumn<casacore::Double> itsEndFreq;
+ casacore::ScalarColumn<casacore::Double> itsStartTime;
+ casacore::ScalarColumn<casacore::Double> itsEndTime;
+ casacore::ScalarColumn<casacore::uInt> itsIter;
+ casacore::ScalarColumn<casacore::Bool> itsLastIter;
+ casacore::ScalarColumn<casacore::uInt> itsRank;
+ casacore::ScalarColumn<casacore::uInt> itsRankDef;
+ casacore::ScalarColumn<casacore::Double> itsChiSqr;
+ casacore::ScalarColumn<casacore::Double> itsLMFactor;
+ casacore::ScalarColumn<casacore::String> itsMessage;
+ casacore::ArrayColumn<casacore::Double> itsSolution;
+ casacore::ArrayColumn<casacore::Double> itsCorrMat;
};
// @}
diff --git a/CEP/ParmDB/include/ParmDB/ParmFacade.h b/CEP/ParmDB/include/ParmDB/ParmFacade.h
index a28d4521ec421b5506ce4f431fcf2f2f80a59de6..14095d45b89ae39f5dcdd60e73fcd9964e784bee 100644
--- a/CEP/ParmDB/include/ParmDB/ParmFacade.h
+++ b/CEP/ParmDB/include/ParmDB/ParmFacade.h
@@ -91,7 +91,7 @@ namespace LOFAR { namespace BBS {
// Get default values of parameters in the table matching the pattern.
// An empty name pattern is the same as * (all parm names).
- casa::Record getDefValues (const string& parmNamePattern = string()) const
+ casacore::Record getDefValues (const string& parmNamePattern = string()) const
{ return itsRep->getDefValues (parmNamePattern); }
// Get the values of the given parameters on the given regular grid
@@ -122,7 +122,7 @@ namespace LOFAR { namespace BBS {
// If freqStep and timeStep are not given (or given as <=0), the
// default freq and time step from the ParmDB will be used.
// <group>
- casa::Record getValues (const string& parmNamePattern,
+ casacore::Record getValues (const string& parmNamePattern,
double freqv1, double freqv2, double freqStep,
double timev1, double timev2, double timeStep,
bool asStartEnd=true,
@@ -130,7 +130,7 @@ namespace LOFAR { namespace BBS {
{ return itsRep->getValues (parmNamePattern, freqv1, freqv2, freqStep,
timev1, timev2, timeStep, asStartEnd,
includeDefaults); }
- casa::Record getValues (const string& parmNamePattern,
+ casacore::Record getValues (const string& parmNamePattern,
double freqv1=-1e30, double freqv2=1e30,
double timev1=-1e30, double timev2=1e30,
bool asStartEnd=true,
@@ -140,7 +140,7 @@ namespace LOFAR { namespace BBS {
// Get the values of the given parameters on the given grid where v1/v2
// represents center/width or start/end.
// The Record contains a map of parameter name to Array<double>.
- casa::Record getValues (const string& parmNamePattern,
+ casacore::Record getValues (const string& parmNamePattern,
const vector<double>& freqv1,
const vector<double>& freqv2,
const vector<double>& timev1,
@@ -155,7 +155,7 @@ namespace LOFAR { namespace BBS {
// Each subrecord has the fields values, freqs, freqwidths, times, and
// timewidths giving the values and domains.
// The domain values are the center and width of each cell.
- casa::Record getValuesGrid (const string& parmNamePattern,
+ casacore::Record getValuesGrid (const string& parmNamePattern,
double freqv1=-1e30, double freqv2=1e30,
double timev1=-1e30, double timev2=1e30,
bool asStartEnd=true)
@@ -170,7 +170,7 @@ namespace LOFAR { namespace BBS {
// coeff, error, and domain. Each of these fields contain an array of
// doubles containing the values. The error array is empty if no errors
// are stored.
- casa::Record getCoeff (const string& parmNamePattern,
+ casacore::Record getCoeff (const string& parmNamePattern,
double freqv1=-1e30, double freqv2=1e30,
double timev1=-1e30, double timev2=1e30,
bool asStartEnd=true)
@@ -185,7 +185,7 @@ namespace LOFAR { namespace BBS {
// The name of each field in the record is the parameter name.
// The values are subrecords containing the parameter values, etc.
// <br>By default it checks if the name does not exist.
- void addDefValues (const casa::Record& rec, bool check=true)
+ void addDefValues (const casacore::Record& rec, bool check=true)
{ return itsRep->addDefValues (rec, check); }
// Delete the default value records for the given parameters.
@@ -222,7 +222,7 @@ namespace LOFAR { namespace BBS {
// The name of each field in the record is the parameter name.
// The values are subrecords containing the domains, parameter values, etc.
// <br>It checks if no values exist for the parameters and domains yet.
- void addValues (const casa::Record& rec)
+ void addValues (const casacore::Record& rec)
{ itsRep->addValues (rec); }
// Delete the records for the given parameters and domain.
@@ -235,7 +235,7 @@ namespace LOFAR { namespace BBS {
private:
// Convert a record to a map.
- map<string,vector<double> > record2Map (const casa::Record& rec) const;
+ map<string,vector<double> > record2Map (const casacore::Record& rec) const;
//# Data members
diff --git a/CEP/ParmDB/include/ParmDB/ParmFacadeDistr.h b/CEP/ParmDB/include/ParmDB/ParmFacadeDistr.h
index 0b4e3597460d3a01663e2f0f8d4a302047122dc3..b5adbfc790c4ca2f1731ce11a14ea91b3f7b3583 100644
--- a/CEP/ParmDB/include/ParmDB/ParmFacadeDistr.h
+++ b/CEP/ParmDB/include/ParmDB/ParmFacadeDistr.h
@@ -34,7 +34,7 @@
#include <Common/lofar_set.h>
//# Forward Declaration.
-namespace casa {
+namespace casacore {
class Record;
class String;
}
@@ -126,10 +126,10 @@ namespace LOFAR { namespace BBS {
virtual vector<string> getDefNames (const string& parmNamePattern) const;
// Get the default values of parameters matching the pattern.
- virtual casa::Record getDefValues (const string& parmNamePattern) const;
+ virtual casacore::Record getDefValues (const string& parmNamePattern) const;
// Add one or more default values to all underlying ParmTables.
- virtual void addDefValues (const casa::Record&, bool check);
+ virtual void addDefValues (const casacore::Record&, bool check);
// Delete the default value records for the given parameters.
virtual void deleteDefValues (const string& parmNamePattern);
@@ -137,7 +137,7 @@ namespace LOFAR { namespace BBS {
// Get the values of the given parameters on the given regular grid
// where v1/v2 represents center/width or start/end.
// The Record contains a map of parameter name to Array<double>.
- virtual casa::Record getValues (const string& parmNamePattern,
+ virtual casacore::Record getValues (const string& parmNamePattern,
double freqv1, double freqv2,
double freqStep,
double timev1, double timev2,
@@ -148,7 +148,7 @@ namespace LOFAR { namespace BBS {
// Get the values of the given parameters on the given grid where v1/v2
// represents center/width or start/end.
// The Record contains a map of parameter name to Array<double>.
- virtual casa::Record getValues (const string& parmNamePattern,
+ virtual casacore::Record getValues (const string& parmNamePattern,
const vector<double>& freqv1,
const vector<double>& freqv2,
const vector<double>& timev1,
@@ -162,13 +162,13 @@ namespace LOFAR { namespace BBS {
// used for each parameters. Their names have the form <parmname>/xx
// where xx is freqs, freqwidths, times, and timewidths. Their values
// are the center and width of each cell.
- virtual casa::Record getValuesGrid (const string& parmNamePattern,
+ virtual casacore::Record getValuesGrid (const string& parmNamePattern,
double freqv1, double freqv2,
double timev1, double timev2,
bool asStartEnd);
// Get coefficients, errors, and domains they belong to.
- virtual casa::Record getCoeff (const string& parmNamePattern,
+ virtual casacore::Record getCoeff (const string& parmNamePattern,
double freqv1, double freqv2,
double timev1, double timev2,
bool asStartEnd);
@@ -204,7 +204,7 @@ namespace LOFAR { namespace BBS {
virtual vector<double> getDefaultSteps() const;
// Add the values for the given parameter names and domain.
- virtual void addValues (const casa::Record& rec);
+ virtual void addValues (const casacore::Record& rec);
private:
// Send all workers a quit message.
@@ -223,35 +223,35 @@ namespace LOFAR { namespace BBS {
void checkStatusAll() const;
// Read a Record from the BlobStream.
- void getRecord (BlobIStream& bis, casa::Record& rec);
+ void getRecord (BlobIStream& bis, casacore::Record& rec);
// Write a Record into the BlobStream.
- void putRecord (BlobOStream& bis, const casa::Record& rec);
+ void putRecord (BlobOStream& bis, const casacore::Record& rec);
// Check if the names of remote client inx are equal to the first one.
void checkNames (const vector<string>& firstNames,
const vector<string>& names, uint inx) const;
// Combine the result records from the remote sites.
- casa::Record combineRemote (const vector<casa::Record>& recs) const;
+ casacore::Record combineRemote (const vector<casacore::Record>& recs) const;
// Find all parm names in the records and add them to the set.
- void findParmNames (const vector<casa::Record>& recs,
- set<casa::String>& names) const;
+ void findParmNames (const vector<casacore::Record>& recs,
+ set<casacore::String>& names) const;
// Combine the info for the given parm from all records.
// The info can be the same in some records meaning that a fully or partial
// global solve is done and distributed to all parmdbs.
- void combineInfo (const casa::String& name,
- const vector<casa::Record>& recs,
- casa::Record& result) const;
+ void combineInfo (const casacore::String& name,
+ const vector<casacore::Record>& recs,
+ casacore::Record& result) const;
//# Data members
string itsPort; //# declare this before itsConn!!
mutable LOFAR::CEP::SocketConnectionSet itsConn;
vector<string> itsPartNames;
vector<string> itsParmNames;
- casa::Record itsDefValues;
+ casacore::Record itsDefValues;
static int theirNextPort;
static vector<string> theirFreePorts;
};
diff --git a/CEP/ParmDB/include/ParmDB/ParmFacadeLocal.h b/CEP/ParmDB/include/ParmDB/ParmFacadeLocal.h
index f5fd860c7634d268dfa5418aae1bade5e8d8822c..cbac93c3fc194eaf6f7382156fbe58b207b479ba 100644
--- a/CEP/ParmDB/include/ParmDB/ParmFacadeLocal.h
+++ b/CEP/ParmDB/include/ParmDB/ParmFacadeLocal.h
@@ -34,8 +34,8 @@
#include <Common/lofar_set.h>
#include <Common/lofar_string.h>
-#include <casa/Containers/Record.h>
-#include <casa/Arrays/Vector.h>
+#include <casacore/casa/Containers/Record.h>
+#include <casacore/casa/Arrays/Vector.h>
namespace LOFAR { namespace BBS {
@@ -87,10 +87,10 @@ namespace LOFAR { namespace BBS {
virtual vector<string> getDefNames (const string& parmNamePattern) const;
// Get the default values of parameters matching the pattern.
- virtual casa::Record getDefValues (const string& parmNamePattern) const;
+ virtual casacore::Record getDefValues (const string& parmNamePattern) const;
// Add one or more default values.
- virtual void addDefValues (const casa::Record&, bool check);
+ virtual void addDefValues (const casacore::Record&, bool check);
// Delete the default value records for the given parameters.
virtual void deleteDefValues (const string& parmNamePattern);
@@ -98,7 +98,7 @@ namespace LOFAR { namespace BBS {
// Get the values of the given parameters on the given regular grid
// where v1/v2 represents center/width or start/end.
// The Record contains a map of parameter name to Array<double>.
- virtual casa::Record getValues (const string& parmNamePattern,
+ virtual casacore::Record getValues (const string& parmNamePattern,
double freqv1, double freqv2,
double freqStep,
double timev1, double timev2,
@@ -109,7 +109,7 @@ namespace LOFAR { namespace BBS {
// Get the values of the given parameters on the given grid where v1/v2
// represents center/width or start/end.
// The Record contains a map of parameter name to Array<double>.
- virtual casa::Record getValues (const string& parmNamePattern,
+ virtual casacore::Record getValues (const string& parmNamePattern,
const vector<double>& freqv1,
const vector<double>& freqv2,
const vector<double>& timev1,
@@ -123,13 +123,13 @@ namespace LOFAR { namespace BBS {
// used for each parameters. Their names have the form <parmname>/xx
// where xx is freqs, freqwidths, times, and timewidths. Their values
// are the center and width of each cell.
- virtual casa::Record getValuesGrid (const string& parmNamePattern,
+ virtual casacore::Record getValuesGrid (const string& parmNamePattern,
double freqv1, double freqv2,
double timev1, double timev2,
bool asStartEnd);
// Get coefficients, errors, and domains they belong to.
- virtual casa::Record getCoeff (const string& parmNamePattern,
+ virtual casacore::Record getCoeff (const string& parmNamePattern,
double freqv1, double freqv2,
double timev1, double timev2,
bool asStartEnd);
@@ -155,7 +155,7 @@ namespace LOFAR { namespace BBS {
virtual void setDefaultSteps (const vector<double>&);
// Add the values for the given parameter names and domain.
- virtual void addValues (const casa::Record& rec);
+ virtual void addValues (const casacore::Record& rec);
// Delete the records for the given parameters and domain.
virtual void deleteValues (const string& parmNamePattern,
@@ -165,7 +165,7 @@ namespace LOFAR { namespace BBS {
private:
// Get the values for the given predict grid
- casa::Record doGetValues (const string& parmNamePattern,
+ casacore::Record doGetValues (const string& parmNamePattern,
const Grid& predictGrid,
bool includeDefaults);
@@ -174,21 +174,21 @@ namespace LOFAR { namespace BBS {
Grid getGrid (const ParmValueSet& valueSet, const Box& domain);
// Collect funklet coeff and errors in the record.
- casa::Record getFunkletCoeff (const ParmValueSet& pvset);
+ casacore::Record getFunkletCoeff (const ParmValueSet& pvset);
// Add the default value for a single parm.
- void addDefValue (const string& parmName, const casa::Record& value,
+ void addDefValue (const string& parmName, const casacore::Record& value,
bool check);
// Add the value for a single parm.
- void addValue (const string& parmName, const casa::Record& value);
+ void addValue (const string& parmName, const casacore::Record& value);
// Construct the Grid object from the record.
- Grid record2Grid (const casa::Record& rec) const;
+ Grid record2Grid (const casacore::Record& rec) const;
// Make a RegularAxis or OrderedAxis.
- Axis::ShPtr makeAxis (const casa::Vector<double>& centers,
- const casa::Vector<double>& widths, uint n) const;
+ Axis::ShPtr makeAxis (const casacore::Vector<double>& centers,
+ const casacore::Vector<double>& widths, uint n) const;
// Convert the string to a funklet type.
int getType (const string& str) const;
diff --git a/CEP/ParmDB/include/ParmDB/ParmFacadeRep.h b/CEP/ParmDB/include/ParmDB/ParmFacadeRep.h
index ce04fe39d9b48227839542b9adbb32cf95344fd3..fdcdf4a70a989260ecc5d9205fd8a15e57cd54f6 100644
--- a/CEP/ParmDB/include/ParmDB/ParmFacadeRep.h
+++ b/CEP/ParmDB/include/ParmDB/ParmFacadeRep.h
@@ -28,7 +28,7 @@
//# Includes
#include <ParmDB/ParmDB.h>
-#include <casa/Containers/Record.h>
+#include <casacore/casa/Containers/Record.h>
#include <Common/lofar_vector.h>
#include <Common/lofar_map.h>
#include <Common/lofar_string.h>
@@ -84,13 +84,13 @@ namespace LOFAR { namespace BBS {
virtual vector<string> getDefNames (const string& parmNamePattern) const = 0;
// Get the default values of parameters matching the pattern.
- virtual casa::Record getDefValues (const string& parmNamePattern) const = 0;
+ virtual casacore::Record getDefValues (const string& parmNamePattern) const = 0;
// Add one or more default values.
// The name of each field in the record is the parameter name.
// The values are subrecords containing the parameter values, etc.
// <br>By default it checks if the name does not exist.
- virtual void addDefValues (const casa::Record&, bool check=true) = 0;
+ virtual void addDefValues (const casacore::Record&, bool check=true) = 0;
// Delete the default value records for the given parameters.
virtual void deleteDefValues (const string& parmNamePattern) = 0;
@@ -98,7 +98,7 @@ namespace LOFAR { namespace BBS {
// Get the values of the given parameters on the given regular grid
// where v1/v2 represents center/width or start/end.
// The Record contains a map of parameter name to Array<double>.
- virtual casa::Record getValues (const string& parmNamePattern,
+ virtual casacore::Record getValues (const string& parmNamePattern,
double freqv1, double freqv2,
double freqStep,
double timev1, double timev2,
@@ -109,7 +109,7 @@ namespace LOFAR { namespace BBS {
// Get the values of the given parameters on the given grid where v1/v2
// represents center/width or start/end.
// The Record contains a map of parameter name to Array<double>.
- virtual casa::Record getValues (const string& parmNamePattern,
+ virtual casacore::Record getValues (const string& parmNamePattern,
const vector<double>& freqv1,
const vector<double>& freqv2,
const vector<double>& timev1,
@@ -123,13 +123,13 @@ namespace LOFAR { namespace BBS {
// used for each parameters. Their names have the form <parmname>/xx
// where xx is freqs, freqwidths, times, and timewidths. Their values
// are the center and width of each cell.
- virtual casa::Record getValuesGrid (const string& parmNamePattern,
+ virtual casacore::Record getValuesGrid (const string& parmNamePattern,
double freqv1, double freqv2,
double timev1, double timev2,
bool asStartEnd) = 0;
// Get coefficients, errors, and domains they belong to.
- virtual casa::Record getCoeff (const string& parmNamePattern,
+ virtual casacore::Record getCoeff (const string& parmNamePattern,
double freqv1, double freqv2,
double timev1, double timev2,
bool asStartEnd) = 0;
@@ -167,7 +167,7 @@ namespace LOFAR { namespace BBS {
// The name of each field in the record is the parameter name.
// The values are subrecords containing the domains, parameter values, etc.
// <br>It checks if no values exist for the parameters and domains yet.
- virtual void addValues (const casa::Record&) = 0;
+ virtual void addValues (const casacore::Record&) = 0;
};
// @}
diff --git a/CEP/ParmDB/include/ParmDB/ParmSet.h b/CEP/ParmDB/include/ParmDB/ParmSet.h
index c35f9e02377b7bf1130a8f65ef7f262c14d2f43c..31df3c73bd1c359e006346819be51d06524aa8b3 100644
--- a/CEP/ParmDB/include/ParmDB/ParmSet.h
+++ b/CEP/ParmDB/include/ParmDB/ParmSet.h
@@ -31,7 +31,7 @@
#include <Common/lofar_string.h>
#include <Common/lofar_vector.h>
#include <Common/lofar_map.h>
-#include <casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/Matrix.h>
namespace LOFAR {
namespace BBS {
diff --git a/CEP/ParmDB/include/ParmDB/ParmValue.h b/CEP/ParmDB/include/ParmDB/ParmValue.h
index d00a7a595ac114298d31f0b1f7d994ff3fb154ef..46b84004fe355e1ac7b1df2858b302ba4025e83b 100644
--- a/CEP/ParmDB/include/ParmDB/ParmValue.h
+++ b/CEP/ParmDB/include/ParmDB/ParmValue.h
@@ -30,7 +30,7 @@
#include <ParmDB/Grid.h>
#include <ParmDB/Axis.h>
#include <Common/lofar_smartptr.h>
-#include <casa/Arrays/Array.h>
+#include <casacore/casa/Arrays/Array.h>
#include <string>
#include <vector>
@@ -81,16 +81,16 @@ namespace BBS {
void setScalar (double value);
// Set as an array of coefficients.
- void setCoeff (const casa::Array<double>&);
+ void setCoeff (const casacore::Array<double>&);
// Set as an array of scalar values with the grid.
// The shape of grid and values must match.
- void setScalars (const Grid&, const casa::Array<double>&);
+ void setScalars (const Grid&, const casacore::Array<double>&);
// Set the errors.
// They must have the same shape as the values, so the values must have
// been set before.
- void setErrors (const casa::Array<double>&);
+ void setErrors (const casacore::Array<double>&);
// Get the value shape.
// <group>
@@ -102,9 +102,9 @@ namespace BBS {
// Get the values.
// <group>
- const casa::Array<double>& getValues() const
+ const casacore::Array<double>& getValues() const
{ return itsValues; }
- casa::Array<double>& getValues()
+ casacore::Array<double>& getValues()
{ return itsValues; }
// </group>
@@ -118,9 +118,9 @@ namespace BBS {
// Get the arrays with errors. Undefined if <src>getErrors()==false</src>.
// <group>
- const casa::Array<double>& getErrors() const
+ const casacore::Array<double>& getErrors() const
{ return *itsErrors; }
- casa::Array<double>& getErrors()
+ casacore::Array<double>& getErrors()
{ return *itsErrors; }
// </group>
@@ -136,7 +136,7 @@ namespace BBS {
// Return the scaled coefficients of a 2D polynomial using the
// given offset and scale factor.
- static casa::Matrix<double> scale2 (const casa::Matrix<double>& coeff,
+ static casacore::Matrix<double> scale2 (const casacore::Matrix<double>& coeff,
double offx, double offy,
double scalex, double scaley);
@@ -152,12 +152,12 @@ namespace BBS {
// Fill Pascal's triangle till the given order.
// The matrix will be resized as needed.
- static void fillPascal (casa::Matrix<double>& pascal, int order);
+ static void fillPascal (casacore::Matrix<double>& pascal, int order);
/// Data members.
Grid itsGrid; //# grid of the values
- casa::Array<double> itsValues; //# scalar values or funklet coeff
- casa::Array<double>* itsErrors;
+ casacore::Array<double> itsValues; //# scalar values or funklet coeff
+ casacore::Array<double>* itsErrors;
int itsRowId; //# rowid in ParmDB
};
@@ -210,9 +210,9 @@ namespace BBS {
// Get/set the mask telling which coefficients are solvable.
// The array can be empty meaning that all coefficients are solvable.
// <group>
- const casa::Array<bool>& getSolvableMask() const
+ const casacore::Array<bool>& getSolvableMask() const
{ return itsSolvableMask; }
- void setSolvableMask (const casa::Array<bool>& mask)
+ void setSolvableMask (const casacore::Array<bool>& mask)
{ itsSolvableMask.assign (mask); }
// <group>
@@ -285,7 +285,7 @@ namespace BBS {
ParmValue::FunkletType itsType;
double itsPerturbation;
bool itsPertRel;
- casa::Array<bool> itsSolvableMask;
+ casacore::Array<bool> itsSolvableMask;
Grid itsDomainGrid;
std::vector<ParmValue::ShPtr> itsValues;
ParmValue itsDefaultValue;
diff --git a/CEP/ParmDB/include/ParmDB/SourceDBCasa.h b/CEP/ParmDB/include/ParmDB/SourceDBCasa.h
index e699c247ebacec000297867e788d1965b782da66..1e2a4c79f95c6133d9497b032696e1b47ec6b28f 100644
--- a/CEP/ParmDB/include/ParmDB/SourceDBCasa.h
+++ b/CEP/ParmDB/include/ParmDB/SourceDBCasa.h
@@ -32,7 +32,7 @@
#include <ParmDB/PatchInfo.h>
#include <Common/lofar_vector.h>
#include <Common/lofar_set.h>
-#include <tables/Tables/Table.h>
+#include <casacore/tables/Tables/Table.h>
namespace LOFAR {
@@ -171,7 +171,7 @@ namespace BBS {
double ra, double dec, uint rownr);
// Find the duplicate patches or sources.
- vector<string> findDuplicates (casa::Table& table,
+ vector<string> findDuplicates (casacore::Table& table,
const string& columnName);
// Fill the patch and source set object from the tables.
@@ -179,10 +179,10 @@ namespace BBS {
void fillSets();
// Read all sources from the table and return them as a vector.
- std::vector<SourceInfo> readSources (const casa::Table& table);
+ std::vector<SourceInfo> readSources (const casacore::Table& table);
// Create the patches subset matching the given arguments.
- casa::Table selectPatches (int category,
+ casacore::Table selectPatches (int category,
const string& pattern,
double minBrightness,
double maxBrightness) const;
@@ -191,12 +191,12 @@ namespace BBS {
double getDefaultParmValue(const string& name);
//# Data members
- casa::Table itsPatchTable;
- casa::Table itsSourceTable;
+ casacore::Table itsPatchTable;
+ casacore::Table itsSourceTable;
set<std::string> itsPatchSet;
set<std::string> itsSourceSet;
bool itsSetsFilled;
- casa::Vector<casa::uInt> itsRowNr;
+ casacore::Vector<casacore::uInt> itsRowNr;
};
// @}
diff --git a/CEP/ParmDB/include/ParmDB/SourceInfo.h b/CEP/ParmDB/include/ParmDB/SourceInfo.h
index 14e0c90aac0925fb032d2e21d1381b94b175a69d..888ead5ab2c35e3939188681bd375dc3225f7c85 100644
--- a/CEP/ParmDB/include/ParmDB/SourceInfo.h
+++ b/CEP/ParmDB/include/ParmDB/SourceInfo.h
@@ -30,8 +30,8 @@
//# Includes
#include <Common/lofar_string.h>
#include <Common/LofarTypes.h>
-#include <casa/Arrays/Array.h>
-#include <measures/Measures/MDirection.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/measures/Measures/MDirection.h>
namespace LOFAR {
@@ -111,13 +111,13 @@ namespace BBS {
// Set or get the shapelet info.
// <group>
- const casa::Array<double>& getShapeletCoeffI() const
+ const casacore::Array<double>& getShapeletCoeffI() const
{ return itsShapeletCoeffI; }
- const casa::Array<double>& getShapeletCoeffQ() const
+ const casacore::Array<double>& getShapeletCoeffQ() const
{ return itsShapeletCoeffQ; }
- const casa::Array<double>& getShapeletCoeffU() const
+ const casacore::Array<double>& getShapeletCoeffU() const
{ return itsShapeletCoeffU; }
- const casa::Array<double>& getShapeletCoeffV() const
+ const casacore::Array<double>& getShapeletCoeffV() const
{ return itsShapeletCoeffV; }
double getShapeletScaleI() const
{ return itsShapeletScaleI; }
@@ -127,10 +127,10 @@ namespace BBS {
{ return itsShapeletScaleU; }
double getShapeletScaleV() const
{ return itsShapeletScaleV; }
- void setShapeletCoeff (const casa::Array<double>& I,
- const casa::Array<double>& Q,
- const casa::Array<double>& U,
- const casa::Array<double>& V);
+ void setShapeletCoeff (const casacore::Array<double>& I,
+ const casacore::Array<double>& Q,
+ const casacore::Array<double>& U,
+ const casacore::Array<double>& V);
void setShapeletScale (double scaleI, double scaleQ,
double scaleU, double scaleV);
// </group>
@@ -154,10 +154,10 @@ namespace BBS {
double itsShapeletScaleQ;
double itsShapeletScaleU;
double itsShapeletScaleV;
- casa::Array<double> itsShapeletCoeffI; // shapelet coefficients I-flux
- casa::Array<double> itsShapeletCoeffQ;
- casa::Array<double> itsShapeletCoeffU;
- casa::Array<double> itsShapeletCoeffV;
+ casacore::Array<double> itsShapeletCoeffI; // shapelet coefficients I-flux
+ casacore::Array<double> itsShapeletCoeffQ;
+ casacore::Array<double> itsShapeletCoeffU;
+ casacore::Array<double> itsShapeletCoeffV;
};
// @}
diff --git a/CEP/ParmDB/src/Axis.cc b/CEP/ParmDB/src/Axis.cc
index 45866d70006a14ecd1b11d9c065eb74ca6285243..832f839e2878533388e6ce24f33c246e2d5c34ea 100644
--- a/CEP/ParmDB/src/Axis.cc
+++ b/CEP/ParmDB/src/Axis.cc
@@ -27,7 +27,7 @@
#include <Blob/BlobSTL.h>
#include <Common/LofarLogger.h>
#include <Common/StreamUtil.h>
-#include <casa/BasicMath/Math.h>
+#include <casacore/casa/BasicMath/Math.h>
namespace LOFAR {
namespace BBS {
@@ -114,7 +114,7 @@ namespace BBS {
ASSERT (itsWidth[i] > 0);
if (i > 0) {
ASSERT(itsUpper[i-1] <= itsLower[i] ||
- casa::near(itsUpper[i-1],itsLower[i]));
+ casacore::near(itsUpper[i-1],itsLower[i]));
}
}
}
@@ -139,10 +139,10 @@ namespace BBS {
for (uint i=0; i<nr; ++i) {
double low1 = ax1->lower(i);
double low2 = ax2->lower(i);
- if (!casa::near(low1, low2)) return false;
+ if (!casacore::near(low1, low2)) return false;
double upp1 = ax1->upper(i);
double upp2 = ax2->upper(i);
- if (!casa::near(upp1, upp2)) return false;
+ if (!casacore::near(upp1, upp2)) return false;
}
return true;
}
@@ -161,7 +161,7 @@ namespace BBS {
if (start >= nr) {
// At the end, so restart at the beginning.
start = 0;
- } else if (casa::near(x, itsLower[start])) {
+ } else if (casacore::near(x, itsLower[start])) {
// At the left edge, so use it if a bias to the right.
if (biasRight) {
return pair<size_t,bool> (start, true);
@@ -183,14 +183,14 @@ namespace BBS {
}
double s = itsLower[start];
double e = itsUpper[start];
- if (casa::near(x,s)) {
+ if (casacore::near(x,s)) {
// On the left edge; take it if biased to the right.
// Otherwise the value is before the interval (thus nothing found).
if (!biasRight) {
fnd = false;
}
break;
- } else if (casa::near(x,e)) {
+ } else if (casacore::near(x,e)) {
// On the right edge; take it if biased to the left.
// Otherwise continue searching.
if (!biasRight) {
@@ -221,7 +221,7 @@ namespace BBS {
pair<double,double> range1 = range();
pair<double,double> range2 = that.range();
if (range1.second <= range2.first ||
- casa::near(range1.second, range2.first)) {
+ casacore::near(range1.second, range2.first)) {
// this is fully left of that.
Axis::ShPtr newAxis (add (that));
s1 = 0;
@@ -231,7 +231,7 @@ namespace BBS {
return newAxis;
}
if (range2.second <= range1.first ||
- casa::near(range2.second, range1.first)) {
+ casacore::near(range2.second, range1.first)) {
// that is fully left of this.
Axis::ShPtr newAxis (that.add (*this));
e1 = newAxis->size();
@@ -269,8 +269,8 @@ namespace BBS {
double upp1 = upper(s2+i);
double low2 = that.lower(s1+i);
double upp2 = that.upper(s1+i);
- ASSERTSTR ((low1==low2 || casa::near(low1,low2)) &&
- (upp1==upp2 || casa::near(upp1,upp2)),
+ ASSERTSTR ((low1==low2 || casacore::near(low1,low2)) &&
+ (upp1==upp2 || casacore::near(upp1,upp2)),
"Axis::combine: interval [" << low1 << ',' << upp1
<< "] mismatches [" << low2 << ',' << upp2 << ']');
}
@@ -338,7 +338,7 @@ namespace BBS {
}
// See if there is a hole between the axes.
// If so, create an extra interval for the hole.
- if (! casa::near (range1.second, range2.first)) {
+ if (! casacore::near (range1.second, range2.first)) {
// Check this is before that.
ASSERT (range1.second < range2.first);
low.push_back (upp[nr1-1]);
@@ -359,7 +359,7 @@ namespace BBS {
// Check if the width is constant, thus if the result is a regular axis.
double width = upp[0] - low[0];
for (uint i=1; i<low.size(); ++i) {
- if (!casa::near (width, upp[i]-low[i])) {
+ if (!casacore::near (width, upp[i]-low[i])) {
return Axis::ShPtr (new OrderedAxis (low, upp, true));
}
}
@@ -436,11 +436,11 @@ namespace BBS {
// // on the biasRight argument.
// if (biasRight) {
// if (inx < last) {
-// if (casa::near (double(inx+1), inxd)) ++inx;
+// if (casacore::near (double(inx+1), inxd)) ++inx;
// }
// } else {
// if (inx > 0) {
-// if (casa::near(double(inx), inxd)) --inx;
+// if (casacore::near(double(inx), inxd)) --inx;
// }
// }
// return inx;
diff --git a/CEP/ParmDB/src/Box.cc b/CEP/ParmDB/src/Box.cc
index a881f1330c2658cc76e265c1db364bc62bd2638f..4c3c8b78f9581ed5d83b879ccc7add3403eaacd6 100644
--- a/CEP/ParmDB/src/Box.cc
+++ b/CEP/ParmDB/src/Box.cc
@@ -56,9 +56,9 @@ namespace BBS {
Point end(min(lhs.upperX(), rhs.upperX()),
min(lhs.upperY(), rhs.upperY()));
if(start.first < end.first
- && !casa::near(start.first, end.first)
+ && !casacore::near(start.first, end.first)
&& start.second < end.second
- && !casa::near(start.second, end.second))
+ && !casacore::near(start.second, end.second))
{
return Box(start, end);
}
diff --git a/CEP/ParmDB/src/Grid.cc b/CEP/ParmDB/src/Grid.cc
index 23eee43fb6c7d06f93cff633abc9231424792dcd..f863e909ecf6cc1cffc31eae1d950832705bbc91 100644
--- a/CEP/ParmDB/src/Grid.cc
+++ b/CEP/ParmDB/src/Grid.cc
@@ -97,8 +97,8 @@ namespace BBS {
if (sy != domains[nx].lowerY()) {
break;
}
- if (! (casa::near(ex, domains[nx].lowerX())
- && casa::near(dx, domains[nx].upperX() - domains[nx].lowerX()))) {
+ if (! (casacore::near(ex, domains[nx].lowerX())
+ && casacore::near(dx, domains[nx].upperX() - domains[nx].lowerX()))) {
xregular = false;
}
ex = domains[nx].upperX();
@@ -119,8 +119,8 @@ namespace BBS {
for (uint j=1; j<ny; ++j) {
for (uint i=0; i<nx; ++i) {
uint inx = j*nx + i;
- ASSERT (casa::near(xaxisStart[i], domains[inx].lowerX()));
- ASSERT (casa::near(xaxisEnd[i], domains[inx].upperX()));
+ ASSERT (casacore::near(xaxisStart[i], domains[inx].lowerX()));
+ ASSERT (casacore::near(xaxisEnd[i], domains[inx].upperX()));
}
}
// Determine the start/end for Y and if it is regular.
@@ -135,8 +135,8 @@ namespace BBS {
uint inx = i*nx;
yaxisStart.push_back (domains[inx].lowerY());
yaxisEnd.push_back (domains[inx].upperY());
- if (! (casa::near(ey, domains[inx].lowerY())
- && casa::near(dy, domains[inx].upperY() - domains[inx].lowerY()))) {
+ if (! (casacore::near(ey, domains[inx].lowerY())
+ && casacore::near(dy, domains[inx].upperY() - domains[inx].lowerY()))) {
yregular = false;
}
ey = domains[inx].upperY();
@@ -144,8 +144,8 @@ namespace BBS {
for (uint j=0; j<ny; ++j) {
for (uint i=1; i<nx; ++i) {
uint inx = j*nx + i;
- ASSERT (casa::near(yaxisStart[j], domains[inx].lowerY()));
- ASSERT (casa::near(yaxisEnd[j], domains[inx].upperY()));
+ ASSERT (casacore::near(yaxisStart[j], domains[inx].lowerY()));
+ ASSERT (casacore::near(yaxisEnd[j], domains[inx].upperY()));
}
}
// Create the (ir)regular axis.
@@ -213,8 +213,8 @@ namespace BBS {
const Axis::ShPtr& axis = grids[i*step].getAxis(axnr);
ncells += axis->size();
if (isRegular) {
- isRegular = axis->isRegular() && (casa::near(width, axis->width(0)) &&
- casa::near(last, axis->lower(0)));
+ isRegular = axis->isRegular() && (casacore::near(width, axis->width(0)) &&
+ casacore::near(last, axis->lower(0)));
last = axis->upper(axis->size() - 1);
}
}
diff --git a/CEP/ParmDB/src/Parm.cc b/CEP/ParmDB/src/Parm.cc
index 6698a4469feb8686a571952f0263d48c0bfe3d3f..73391ef758f65033289ee5e896a550ec860a15d2 100644
--- a/CEP/ParmDB/src/Parm.cc
+++ b/CEP/ParmDB/src/Parm.cc
@@ -24,10 +24,10 @@
#include <ParmDB/Parm.h>
#include <ParmDB/ParmCache.h>
#include <ParmDB/AxisMapping.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
namespace BBS {
diff --git a/CEP/ParmDB/src/ParmDB.cc b/CEP/ParmDB/src/ParmDB.cc
index 8268202959563431d0e265a95f518273368f9832..b81c6c908e1c37ed18c32476a635a664290bc2aa 100644
--- a/CEP/ParmDB/src/ParmDB.cc
+++ b/CEP/ParmDB/src/ParmDB.cc
@@ -29,16 +29,16 @@
#include <ParmDB/ParmDBPostgres.h>
#endif
#include <Common/LofarLogger.h>
-#include <casa/Utilities/Regex.h>
+#include <casacore/casa/Utilities/Regex.h>
#ifdef AIPS_NO_TEMPLATE_SRC
-# include <casa/Utilities/GenSort.cc> // for automatic template
+# include <casacore/casa/Utilities/GenSort.cc> // for automatic template
#else
-# include <casa/Utilities/GenSort.h>
+# include <casacore/casa/Utilities/GenSort.h>
#endif
using namespace std;
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
namespace BBS {
diff --git a/CEP/ParmDB/src/ParmDBCasa.cc b/CEP/ParmDB/src/ParmDBCasa.cc
index 0a24475e7ae535e59ea19b6a65587b4ad93df282..f8f2ab0c61c6fc59c789083acf42d1c2c8966633 100644
--- a/CEP/ParmDB/src/ParmDBCasa.cc
+++ b/CEP/ParmDB/src/ParmDBCasa.cc
@@ -24,26 +24,26 @@
#include <ParmDB/ParmDBCasa.h>
#include <Common/LofarLogger.h>
-#include <tables/Tables/TableDesc.h>
-#include <tables/Tables/SetupNewTab.h>
-#include <tables/Tables/ExprNode.h>
-#include <tables/Tables/ExprNodeSet.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <tables/Tables/ArrayColumn.h>
-#include <tables/Tables/ScaColDesc.h>
-#include <tables/Tables/ArrColDesc.h>
-#include <tables/Tables/TableIter.h>
-#include <tables/Tables/TableRecord.h>
-#include <tables/Tables/TableLocker.h>
-#include <tables/Tables/ColumnsIndex.h>
-#include <casa/Containers/RecordField.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/Arrays/ArrayUtil.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Utilities/Regex.h>
-
-using namespace casa;
+#include <casacore/tables/Tables/TableDesc.h>
+#include <casacore/tables/Tables/SetupNewTab.h>
+#include <casacore/tables/TaQL/ExprNode.h>
+#include <casacore/tables/TaQL/ExprNodeSet.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
+#include <casacore/tables/Tables/ScaColDesc.h>
+#include <casacore/tables/Tables/ArrColDesc.h>
+#include <casacore/tables/Tables/TableIter.h>
+#include <casacore/tables/Tables/TableRecord.h>
+#include <casacore/tables/Tables/TableLocker.h>
+#include <casacore/tables/Tables/ColumnsIndex.h>
+#include <casacore/casa/Containers/RecordField.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/ArrayUtil.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Utilities/Regex.h>
+
+using namespace casacore;
using namespace std;
namespace LOFAR {
diff --git a/CEP/ParmDB/src/ParmDBLog.cc b/CEP/ParmDB/src/ParmDBLog.cc
index aa3bb17262e37325d8b88baa9671a77111f5a1bb..ccd2bb260909eda12a8cac60a2c5125c6a788f5e 100644
--- a/CEP/ParmDB/src/ParmDBLog.cc
+++ b/CEP/ParmDB/src/ParmDBLog.cc
@@ -27,14 +27,14 @@
#include <Common/LofarLogger.h> // needed to write log messages
#include <Common/lofar_vector.h>
-#include <tables/Tables/TableDesc.h>
-#include <tables/Tables/SetupNewTab.h>
-#include <tables/Tables/ScaColDesc.h>
-#include <tables/Tables/ArrColDesc.h>
-#include <tables/Tables/TableLocker.h>
-#include <casa/Arrays/Vector.h>
-
-using namespace casa;
+#include <casacore/tables/Tables/TableDesc.h>
+#include <casacore/tables/Tables/SetupNewTab.h>
+#include <casacore/tables/Tables/ScaColDesc.h>
+#include <casacore/tables/Tables/ArrColDesc.h>
+#include <casacore/tables/Tables/TableLocker.h>
+#include <casacore/casa/Arrays/Vector.h>
+
+using namespace casacore;
using namespace std;
namespace LOFAR
@@ -114,7 +114,7 @@ namespace BBS
// Get rw-keywordset from table
TableRecord &keywords = itsTable.rwKeywordSet();
- casa::Vector<uInt> range(2);
+ casacore::Vector<uInt> range(2);
range[0] = start;
range[1] = end;
@@ -168,7 +168,7 @@ namespace BBS
uint rank, uint rankDeficiency,
double chiSquare, double lmFactor,
const vector<double>& solution, const string& message,
- const casa::Array<double>& correlationMatrix)
+ const casacore::Array<double>& correlationMatrix)
{
TableLocker locker(itsTable, FileLocker::Write);
doAdd (startFreq, endFreq, startTime, endTime,
diff --git a/CEP/ParmDB/src/ParmFacade.cc b/CEP/ParmDB/src/ParmFacade.cc
index 85191941c77f879c88ae5d9cae8062e56d2b8437..4ba37ae1aa99751c87596952504dacd6ffe34001 100644
--- a/CEP/ParmDB/src/ParmFacade.cc
+++ b/CEP/ParmDB/src/ParmFacade.cc
@@ -24,10 +24,10 @@
#include <ParmDB/ParmFacade.h>
#include <ParmDB/ParmFacadeLocal.h>
#include <ParmDB/ParmFacadeDistr.h>
-#include <tables/Tables/Table.h>
+#include <casacore/tables/Tables/Table.h>
using namespace std;
-using namespace casa;
+using namespace casacore;
// Create tParmFacade.in_mep with parmdb using:
// create tablename='tParmFacade.in_mep'
diff --git a/CEP/ParmDB/src/ParmFacadeDistr.cc b/CEP/ParmDB/src/ParmFacadeDistr.cc
index 58a0ca2bd2dbe1c45753e24d65184e646bab9321..961c6ec3f83b8fc7d61508185a013f189f55b10d 100644
--- a/CEP/ParmDB/src/ParmFacadeDistr.cc
+++ b/CEP/ParmDB/src/ParmFacadeDistr.cc
@@ -26,15 +26,15 @@
#include <Blob/BlobArray.h>
#include <Blob/BlobAipsIO.h>
#include <Common/LofarLogger.h>
-#include <casa/IO/AipsIO.h>
-#include <casa/Containers/Record.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
-#include<casa/Utilities/GenSort.h>
+#include <casacore/casa/IO/AipsIO.h>
+#include <casacore/casa/Containers/Record.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
+#include<casacore/casa/Utilities/GenSort.h>
#include <Common/lofar_iostream.h>
using namespace LOFAR::CEP;
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
@@ -664,14 +664,14 @@ namespace LOFAR {
void ParmFacadeDistr::getRecord (BlobIStream& bis, Record& rec)
{
BlobAipsIO baio(bis);
- casa::AipsIO aio(&baio);
+ casacore::AipsIO aio(&baio);
aio >> rec;
}
void ParmFacadeDistr::putRecord (BlobOStream& bos, const Record& rec)
{
BlobAipsIO baio(bos);
- casa::AipsIO aio(&baio);
+ casacore::AipsIO aio(&baio);
aio << rec;
}
diff --git a/CEP/ParmDB/src/ParmFacadeLocal.cc b/CEP/ParmDB/src/ParmFacadeLocal.cc
index 72b1a5003ae6b19cef18fb20e99b4a9629619b46..e5ecda041b39161547437e069dcd8313e31cd39b 100644
--- a/CEP/ParmDB/src/ParmFacadeLocal.cc
+++ b/CEP/ParmDB/src/ParmFacadeLocal.cc
@@ -28,11 +28,11 @@
#include <ParmDB/Parm.h>
#include <Common/LofarLogger.h>
#include <Common/StringUtil.h>
-#include <casa/Utilities/Regex.h>
-#include <casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Utilities/Regex.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
using namespace std;
-using namespace casa;
+using namespace casacore;
// Create tParmFacade.in_mep with parmdb using:
// create tablename='tParmFacade.in_mep'
diff --git a/CEP/ParmDB/src/ParmValue.cc b/CEP/ParmDB/src/ParmValue.cc
index ca2259033ad5d08f48b591b8766909611ba7be8c..611598b7849ca835c69861a540f49d400bbf99f6 100644
--- a/CEP/ParmDB/src/ParmValue.cc
+++ b/CEP/ParmDB/src/ParmValue.cc
@@ -23,9 +23,9 @@
#include <lofar_config.h>
#include <ParmDB/ParmValue.h>
#include <Common/LofarTypes.h>
-#include <casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/Matrix.h>
-using namespace casa;
+using namespace casacore;
using namespace std;
namespace LOFAR {
@@ -76,13 +76,13 @@ namespace BBS {
itsValues = value;
}
- void ParmValue::setCoeff (const casa::Array<double>& values)
+ void ParmValue::setCoeff (const casacore::Array<double>& values)
{
itsValues.assign (values);
}
void ParmValue::setScalars (const Grid& grid,
- const casa::Array<double>& values)
+ const casacore::Array<double>& values)
{
ASSERT (int(grid.nx()) == values.shape()[0] &&
int(grid.ny()) == values.shape()[1]);
@@ -90,7 +90,7 @@ namespace BBS {
itsGrid = grid;
}
- void ParmValue::setErrors (const casa::Array<double>& errors)
+ void ParmValue::setErrors (const casacore::Array<double>& errors)
{
// Check that the errors have the same shape as the values.
ASSERT (errors.shape().isEqual (itsValues.shape()));
@@ -106,7 +106,7 @@ namespace BBS {
{
// No need to rescale if polynomial did not have a domain
// or if the axes have length 1 and others match.
- casa::Matrix<double> coeff(getValues());
+ casacore::Matrix<double> coeff(getValues());
if (oldDomain.empty() || coeff.size() == 1 ||
(coeff.nrow() == 1 && sy == oldDomain.lowerY() &&
ey == oldDomain.upperY()) ||
@@ -139,12 +139,12 @@ namespace BBS {
// So for each i,j,p,q each new coeff(p,q) gets terms
// a[i,j] * (i p) * sx**p * ox**(i-p)) * (j q) * sy**q * oy**(j-q))
// The factors sx**p and sy**q are independent of i,j and are applied later.
- casa::Matrix<double> ParmValue::scale2 (const casa::Matrix<double>& coeff,
+ casacore::Matrix<double> ParmValue::scale2 (const casacore::Matrix<double>& coeff,
double offx, double offy,
double scalex, double scaley)
{
// Fill the Pascal triangle (till order 10) if not done yet.
- static casa::Matrix<double> pascal;
+ static casacore::Matrix<double> pascal;
if (pascal.empty()) {
fillPascal (pascal, 10);
}
@@ -152,7 +152,7 @@ namespace BBS {
int nx = coeff.shape()[0];
int ny = coeff.shape()[1];
ASSERT (nx<int(pascal.nrow()) && ny<int(pascal.nrow()));
- casa::Matrix<double> scoeff(coeff.shape(), 0.);
+ casacore::Matrix<double> scoeff(coeff.shape(), 0.);
for (int iy=0; iy<ny; ++iy) {
for (int ix=0; ix<nx; ++ix) {
double offpy= coeff(ix,iy);
@@ -178,7 +178,7 @@ namespace BBS {
return scoeff;
}
- void ParmValue::fillPascal (casa::Matrix<double>& pascal, int order)
+ void ParmValue::fillPascal (casacore::Matrix<double>& pascal, int order)
{
// pascal(j,i) gives (i over j).
pascal.resize (order, order);
diff --git a/CEP/ParmDB/src/PatchInfo.cc b/CEP/ParmDB/src/PatchInfo.cc
index ea22d52cbf69da863c2788800ed83873bda08520..f01350afe914d8a781876e99da3a637929ff7a32 100644
--- a/CEP/ParmDB/src/PatchInfo.cc
+++ b/CEP/ParmDB/src/PatchInfo.cc
@@ -31,9 +31,9 @@
#include <Blob/BlobOStream.h>
#include <Common/LofarLogger.h>
-#include <casa/Quanta/MVAngle.h>
+#include <casacore/casa/Quanta/MVAngle.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
namespace BBS {
diff --git a/CEP/ParmDB/src/SourceDB.cc b/CEP/ParmDB/src/SourceDB.cc
index 9402d62c93759d07cf23d63c065cfdae0e8cd1d2..0852b6be7715eb70b0b59cb6dffa772d19ecd207 100644
--- a/CEP/ParmDB/src/SourceDB.cc
+++ b/CEP/ParmDB/src/SourceDB.cc
@@ -27,10 +27,10 @@
#include <ParmDB/ParmDB.h>
#include <Common/LofarLogger.h>
-#include <casa/OS/File.h>
+#include <casacore/casa/OS/File.h>
using namespace std;
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
namespace BBS {
diff --git a/CEP/ParmDB/src/SourceDBBlob.cc b/CEP/ParmDB/src/SourceDBBlob.cc
index 3e79c39e835757aff3b9bb54a0b4d5f220dc9a77..80e88a818f8d76a36df99ec3181108af4e08303e 100644
--- a/CEP/ParmDB/src/SourceDBBlob.cc
+++ b/CEP/ParmDB/src/SourceDBBlob.cc
@@ -25,11 +25,11 @@
#include <ParmDB/ParmMap.h>
#include <Common/Exception.h>
-#include <casa/BasicSL/String.h>
-#include <casa/Utilities/Sort.h>
+#include <casacore/casa/BasicSL/String.h>
+#include <casacore/casa/Utilities/Sort.h>
#include <iostream>
-using namespace casa;
+using namespace casacore;
using namespace std;
namespace LOFAR {
diff --git a/CEP/ParmDB/src/SourceDBCasa.cc b/CEP/ParmDB/src/SourceDBCasa.cc
index 49b4d0eda89adcdaad8aa4b685987246314bb15c..15f0d4d20cb4225de80c30c72b49ae0efc7208cf 100644
--- a/CEP/ParmDB/src/SourceDBCasa.cc
+++ b/CEP/ParmDB/src/SourceDBCasa.cc
@@ -24,20 +24,20 @@
#include <ParmDB/SourceDBCasa.h>
#include <ParmDB/ParmMap.h>
-#include <tables/Tables/TableDesc.h>
-#include <tables/Tables/SetupNewTab.h>
-#include <tables/Tables/ExprNode.h>
-#include <tables/Tables/ExprNodeSet.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <tables/Tables/ArrayColumn.h>
-#include <tables/Tables/ScaColDesc.h>
-#include <tables/Tables/ArrColDesc.h>
-#include <tables/Tables/TableIter.h>
-#include <tables/Tables/TableRecord.h>
-#include <tables/Tables/TableLocker.h>
-#include <tables/Tables/TableIter.h>
-#include <casa/Containers/RecordField.h>
-using namespace casa;
+#include <casacore/tables/Tables/TableDesc.h>
+#include <casacore/tables/Tables/SetupNewTab.h>
+#include <casacore/tables/TaQL/ExprNode.h>
+#include <casacore/tables/TaQL/ExprNodeSet.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
+#include <casacore/tables/Tables/ScaColDesc.h>
+#include <casacore/tables/Tables/ArrColDesc.h>
+#include <casacore/tables/Tables/TableIter.h>
+#include <casacore/tables/Tables/TableRecord.h>
+#include <casacore/tables/Tables/TableLocker.h>
+#include <casacore/tables/Tables/TableIter.h>
+#include <casacore/casa/Containers/RecordField.h>
+using namespace casacore;
namespace LOFAR {
namespace BBS {
@@ -677,7 +677,7 @@ namespace BBS {
{
ParmValueSet valueSet = getParmDB().getDefValue(name, ParmValue());
ASSERT(valueSet.empty() && valueSet.getType() == ParmValue::Scalar);
- const casa::Array<double> &values = valueSet.getDefParmValue().getValues();
+ const casacore::Array<double> &values = valueSet.getDefParmValue().getValues();
ASSERT(values.size() == 1);
return values.data()[0];
}
diff --git a/CEP/ParmDB/src/SourceData.cc b/CEP/ParmDB/src/SourceData.cc
index 0ba7ca2c7bacd8892b2845ca61b4a773650086af..5998cbe5671ebe1dd3c4afd7cb6b393c418b2c87 100644
--- a/CEP/ParmDB/src/SourceData.cc
+++ b/CEP/ParmDB/src/SourceData.cc
@@ -27,11 +27,11 @@
#include <Blob/BlobOStream.h>
#include <Common/Exception.h>
-#include <casa/Arrays/ArrayIO.h>
-#include <casa/Quanta/MVAngle.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Quanta/MVAngle.h>
#include <iostream>
-using namespace casa;
+using namespace casacore;
using namespace std;
namespace LOFAR {
@@ -60,7 +60,7 @@ namespace BBS {
iter = parms.find(name + ':' + itsInfo.getName());
}
if (iter != parms.end()) {
- const casa::Array<double>& arr =
+ const casacore::Array<double>& arr =
iter->second.getFirstParmValue().getValues();
ASSERTSTR (arr.size()==1, "Error: value " + name + " of source " +
itsInfo.getName() + " has multiple values");
diff --git a/CEP/ParmDB/src/SourceInfo.cc b/CEP/ParmDB/src/SourceInfo.cc
index 023eaceef74b55cbdf072661556bc071eca8aaf0..d80eb2f71da0292873a8dbf7297533e6ea3c87b2 100644
--- a/CEP/ParmDB/src/SourceInfo.cc
+++ b/CEP/ParmDB/src/SourceInfo.cc
@@ -32,7 +32,7 @@
#include <Blob/BlobOStream.h>
#include <Blob/BlobArray.h>
-#include <casa/Arrays/Array.h>
+#include <casacore/casa/Arrays/Array.h>
namespace LOFAR {
@@ -84,10 +84,10 @@ namespace BBS {
return *this;
}
- void SourceInfo::setShapeletCoeff (const casa::Array<double>& I,
- const casa::Array<double>& Q,
- const casa::Array<double>& U,
- const casa::Array<double>& V)
+ void SourceInfo::setShapeletCoeff (const casacore::Array<double>& I,
+ const casacore::Array<double>& Q,
+ const casacore::Array<double>& U,
+ const casacore::Array<double>& V)
{
itsShapeletCoeffI.assign (I);
itsShapeletCoeffQ.assign (Q);
diff --git a/CEP/ParmDB/src/makesourcedb.cc b/CEP/ParmDB/src/makesourcedb.cc
index fc3f5400a6bcec5e89b559860c9971c061fc8c74..611d802d646dd2589159cd72bf74314418ada381 100644
--- a/CEP/ParmDB/src/makesourcedb.cc
+++ b/CEP/ParmDB/src/makesourcedb.cc
@@ -133,13 +133,13 @@
#include <iostream>
#include <fstream>
#include <sstream>
-#include <casa/OS/Path.h>
-#include <casa/Quanta/MVAngle.h>
-#include <casa/Inputs/Input.h>
-#include <casa/BasicSL/Constants.h>
+#include <casacore/casa/OS/Path.h>
+#include <casacore/casa/Quanta/MVAngle.h>
+#include <casacore/casa/Inputs/Input.h>
+#include <casacore/casa/BasicSL/Constants.h>
using namespace std;
-using namespace casa;
+using namespace casacore;
using namespace LOFAR;
using namespace BBS;
@@ -1020,7 +1020,7 @@ void make (const string& in, const string& out, const string& outType,
if (! in.empty()) {
ifstream infile(in.c_str());
ASSERTSTR (infile, "File " << in << " could not be opened");
- casa::Regex regexf("^[ \t]*[fF][oO][rR][mM][aA][tT][ \t]*=.*");
+ casacore::Regex regexf("^[ \t]*[fF][oO][rR][mM][aA][tT][ \t]*=.*");
string line;
// Read first line.
getInLine (infile, line);
@@ -1092,9 +1092,9 @@ string readFormat (string file, const string& catFile)
<< " containing format string could not be opened");
string line;
getInLine (infile, line);
- casa::Regex regex("^[ \t]*#[ \t]*\\([ \t]*.*\\)[ \t]*=[ \t]*[fF][oO][rR][mM][aA][tT][ \t]*$");
- casa::Regex regexs1("^[ \t]*#[ \t]*\\([ \t]*");
- casa::Regex regexs2("\\)[ \t]*=[ \t]*[fF][oO][rR][mM][aA][tT][ \t]*$");
+ casacore::Regex regex("^[ \t]*#[ \t]*\\([ \t]*.*\\)[ \t]*=[ \t]*[fF][oO][rR][mM][aA][tT][ \t]*$");
+ casacore::Regex regexs1("^[ \t]*#[ \t]*\\([ \t]*");
+ casacore::Regex regexs2("\\)[ \t]*=[ \t]*[fF][oO][rR][mM][aA][tT][ \t]*$");
while (infile) {
uInt st=0;
st = lskipws(line, st, line.size()); // skip whitespace
@@ -1102,7 +1102,7 @@ string readFormat (string file, const string& catFile)
if (line[st] != '#') {
break; // data line
}
- casa::String sline(line);
+ casacore::String sline(line);
if (sline.matches (regex)) {
sline.gsub (regexs1, String());
sline.gsub (regexs2, String());
@@ -1112,9 +1112,9 @@ string readFormat (string file, const string& catFile)
getInLine (infile, line);
}
// See if a format line is given as "format=".
- casa::Regex regexf("^[ \t]*[fF][oO][rR][mM][aA][tT][ \t]*=.*$");
- casa::Regex regexf1("^[ \t]*[fF][oO][rR][mM][aA][tT][ \t]*=[ \t]*");
- casa::String sline(line);
+ casacore::Regex regexf("^[ \t]*[fF][oO][rR][mM][aA][tT][ \t]*=.*$");
+ casacore::Regex regexf1("^[ \t]*[fF][oO][rR][mM][aA][tT][ \t]*=[ \t]*");
+ casacore::String sline(line);
if (sline.matches (regexf)) {
sline.gsub (regexf1, String());
return sline;
diff --git a/CEP/ParmDB/src/mergesourcedb.cc b/CEP/ParmDB/src/mergesourcedb.cc
index 07f05d8aeb820ba73c31bfa68ca2ea77eb8b81d2..22107a37b1badc9264f1e99f61a391a20c87f76f 100644
--- a/CEP/ParmDB/src/mergesourcedb.cc
+++ b/CEP/ParmDB/src/mergesourcedb.cc
@@ -49,12 +49,12 @@
#include <Common/SystemUtil.h>
#include <Common/Exception.h>
-#include <casa/Quanta/MVAngle.h>
-#include <casa/Inputs/Input.h>
+#include <casacore/casa/Quanta/MVAngle.h>
+#include <casacore/casa/Inputs/Input.h>
#include <vector>
using namespace std;
-using namespace casa;
+using namespace casacore;
using namespace LOFAR;
using namespace BBS;
diff --git a/CEP/ParmDB/src/parmdbm.cc b/CEP/ParmDB/src/parmdbm.cc
index 48cb52ca3c24ef7bef4bc25b153e8e0a1211cbc9..b037e18e0950acf009b24a9ebbb23738445c8217 100644
--- a/CEP/ParmDB/src/parmdbm.cc
+++ b/CEP/ParmDB/src/parmdbm.cc
@@ -39,16 +39,16 @@
#include <Common/LofarLogger.h>
#include <Common/Exception.h>
-#include <casa/Quanta/MVTime.h>
-#include <casa/Utilities/MUString.h>
-#include <casa/Containers/Block.h>
-#include <casa/Exceptions/Error.h>
+#include <casacore/casa/Quanta/MVTime.h>
+#include <casacore/casa/Utilities/MUString.h>
+#include <casacore/casa/Containers/Block.h>
+#include <casacore/casa/Exceptions/Error.h>
#include <Common/lofar_string.h>
#include <Common/lofar_iostream.h>
#include <Common/lofar_fstream.h>
#include <pwd.h>
-using namespace casa;
+using namespace casacore;
using namespace LOFAR;
using namespace BBS;
diff --git a/CEP/ParmDB/src/parmdbremote.cc b/CEP/ParmDB/src/parmdbremote.cc
index a1526064b4ca593fa41af8716bec89fcf4f7166c..4fa8313682b579ae82345f3e5598a6207d1b5ea1 100644
--- a/CEP/ParmDB/src/parmdbremote.cc
+++ b/CEP/ParmDB/src/parmdbremote.cc
@@ -31,8 +31,8 @@
#include <Common/LofarLogger.h>
#include <Common/StreamUtil.h>
#include <Common/Exception.h>
-#include <casa/IO/AipsIO.h>
-#include <casa/Containers/Record.h>
+#include <casacore/casa/IO/AipsIO.h>
+#include <casacore/casa/Containers/Record.h>
#include <iostream>
#include <unistd.h> //# for basename
#include <libgen.h>
@@ -45,17 +45,17 @@ using namespace std;
// Use a terminate handler that can produce a backtrace.
Exception::TerminateHandler t(Exception::terminate);
-void putRecord (BlobOStream& bos, const casa::Record& rec)
+void putRecord (BlobOStream& bos, const casacore::Record& rec)
{
BlobAipsIO baio(bos);
- casa::AipsIO aio(&baio);
+ casacore::AipsIO aio(&baio);
aio << rec;
}
-void getRecord (BlobIStream& bis, casa::Record& rec)
+void getRecord (BlobIStream& bis, casacore::Record& rec)
{
BlobAipsIO baio(bis);
- casa::AipsIO aio(&baio);
+ casacore::AipsIO aio(&baio);
aio >> rec;
}
@@ -91,7 +91,7 @@ void getValues (ParmFacadeLocal& pdb, BlobIStream& bis, MWBlobOut& bbo,
if (efreq > range[1]) efreq = range[1];
if (stime < range[2]) stime = range[2];
if (etime > range[3]) etime = range[3];
- casa::Record rec;
+ casacore::Record rec;
if (sfreq <= efreq && stime <= etime) {
try {
rec = pdb.getValues (pattern, sfreq, efreq, freqStep,
@@ -111,7 +111,7 @@ void getValuesVec (ParmFacadeLocal& pdb, BlobIStream& bis, MWBlobOut& bbo)
bool asStartEnd, includeDefaults;
bis >> pattern >> freqv1 >> freqv2 >> timev1 >> timev2
>> asStartEnd >> includeDefaults;
- casa::Record rec;
+ casacore::Record rec;
try {
rec = pdb.getValues (pattern, freqv1, freqv2,
timev1, timev2, asStartEnd, includeDefaults);
@@ -127,7 +127,7 @@ void getValuesGrid (ParmFacadeLocal& pdb, BlobIStream& bis, MWBlobOut& bbo)
string pattern;
double sfreq, efreq, stime, etime;
bis >> pattern >> sfreq >> efreq >> stime >> etime;
- casa::Record rec;
+ casacore::Record rec;
if (sfreq <= efreq && stime <= etime) {
try {
rec = pdb.getValuesGrid (pattern, sfreq, efreq, stime, etime, true);
@@ -144,7 +144,7 @@ void getCoeff (ParmFacadeLocal& pdb, BlobIStream& bis, MWBlobOut& bbo)
string pattern;
double sfreq, efreq, stime, etime;
bis >> pattern >> sfreq >> efreq >> stime >> etime;
- casa::Record rec;
+ casacore::Record rec;
if (sfreq <= efreq && stime <= etime) {
try {
rec = pdb.getCoeff (pattern, sfreq, efreq, stime, etime, true);
@@ -238,7 +238,7 @@ void deleteDefValues (ParmFacadeLocal& pdb, BlobIStream& bis, MWBlobOut& bbo)
void addDefValues (ParmFacadeLocal& pdb, BlobIStream& bis, MWBlobOut& bbo)
{
- casa::Record values;
+ casacore::Record values;
bool check;
getRecord (bis, values);
bis >> check;
diff --git a/CEP/ParmDB/src/parmexportcal.cc b/CEP/ParmDB/src/parmexportcal.cc
index 0dbc5a237e03f4d85cb528c9d7ac047957006c5a..c490524a2f31936574642d944c6b22fec5765b62 100644
--- a/CEP/ParmDB/src/parmexportcal.cc
+++ b/CEP/ParmDB/src/parmexportcal.cc
@@ -36,16 +36,16 @@
#include <Common/SystemUtil.h>
#include <Common/Exception.h>
-#include <casa/Quanta/MVTime.h>
-#include <casa/Utilities/MUString.h>
-#include <casa/Containers/Block.h>
-#include <casa/Exceptions/Error.h>
+#include <casacore/casa/Quanta/MVTime.h>
+#include <casacore/casa/Utilities/MUString.h>
+#include <casacore/casa/Containers/Block.h>
+#include <casacore/casa/Exceptions/Error.h>
#include <Common/lofar_string.h>
#include <Common/lofar_iostream.h>
#include <Common/lofar_fstream.h>
#include <pwd.h>
-using namespace casa;
+using namespace casacore;
using namespace LOFAR;
using namespace BBS;
@@ -295,7 +295,7 @@ int main (int argc, char *argv[])
} catch (LOFAR::Exception& ex) {
cerr << "Caught LOFAR exception: " << ex << endl;
return 1;
- } catch (casa::AipsError& ex) {
+ } catch (casacore::AipsError& ex) {
cerr << "Caught AIPS error: " << ex.what() << endl;
return 1;
}
diff --git a/CEP/ParmDB/src/showsourcedb.cc b/CEP/ParmDB/src/showsourcedb.cc
index e663b1cfc18c401de2cb0d7ac700bea9c966a244..7e37875d12fa0bc23224fb57135e7d06312aaa4a 100644
--- a/CEP/ParmDB/src/showsourcedb.cc
+++ b/CEP/ParmDB/src/showsourcedb.cc
@@ -38,12 +38,12 @@
#include <Common/SystemUtil.h>
#include <Common/Exception.h>
-#include <casa/Quanta/MVAngle.h>
-#include <casa/Inputs/Input.h>
+#include <casacore/casa/Quanta/MVAngle.h>
+#include <casacore/casa/Inputs/Input.h>
#include <vector>
using namespace std;
-using namespace casa;
+using namespace casacore;
using namespace LOFAR;
using namespace BBS;
diff --git a/CEP/ParmDB/test/tAxisMapping.cc b/CEP/ParmDB/test/tAxisMapping.cc
index 82763ff9a5e0a6d510bd1052f036fcbafc897038..671a0b8c84bb9ea727609f6fce19f12253ca8cdc 100644
--- a/CEP/ParmDB/test/tAxisMapping.cc
+++ b/CEP/ParmDB/test/tAxisMapping.cc
@@ -24,7 +24,7 @@
#include <ParmDB/AxisMapping.h>
#include <Common/LofarLogger.h>
#include <Common/lofar_iostream.h>
-#include <casa/BasicMath/Math.h>
+#include <casacore/casa/BasicMath/Math.h>
using namespace LOFAR;
using namespace LOFAR::BBS;
@@ -49,7 +49,7 @@ void checkMapping (const Axis& predictAxis, const AxisMapping& mapping)
}
//cout << nr << ' '<<parmCell<<' '<<cen <<' ' <<*centers<<endl;
ASSERT (*iter == parmCell);
- ASSERT (casa::near (*centers, cen));
+ ASSERT (casacore::near (*centers, cen));
++centers;
++nr;
cen += 1/5.;
diff --git a/CEP/ParmDB/test/tParm.cc b/CEP/ParmDB/test/tParm.cc
index 6605372bbc81decd109c012ec9020fdf748ba49d..b703c705e9294fd8a7f2f9a281947edd92e83f28 100644
--- a/CEP/ParmDB/test/tParm.cc
+++ b/CEP/ParmDB/test/tParm.cc
@@ -25,15 +25,15 @@
#include <ParmDB/ParmCache.h>
#include <ParmDB/ParmDB.h>
#include <Common/LofarLogger.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::BBS;
-using namespace casa;
+using namespace casacore;
using namespace std;
// Test the basic functionality.
@@ -117,7 +117,7 @@ void testResultCoeff()
(coeff(0,1) + coeff(1,1)*x)*y +
(coeff(0,2) + coeff(1,2)*x)*y*y);
//cout << result(i,j) << ' ' << v << ' '<<x<<' '<<y<<endl;
- ASSERT (casa::near (result(i,j), v));
+ ASSERT (casacore::near (result(i,j), v));
}
}
}
@@ -159,7 +159,7 @@ void testResultCoeff()
(coeff(0,1) + coeffadd + (coeff(1,1) + coeffadd)*x)*y +
(coeff(0,2) + coeffadd + (coeff(1,2) + coeffadd)*x)*y*y);
//cout << result(i,j) << ' ' << v << ' '<<x<<' '<<y<<endl;
- ASSERT (casa::near (result(i,j), v));
+ ASSERT (casacore::near (result(i,j), v));
}
}
}
@@ -204,7 +204,7 @@ void testResultCoeff()
(coeff(0,1) + coeffadd + (coeff(1,1) + coeffadd)*x)*y +
(coeff(0,2) + coeffadd + (coeff(1,2) + coeffadd)*x)*y*y);
//cout << result(i,j) << ' ' << v << ' '<<x<<' '<<y<<endl;
- ASSERT (casa::near (result.data()[i+j*3], v));
+ ASSERT (casacore::near (result.data()[i+j*3], v));
}
}
// Check the perturbed values.
@@ -224,7 +224,7 @@ void testResultCoeff()
(coeff(0,1) + coeffadd + (coeff(1,1) + coeffadd)*x)*y +
(coeff(0,2) + coeffadd + (coeff(1,2) + coeffadd)*x)*y*y);
//cout << result(i,j) << ' ' << v << ' '<<x<<' '<<y<<endl;
- ASSERT (casa::near (result.data()[i+j*3], v));
+ ASSERT (casacore::near (result.data()[i+j*3], v));
}
}
coeff(ip%2, ip/2) -= pertc[ip];
@@ -258,7 +258,7 @@ void testResultOneScalar()
int x = i/2;
double v = scalars(x,y);
//cout << result(i,j) << ' ' << v << ' '<<x<<' '<<y<<endl;
- ASSERT (casa::near (result(i,j), v));
+ ASSERT (casacore::near (result(i,j), v));
}
}
}
@@ -276,7 +276,7 @@ void testResultOneScalar()
int x = i/3;
double v = scalars(x,y);
//cout << result(i,j) << ' ' << v << ' '<<x<<' '<<y<<endl;
- ASSERT (casa::near (result(i,j), v));
+ ASSERT (casacore::near (result(i,j), v));
}
}
}
@@ -335,7 +335,7 @@ void testResultMultiScalar (bool setErrors)
int x = ((1+ix)%6) / 3; // x-value in ParmValue
double v = x + 10*pvx + y + 40*pvy;
//cout << result(ix,iy) << ' ' << v << ' '<<pvx<<' '<<x<<' '<<pvy<<' '<<y<<endl;
- ASSERT (casa::near (result(ix,iy), v));
+ ASSERT (casacore::near (result(ix,iy), v));
}
}
}
@@ -357,7 +357,7 @@ void testResultMultiScalar (bool setErrors)
int x = ((ix)%6) / 3; // x-value in ParmValue
double v = x + 10*pvx + y + 40*pvy;
//cout << result(ix,iy) << ' ' << v << ' '<<pvx<<' '<<x<<' '<<pvy<<' '<<y<<endl;
- ASSERT (casa::near (result(ix,iy), v));
+ ASSERT (casacore::near (result(ix,iy), v));
}
}
}
@@ -423,12 +423,12 @@ void testSetGetCoeff1()
vector<double> coeffdc = parmdc.getCoeff (Location(0,0));
ASSERT (coeffdc.size() == coeff.size()-1);
for (uint i=0; i<coeffdc.size(); ++i) {
- ASSERT (casa::near(coeffdc[i], i+10.));
+ ASSERT (casacore::near(coeffdc[i], i+10.));
}
coeffdc = parmd2.getCoeff (Location(0,0), false);
ASSERT (coeffdc.size() == coeff.size());
for (uint i=0; i<coeffdc.size(); ++i) {
- ASSERT (casa::near(coeffdc[i], i+10.));
+ ASSERT (casacore::near(coeffdc[i], i+10.));
}
}
// Set coefficients
@@ -442,12 +442,12 @@ void testSetGetCoeff1()
vector<double> coeffdc = parmdc.getCoeff (Location(0,0));
ASSERT (coeffdc.size() == newCoeff.size());
for (uint i=0; i<coeffdc.size(); ++i) {
- ASSERT (casa::near(coeffdc[i], (i+1)*0.1));
+ ASSERT (casacore::near(coeffdc[i], (i+1)*0.1));
}
vector<double> errordc = parmdc.getErrors (Location(0,0));
ASSERT (errordc.size() == newError.size());
for (uint i=0; i<errordc.size(); ++i) {
- ASSERT (casa::near(errordc[i], (i+2)*0.001));
+ ASSERT (casacore::near(errordc[i], (i+2)*0.001));
}
parmCache.flush();
}
@@ -475,7 +475,7 @@ void testSetGetCoeff2()
vector<double> coeffdc = parmdc.getCoeff (Location(1,1));
ASSERT (coeffdc.size() == 5);
for (uint i=0; i<coeffdc.size(); ++i) {
- ASSERT (casa::near(coeffdc[i], i+10.));
+ ASSERT (casacore::near(coeffdc[i], i+10.));
}
vector<double> errordc = parmdc.getErrors (Location(1,1));
ASSERT (errordc.size() == 0);
@@ -483,12 +483,12 @@ void testSetGetCoeff2()
coeffdc = parmdc.getCoeff (Location(0,0));
ASSERT (coeffdc.size() == 5);
for (uint i=0; i<coeffdc.size(); ++i) {
- ASSERT (casa::near(coeffdc[i], (i+1)*0.1));
+ ASSERT (casacore::near(coeffdc[i], (i+1)*0.1));
}
errordc = parmdc.getErrors (Location(0,0));
ASSERT (errordc.size() == 5);
for (uint i=0; i<errordc.size(); ++i) {
- ASSERT (casa::near(errordc[i], (i+2)*0.001));
+ ASSERT (casacore::near(errordc[i], (i+2)*0.001));
}
}
}
@@ -554,7 +554,7 @@ void testScalarPert()
int x = i/2;
double v = scalars(x,y);
//cout << result(i,j) << ' ' << v << ' '<<x<<' '<<y<<endl;
- ASSERT (casa::near (result(i,j), v));
+ ASSERT (casacore::near (result(i,j), v));
}
}
}
@@ -575,8 +575,8 @@ void testScalarPert()
int x = i/3;
double v = scalars(x,y);
//cout << result(i,j) << ' ' << v << ' '<<x<<' '<<y<<endl;
- ASSERT (casa::near (result(i,j), v));
- ASSERT (casa::near (pert(i,j), v + scalars(0,0)*1e-6));
+ ASSERT (casacore::near (result(i,j), v));
+ ASSERT (casacore::near (pert(i,j), v + scalars(0,0)*1e-6));
}
}
}
diff --git a/CEP/ParmDB/test/tParmCache.cc b/CEP/ParmDB/test/tParmCache.cc
index d51046dde53a10a0909e780c4a5ecc30bc1ad516..9f480d82d5b8df6c568428af60ada9375da19271 100644
--- a/CEP/ParmDB/test/tParmCache.cc
+++ b/CEP/ParmDB/test/tParmCache.cc
@@ -24,15 +24,15 @@
#include <ParmDB/ParmCache.h>
#include <ParmDB/ParmDB.h>
#include <Common/LofarLogger.h>
-#include <tables/Tables/Table.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::BBS;
-using namespace casa;
+using namespace casacore;
using namespace std;
diff --git a/CEP/ParmDB/test/tParmDBCasa.cc b/CEP/ParmDB/test/tParmDBCasa.cc
index 6eca10e05151693ee68fe9b4f6862084de8946a7..89d83acf0fd13f6ad5b691b830c08c94da1f0b0f 100644
--- a/CEP/ParmDB/test/tParmDBCasa.cc
+++ b/CEP/ParmDB/test/tParmDBCasa.cc
@@ -24,15 +24,15 @@
#include <ParmDB/ParmDBCasa.h>
#include <ParmDB/Box.h>
#include <Common/LofarLogger.h>
-#include <tables/Tables/TableRecord.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/tables/Tables/TableRecord.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::BBS;
-using namespace casa;
+using namespace casacore;
using namespace std;
void testCreate()
diff --git a/CEP/ParmDB/test/tParmDBLog.cc b/CEP/ParmDB/test/tParmDBLog.cc
index 495dc1cad64933a149b7cdc2de77fb4ec007a9a7..993c310d3810467582833503b441ffbb8018d315 100644
--- a/CEP/ParmDB/test/tParmDBLog.cc
+++ b/CEP/ParmDB/test/tParmDBLog.cc
@@ -28,7 +28,7 @@
using namespace LOFAR;
using namespace LOFAR::BBS;
-using namespace casa;
+using namespace casacore;
using namespace std;
void fill (bool create)
diff --git a/CEP/ParmDB/test/tParmFacade.cc b/CEP/ParmDB/test/tParmFacade.cc
index 22f90ffae96fd0a5755145191d763e3cb240ee09..9e4de35cbaf66242e6de0805abd285d3c851ebbf 100644
--- a/CEP/ParmDB/test/tParmFacade.cc
+++ b/CEP/ParmDB/test/tParmFacade.cc
@@ -23,14 +23,14 @@
#include <lofar_config.h>
#include <ParmDB/ParmFacade.h>
#include <Common/StreamUtil.h>
-#include <casa/Containers/Record.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Containers/Record.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
#include <iostream>
#include <sstream>
using namespace LOFAR;
using namespace BBS;
-using namespace casa;
+using namespace casacore;
using namespace std;
// tParmFacade.run creates the pdb with parmdb.
diff --git a/CEP/ParmDB/test/tParmPolc.cc b/CEP/ParmDB/test/tParmPolc.cc
index 90d83ad43a2e9de7988331e5c1203d97f2b2a54c..a46cfd533d0fba4c638f28cc18b209212b749487 100644
--- a/CEP/ParmDB/test/tParmPolc.cc
+++ b/CEP/ParmDB/test/tParmPolc.cc
@@ -25,15 +25,15 @@
#include <ParmDB/ParmCache.h>
#include <ParmDB/ParmDB.h>
#include <Common/LofarLogger.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::BBS;
-using namespace casa;
+using namespace casacore;
using namespace std;
// Test evaluating a polc for a single and multiple ParmValues.
diff --git a/CEP/ParmDB/test/tParmValue.cc b/CEP/ParmDB/test/tParmValue.cc
index 9d27e14b55651eee02ed53b6bc8cb60a467a21ff..5de53ae7353b4e02f0328e8988b2fa7249cda3d1 100644
--- a/CEP/ParmDB/test/tParmValue.cc
+++ b/CEP/ParmDB/test/tParmValue.cc
@@ -22,15 +22,15 @@
#include <lofar_config.h>
#include <ParmDB/ParmValue.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
#include <Common/LofarLogger.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::BBS;
-using namespace casa;
+using namespace casacore;
using namespace std;
void testValue()
diff --git a/CEP/ParmDB/test/tSourceDBCasa.cc b/CEP/ParmDB/test/tSourceDBCasa.cc
index 8c2d58ad7447bdec1f02f876eb7165af24679f38..386ab6141ee95d57ea3ef387c64a98b7fdc0159a 100644
--- a/CEP/ParmDB/test/tSourceDBCasa.cc
+++ b/CEP/ParmDB/test/tSourceDBCasa.cc
@@ -24,12 +24,12 @@
#include <ParmDB/SourceDBCasa.h>
#include <Common/StreamUtil.h>
#include <Common/LofarLogger.h>
-#include <tables/Tables/TableRecord.h>
+#include <casacore/tables/Tables/TableRecord.h>
#include <iostream>
using namespace LOFAR;
using namespace LOFAR::BBS;
-using namespace casa;
+using namespace casacore;
using namespace std;
void testCreate()
diff --git a/CEP/ParmDB/test/tTimeAxis.cc b/CEP/ParmDB/test/tTimeAxis.cc
index 5ab7e27ceb7659e5485feaad7c42e1ed737578de..3c3a1d51aec999c3f752e4a23bd5cb33a8b10d8a 100644
--- a/CEP/ParmDB/test/tTimeAxis.cc
+++ b/CEP/ParmDB/test/tTimeAxis.cc
@@ -22,15 +22,15 @@
#include <lofar_config.h>
#include <ParmDB/Axis.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/ScalarColumn.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
#include <Common/LofarLogger.h>
#include <Common/lofar_iostream.h>
#include <Common/lofar_sstream.h>
using namespace LOFAR;
using namespace LOFAR::BBS;
-using namespace casa;
+using namespace casacore;
void doIt (const string& msname, int timestep, int timestart)
{
@@ -58,7 +58,7 @@ void doIt (const string& msname, int timestep, int timestart)
Axis::ShPtr axis2 (axis1->subset (size_t(i), size_t(i+n-1)));
cout << "step " << i << ": " << n << " times " << axis2->lower(0)
<< ' ' << axis2->upper(n-1) << " "
- << casa::near(axis2->lower(0), last2);
+ << casacore::near(axis2->lower(0), last2);
last2 = axis2->upper(n-1);
// Create a few times the same axis.
// Each time it converts from start/end to center/width and back.
@@ -74,7 +74,7 @@ void doIt (const string& msname, int timestep, int timestart)
}
cout << " diff: " << axis3->lower(0) - axis2->lower(0)
<< ' ' << axis3->upper(n-1) - axis2->upper(n-1)<< " "
- << casa::near(axis3->lower(0), last3) << endl;
+ << casacore::near(axis3->lower(0), last3) << endl;
last3 = axis3->upper(n-1);
}
}
diff --git a/CEP/pyparmdb/src/pyparmdb.cc b/CEP/pyparmdb/src/pyparmdb.cc
index ed96dbb680af8219734f38f9166cb2aab44b9080..8b3a48635bfcaceb25faaa62baf549b7e5a8bfd1 100755
--- a/CEP/pyparmdb/src/pyparmdb.cc
+++ b/CEP/pyparmdb/src/pyparmdb.cc
@@ -22,12 +22,12 @@
#include <lofar_config.h>
#include <ParmDB/ParmFacade.h>
-#include <casa/aips.h>
+#include <casacore/casa/aips.h>
#if defined(casacore)
-#include <python/Converters/PycExcp.h>
-#include <python/Converters/PycBasicData.h>
-#include <python/Converters/PycRecord.h>
-#include <python/Converters/PycBasicData.h>
+#include <casacore/python/Converters/PycExcp.h>
+#include <casacore/python/Converters/PycBasicData.h>
+#include <casacore/python/Converters/PycRecord.h>
+#include <casacore/python/Converters/PycBasicData.h>
#define pyrap python
#else
#include <pyrap/Converters/PycExcp.h>
@@ -41,7 +41,7 @@
#include "Package__Version.cc"
using namespace boost::python;
-using namespace casa;
+using namespace casacore;
namespace LOFAR { namespace BBS {
@@ -159,11 +159,11 @@ namespace LOFAR { namespace BBS {
// Define the python module itself.
BOOST_PYTHON_MODULE(_parmdb)
{
- casa::pyrap::register_convert_excp();
- casa::pyrap::register_convert_basicdata();
- casa::pyrap::register_convert_std_vector<double>();
- casa::pyrap::register_convert_std_vector<std::string>();
- casa::pyrap::register_convert_casa_record();
+ casacore::pyrap::register_convert_excp();
+ casacore::pyrap::register_convert_basicdata();
+ casacore::pyrap::register_convert_std_vector<double>();
+ casacore::pyrap::register_convert_std_vector<std::string>();
+ casacore::pyrap::register_convert_casa_record();
LOFAR::BBS::pyparmdb();
}
diff --git a/EmbraceStMan/include/EmbraceStMan/EmbraceColumn.h b/EmbraceStMan/include/EmbraceStMan/EmbraceColumn.h
index 9abd92c8c8b31195bdaebe982408ee0b4fde50af..773e52199a6d5d6bece05c187d3485db8ef6d47f 100644
--- a/EmbraceStMan/include/EmbraceStMan/EmbraceColumn.h
+++ b/EmbraceStMan/include/EmbraceStMan/EmbraceColumn.h
@@ -26,14 +26,14 @@
//# Includes
#include <EmbraceStMan/EmbraceStMan.h>
#include <Common/lofar_vector.h>
-#include <tables/Tables/StManColumn.h>
-#include <measures/Measures/MeasFrame.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MBaseline.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/Arrays/IPosition.h>
-#include <casa/Containers/Block.h>
-#include <casa/OS/Conversion.h>
+#include <casacore/tables/DataMan/StManColumn.h>
+#include <casacore/measures/Measures/MeasFrame.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MBaseline.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/IPosition.h>
+#include <casacore/casa/Containers/Block.h>
+#include <casacore/casa/OS/Conversion.h>
namespace EMBRACE {
@@ -55,7 +55,7 @@ namespace EMBRACE {
// For each column a specific Column class exists.
// </synopsis>
-class EmbraceColumn : public casa::StManColumn
+class EmbraceColumn : public casacore::StManColumn
{
public:
explicit EmbraceColumn (EmbraceStMan* parent, int dtype)
@@ -64,9 +64,9 @@ public:
{}
virtual ~EmbraceColumn();
// Most columns are not writable (only DATA is writable).
- virtual casa::Bool isWritable() const;
+ virtual casacore::Bool isWritable() const;
// Set column shape of fixed shape columns; it does nothing.
- virtual void setShapeColumn (const casa::IPosition& shape);
+ virtual void setShapeColumn (const casacore::IPosition& shape);
// Prepare the column. By default it does nothing.
virtual void prepareCol();
protected:
@@ -81,7 +81,7 @@ public:
explicit Ant1Column (EmbraceStMan* parent, int dtype)
: EmbraceColumn(parent, dtype) {}
virtual ~Ant1Column();
- virtual void getIntV (casa::uInt rowNr, casa::Int* dataPtr);
+ virtual void getIntV (casacore::uInt rowNr, casacore::Int* dataPtr);
};
// <summary>ANTENNA2 column in the EMBRACE Storage Manager.</summary>
@@ -92,7 +92,7 @@ public:
explicit Ant2Column (EmbraceStMan* parent, int dtype)
: EmbraceColumn(parent, dtype) {}
virtual ~Ant2Column();
- virtual void getIntV (casa::uInt rowNr, casa::Int* dataPtr);
+ virtual void getIntV (casacore::uInt rowNr, casacore::Int* dataPtr);
};
// <summary>TIME and TIME_CENTROID column in the EMBRACE Storage Manager.</summary>
@@ -103,9 +103,9 @@ public:
explicit TimeColumn (EmbraceStMan* parent, int dtype)
: EmbraceColumn(parent, dtype) {}
virtual ~TimeColumn();
- virtual void getdoubleV (casa::uInt rowNr, casa::Double* dataPtr);
+ virtual void getdoubleV (casacore::uInt rowNr, casacore::Double* dataPtr);
private:
- casa::Double itsValue;
+ casacore::Double itsValue;
};
// <summary>INTERVAL and EXPOSURE column in the EMBRACE Storage Manager.</summary>
@@ -116,9 +116,9 @@ public:
explicit IntervalColumn (EmbraceStMan* parent, int dtype)
: EmbraceColumn(parent, dtype) {}
virtual ~IntervalColumn();
- virtual void getdoubleV (casa::uInt rowNr, casa::Double* dataPtr);
+ virtual void getdoubleV (casacore::uInt rowNr, casacore::Double* dataPtr);
private:
- casa::Double itsValue;
+ casacore::Double itsValue;
};
// <summary>All columns in the EMBRACE Storage Manager with value 0.</summary>
@@ -129,9 +129,9 @@ public:
explicit ZeroColumn (EmbraceStMan* parent, int dtype)
: EmbraceColumn(parent, dtype) {}
virtual ~ZeroColumn();
- virtual void getIntV (casa::uInt rowNr, casa::Int* dataPtr);
+ virtual void getIntV (casacore::uInt rowNr, casacore::Int* dataPtr);
private:
- casa::Int itsValue;
+ casacore::Int itsValue;
};
// <summary>All columns in the EMBRACE Storage Manager with value False.</summary>
@@ -142,9 +142,9 @@ public:
explicit FalseColumn (EmbraceStMan* parent, int dtype)
: EmbraceColumn(parent, dtype) {}
virtual ~FalseColumn();
- virtual void getBoolV (casa::uInt rowNr, casa::Bool* dataPtr);
+ virtual void getBoolV (casacore::uInt rowNr, casacore::Bool* dataPtr);
private:
- casa::Bool itsValue;
+ casacore::Bool itsValue;
};
// <summary>UVW column in the EMBRACE Storage Manager.</summary>
@@ -155,17 +155,17 @@ public:
explicit UvwColumn (EmbraceStMan* parent, int dtype)
: EmbraceColumn(parent, dtype) {}
virtual ~UvwColumn();
- virtual casa::IPosition shape (casa::uInt rownr);
- virtual void getArraydoubleV (casa::uInt rowNr,
- casa::Array<casa::Double>* dataPtr);
+ virtual casacore::IPosition shape (casacore::uInt rownr);
+ virtual void getArraydoubleV (casacore::uInt rowNr,
+ casacore::Array<casacore::Double>* dataPtr);
virtual void prepareCol();
private:
- casa::MDirection itsPhaseDir; //# could be SUN, etc.
- casa::MDirection itsJ2000Dir; //# Phase dir in J2000
- casa::MeasFrame itsFrame;
- vector<casa::MBaseline> itsAntMB;
- vector<casa::Vector<double> > itsAntUvw;
- casa::Block<bool> itsUvwFilled;
+ casacore::MDirection itsPhaseDir; //# could be SUN, etc.
+ casacore::MDirection itsJ2000Dir; //# Phase dir in J2000
+ casacore::MeasFrame itsFrame;
+ vector<casacore::MBaseline> itsAntMB;
+ vector<casacore::Vector<double> > itsAntUvw;
+ casacore::Block<bool> itsUvwFilled;
int itsLastBlNr;
bool itsCanCalc; //# false = UVW cannot be calc.
};
@@ -178,12 +178,12 @@ public:
explicit DataColumn (EmbraceStMan* parent, int dtype)
: EmbraceColumn(parent, dtype) {}
virtual ~DataColumn();
- virtual casa::Bool isWritable() const;
- virtual casa::IPosition shape (casa::uInt rownr);
- virtual void getArrayComplexV (casa::uInt rowNr,
- casa::Array<casa::Complex>* dataPtr);
- virtual void putArrayComplexV (casa::uInt rowNr,
- const casa::Array<casa::Complex>* dataPtr);
+ virtual casacore::Bool isWritable() const;
+ virtual casacore::IPosition shape (casacore::uInt rownr);
+ virtual void getArrayComplexV (casacore::uInt rowNr,
+ casacore::Array<casacore::Complex>* dataPtr);
+ virtual void putArrayComplexV (casacore::uInt rowNr,
+ const casacore::Array<casacore::Complex>* dataPtr);
};
// <summary>FLAG column in the EMBRACE Storage Manager.</summary>
@@ -194,9 +194,9 @@ public:
explicit FlagColumn (EmbraceStMan* parent, int dtype)
: EmbraceColumn(parent, dtype) {}
virtual ~FlagColumn();
- virtual casa::IPosition shape (casa::uInt rownr);
- virtual void getArrayBoolV (casa::uInt rowNr,
- casa::Array<casa::Bool>* dataPtr);
+ virtual casacore::IPosition shape (casacore::uInt rownr);
+ virtual void getArrayBoolV (casacore::uInt rowNr,
+ casacore::Array<casacore::Bool>* dataPtr);
};
// <summary>WEIGHT column in the EMBRACE Storage Manager.</summary>
@@ -207,9 +207,9 @@ public:
explicit WeightColumn (EmbraceStMan* parent, int dtype)
: EmbraceColumn(parent, dtype) {}
virtual ~WeightColumn();
- virtual casa::IPosition shape (casa::uInt rownr);
- virtual void getArrayfloatV (casa::uInt rowNr,
- casa::Array<casa::Float>* dataPtr);
+ virtual casacore::IPosition shape (casacore::uInt rownr);
+ virtual void getArrayfloatV (casacore::uInt rowNr,
+ casacore::Array<casacore::Float>* dataPtr);
};
// <summary>SIGMA column in the EMBRACE Storage Manager.</summary>
@@ -220,9 +220,9 @@ public:
explicit SigmaColumn (EmbraceStMan* parent, int dtype)
: EmbraceColumn(parent, dtype) {}
virtual ~SigmaColumn();
- virtual casa::IPosition shape (casa::uInt rownr);
- virtual void getArrayfloatV (casa::uInt rowNr,
- casa::Array<casa::Float>* dataPtr);
+ virtual casacore::IPosition shape (casacore::uInt rownr);
+ virtual void getArrayfloatV (casacore::uInt rowNr,
+ casacore::Array<casacore::Float>* dataPtr);
};
// <summary>WEIGHT_SPECTRUM column in the EMBRACE Storage Manager.</summary>
@@ -233,9 +233,9 @@ public:
explicit WSpectrumColumn (EmbraceStMan* parent, int dtype)
: EmbraceColumn(parent, dtype) {}
virtual ~WSpectrumColumn();
- virtual casa::IPosition shape (casa::uInt rownr);
- virtual void getArrayfloatV (casa::uInt rowNr,
- casa::Array<casa::Float>* dataPtr);
+ virtual casacore::IPosition shape (casacore::uInt rownr);
+ virtual void getArrayfloatV (casacore::uInt rowNr,
+ casacore::Array<casacore::Float>* dataPtr);
};
// <summary>FLAG_CATEGORY column in the EMBRACE Storage Manager.</summary>
@@ -246,8 +246,8 @@ public:
explicit FlagCatColumn (EmbraceStMan* parent, int dtype)
: EmbraceColumn(parent, dtype) {}
virtual ~FlagCatColumn();
- virtual casa::Bool isShapeDefined (casa::uInt rownr);
- virtual casa::IPosition shape (casa::uInt rownr);
+ virtual casacore::Bool isShapeDefined (casacore::uInt rownr);
+ virtual casacore::IPosition shape (casacore::uInt rownr);
};
diff --git a/EmbraceStMan/include/EmbraceStMan/EmbraceStMan.h b/EmbraceStMan/include/EmbraceStMan/EmbraceStMan.h
index cc6a6d1078a1d22c63606649e01169a59ddb26c9..6b1e57cc0c96f7d1efacb785ea2eb31300a754d7 100644
--- a/EmbraceStMan/include/EmbraceStMan/EmbraceStMan.h
+++ b/EmbraceStMan/include/EmbraceStMan/EmbraceStMan.h
@@ -23,10 +23,10 @@
#define EMBRACE_EMBRACESTMAN_EMBRACESTMAN_H
//# Includes
-#include <tables/Tables/DataManager.h>
-#include <casa/IO/LargeFiledesIO.h>
-#include <casa/Containers/Block.h>
-#include <casa/Containers/Record.h>
+#include <casacore/tables/DataMan/DataManager.h>
+#include <casacore/casa/IO/LargeFiledesIO.h>
+#include <casacore/casa/Containers/Block.h>
+#include <casacore/casa/Containers/Record.h>
#include <vector>
namespace EMBRACE {
@@ -111,52 +111,52 @@ class EmbraceColumn;
//# </todo>
-class EmbraceStMan : public casa::DataManager
+class EmbraceStMan : public casacore::DataManager
{
public:
// Create an Embrace storage manager with the given name.
// If no name is used, it is set to "EmbraceStMan"
- explicit EmbraceStMan (const casa::String& dataManagerName = "EmbraceStMan");
+ explicit EmbraceStMan (const casacore::String& dataManagerName = "EmbraceStMan");
// Create an Embrace storage manager with the given name.
// The specifications are part of the record (as created by dataManagerSpec).
- EmbraceStMan (const casa::String& dataManagerName, const casa::Record& spec);
+ EmbraceStMan (const casacore::String& dataManagerName, const casacore::Record& spec);
~EmbraceStMan();
// Clone this object.
- virtual casa::DataManager* clone() const;
+ virtual casacore::DataManager* clone() const;
// Get the type name of the data manager (i.e. EmbraceStMan).
- virtual casa::String dataManagerType() const;
+ virtual casacore::String dataManagerType() const;
// Get the name given to the storage manager (in the constructor).
- virtual casa::String dataManagerName() const;
+ virtual casacore::String dataManagerName() const;
// Record a record containing data manager specifications.
- virtual casa::Record dataManagerSpec() const;
+ virtual casacore::Record dataManagerSpec() const;
// Get the number of rows in this storage manager.
- casa::uInt getNRow() const
+ casacore::uInt getNRow() const
{ return itsNrRows; }
// The storage manager cannot add rows.
- virtual casa::Bool canAddRow() const;
+ virtual casacore::Bool canAddRow() const;
// The storage manager cannot delete rows.
- virtual casa::Bool canRemoveRow() const;
+ virtual casacore::Bool canRemoveRow() const;
// The storage manager can add columns, which does not really do something.
- virtual casa::Bool canAddColumn() const;
+ virtual casacore::Bool canAddColumn() const;
// Columns can be removed, but it does not do anything at all.
- virtual casa::Bool canRemoveColumn() const;
+ virtual casacore::Bool canRemoveColumn() const;
// Make the object from the type name string.
// This function gets registered in the DataManager "constructor" map.
// The caller has to delete the object.
- static casa::DataManager* makeObject (const casa::String& aDataManType,
- const casa::Record& spec);
+ static casacore::DataManager* makeObject (const casacore::String& aDataManType,
+ const casacore::Record& spec);
// Register the class name and the static makeObject "constructor".
// This will make the engine known to the table system.
@@ -165,22 +165,22 @@ public:
// Get data.
// <group>
- const casa::Block<casa::Int>& ant1() const
+ const casacore::Block<casacore::Int>& ant1() const
{ return itsAnt1; }
- const casa::Block<casa::Int>& ant2() const
+ const casacore::Block<casacore::Int>& ant2() const
{ return itsAnt2; }
- double time (casa::uInt blocknr);
+ double time (casacore::uInt blocknr);
double interval() const
{ return itsTimeIntv; }
- casa::uInt nchan() const
+ casacore::uInt nchan() const
{ return itsNChan; }
- casa::uInt npol() const
+ casacore::uInt npol() const
{ return itsNPol; }
- void getData (casa::uInt rownr, casa::Complex* buf);
- void putData (casa::uInt rownr, const casa::Complex* buf);
+ void getData (casacore::uInt rownr, casacore::Complex* buf);
+ void putData (casacore::uInt rownr, const casacore::Complex* buf);
// </group>
- casa::uInt getEmbraceStManVersion() const
+ casacore::uInt getEmbraceStManVersion() const
{ return itsVersion; }
private:
@@ -192,17 +192,17 @@ private:
// Flush and optionally fsync the data.
// It does nothing, and returns False.
- virtual casa::Bool flush (casa::AipsIO&, casa::Bool doFsync);
+ virtual casacore::Bool flush (casacore::AipsIO&, casacore::Bool doFsync);
// Let the storage manager create files as needed for a new table.
// This allows a column with an indirect array to create its file.
- virtual void create (casa::uInt nrrow);
+ virtual void create (casacore::uInt nrrow);
// Open the storage manager file for an existing table.
// Return the number of rows in the data file.
// <group>
- virtual void open (casa::uInt nrrow, casa::AipsIO&); //# should never be called
- virtual casa::uInt open1 (casa::uInt nrrow, casa::AipsIO&);
+ virtual void open (casacore::uInt nrrow, casacore::AipsIO&); //# should never be called
+ virtual casacore::uInt open1 (casacore::uInt nrrow, casacore::AipsIO&);
// </group>
// Prepare the columns (needed for UvwColumn).
@@ -211,8 +211,8 @@ private:
// Resync the storage manager with the new file contents.
// It does nothing.
// <group>
- virtual void resync (casa::uInt nrrow); //# should never be called
- virtual casa::uInt resync1 (casa::uInt nrrow);
+ virtual void resync (casacore::uInt nrrow); //# should never be called
+ virtual casacore::uInt resync1 (casacore::uInt nrrow);
// </group>
// Reopen the storage manager files for read/write.
@@ -226,35 +226,35 @@ private:
// Add rows to the storage manager.
// It cannot do it, so throws an exception.
- virtual void addRow (casa::uInt nrrow);
+ virtual void addRow (casacore::uInt nrrow);
// Delete a row from all columns.
// It cannot do it, so throws an exception.
- virtual void removeRow (casa::uInt rowNr);
+ virtual void removeRow (casacore::uInt rowNr);
// Do the final addition of a column.
// It won't do anything.
- virtual void addColumn (casa::DataManagerColumn*);
+ virtual void addColumn (casacore::DataManagerColumn*);
// Remove a column from the data file.
// It won't do anything.
- virtual void removeColumn (casa::DataManagerColumn*);
+ virtual void removeColumn (casacore::DataManagerColumn*);
// Create a column in the storage manager on behalf of a table column.
// The caller has to delete the newly created object.
// <group>
// Create a scalar column.
- virtual casa::DataManagerColumn* makeScalarColumn (const casa::String& aName,
+ virtual casacore::DataManagerColumn* makeScalarColumn (const casacore::String& aName,
int aDataType,
- const casa::String& aDataTypeID);
+ const casacore::String& aDataTypeID);
// Create a direct array column.
- virtual casa::DataManagerColumn* makeDirArrColumn (const casa::String& aName,
+ virtual casacore::DataManagerColumn* makeDirArrColumn (const casacore::String& aName,
int aDataType,
- const casa::String& aDataTypeID);
+ const casacore::String& aDataTypeID);
// Create an indirect array column.
- virtual casa::DataManagerColumn* makeIndArrColumn (const casa::String& aName,
+ virtual casacore::DataManagerColumn* makeIndArrColumn (const casacore::String& aName,
int aDataType,
- const casa::String& aDataTypeID);
+ const casacore::String& aDataTypeID);
// </group>
// Initialize by reading the header info.
@@ -268,30 +268,30 @@ private:
//# Declare member variables.
// Name of data manager.
- casa::String itsDataManName;
+ casacore::String itsDataManName;
// The name of the data file.
- casa::String itsFileName;
+ casacore::String itsFileName;
// The number of rows in the columns.
- casa::uInt itsNrRows;
+ casacore::uInt itsNrRows;
// The antennae forming the baselines.
- casa::Block<casa::Int> itsAnt1;
- casa::Block<casa::Int> itsAnt2;
+ casacore::Block<casacore::Int> itsAnt1;
+ casacore::Block<casacore::Int> itsAnt2;
// The start time and interval.
double itsStartTime;
double itsTimeIntv;
- casa::uInt itsNChan;
- casa::uInt itsNPol;
+ casacore::uInt itsNChan;
+ casacore::uInt itsNPol;
// The column objects.
std::vector<EmbraceColumn*> itsColumns;
// Regular IO is used.
- casa::LargeFiledesIO* itsRegFile;
- casa::Block<float> itsBuffer; //# buffer of size itsBLDataSize for regular IO
+ casacore::LargeFiledesIO* itsRegFile;
+ casacore::Block<float> itsBuffer; //# buffer of size itsBLDataSize for regular IO
// The seqnr file (if present) is always memory-mapped because it is small.
bool itsDoSwap; //# True = byte-swapping is needed
- casa::Int64 itsBLDataSize; //# data size (in bytes) of a single baseline
- casa::Record itsSpec;
+ casacore::Int64 itsBLDataSize; //# data size (in bytes) of a single baseline
+ casacore::Record itsSpec;
- casa::uInt itsVersion; //# Version of EmbraceStMan MeasurementSet
+ casacore::uInt itsVersion; //# Version of EmbraceStMan MeasurementSet
};
diff --git a/EmbraceStMan/src/EmbraceColumn.cc b/EmbraceStMan/src/EmbraceColumn.cc
index 8668741a796b68490418122e6f2df4f13b8c671f..881c3c87779988a11c2e51038d96b1b1dacd34bf 100644
--- a/EmbraceStMan/src/EmbraceColumn.cc
+++ b/EmbraceStMan/src/EmbraceColumn.cc
@@ -22,26 +22,26 @@
#include <lofar_config.h>
#include <EmbraceStMan/EmbraceColumn.h>
-#include <tables/Tables/DataManError.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/TableRecord.h>
-#include <measures/TableMeasures/ScalarMeasColumn.h>
-#include <measures/TableMeasures/ArrayMeasColumn.h>
-#include <measures/Measures/MEpoch.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MCPosition.h>
-#include <measures/Measures/MBaseline.h>
-#include <measures/Measures/MCBaseline.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MeasTable.h>
-#include <measures/Measures/Muvw.h>
-#include <casa/Arrays/Array.h>
-#include <casa/Utilities/Assert.h>
-#include <casa/Exceptions/Error.h>
+#include <casacore/tables/DataMan/DataManError.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/TableRecord.h>
+#include <casacore/measures/TableMeasures/ScalarMeasColumn.h>
+#include <casacore/measures/TableMeasures/ArrayMeasColumn.h>
+#include <casacore/measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/measures/Measures/MBaseline.h>
+#include <casacore/measures/Measures/MCBaseline.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MeasTable.h>
+#include <casacore/measures/Measures/Muvw.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/casa/Utilities/Assert.h>
+#include <casacore/casa/Exceptions/Error.h>
-using namespace casa;
+using namespace casacore;
namespace EMBRACE {
diff --git a/EmbraceStMan/src/EmbraceStMan.cc b/EmbraceStMan/src/EmbraceStMan.cc
index 43134d0a8c1a585eba5140d5e45a822b2bcb0681..af9d0b24acf3b39bd9860f64ac1f6170e9cf60e3 100644
--- a/EmbraceStMan/src/EmbraceStMan.cc
+++ b/EmbraceStMan/src/EmbraceStMan.cc
@@ -23,18 +23,18 @@
#include <EmbraceStMan/EmbraceStMan.h>
#include <EmbraceStMan/EmbraceColumn.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/DataManError.h>
-#include <casa/Containers/Record.h>
-#include <casa/Containers/BlockIO.h>
-#include <casa/IO/AipsIO.h>
-#include <casa/OS/CanonicalConversion.h>
-#include <casa/OS/HostInfo.h>
-#include <casa/OS/DOos.h>
-#include <casa/Utilities/Assert.h>
-#include <casa/iostream.h>
-
-using namespace casa;
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/DataMan/DataManError.h>
+#include <casacore/casa/Containers/Record.h>
+#include <casacore/casa/Containers/BlockIO.h>
+#include <casacore/casa/IO/AipsIO.h>
+#include <casacore/casa/OS/CanonicalConversion.h>
+#include <casacore/casa/OS/HostInfo.h>
+#include <casacore/casa/OS/DOos.h>
+#include <casacore/casa/Utilities/Assert.h>
+#include <casacore/casa/iostream.h>
+
+using namespace casacore;
namespace EMBRACE {
diff --git a/EmbraceStMan/src/makemsembrace.cc b/EmbraceStMan/src/makemsembrace.cc
index 709703cca353ee1464be094428a4342e7da0336f..cf04caba0850eb3df918fa834245bae76e3e8f8e 100644
--- a/EmbraceStMan/src/makemsembrace.cc
+++ b/EmbraceStMan/src/makemsembrace.cc
@@ -25,19 +25,19 @@
#include <Common/ParameterSet.h>
#include <Common/LofarLogger.h>
-#include <tables/Tables/SetupNewTab.h>
-#include <tables/Tables/TableCopy.h>
-#include <tables/Tables/TableIter.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <tables/Tables/ArrayColumn.h>
-#include <casa/Containers/BlockIO.h>
-#include <casa/IO/AipsIO.h>
-#include <casa/OS/File.h>
-#include <casa/OS/Path.h>
+#include <casacore/tables/Tables/SetupNewTab.h>
+#include <casacore/tables/Tables/TableCopy.h>
+#include <casacore/tables/Tables/TableIter.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
+#include <casacore/casa/Containers/BlockIO.h>
+#include <casacore/casa/IO/AipsIO.h>
+#include <casacore/casa/OS/File.h>
+#include <casacore/casa/OS/Path.h>
using namespace EMBRACE;
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
using namespace std;
int main (int argc, char* argv[])
diff --git a/EmbraceStMan/test/tEmbraceStMan.cc b/EmbraceStMan/test/tEmbraceStMan.cc
index 2e56c890ed7afce38ba1b9ab85daa68c2dd77e88..19a51615bfc720673a16358d85c197d8479610e4 100644
--- a/EmbraceStMan/test/tEmbraceStMan.cc
+++ b/EmbraceStMan/test/tEmbraceStMan.cc
@@ -23,42 +23,42 @@
#include <EmbraceStMan/EmbraceStMan.h>
#include <Common/ParameterSet.h>
-#include <tables/Tables/TableDesc.h>
-#include <tables/Tables/SetupNewTab.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/TableLock.h>
-#include <tables/Tables/ScaColDesc.h>
-#include <tables/Tables/ArrColDesc.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <tables/Tables/ArrayColumn.h>
-#include <measures/TableMeasures/TableMeasRefDesc.h>
-#include <measures/TableMeasures/TableMeasValueDesc.h>
-#include <measures/TableMeasures/TableMeasDesc.h>
-#include <measures/TableMeasures/ScalarMeasColumn.h>
-#include <measures/TableMeasures/ArrayMeasColumn.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MCPosition.h>
-#include <casa/Arrays/Array.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayIO.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Containers/BlockIO.h>
-#include <casa/OS/RegularFile.h>
-#include <casa/OS/Path.h>
-#include <casa/Utilities/Assert.h>
-#include <casa/IO/RegularFileIO.h>
-#include <casa/IO/RawIO.h>
-#include <casa/IO/CanonicalIO.h>
-#include <casa/OS/HostInfo.h>
-#include <casa/Exceptions/Error.h>
-#include <casa/iostream.h>
-#include <casa/sstream.h>
+#include <casacore/tables/Tables/TableDesc.h>
+#include <casacore/tables/Tables/SetupNewTab.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/TableLock.h>
+#include <casacore/tables/Tables/ScaColDesc.h>
+#include <casacore/tables/Tables/ArrColDesc.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
+#include <casacore/measures/TableMeasures/TableMeasRefDesc.h>
+#include <casacore/measures/TableMeasures/TableMeasValueDesc.h>
+#include <casacore/measures/TableMeasures/TableMeasDesc.h>
+#include <casacore/measures/TableMeasures/ScalarMeasColumn.h>
+#include <casacore/measures/TableMeasures/ArrayMeasColumn.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Containers/BlockIO.h>
+#include <casacore/casa/OS/RegularFile.h>
+#include <casacore/casa/OS/Path.h>
+#include <casacore/casa/Utilities/Assert.h>
+#include <casacore/casa/IO/RegularFileIO.h>
+#include <casacore/casa/IO/RawIO.h>
+#include <casacore/casa/IO/CanonicalIO.h>
+#include <casacore/casa/OS/HostInfo.h>
+#include <casacore/casa/Exceptions/Error.h>
+#include <casacore/casa/iostream.h>
+#include <casacore/casa/sstream.h>
using namespace EMBRACE;
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
// This program tests the class EmbraceStMan and related classes.
// The results are written to stdout. The script executing this program,
diff --git a/EmbraceStMan/test/tIOPerf.cc b/EmbraceStMan/test/tIOPerf.cc
index d6b3e54b1be63578b86af59833ed01132bb0da6f..f7d53a398e85f67f74a1aaf2f340e413702a41dc 100644
--- a/EmbraceStMan/test/tIOPerf.cc
+++ b/EmbraceStMan/test/tIOPerf.cc
@@ -19,9 +19,9 @@
//#
//# $Id$
-#include <casa/Containers/Block.h>
-#include <casa/OS/Timer.h>
-#include <casa/BasicSL/String.h>
+#include <casacore/casa/Containers/Block.h>
+#include <casacore/casa/OS/Timer.h>
+#include <casacore/casa/BasicSL/String.h>
#include <Common/LofarLogger.h>
#include <unistd.h>
#include <fcntl.h>
@@ -29,7 +29,7 @@
#include <sstream>
#include <stdexcept>
-using namespace casa;
+using namespace casacore;
using namespace std;
// This program tests the class LofarStMan and related classes.
diff --git a/EmbraceStMan/test/tfix.cc b/EmbraceStMan/test/tfix.cc
index 451a7107701a155bb1eac448d638c48da0be8fab..ea90daaf36b8bff9869cd3820886bfe38a0fa767 100644
--- a/EmbraceStMan/test/tfix.cc
+++ b/EmbraceStMan/test/tfix.cc
@@ -20,14 +20,14 @@
//# $Id$
#include <LofarStMan/LofarStMan.h>
-#include <tables/Tables/TableDesc.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/ArrColDesc.h>
-#include <casa/Exceptions/Error.h>
-#include <casa/iostream.h>
+#include <casacore/tables/Tables/TableDesc.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/ArrColDesc.h>
+#include <casacore/casa/Exceptions/Error.h>
+#include <casacore/casa/iostream.h>
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
// This program adds column WEIGHT_SPECTRUM using LofarStMan.
// It adds it to the existing LofarStMan data manager in an MS, otherwise
diff --git a/LCS/AMC/AMCImpl/src/ConverterImpl.cc b/LCS/AMC/AMCImpl/src/ConverterImpl.cc
index d1e62706ed827c78a6d7ab6a0809aaf2841ca1c3..026398832c86af58541fce19e9f7d37315aa0d86 100644
--- a/LCS/AMC/AMCImpl/src/ConverterImpl.cc
+++ b/LCS/AMC/AMCImpl/src/ConverterImpl.cc
@@ -29,14 +29,14 @@
#include <AMCBase/RequestData.h>
#include <AMCBase/ResultData.h>
#include <Common/LofarLogger.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MEpoch.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MCDirection.h>
-#include <casa/Exceptions/Error.h>
-
-using namespace casa;
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/casa/Exceptions/Error.h>
+
+using namespace casacore;
namespace LOFAR
{
diff --git a/LCS/AMC/AMCImpl/src/WGS84toITRF.cc b/LCS/AMC/AMCImpl/src/WGS84toITRF.cc
index 4f99e9bb3f43495999009df8fceeaf0bda967902..fbaadf1a449c0affbe745625939d530006de457d 100644
--- a/LCS/AMC/AMCImpl/src/WGS84toITRF.cc
+++ b/LCS/AMC/AMCImpl/src/WGS84toITRF.cc
@@ -21,17 +21,17 @@
//# $Id$
#include <lofar_config.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MeasFrame.h>
-#include <measures/Measures/MCPosition.h>
-#include <casa/Exceptions/Error.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MeasFrame.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/casa/Exceptions/Error.h>
#include <Common/lofar_iostream.h>
#include <Common/lofar_iomanip.h>
#include <Common/Exception.h>
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
using namespace std;
MPosition readPos()
diff --git a/LCS/Blob/include/Blob/BlobAipsIO.h b/LCS/Blob/include/Blob/BlobAipsIO.h
index f87f0002bbb951ff4f065455893a8cc97bb5ec68..dfa20b6b32537e911c6564239a9f244f50e575ea 100644
--- a/LCS/Blob/include/Blob/BlobAipsIO.h
+++ b/LCS/Blob/include/Blob/BlobAipsIO.h
@@ -23,7 +23,7 @@
#ifndef LOFAR_BLOB_BLOBAIPSIO_H
#define LOFAR_BLOB_BLOBAIPSIO_H
-#include <casa/IO/ByteIO.h>
+#include <casacore/casa/IO/ByteIO.h>
#include <Blob/BlobOStream.h>
#include <Blob/BlobIStream.h>
@@ -43,7 +43,7 @@ namespace LOFAR {
// the same is true for gets.
// Of course, the order of reading must be the same as the order of writing.
- class BlobAipsIO: public casa::ByteIO
+ class BlobAipsIO: public casacore::ByteIO
{
public:
// Construct from a Blob buffer.
@@ -58,18 +58,18 @@ namespace LOFAR {
// An exception is thrown if the stream is not writable.
//# The 2nd write and read function are defined for the read/write signatures
//# in older casacore versions (pre v2.0).
- virtual void write (casa::Int64 size, const void* buf);
- virtual void write (casa::uInt size, const void* buf);
+ virtual void write (casacore::Int64 size, const void* buf);
+ virtual void write (casacore::uInt size, const void* buf);
// Read \a size bytes from the Blob stream. Returns the number of
// bytes actually read. Will throw an Exception (AipsError) if the
// requested number of bytes could not be read unless throwException is set
// to False.
- virtual casa::Int64 read (casa::Int64 size, void* buf, bool throwException);
- virtual casa::Int read (casa::uInt size, void* buf, bool throwException);
+ virtual casacore::Int64 read (casacore::Int64 size, void* buf, bool throwException);
+ virtual casacore::Int read (casacore::uInt size, void* buf, bool throwException);
// Get the length of the Blob stream. Returns 0 if the stream is not seekable.
- virtual casa::Int64 length();
+ virtual casacore::Int64 length();
// Is the Blob stream readable?
virtual bool isReadable() const;
@@ -90,7 +90,7 @@ private:
// Reset the position pointer to the given value. It returns the
// new position.
- virtual casa::Int64 doSeek (casa::Int64 offset, casa::ByteIO::SeekOption);
+ virtual casacore::Int64 doSeek (casacore::Int64 offset, casacore::ByteIO::SeekOption);
BlobOStream* itsOBuf;
BlobIStream* itsIBuf;
diff --git a/LCS/Blob/include/Blob/BlobArray.h b/LCS/Blob/include/Blob/BlobArray.h
index 63952a66158fa69d762f46d01dc81f1fe366d1c7..c191f149c4b181eb6c803c4187d6e760120fae2f 100644
--- a/LCS/Blob/include/Blob/BlobArray.h
+++ b/LCS/Blob/include/Blob/BlobArray.h
@@ -33,7 +33,7 @@
# include <blitz/array.h>
#endif
#if defined(HAVE_AIPSPP)
-# include <casa/Arrays/Array.h>
+# include <casacore/casa/Arrays/Array.h>
#endif
@@ -127,18 +127,18 @@ namespace LOFAR
#if defined(HAVE_AIPSPP)
// Write an AIPS++ array (which can be non-contiguous).
template<typename T>
- BlobOStream& operator<< (BlobOStream&, const casa::Array<T>&);
+ BlobOStream& operator<< (BlobOStream&, const casacore::Array<T>&);
// Read back an AIPS++ array.
// If the shape mismatches, the array is resized.
// If the shape matches, the array can be non-contiguous.
template<typename T>
- BlobIStream& operator>> (BlobIStream&, casa::Array<T>&);
+ BlobIStream& operator>> (BlobIStream&, casacore::Array<T>&);
// Write/read the shape of an AIPS++ array.
// <group>
- BlobOStream& operator<< (BlobOStream&, const casa::IPosition&);
- BlobIStream& operator>> (BlobIStream&, casa::IPosition&);
+ BlobOStream& operator<< (BlobOStream&, const casacore::IPosition&);
+ BlobIStream& operator>> (BlobIStream&, casacore::IPosition&);
// </group>
#endif
diff --git a/LCS/Blob/src/BlobAipsIO.cc b/LCS/Blob/src/BlobAipsIO.cc
index 2598920969542fcf3e711d4684a72e579fc51228..f20318ba4493a645376b035888f20ab4dd65790a 100644
--- a/LCS/Blob/src/BlobAipsIO.cc
+++ b/LCS/Blob/src/BlobAipsIO.cc
@@ -28,7 +28,7 @@
#include <Blob/BlobAipsIO.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
diff --git a/LCS/Blob/src/BlobArray.cc b/LCS/Blob/src/BlobArray.cc
index ff6b27543fa07377675795454f2852c63740713a..94f57cc1115783dbe7aeaea196272e4d7d7cc2d7 100644
--- a/LCS/Blob/src/BlobArray.cc
+++ b/LCS/Blob/src/BlobArray.cc
@@ -131,7 +131,7 @@ BlobIStream& operator>> (BlobIStream& bs, std::vector<bool>& vec)
}
#if defined(HAVE_AIPSPP)
-BlobOStream& operator<< (BlobOStream& bs, const casa::IPosition& ipos)
+BlobOStream& operator<< (BlobOStream& bs, const casacore::IPosition& ipos)
{
uint64 size = ipos.size();
putBlobArrayHeader (bs, true,
@@ -143,7 +143,7 @@ BlobOStream& operator<< (BlobOStream& bs, const casa::IPosition& ipos)
return bs;
}
-BlobIStream& operator>> (BlobIStream& bs, casa::IPosition& ipos)
+BlobIStream& operator>> (BlobIStream& bs, casacore::IPosition& ipos)
{
bs.getStart (LOFAR::typeName((const int64**)0));
bool fortranOrder;
diff --git a/LCS/Blob/test/tBlobAipsIO.cc b/LCS/Blob/test/tBlobAipsIO.cc
index 81a3947c1c2d40b202c0957ec6c628a8e25f73fb..8997ebcfb45111deb6a285d855eca75b16f45d92 100644
--- a/LCS/Blob/test/tBlobAipsIO.cc
+++ b/LCS/Blob/test/tBlobAipsIO.cc
@@ -28,10 +28,10 @@
#include <Blob/BlobAipsIO.h>
#include <Blob/BlobOBufChar.h>
#include <Blob/BlobIBufChar.h>
-#include <casa/IO/AipsIO.h>
+#include <casacore/casa/IO/AipsIO.h>
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
void doIt()
{
diff --git a/LCS/Blob/test/tBlobCasa.cc b/LCS/Blob/test/tBlobCasa.cc
index da9ac9d6558ee936686a753d256c842b74e1cee9..33f2bb999794337c33fb601d47122cad57834613 100644
--- a/LCS/Blob/test/tBlobCasa.cc
+++ b/LCS/Blob/test/tBlobCasa.cc
@@ -29,10 +29,10 @@
#include <Blob/BlobString.h>
#include <Blob/BlobOBufString.h>
#include <Blob/BlobIBufString.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/BasicSL/Complex.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/BasicSL/Complex.h>
using namespace LOFAR;
@@ -42,25 +42,25 @@ void doOut (BlobOBuffer& bb)
BlobOStream bs(bb);
bs.putStart ("test", 1);
// Create and fill a 3-dim array.
- casa::IPosition shp(3,2,3,4);
+ casacore::IPosition shp(3,2,3,4);
bs << shp;
- casa::Array<double> arr(shp);
+ casacore::Array<double> arr(shp);
indgen (arr);
bs << arr;
// Create an int vector.
- std::vector<casa::Int64> vec(2);
+ std::vector<casacore::Int64> vec(2);
vec[0] = 10;
vec[1] = 11;
bs << vec;
// Create an empty vector.
- casa::Vector<casa::String> empVec;
+ casacore::Vector<casacore::String> empVec;
bs << empVec;
// Create a complex vector.
- casa::Vector<casa::DComplex> vecc(1);
- vecc[0] = casa::DComplex(2,3);
+ casacore::Vector<casacore::DComplex> vecc(1);
+ vecc[0] = casacore::DComplex(2,3);
bs << vecc;
// Create a string vector.
- casa::Vector<casa::String> vecs(2);
+ casacore::Vector<casacore::String> vecs(2);
vecs[0] = "str1";
vecs[1] = "str1a";
bs << vecs;
@@ -74,17 +74,17 @@ void doIn (BlobIBuffer& bb)
BlobIStream bs(bb);
bs.getStart ("test");
// Read the shape as a vector.
- std::vector<casa::Int64> vec(1,100);
+ std::vector<casacore::Int64> vec(1,100);
bs >> vec;
// Read the array.
- casa::Array<double> arr;
+ casacore::Array<double> arr;
bs >> arr;
// Check the values.
ASSERT (vec.size() == 3);
ASSERT (vec[0] == 2 && vec[1] == 3 && vec[2] == 4);
- casa::IPosition shp(3,2,3,4);
+ casacore::IPosition shp(3,2,3,4);
ASSERT (arr.shape() == shp);
- casa::Array<double> arr2(shp);
+ casacore::Array<double> arr2(shp);
indgen(arr2);
ASSERT (allEQ(arr, arr2));
// Read the vector as a shape.
@@ -92,15 +92,15 @@ void doIn (BlobIBuffer& bb)
ASSERT (shp.size() == 2);
ASSERT (shp[0] = 10 && shp[1] == 11);
// Get the empty vector.
- casa::Vector<casa::String> vecs(1);
+ casacore::Vector<casacore::String> vecs(1);
vecs[0] = "a";
bs >> vecs;
ASSERT (vecs.size() == 0);
// Get the complex vector.
- casa::Vector<casa::DComplex> vecc;
+ casacore::Vector<casacore::DComplex> vecc;
bs >> vecc;
ASSERT (vecc.size() == 1);
- ASSERT (vecc[0] == casa::DComplex(2,3));
+ ASSERT (vecc[0] == casacore::DComplex(2,3));
// Get the string vector.
bs >> vecs;
ASSERT (vecs.size() == 2);
diff --git a/LCS/Common/include/Common/CasaLogSink.h b/LCS/Common/include/Common/CasaLogSink.h
index d03dcd3359d2c4fecce37ba023c41b7e8a51b24f..bc5c29ca48028cacf4a762fcab39c935f3bdd620 100644
--- a/LCS/Common/include/Common/CasaLogSink.h
+++ b/LCS/Common/include/Common/CasaLogSink.h
@@ -31,8 +31,8 @@
#ifdef HAVE_AIPSPP
//#Includes
-#include <casa/Logging/LogSink.h>
-#include <casa/Logging/LogFilter.h>
+#include <casacore/casa/Logging/LogSink.h>
+#include <casacore/casa/Logging/LogFilter.h>
namespace LOFAR {
@@ -46,7 +46,7 @@ namespace LOFAR {
// CasaLogSink::attach();
// @endcode
- class CasaLogSink : public casa::LogSinkInterface
+ class CasaLogSink : public casacore::LogSinkInterface
{
public:
// By default no filtering is done.
@@ -54,8 +54,8 @@ namespace LOFAR {
// Create the sink with the given filter (level).
// @{
- explicit CasaLogSink (casa::LogMessage::Priority filter);
- explicit CasaLogSink (const casa::LogFilterInterface& filter);
+ explicit CasaLogSink (casacore::LogMessage::Priority filter);
+ explicit CasaLogSink (const casacore::LogFilterInterface& filter);
// @}
~CasaLogSink();
@@ -64,15 +64,15 @@ namespace LOFAR {
static void attach();
// If the message passes the filter, write it to the log4cxx sink.
- virtual casa::Bool postLocally (const casa::LogMessage& message);
+ virtual casacore::Bool postLocally (const casacore::LogMessage& message);
// Clear the local sink (i.e. remove all messages from it).
virtual void clearLocally();
// Returns the id for this class...
- static casa::String localId();
+ static casacore::String localId();
// Returns the id of the LogSink in use...
- casa::String id() const;
+ casacore::String id() const;
private:
// Copying is forbidden.
diff --git a/LCS/Common/include/Common/InputParSet.h b/LCS/Common/include/Common/InputParSet.h
index a072cff2baed1c461734238f2c48ed5972054a2d..0c206f2e6e2ae1d565b28b392f0e00f1924e5ac9 100644
--- a/LCS/Common/include/Common/InputParSet.h
+++ b/LCS/Common/include/Common/InputParSet.h
@@ -30,10 +30,14 @@
//# Includes
#include <Common/ParameterSet.h>
+#ifdef HAVE_AIPSPP
+# include <casacore/casa/Inputs/Input.h>
+#else
//# Forward declare Input.
-namespace casa {
+namespace casacore {
class Input;
}
+#endif
namespace LOFAR {
@@ -105,7 +109,7 @@ namespace LOFAR {
string getDefault (map<string,IPV>::const_iterator iter) const;
ParameterSet itsParSet;
- casa::Input* itsInput;
+ casacore::Input* itsInput;
bool itsUsePS; //# true = use ParameterSet
string itsVersion;
map<string, IPV> itsParms;
diff --git a/LCS/Common/src/CasaLogSink.cc b/LCS/Common/src/CasaLogSink.cc
index c8d6bd014af8b226008d09f979543d282c7608e7..d6de31d85938a538df6a64f1ce8e67c6160bfe32 100644
--- a/LCS/Common/src/CasaLogSink.cc
+++ b/LCS/Common/src/CasaLogSink.cc
@@ -33,15 +33,15 @@ namespace LOFAR {
#ifdef HAVE_AIPSPP
CasaLogSink::CasaLogSink()
- : casa::LogSinkInterface (casa::LogFilter())
+ : casacore::LogSinkInterface (casacore::LogFilter())
{}
- CasaLogSink::CasaLogSink (casa::LogMessage::Priority filter)
- : casa::LogSinkInterface (casa::LogFilter(filter))
+ CasaLogSink::CasaLogSink (casacore::LogMessage::Priority filter)
+ : casacore::LogSinkInterface (casacore::LogFilter(filter))
{}
- CasaLogSink::CasaLogSink (const casa::LogFilterInterface& filter)
- : casa::LogSinkInterface (filter)
+ CasaLogSink::CasaLogSink (const casacore::LogFilterInterface& filter)
+ : casacore::LogSinkInterface (filter)
{}
CasaLogSink::~CasaLogSink()
@@ -49,41 +49,41 @@ namespace LOFAR {
void CasaLogSink::attach()
{
- casa::LogSinkInterface* globalSink = new LOFAR::CasaLogSink;
+ casacore::LogSinkInterface* globalSink = new LOFAR::CasaLogSink;
// Note that the pointer is taken over by LogSink.
- casa::LogSink::globalSink (globalSink);
+ casacore::LogSink::globalSink (globalSink);
}
- casa::Bool CasaLogSink::postLocally (const casa::LogMessage& message)
+ casacore::Bool CasaLogSink::postLocally (const casacore::LogMessage& message)
{
- casa::Bool posted = casa::False;
+ casacore::Bool posted = casacore::False;
if (filter().pass(message)) {
std::string msg (message.origin().location() + ": " + message.message());
- posted = casa::True;
+ posted = casacore::True;
switch (message.priority()) {
- case casa::LogMessage::DEBUGGING:
- case casa::LogMessage::DEBUG2:
- case casa::LogMessage::DEBUG1:
+ case casacore::LogMessage::DEBUGGING:
+ case casacore::LogMessage::DEBUG2:
+ case casacore::LogMessage::DEBUG1:
{
LOG_DEBUG (msg);
break;
}
- case casa::LogMessage::NORMAL5:
- case casa::LogMessage::NORMAL4:
- case casa::LogMessage::NORMAL3:
- case casa::LogMessage::NORMAL2:
- case casa::LogMessage::NORMAL1:
- case casa::LogMessage::NORMAL:
+ case casacore::LogMessage::NORMAL5:
+ case casacore::LogMessage::NORMAL4:
+ case casacore::LogMessage::NORMAL3:
+ case casacore::LogMessage::NORMAL2:
+ case casacore::LogMessage::NORMAL1:
+ case casacore::LogMessage::NORMAL:
{
LOG_INFO (msg);
break;
}
- case casa::LogMessage::WARN:
+ case casacore::LogMessage::WARN:
{
LOG_WARN (msg);
break;
}
- case casa::LogMessage::SEVERE:
+ case casacore::LogMessage::SEVERE:
{
LOG_ERROR (msg);
break;
@@ -96,14 +96,14 @@ namespace LOFAR {
void CasaLogSink::clearLocally()
{}
- casa::String CasaLogSink::localId()
+ casacore::String CasaLogSink::localId()
{
- return casa::String("CasaLogSink");
+ return casacore::String("CasaLogSink");
}
- casa::String CasaLogSink::id() const
+ casacore::String CasaLogSink::id() const
{
- return casa::String("CasaLogSink");
+ return casacore::String("CasaLogSink");
}
#else
diff --git a/LCS/Common/src/InputParSet.cc b/LCS/Common/src/InputParSet.cc
index a075948e5a18babf2c9fdefb5f4ab5bee5875f76..446da70e35c349c8c82780342529639f7b624f1f 100644
--- a/LCS/Common/src/InputParSet.cc
+++ b/LCS/Common/src/InputParSet.cc
@@ -24,7 +24,7 @@
#include <Common/InputParSet.h>
#include <Common/Exceptions.h>
#ifdef HAVE_AIPSPP
-# include <casa/Inputs/Input.h>
+# include <casacore/casa/Inputs/Input.h>
#endif
// Read input args from command line if given as key=value or as --key value
@@ -40,7 +40,7 @@ namespace LOFAR {
itsUsePS (false)
{
#ifdef HAVE_AIPSPP
- itsInput = new casa::Input;
+ itsInput = new casacore::Input;
#endif
}
@@ -126,7 +126,7 @@ namespace LOFAR {
return pv.getDoubleVector();
}
#ifdef HAVE_AIPSPP
- casa::Block<double> vals (itsInput->getDoubleArray (key));
+ casacore::Block<double> vals (itsInput->getDoubleArray (key));
return vector<double>(vals.begin(), vals.end());
#endif
return vector<double>();
@@ -167,7 +167,7 @@ namespace LOFAR {
return pv.getIntVector();
}
#ifdef HAVE_AIPSPP
- casa::Block<int> vals (itsInput->getIntArray (key));
+ casacore::Block<int> vals (itsInput->getIntArray (key));
return vector<int>(vals.begin(), vals.end());
#endif
return vector<int>();
diff --git a/LCS/Common/test/tCasaLogSink.cc b/LCS/Common/test/tCasaLogSink.cc
index 88d4a493ce12cd4f340a4a9b4cc628589b6bc45d..523fb0f28e976ee272eee4aa43f8eb48ecb359a0 100644
--- a/LCS/Common/test/tCasaLogSink.cc
+++ b/LCS/Common/test/tCasaLogSink.cc
@@ -27,7 +27,7 @@
#include <Common/lofar_iostream.h>
#ifdef HAVE_AIPSPP
-#include <casa/Logging/LogIO.h>
+#include <casacore/casa/Logging/LogIO.h>
#endif
using namespace LOFAR;
@@ -38,11 +38,11 @@ int main()
#ifdef HAVE_AIPSPP
cout << "writing to casa logger ..." << endl;
- casa::LogIO logger;
- logger << casa::LogIO::DEBUG1 << "debug message" << casa::LogIO::POST;
- logger << casa::LogIO::NORMAL << "normal message" << casa::LogIO::POST;
- logger << casa::LogIO::WARN << "warn message" << casa::LogIO::POST;
- logger << casa::LogIO::SEVERE << "error message" << casa::LogIO::POST;
+ casacore::LogIO logger;
+ logger << casacore::LogIO::DEBUG1 << "debug message" << casacore::LogIO::POST;
+ logger << casacore::LogIO::NORMAL << "normal message" << casacore::LogIO::POST;
+ logger << casacore::LogIO::WARN << "warn message" << casacore::LogIO::POST;
+ logger << casacore::LogIO::SEVERE << "error message" << casacore::LogIO::POST;
#endif
return 0;
diff --git a/LCS/LofarStMan/include/LofarStMan/LofarColumn.h b/LCS/LofarStMan/include/LofarStMan/LofarColumn.h
index fe6a45dcc601c487039771f3c10309c41c51048e..a34db085467bed5af271adaf7cf83359af861654 100644
--- a/LCS/LofarStMan/include/LofarStMan/LofarColumn.h
+++ b/LCS/LofarStMan/include/LofarStMan/LofarColumn.h
@@ -27,17 +27,17 @@
#include <LofarStMan/LofarStMan.h>
#include <Common/lofar_vector.h>
#if defined(casacore)
-#include <tables/DataMan/StManColumn.h>
+#include <casacore/tables/DataMan/StManColumn.h>
#else
-#include <tables/Tables/StManColumn.h>
+#include <casacore/tables/DataMan/StManColumn.h>
#endif
-#include <measures/Measures/MeasFrame.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MBaseline.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/Arrays/IPosition.h>
-#include <casa/Containers/Block.h>
-#include <casa/OS/Conversion.h>
+#include <casacore/measures/Measures/MeasFrame.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MBaseline.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/IPosition.h>
+#include <casacore/casa/Containers/Block.h>
+#include <casacore/casa/OS/Conversion.h>
namespace LOFAR {
@@ -59,7 +59,7 @@ namespace LOFAR {
// For each column a specific Column class exists.
// </synopsis>
-class LofarColumn : public casa::StManColumn
+class LofarColumn : public casacore::StManColumn
{
public:
explicit LofarColumn (LofarStMan* parent, int dtype)
@@ -68,9 +68,9 @@ public:
{}
virtual ~LofarColumn();
// Most columns are not writable (only DATA is writable).
- virtual casa::Bool isWritable() const;
+ virtual casacore::Bool isWritable() const;
// Set column shape of fixed shape columns; it does nothing.
- virtual void setShapeColumn (const casa::IPosition& shape);
+ virtual void setShapeColumn (const casacore::IPosition& shape);
// Prepare the column. By default it does nothing.
virtual void prepareCol();
protected:
@@ -85,7 +85,7 @@ public:
explicit Ant1Column (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~Ant1Column();
- virtual void getIntV (casa::uInt rowNr, casa::Int* dataPtr);
+ virtual void getIntV (casacore::uInt rowNr, casacore::Int* dataPtr);
};
// <summary>ANTENNA2 column in the LOFAR Storage Manager.</summary>
@@ -96,7 +96,7 @@ public:
explicit Ant2Column (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~Ant2Column();
- virtual void getIntV (casa::uInt rowNr, casa::Int* dataPtr);
+ virtual void getIntV (casacore::uInt rowNr, casacore::Int* dataPtr);
};
// <summary>TIME and TIME_CENTROID column in the LOFAR Storage Manager.</summary>
@@ -107,9 +107,9 @@ public:
explicit TimeColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~TimeColumn();
- virtual void getdoubleV (casa::uInt rowNr, casa::Double* dataPtr);
+ virtual void getdoubleV (casacore::uInt rowNr, casacore::Double* dataPtr);
private:
- casa::Double itsValue;
+ casacore::Double itsValue;
};
// <summary>INTERVAL and EXPOSURE column in the LOFAR Storage Manager.</summary>
@@ -120,9 +120,9 @@ public:
explicit IntervalColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~IntervalColumn();
- virtual void getdoubleV (casa::uInt rowNr, casa::Double* dataPtr);
+ virtual void getdoubleV (casacore::uInt rowNr, casacore::Double* dataPtr);
private:
- casa::Double itsValue;
+ casacore::Double itsValue;
};
// <summary>All columns in the LOFAR Storage Manager with value 0.</summary>
@@ -133,9 +133,9 @@ public:
explicit ZeroColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~ZeroColumn();
- virtual void getIntV (casa::uInt rowNr, casa::Int* dataPtr);
+ virtual void getIntV (casacore::uInt rowNr, casacore::Int* dataPtr);
private:
- casa::Int itsValue;
+ casacore::Int itsValue;
};
// <summary>All columns in the LOFAR Storage Manager with value False.</summary>
@@ -146,9 +146,9 @@ public:
explicit FalseColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~FalseColumn();
- virtual void getBoolV (casa::uInt rowNr, casa::Bool* dataPtr);
+ virtual void getBoolV (casacore::uInt rowNr, casacore::Bool* dataPtr);
private:
- casa::Bool itsValue;
+ casacore::Bool itsValue;
};
// <summary>UVW column in the LOFAR Storage Manager.</summary>
@@ -159,17 +159,17 @@ public:
explicit UvwColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~UvwColumn();
- virtual casa::IPosition shape (casa::uInt rownr);
- virtual void getArraydoubleV (casa::uInt rowNr,
- casa::Array<casa::Double>* dataPtr);
+ virtual casacore::IPosition shape (casacore::uInt rownr);
+ virtual void getArraydoubleV (casacore::uInt rowNr,
+ casacore::Array<casacore::Double>* dataPtr);
virtual void prepareCol();
private:
- casa::MDirection itsPhaseDir; //# could be SUN, etc.
- casa::MDirection itsJ2000Dir; //# Phase dir in J2000
- casa::MeasFrame itsFrame;
- vector<casa::MBaseline> itsAntMB;
- vector<casa::Vector<double> > itsAntUvw;
- casa::Block<bool> itsUvwFilled;
+ casacore::MDirection itsPhaseDir; //# could be SUN, etc.
+ casacore::MDirection itsJ2000Dir; //# Phase dir in J2000
+ casacore::MeasFrame itsFrame;
+ vector<casacore::MBaseline> itsAntMB;
+ vector<casacore::Vector<double> > itsAntUvw;
+ casacore::Block<bool> itsUvwFilled;
int itsLastBlNr;
bool itsCanCalc; //# false = UVW cannot be calc.
};
@@ -182,12 +182,12 @@ public:
explicit DataColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~DataColumn();
- virtual casa::Bool isWritable() const;
- virtual casa::IPosition shape (casa::uInt rownr);
- virtual void getArrayComplexV (casa::uInt rowNr,
- casa::Array<casa::Complex>* dataPtr);
- virtual void putArrayComplexV (casa::uInt rowNr,
- const casa::Array<casa::Complex>* dataPtr);
+ virtual casacore::Bool isWritable() const;
+ virtual casacore::IPosition shape (casacore::uInt rownr);
+ virtual void getArrayComplexV (casacore::uInt rowNr,
+ casacore::Array<casacore::Complex>* dataPtr);
+ virtual void putArrayComplexV (casacore::uInt rowNr,
+ const casacore::Array<casacore::Complex>* dataPtr);
};
// <summary>FLAG column in the LOFAR Storage Manager.</summary>
@@ -198,9 +198,9 @@ public:
explicit FlagColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~FlagColumn();
- virtual casa::IPosition shape (casa::uInt rownr);
- virtual void getArrayBoolV (casa::uInt rowNr,
- casa::Array<casa::Bool>* dataPtr);
+ virtual casacore::IPosition shape (casacore::uInt rownr);
+ virtual void getArrayBoolV (casacore::uInt rowNr,
+ casacore::Array<casacore::Bool>* dataPtr);
};
// <summary>WEIGHT column in the LOFAR Storage Manager.</summary>
@@ -211,9 +211,9 @@ public:
explicit WeightColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~WeightColumn();
- virtual casa::IPosition shape (casa::uInt rownr);
- virtual void getArrayfloatV (casa::uInt rowNr,
- casa::Array<casa::Float>* dataPtr);
+ virtual casacore::IPosition shape (casacore::uInt rownr);
+ virtual void getArrayfloatV (casacore::uInt rowNr,
+ casacore::Array<casacore::Float>* dataPtr);
};
// <summary>SIGMA column in the LOFAR Storage Manager.</summary>
@@ -224,9 +224,9 @@ public:
explicit SigmaColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~SigmaColumn();
- virtual casa::IPosition shape (casa::uInt rownr);
- virtual void getArrayfloatV (casa::uInt rowNr,
- casa::Array<casa::Float>* dataPtr);
+ virtual casacore::IPosition shape (casacore::uInt rownr);
+ virtual void getArrayfloatV (casacore::uInt rowNr,
+ casacore::Array<casacore::Float>* dataPtr);
};
// <summary>WEIGHT_SPECTRUM column in the LOFAR Storage Manager.</summary>
@@ -237,9 +237,9 @@ public:
explicit WSpectrumColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~WSpectrumColumn();
- virtual casa::IPosition shape (casa::uInt rownr);
- virtual void getArrayfloatV (casa::uInt rowNr,
- casa::Array<casa::Float>* dataPtr);
+ virtual casacore::IPosition shape (casacore::uInt rownr);
+ virtual void getArrayfloatV (casacore::uInt rowNr,
+ casacore::Array<casacore::Float>* dataPtr);
};
// <summary>FLAG_CATEGORY column in the LOFAR Storage Manager.</summary>
@@ -250,8 +250,8 @@ public:
explicit FlagCatColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~FlagCatColumn();
- virtual casa::Bool isShapeDefined (casa::uInt rownr);
- virtual casa::IPosition shape (casa::uInt rownr);
+ virtual casacore::Bool isShapeDefined (casacore::uInt rownr);
+ virtual casacore::IPosition shape (casacore::uInt rownr);
};
diff --git a/LCS/LofarStMan/include/LofarStMan/LofarStMan.h b/LCS/LofarStMan/include/LofarStMan/LofarStMan.h
index 546581bb612cbc2f4fb49b9014393912dc487042..4befb110f61cec02becb6dc767562e2aae427794 100644
--- a/LCS/LofarStMan/include/LofarStMan/LofarStMan.h
+++ b/LCS/LofarStMan/include/LofarStMan/LofarStMan.h
@@ -23,11 +23,11 @@
#define LOFAR_LOFARSTMAN_LOFARSTMAN_H
//# Includes
-#include <tables/Tables/DataManager.h>
-#include <casa/IO/MMapIO.h>
-#include <casa/IO/LargeFiledesIO.h>
-#include <casa/Containers/Block.h>
-#include <casa/Containers/Record.h>
+#include <casacore/tables/DataMan/DataManager.h>
+#include <casacore/casa/IO/MMapIO.h>
+#include <casacore/casa/IO/FiledesIO.h>
+#include <casacore/casa/Containers/Block.h>
+#include <casacore/casa/Containers/Record.h>
#include <Common/LofarTypes.h>
#include <Common/lofar_vector.h>
@@ -114,55 +114,55 @@ class LofarColumn;
//# </todo>
-class LofarStMan : public casa::DataManager
+class LofarStMan : public casacore::DataManager
{
public:
// Create a Lofar storage manager with the given name.
// If no name is used, it is set to "LofarStMan"
- explicit LofarStMan (const casa::String& dataManagerName = "LofarStMan");
+ explicit LofarStMan (const casacore::String& dataManagerName = "LofarStMan");
// Create a Lofar storage manager with the given name.
// The specifications are part of the record (as created by dataManagerSpec).
- LofarStMan (const casa::String& dataManagerName, const casa::Record& spec);
+ LofarStMan (const casacore::String& dataManagerName, const casacore::Record& spec);
~LofarStMan();
// Clone this object.
- virtual casa::DataManager* clone() const;
+ virtual casacore::DataManager* clone() const;
// Get the type name of the data manager (i.e. LofarStMan).
- virtual casa::String dataManagerType() const;
+ virtual casacore::String dataManagerType() const;
// Get the name given to the storage manager (in the constructor).
- virtual casa::String dataManagerName() const;
+ virtual casacore::String dataManagerName() const;
// Record a record containing data manager specifications.
- virtual casa::Record dataManagerSpec() const;
+ virtual casacore::Record dataManagerSpec() const;
// Get the number of rows in this storage manager.
uint getNRow() const
{ return itsNrRows; }
// The storage manager is not a regular one.
- virtual casa::Bool isRegular() const;
+ virtual casacore::Bool isRegular() const;
// The storage manager cannot add rows.
- virtual casa::Bool canAddRow() const;
+ virtual casacore::Bool canAddRow() const;
// The storage manager cannot delete rows.
- virtual casa::Bool canRemoveRow() const;
+ virtual casacore::Bool canRemoveRow() const;
// The storage manager can add columns, which does not really do something.
- virtual casa::Bool canAddColumn() const;
+ virtual casacore::Bool canAddColumn() const;
// Columns can be removed, but it does not do anything at all.
- virtual casa::Bool canRemoveColumn() const;
+ virtual casacore::Bool canRemoveColumn() const;
// Make the object from the type name string.
// This function gets registered in the DataManager "constructor" map.
// The caller has to delete the object.
- static casa::DataManager* makeObject (const casa::String& aDataManType,
- const casa::Record& spec);
+ static casacore::DataManager* makeObject (const casacore::String& aDataManType,
+ const casacore::Record& spec);
// Register the class name and the static makeObject "constructor".
// This will make the engine known to the table system.
@@ -171,9 +171,9 @@ public:
// Get data.
// <group>
- const casa::Block<int32>& ant1() const
+ const casacore::Block<int32>& ant1() const
{ return itsAnt1; }
- const casa::Block<int32>& ant2() const
+ const casacore::Block<int32>& ant2() const
{ return itsAnt2; }
double time (uint blocknr);
double interval() const
@@ -184,12 +184,12 @@ public:
{ return itsNPol; }
double maxnSample() const
{ return itsMaxNrSample; }
- void getData (uint rownr, casa::Complex* buf);
- void putData (uint rownr, const casa::Complex* buf);
+ void getData (uint rownr, casacore::Complex* buf);
+ void putData (uint rownr, const casacore::Complex* buf);
- const casa::uChar* getNSample1 (uint rownr, bool swapIfNeeded);
- const casa::uShort* getNSample2 (uint rownr, bool swapIfNeeded);
- const casa::uInt* getNSample4 (uint rownr, bool swapIfNeeded);
+ const casacore::uChar* getNSample1 (uint rownr, bool swapIfNeeded);
+ const casacore::uShort* getNSample2 (uint rownr, bool swapIfNeeded);
+ const casacore::uInt* getNSample4 (uint rownr, bool swapIfNeeded);
// </group>
uint getLofarStManVersion() const
@@ -207,17 +207,17 @@ private:
// Flush and optionally fsync the data.
// It does nothing, and returns False.
- virtual casa::Bool flush (casa::AipsIO&, casa::Bool doFsync);
+ virtual casacore::Bool flush (casacore::AipsIO&, casacore::Bool doFsync);
// Let the storage manager create files as needed for a new table.
// This allows a column with an indirect array to create its file.
- virtual void create (casa::uInt nrrow);
+ virtual void create (casacore::uInt nrrow);
// Open the storage manager file for an existing table.
// Return the number of rows in the data file.
// <group>
- virtual void open (casa::uInt nrrow, casa::AipsIO&); //# should never be called
- virtual casa::uInt open1 (casa::uInt nrrow, casa::AipsIO&);
+ virtual void open (casacore::uInt nrrow, casacore::AipsIO&); //# should never be called
+ virtual casacore::uInt open1 (casacore::uInt nrrow, casacore::AipsIO&);
// </group>
// Prepare the columns (needed for UvwColumn).
@@ -226,8 +226,8 @@ private:
// Resync the storage manager with the new file contents.
// It does nothing.
// <group>
- virtual void resync (casa::uInt nrrow); //# should never be called
- virtual casa::uInt resync1 (casa::uInt nrrow);
+ virtual void resync (casacore::uInt nrrow); //# should never be called
+ virtual casacore::uInt resync1 (casacore::uInt nrrow);
// </group>
// Reopen the storage manager files for read/write.
@@ -241,35 +241,35 @@ private:
// Add rows to the storage manager.
// It cannot do it, so throws an exception.
- virtual void addRow (casa::uInt nrrow);
+ virtual void addRow (casacore::uInt nrrow);
// Delete a row from all columns.
// It cannot do it, so throws an exception.
- virtual void removeRow (casa::uInt rowNr);
+ virtual void removeRow (casacore::uInt rowNr);
// Do the final addition of a column.
// It won't do anything.
- virtual void addColumn (casa::DataManagerColumn*);
+ virtual void addColumn (casacore::DataManagerColumn*);
// Remove a column from the data file.
// It won't do anything.
- virtual void removeColumn (casa::DataManagerColumn*);
+ virtual void removeColumn (casacore::DataManagerColumn*);
// Create a column in the storage manager on behalf of a table column.
// The caller has to delete the newly created object.
// <group>
// Create a scalar column.
- virtual casa::DataManagerColumn* makeScalarColumn (const casa::String& aName,
+ virtual casacore::DataManagerColumn* makeScalarColumn (const casacore::String& aName,
int aDataType,
- const casa::String& aDataTypeID);
+ const casacore::String& aDataTypeID);
// Create a direct array column.
- virtual casa::DataManagerColumn* makeDirArrColumn (const casa::String& aName,
+ virtual casacore::DataManagerColumn* makeDirArrColumn (const casacore::String& aName,
int aDataType,
- const casa::String& aDataTypeID);
+ const casacore::String& aDataTypeID);
// Create an indirect array column.
- virtual casa::DataManagerColumn* makeIndArrColumn (const casa::String& aName,
+ virtual casacore::DataManagerColumn* makeIndArrColumn (const casacore::String& aName,
int aDataType,
- const casa::String& aDataTypeID);
+ const casacore::String& aDataTypeID);
// </group>
// Initialize by reading the header info.
@@ -288,39 +288,39 @@ private:
void closeFiles();
// Get a pointer to data to be read.
- const void* getReadPointer (casa::uInt blocknr, casa::uInt offset,
- casa::uInt size)
+ const void* getReadPointer (casacore::uInt blocknr, casacore::uInt offset,
+ casacore::uInt size)
{
return readFile (blocknr, offset, size);
}
// Get a pointer where data can be written.
- void* getWritePointer (casa::uInt /*blocknr*/, casa::uInt /*offset*/,
- casa::uInt size)
+ void* getWritePointer (casacore::uInt /*blocknr*/, casacore::uInt /*offset*/,
+ casacore::uInt size)
{
return getBuffer (size);
}
// Write the data. It is a no-op if mmap is used.
- void writeData (casa::uInt blocknr, casa::uInt offset, casa::uInt size)
+ void writeData (casacore::uInt blocknr, casacore::uInt offset, casacore::uInt size)
{
writeFile (blocknr, offset, size);
}
// Read or write the data for regular files.
- void* readFile (casa::uInt blocknr, casa::uInt offset, casa::uInt size);
- void* getBuffer (casa::uInt size);
- void writeFile (casa::uInt blocknr, casa::uInt offset, casa::uInt size);
+ void* readFile (casacore::uInt blocknr, casacore::uInt offset, casacore::uInt size);
+ void* getBuffer (casacore::uInt size);
+ void writeFile (casacore::uInt blocknr, casacore::uInt offset, casacore::uInt size);
//# Declare member variables.
// Name of data manager.
- casa::String itsDataManName;
+ casacore::String itsDataManName;
// The number of rows in the columns.
uint itsNrRows;
// The antennae forming the baselines.
- casa::Block<int32> itsAnt1;
- casa::Block<int32> itsAnt2;
+ casacore::Block<int32> itsAnt1;
+ casacore::Block<int32> itsAnt2;
// The start time and interval.
double itsStartTime;
double itsTimeIntv;
@@ -331,21 +331,21 @@ private:
vector<LofarColumn*> itsColumns;
// On 32-bit systems regular IO is used.
int itsFD;
- casa::LargeFiledesIO* itsRegFile;
- casa::Block<char> itsBuffer; //# buffer of size itsBLDataSize for regular IO
+ casacore::FiledesIO* itsRegFile;
+ casacore::Block<char> itsBuffer; //# buffer of size itsBLDataSize for regular IO
// The seqnr file (if present) is always memory-mapped because it is small.
- casa::MMapIO* itsSeqFile;
+ casacore::MMapIO* itsSeqFile;
bool itsDoSwap; //# True = byte-swapping is needed
int64 itsBlockSize; //# size of a block containing a seqnr
int64 itsBLDataSize; //# data size of a single baseline
int64 itsDataStart; //# start of data in a block
int64 itsSampStart; //# start of nsamples in a block
//# Buffer to hold nsample values.
- casa::Block<casa::uChar> itsNSampleBuf1;
- casa::Block<casa::uShort> itsNSampleBuf2;
- casa::Block<casa::uInt> itsNSampleBuf4;
+ casacore::Block<casacore::uChar> itsNSampleBuf1;
+ casacore::Block<casacore::uShort> itsNSampleBuf2;
+ casacore::Block<casacore::uInt> itsNSampleBuf4;
double itsMaxNrSample; //# weight = nsample / itsMaxNrSample;
- casa::Record itsSpec;
+ casacore::Record itsSpec;
uint itsVersion; //# Version of LofarStMan MeasurementSet
};
diff --git a/LCS/LofarStMan/src/LofarColumn.cc b/LCS/LofarStMan/src/LofarColumn.cc
index 5242713dc79145e637a9bc6572a1c3cfb8caf2b3..3b523f9136f966564a958bbbd3851e1d56215ace 100644
--- a/LCS/LofarStMan/src/LofarColumn.cc
+++ b/LCS/LofarStMan/src/LofarColumn.cc
@@ -21,26 +21,26 @@
#include <LofarStMan/LofarColumn.h>
-#include <tables/Tables/DataManError.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/TableRecord.h>
-#include <measures/TableMeasures/ScalarMeasColumn.h>
-#include <measures/TableMeasures/ArrayMeasColumn.h>
-#include <measures/Measures/MEpoch.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MCPosition.h>
-#include <measures/Measures/MBaseline.h>
-#include <measures/Measures/MCBaseline.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MeasTable.h>
-#include <measures/Measures/Muvw.h>
-#include <casa/Arrays/Array.h>
-#include <casa/Utilities/Assert.h>
-#include <casa/Exceptions/Error.h>
+#include <casacore/tables/DataMan/DataManError.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/TableRecord.h>
+#include <casacore/measures/TableMeasures/ScalarMeasColumn.h>
+#include <casacore/measures/TableMeasures/ArrayMeasColumn.h>
+#include <casacore/measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/measures/Measures/MBaseline.h>
+#include <casacore/measures/Measures/MCBaseline.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MeasTable.h>
+#include <casacore/measures/Measures/Muvw.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/casa/Utilities/Assert.h>
+#include <casacore/casa/Exceptions/Error.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
diff --git a/LCS/LofarStMan/src/LofarStMan.cc b/LCS/LofarStMan/src/LofarStMan.cc
index 4d1d32016763ccc7a1bcf3a80d0b6a8da14cfea0..8bae2e311709c71108873b8323a4810056f321a4 100644
--- a/LCS/LofarStMan/src/LofarStMan.cc
+++ b/LCS/LofarStMan/src/LofarStMan.cc
@@ -21,18 +21,18 @@
#include <LofarStMan/LofarStMan.h>
#include <LofarStMan/LofarColumn.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/DataManError.h>
-#include <casa/Containers/Record.h>
-#include <casa/Containers/BlockIO.h>
-#include <casa/IO/AipsIO.h>
-#include <casa/OS/CanonicalConversion.h>
-#include <casa/OS/HostInfo.h>
-#include <casa/OS/DOos.h>
-#include <casa/Utilities/Assert.h>
-#include <casa/iostream.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/DataMan/DataManError.h>
+#include <casacore/casa/Containers/Record.h>
+#include <casacore/casa/Containers/BlockIO.h>
+#include <casacore/casa/IO/AipsIO.h>
+#include <casacore/casa/OS/CanonicalConversion.h>
+#include <casacore/casa/OS/HostInfo.h>
+#include <casacore/casa/OS/DOos.h>
+#include <casacore/casa/Utilities/Assert.h>
+#include <casacore/casa/iostream.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
@@ -226,8 +226,8 @@ void LofarStMan::openFiles (bool writable)
// First close if needed.
closeFiles();
String fname (fileName() + "data");
- itsFD = LargeFiledesIO::open (fname.c_str(), writable);
- itsRegFile = new LargeFiledesIO (itsFD);
+ itsFD = FiledesIO::open (fname.c_str(), writable);
+ itsRegFile = new FiledesIO (itsFD);
// Set correct number of rows.
itsNrRows = itsRegFile->length() / itsBlockSize * itsAnt1.size();
// Map the file with seqnrs.
@@ -261,7 +261,7 @@ void LofarStMan::mapSeqFile()
void LofarStMan::closeFiles()
{
if (itsFD >= 0) {
- LargeFiledesIO::close (itsFD);
+ FiledesIO::close (itsFD);
itsFD = -1;
}
delete itsRegFile;
diff --git a/LCS/LofarStMan/src/fixlsmeta.cc b/LCS/LofarStMan/src/fixlsmeta.cc
index 4ce99510fef4bf835b87299d50bf7f6e6b704e33..3c830ed3105f1f916cd2d5f14f65c504839cbe91 100644
--- a/LCS/LofarStMan/src/fixlsmeta.cc
+++ b/LCS/LofarStMan/src/fixlsmeta.cc
@@ -23,14 +23,14 @@
#include <LofarStMan/LofarStMan.h>
#include <Common/LofarLogger.h>
#include <Common/Exception.h>
-#include <casa/IO/AipsIO.h>
-#include <casa/Containers/BlockIO.h>
-#include <casa/Quanta/MVTime.h>
-#include <casa/Quanta/Quantum.h>
-#include <casa/Inputs/Input.h>
-#include <casa/iostream.h>
+#include <casacore/casa/IO/AipsIO.h>
+#include <casacore/casa/Containers/BlockIO.h>
+#include <casacore/casa/Quanta/MVTime.h>
+#include <casacore/casa/Quanta/Quantum.h>
+#include <casacore/casa/Inputs/Input.h>
+#include <casacore/casa/iostream.h>
-using namespace casa;
+using namespace casacore;
using namespace LOFAR;
// Use a terminate handler that can produce a backtrace.
diff --git a/LCS/LofarStMan/test/tIOPerf.cc b/LCS/LofarStMan/test/tIOPerf.cc
index d6b3e54b1be63578b86af59833ed01132bb0da6f..f7d53a398e85f67f74a1aaf2f340e413702a41dc 100644
--- a/LCS/LofarStMan/test/tIOPerf.cc
+++ b/LCS/LofarStMan/test/tIOPerf.cc
@@ -19,9 +19,9 @@
//#
//# $Id$
-#include <casa/Containers/Block.h>
-#include <casa/OS/Timer.h>
-#include <casa/BasicSL/String.h>
+#include <casacore/casa/Containers/Block.h>
+#include <casacore/casa/OS/Timer.h>
+#include <casacore/casa/BasicSL/String.h>
#include <Common/LofarLogger.h>
#include <unistd.h>
#include <fcntl.h>
@@ -29,7 +29,7 @@
#include <sstream>
#include <stdexcept>
-using namespace casa;
+using namespace casacore;
using namespace std;
// This program tests the class LofarStMan and related classes.
diff --git a/LCS/LofarStMan/test/tLofarStMan.cc b/LCS/LofarStMan/test/tLofarStMan.cc
index e533ce4fd54a2f4c286b4fe3a8217b8ee5cb6b77..e169cfd873d66a40cf658b07d4d05ed7a876abd8 100644
--- a/LCS/LofarStMan/test/tLofarStMan.cc
+++ b/LCS/LofarStMan/test/tLofarStMan.cc
@@ -20,40 +20,40 @@
//# $Id$
#include <LofarStMan/LofarStMan.h>
-#include <tables/Tables/TableDesc.h>
-#include <tables/Tables/SetupNewTab.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/TableLock.h>
-#include <tables/Tables/ScaColDesc.h>
-#include <tables/Tables/ArrColDesc.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <tables/Tables/ArrayColumn.h>
-#include <measures/TableMeasures/TableMeasRefDesc.h>
-#include <measures/TableMeasures/TableMeasValueDesc.h>
-#include <measures/TableMeasures/TableMeasDesc.h>
-#include <measures/TableMeasures/ScalarMeasColumn.h>
-#include <measures/TableMeasures/ArrayMeasColumn.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MCPosition.h>
-#include <casa/Arrays/Array.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayIO.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Containers/BlockIO.h>
-#include <casa/OS/RegularFile.h>
-#include <casa/Utilities/Assert.h>
-#include <casa/IO/RegularFileIO.h>
-#include <casa/IO/RawIO.h>
-#include <casa/IO/CanonicalIO.h>
-#include <casa/OS/HostInfo.h>
-#include <casa/Exceptions/Error.h>
-#include <casa/iostream.h>
-#include <casa/sstream.h>
+#include <casacore/tables/Tables/TableDesc.h>
+#include <casacore/tables/Tables/SetupNewTab.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/TableLock.h>
+#include <casacore/tables/Tables/ScaColDesc.h>
+#include <casacore/tables/Tables/ArrColDesc.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
+#include <casacore/measures/TableMeasures/TableMeasRefDesc.h>
+#include <casacore/measures/TableMeasures/TableMeasValueDesc.h>
+#include <casacore/measures/TableMeasures/TableMeasDesc.h>
+#include <casacore/measures/TableMeasures/ScalarMeasColumn.h>
+#include <casacore/measures/TableMeasures/ArrayMeasColumn.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Containers/BlockIO.h>
+#include <casacore/casa/OS/RegularFile.h>
+#include <casacore/casa/Utilities/Assert.h>
+#include <casacore/casa/IO/RegularFileIO.h>
+#include <casacore/casa/IO/RawIO.h>
+#include <casacore/casa/IO/CanonicalIO.h>
+#include <casacore/casa/OS/HostInfo.h>
+#include <casacore/casa/Exceptions/Error.h>
+#include <casacore/casa/iostream.h>
+#include <casacore/casa/sstream.h>
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
// This program tests the class LofarStMan and related classes.
// The results are written to stdout. The script executing this program,
diff --git a/LCS/LofarStMan/test/tfix.cc b/LCS/LofarStMan/test/tfix.cc
index 451a7107701a155bb1eac448d638c48da0be8fab..ea90daaf36b8bff9869cd3820886bfe38a0fa767 100644
--- a/LCS/LofarStMan/test/tfix.cc
+++ b/LCS/LofarStMan/test/tfix.cc
@@ -20,14 +20,14 @@
//# $Id$
#include <LofarStMan/LofarStMan.h>
-#include <tables/Tables/TableDesc.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/ArrColDesc.h>
-#include <casa/Exceptions/Error.h>
-#include <casa/iostream.h>
+#include <casacore/tables/Tables/TableDesc.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/ArrColDesc.h>
+#include <casacore/casa/Exceptions/Error.h>
+#include <casacore/casa/iostream.h>
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
// This program adds column WEIGHT_SPECTRUM using LofarStMan.
// It adds it to the existing LofarStMan data manager in an MS, otherwise
diff --git a/LCS/MSLofar/include/MSLofar/BeamTables.h b/LCS/MSLofar/include/MSLofar/BeamTables.h
index 902a051b904f552bb1ae43aa2b09852334e6d79b..493c835043b070b4feb9b9d3d1cb07170a923d88 100644
--- a/LCS/MSLofar/include/MSLofar/BeamTables.h
+++ b/LCS/MSLofar/include/MSLofar/BeamTables.h
@@ -31,7 +31,7 @@
#include <Common/lofar_map.h>
//# Forward Declarations.
-namespace casa {
+namespace casacore {
class Table;
template<typename T> class Array;
template<typename T> class Vector;
@@ -55,13 +55,13 @@ namespace LOFAR {
public:
// Create the subtables and attach them to the MS.
- static void create (casa::Table& ms,
+ static void create (casacore::Table& ms,
bool overwrite = false);
// Fill the subtables. They should be empty.
// <src>mustExist</src> tells if the AntennaField and iHBADelta file of
// an antenna must exist.
- static void fill (casa::Table& ms,
+ static void fill (casacore::Table& ms,
const string& antennaSet,
const string& antennaSetFileName,
const string& antennaFieldDir,
@@ -72,7 +72,7 @@ namespace LOFAR {
// The 'before' file contains the elements already broken at the beginning
// of the observation. The 'during' file contains elements broken during
// the observation.
- /// static void updateBroken (casa::Table& ms,
+ /// static void updateBroken (casacore::Table& ms,
/// const string& beforeFileName,
/// const string& duringFilename);
@@ -100,7 +100,7 @@ namespace LOFAR {
// Write the antenna set name into all rows of the LOFAR_ANTENNA_SET
// column of the OBSERVATION table.
// The column is added if not defined yet.
- static void writeObservation (casa::Table& obsTable,
+ static void writeObservation (casacore::Table& obsTable,
const string& antennaSet);
// Write the LOFAR_STATION table.
@@ -111,13 +111,13 @@ namespace LOFAR {
// Write the LOFAR_STATION_ID column in the ANTENNA table.
// The column is added if not existing.
- static void writeAntenna (casa::Table& antTable,
- const casa::Vector<casa::String>& antNames,
+ static void writeAntenna (casacore::Table& antTable,
+ const casacore::Vector<casacore::String>& antNames,
const map<string,int>& stationIdMap,
const vector<double>& diameters);
// Convert an AFArray to a casacore Array object.
- static casa::Array<double> array2Casa (const AntField::AFArray& barray);
+ static casacore::Array<double> array2Casa (const AntField::AFArray& barray);
// Read the HBA dipole offsets.
static void getHBADeltas (const string& filename, AntField::AFArray&,
diff --git a/LCS/MSLofar/include/MSLofar/FailedTileInfo.h b/LCS/MSLofar/include/MSLofar/FailedTileInfo.h
index 780256bb4050b691ff696aebdc20c2cf1cec3262..7a552cbed9cc9bb0542dc87cd1fafa42ff78262b 100644
--- a/LCS/MSLofar/include/MSLofar/FailedTileInfo.h
+++ b/LCS/MSLofar/include/MSLofar/FailedTileInfo.h
@@ -22,9 +22,9 @@
#ifndef LOFAR_FAILEDTILEINFO_H
#define LOFAR_FAILEDTILEINFO_H
-#include <tables/Tables/Table.h>
-#include <casa/Quanta/MVEpoch.h>
-#include <casa/Arrays/Matrix.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/casa/Quanta/MVEpoch.h>
+#include <casacore/casa/Arrays/Matrix.h>
#include <Common/lofar_vector.h>
#include <Common/lofar_map.h>
@@ -40,7 +40,7 @@ namespace LOFAR {
// Construct the object for a failed tile or RCU.
FailedTileInfo (const string& station, const string& time,
- const casa::MVEpoch& epoch, const string& type, int seqnr);
+ const casacore::MVEpoch& epoch, const string& type, int seqnr);
// Read the broken hardware file giving a map of antenna name to a vector
// of pairs of tile/RCU and time.
@@ -49,16 +49,16 @@ namespace LOFAR {
// Convert the info per station name to info per antennaId.
static vector<VectorFailed> antennaConvert
- (const casa::Table& ms, const map<string,VectorFailed>& broken);
+ (const casacore::Table& ms, const map<string,VectorFailed>& broken);
// Find the tile nr from the given seqnr which can be a tile or rcu.
// If a tile for the given station type is given, the element is seqnr/2.
// Otherwise find the matching rcu in the rcuList and return its index.
static int findTile (const FailedTileInfo&,
- const casa::Matrix<casa::Int>& rcus);
+ const casacore::Matrix<casacore::Int>& rcus);
// Write the failed tile info.
- static void writeFailed (casa::Table& ms,
+ static void writeFailed (casacore::Table& ms,
const vector<VectorFailed>& brokenBefore,
const vector<VectorFailed>& brokenDuring);
@@ -69,7 +69,7 @@ namespace LOFAR {
private:
string itsStation;
string itsTime;
- casa::MVEpoch itsEpoch;
+ casacore::MVEpoch itsEpoch;
string itsType; //# RCU, LBA, or HBA
int itsSeqNr;
};
diff --git a/LCS/MSLofar/include/MSLofar/MSAntennaField.h b/LCS/MSLofar/include/MSLofar/MSAntennaField.h
index 7d4ca1fa859928cad312fd8eda48740302fec653..142128fef6bf06e0f62f5ad855c27ab406963974 100644
--- a/LCS/MSLofar/include/MSLofar/MSAntennaField.h
+++ b/LCS/MSLofar/include/MSLofar/MSAntennaField.h
@@ -36,15 +36,15 @@ namespace LOFAR {
MSAntennaField();
// Create from an existing table.
- MSAntennaField (const casa::String& tableName,
- casa::Table::TableOption option);
+ MSAntennaField (const casacore::String& tableName,
+ casacore::Table::TableOption option);
// Create a new table.
- MSAntennaField (casa::SetupNewTable& newTab, casa::uInt nrrow,
- casa::Bool initialize);
+ MSAntennaField (casacore::SetupNewTable& newTab, casacore::uInt nrrow,
+ casacore::Bool initialize);
// Create from an existing Table object.
- MSAntennaField (const casa::Table& table);
+ MSAntennaField (const casacore::Table& table);
// Copy constructor (reference semnatics).
MSAntennaField (const MSAntennaField& that);
@@ -56,7 +56,7 @@ namespace LOFAR {
MSAntennaField& operator= (const MSAntennaField& that);
// Create the table description containing the required columns.
- static casa::TableDesc requiredTableDesc();
+ static casacore::TableDesc requiredTableDesc();
};
} //# end namespace
diff --git a/LCS/MSLofar/include/MSLofar/MSAntennaFieldColumns.h b/LCS/MSLofar/include/MSLofar/MSAntennaFieldColumns.h
index 6c77060b432a3a5ca44a4dbb1e2b29c1e22a2ab1..bc19b3f6afc4210afd5b3822782011ccb3cc5e39 100644
--- a/LCS/MSLofar/include/MSLofar/MSAntennaFieldColumns.h
+++ b/LCS/MSLofar/include/MSLofar/MSAntennaFieldColumns.h
@@ -24,18 +24,18 @@
#ifndef MSLOFAR_MSANTENNAFIELDCOLUMNS_H
#define MSLOFAR_MSANTENNAFIELDCOLUMNS_H
-#include <casa/aips.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MCPosition.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MCDirection.h>
-#include <measures/TableMeasures/ArrayMeasColumn.h>
-#include <measures/TableMeasures/ArrayQuantColumn.h>
-#include <measures/TableMeasures/ScalarMeasColumn.h>
-#include <measures/TableMeasures/ScalarQuantColumn.h>
-#include <tables/Tables/ArrayColumn.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <casa/BasicSL/String.h>
+#include <casacore/casa/aips.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MCPosition.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/measures/TableMeasures/ArrayMeasColumn.h>
+#include <casacore/measures/TableMeasures/ArrayQuantColumn.h>
+#include <casacore/measures/TableMeasures/ScalarMeasColumn.h>
+#include <casacore/measures/TableMeasures/ScalarQuantColumn.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/casa/BasicSL/String.h>
namespace LOFAR {
@@ -61,41 +61,41 @@ namespace LOFAR {
// Access to columns.
// <group>
- const casa::ROScalarColumn<casa::Int>& antennaId() const
+ const casacore::ROScalarColumn<casacore::Int>& antennaId() const
{ return antennaId_p; }
- const casa::ROScalarColumn<casa::String>& name() const
+ const casacore::ROScalarColumn<casacore::String>& name() const
{ return name_p; }
- const casa::ROArrayColumn<casa::Double>& position() const
+ const casacore::ROArrayColumn<casacore::Double>& position() const
{ return position_p; }
- const casa::ROArrayQuantColumn<casa::Double>& positionQuant() const
+ const casacore::ROArrayQuantColumn<casacore::Double>& positionQuant() const
{ return positionQuant_p; }
- const casa::ROScalarMeasColumn<casa::MPosition>& positionMeas() const
+ const casacore::ROScalarMeasColumn<casacore::MPosition>& positionMeas() const
{ return positionMeas_p; }
- const casa::ROArrayColumn<casa::Double>& coordinateAxes() const
+ const casacore::ROArrayColumn<casacore::Double>& coordinateAxes() const
{ return coordinateAxes_p; }
- const casa::ROArrayQuantColumn<casa::Double>& coordinateaxesQuant() const
+ const casacore::ROArrayQuantColumn<casacore::Double>& coordinateaxesQuant() const
{ return coordinateAxesQuant_p; }
- const casa::ROArrayColumn<casa::Double>& elementOffset() const
+ const casacore::ROArrayColumn<casacore::Double>& elementOffset() const
{ return elementOffset_p; }
- const casa::ROArrayQuantColumn<casa::Double>& elementOffsetQuant() const
+ const casacore::ROArrayQuantColumn<casacore::Double>& elementOffsetQuant() const
{ return elementOffsetQuant_p; }
- const casa::ROArrayColumn<casa::Int>& elementRCU() const
+ const casacore::ROArrayColumn<casacore::Int>& elementRCU() const
{ return elementRCU_p; }
- const casa::ROArrayColumn<casa::Bool>& elementFlag() const
+ const casacore::ROArrayColumn<casacore::Bool>& elementFlag() const
{ return elementFlag_p; }
- const casa::ROScalarColumn<casa::Double>& tileRotation() const
+ const casacore::ROScalarColumn<casacore::Double>& tileRotation() const
{ return tileRotation_p; }
- const casa::ROScalarQuantColumn<casa::Double>& tileRotationQuant() const
+ const casacore::ROScalarQuantColumn<casacore::Double>& tileRotationQuant() const
{ return tileRotationQuant_p; }
- const casa::ROArrayColumn<casa::Double>& tileElementOffset() const
+ const casacore::ROArrayColumn<casacore::Double>& tileElementOffset() const
{ return tileElementOffset_p; }
- const casa::ROArrayQuantColumn<casa::Double>& tileElementOffsetQuant() const
+ const casacore::ROArrayQuantColumn<casacore::Double>& tileElementOffsetQuant() const
{ return tileElementOffsetQuant_p; }
// </group>
// Convenience function that returns the number of rows
// in any of the columns.
- casa::uInt nrow() const
+ casacore::uInt nrow() const
{ return antennaId_p.nrow(); }
protected:
@@ -113,25 +113,25 @@ namespace LOFAR {
ROMSAntennaFieldColumns& operator=(const ROMSAntennaFieldColumns&);
//# required columns
- casa::ROScalarColumn<casa::Int> antennaId_p;
- casa::ROScalarColumn<casa::String> name_p;
- casa::ROArrayColumn<casa::Double> position_p;
- casa::ROArrayColumn<casa::Double> coordinateAxes_p;
- casa::ROArrayColumn<casa::Double> elementOffset_p;
- casa::ROArrayColumn<casa::Int> elementRCU_p;
- casa::ROArrayColumn<casa::Bool> elementFlag_p;
- casa::ROScalarColumn<casa::Double> tileRotation_p;
- casa::ROArrayColumn<casa::Double> tileElementOffset_p;
+ casacore::ROScalarColumn<casacore::Int> antennaId_p;
+ casacore::ROScalarColumn<casacore::String> name_p;
+ casacore::ROArrayColumn<casacore::Double> position_p;
+ casacore::ROArrayColumn<casacore::Double> coordinateAxes_p;
+ casacore::ROArrayColumn<casacore::Double> elementOffset_p;
+ casacore::ROArrayColumn<casacore::Int> elementRCU_p;
+ casacore::ROArrayColumn<casacore::Bool> elementFlag_p;
+ casacore::ROScalarColumn<casacore::Double> tileRotation_p;
+ casacore::ROArrayColumn<casacore::Double> tileElementOffset_p;
//# Access to Measure columns
- casa::ROScalarMeasColumn<casa::MPosition> positionMeas_p;
+ casacore::ROScalarMeasColumn<casacore::MPosition> positionMeas_p;
//# Access to Quantum columns
- casa::ROArrayQuantColumn<casa::Double> positionQuant_p;
- casa::ROArrayQuantColumn<casa::Double> coordinateAxesQuant_p;
- casa::ROArrayQuantColumn<casa::Double> elementOffsetQuant_p;
- casa::ROScalarQuantColumn<casa::Double> tileRotationQuant_p;
- casa::ROArrayQuantColumn<casa::Double> tileElementOffsetQuant_p;
+ casacore::ROArrayQuantColumn<casacore::Double> positionQuant_p;
+ casacore::ROArrayQuantColumn<casacore::Double> coordinateAxesQuant_p;
+ casacore::ROArrayQuantColumn<casacore::Double> elementOffsetQuant_p;
+ casacore::ROScalarQuantColumn<casacore::Double> tileRotationQuant_p;
+ casacore::ROArrayQuantColumn<casacore::Double> tileElementOffsetQuant_p;
};
@@ -154,35 +154,35 @@ namespace LOFAR {
// Read-write access to required columns.
// <group>
- casa::ScalarColumn<casa::Int>& antennaId()
+ casacore::ScalarColumn<casacore::Int>& antennaId()
{ return antennaId_p; }
- casa::ScalarColumn<casa::String>& name()
+ casacore::ScalarColumn<casacore::String>& name()
{ return name_p; }
- casa::ArrayColumn<casa::Double>& position()
+ casacore::ArrayColumn<casacore::Double>& position()
{ return position_p; }
- casa::ArrayQuantColumn<casa::Double>& positionQuant()
+ casacore::ArrayQuantColumn<casacore::Double>& positionQuant()
{ return positionQuant_p; }
- casa::ScalarMeasColumn<casa::MPosition>& positionMeas()
+ casacore::ScalarMeasColumn<casacore::MPosition>& positionMeas()
{ return positionMeas_p; }
- casa::ArrayColumn<casa::Double>& coordinateAxes()
+ casacore::ArrayColumn<casacore::Double>& coordinateAxes()
{ return coordinateAxes_p; }
- casa::ArrayQuantColumn<casa::Double>& coordinateaxesQuant()
+ casacore::ArrayQuantColumn<casacore::Double>& coordinateaxesQuant()
{ return coordinateAxesQuant_p; }
- casa::ArrayColumn<casa::Double>& elementOffset()
+ casacore::ArrayColumn<casacore::Double>& elementOffset()
{ return elementOffset_p; }
- casa::ArrayQuantColumn<casa::Double>& elementOffsetQuant()
+ casacore::ArrayQuantColumn<casacore::Double>& elementOffsetQuant()
{ return elementOffsetQuant_p; }
- casa::ArrayColumn<casa::Int>& elementRCU()
+ casacore::ArrayColumn<casacore::Int>& elementRCU()
{ return elementRCU_p; }
- casa::ArrayColumn<casa::Bool>& elementFlag()
+ casacore::ArrayColumn<casacore::Bool>& elementFlag()
{ return elementFlag_p; }
- casa::ScalarColumn<casa::Double>& tileRotation()
+ casacore::ScalarColumn<casacore::Double>& tileRotation()
{ return tileRotation_p; }
- casa::ScalarQuantColumn<casa::Double>& tileRotationQuant()
+ casacore::ScalarQuantColumn<casacore::Double>& tileRotationQuant()
{ return tileRotationQuant_p; }
- casa::ArrayColumn<casa::Double>& tileElementOffset()
+ casacore::ArrayColumn<casacore::Double>& tileElementOffset()
{ return tileElementOffset_p; }
- casa::ArrayQuantColumn<casa::Double>& tileElementOffsetQuant()
+ casacore::ArrayQuantColumn<casacore::Double>& tileElementOffsetQuant()
{ return tileElementOffsetQuant_p; }
// </group>
@@ -201,25 +201,25 @@ namespace LOFAR {
MSAntennaFieldColumns& operator=(const MSAntennaFieldColumns&);
//# required columns
- casa::ScalarColumn<casa::Int> antennaId_p;
- casa::ScalarColumn<casa::String> name_p;
- casa::ArrayColumn<casa::Double> position_p;
- casa::ArrayColumn<casa::Double> coordinateAxes_p;
- casa::ArrayColumn<casa::Double> elementOffset_p;
- casa::ArrayColumn<casa::Int> elementRCU_p;
- casa::ArrayColumn<casa::Bool> elementFlag_p;
- casa::ScalarColumn<casa::Double> tileRotation_p;
- casa::ArrayColumn<casa::Double> tileElementOffset_p;
+ casacore::ScalarColumn<casacore::Int> antennaId_p;
+ casacore::ScalarColumn<casacore::String> name_p;
+ casacore::ArrayColumn<casacore::Double> position_p;
+ casacore::ArrayColumn<casacore::Double> coordinateAxes_p;
+ casacore::ArrayColumn<casacore::Double> elementOffset_p;
+ casacore::ArrayColumn<casacore::Int> elementRCU_p;
+ casacore::ArrayColumn<casacore::Bool> elementFlag_p;
+ casacore::ScalarColumn<casacore::Double> tileRotation_p;
+ casacore::ArrayColumn<casacore::Double> tileElementOffset_p;
//# Access to Measure columns
- casa::ScalarMeasColumn<casa::MPosition> positionMeas_p;
+ casacore::ScalarMeasColumn<casacore::MPosition> positionMeas_p;
//# Access to Quantum columns
- casa::ArrayQuantColumn<casa::Double> positionQuant_p;
- casa::ArrayQuantColumn<casa::Double> coordinateAxesQuant_p;
- casa::ArrayQuantColumn<casa::Double> elementOffsetQuant_p;
- casa::ScalarQuantColumn<casa::Double> tileRotationQuant_p;
- casa::ArrayQuantColumn<casa::Double> tileElementOffsetQuant_p;
+ casacore::ArrayQuantColumn<casacore::Double> positionQuant_p;
+ casacore::ArrayQuantColumn<casacore::Double> coordinateAxesQuant_p;
+ casacore::ArrayQuantColumn<casacore::Double> elementOffsetQuant_p;
+ casacore::ScalarQuantColumn<casacore::Double> tileRotationQuant_p;
+ casacore::ArrayQuantColumn<casacore::Double> tileElementOffsetQuant_p;
};
} //# end namespace
diff --git a/LCS/MSLofar/include/MSLofar/MSElementFailure.h b/LCS/MSLofar/include/MSLofar/MSElementFailure.h
index ac9b65cef8db5c315a07b8d94596edcae2811a45..cacad58d2c55a5c5512e2827f73c98f61439ebb1 100644
--- a/LCS/MSLofar/include/MSLofar/MSElementFailure.h
+++ b/LCS/MSLofar/include/MSLofar/MSElementFailure.h
@@ -36,15 +36,15 @@ namespace LOFAR {
MSElementFailure();
// Create from an existing table.
- MSElementFailure (const casa::String& tableName,
- casa::Table::TableOption option);
+ MSElementFailure (const casacore::String& tableName,
+ casacore::Table::TableOption option);
// Create a new table.
- MSElementFailure (casa::SetupNewTable& newTab, casa::uInt nrrow,
- casa::Bool initialize);
+ MSElementFailure (casacore::SetupNewTable& newTab, casacore::uInt nrrow,
+ casacore::Bool initialize);
// Create from an existing Table object.
- MSElementFailure (const casa::Table& table);
+ MSElementFailure (const casacore::Table& table);
// Copy constructor (reference semnatics).
MSElementFailure (const MSElementFailure& that);
@@ -56,7 +56,7 @@ namespace LOFAR {
MSElementFailure& operator= (const MSElementFailure& that);
// Create the table description containing the required columns.
- static casa::TableDesc requiredTableDesc();
+ static casacore::TableDesc requiredTableDesc();
};
} //# end namespace
diff --git a/LCS/MSLofar/include/MSLofar/MSElementFailureColumns.h b/LCS/MSLofar/include/MSLofar/MSElementFailureColumns.h
index 20ec15e9a16ce003e649036e1da7ffefafdea034..e64cc131194f212291235a0a70dbaa2df7e83273 100644
--- a/LCS/MSLofar/include/MSLofar/MSElementFailureColumns.h
+++ b/LCS/MSLofar/include/MSLofar/MSElementFailureColumns.h
@@ -24,13 +24,13 @@
#ifndef MSLOFAR_MSELEMENTFAILURECOLUMNS_H
#define MSLOFAR_MSELEMENTFAILURECOLUMNS_H
-#include <casa/aips.h>
-#include <measures/Measures/MEpoch.h>
-#include <measures/Measures/MCEpoch.h>
-#include <measures/TableMeasures/ScalarMeasColumn.h>
-#include <measures/TableMeasures/ScalarQuantColumn.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <casa/BasicSL/String.h>
+#include <casacore/casa/aips.h>
+#include <casacore/measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MCEpoch.h>
+#include <casacore/measures/TableMeasures/ScalarMeasColumn.h>
+#include <casacore/measures/TableMeasures/ScalarQuantColumn.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/casa/BasicSL/String.h>
namespace LOFAR {
@@ -56,21 +56,21 @@ namespace LOFAR {
// Access to columns.
// <group>
- const casa::ROScalarColumn<casa::Int>& antennaFieldId() const
+ const casacore::ROScalarColumn<casacore::Int>& antennaFieldId() const
{ return antennaFieldId_p; }
- const casa::ROScalarColumn<casa::Int>& elementIndex() const
+ const casacore::ROScalarColumn<casacore::Int>& elementIndex() const
{ return elementIndex_p; }
- const casa::ROScalarColumn<casa::Double>& time() const
+ const casacore::ROScalarColumn<casacore::Double>& time() const
{ return time_p; }
- const casa::ROScalarQuantColumn<casa::Double>& timeQuant() const
+ const casacore::ROScalarQuantColumn<casacore::Double>& timeQuant() const
{ return timeQuant_p; }
- const casa::ROScalarMeasColumn<casa::MEpoch>& timeMeas() const
+ const casacore::ROScalarMeasColumn<casacore::MEpoch>& timeMeas() const
{ return timeMeas_p; }
// </group>
// Convenience function that returns the number of rows
// in any of the columns.
- casa::uInt nrow() const
+ casacore::uInt nrow() const
{ return antennaFieldId_p.nrow(); }
protected:
@@ -88,15 +88,15 @@ namespace LOFAR {
ROMSElementFailureColumns& operator=(const ROMSElementFailureColumns&);
//# required columns
- casa::ROScalarColumn<casa::Int> antennaFieldId_p;
- casa::ROScalarColumn<casa::Int> elementIndex_p;
- casa::ROScalarColumn<casa::Double> time_p;
+ casacore::ROScalarColumn<casacore::Int> antennaFieldId_p;
+ casacore::ROScalarColumn<casacore::Int> elementIndex_p;
+ casacore::ROScalarColumn<casacore::Double> time_p;
//# Access to Quantum columns
- casa::ROScalarQuantColumn<casa::Double> timeQuant_p;
+ casacore::ROScalarQuantColumn<casacore::Double> timeQuant_p;
//# Access to Quantum columns
- casa::ROScalarMeasColumn<casa::MEpoch> timeMeas_p;
+ casacore::ROScalarMeasColumn<casacore::MEpoch> timeMeas_p;
};
@@ -119,15 +119,15 @@ namespace LOFAR {
// Read-write access to required columns.
// <group>
- casa::ScalarColumn<casa::Int>& antennaFieldId()
+ casacore::ScalarColumn<casacore::Int>& antennaFieldId()
{ return antennaFieldId_p; }
- casa::ScalarColumn<casa::Int>& elementIndex()
+ casacore::ScalarColumn<casacore::Int>& elementIndex()
{ return elementIndex_p; }
- casa::ScalarColumn<casa::Double>& time()
+ casacore::ScalarColumn<casacore::Double>& time()
{ return time_p; }
- casa::ScalarQuantColumn<casa::Double>& timeQuant()
+ casacore::ScalarQuantColumn<casacore::Double>& timeQuant()
{ return timeQuant_p; }
- casa::ScalarMeasColumn<casa::MEpoch>& timeMeas()
+ casacore::ScalarMeasColumn<casacore::MEpoch>& timeMeas()
{ return timeMeas_p; }
// </group>
@@ -146,15 +146,15 @@ namespace LOFAR {
MSElementFailureColumns& operator= (const MSElementFailureColumns&);
//# required columns
- casa::ScalarColumn<casa::Int> antennaFieldId_p;
- casa::ScalarColumn<casa::Int> elementIndex_p;
- casa::ScalarColumn<casa::Double> time_p;
+ casacore::ScalarColumn<casacore::Int> antennaFieldId_p;
+ casacore::ScalarColumn<casacore::Int> elementIndex_p;
+ casacore::ScalarColumn<casacore::Double> time_p;
//# Access to Quantum columns
- casa::ScalarQuantColumn<casa::Double> timeQuant_p;
+ casacore::ScalarQuantColumn<casacore::Double> timeQuant_p;
//# Access to Quantum columns
- casa::ScalarMeasColumn<casa::MEpoch> timeMeas_p;
+ casacore::ScalarMeasColumn<casacore::MEpoch> timeMeas_p;
};
} //# end namespace
diff --git a/LCS/MSLofar/include/MSLofar/MSLofar.h b/LCS/MSLofar/include/MSLofar/MSLofar.h
index 9beae68c993302e62e224a42bd465382ba254491..e40b2fe0cadc733cfa2cbfea421cad23e6d140c7 100644
--- a/LCS/MSLofar/include/MSLofar/MSLofar.h
+++ b/LCS/MSLofar/include/MSLofar/MSLofar.h
@@ -24,7 +24,7 @@
#ifndef MSLOFAR_MSLOFAR_H
#define MSLOFAR_MSLOFAR_H
-#include <ms/MeasurementSets/MeasurementSet.h>
+#include <casacore/ms/MeasurementSets/MeasurementSet.h>
#include <MSLofar/MSLofarAntenna.h>
#include <MSLofar/MSLofarField.h>
#include <MSLofar/MSLofarObservation.h>
@@ -38,7 +38,7 @@ namespace LOFAR {
// It is derived from the casacore MeasurementSet class and adds the
// LOFAR specific columns and subtables.
- class MSLofar: public casa::MeasurementSet
+ class MSLofar: public casacore::MeasurementSet
{
public:
@@ -47,23 +47,23 @@ namespace LOFAR {
MSLofar();
// Construct from an existing LOFAR MS table using default locking options.
- MSLofar (const casa::String &tableName,
- casa::Table::TableOption = casa::Table::Old);
+ MSLofar (const casacore::String &tableName,
+ casacore::Table::TableOption = casacore::Table::Old);
// Construct from an existing LOFAR MS table using given locking options.
- MSLofar (const casa::String &tableName, const casa::TableLock& lockOptions,
- casa::Table::TableOption = casa::Table::Old);
+ MSLofar (const casacore::String &tableName, const casacore::TableLock& lockOptions,
+ casacore::Table::TableOption = casacore::Table::Old);
// Construct a new LOFAR MS using default locking options.
- MSLofar (casa::SetupNewTable &newTab,casa:: uInt nrrow = 0,
- casa::Bool initialize = casa::False);
+ MSLofar (casacore::SetupNewTable &newTab,casacore:: uInt nrrow = 0,
+ casacore::Bool initialize = casacore::False);
// Construct a new LOFAR MS using given locking options.
- MSLofar (casa::SetupNewTable &newTab, const casa::TableLock& lockOptions,
- casa::uInt nrrow = 0, casa::Bool initialize = casa::False);
+ MSLofar (casacore::SetupNewTable &newTab, const casacore::TableLock& lockOptions,
+ casacore::uInt nrrow = 0, casacore::Bool initialize = casacore::False);
// Construct from an existing Table object.
- MSLofar (const casa::Table &table);
+ MSLofar (const casacore::Table &table);
// Copy constructor (reference semantics).
MSLofar (const MSLofar &other);
@@ -83,16 +83,16 @@ namespace LOFAR {
// model visibilities are stored as new DATA columns in an MS which
// references the raw MS for the other columns. Except for these special
// cases, the use of this function will be rare.
- MSLofar referenceCopy (const casa::String& newTableName,
- const casa::Block<casa::String>& writableColumns) const;
+ MSLofar referenceCopy (const casacore::String& newTableName,
+ const casacore::Block<casacore::String>& writableColumns) const;
// Return the name of each of the LOFAR specific subtables.
// This should be used by the filler to create the subtables in the
// correct location.
// <group>
- casa::String stationTableName() const;
- casa::String antennaFieldTableName() const;
- casa::String elementFailureTableName() const;
+ casacore::String stationTableName() const;
+ casacore::String antennaFieldTableName() const;
+ casacore::String elementFailureTableName() const;
// </group>
// Access functions for the LOFAR specific subtables, using the MS-like
@@ -116,7 +116,7 @@ namespace LOFAR {
// this only if you assign new subtables to the table keywords.
// This also checks for validity of the table and its subtables.
// Set clear to True to clear the subtable references (used in assignment)
- void initRefs (casa::Bool clear=casa::False);
+ void initRefs (casacore::Bool clear=casacore::False);
// Create default subtables: fills the required subtable keywords with
// tables of the correct type, mainly for testing and as an example of
@@ -124,19 +124,19 @@ namespace LOFAR {
// often have more things specified, like dimensions of arrays and
// storage managers for the various columns.
void createDefaultSubtables
- (casa::Table::TableOption option=casa::Table::Scratch);
+ (casacore::Table::TableOption option=casacore::Table::Scratch);
// Flush all the tables and subtables associated with this
// MeasurementSet. This function calls the Table::flush() function on the
// main table and all the standard subtables including optional
// subtables. See the Table class for a description of the sync argument.
- void flush (casa::Bool sync=casa::False);
+ void flush (casacore::Bool sync=casacore::False);
// Remove MEASINFO keywords TabVarTypes and TabVarCodes, because
// old CASA cannot handle them since Dirk Petry added frequency
// type Undefined.
- static void removeMeasKeys (casa::Table& table,
- const casa::String& colName);
+ static void removeMeasKeys (casacore::Table& table,
+ const casacore::String& colName);
private:
//# keep references to the subtables
diff --git a/LCS/MSLofar/include/MSLofar/MSLofarAntenna.h b/LCS/MSLofar/include/MSLofar/MSLofarAntenna.h
index fca81f065cdc394c786ca3ad1d72df4ab3e65e01..957128c6e0ac7503b4e087163935ce8c07f09ae8 100644
--- a/LCS/MSLofar/include/MSLofar/MSLofarAntenna.h
+++ b/LCS/MSLofar/include/MSLofar/MSLofarAntenna.h
@@ -24,12 +24,12 @@
#ifndef MSLOFAR_MSLOFARANTENNA_H
#define MSLOFAR_MSLOFARANTENNA_H
-#include <ms/MeasurementSets/MSAntenna.h>
+#include <casacore/ms/MeasurementSets/MSAntenna.h>
#include <MSLofar/MSLofarTable.h>
namespace LOFAR {
- class MSLofarAntenna: public casa::MSAntenna
+ class MSLofarAntenna: public casacore::MSAntenna
{
public:
@@ -37,15 +37,15 @@ namespace LOFAR {
MSLofarAntenna();
// Create from an existing table.
- MSLofarAntenna (const casa::String& tableName,
- casa::Table::TableOption option);
+ MSLofarAntenna (const casacore::String& tableName,
+ casacore::Table::TableOption option);
// Create a new table.
- MSLofarAntenna (casa::SetupNewTable& newTab, casa::uInt nrrow,
- casa::Bool initialize);
+ MSLofarAntenna (casacore::SetupNewTable& newTab, casacore::uInt nrrow,
+ casacore::Bool initialize);
// Create from an existing Table object.
- MSLofarAntenna (const casa::Table& table);
+ MSLofarAntenna (const casacore::Table& table);
// Copy constructor (reference semnatics).
MSLofarAntenna (const MSLofarAntenna& that);
@@ -57,7 +57,7 @@ namespace LOFAR {
MSLofarAntenna& operator= (const MSLofarAntenna& that);
// Create the table description containing the required columns.
- static casa::TableDesc requiredTableDesc();
+ static casacore::TableDesc requiredTableDesc();
};
} //# end namespace
diff --git a/LCS/MSLofar/include/MSLofar/MSLofarAntennaColumns.h b/LCS/MSLofar/include/MSLofar/MSLofarAntennaColumns.h
index cb48d4eee9afdb44138cf9da01a9901ce3aae840..d5b02c225a4f1d6ab249c2bd1a7c442d90fe214f 100644
--- a/LCS/MSLofar/include/MSLofar/MSLofarAntennaColumns.h
+++ b/LCS/MSLofar/include/MSLofar/MSLofarAntennaColumns.h
@@ -24,7 +24,7 @@
#ifndef MSLOFAR_MSLOFARANTENNACOLUMNS_H
#define MSLOFAR_MSLOFARANTENNACOLUMNS_H
-#include <ms/MeasurementSets/MSAntennaColumns.h>
+#include <casacore/ms/MeasurementSets/MSAntennaColumns.h>
namespace LOFAR {
@@ -38,7 +38,7 @@ namespace LOFAR {
// column. Access to non-predefined columns will still have to be done with
// explicit declarations.
- class ROMSLofarAntennaColumns: public casa::ROMSAntennaColumns
+ class ROMSLofarAntennaColumns: public casacore::ROMSAntennaColumns
{
public:
@@ -50,13 +50,13 @@ namespace LOFAR {
// Access to columns.
// <group>
- const casa::ROScalarColumn<casa::Int>& stationId() const
+ const casacore::ROScalarColumn<casacore::Int>& stationId() const
{ return stationId_p; }
- const casa::ROArrayColumn<casa::Double>& phaseReference() const
+ const casacore::ROArrayColumn<casacore::Double>& phaseReference() const
{ return phaseReference_p; }
- const casa::ROArrayQuantColumn<casa::Double>& phaseReferenceQuant() const
+ const casacore::ROArrayQuantColumn<casacore::Double>& phaseReferenceQuant() const
{ return phaseReferenceQuant_p; }
- const casa::ROScalarMeasColumn<casa::MPosition>& phaseReferenceMeas() const
+ const casacore::ROScalarMeasColumn<casacore::MPosition>& phaseReferenceMeas() const
{ return phaseReferenceMeas_p; }
// </group>
@@ -75,12 +75,12 @@ namespace LOFAR {
ROMSLofarAntennaColumns& operator=(const ROMSLofarAntennaColumns&);
//# required columns
- casa::ROScalarColumn<casa::Int> stationId_p;
- casa::ROArrayColumn<casa::Double> phaseReference_p;
+ casacore::ROScalarColumn<casacore::Int> stationId_p;
+ casacore::ROArrayColumn<casacore::Double> phaseReference_p;
//# Access to Measure columns
- casa::ROScalarMeasColumn<casa::MPosition> phaseReferenceMeas_p;
+ casacore::ROScalarMeasColumn<casacore::MPosition> phaseReferenceMeas_p;
//# Access to Quantum columns
- casa::ROArrayQuantColumn<casa::Double> phaseReferenceQuant_p;
+ casacore::ROArrayQuantColumn<casacore::Double> phaseReferenceQuant_p;
};
@@ -91,7 +91,7 @@ namespace LOFAR {
// for every predefined column. Access to non-predefined columns will still
// have to be done with explicit declarations.
- class MSLofarAntennaColumns: public casa::MSAntennaColumns
+ class MSLofarAntennaColumns: public casacore::MSAntennaColumns
{
public:
@@ -103,21 +103,21 @@ namespace LOFAR {
// Read-write access to required columns.
// <group>
- const casa::ROScalarColumn<casa::Int>& stationId() const
+ const casacore::ROScalarColumn<casacore::Int>& stationId() const
{ return roStationId_p; }
- casa::ScalarColumn<casa::Int>& stationId()
+ casacore::ScalarColumn<casacore::Int>& stationId()
{ return rwStationId_p; }
- const casa::ROArrayColumn<casa::Double>& phaseReference() const
+ const casacore::ROArrayColumn<casacore::Double>& phaseReference() const
{ return roPhaseReference_p; }
- casa::ArrayColumn<casa::Double>& phaseReference()
+ casacore::ArrayColumn<casacore::Double>& phaseReference()
{ return rwPhaseReference_p; }
- const casa::ROArrayQuantColumn<casa::Double>& phaseReferenceQuant() const
+ const casacore::ROArrayQuantColumn<casacore::Double>& phaseReferenceQuant() const
{ return roPhaseReferenceQuant_p; }
- casa::ArrayQuantColumn<casa::Double>& phaseReferenceQuant()
+ casacore::ArrayQuantColumn<casacore::Double>& phaseReferenceQuant()
{ return rwPhaseReferenceQuant_p; }
- const casa::ROScalarMeasColumn<casa::MPosition>& phaseReferenceMeas() const
+ const casacore::ROScalarMeasColumn<casacore::MPosition>& phaseReferenceMeas() const
{ return roPhaseReferenceMeas_p; }
- casa::ScalarMeasColumn<casa::MPosition>& phaseReferenceMeas()
+ casacore::ScalarMeasColumn<casacore::MPosition>& phaseReferenceMeas()
{ return rwPhaseReferenceMeas_p; }
// </group>
@@ -136,16 +136,16 @@ namespace LOFAR {
MSLofarAntennaColumns& operator=(const MSLofarAntennaColumns&);
//# required columns
- casa::ROScalarColumn<casa::Int> roStationId_p;
- casa::ScalarColumn<casa::Int> rwStationId_p;
- casa::ROArrayColumn<casa::Double> roPhaseReference_p;
- casa::ArrayColumn<casa::Double> rwPhaseReference_p;
+ casacore::ROScalarColumn<casacore::Int> roStationId_p;
+ casacore::ScalarColumn<casacore::Int> rwStationId_p;
+ casacore::ROArrayColumn<casacore::Double> roPhaseReference_p;
+ casacore::ArrayColumn<casacore::Double> rwPhaseReference_p;
//# Access to Measure columns
- casa::ROScalarMeasColumn<casa::MPosition> roPhaseReferenceMeas_p;
- casa::ScalarMeasColumn<casa::MPosition> rwPhaseReferenceMeas_p;
+ casacore::ROScalarMeasColumn<casacore::MPosition> roPhaseReferenceMeas_p;
+ casacore::ScalarMeasColumn<casacore::MPosition> rwPhaseReferenceMeas_p;
//# Access to Quantum columns
- casa::ROArrayQuantColumn<casa::Double> roPhaseReferenceQuant_p;
- casa::ArrayQuantColumn<casa::Double> rwPhaseReferenceQuant_p;
+ casacore::ROArrayQuantColumn<casacore::Double> roPhaseReferenceQuant_p;
+ casacore::ArrayQuantColumn<casacore::Double> rwPhaseReferenceQuant_p;
};
} //# end namespace
diff --git a/LCS/MSLofar/include/MSLofar/MSLofarField.h b/LCS/MSLofar/include/MSLofar/MSLofarField.h
index 0f63671711695672ecd007c5fe77e19a29c4c1c6..f65b49f265d44d9ff324d7b4083ab039bdd169f5 100644
--- a/LCS/MSLofar/include/MSLofar/MSLofarField.h
+++ b/LCS/MSLofar/include/MSLofar/MSLofarField.h
@@ -24,12 +24,12 @@
#ifndef MSLOFAR_MSLOFARFIELD_H
#define MSLOFAR_MSLOFARFIELD_H
-#include <ms/MeasurementSets/MSField.h>
+#include <casacore/ms/MeasurementSets/MSField.h>
#include <MSLofar/MSLofarTable.h>
namespace LOFAR {
- class MSLofarField: public casa::MSField
+ class MSLofarField: public casacore::MSField
{
public:
@@ -37,15 +37,15 @@ namespace LOFAR {
MSLofarField();
// Create from an existing table.
- MSLofarField (const casa::String& tableName,
- casa::Table::TableOption option);
+ MSLofarField (const casacore::String& tableName,
+ casacore::Table::TableOption option);
// Create a new table.
- MSLofarField (casa::SetupNewTable& newTab, casa::uInt nrrow,
- casa::Bool initialize);
+ MSLofarField (casacore::SetupNewTable& newTab, casacore::uInt nrrow,
+ casacore::Bool initialize);
// Create from an existing Table object.
- MSLofarField (const casa::Table& table);
+ MSLofarField (const casacore::Table& table);
// Copy constructor (reference semnatics).
MSLofarField (const MSLofarField& that);
@@ -57,7 +57,7 @@ namespace LOFAR {
MSLofarField& operator= (const MSLofarField& that);
// Create the table description containing the required columns.
- static casa::TableDesc requiredTableDesc();
+ static casacore::TableDesc requiredTableDesc();
};
} //# end namespace
diff --git a/LCS/MSLofar/include/MSLofar/MSLofarFieldColumns.h b/LCS/MSLofar/include/MSLofar/MSLofarFieldColumns.h
index d82f5139e62ec40449e52725b92feda78f7be1b0..876119d3c80f9895f28432a071102a93bd99cf00 100644
--- a/LCS/MSLofar/include/MSLofar/MSLofarFieldColumns.h
+++ b/LCS/MSLofar/include/MSLofar/MSLofarFieldColumns.h
@@ -24,7 +24,7 @@
#ifndef MSLOFAR_MSLOFARFIELDCOLUMNS_H
#define MSLOFAR_MSLOFARFIELDCOLUMNS_H
-#include <ms/MeasurementSets/MSFieldColumns.h>
+#include <casacore/ms/MeasurementSets/MSFieldColumns.h>
namespace LOFAR {
@@ -38,7 +38,7 @@ namespace LOFAR {
// column. Access to non-predefined columns will still have to be done with
// explicit declarations.
- class ROMSLofarFieldColumns: public casa::ROMSFieldColumns
+ class ROMSLofarFieldColumns: public casacore::ROMSFieldColumns
{
public:
@@ -50,9 +50,9 @@ namespace LOFAR {
// Access to columns.
// <group>
- const casa::ROArrayColumn<casa::Double>& tileBeamDir() const
+ const casacore::ROArrayColumn<casacore::Double>& tileBeamDir() const
{ return tileBeamDir_p; }
- const casa::ROScalarMeasColumn<casa::MDirection>& tileBeamDirMeasCol() const
+ const casacore::ROScalarMeasColumn<casacore::MDirection>& tileBeamDirMeasCol() const
{ return tileBeamDirMeas_p; }
// </group>
@@ -71,9 +71,9 @@ namespace LOFAR {
ROMSLofarFieldColumns& operator=(const ROMSLofarFieldColumns&);
//# required columns
- casa::ROArrayColumn<casa::Double> tileBeamDir_p;
+ casacore::ROArrayColumn<casacore::Double> tileBeamDir_p;
//# Access to Measure columns
- casa::ROScalarMeasColumn<casa::MDirection> tileBeamDirMeas_p;
+ casacore::ROScalarMeasColumn<casacore::MDirection> tileBeamDirMeas_p;
};
@@ -84,7 +84,7 @@ namespace LOFAR {
// for every predefined column. Access to non-predefined columns will still
// have to be done with explicit declarations.
- class MSLofarFieldColumns: public casa::MSFieldColumns
+ class MSLofarFieldColumns: public casacore::MSFieldColumns
{
public:
@@ -96,24 +96,24 @@ namespace LOFAR {
// Read-write access to required columns.
// <group>
- const casa::ROArrayColumn<casa::Double>& tileBeamDir() const
+ const casacore::ROArrayColumn<casacore::Double>& tileBeamDir() const
{ return roTileBeamDir_p; }
- casa::ArrayColumn<casa::Double>& tileBeamDir()
+ casacore::ArrayColumn<casacore::Double>& tileBeamDir()
{ return rwTileBeamDir_p; }
- const casa::ROScalarMeasColumn<casa::MDirection>& tileBeamDirMeasCol() const
+ const casacore::ROScalarMeasColumn<casacore::MDirection>& tileBeamDirMeasCol() const
{ return roTileBeamDirMeas_p; }
- casa::ScalarMeasColumn<casa::MDirection>& tileBeamDirMeasCol()
+ casacore::ScalarMeasColumn<casacore::MDirection>& tileBeamDirMeasCol()
{ return rwTileBeamDirMeas_p; }
// </group>
// Set the direction reference type for all direction columns.
// This can only be done when the table has no rows.
// Trying to do so at other times will throw an exception.
- void setDirectionRef(casa::MDirection::Types ref);
+ void setDirectionRef(casacore::MDirection::Types ref);
// Same as above, but the LOFAR_TILE_BEAM_DIR can have a different type.
- void setDirectionRef(casa::MDirection::Types ref,
- casa::MDirection::Types tileBeamDirRef);
+ void setDirectionRef(casacore::MDirection::Types ref,
+ casacore::MDirection::Types tileBeamDirRef);
// Set the direction offset for all direction columns.
// This can only be done when the table has no rows.
@@ -140,11 +140,11 @@ namespace LOFAR {
MSLofarFieldColumns& operator=(const MSLofarFieldColumns&);
//# required columns
- casa::ROArrayColumn<casa::Double> roTileBeamDir_p;
- casa::ArrayColumn<casa::Double> rwTileBeamDir_p;
+ casacore::ROArrayColumn<casacore::Double> roTileBeamDir_p;
+ casacore::ArrayColumn<casacore::Double> rwTileBeamDir_p;
//# Access to Measure columns
- casa::ROScalarMeasColumn<casa::MDirection> roTileBeamDirMeas_p;
- casa::ScalarMeasColumn<casa::MDirection> rwTileBeamDirMeas_p;
+ casacore::ROScalarMeasColumn<casacore::MDirection> roTileBeamDirMeas_p;
+ casacore::ScalarMeasColumn<casacore::MDirection> rwTileBeamDirMeas_p;
};
} //# end namespace
diff --git a/LCS/MSLofar/include/MSLofar/MSLofarObsColumns.h b/LCS/MSLofar/include/MSLofar/MSLofarObsColumns.h
index 2c991c24ef46cdc71c99bd8b2ef3476c725333c4..74e6c5d7391e91c2fb6b230dda9ff59fdadfab59 100644
--- a/LCS/MSLofar/include/MSLofar/MSLofarObsColumns.h
+++ b/LCS/MSLofar/include/MSLofar/MSLofarObsColumns.h
@@ -24,7 +24,7 @@
#ifndef MSLOFAR_MSLOFAROBSCOLUMNS_H
#define MSLOFAR_MSLOFAROBSCOLUMNS_H
-#include <ms/MeasurementSets/MSObsColumns.h>
+#include <casacore/ms/MeasurementSets/MSObsColumns.h>
namespace LOFAR {
@@ -38,7 +38,7 @@ namespace LOFAR {
// column. Access to non-predefined columns will still have to be done with
// explicit declarations.
- class ROMSLofarObservationColumns: public casa::ROMSObservationColumns
+ class ROMSLofarObservationColumns: public casacore::ROMSObservationColumns
{
public:
@@ -50,77 +50,77 @@ namespace LOFAR {
// Access to columns.
// <group>
- const casa::ROScalarColumn<casa::String>& projectTitle() const
+ const casacore::ROScalarColumn<casacore::String>& projectTitle() const
{ return projectTitle_p; }
- const casa::ROScalarColumn<casa::String>& projectPI() const
+ const casacore::ROScalarColumn<casacore::String>& projectPI() const
{ return projectPI_p; }
- const casa::ROArrayColumn<casa::String>& projectCoI() const
+ const casacore::ROArrayColumn<casacore::String>& projectCoI() const
{ return projectCoI_p; }
- const casa::ROScalarColumn<casa::String>& projectContact() const
+ const casacore::ROScalarColumn<casacore::String>& projectContact() const
{ return projectContact_p; }
- const casa::ROScalarColumn<casa::String>& observationId() const
+ const casacore::ROScalarColumn<casacore::String>& observationId() const
{ return observationId_p; }
- const casa::ROScalarColumn<casa::Double>& observationStart() const
+ const casacore::ROScalarColumn<casacore::Double>& observationStart() const
{ return observationStart_p; }
- const casa::ROScalarColumn<casa::Double>& observationEnd() const
+ const casacore::ROScalarColumn<casacore::Double>& observationEnd() const
{ return observationEnd_p; }
- const casa::ROScalarColumn<casa::Double>& observationFrequencyMax() const
+ const casacore::ROScalarColumn<casacore::Double>& observationFrequencyMax() const
{ return observationFrequencyMax_p; }
- const casa::ROScalarColumn<casa::Double>& observationFrequencyMin() const
+ const casacore::ROScalarColumn<casacore::Double>& observationFrequencyMin() const
{ return observationFrequencyMin_p; }
- const casa::ROScalarColumn<casa::Double>& observationFrequencyCenter() const
+ const casacore::ROScalarColumn<casacore::Double>& observationFrequencyCenter() const
{ return observationFrequencyCenter_p; }
- const casa::ROScalarColumn<casa::Int>& subArrayPointing() const
+ const casacore::ROScalarColumn<casacore::Int>& subArrayPointing() const
{ return subArrayPointing_p; }
- const casa::ROScalarColumn<casa::Int>& nofBitsPerSample() const
+ const casacore::ROScalarColumn<casacore::Int>& nofBitsPerSample() const
{ return nofBitsPerSample_p; }
- const casa::ROScalarColumn<casa::String>& antennaSet() const
+ const casacore::ROScalarColumn<casacore::String>& antennaSet() const
{ return antennaSet_p; }
- const casa::ROScalarColumn<casa::String>& filterSelection() const
+ const casacore::ROScalarColumn<casacore::String>& filterSelection() const
{ return filterSelection_p; }
- const casa::ROScalarColumn<casa::Double>& clockFrequency() const
+ const casacore::ROScalarColumn<casacore::Double>& clockFrequency() const
{ return clockFrequency_p; }
- const casa::ROArrayColumn<casa::String>& target() const
+ const casacore::ROArrayColumn<casacore::String>& target() const
{ return target_p; }
- const casa::ROScalarColumn<casa::String>& systemVersion() const
+ const casacore::ROScalarColumn<casacore::String>& systemVersion() const
{ return systemVersion_p; }
- const casa::ROScalarColumn<casa::String>& pipelineName() const
+ const casacore::ROScalarColumn<casacore::String>& pipelineName() const
{ return pipelineName_p; }
- const casa::ROScalarColumn<casa::String>& pipelineVersion() const
+ const casacore::ROScalarColumn<casacore::String>& pipelineVersion() const
{ return pipelineVersion_p; }
- const casa::ROScalarColumn<casa::String>& filename() const
+ const casacore::ROScalarColumn<casacore::String>& filename() const
{ return filename_p; }
- const casa::ROScalarColumn<casa::String>& filetype() const
+ const casacore::ROScalarColumn<casacore::String>& filetype() const
{ return filetype_p; }
- const casa::ROScalarColumn<casa::Double>& filedate() const
+ const casacore::ROScalarColumn<casacore::Double>& filedate() const
{ return filedate_p; }
// </group>
// Access to Quantity columns
// <group>
- const casa::ROScalarQuantColumn<casa::Double>& observationStartQuant() const
+ const casacore::ROScalarQuantColumn<casacore::Double>& observationStartQuant() const
{ return observationStartQuant_p; }
- const casa::ROScalarQuantColumn<casa::Double>& observationEndQuant() const
+ const casacore::ROScalarQuantColumn<casacore::Double>& observationEndQuant() const
{ return observationEndQuant_p; }
- const casa::ROScalarQuantColumn<casa::Double>& observationFrequencyMaxQuant() const
+ const casacore::ROScalarQuantColumn<casacore::Double>& observationFrequencyMaxQuant() const
{ return observationFrequencyMaxQuant_p; }
- const casa::ROScalarQuantColumn<casa::Double>& observationFrequencyMinQuant() const
+ const casacore::ROScalarQuantColumn<casacore::Double>& observationFrequencyMinQuant() const
{ return observationFrequencyMinQuant_p; }
- const casa::ROScalarQuantColumn<casa::Double>& clockFrequencyQuant() const
+ const casacore::ROScalarQuantColumn<casacore::Double>& clockFrequencyQuant() const
{ return clockFrequencyQuant_p; }
- const casa::ROScalarQuantColumn<casa::Double>& observationFrequencyCenterQuant() const
+ const casacore::ROScalarQuantColumn<casacore::Double>& observationFrequencyCenterQuant() const
{ return observationFrequencyCenterQuant_p; }
- const casa::ROScalarQuantColumn<casa::Double>& filedateQuant() const
+ const casacore::ROScalarQuantColumn<casacore::Double>& filedateQuant() const
{ return filedateQuant_p; }
// </group>
// Access to Measure columns
// <group>
- const casa::ROScalarMeasColumn<casa::MEpoch>& observationStartMeas() const
+ const casacore::ROScalarMeasColumn<casacore::MEpoch>& observationStartMeas() const
{ return observationStartMeas_p; }
- const casa::ROScalarMeasColumn<casa::MEpoch>& observationEndMeas() const
+ const casacore::ROScalarMeasColumn<casacore::MEpoch>& observationEndMeas() const
{ return observationEndMeas_p; }
- const casa::ROScalarMeasColumn<casa::MEpoch>& filedateMeas() const
+ const casacore::ROScalarMeasColumn<casacore::MEpoch>& filedateMeas() const
{ return filedateMeas_p; }
// </group>
@@ -139,40 +139,40 @@ namespace LOFAR {
ROMSLofarObservationColumns& operator=(const ROMSLofarObservationColumns&);
//# required columns
- casa::ROScalarColumn<casa::String> projectTitle_p;
- casa::ROScalarColumn<casa::String> projectPI_p;
- casa::ROArrayColumn<casa::String> projectCoI_p;
- casa::ROScalarColumn<casa::String> projectContact_p;
- casa::ROScalarColumn<casa::String> observationId_p;
- casa::ROScalarColumn<casa::Double> observationStart_p;
- casa::ROScalarColumn<casa::Double> observationEnd_p;
- casa::ROScalarColumn<casa::Double> observationFrequencyMax_p;
- casa::ROScalarColumn<casa::Double> observationFrequencyMin_p;
- casa::ROScalarColumn<casa::Double> observationFrequencyCenter_p;
- casa::ROScalarColumn<casa::Int> subArrayPointing_p;
- casa::ROScalarColumn<casa::Int> nofBitsPerSample_p;
- casa::ROScalarColumn<casa::String> antennaSet_p;
- casa::ROScalarColumn<casa::String> filterSelection_p;
- casa::ROScalarColumn<casa::Double> clockFrequency_p;
- casa::ROArrayColumn<casa::String> target_p;
- casa::ROScalarColumn<casa::String> systemVersion_p;
- casa::ROScalarColumn<casa::String> pipelineName_p;
- casa::ROScalarColumn<casa::String> pipelineVersion_p;
- casa::ROScalarColumn<casa::String> filename_p;
- casa::ROScalarColumn<casa::String> filetype_p;
- casa::ROScalarColumn<casa::Double> filedate_p;
+ casacore::ROScalarColumn<casacore::String> projectTitle_p;
+ casacore::ROScalarColumn<casacore::String> projectPI_p;
+ casacore::ROArrayColumn<casacore::String> projectCoI_p;
+ casacore::ROScalarColumn<casacore::String> projectContact_p;
+ casacore::ROScalarColumn<casacore::String> observationId_p;
+ casacore::ROScalarColumn<casacore::Double> observationStart_p;
+ casacore::ROScalarColumn<casacore::Double> observationEnd_p;
+ casacore::ROScalarColumn<casacore::Double> observationFrequencyMax_p;
+ casacore::ROScalarColumn<casacore::Double> observationFrequencyMin_p;
+ casacore::ROScalarColumn<casacore::Double> observationFrequencyCenter_p;
+ casacore::ROScalarColumn<casacore::Int> subArrayPointing_p;
+ casacore::ROScalarColumn<casacore::Int> nofBitsPerSample_p;
+ casacore::ROScalarColumn<casacore::String> antennaSet_p;
+ casacore::ROScalarColumn<casacore::String> filterSelection_p;
+ casacore::ROScalarColumn<casacore::Double> clockFrequency_p;
+ casacore::ROArrayColumn<casacore::String> target_p;
+ casacore::ROScalarColumn<casacore::String> systemVersion_p;
+ casacore::ROScalarColumn<casacore::String> pipelineName_p;
+ casacore::ROScalarColumn<casacore::String> pipelineVersion_p;
+ casacore::ROScalarColumn<casacore::String> filename_p;
+ casacore::ROScalarColumn<casacore::String> filetype_p;
+ casacore::ROScalarColumn<casacore::Double> filedate_p;
//# Access to Quantum columns
- casa::ROScalarQuantColumn<casa::Double> observationStartQuant_p;
- casa::ROScalarQuantColumn<casa::Double> observationEndQuant_p;
- casa::ROScalarQuantColumn<casa::Double> observationFrequencyMaxQuant_p;
- casa::ROScalarQuantColumn<casa::Double> observationFrequencyMinQuant_p;
- casa::ROScalarQuantColumn<casa::Double> observationFrequencyCenterQuant_p;
- casa::ROScalarQuantColumn<casa::Double> clockFrequencyQuant_p;
- casa::ROScalarQuantColumn<casa::Double> filedateQuant_p;
+ casacore::ROScalarQuantColumn<casacore::Double> observationStartQuant_p;
+ casacore::ROScalarQuantColumn<casacore::Double> observationEndQuant_p;
+ casacore::ROScalarQuantColumn<casacore::Double> observationFrequencyMaxQuant_p;
+ casacore::ROScalarQuantColumn<casacore::Double> observationFrequencyMinQuant_p;
+ casacore::ROScalarQuantColumn<casacore::Double> observationFrequencyCenterQuant_p;
+ casacore::ROScalarQuantColumn<casacore::Double> clockFrequencyQuant_p;
+ casacore::ROScalarQuantColumn<casacore::Double> filedateQuant_p;
//# Access to Measure columns
- casa::ROScalarMeasColumn<casa::MEpoch> observationStartMeas_p;
- casa::ROScalarMeasColumn<casa::MEpoch> observationEndMeas_p;
- casa::ROScalarMeasColumn<casa::MEpoch> filedateMeas_p;
+ casacore::ROScalarMeasColumn<casacore::MEpoch> observationStartMeas_p;
+ casacore::ROScalarMeasColumn<casacore::MEpoch> observationEndMeas_p;
+ casacore::ROScalarMeasColumn<casacore::MEpoch> filedateMeas_p;
};
@@ -183,7 +183,7 @@ namespace LOFAR {
// for every predefined column. Access to non-predefined columns will still
// have to be done with explicit declarations.
- class MSLofarObservationColumns: public casa::MSObservationColumns
+ class MSLofarObservationColumns: public casacore::MSObservationColumns
{
public:
@@ -195,153 +195,153 @@ namespace LOFAR {
// Readonly access to columns.
// <group>
- const casa::ROScalarColumn<casa::String>& projectTitle() const
+ const casacore::ROScalarColumn<casacore::String>& projectTitle() const
{ return roProjectTitle_p; }
- const casa::ROScalarColumn<casa::String>& projectPI() const
+ const casacore::ROScalarColumn<casacore::String>& projectPI() const
{ return roProjectPI_p; }
- const casa::ROArrayColumn<casa::String>& projectCoI() const
+ const casacore::ROArrayColumn<casacore::String>& projectCoI() const
{ return roProjectCoI_p; }
- const casa::ROScalarColumn<casa::String>& projectContact() const
+ const casacore::ROScalarColumn<casacore::String>& projectContact() const
{ return roProjectContact_p; }
- const casa::ROScalarColumn<casa::String>& observationId() const
+ const casacore::ROScalarColumn<casacore::String>& observationId() const
{ return roObservationId_p; }
- const casa::ROScalarColumn<casa::Double>& observationStart() const
+ const casacore::ROScalarColumn<casacore::Double>& observationStart() const
{ return roObservationStart_p; }
- const casa::ROScalarColumn<casa::Double>& observationEnd() const
+ const casacore::ROScalarColumn<casacore::Double>& observationEnd() const
{ return roObservationEnd_p; }
- const casa::ROScalarColumn<casa::Double>& observationFrequencyMax() const
+ const casacore::ROScalarColumn<casacore::Double>& observationFrequencyMax() const
{ return roObservationFrequencyMax_p; }
- const casa::ROScalarColumn<casa::Double>& observationFrequencyMin() const
+ const casacore::ROScalarColumn<casacore::Double>& observationFrequencyMin() const
{ return roObservationFrequencyMin_p; }
- const casa::ROScalarColumn<casa::Double>& observationFrequencyCenter() const
+ const casacore::ROScalarColumn<casacore::Double>& observationFrequencyCenter() const
{ return roObservationFrequencyCenter_p; }
- const casa::ROScalarColumn<casa::Int>& subArrayPointing() const
+ const casacore::ROScalarColumn<casacore::Int>& subArrayPointing() const
{ return roSubArrayPointing_p; }
- const casa::ROScalarColumn<casa::Int>& nofBitsPerSample() const
+ const casacore::ROScalarColumn<casacore::Int>& nofBitsPerSample() const
{ return roNofBitsPerSample_p; }
- const casa::ROScalarColumn<casa::String>& antennaSet() const
+ const casacore::ROScalarColumn<casacore::String>& antennaSet() const
{ return roAntennaSet_p; }
- const casa::ROScalarColumn<casa::String>& filterSelection() const
+ const casacore::ROScalarColumn<casacore::String>& filterSelection() const
{ return roFilterSelection_p; }
- const casa::ROScalarColumn<casa::Double>& clockFrequency() const
+ const casacore::ROScalarColumn<casacore::Double>& clockFrequency() const
{ return roClockFrequency_p; }
- const casa::ROArrayColumn<casa::String>& target() const
+ const casacore::ROArrayColumn<casacore::String>& target() const
{ return roTarget_p; }
- const casa::ROScalarColumn<casa::String>& systemVersion() const
+ const casacore::ROScalarColumn<casacore::String>& systemVersion() const
{ return roSystemVersion_p; }
- const casa::ROScalarColumn<casa::String>& pipelineName() const
+ const casacore::ROScalarColumn<casacore::String>& pipelineName() const
{ return roPipelineName_p; }
- const casa::ROScalarColumn<casa::String>& pipelineVersion() const
+ const casacore::ROScalarColumn<casacore::String>& pipelineVersion() const
{ return roPipelineVersion_p; }
- const casa::ROScalarColumn<casa::String>& filename() const
+ const casacore::ROScalarColumn<casacore::String>& filename() const
{ return roFilename_p; }
- const casa::ROScalarColumn<casa::String>& filetype() const
+ const casacore::ROScalarColumn<casacore::String>& filetype() const
{ return roFiletype_p; }
- const casa::ROScalarColumn<casa::Double>& filedate() const
+ const casacore::ROScalarColumn<casacore::Double>& filedate() const
{ return roFiledate_p; }
// </group>
// Readonly access to Quantity columns
// <group>
- const casa::ROScalarQuantColumn<casa::Double>& observationStartQuant() const
+ const casacore::ROScalarQuantColumn<casacore::Double>& observationStartQuant() const
{ return roObservationStartQuant_p; }
- const casa::ROScalarQuantColumn<casa::Double>& observationEndQuant() const
+ const casacore::ROScalarQuantColumn<casacore::Double>& observationEndQuant() const
{ return roObservationEndQuant_p; }
- const casa::ROScalarQuantColumn<casa::Double>& observationFrequencyMaxQuant() const
+ const casacore::ROScalarQuantColumn<casacore::Double>& observationFrequencyMaxQuant() const
{ return roObservationFrequencyMaxQuant_p; }
- const casa::ROScalarQuantColumn<casa::Double>& observationFrequencyMinQuant() const
+ const casacore::ROScalarQuantColumn<casacore::Double>& observationFrequencyMinQuant() const
{ return roObservationFrequencyMinQuant_p; }
- const casa::ROScalarQuantColumn<casa::Double>& observationFrequencyCenterQuant() const
+ const casacore::ROScalarQuantColumn<casacore::Double>& observationFrequencyCenterQuant() const
{ return roObservationFrequencyCenterQuant_p; }
- const casa::ROScalarQuantColumn<casa::Double>& clockFrequencyQuant() const
+ const casacore::ROScalarQuantColumn<casacore::Double>& clockFrequencyQuant() const
{ return roClockFrequencyQuant_p; }
- const casa::ROScalarQuantColumn<casa::Double>& filedateQuant() const
+ const casacore::ROScalarQuantColumn<casacore::Double>& filedateQuant() const
{ return roFiledateQuant_p; }
// </group>
// Readonly access to Measure columns
// <group>
- const casa::ROScalarMeasColumn<casa::MEpoch>& observationStartMeas() const
+ const casacore::ROScalarMeasColumn<casacore::MEpoch>& observationStartMeas() const
{ return roObservationStartMeas_p; }
- const casa::ROScalarMeasColumn<casa::MEpoch>& observationEndMeas() const
+ const casacore::ROScalarMeasColumn<casacore::MEpoch>& observationEndMeas() const
{ return roObservationEndMeas_p; }
- const casa::ROScalarMeasColumn<casa::MEpoch>& filedateMeas() const
+ const casacore::ROScalarMeasColumn<casacore::MEpoch>& filedateMeas() const
{ return roFiledateMeas_p; }
// </group>
// Read/write access to columns.
// <group>
- casa::ScalarColumn<casa::String>& projectTitle()
+ casacore::ScalarColumn<casacore::String>& projectTitle()
{ return rwProjectTitle_p; }
- casa::ScalarColumn<casa::String>& projectPI()
+ casacore::ScalarColumn<casacore::String>& projectPI()
{ return rwProjectPI_p; }
- casa::ArrayColumn<casa::String>& projectCoI()
+ casacore::ArrayColumn<casacore::String>& projectCoI()
{ return rwProjectCoI_p; }
- casa::ScalarColumn<casa::String>& projectContact()
+ casacore::ScalarColumn<casacore::String>& projectContact()
{ return rwProjectContact_p; }
- casa::ScalarColumn<casa::String>& observationId()
+ casacore::ScalarColumn<casacore::String>& observationId()
{ return rwObservationId_p; }
- casa::ScalarColumn<casa::Double>& observationStart()
+ casacore::ScalarColumn<casacore::Double>& observationStart()
{ return rwObservationStart_p; }
- casa::ScalarColumn<casa::Double>& observationEnd()
+ casacore::ScalarColumn<casacore::Double>& observationEnd()
{ return rwObservationEnd_p; }
- casa::ScalarColumn<casa::Double>& observationFrequencyMax()
+ casacore::ScalarColumn<casacore::Double>& observationFrequencyMax()
{ return rwObservationFrequencyMax_p; }
- casa::ScalarColumn<casa::Double>& observationFrequencyMin()
+ casacore::ScalarColumn<casacore::Double>& observationFrequencyMin()
{ return rwObservationFrequencyMin_p; }
- casa::ScalarColumn<casa::Double>& observationFrequencyCenter()
+ casacore::ScalarColumn<casacore::Double>& observationFrequencyCenter()
{ return rwObservationFrequencyCenter_p; }
- casa::ScalarColumn<casa::Int>& subArrayPointing()
+ casacore::ScalarColumn<casacore::Int>& subArrayPointing()
{ return rwSubArrayPointing_p; }
- casa::ScalarColumn<casa::Int>& nofBitsPerSample()
+ casacore::ScalarColumn<casacore::Int>& nofBitsPerSample()
{ return rwNofBitsPerSample_p; }
- casa::ScalarColumn<casa::String>& antennaSet()
+ casacore::ScalarColumn<casacore::String>& antennaSet()
{ return rwAntennaSet_p; }
- casa::ScalarColumn<casa::String>& filterSelection()
+ casacore::ScalarColumn<casacore::String>& filterSelection()
{ return rwFilterSelection_p; }
- casa::ScalarColumn<casa::Double>& clockFrequency()
+ casacore::ScalarColumn<casacore::Double>& clockFrequency()
{ return rwClockFrequency_p; }
- casa::ArrayColumn<casa::String>& target()
+ casacore::ArrayColumn<casacore::String>& target()
{ return rwTarget_p; }
- casa::ScalarColumn<casa::String>& systemVersion()
+ casacore::ScalarColumn<casacore::String>& systemVersion()
{ return rwSystemVersion_p; }
- casa::ScalarColumn<casa::String>& pipelineName()
+ casacore::ScalarColumn<casacore::String>& pipelineName()
{ return rwPipelineName_p; }
- casa::ScalarColumn<casa::String>& pipelineVersion()
+ casacore::ScalarColumn<casacore::String>& pipelineVersion()
{ return rwPipelineVersion_p; }
- casa::ScalarColumn<casa::String>& filename()
+ casacore::ScalarColumn<casacore::String>& filename()
{ return rwFilename_p; }
- casa::ScalarColumn<casa::String>& filetype()
+ casacore::ScalarColumn<casacore::String>& filetype()
{ return rwFiletype_p; }
- casa::ScalarColumn<casa::Double>& filedate()
+ casacore::ScalarColumn<casacore::Double>& filedate()
{ return rwFiledate_p; }
// </group>
// Read/write access to Quantity columns
// <group>
- casa::ScalarQuantColumn<casa::Double>& observationStartQuant()
+ casacore::ScalarQuantColumn<casacore::Double>& observationStartQuant()
{ return rwObservationStartQuant_p; }
- casa::ScalarQuantColumn<casa::Double>& observationEndQuant()
+ casacore::ScalarQuantColumn<casacore::Double>& observationEndQuant()
{ return rwObservationEndQuant_p; }
- casa::ScalarQuantColumn<casa::Double>& observationFrequencyMaxQuant()
+ casacore::ScalarQuantColumn<casacore::Double>& observationFrequencyMaxQuant()
{ return rwObservationFrequencyMaxQuant_p; }
- casa::ScalarQuantColumn<casa::Double>& observationFrequencyMinQuant()
+ casacore::ScalarQuantColumn<casacore::Double>& observationFrequencyMinQuant()
{ return rwObservationFrequencyMinQuant_p; }
- casa::ScalarQuantColumn<casa::Double>& observationFrequencyCenterQuant()
+ casacore::ScalarQuantColumn<casacore::Double>& observationFrequencyCenterQuant()
{ return rwObservationFrequencyCenterQuant_p; }
- casa::ScalarQuantColumn<casa::Double>& clockFrequencyQuant()
+ casacore::ScalarQuantColumn<casacore::Double>& clockFrequencyQuant()
{ return rwClockFrequencyQuant_p; }
- casa::ScalarQuantColumn<casa::Double>& filedateQuant()
+ casacore::ScalarQuantColumn<casacore::Double>& filedateQuant()
{ return rwFiledateQuant_p; }
// </group>
// Read/write access to Measure columns
// <group>
- casa::ScalarMeasColumn<casa::MEpoch>& observationStartMeas()
+ casacore::ScalarMeasColumn<casacore::MEpoch>& observationStartMeas()
{ return rwObservationStartMeas_p; }
- casa::ScalarMeasColumn<casa::MEpoch>& observationEndMeas()
+ casacore::ScalarMeasColumn<casacore::MEpoch>& observationEndMeas()
{ return rwObservationEndMeas_p; }
- casa::ScalarMeasColumn<casa::MEpoch>& filedateMeas()
+ casacore::ScalarMeasColumn<casacore::MEpoch>& filedateMeas()
{ return rwFiledateMeas_p; }
// </group>
@@ -360,75 +360,75 @@ namespace LOFAR {
MSLofarObservationColumns& operator=(const MSLofarObservationColumns&);
//# required columns
- casa::ROScalarColumn<casa::String> roProjectTitle_p;
- casa::ROScalarColumn<casa::String> roProjectPI_p;
- casa::ROArrayColumn<casa::String> roProjectCoI_p;
- casa::ROScalarColumn<casa::String> roProjectContact_p;
- casa::ROScalarColumn<casa::String> roObservationId_p;
- casa::ROScalarColumn<casa::Double> roObservationStart_p;
- casa::ROScalarColumn<casa::Double> roObservationEnd_p;
- casa::ROScalarColumn<casa::Double> roObservationFrequencyMax_p;
- casa::ROScalarColumn<casa::Double> roObservationFrequencyMin_p;
- casa::ROScalarColumn<casa::Double> roObservationFrequencyCenter_p;
- casa::ROScalarColumn<casa::Int> roSubArrayPointing_p;
- casa::ROScalarColumn<casa::Int> roNofBitsPerSample_p;
- casa::ROScalarColumn<casa::String> roAntennaSet_p;
- casa::ROScalarColumn<casa::String> roFilterSelection_p;
- casa::ROScalarColumn<casa::Double> roClockFrequency_p;
- casa::ROArrayColumn<casa::String> roTarget_p;
- casa::ROScalarColumn<casa::String> roSystemVersion_p;
- casa::ROScalarColumn<casa::String> roPipelineName_p;
- casa::ROScalarColumn<casa::String> roPipelineVersion_p;
- casa::ROScalarColumn<casa::String> roFilename_p;
- casa::ROScalarColumn<casa::String> roFiletype_p;
- casa::ROScalarColumn<casa::Double> roFiledate_p;
+ casacore::ROScalarColumn<casacore::String> roProjectTitle_p;
+ casacore::ROScalarColumn<casacore::String> roProjectPI_p;
+ casacore::ROArrayColumn<casacore::String> roProjectCoI_p;
+ casacore::ROScalarColumn<casacore::String> roProjectContact_p;
+ casacore::ROScalarColumn<casacore::String> roObservationId_p;
+ casacore::ROScalarColumn<casacore::Double> roObservationStart_p;
+ casacore::ROScalarColumn<casacore::Double> roObservationEnd_p;
+ casacore::ROScalarColumn<casacore::Double> roObservationFrequencyMax_p;
+ casacore::ROScalarColumn<casacore::Double> roObservationFrequencyMin_p;
+ casacore::ROScalarColumn<casacore::Double> roObservationFrequencyCenter_p;
+ casacore::ROScalarColumn<casacore::Int> roSubArrayPointing_p;
+ casacore::ROScalarColumn<casacore::Int> roNofBitsPerSample_p;
+ casacore::ROScalarColumn<casacore::String> roAntennaSet_p;
+ casacore::ROScalarColumn<casacore::String> roFilterSelection_p;
+ casacore::ROScalarColumn<casacore::Double> roClockFrequency_p;
+ casacore::ROArrayColumn<casacore::String> roTarget_p;
+ casacore::ROScalarColumn<casacore::String> roSystemVersion_p;
+ casacore::ROScalarColumn<casacore::String> roPipelineName_p;
+ casacore::ROScalarColumn<casacore::String> roPipelineVersion_p;
+ casacore::ROScalarColumn<casacore::String> roFilename_p;
+ casacore::ROScalarColumn<casacore::String> roFiletype_p;
+ casacore::ROScalarColumn<casacore::Double> roFiledate_p;
//# Access to Quantum columns
- casa::ROScalarQuantColumn<casa::Double> roObservationStartQuant_p;
- casa::ROScalarQuantColumn<casa::Double> roObservationEndQuant_p;
- casa::ROScalarQuantColumn<casa::Double> roObservationFrequencyMaxQuant_p;
- casa::ROScalarQuantColumn<casa::Double> roObservationFrequencyMinQuant_p;
- casa::ROScalarQuantColumn<casa::Double> roObservationFrequencyCenterQuant_p;
- casa::ROScalarQuantColumn<casa::Double> roClockFrequencyQuant_p;
- casa::ROScalarQuantColumn<casa::Double> roFiledateQuant_p;
+ casacore::ROScalarQuantColumn<casacore::Double> roObservationStartQuant_p;
+ casacore::ROScalarQuantColumn<casacore::Double> roObservationEndQuant_p;
+ casacore::ROScalarQuantColumn<casacore::Double> roObservationFrequencyMaxQuant_p;
+ casacore::ROScalarQuantColumn<casacore::Double> roObservationFrequencyMinQuant_p;
+ casacore::ROScalarQuantColumn<casacore::Double> roObservationFrequencyCenterQuant_p;
+ casacore::ROScalarQuantColumn<casacore::Double> roClockFrequencyQuant_p;
+ casacore::ROScalarQuantColumn<casacore::Double> roFiledateQuant_p;
//# Access to Measure columns
- casa::ROScalarMeasColumn<casa::MEpoch> roObservationStartMeas_p;
- casa::ROScalarMeasColumn<casa::MEpoch> roObservationEndMeas_p;
- casa::ROScalarMeasColumn<casa::MEpoch> roFiledateMeas_p;
+ casacore::ROScalarMeasColumn<casacore::MEpoch> roObservationStartMeas_p;
+ casacore::ROScalarMeasColumn<casacore::MEpoch> roObservationEndMeas_p;
+ casacore::ROScalarMeasColumn<casacore::MEpoch> roFiledateMeas_p;
//# required columns
- casa::ScalarColumn<casa::String> rwProjectTitle_p;
- casa::ScalarColumn<casa::String> rwProjectPI_p;
- casa::ArrayColumn<casa::String> rwProjectCoI_p;
- casa::ScalarColumn<casa::String> rwProjectContact_p;
- casa::ScalarColumn<casa::String> rwObservationId_p;
- casa::ScalarColumn<casa::Double> rwObservationStart_p;
- casa::ScalarColumn<casa::Double> rwObservationEnd_p;
- casa::ScalarColumn<casa::Double> rwObservationFrequencyMax_p;
- casa::ScalarColumn<casa::Double> rwObservationFrequencyMin_p;
- casa::ScalarColumn<casa::Double> rwObservationFrequencyCenter_p;
- casa::ScalarColumn<casa::Int> rwSubArrayPointing_p;
- casa::ScalarColumn<casa::Int> rwNofBitsPerSample_p;
- casa::ScalarColumn<casa::String> rwAntennaSet_p;
- casa::ScalarColumn<casa::String> rwFilterSelection_p;
- casa::ScalarColumn<casa::Double> rwClockFrequency_p;
- casa::ArrayColumn<casa::String> rwTarget_p;
- casa::ScalarColumn<casa::String> rwSystemVersion_p;
- casa::ScalarColumn<casa::String> rwPipelineName_p;
- casa::ScalarColumn<casa::String> rwPipelineVersion_p;
- casa::ScalarColumn<casa::String> rwFilename_p;
- casa::ScalarColumn<casa::String> rwFiletype_p;
- casa::ScalarColumn<casa::Double> rwFiledate_p;
+ casacore::ScalarColumn<casacore::String> rwProjectTitle_p;
+ casacore::ScalarColumn<casacore::String> rwProjectPI_p;
+ casacore::ArrayColumn<casacore::String> rwProjectCoI_p;
+ casacore::ScalarColumn<casacore::String> rwProjectContact_p;
+ casacore::ScalarColumn<casacore::String> rwObservationId_p;
+ casacore::ScalarColumn<casacore::Double> rwObservationStart_p;
+ casacore::ScalarColumn<casacore::Double> rwObservationEnd_p;
+ casacore::ScalarColumn<casacore::Double> rwObservationFrequencyMax_p;
+ casacore::ScalarColumn<casacore::Double> rwObservationFrequencyMin_p;
+ casacore::ScalarColumn<casacore::Double> rwObservationFrequencyCenter_p;
+ casacore::ScalarColumn<casacore::Int> rwSubArrayPointing_p;
+ casacore::ScalarColumn<casacore::Int> rwNofBitsPerSample_p;
+ casacore::ScalarColumn<casacore::String> rwAntennaSet_p;
+ casacore::ScalarColumn<casacore::String> rwFilterSelection_p;
+ casacore::ScalarColumn<casacore::Double> rwClockFrequency_p;
+ casacore::ArrayColumn<casacore::String> rwTarget_p;
+ casacore::ScalarColumn<casacore::String> rwSystemVersion_p;
+ casacore::ScalarColumn<casacore::String> rwPipelineName_p;
+ casacore::ScalarColumn<casacore::String> rwPipelineVersion_p;
+ casacore::ScalarColumn<casacore::String> rwFilename_p;
+ casacore::ScalarColumn<casacore::String> rwFiletype_p;
+ casacore::ScalarColumn<casacore::Double> rwFiledate_p;
//# Access to Quantum columns
- casa::ScalarQuantColumn<casa::Double> rwObservationStartQuant_p;
- casa::ScalarQuantColumn<casa::Double> rwObservationEndQuant_p;
- casa::ScalarQuantColumn<casa::Double> rwObservationFrequencyMaxQuant_p;
- casa::ScalarQuantColumn<casa::Double> rwObservationFrequencyMinQuant_p;
- casa::ScalarQuantColumn<casa::Double> rwObservationFrequencyCenterQuant_p;
- casa::ScalarQuantColumn<casa::Double> rwClockFrequencyQuant_p;
- casa::ScalarQuantColumn<casa::Double> rwFiledateQuant_p;
+ casacore::ScalarQuantColumn<casacore::Double> rwObservationStartQuant_p;
+ casacore::ScalarQuantColumn<casacore::Double> rwObservationEndQuant_p;
+ casacore::ScalarQuantColumn<casacore::Double> rwObservationFrequencyMaxQuant_p;
+ casacore::ScalarQuantColumn<casacore::Double> rwObservationFrequencyMinQuant_p;
+ casacore::ScalarQuantColumn<casacore::Double> rwObservationFrequencyCenterQuant_p;
+ casacore::ScalarQuantColumn<casacore::Double> rwClockFrequencyQuant_p;
+ casacore::ScalarQuantColumn<casacore::Double> rwFiledateQuant_p;
//# Access to Measure columns
- casa::ScalarMeasColumn<casa::MEpoch> rwObservationStartMeas_p;
- casa::ScalarMeasColumn<casa::MEpoch> rwObservationEndMeas_p;
- casa::ScalarMeasColumn<casa::MEpoch> rwFiledateMeas_p;
+ casacore::ScalarMeasColumn<casacore::MEpoch> rwObservationStartMeas_p;
+ casacore::ScalarMeasColumn<casacore::MEpoch> rwObservationEndMeas_p;
+ casacore::ScalarMeasColumn<casacore::MEpoch> rwFiledateMeas_p;
};
} //# end namespace
diff --git a/LCS/MSLofar/include/MSLofar/MSLofarObservation.h b/LCS/MSLofar/include/MSLofar/MSLofarObservation.h
index e12ce16382526f64be6b44320ae54f8c5b0477bf..e6ea5ec8ab10d3b4cc924303206a978e2420d157 100644
--- a/LCS/MSLofar/include/MSLofar/MSLofarObservation.h
+++ b/LCS/MSLofar/include/MSLofar/MSLofarObservation.h
@@ -24,12 +24,12 @@
#ifndef MSLOFAR_MSLOFAROBSERVATION_H
#define MSLOFAR_MSLOFAROBSERVATION_H
-#include <ms/MeasurementSets/MSObservation.h>
+#include <casacore/ms/MeasurementSets/MSObservation.h>
#include <MSLofar/MSLofarTable.h>
namespace LOFAR {
- class MSLofarObservation: public casa::MSObservation
+ class MSLofarObservation: public casacore::MSObservation
{
public:
@@ -37,15 +37,15 @@ namespace LOFAR {
MSLofarObservation();
// Create from an existing table.
- MSLofarObservation (const casa::String& tableName,
- casa::Table::TableOption option);
+ MSLofarObservation (const casacore::String& tableName,
+ casacore::Table::TableOption option);
// Create a new table.
- MSLofarObservation (casa::SetupNewTable& newTab, casa::uInt nrrow,
- casa::Bool initialize);
+ MSLofarObservation (casacore::SetupNewTable& newTab, casacore::uInt nrrow,
+ casacore::Bool initialize);
// Create from an existing Table object.
- MSLofarObservation (const casa::Table& table);
+ MSLofarObservation (const casacore::Table& table);
// Copy constructor (reference semnatics).
MSLofarObservation (const MSLofarObservation& that);
@@ -57,7 +57,7 @@ namespace LOFAR {
MSLofarObservation& operator= (const MSLofarObservation& that);
// Create the table description containing the required columns.
- static casa::TableDesc requiredTableDesc();
+ static casacore::TableDesc requiredTableDesc();
};
} //# end namespace
diff --git a/LCS/MSLofar/include/MSLofar/MSLofarTable.h b/LCS/MSLofar/include/MSLofar/MSLofarTable.h
index 9dce9b1981247c6731432f9b5d8649de85c290c4..de9a6178e976f1058a7c03b47bef1ef6575c8f2e 100644
--- a/LCS/MSLofar/include/MSLofar/MSLofarTable.h
+++ b/LCS/MSLofar/include/MSLofar/MSLofarTable.h
@@ -24,12 +24,12 @@
#ifndef MSLOFAR_MSLOFARTABLE_H
#define MSLOFAR_MSLOFARTABLE_H
-#include <tables/Tables/Table.h>
-#include <casa/Arrays/IPosition.h>
-#include <casa/Utilities/DataType.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/casa/Arrays/IPosition.h>
+#include <casacore/casa/Utilities/DataType.h>
//# Forward Declarations.
-namespace casa {
+namespace casacore {
class TableDesc;
class SetupNewTable;
class String;
@@ -40,21 +40,21 @@ namespace LOFAR {
// This class is the base class for a LOFAR MeasurementSet table.
// It is modeled after the casacore MS classes.
- class MSLofarTable: public casa::Table
+ class MSLofarTable: public casacore::Table
{
public:
// Default constructor creates an unusable object.
MSLofarTable();
// Create from an existing table.
- MSLofarTable (const casa::String& tableName, casa::Table::TableOption);
+ MSLofarTable (const casacore::String& tableName, casacore::Table::TableOption);
// Create a new table.
- MSLofarTable (casa::SetupNewTable& newTab, casa::uInt nrrow,
- casa::Bool initialize);
+ MSLofarTable (casacore::SetupNewTable& newTab, casacore::uInt nrrow,
+ casacore::Bool initialize);
// Create from an existing Table object.
- MSLofarTable (const casa::Table& table);
+ MSLofarTable (const casacore::Table& table);
// Copy constructor (reference semnatics).
MSLofarTable (const MSLofarTable& that);
@@ -66,20 +66,20 @@ namespace LOFAR {
MSLofarTable& operator= (const MSLofarTable& that);
// Add a column to the table description.
- static void addColumn (casa::TableDesc& td,
- const casa::String& colName,
- casa::DataType dtype,
- const casa::String& comment,
- const casa::String& unit = casa::String(),
- const casa::String& measure = casa::String(),
+ static void addColumn (casacore::TableDesc& td,
+ const casacore::String& colName,
+ casacore::DataType dtype,
+ const casacore::String& comment,
+ const casacore::String& unit = casacore::String(),
+ const casacore::String& measure = casacore::String(),
int measRefType = 0,
int ndim = -1,
- const casa::IPosition& shape = casa::IPosition(),
+ const casacore::IPosition& shape = casacore::IPosition(),
int option = 0);
// Set the units of the column.
- static void setUnit (casa::TableDesc& td, const casa::String& colName,
- const casa::String& unit, int nunit);
+ static void setUnit (casacore::TableDesc& td, const casacore::String& colName,
+ const casacore::String& unit, int nunit);
};
} //# end namespace
diff --git a/LCS/MSLofar/include/MSLofar/MSStation.h b/LCS/MSLofar/include/MSLofar/MSStation.h
index dae92b47596c65dbd988eebcaeb32d63e910b418..69b5f1719a07bf48926c2dbc1d7926ba7a6011be 100644
--- a/LCS/MSLofar/include/MSLofar/MSStation.h
+++ b/LCS/MSLofar/include/MSLofar/MSStation.h
@@ -36,15 +36,15 @@ namespace LOFAR {
MSStation();
// Create from an existing table.
- MSStation (const casa::String& tableName,
- casa::Table::TableOption option);
+ MSStation (const casacore::String& tableName,
+ casacore::Table::TableOption option);
// Create a new table.
- MSStation (casa::SetupNewTable& newTab, casa::uInt nrrow,
- casa::Bool initialize);
+ MSStation (casacore::SetupNewTable& newTab, casacore::uInt nrrow,
+ casacore::Bool initialize);
// Create from an existing Table object.
- MSStation (const casa::Table& table);
+ MSStation (const casacore::Table& table);
// Copy constructor (reference semnatics).
MSStation (const MSStation& that);
@@ -56,7 +56,7 @@ namespace LOFAR {
MSStation& operator= (const MSStation& that);
// Create the table description containing the required columns.
- static casa::TableDesc requiredTableDesc();
+ static casacore::TableDesc requiredTableDesc();
};
} //# end namespace
diff --git a/LCS/MSLofar/include/MSLofar/MSStationColumns.h b/LCS/MSLofar/include/MSLofar/MSStationColumns.h
index 90908991615b600388f0fe8789cd16aa298f62f2..8ba75f040680fa81e1a3d37a8527b56491ec95d9 100644
--- a/LCS/MSLofar/include/MSLofar/MSStationColumns.h
+++ b/LCS/MSLofar/include/MSLofar/MSStationColumns.h
@@ -24,9 +24,9 @@
#ifndef MSLOFAR_MSSTATIONCOLUMNS_H
#define MSLOFAR_MSSTATIONCOLUMNS_H
-#include <casa/aips.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <casa/BasicSL/String.h>
+#include <casacore/casa/aips.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/casa/BasicSL/String.h>
namespace LOFAR {
@@ -52,17 +52,17 @@ namespace LOFAR {
// Access to columns.
// <group>
- casa::ROScalarColumn<casa::String>& name()
+ casacore::ROScalarColumn<casacore::String>& name()
{ return name_p; }
- casa::ROScalarColumn<casa::Int>& clockId()
+ casacore::ROScalarColumn<casacore::Int>& clockId()
{ return clockId_p; }
- casa::ROScalarColumn<casa::Bool>& flagRow()
+ casacore::ROScalarColumn<casacore::Bool>& flagRow()
{ return flagRow_p; }
// </group>
// Convenience function that returns the number of rows
// in any of the columns.
- casa::uInt nrow() const
+ casacore::uInt nrow() const
{ return name_p.nrow(); }
protected:
@@ -80,9 +80,9 @@ namespace LOFAR {
ROMSStationColumns& operator=(const ROMSStationColumns&);
//# required columns
- casa::ROScalarColumn<casa::String> name_p;
- casa::ROScalarColumn<casa::Int> clockId_p;
- casa::ROScalarColumn<casa::Bool> flagRow_p;
+ casacore::ROScalarColumn<casacore::String> name_p;
+ casacore::ROScalarColumn<casacore::Int> clockId_p;
+ casacore::ROScalarColumn<casacore::Bool> flagRow_p;
};
@@ -105,11 +105,11 @@ namespace LOFAR {
// Read-write access to required columns.
// <group>
- casa::ScalarColumn<casa::String>& name()
+ casacore::ScalarColumn<casacore::String>& name()
{ return name_p; }
- casa::ScalarColumn<casa::Int>& clockId()
+ casacore::ScalarColumn<casacore::Int>& clockId()
{ return clockId_p; }
- casa::ScalarColumn<casa::Bool>& flagRow()
+ casacore::ScalarColumn<casacore::Bool>& flagRow()
{ return flagRow_p; }
// </group>
@@ -128,9 +128,9 @@ namespace LOFAR {
MSStationColumns& operator=(const MSStationColumns&);
//# required columns
- casa::ScalarColumn<casa::String> name_p;
- casa::ScalarColumn<casa::Int> clockId_p;
- casa::ScalarColumn<casa::Bool> flagRow_p;
+ casacore::ScalarColumn<casacore::String> name_p;
+ casacore::ScalarColumn<casacore::Int> clockId_p;
+ casacore::ScalarColumn<casacore::Bool> flagRow_p;
};
diff --git a/LCS/MSLofar/src/BeamTables.cc b/LCS/MSLofar/src/BeamTables.cc
index db5f07145f299f2e7c4d616033b781f96278587b..728f24cf6978dce33d6c512c7b146562c052f59d 100644
--- a/LCS/MSLofar/src/BeamTables.cc
+++ b/LCS/MSLofar/src/BeamTables.cc
@@ -34,15 +34,15 @@
#include <ApplCommon/StationInfo.h>
#include <Common/StreamUtil.h>
-#include <tables/Tables/SetupNewTab.h>
-#include <tables/Tables/TableRecord.h>
-#include <tables/Tables/ScaColDesc.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/Arrays/Cube.h>
-#include <casa/Arrays/MatrixMath.h>
+#include <casacore/tables/Tables/SetupNewTab.h>
+#include <casacore/tables/Tables/TableRecord.h>
+#include <casacore/tables/Tables/ScaColDesc.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/Cube.h>
+#include <casacore/casa/Arrays/MatrixMath.h>
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
void BeamTables::create (Table& ms, bool overwrite)
{
diff --git a/LCS/MSLofar/src/FailedTileInfo.cc b/LCS/MSLofar/src/FailedTileInfo.cc
index 421c0349f16e8ee8dd42b9e55172e60be0c0b911..264f306e630053657f42a6d5d452f953615ce207 100644
--- a/LCS/MSLofar/src/FailedTileInfo.cc
+++ b/LCS/MSLofar/src/FailedTileInfo.cc
@@ -22,14 +22,14 @@
#include <lofar_config.h>
#include <MSLofar/FailedTileInfo.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/TableRecord.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <tables/Tables/ArrayColumn.h>
-#include <measures/TableMeasures/ScalarQuantColumn.h>
-#include <measures/TableMeasures/ArrayQuantColumn.h>
-#include <casa/Quanta/MVEpoch.h>
-#include <casa/Quanta/MVTime.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/TableRecord.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
+#include <casacore/measures/TableMeasures/ScalarQuantColumn.h>
+#include <casacore/measures/TableMeasures/ArrayQuantColumn.h>
+#include <casacore/casa/Quanta/MVEpoch.h>
+#include <casacore/casa/Quanta/MVTime.h>
#include <Common/StringUtil.h>
#include <Common/StreamUtil.h>
@@ -39,7 +39,7 @@
#include <Common/lofar_map.h>
#include <Common/lofar_iostream.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
diff --git a/LCS/MSLofar/src/MSAntennaField.cc b/LCS/MSLofar/src/MSAntennaField.cc
index 162f5971f5ad94070f622757e83eeab3e99eeca4..81061c66efb9ec2b05bad93b9f1b6cdfd38bee4f 100644
--- a/LCS/MSLofar/src/MSAntennaField.cc
+++ b/LCS/MSLofar/src/MSAntennaField.cc
@@ -24,10 +24,10 @@
#include <lofar_config.h>
#include <MSLofar/MSAntennaField.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MDirection.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
diff --git a/LCS/MSLofar/src/MSElementFailure.cc b/LCS/MSLofar/src/MSElementFailure.cc
index dc9e798c62173f2c8dc3cf6da587cd6a5a009476..f18ff9f65c41a9b10adc8af3de4c1244ee07b7b2 100644
--- a/LCS/MSLofar/src/MSElementFailure.cc
+++ b/LCS/MSLofar/src/MSElementFailure.cc
@@ -24,9 +24,9 @@
#include <lofar_config.h>
#include <MSLofar/MSElementFailure.h>
-#include <measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MEpoch.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
diff --git a/LCS/MSLofar/src/MSLofar.cc b/LCS/MSLofar/src/MSLofar.cc
index d761dfdddf76aeb4b416745247bdb87fca461bd2..2ddc912d0d1f883ee80ad5389d6896d0129e46ef 100644
--- a/LCS/MSLofar/src/MSLofar.cc
+++ b/LCS/MSLofar/src/MSLofar.cc
@@ -26,10 +26,10 @@
#include <MSLofar/MSLofarAntenna.h>
#include <MSLofar/MSLofarField.h>
#include <MSLofar/MSLofarObservation.h>
-#include <tables/Tables/SetupNewTab.h>
-#include <tables/Tables/TableRecord.h>
-#include <tables/Tables/TableColumn.h>
-using namespace casa;
+#include <casacore/tables/Tables/SetupNewTab.h>
+#include <casacore/tables/Tables/TableRecord.h>
+#include <casacore/tables/Tables/TableColumn.h>
+using namespace casacore;
namespace LOFAR {
diff --git a/LCS/MSLofar/src/MSLofarAntenna.cc b/LCS/MSLofar/src/MSLofarAntenna.cc
index 9ae225a767424230e1705e808fad94a02926d1cc..e370243e5c94a3d691fb9f1b43ae6c34d0e0b7ca 100644
--- a/LCS/MSLofar/src/MSLofarAntenna.cc
+++ b/LCS/MSLofar/src/MSLofarAntenna.cc
@@ -23,9 +23,9 @@
#include <lofar_config.h>
#include <MSLofar/MSLofarAntenna.h>
-#include <measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MPosition.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
diff --git a/LCS/MSLofar/src/MSLofarAntennaColumns.cc b/LCS/MSLofar/src/MSLofarAntennaColumns.cc
index 09d2e1edd190ea734e055e4f26f67e96404be610..d6a341341ffb3edeff4d8dce6e2e0f2f90bf42c6 100644
--- a/LCS/MSLofar/src/MSLofarAntennaColumns.cc
+++ b/LCS/MSLofar/src/MSLofarAntennaColumns.cc
@@ -25,7 +25,7 @@
#include <MSLofar/MSLofarAntennaColumns.h>
#include <MSLofar/MSLofarAntenna.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
diff --git a/LCS/MSLofar/src/MSLofarField.cc b/LCS/MSLofar/src/MSLofarField.cc
index fff67196a7119fe3c7009c9ecbaec3ac26ca7a26..f4287c0486b49b55891247b5b7e5e69a44e3f197 100644
--- a/LCS/MSLofar/src/MSLofarField.cc
+++ b/LCS/MSLofar/src/MSLofarField.cc
@@ -23,9 +23,9 @@
#include <lofar_config.h>
#include <MSLofar/MSLofarField.h>
-#include <measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MPosition.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
diff --git a/LCS/MSLofar/src/MSLofarFieldColumns.cc b/LCS/MSLofar/src/MSLofarFieldColumns.cc
index 50908882119c7ceb123dc15a8b123294474343a1..abc483fe3c5cf578e4967f1b51e26cf76ea69ccc 100644
--- a/LCS/MSLofar/src/MSLofarFieldColumns.cc
+++ b/LCS/MSLofar/src/MSLofarFieldColumns.cc
@@ -25,7 +25,7 @@
#include <MSLofar/MSLofarFieldColumns.h>
#include <MSLofar/MSLofarField.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
diff --git a/LCS/MSLofar/src/MSLofarObsColumns.cc b/LCS/MSLofar/src/MSLofarObsColumns.cc
index c859c54437eb527198ca6c04464ea6f71402e033..dbd49515743f012867933bce19493c929745981e 100644
--- a/LCS/MSLofar/src/MSLofarObsColumns.cc
+++ b/LCS/MSLofar/src/MSLofarObsColumns.cc
@@ -25,7 +25,7 @@
#include <MSLofar/MSLofarObsColumns.h>
#include <MSLofar/MSLofarObservation.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
diff --git a/LCS/MSLofar/src/MSLofarObservation.cc b/LCS/MSLofar/src/MSLofarObservation.cc
index 42fb1d2de419b52f65254400d38d976196b18704..24b6bd273576c74948e2b9675acbbacef999cb84 100644
--- a/LCS/MSLofar/src/MSLofarObservation.cc
+++ b/LCS/MSLofar/src/MSLofarObservation.cc
@@ -23,9 +23,9 @@
#include <lofar_config.h>
#include <MSLofar/MSLofarObservation.h>
-#include <measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MEpoch.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
diff --git a/LCS/MSLofar/src/MSLofarTable.cc b/LCS/MSLofar/src/MSLofarTable.cc
index cdf6b27cdfab01cb0a9850c1a590560c96e85e50..2fb82ceca234aff03f3dacba6e722f29ff842e50 100644
--- a/LCS/MSLofar/src/MSLofarTable.cc
+++ b/LCS/MSLofar/src/MSLofarTable.cc
@@ -26,20 +26,20 @@
#include <MSLofar/MSLofarTable.h>
#include <Common/LofarLogger.h>
-#include <tables/Tables/SetupNewTab.h>
-#include <tables/Tables/TableDesc.h>
-#include <tables/Tables/ColDescSet.h>
-#include <tables/Tables/ScaColDesc.h>
-#include <tables/Tables/ArrColDesc.h>
-#include <ms/MeasurementSets/MSTableImpl.h>
-#include <measures/TableMeasures/TableMeasRefDesc.h>
-#include <measures/TableMeasures/TableMeasDesc.h>
-#include <measures/TableMeasures/TableQuantumDesc.h>
-#include <measures/Measures/MEpoch.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MDirection.h>
+#include <casacore/tables/Tables/SetupNewTab.h>
+#include <casacore/tables/Tables/TableDesc.h>
+#include <casacore/tables/Tables/ColDescSet.h>
+#include <casacore/tables/Tables/ScaColDesc.h>
+#include <casacore/tables/Tables/ArrColDesc.h>
+#include <casacore/ms/MeasurementSets/MSTableImpl.h>
+#include <casacore/measures/TableMeasures/TableMeasRefDesc.h>
+#include <casacore/measures/TableMeasures/TableMeasDesc.h>
+#include <casacore/measures/TableMeasures/TableQuantumDesc.h>
+#include <casacore/measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MDirection.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
@@ -75,11 +75,11 @@ namespace LOFAR {
return *this;
}
- void MSLofarTable::addColumn (TableDesc& td, const casa::String& colName,
+ void MSLofarTable::addColumn (TableDesc& td, const casacore::String& colName,
DataType dtype,
- const casa::String& comment,
- const casa::String& unit,
- const casa::String& measure, int measRefType,
+ const casacore::String& comment,
+ const casacore::String& unit,
+ const casacore::String& measure, int measRefType,
int ndim, const IPosition& shape,
int option)
{
diff --git a/LCS/MSLofar/src/MSStation.cc b/LCS/MSLofar/src/MSStation.cc
index 6c25d965c5ccdf9e28dc963ee71958fec515bbd3..ebf78ac9f604b02c820e4d122e089c938f05480a 100644
--- a/LCS/MSLofar/src/MSStation.cc
+++ b/LCS/MSLofar/src/MSStation.cc
@@ -24,9 +24,9 @@
#include <lofar_config.h>
#include <MSLofar/MSStation.h>
-#include <measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MPosition.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR {
diff --git a/LCS/MSLofar/src/makebeamtables.cc b/LCS/MSLofar/src/makebeamtables.cc
index 2586f1613d2614e708dc5046b2dd2be12fe88ba0..f7ec4d49c5d283af7e878466406da647c79fa0af 100644
--- a/LCS/MSLofar/src/makebeamtables.cc
+++ b/LCS/MSLofar/src/makebeamtables.cc
@@ -27,11 +27,11 @@
#include <Common/InputParSet.h>
#include <Common/SystemUtil.h>
#include <Common/LofarLogger.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <ms/MeasurementSets/MeasurementSet.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/ms/MeasurementSets/MeasurementSet.h>
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
int main (int argc, char* argv[])
{
diff --git a/LCS/MSLofar/test/tBeamTables.cc b/LCS/MSLofar/test/tBeamTables.cc
index fae23ad5042ddd2bd7f3dcefefb6905046a1d034..04af8c6d8001b8c6239319f163f3824d4f94cd05 100644
--- a/LCS/MSLofar/test/tBeamTables.cc
+++ b/LCS/MSLofar/test/tBeamTables.cc
@@ -26,20 +26,20 @@
#include <MSLofar/BeamTables.h>
#include <MSLofar/FailedTileInfo.h>
-#include <tables/Tables/SetupNewTab.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/ScaColDesc.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <tables/Tables/TableRow.h>
-#include <tables/Tables/ArrayColumn.h>
-#include <tables/Tables/ArrColDesc.h>
-#include <measures/TableMeasures/TableQuantumDesc.h>
-#include <measures/TableMeasures/ArrayQuantColumn.h>
-#include <casa/Quanta/MVTime.h>
-#include <casa/OS/Path.h>
+#include <casacore/tables/Tables/SetupNewTab.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/ScaColDesc.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/tables/Tables/TableRow.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
+#include <casacore/tables/Tables/ArrColDesc.h>
+#include <casacore/measures/TableMeasures/TableQuantumDesc.h>
+#include <casacore/measures/TableMeasures/ArrayQuantColumn.h>
+#include <casacore/casa/Quanta/MVTime.h>
+#include <casacore/casa/OS/Path.h>
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
void showTab (const String& name)
{
diff --git a/LCS/MSLofar/test/tMSLofar.cc b/LCS/MSLofar/test/tMSLofar.cc
index 9960555eb56812489af9fd06b51c4c6ed2034b3b..c5c8b591e88d766692afb13dd37e82c53c55a205 100644
--- a/LCS/MSLofar/test/tMSLofar.cc
+++ b/LCS/MSLofar/test/tMSLofar.cc
@@ -32,14 +32,14 @@
#include <MSLofar/MSElementFailureColumns.h>
#include <Common/LofarLogger.h>
-#include <ms/MeasurementSets/MSSpectralWindow.h>
-#include <ms/MeasurementSets/MSSpWindowColumns.h>
-#include <tables/Tables/SetupNewTab.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/OS/Timer.h>
+#include <casacore/ms/MeasurementSets/MSSpectralWindow.h>
+#include <casacore/ms/MeasurementSets/MSSpWindowColumns.h>
+#include <casacore/tables/Tables/SetupNewTab.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/OS/Timer.h>
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
using namespace std;
void createMS (MDirection::Types dirRef)
diff --git a/LCS/MSLofar/test/tMSLofar2.cc b/LCS/MSLofar/test/tMSLofar2.cc
index d1a2d9521843f0a2099d72b6608d350a4328bdc6..7119054d46dc7cad81117d58259b06e69e87c147 100644
--- a/LCS/MSLofar/test/tMSLofar2.cc
+++ b/LCS/MSLofar/test/tMSLofar2.cc
@@ -29,23 +29,23 @@
#include <MSLofar/MSLofar.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/ArrayUtil.h>
-#include <casa/Exceptions/Error.h>
-#include <tables/Tables.h>
-#include <tables/Tables/RowCopier.h>
-#include <casa/BasicSL/String.h>
-#include <casa/Utilities/Fallible.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MEpoch.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MFrequency.h>
-#include <casa/Utilities/Assert.h>
-#include <casa/iostream.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/ArrayUtil.h>
+#include <casacore/casa/Exceptions/Error.h>
+#include <casacore/tables/Tables.h>
+#include <casacore/tables/Tables/RowCopier.h>
+#include <casacore/casa/BasicSL/String.h>
+#include <casacore/casa/Utilities/Fallible.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MFrequency.h>
+#include <casacore/casa/Utilities/Assert.h>
+#include <casacore/casa/iostream.h>
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
// test addColumnToDesc static for all possible columns
diff --git a/LCS/MSLofar/test/tMSLofarTable.cc b/LCS/MSLofar/test/tMSLofarTable.cc
index 1b867dc833313177830fea48d2370bfb348d044a..baea2550a1b37888bbf60e39db0b33376a36bf39 100644
--- a/LCS/MSLofar/test/tMSLofarTable.cc
+++ b/LCS/MSLofar/test/tMSLofarTable.cc
@@ -31,13 +31,13 @@
#include <MSLofar/MSElementFailureColumns.h>
#include <Common/LofarLogger.h>
-#include <tables/Tables/SetupNewTab.h>
-#include <casa/Arrays/Vector.h>
-#include <casa/Arrays/Matrix.h>
-#include <casa/Arrays/ArrayLogical.h>
+#include <casacore/tables/Tables/SetupNewTab.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/casa/Arrays/Matrix.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
using namespace LOFAR;
-using namespace casa;
+using namespace casacore;
using namespace std;
void checkAntennaField()
diff --git a/MAC/APL/CASATools/include/CASATools/CasaConverter.h b/MAC/APL/CASATools/include/CASATools/CasaConverter.h
index 1e53f575cb1a7a939d5856b4c66474945b6f8710..533840c47e1284dd76b2c57a32f4e0dd57b3f191 100644
--- a/MAC/APL/CASATools/include/CASATools/CasaConverter.h
+++ b/MAC/APL/CASATools/include/CASATools/CasaConverter.h
@@ -29,12 +29,12 @@
//# Never #include <config.h> or #include <lofar_config.h> in a header file!
//# Includes
#include <blitz/array.h>
-#include <measures/Measures.h>
-#include <measures/Measures/MEpoch.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures.h>
+#include <casacore/measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MCDirection.h>
#include <APL/RTCCommon/Timestamp.h>
// Avoid 'using namespace' in headerfiles
@@ -72,12 +72,12 @@ public:
private:
// internal admin structures
typedef struct converter {
- casa::MDirection::Convert conv;
- casa::MeasFrame frame;
+ casacore::MDirection::Convert conv;
+ casacore::MeasFrame frame;
} converter_t;
// private helper routines
- converter_t* _getConverter(casa::MDirection::Types);
+ converter_t* _getConverter(casacore::MDirection::Types);
blitz::Array<double,1> _cartesian(double angle2Pi, double angle1Pi);
// Copying is not allowed
@@ -88,10 +88,10 @@ private:
string itsTargetName;
// name, type map
- map<string, casa::MDirection::Types> itsDirectionTypes;
+ map<string, casacore::MDirection::Types> itsDirectionTypes;
// type, converter_t map
- map<casa::MDirection::Types, converter_t> itsConverters;
+ map<casacore::MDirection::Types, converter_t> itsConverters;
};
// @}
diff --git a/MAC/APL/CASATools/src/CasaConverter.cc b/MAC/APL/CASATools/src/CasaConverter.cc
index bd9311d24d368eaf8963f9af2befe7275f1b0ba2..eeb2a6f966815c0559596f38a09f9336ff8b1797 100644
--- a/MAC/APL/CASATools/src/CasaConverter.cc
+++ b/MAC/APL/CASATools/src/CasaConverter.cc
@@ -26,19 +26,19 @@
//# Includes
#include <Common/LofarLogger.h>
-#include <measures/Measures.h>
-#include <measures/Measures/MEpoch.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MCDirection.h>
+#include <casacore/measures/Measures.h>
+#include <casacore/measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MCDirection.h>
#include <CASATools/CasaConverter.h>
namespace LOFAR {
namespace CASATools {
-using namespace casa;
+using namespace casacore;
using namespace blitz;
using namespace RTC;
@@ -205,7 +205,7 @@ bool CasaConverter::doConversion(const string& sourceType,
targetDir = theConv->conv(MVDirection(antPos(d,0), antPos(d,1), antPos(d,2)));
LOG_TRACE_FLOW_STR("casaconv:antPos(" << antPos(d,0) << "," << antPos(d,1) << "," << antPos(d,2) << ")==>" << targetDir);
}
- casa::Vector<Double> angles = targetDir.getValue().get();
+ casacore::Vector<Double> angles = targetDir.getValue().get();
result(d, Range::all()) = _cartesian(angles(0), angles(1));
}
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tConverter.cc b/MAC/APL/PAC/ITRFBeamServer/test/tConverter.cc
index 7cdbb48f5044ddeabeeeb08e396638ee2b6ba54f..85bda9eb54dab7fe5c450c53b7cbbd7c9a860d33 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tConverter.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tConverter.cc
@@ -28,15 +28,15 @@
#include <Common/LofarLogger.h>
#include <APL/RTCCommon/Timestamp.h>
-#include <casa/Exceptions/Error.h>
-#include <casa/Quanta/MVTime.h>
-#include <casa/Arrays/Vector.h>
-#include <measures/Measures.h>
-#include <measures/Measures/MEpoch.h>
-#include <measures/Measures/MPosition.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MCDirection.h>
+#include <casacore/casa/Exceptions/Error.h>
+#include <casacore/casa/Quanta/MVTime.h>
+#include <casacore/casa/Arrays/Vector.h>
+#include <casacore/measures/Measures.h>
+#include <casacore/measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MCDirection.h>
#include <AMCBase/Converter.h>
#include <AMCBase/ConverterClient.h>
@@ -48,7 +48,7 @@
#include <blitz/array.h>
-using namespace casa;
+using namespace casacore;
using namespace blitz;
using namespace LOFAR;
using namespace AMC;
@@ -85,13 +85,13 @@ int main(int argc, char* argv[])
cout << i << ": Epoch : " << MVTime(2010,2,2,0.25) << endl;
MDirection J2000Dir = I2Jconverter(ITRFPos);
cout << i << ": Result : " << J2000Dir << endl;
- casa::Vector<Double> angles = J2000Dir.getValue().get();
+ casacore::Vector<Double> angles = J2000Dir.getValue().get();
cout << i << " converted : " << Direction(angles(0), angles(1), Direction::ITRF) << endl;
}
Int nAll, nExtra;
const uInt* typ;
- const casa::String* theTypes = MDirection::allMyTypes(nAll, nExtra, typ);
+ const casacore::String* theTypes = MDirection::allMyTypes(nAll, nExtra, typ);
cout << "nAll=" << nAll << ", nExtra=" << nExtra << ", typ=" << typ << endl;
for (int i=0; i < nAll; i++) {
cout << theTypes[i] << "=" << typ[i] << endl;
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc b/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc
index d6789cb3e93ef59a1cae472f17840cec9d5d3537..1b27e8bd8ea30d1ee59c067c8cf7588209b24a8f 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc
@@ -33,7 +33,7 @@
#include <blitz/array.h>
#include <CASATools/CasaConverter.h>
-using namespace casa;
+using namespace casacore;
using namespace blitz;
using namespace LOFAR;
using namespace RTC;
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tJ2000Converter.cc b/MAC/APL/PAC/ITRFBeamServer/test/tJ2000Converter.cc
index 0691a6327c2f6dff74125bbd64d09457321b1144..e2fd44f6e3a7871c69ed19de8fa0d95de7ad49f5 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tJ2000Converter.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tJ2000Converter.cc
@@ -30,7 +30,7 @@
#include <blitz/array.h>
#include <ITRFBeamServer/J2000Converter.h>
-using namespace casa;
+using namespace casacore;
using namespace blitz;
using namespace LOFAR;
using namespace RTC;
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc b/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc
index dcc914fd3b2aeddae8a6b700157857c818fd1cbd..ca4d7d15108ca184d7cbb06a7d270b66d243fe82 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc
@@ -33,7 +33,7 @@
#include <blitz/array.h>
#include <CASATools/CasaConverter.h>
-using namespace casa;
+using namespace casacore;
using namespace blitz;
using namespace LOFAR;
using namespace RTC;
diff --git a/RTCP/Cobalt/BrokenAntennaInfo/src/FinalMetaDataGatherer.cc b/RTCP/Cobalt/BrokenAntennaInfo/src/FinalMetaDataGatherer.cc
index 29a03e36e980dda6fbd26ca0f938df3fe8bb4d9f..6cc778a21bc06cecc1aefbde84f0da1b1561514d 100644
--- a/RTCP/Cobalt/BrokenAntennaInfo/src/FinalMetaDataGatherer.cc
+++ b/RTCP/Cobalt/BrokenAntennaInfo/src/FinalMetaDataGatherer.cc
@@ -58,14 +58,14 @@
#include <boost/date_time/posix_time/posix_time.hpp>
// Casacore
-#include <measures/Measures/MEpoch.h>
-#include <casa/Quanta/MVTime.h>
+#include <casacore/measures/Measures/MEpoch.h>
+#include <casacore/casa/Quanta/MVTime.h>
using namespace LOFAR;
using namespace LOFAR::Cobalt;
using namespace LOFAR::OTDB;
using namespace std;
-using namespace casa;
+using namespace casacore;
using namespace boost::posix_time;
namespace LOFAR {
diff --git a/RTCP/Cobalt/InputProc/src/Delays/Delays.cc b/RTCP/Cobalt/InputProc/src/Delays/Delays.cc
index 448c50617f64af51b5dbf9e368194095eab90ffa..e2b600d35ab32f51ce623241f43b96dcfcad44db 100644
--- a/RTCP/Cobalt/InputProc/src/Delays/Delays.cc
+++ b/RTCP/Cobalt/InputProc/src/Delays/Delays.cc
@@ -29,9 +29,9 @@
#include <CoInterface/Exceptions.h>
#ifdef HAVE_CASACORE
-#include <measures/Measures/MEpoch.h>
-#include <measures/Measures/MCDirection.h>
-#include <casa/Exceptions/Error.h>
+#include <casacore/measures/Measures/MEpoch.h>
+#include <casacore/measures/Measures/MCDirection.h>
+#include <casacore/casa/Exceptions/Error.h>
#endif
@@ -76,7 +76,7 @@ namespace LOFAR
#ifdef HAVE_CASACORE
- using namespace casa;
+ using namespace casacore;
static LOFAR::Mutex casacoreMutex; // casacore is not thread safe
@@ -135,11 +135,11 @@ namespace LOFAR
frame.set(MEpoch(toUTC(from), MEpoch::UTC));
// Set the position for the frame.
- const MVPosition phaseCenter(casa::Vector<Double>(parset.settings.antennaFields[stationIdx].phaseCenter));
+ const MVPosition phaseCenter(casacore::Vector<Double>(parset.settings.antennaFields[stationIdx].phaseCenter));
frame.set(MPosition(phaseCenter, MPosition::ITRF));
// Cache the difference with CS002LBA
- const MVPosition pRef(casa::Vector<Double>(parset.settings.delayCompensation.referencePhaseCenter));
+ const MVPosition pRef(casacore::Vector<Double>(parset.settings.delayCompensation.referencePhaseCenter));
phasePositionDiff = phaseCenter - pRef;
// Set-up the direction cache and conversion engines, using reference direction ITRF.
@@ -158,14 +158,14 @@ namespace LOFAR
}
- struct Delays::Delay Delays::convert( casa::MDirection::Convert &converter, const casa::MVDirection &direction ) const {
+ struct Delays::Delay Delays::convert( casacore::MDirection::Convert &converter, const casacore::MVDirection &direction ) const {
struct Delay d;
if (parset.settings.delayCompensation.enabled) {
MVDirection casaDir = converter(direction).getValue();
// Compute direction and convert it
- casa::Vector<double> dir = casaDir.getValue();
+ casacore::Vector<double> dir = casaDir.getValue();
std::copy(dir.begin(), dir.end(), d.direction);
// Compute delay
diff --git a/RTCP/Cobalt/InputProc/src/Delays/Delays.h b/RTCP/Cobalt/InputProc/src/Delays/Delays.h
index 436ef5a07cb8adb3855f46ae7cc91742356f2e08..f81abb6241f45a6ee2428a755606b38ba3395b0b 100644
--- a/RTCP/Cobalt/InputProc/src/Delays/Delays.h
+++ b/RTCP/Cobalt/InputProc/src/Delays/Delays.h
@@ -39,12 +39,12 @@
#include <CoInterface/RSPTimeStamp.h>
#ifdef HAVE_CASACORE
-#include <measures/Measures/MeasConvert.h>
-#include <measures/Measures/MDirection.h>
-#include <measures/Measures/MPosition.h>
-#include <casa/Quanta/MVDirection.h>
-#include <casa/Quanta/MVPosition.h>
-#include <casa/Quanta/MVEpoch.h>
+#include <casacore/measures/Measures/MeasConvert.h>
+#include <casacore/measures/Measures/MDirection.h>
+#include <casacore/measures/Measures/MPosition.h>
+#include <casacore/casa/Quanta/MVDirection.h>
+#include <casacore/casa/Quanta/MVPosition.h>
+#include <casacore/casa/Quanta/MVEpoch.h>
#endif
namespace LOFAR
@@ -170,18 +170,18 @@ namespace LOFAR
double clockCorrection() const;
#ifdef HAVE_CASACORE
- casa::MVEpoch toUTC( const TimeStamp ×tamp ) const;
+ casacore::MVEpoch toUTC( const TimeStamp ×tamp ) const;
// Converts a sky direction to a direction and delay
- struct Delay convert( casa::MDirection::Convert &converter, const casa::MVDirection &direction ) const;
+ struct Delay convert( casacore::MDirection::Convert &converter, const casacore::MVDirection &direction ) const;
- casa::MeasFrame frame;
+ casacore::MeasFrame frame;
- std::vector<casa::MDirection::Types> directionTypes; // [sap]
- std::map<casa::MDirection::Types, casa::MDirection::Convert> converters; // [type]
+ std::vector<casacore::MDirection::Types> directionTypes; // [sap]
+ std::map<casacore::MDirection::Types, casacore::MDirection::Convert> converters; // [type]
// Station to reference station position difference vector.
- casa::MVPosition phasePositionDiff;
+ casacore::MVPosition phasePositionDiff;
#endif
};
diff --git a/RTCP/Cobalt/OutputProc/src/MSWriterCorrelated.cc b/RTCP/Cobalt/OutputProc/src/MSWriterCorrelated.cc
index a1607d760d9455cc1ab1c6bd235d1297e6fcdfee..c919506d7741aa8cce9f437a376e3eda296cef25 100644
--- a/RTCP/Cobalt/OutputProc/src/MSWriterCorrelated.cc
+++ b/RTCP/Cobalt/OutputProc/src/MSWriterCorrelated.cc
@@ -36,13 +36,13 @@
#include <CoInterface/CorrelatedData.h>
#include <CoInterface/LTAFeedback.h>
-#include <tables/Tables/Table.h>
-#include <casa/Quanta/MVTime.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/casa/Quanta/MVTime.h>
#include "MeasurementSetFormat.h"
using boost::format;
-using namespace casa;
+using namespace casacore;
namespace LOFAR
diff --git a/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.cc b/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.cc
index 0cf00e3b361a712eb92c86e28f56e7b5887afeca..3bdf9534242767d126ffdd1c6eb008ab8c85359d 100644
--- a/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.cc
+++ b/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.cc
@@ -32,33 +32,33 @@
#include <linux/limits.h>
#endif
-#include <tables/Tables/TableDesc.h>
-#include <tables/Tables/SetupNewTab.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/TableLock.h>
-#include <tables/Tables/TableRecord.h>
-#include <tables/Tables/ScaColDesc.h>
-#include <tables/Tables/ArrColDesc.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <tables/Tables/ArrayColumn.h>
-//#include <tables/Tables/StandardStMan.h>
-#include <casa/Arrays/Array.h>
-#include <casa/Arrays/ArrayMath.h>
-#include <casa/Arrays/ArrayIO.h>
-#include <casa/Arrays/ArrayLogical.h>
-#include <casa/Containers/BlockIO.h>
-#include <casa/OS/RegularFile.h>
-#include <casa/Utilities/Assert.h>
-#include <casa/IO/RegularFileIO.h>
-#include <casa/IO/RawIO.h>
-#include <casa/IO/CanonicalIO.h>
-#include <casa/OS/HostInfo.h>
-#include <casa/Exceptions/Error.h>
-#include <casa/iostream.h>
-#include <casa/sstream.h>
-#include <casa/BasicSL/Constants.h>
-
-#include <ms/MeasurementSets.h>
+#include <casacore/tables/Tables/TableDesc.h>
+#include <casacore/tables/Tables/SetupNewTab.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/TableLock.h>
+#include <casacore/tables/Tables/TableRecord.h>
+#include <casacore/tables/Tables/ScaColDesc.h>
+#include <casacore/tables/Tables/ArrColDesc.h>
+#include <casacore/tables/Tables/ScalarColumn.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
+//#include <casacore/tables/DataMan/StandardStMan.h>
+#include <casacore/casa/Arrays/Array.h>
+#include <casacore/casa/Arrays/ArrayMath.h>
+#include <casacore/casa/Arrays/ArrayIO.h>
+#include <casacore/casa/Arrays/ArrayLogical.h>
+#include <casacore/casa/Containers/BlockIO.h>
+#include <casacore/casa/OS/RegularFile.h>
+#include <casacore/casa/Utilities/Assert.h>
+#include <casacore/casa/IO/RegularFileIO.h>
+#include <casacore/casa/IO/RawIO.h>
+#include <casacore/casa/IO/CanonicalIO.h>
+#include <casacore/casa/OS/HostInfo.h>
+#include <casacore/casa/Exceptions/Error.h>
+#include <casacore/casa/iostream.h>
+#include <casacore/casa/sstream.h>
+#include <casacore/casa/BasicSL/Constants.h>
+
+#include <casacore/ms/MeasurementSets.h>
#include <MSLofar/MSLofar.h>
#include <MSLofar/MSLofarField.h>
@@ -75,7 +75,7 @@
#include <OutputProc/Package__Version.h>
-using namespace casa;
+using namespace casacore;
namespace LOFAR
{
@@ -233,9 +233,9 @@ namespace LOFAR
void MeasurementSetFormat::fillAntenna(const Block<MPosition>& antMPos)
{
// Determine constants for the ANTENNA subtable.
- casa::Vector<Double> antOffset(3);
+ casacore::Vector<Double> antOffset(3);
antOffset = 0;
- casa::Vector<Double> phaseRef(3);
+ casacore::Vector<Double> phaseRef(3);
// Fill the ANTENNA subtable.
MSLofarAntenna msant = itsMS->antenna();
@@ -268,20 +268,20 @@ namespace LOFAR
{
// Determine constants for the FEED subtable.
unsigned nRec = 2;
- casa::Matrix<Double> feedOffset(2,nRec);
+ casacore::Matrix<Double> feedOffset(2,nRec);
feedOffset = 0;
- casa::Matrix<Complex> feedResponse(nRec,nRec);
+ casacore::Matrix<Complex> feedResponse(nRec,nRec);
feedResponse = Complex(0.0,0.0);
for (unsigned rec = 0; rec < nRec; rec++)
feedResponse(rec,rec) = Complex(1.0, 0.0);
- casa::Vector<String> feedType(nRec);
+ casacore::Vector<String> feedType(nRec);
feedType(0) = "X";
feedType(1) = "Y";
- casa::Vector<Double> feedPos(3);
+ casacore::Vector<Double> feedPos(3);
feedPos = 0.0;
- casa::Vector<Double> feedAngle(nRec);
+ casacore::Vector<Double> feedAngle(nRec);
feedAngle = -C::pi_4; // 0 for parallel dipoles
// Fill the FEED subtable.
@@ -317,7 +317,7 @@ namespace LOFAR
if (!MDirection::getType(beamDirectionType, itsPS.settings.SAPs[subarray].direction.type))
THROW(StorageException, "Beam direction type unknown: " << itsPS.settings.SAPs[subarray].direction.type);
MDirection indir(radec, beamDirectionType);
- casa::Vector<MDirection> outdir(1);
+ casacore::Vector<MDirection> outdir(1);
outdir(0) = indir;
// AnaBeam direction type
@@ -329,7 +329,7 @@ namespace LOFAR
// ScSupp fills Observation.Beam[x].target, sometimes with field codes, sometimes with pointing names.
// Use it here to write FIELD CODE.
- casa::String ctarget(itsPS.settings.SAPs[subarray].target);
+ casacore::String ctarget(itsPS.settings.SAPs[subarray].target);
// Put the direction into the FIELD subtable.
MSLofarField msfield = itsMS->field();
@@ -376,7 +376,7 @@ namespace LOFAR
MSPolarization mspol = itsMS->polarization();
MSPolarizationColumns mspolCol(mspol);
uInt rownr = mspol.nrow();
- casa::Vector<Int> corrType(npolarizations);
+ casacore::Vector<Int> corrType(npolarizations);
corrType(0) = Stokes::XX;
if (npolarizations == 2) {
@@ -387,7 +387,7 @@ namespace LOFAR
corrType(3) = Stokes::YY;
}
- casa::Matrix<Int> corrProduct(2, npolarizations);
+ casacore::Matrix<Int> corrProduct(2, npolarizations);
for (unsigned i = 0; i < npolarizations; i++) {
corrProduct(0,i) = Stokes::receptor1(Stokes::type(corrType(i)));
@@ -422,7 +422,7 @@ namespace LOFAR
void MeasurementSetFormat::fillObs(unsigned subarray)
{
// Get start and end time.
- casa::Vector<Double> timeRange(2);
+ casacore::Vector<Double> timeRange(2);
timeRange[0] = itsStartTime;
timeRange[1] = itsStartTime + itsNrTimes * itsTimeStep;
@@ -446,18 +446,18 @@ namespace LOFAR
maxFreq -= 0.5 * nchan * width;
}
- casa::Vector<String> corrSchedule(1);
+ casacore::Vector<String> corrSchedule(1);
corrSchedule = "corrSchedule";
vector<string> targets(itsPS.getStringVector
("Observation.Beam[" + String::toString(subarray) + "].target", vector<string>(), true));
- casa::Vector<String> ctargets(targets.size());
+ casacore::Vector<String> ctargets(targets.size());
for (uint i = 0; i < targets.size(); ++i)
ctargets[i] = targets[i];
vector<string> cois(itsPS.getStringVector("Observation.Campaign.CO_I", vector<string>(), true));
- casa::Vector<String> ccois(cois.size());
+ casacore::Vector<String> ccois(cois.size());
for (uint i = 0; i < cois.size(); ++i)
ccois[i] = cois[i];
@@ -512,8 +512,8 @@ namespace LOFAR
const double totalBW = nchan * chanWidth;
const double channel0freq = itsPS.channel0Frequency(subband, nchan);
- casa::Vector<double> chanWidths(nchan, chanWidth);
- casa::Vector<double> chanFreqs(nchan);
+ casacore::Vector<double> chanWidths(nchan, chanWidth);
+ casacore::Vector<double> chanFreqs(nchan);
indgen (chanFreqs, channel0freq, chanWidth);
MSSpectralWindow msspw = itsMS->spectralWindow();
@@ -560,10 +560,10 @@ namespace LOFAR
ArrayColumn<String> cli (histtab, "CLI_COMMAND");
// Put all parset entries in a Vector<String>.
- casa::Vector<String> appvec;
- casa::Vector<String> clivec;
+ casacore::Vector<String> appvec;
+ casacore::Vector<String> clivec;
appvec.resize (itsPS.size());
- casa::Array<String>::contiter viter = appvec.cbegin();
+ casacore::Array<String>::contiter viter = appvec.cbegin();
for (ParameterSet::const_iterator iter = itsPS.begin(); iter != itsPS.end(); ++iter, ++viter) {
*viter = iter->first + '=' + iter->second.get();
}
@@ -619,12 +619,12 @@ namespace LOFAR
THROW(StorageException, "Beam direction type unknown: " << itsPS.settings.SAPs[subarray].direction.type);
MDirection indir(radec, beamDirectionType);
- casa::Vector<MDirection> outdir(1);
+ casacore::Vector<MDirection> outdir(1);
outdir(0) = indir;
// ScSupp fills Observation.Beam[x].target, sometimes with field codes, sometimes with pointing names.
// Use it here to write POINTING NAME.
- casa::String ctarget(itsPS.settings.SAPs[subarray].target);
+ casacore::String ctarget(itsPS.settings.SAPs[subarray].target);
// Fill the POINTING subtable.
MSPointing mspointing = itsMS->pointing();
diff --git a/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.h b/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.h
index 75cf01eece3feb638a4b6317d234a2952271b420..23d3ba385b5e3940ee137648ae6a2394b669771b 100644
--- a/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.h
+++ b/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.h
@@ -31,9 +31,9 @@
#include <CoInterface/SmartPtr.h>
#include <CoInterface/OutputTypes.h> //for LofarStManVersion
-#include <casa/aips.h>
-#include <casa/Utilities/DataType.h>
-#include <casa/Arrays/IPosition.h>
+#include <casacore/casa/aips.h>
+#include <casacore/casa/Utilities/DataType.h>
+#include <casacore/casa/Arrays/IPosition.h>
/*
* LofarStMan supports multiple versions of the MS, with the following
@@ -97,7 +97,7 @@ namespace LOFAR
void createMSMetaFile(const std::string &MSname, unsigned subband);
void fillFeed();
- void fillAntenna(const casa::Block<casa::MPosition>& antMPos);
+ void fillAntenna(const casacore::Block<casacore::MPosition>& antMPos);
void fillField(unsigned subarray);
void fillPola();
void fillDataDesc();
diff --git a/RTCP/Cobalt/OutputProc/src/OutputThread.cc b/RTCP/Cobalt/OutputProc/src/OutputThread.cc
index a1dce26c390251149258d8dc94afaa1d77eeaf78..72e6d5edbc34e44c7d5b095e7b09adb51c85b6bc 100644
--- a/RTCP/Cobalt/OutputProc/src/OutputThread.cc
+++ b/RTCP/Cobalt/OutputProc/src/OutputThread.cc
@@ -43,7 +43,7 @@
#include <CoInterface/BudgetTimer.h>
#if defined HAVE_AIPSPP
-#include <casa/Exceptions/Error.h>
+#include <casacore/casa/Exceptions/Error.h>
#endif
#include "MSWriterFile.h"
@@ -208,7 +208,7 @@ namespace LOFAR
THROW(StorageException, ex);
#if defined HAVE_AIPSPP
}
- catch (casa::AipsError &ex)
+ catch (casacore::AipsError &ex)
{
LOG_ERROR_STR(itsLogPrefix << "Could not create meta data (AipsError): " << ex.what());
@@ -233,7 +233,7 @@ namespace LOFAR
THROW(StorageException, ex);
#if defined HAVE_AIPSPP
}
- catch (casa::AipsError &ex)
+ catch (casacore::AipsError &ex)
{
LOG_ERROR_STR(itsLogPrefix << "Could not add final meta data (AipsError): " << ex.what());
@@ -328,7 +328,7 @@ namespace LOFAR
itsWriter = new MSWriterNull(itsParset);
#if defined HAVE_AIPSPP
- } catch (casa::AipsError &ex) {
+ } catch (casacore::AipsError &ex) {
LOG_ERROR_STR(itsLogPrefix << "Caught AipsError: " << ex.what());
itsWriter = new MSWriterNull(itsParset);
#endif
@@ -390,7 +390,7 @@ namespace LOFAR
itsWriter = new MSWriterNull(itsParset);
#if defined HAVE_AIPSPP
- } catch (casa::AipsError &ex) {
+ } catch (casacore::AipsError &ex) {
LOG_ERROR_STR(itsLogPrefix << "Caught AipsError: " << ex.what());
itsWriter = new MSWriterNull(itsParset);
#endif
diff --git a/RTCP/Cobalt/OutputProc/src/plotMS.cc b/RTCP/Cobalt/OutputProc/src/plotMS.cc
index ca1e47ceebd722688b400410cb72dc29c6c656ee..60eb6808cedcd0d82a4ec6a1d52deddaec7f5fc0 100644
--- a/RTCP/Cobalt/OutputProc/src/plotMS.cc
+++ b/RTCP/Cobalt/OutputProc/src/plotMS.cc
@@ -37,9 +37,9 @@
#include <CoInterface/Parset.h>
#include <CoInterface/CorrelatedData.h>
-#include <casa/IO/AipsIO.h>
-#include <casa/Containers/Block.h>
-#include <casa/Containers/BlockIO.h>
+#include <casacore/casa/IO/AipsIO.h>
+#include <casacore/casa/Containers/Block.h>
+#include <casacore/casa/Containers/BlockIO.h>
using namespace LOFAR;
using namespace LOFAR::Cobalt;
@@ -135,10 +135,10 @@ int main(int argc, char *argv[])
ASSERT( channel >= 0 && (unsigned)channel < parset.settings.correlator.nrChannels );
// determine base line from string
- casa::Block<int32> itsAnt1;
- casa::Block<int32> itsAnt2;
+ casacore::Block<int32> itsAnt1;
+ casacore::Block<int32> itsAnt2;
- casa::AipsIO aio(meta_filename);
+ casacore::AipsIO aio(meta_filename);
uint32 itsVersion = aio.getstart("LofarStMan");
if (itsVersion == 2) {
aio >> itsAnt2 >> itsAnt1;
@@ -221,7 +221,7 @@ int main(int argc, char *argv[])
} catch (LOFAR::Exception &ex) {
LOG_FATAL_STR("[obs unknown] Caught LOFAR Exception: " << ex);
return 1;
- } catch (casa::AipsError& ex) {
+ } catch (casacore::AipsError& ex) {
LOG_FATAL_STR("[obs unknown] Caught Aips Error: " << ex.what());
return 1;
}
diff --git a/RTCP/Cobalt/OutputProc/test/tMeasurementSetFormat.cc b/RTCP/Cobalt/OutputProc/test/tMeasurementSetFormat.cc
index 4cbb59da60893bbfcc86c6bd6b3a4e981b75a209..55d34b24241668aec14319864bc836bdbf201819 100644
--- a/RTCP/Cobalt/OutputProc/test/tMeasurementSetFormat.cc
+++ b/RTCP/Cobalt/OutputProc/test/tMeasurementSetFormat.cc
@@ -27,14 +27,14 @@
#include <Common/Exception.h>
#include <OutputProc/MeasurementSetFormat.h>
-#include <casa/IO/RegularFileIO.h>
+#include <casacore/casa/IO/RegularFileIO.h>
#include <casacore/tables/Tables.h>
#include <UnitTest++.h>
#include <boost/format.hpp>
using namespace LOFAR;
using namespace LOFAR::Cobalt;
-using namespace casa;
+using namespace casacore;
using namespace std;
// Define handler that tries to print a backtrace.
diff --git a/RTCP/Cobalt/OutputProc/test/tSubbandWriter.cc b/RTCP/Cobalt/OutputProc/test/tSubbandWriter.cc
index 23afabfd4e97dc7fcdf12d97cf4d5d1ec975d631..6d1ee9c0fd60a154340b465974d58f0598b827ee 100644
--- a/RTCP/Cobalt/OutputProc/test/tSubbandWriter.cc
+++ b/RTCP/Cobalt/OutputProc/test/tSubbandWriter.cc
@@ -35,17 +35,17 @@
#include <OutputProc/SubbandWriter.h>
#include <MSLofar/FailedTileInfo.h>
-#include <tables/Tables/Table.h>
-#include <tables/Tables/TableRow.h>
-#include <tables/Tables/ArrayColumn.h>
-#include <casa/Quanta/MVTime.h>
+#include <casacore/tables/Tables/Table.h>
+#include <casacore/tables/Tables/TableRow.h>
+#include <casacore/tables/Tables/ArrayColumn.h>
+#include <casacore/casa/Quanta/MVTime.h>
#include <UnitTest++.h>
using namespace std;
using namespace LOFAR;
using namespace Cobalt;
-using namespace casa;
+using namespace casacore;
using boost::format;
unsigned obsId = 54321;
diff --git a/SubSystems/Dragnet/scripts/casacore-measures-tables/CheckIERS.cc b/SubSystems/Dragnet/scripts/casacore-measures-tables/CheckIERS.cc
index 6e5879794cc4cdf1c710b03b3cf7eaa891d0bdd7..d90cf18e130256de439054508c6608a202dac07a 100644
--- a/SubSystems/Dragnet/scripts/casacore-measures-tables/CheckIERS.cc
+++ b/SubSystems/Dragnet/scripts/casacore-measures-tables/CheckIERS.cc
@@ -30,7 +30,7 @@
#include <casacore/tables/Tables.h>
#include <casacore/casa/OS/Time.h>
-using namespace casa;
+using namespace casacore;
int main(int argc, char *argv[]) {
try
diff --git a/support/tools/Matlab/MSToMatlab/MSInfo.cpp b/support/tools/Matlab/MSToMatlab/MSInfo.cpp
index 496124b71c9a6413283b7166fc02de8ee9c4e72b..84caf8baaee5b833f57f3c26047600e260409e42 100644
--- a/support/tools/Matlab/MSToMatlab/MSInfo.cpp
+++ b/support/tools/Matlab/MSToMatlab/MSInfo.cpp
@@ -1,5 +1,5 @@
-#include <casa/Arrays.h>
-#include <casa/aipstype.h>
+#include <casacore/casa/Arrays.h>
+#include <casacore/casa/aipstype.h>
#include "MSInfo.h"
#include "Antenna.h"
diff --git a/support/tools/Matlab/MSToMatlab/MSInfo.h b/support/tools/Matlab/MSToMatlab/MSInfo.h
index 875fe3c0c56f17a7493bb26378623a56fc10fa97..16f5ad85e1c53fa18997fe20058c37edf11cf8d7 100644
--- a/support/tools/Matlab/MSToMatlab/MSInfo.h
+++ b/support/tools/Matlab/MSToMatlab/MSInfo.h
@@ -4,10 +4,10 @@
#include <string>
#include <vector>
-#include <casa/Arrays.h>
-#include <casa/aipstype.h>
-#include <casa/complex.h>
-#include <casa/BasicMath/Math.h>
+#include <casacore/casa/Arrays.h>
+#include <casacore/casa/aipstype.h>
+#include <casacore/casa/complex.h>
+#include <casacore/casa/BasicMath/Math.h>
#include "Antenna.h"
@@ -24,7 +24,7 @@ class MSInfo
std::string sourceMS;
int nChannels;
- casa::Vector<double> frequencies;
+ casacore::Vector<double> frequencies;
int nAntennae;
std::vector<Antenna> antennae;
diff --git a/support/tools/Matlab/MSToMatlab/MSReader.cpp b/support/tools/Matlab/MSToMatlab/MSReader.cpp
index 794e5cedd6894b9b9cbe4b37cac7fc789db5478a..070e67ec93c662de8857b1820299502c7c2e4ee3 100644
--- a/support/tools/Matlab/MSToMatlab/MSReader.cpp
+++ b/support/tools/Matlab/MSToMatlab/MSReader.cpp
@@ -2,18 +2,18 @@
#include "MSInfo.h"
-#include <tables/Tables.h>
-#include <tables/Tables/TableIter.h>
+#include <casacore/tables/Tables.h>
+#include <casacore/tables/Tables/TableIter.h>
-#include <casa/Arrays.h>
-#include <casa/aipstype.h>
-#include <casa/complex.h>
-#include <casa/BasicMath/Math.h>
+#include <casacore/casa/Arrays.h>
+#include <casacore/casa/aipstype.h>
+#include <casacore/casa/complex.h>
+#include <casacore/casa/BasicMath/Math.h>
#include <iomanip>
using namespace std;
-using namespace casa;
+using namespace casacore;
MSReader::MSReader(const string& msName):
msInfo()
diff --git a/support/tools/Matlab/MSToMatlab/MSReader.h b/support/tools/Matlab/MSToMatlab/MSReader.h
index 6f7e69456a3370a44f7d3f66e64a848308171608..d1bf15b88aacb8374e4e50b2fa242d884767a4ea 100644
--- a/support/tools/Matlab/MSToMatlab/MSReader.h
+++ b/support/tools/Matlab/MSToMatlab/MSReader.h
@@ -3,18 +3,18 @@
#include "MSInfo.h"
-#include <ms/MeasurementSets.h>
+#include <casacore/ms/MeasurementSets.h>
-#include <tables/Tables.h>
+#include <casacore/tables/Tables.h>
-#include <casa/Arrays.h>
-#include <casa/aipstype.h>
-#include <casa/complex.h>
+#include <casacore/casa/Arrays.h>
+#include <casacore/casa/aipstype.h>
+#include <casacore/casa/complex.h>
#include <string>
using namespace std;
-using namespace casa;
+using namespace casacore;
class MSReader
{
diff --git a/support/tools/Matlab/MSToMatlab/MatWriter.cpp b/support/tools/Matlab/MSToMatlab/MatWriter.cpp
index 75206142c66e21f344cd08aba24f1537dd3eb058..5ef3b35ab271c0baa2db5f524fb2074b9de3aaaa 100644
--- a/support/tools/Matlab/MSToMatlab/MatWriter.cpp
+++ b/support/tools/Matlab/MSToMatlab/MatWriter.cpp
@@ -10,7 +10,7 @@
#include <iomanip>
using namespace std;
-using namespace casa;
+using namespace casacore;
typedef float dataType;
diff --git a/support/tools/Matlab/MSToMatlab/MatWriter.h b/support/tools/Matlab/MSToMatlab/MatWriter.h
index d9637da7218c1745496af6fc40e41951eeb21b4c..8e52c7f3b53f6368aa7a85111a47903c6fae1987 100644
--- a/support/tools/Matlab/MSToMatlab/MatWriter.h
+++ b/support/tools/Matlab/MSToMatlab/MatWriter.h
@@ -4,13 +4,13 @@
#include "mat.h"
#include "MSInfo.h"
-#include <casa/Arrays.h>
-#include <casa/BasicMath/Math.h>
-#include <casa/aipstype.h>
-#include <casa/complex.h>
+#include <casacore/casa/Arrays.h>
+#include <casacore/casa/BasicMath/Math.h>
+#include <casacore/casa/aipstype.h>
+#include <casacore/casa/complex.h>
using namespace std;
-using namespace casa;
+using namespace casacore;
class MatWriter{
public:
diff --git a/support/tools/Matlab/MSToMatlab/main.cpp b/support/tools/Matlab/MSToMatlab/main.cpp
index 39731f89acfa9a17213282b31e7446bd963aabd6..e41b5c62f7aebf26121b40a3f335f5ed830860f5 100644
--- a/support/tools/Matlab/MSToMatlab/main.cpp
+++ b/support/tools/Matlab/MSToMatlab/main.cpp
@@ -9,9 +9,9 @@
#include <sys/stat.h>
#include <sys/types.h>
-#include <casa/Arrays.h>
-#include <casa/aipstype.h>
-#include <casa/complex.h>
+#include <casacore/casa/Arrays.h>
+#include <casacore/casa/aipstype.h>
+#include <casacore/casa/complex.h>
#include "SimpleOpt.h"
diff --git a/support/tools/Matlab/MSToMatlab/main.h b/support/tools/Matlab/MSToMatlab/main.h
index fbd40246e46c009f390304dc84a89bd7a68b6b3d..9b0a5bd06bf437b5bb6eff67c78599e3f8b18e69 100644
--- a/support/tools/Matlab/MSToMatlab/main.h
+++ b/support/tools/Matlab/MSToMatlab/main.h
@@ -1,7 +1,7 @@
-#include <casa/Arrays.h>
-#include <casa/aipstype.h>
-#include <casa/complex.h>
-#include <casa/BasicMath/Math.h>
+#include <casacore/casa/Arrays.h>
+#include <casacore/casa/aipstype.h>
+#include <casacore/casa/complex.h>
+#include <casacore/casa/BasicMath/Math.h>
using namespace std;
class test{
diff --git a/support/tools/Matlab/MSToMatlab/matlabTest.cpp b/support/tools/Matlab/MSToMatlab/matlabTest.cpp
index 17cd3bcf491d482399af0bb107a10d6ab140d73b..a4b0912a7079187a08952105dbfaaf236940aa2b 100755
--- a/support/tools/Matlab/MSToMatlab/matlabTest.cpp
+++ b/support/tools/Matlab/MSToMatlab/matlabTest.cpp
@@ -3,10 +3,10 @@
#include <string.h>
#include <stdlib.h>
#include <iostream>
-#include <casa/BasicMath/Math.h>
-#include <casa/aipstype.h>
-#include <casa/complex.h>
-#include <tables/Tables.h>
+#include <casacore/casa/BasicMath/Math.h>
+#include <casacore/casa/aipstype.h>
+#include <casacore/casa/complex.h>
+#include <casacore/tables/Tables.h>
#define BUFSIZE 256
diff --git a/support/tools/Matlab/MSToMatlab/test.cpp b/support/tools/Matlab/MSToMatlab/test.cpp
index 9870217ac520ceec49eecbfe9e188d39c1bf7ba1..5910ade732591e77ee4201079dee99318427e254 100644
--- a/support/tools/Matlab/MSToMatlab/test.cpp
+++ b/support/tools/Matlab/MSToMatlab/test.cpp
@@ -5,7 +5,7 @@
#include "MSReader.h"
#include "MatWriter.h"
-#include <casa/Arrays.h>
+#include <casacore/casa/Arrays.h>
using namespace std;