Skip to content

Make compatible with casacore 3.8.2 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aroffringa merged 4 commits into from
Oct 6, 2026
Merged

Make compatible with casacore 3.8.2 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98cd331
Make compatible with casacore 3.8.2
aroffringa Oct 6, 2026
81cbe8a
Enable std set of warnings
aroffringa Oct 6, 2026
159419c
Update minimum CMake version to 3.12
aroffringa Oct 6, 2026
db789f5
Avoid ambiguity with older casacore
aroffringa Oct 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# $Id: CMakeLists.txt 14280 2009-10-16 13:48:46Z loose $

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.12)

project(LofarStMan VERSION 1.0.2)

Expand All @@ -9,7 +9,18 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)

list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O3")
add_compile_options(
-O3

@gmloose gmloose Oct 6, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general, I think it's a bad idea to hard-code optimization levels in a CMakeLists.txt file, but since this is just reformatting ..., I'll ignore it.

@aroffringa aroffringa Oct 6, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think what we in general want is that the default is -O3, even when not explicitly specifying it is a release. If that can be done otherwise I'm fine with that, though the hardcoded -O3 is I think in almost all our software ;).

If you want we can discuss further, for now I'll merge as indeed the -O3 behaviour itself didn't change.

Thanks!

-Wall
-Wnon-virtual-dtor
-Wzero-as-null-pointer-constant
-Wduplicated-branches
-Wundef
-Wvla
-Wpointer-arith
-Wextra
-Wno-unused-parameter
-Wno-psabi)

if(PORTABLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
Expand Down
86 changes: 43 additions & 43 deletions include/LofarStMan/LofarColumn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ class LofarColumn : public casacore::StManColumn
: StManColumn (dtype),
itsParent (parent)
{}
virtual ~LofarColumn();
~LofarColumn() override;
// Most columns are not writable (only DATA is writable).
virtual casacore::Bool isWritable() const;
bool isWritable() const override;
// Set column shape of fixed shape columns; it does nothing.
virtual void setShapeColumn (const casacore::IPosition& shape);
void setShapeColumn (const casacore::IPosition& shape) final override;
// Prepare the column. By default it does nothing.
virtual void prepareCol();
protected:
Expand All @@ -77,50 +77,50 @@ class LofarColumn : public casacore::StManColumn

// <summary>ANTENNA1 column in the LOFAR Storage Manager.</summary>
// <use visibility=local>
class Ant1Column : public LofarColumn
class Ant1Column final : public LofarColumn
{
public:
explicit Ant1Column (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~Ant1Column();
virtual void getIntV (casacore::uInt rowNr, casacore::Int* dataPtr);
~Ant1Column() override;
void getIntV (unsigned int rowNr, int* dataPtr) override;
};

// <summary>ANTENNA2 column in the LOFAR Storage Manager.</summary>
// <use visibility=local>
class Ant2Column : public LofarColumn
class Ant2Column final : public LofarColumn
{
public:
explicit Ant2Column (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~Ant2Column();
virtual void getIntV (casacore::uInt rowNr, casacore::Int* dataPtr);
~Ant2Column() override;
void getIntV (unsigned int rowNr, int* dataPtr) override;
};

// <summary>TIME and TIME_CENTROID column in the LOFAR Storage Manager.</summary>
// <use visibility=local>
class TimeColumn : public LofarColumn
class TimeColumn final : public LofarColumn
{
public:
explicit TimeColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~TimeColumn();
virtual void getdoubleV (casacore::uInt rowNr, casacore::Double* dataPtr);
~TimeColumn() override;
void getdoubleV (unsigned int rowNr, double* dataPtr) override;
private:
casacore::Double itsValue;
double itsValue;
};

// <summary>INTERVAL and EXPOSURE column in the LOFAR Storage Manager.</summary>
// <use visibility=local>
class IntervalColumn : public LofarColumn
class IntervalColumn final : public LofarColumn
{
public:
explicit IntervalColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~IntervalColumn();
virtual void getdoubleV (casacore::uInt rowNr, casacore::Double* dataPtr);
~IntervalColumn() override;
void getdoubleV (unsigned int rowNr, double* dataPtr) override;
private:
casacore::Double itsValue;
double itsValue;
};

// <summary>All columns in the LOFAR Storage Manager with value 0.</summary>
Expand All @@ -131,22 +131,22 @@ class ZeroColumn : public LofarColumn
explicit ZeroColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~ZeroColumn();
virtual void getIntV (casacore::uInt rowNr, casacore::Int* dataPtr);
virtual void getIntV (unsigned int rowNr, int* dataPtr);
private:
casacore::Int itsValue;
int itsValue;
};

// <summary>All columns in the LOFAR Storage Manager with value False.</summary>
// <summary>All columns in the LOFAR Storage Manager with value false.</summary>
// <use visibility=local>
class FalseColumn : public LofarColumn
{
public:
explicit FalseColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~FalseColumn();
virtual void getBoolV (casacore::uInt rowNr, casacore::Bool* dataPtr);
virtual void getBoolV (unsigned int rowNr, bool* dataPtr);
private:
casacore::Bool itsValue;
bool itsValue;
};

// <summary>UVW column in the LOFAR Storage Manager.</summary>
Expand All @@ -157,9 +157,9 @@ class UvwColumn : public LofarColumn
explicit UvwColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~UvwColumn();
virtual casacore::IPosition shape (casacore::uInt rownr);
virtual void getArraydoubleV (casacore::uInt rowNr,
casacore::Array<casacore::Double>* dataPtr);
virtual casacore::IPosition shape (unsigned int rownr);
virtual void getArraydoubleV (unsigned int rowNr,
casacore::Array<double>* dataPtr);
virtual void prepareCol();
private:
casacore::MDirection itsPhaseDir; //# could be SUN, etc.
Expand All @@ -180,11 +180,11 @@ class DataColumn : public LofarColumn
explicit DataColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~DataColumn();
virtual casacore::Bool isWritable() const;
virtual casacore::IPosition shape (casacore::uInt rownr);
virtual void getArrayComplexV (casacore::uInt rowNr,
virtual bool isWritable() const;
virtual casacore::IPosition shape (unsigned int rownr);
virtual void getArrayComplexV (unsigned int rowNr,
casacore::Array<casacore::Complex>* dataPtr);
virtual void putArrayComplexV (casacore::uInt rowNr,
virtual void putArrayComplexV (unsigned int rowNr,
const casacore::Array<casacore::Complex>* dataPtr);
};

Expand All @@ -196,9 +196,9 @@ class FlagColumn : public LofarColumn
explicit FlagColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~FlagColumn();
virtual casacore::IPosition shape (casacore::uInt rownr);
virtual void getArrayBoolV (casacore::uInt rowNr,
casacore::Array<casacore::Bool>* dataPtr);
virtual casacore::IPosition shape (unsigned int rownr);
virtual void getArrayBoolV (unsigned int rowNr,
casacore::Array<bool>* dataPtr);
};

// <summary>WEIGHT column in the LOFAR Storage Manager.</summary>
Expand All @@ -209,9 +209,9 @@ class WeightColumn : public LofarColumn
explicit WeightColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~WeightColumn();
virtual casacore::IPosition shape (casacore::uInt rownr);
virtual void getArrayfloatV (casacore::uInt rowNr,
casacore::Array<casacore::Float>* dataPtr);
virtual casacore::IPosition shape (unsigned int rownr);
virtual void getArrayfloatV (unsigned int rowNr,
casacore::Array<float>* dataPtr);
};

// <summary>SIGMA column in the LOFAR Storage Manager.</summary>
Expand All @@ -222,9 +222,9 @@ class SigmaColumn : public LofarColumn
explicit SigmaColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~SigmaColumn();
virtual casacore::IPosition shape (casacore::uInt rownr);
virtual void getArrayfloatV (casacore::uInt rowNr,
casacore::Array<casacore::Float>* dataPtr);
virtual casacore::IPosition shape (unsigned int rownr);
virtual void getArrayfloatV (unsigned int rowNr,
casacore::Array<float>* dataPtr);
};

// <summary>WEIGHT_SPECTRUM column in the LOFAR Storage Manager.</summary>
Expand All @@ -235,9 +235,9 @@ class WSpectrumColumn : public LofarColumn
explicit WSpectrumColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~WSpectrumColumn();
virtual casacore::IPosition shape (casacore::uInt rownr);
virtual void getArrayfloatV (casacore::uInt rowNr,
casacore::Array<casacore::Float>* dataPtr);
virtual casacore::IPosition shape (unsigned int rownr);
virtual void getArrayfloatV (unsigned int rowNr,
casacore::Array<float>* dataPtr);
};

// <summary>FLAG_CATEGORY column in the LOFAR Storage Manager.</summary>
Expand All @@ -248,8 +248,8 @@ class FlagCatColumn : public LofarColumn
explicit FlagCatColumn (LofarStMan* parent, int dtype)
: LofarColumn(parent, dtype) {}
virtual ~FlagCatColumn();
virtual casacore::Bool isShapeDefined (casacore::uInt rownr);
virtual casacore::IPosition shape (casacore::uInt rownr);
virtual bool isShapeDefined (unsigned int rownr);
virtual casacore::IPosition shape (unsigned int rownr);
};


Expand Down
Loading