...
 
Commits (3)
......@@ -46,6 +46,7 @@
#include <casacore/casa/Arrays/ArrayLogical.h>
#include <casacore/casa/Containers/Record.h>
#include <casacore/casa/OS/Path.h>
#include <casacore/casa/version.h>
#include <iostream>
#include <limits>
......@@ -282,7 +283,12 @@ namespace LOFAR {
}
}
// Remove possible hypercolumn definitions.
// Test for casacore version 3.1.1 or smaller
#if CASACORE_MAJOR_VERSION<3 || (CASACORE_MAJOR_VERSION==3 && (CASACORE_MINOR_VERSION==0 || (CASACORE_MINOR_VERSION==1 && CASACORE_PATCH_VERSION < 2)))
newdesc.adjustHypercolumns (SimpleOrderedMap<String,String>(String()));
#else
newdesc.adjustHypercolumns (std::map<String,String>());
#endif
// Set data manager info.
Record dminfo = temptable.dataManagerInfo();
// Determine the DATA tile shape. Use all corrs and the given #channels.
......
......@@ -45,7 +45,7 @@
#include <casacore/measures/Measures/MPosition.h>
#include <casacore/casa/Arrays/Matrix.h>
#include <casacore/casa/Arrays/Vector.h>
#include <casacore/casa/version.h>
using namespace casacore;
......@@ -126,9 +126,17 @@ namespace LOFAR {
Vector<Int> selectedAnts1;
Vector<Int> selectedAnts2;
Matrix<Int> selectedBaselines;
MSSelectionErrorHandler* curHandler = MSAntennaParse::thisMSAErrorHandler;
auto curHandler = MSAntennaParse::thisMSAErrorHandler;
#if CASACORE_MAJOR_VERSION<3 || (CASACORE_MAJOR_VERSION==3 && (CASACORE_MINOR_VERSION==0 || (CASACORE_MINOR_VERSION==1 && CASACORE_PATCH_VERSION < 2)))
// In casacore < 3.1.2 thisMSAErrorHandler is a raw pointer,
// From casacore 3.1.2. it's a CountedPtr
BaselineSelectErrorHandler errorHandler (os);
MSAntennaParse::thisMSAErrorHandler = &errorHandler;
#else
CountedPtr<MSSelectionErrorHandler> errorHandler(
new BaselineSelectErrorHandler (os));
MSAntennaParse::thisMSAErrorHandler = errorHandler;
#endif
try {
// Create a table expression representing the selection.
TableExprNode node = msAntennaGramParseCommand
......