From 15776487db68d24aa22939d84887c2ef181c9a3e Mon Sep 17 00:00:00 2001 From: Maik Nijhuis <maik.nijhuis@triopsys.nl> Date: Mon, 16 Nov 2020 14:25:40 +0100 Subject: [PATCH] Use SPDX license header, set copyright year to 2020. Also remove $Id...$ lines. --- AOFlaggerStep/AOFlaggerStep.cc | 20 ++--------- AOFlaggerStep/AOFlaggerStep.h | 18 ++-------- AOFlaggerStep/Register.cc | 20 ++--------- AOFlaggerStep/Register.h | 18 ++-------- AOFlaggerStep/test/CMakeLists.txt | 3 ++ AOFlaggerStep/test/tAOFlaggerStep.cc | 20 ++--------- Blob/BlobAipsIO.cc | 21 ++--------- Blob/BlobAipsIO.h | 19 ++-------- Blob/BlobArray.cc | 21 ++--------- Blob/BlobArray.h | 21 ++--------- Blob/BlobArray.tcc | 22 ++---------- Blob/BlobException.h | 19 ++-------- Blob/BlobHeader.cc | 21 ++--------- Blob/BlobHeader.h | 19 ++-------- Blob/BlobIBufStream.cc | 21 ++--------- Blob/BlobIBufStream.h | 19 ++-------- Blob/BlobIBuffer.h | 19 ++-------- Blob/BlobIStream.cc | 21 ++--------- Blob/BlobIStream.h | 19 ++-------- Blob/BlobOBufStream.cc | 21 ++--------- Blob/BlobOBufStream.h | 19 ++-------- Blob/BlobOBuffer.h | 19 ++-------- Blob/BlobOStream.cc | 21 ++--------- Blob/BlobOStream.h | 19 ++-------- Blob/BlobSTL.h | 19 ++-------- Blob/BlobSTL.tcc | 22 ++---------- Blob/BlobStreamable.h | 19 ++-------- CMake/FindCFITSIO.cmake | 21 ++--------- CMake/FindCasacore.cmake | 34 +++++------------- CMake/PythonInstall.cmake | 41 +++++++--------------- CMakeLists.txt | 5 ++- Common/BaselineSelect.cc | 21 ++--------- Common/BaselineSelect.h | 19 ++-------- Common/ClusterDesc.cc | 21 ++--------- Common/ClusterDesc.h | 19 ++-------- Common/DataConvert.cc | 21 ++--------- Common/DataConvert.h | 19 ++-------- Common/DataFormat.h | 19 ++-------- Common/Epsilon.h | 19 ++-------- Common/KVpair.h | 19 ++-------- Common/MWError.h | 19 ++-------- Common/Memory.cc | 19 ++-------- Common/Memory.h | 19 ++-------- Common/NodeDesc.cc | 21 ++--------- Common/NodeDesc.h | 19 ++-------- Common/ObjectFactory.h | 21 ++--------- Common/ParameterHandler.cc | 23 ++---------- Common/ParameterHandler.h | 19 ++-------- Common/ParameterRecord.cc | 21 ++--------- Common/ParameterRecord.h | 19 ++-------- Common/ParameterSet.cc | 21 ++--------- Common/ParameterSet.h | 19 ++-------- Common/ParameterSetImpl.cc | 21 ++--------- Common/ParameterSetImpl.h | 21 ++--------- Common/ParameterValue.cc | 21 ++--------- Common/ParameterValue.h | 19 ++-------- Common/PrettyUnits.cc | 21 ++--------- Common/PrettyUnits.h | 19 ++-------- Common/Singleton.h | 19 ++-------- Common/StreamUtil.h | 19 ++-------- Common/StringUtil.cc | 21 ++--------- Common/StringUtil.h | 19 ++-------- Common/Timer.cc | 21 ++--------- Common/Timer.h | 19 ++-------- Common/TypeNames.cc | 21 ++--------- Common/TypeNames.h | 19 ++-------- Common/TypeNames.tcc | 22 ++---------- Common/Types.h | 19 ++-------- Common/VdsDesc.cc | 21 ++--------- Common/VdsDesc.h | 19 ++-------- Common/VdsMaker.cc | 21 ++--------- Common/VdsMaker.h | 19 ++-------- Common/VdsPartDesc.cc | 21 ++--------- Common/VdsPartDesc.h | 19 ++-------- Common/buffered_lane.h | 19 ++-------- Common/test/unit/tMemory.cc | 3 ++ DDECal/Constraint.cc | 19 ++-------- DDECal/Constraint.h | 19 ++-------- DDECal/DDECal.cc | 21 ++--------- DDECal/DDECal.h | 19 ++-------- DDECal/KLFitter.cc | 19 ++-------- DDECal/KLFitter.h | 19 ++-------- DDECal/KernelSmoother.h | 19 ++-------- DDECal/MultiDirBuffer.h | 19 ++-------- DDECal/MultiDirSolver.cc | 19 ++-------- DDECal/MultiDirSolver.h | 19 ++-------- DDECal/PieceWisePhaseFitter.h | 19 ++-------- DDECal/PiercePoint.cc | 19 ++-------- DDECal/PiercePoint.h | 19 ++-------- DDECal/QRSolver.h | 19 ++-------- DDECal/Register.cc | 21 ++--------- DDECal/Register.h | 19 ++-------- DDECal/RotationAndDiagonalConstraint.cc | 19 ++-------- DDECal/RotationAndDiagonalConstraint.h | 19 ++-------- DDECal/RotationConstraint.cc | 19 ++-------- DDECal/RotationConstraint.h | 19 ++-------- DDECal/ScreenConstraint.cc | 19 ++-------- DDECal/ScreenConstraint.h | 19 ++-------- DDECal/SmoothnessConstraint.cc | 19 ++-------- DDECal/SmoothnessConstraint.h | 19 ++-------- DDECal/Stopwatch.cc | 19 ++-------- DDECal/Stopwatch.h | 19 ++-------- DDECal/TECConstraint.cc | 19 ++-------- DDECal/TECConstraint.h | 19 ++-------- DDECal/screenfitter.cc | 19 ++-------- DDECal/screenfitter.h | 19 ++-------- DDECal/test/integration/CMakeLists.txt | 3 ++ DDECal/test/integration/tDDECal.sh | 3 ++ DDECal/test/integration/tIDGPredict.sh | 3 ++ DDECal/test/integration/tIDGPredict_ref.py | 4 +++ DDECal/test/unit/tRotationConstraint.cc | 3 ++ DPPP/Apply.cc | 19 ++-------- DPPP/Apply.h | 19 ++-------- DPPP/ApplyBeam.cc | 21 ++--------- DPPP/ApplyBeam.h | 19 ++-------- DPPP/ApplyCal.cc | 21 ++--------- DPPP/ApplyCal.h | 19 ++-------- DPPP/Averager.cc | 21 ++--------- DPPP/Averager.h | 19 ++-------- DPPP/BDAAverager.cc | 19 ++-------- DPPP/BDAAverager.h | 19 ++-------- DPPP/BDABuffer.cc | 19 ++-------- DPPP/BDABuffer.h | 19 ++-------- DPPP/BDAIntervalBuffer.cc | 19 ++-------- DPPP/BDAIntervalBuffer.h | 19 ++-------- DPPP/Baseline.h | 19 ++-------- DPPP/BaselineSelection.cc | 21 ++--------- DPPP/BaselineSelection.h | 19 ++-------- DPPP/CMakeLists.txt | 3 ++ DPPP/ColumnReader.cc | 18 ++-------- DPPP/ColumnReader.h | 18 ++-------- DPPP/Counter.cc | 21 ++--------- DPPP/Counter.h | 19 ++-------- DPPP/Cursor.h | 19 ++-------- DPPP/CursorUtilCasa.h | 19 ++-------- DPPP/DPBuffer.cc | 21 ++--------- DPPP/DPBuffer.h | 19 ++-------- DPPP/DPInfo.cc | 21 ++--------- DPPP/DPInfo.h | 19 ++-------- DPPP/DPInput.cc | 21 ++--------- DPPP/DPInput.h | 19 ++-------- DPPP/DPLogger.cc | 21 ++--------- DPPP/DPLogger.h | 19 ++-------- DPPP/DPPP.cc | 21 ++--------- DPPP/DPRun.cc | 21 ++--------- DPPP/DPRun.h | 19 ++-------- DPPP/DPStep.cc | 21 ++--------- DPPP/DPStep.h | 19 ++-------- DPPP/DemixInfo.cc | 21 ++--------- DPPP/DemixInfo.h | 19 ++-------- DPPP/DemixWorker.cc | 21 ++--------- DPPP/DemixWorker.h | 19 ++-------- DPPP/Demixer.cc | 21 ++--------- DPPP/Demixer.h | 19 ++-------- DPPP/DemixerNew.cc | 21 ++--------- DPPP/DemixerNew.h | 19 ++-------- DPPP/DummyStep.cc | 21 ++--------- DPPP/DummyStep.h | 19 ++-------- DPPP/EstimateMixed.cc | 19 ++-------- DPPP/EstimateMixed.h | 19 ++-------- DPPP/EstimateNew.cc | 19 ++-------- DPPP/EstimateNew.h | 19 ++-------- DPPP/Exceptions.h | 19 ++-------- DPPP/Filter.cc | 21 ++--------- DPPP/Filter.h | 19 ++-------- DPPP/FlagCounter.cc | 21 ++--------- DPPP/FlagCounter.h | 19 ++-------- DPPP/GainCal.cc | 21 ++--------- DPPP/GainCal.h | 19 ++-------- DPPP/GainCalAlgorithm.cc | 21 ++--------- DPPP/GainCalAlgorithm.h | 19 ++-------- DPPP/GaussianSource.cc | 19 ++-------- DPPP/GaussianSource.h | 19 ++-------- DPPP/GridInterpolate.cc | 21 ++--------- DPPP/GridInterpolate.h | 19 ++-------- DPPP/H5Parm.cc | 19 ++-------- DPPP/H5Parm.h | 19 ++-------- DPPP/H5ParmPredict.cc | 21 ++--------- DPPP/H5ParmPredict.h | 18 ++-------- DPPP/Interpolate.cc | 19 ++-------- DPPP/Interpolate.h | 19 ++-------- DPPP/MS.cc | 18 ++-------- DPPP/MS.h | 18 ++-------- DPPP/MSBDAReader.cc | 18 ++-------- DPPP/MSBDAReader.h | 18 ++-------- DPPP/MSBDAWriter.cc | 18 ++-------- DPPP/MSBDAWriter.h | 18 ++-------- DPPP/MSReader.cc | 21 ++--------- DPPP/MSReader.h | 19 ++-------- DPPP/MSUpdater.cc | 21 ++--------- DPPP/MSUpdater.h | 19 ++-------- DPPP/MSWriter.cc | 21 ++--------- DPPP/MSWriter.h | 19 ++-------- DPPP/MedFlagger.cc | 21 ++--------- DPPP/MedFlagger.h | 19 ++-------- DPPP/ModelComponent.cc | 19 ++-------- DPPP/ModelComponent.h | 19 ++-------- DPPP/ModelComponentVisitor.cc | 19 ++-------- DPPP/ModelComponentVisitor.h | 19 ++-------- DPPP/MultiMSReader.cc | 21 ++--------- DPPP/MultiMSReader.h | 19 ++-------- DPPP/OneApplyCal.cc | 21 ++--------- DPPP/OneApplyCal.h | 19 ++-------- DPPP/Patch.cc | 19 ++-------- DPPP/Patch.h | 19 ++-------- DPPP/PhaseFitter.cc | 21 ++--------- DPPP/PhaseFitter.h | 21 ++--------- DPPP/PhaseShift.cc | 21 ++--------- DPPP/PhaseShift.h | 19 ++-------- DPPP/PointSource.cc | 19 ++-------- DPPP/PointSource.h | 19 ++-------- DPPP/Position.cc | 19 ++-------- DPPP/Position.h | 19 ++-------- DPPP/PreFlagger.cc | 21 ++--------- DPPP/PreFlagger.h | 19 ++-------- DPPP/Predict.cc | 21 ++--------- DPPP/Predict.h | 19 ++-------- DPPP/ProgressMeter.cc | 19 ++-------- DPPP/ProgressMeter.h | 19 ++-------- DPPP/ScaleData.cc | 21 ++--------- DPPP/ScaleData.h | 19 ++-------- DPPP/SetBeam.cc | 19 ++-------- DPPP/SetBeam.h | 19 ++-------- DPPP/Simulate.cc | 19 ++-------- DPPP/Simulate.h | 19 ++-------- DPPP/Simulator.cc | 19 ++-------- DPPP/Simulator.h | 19 ++-------- DPPP/SolTab.cc | 19 ++-------- DPPP/SolutionInterval.cc | 17 ++------- DPPP/SolutionInterval.h | 17 ++------- DPPP/SourceDBUtil.cc | 19 ++-------- DPPP/SourceDBUtil.h | 19 ++-------- DPPP/Split.cc | 21 ++--------- DPPP/Split.h | 19 ++-------- DPPP/StManParsetKeys.h | 19 ++-------- DPPP/StationAdder.cc | 21 ++--------- DPPP/StationAdder.h | 19 ++-------- DPPP/Stokes.cc | 19 ++-------- DPPP/Stokes.h | 19 ++-------- DPPP/SubtractMixed.cc | 19 ++-------- DPPP/SubtractMixed.h | 19 ++-------- DPPP/SubtractNew.cc | 19 ++-------- DPPP/SubtractNew.h | 19 ++-------- DPPP/UVWCalculator.cc | 21 ++--------- DPPP/UVWCalculator.h | 19 ++-------- DPPP/UVWFlagger.cc | 21 ++--------- DPPP/UVWFlagger.h | 19 ++-------- DPPP/Upsample.cc | 21 ++--------- DPPP/Upsample.h | 19 ++-------- DPPP/Version.h | 19 ++-------- DPPP/__init__.py | 23 ++---------- DPPP/etc/CMakeLists.txt | 5 ++- DPPP/test/integration/CMakeLists.txt | 3 ++ DPPP/test/integration/tApplyBeam.sh | 3 ++ DPPP/test/integration/tApplyCal2.sh | 3 ++ DPPP/test/integration/tDemix.sh | 3 ++ DPPP/test/integration/tGainCal.sh | 3 ++ DPPP/test/integration/tGainCalH5Parm.sh | 4 ++- DPPP/test/integration/tMultiApplyCal.sh | 4 ++- DPPP/test/integration/tPredict.sh | 3 ++ DPPP/test/runtests.cc | 3 ++ DPPP/test/unit/mock/MockInput.cc | 19 ++-------- DPPP/test/unit/mock/MockInput.h | 19 ++-------- DPPP/test/unit/mock/MockStep.cc | 19 ++-------- DPPP/test/unit/mock/MockStep.h | 19 ++-------- DPPP/test/unit/tApplyCal.cc | 21 ++--------- DPPP/test/unit/tApplyCalH5.cc | 21 ++--------- DPPP/test/unit/tAverager.cc | 21 ++--------- DPPP/test/unit/tBDAAverager.cc | 19 ++-------- DPPP/test/unit/tBDABuffer.cc | 19 ++-------- DPPP/test/unit/tBDAIntervalBuffer.cc | 19 ++-------- DPPP/test/unit/tBaselineSelection.cc | 21 ++--------- DPPP/test/unit/tDPInfo.cc | 19 ++-------- DPPP/test/unit/tDPPP.cc | 21 ++--------- DPPP/test/unit/tDemixer.cc | 21 ++--------- DPPP/test/unit/tFilter.cc | 21 ++--------- DPPP/test/unit/tGridInterpolate.cc | 21 ++--------- DPPP/test/unit/tH5Parm.cc | 3 ++ DPPP/test/unit/tInterpolate.cc | 19 ++-------- DPPP/test/unit/tMSBDAReader.cc | 19 ++-------- DPPP/test/unit/tMedFlagger.cc | 21 ++--------- DPPP/test/unit/tMirror.cc | 21 ++--------- DPPP/test/unit/tPSet.cc | 21 ++--------- DPPP/test/unit/tPhaseShift.cc | 21 ++--------- DPPP/test/unit/tPreFlagger.cc | 21 ++--------- DPPP/test/unit/tScaleData.cc | 21 ++--------- DPPP/test/unit/tScaleDataBDA.cc | 19 ++-------- DPPP/test/unit/tSolutionInterval.cc | 19 ++-------- DPPP/test/unit/tStationAdder.cc | 21 ++--------- DPPP/test/unit/tUVWFlagger.cc | 21 ++--------- DPPP/test/unit/tUpsample.cc | 21 ++--------- IDGPredict/DS9FacetFile.h | 19 ++-------- IDGPredict/Facet.h | 19 ++-------- IDGPredict/FacetImage.cc | 19 ++-------- IDGPredict/FacetImage.h | 19 ++-------- IDGPredict/IDGConfiguration.h | 19 ++-------- IDGPredict/IDGPredict.cc | 19 ++-------- IDGPredict/IDGPredict.h | 19 ++-------- IDGPredict/ParsetAterms.h | 19 ++-------- IDGPredict/test/unit/tDS9FacetFile.cc | 3 ++ IDGPredict/test/unit/tIDGPredict.cc | 3 ++ ParmDB/Axis.cc | 21 ++--------- ParmDB/Axis.h | 19 ++-------- ParmDB/AxisMapping.cc | 21 ++--------- ParmDB/AxisMapping.h | 19 ++-------- ParmDB/Box.cc | 21 ++--------- ParmDB/Box.h | 19 ++-------- ParmDB/Grid.cc | 21 ++--------- ParmDB/Grid.h | 19 ++-------- ParmDB/Parm.cc | 21 ++--------- ParmDB/Parm.h | 19 ++-------- ParmDB/ParmCache.cc | 21 ++--------- ParmDB/ParmCache.h | 19 ++-------- ParmDB/ParmDB.cc | 21 ++--------- ParmDB/ParmDB.h | 19 ++-------- ParmDB/ParmDBBlob.cc | 21 ++--------- ParmDB/ParmDBBlob.h | 19 ++-------- ParmDB/ParmDBCasa.cc | 21 ++--------- ParmDB/ParmDBCasa.h | 19 ++-------- ParmDB/ParmDBLocker.cc | 21 ++--------- ParmDB/ParmDBLocker.h | 19 ++-------- ParmDB/ParmDBMeta.cc | 21 ++--------- ParmDB/ParmDBMeta.h | 19 ++-------- ParmDB/ParmFacade.cc | 21 ++--------- ParmDB/ParmFacade.h | 19 ++-------- ParmDB/ParmFacadeDistr.cc | 21 ++--------- ParmDB/ParmFacadeDistr.h | 19 ++-------- ParmDB/ParmFacadeLocal.cc | 21 ++--------- ParmDB/ParmFacadeLocal.h | 19 ++-------- ParmDB/ParmFacadeRep.cc | 21 ++--------- ParmDB/ParmFacadeRep.h | 19 ++-------- ParmDB/ParmMap.h | 19 ++-------- ParmDB/ParmSet.cc | 21 ++--------- ParmDB/ParmSet.h | 19 ++-------- ParmDB/ParmValue.cc | 21 ++--------- ParmDB/ParmValue.h | 19 ++-------- ParmDB/PatchInfo.cc | 21 ++--------- ParmDB/PatchInfo.h | 19 ++-------- ParmDB/SourceDB.cc | 21 ++--------- ParmDB/SourceDB.h | 19 ++-------- ParmDB/SourceDBBlob.cc | 21 ++--------- ParmDB/SourceDBBlob.h | 19 ++-------- ParmDB/SourceDBCasa.cc | 21 ++--------- ParmDB/SourceDBCasa.h | 19 ++-------- ParmDB/SourceData.cc | 21 ++--------- ParmDB/SourceData.h | 19 ++-------- ParmDB/SourceInfo.cc | 21 ++--------- ParmDB/SourceInfo.h | 19 ++-------- ParmDB/makesourcedb.cc | 21 ++--------- ParmDB/showsourcedb.cc | 21 ++--------- PythonDPPP/CMakeLists.txt | 7 ++-- PythonDPPP/DPStepBase.cc | 21 ++--------- PythonDPPP/DPStepBase.h | 19 ++-------- PythonDPPP/PythonDPPP.cc | 21 ++--------- PythonDPPP/PythonStep.cc | 21 ++--------- PythonDPPP/PythonStep.h | 19 ++-------- PythonDPPP/__init__.py | 31 ++++------------ PythonDPPP/test/CMakeLists.txt | 3 ++ PythonDPPP/test/tPythonStep.py | 20 ++--------- SPWCombine/CMakeLists.txt | 5 ++- SPWCombine/Combiner.cc | 21 ++--------- SPWCombine/CombinerProcessControl.cc | 21 ++--------- SPWCombine/CombinerProcessControl.h | 19 ++-------- SPWCombine/SPWCombine.cc | 21 ++--------- SPWCombine/SPWCombine.h | 19 ++-------- TestDynDPPP/TestDynStep.cc | 21 ++--------- TestDynDPPP/TestDynStep.h | 19 ++-------- TestDynDPPP/test/tDynStep.cc | 21 ++--------- docs/CMakeLists.txt | 3 ++ docs/conf.py | 3 ++ scripts/run-clang-format.sh | 8 ++--- 371 files changed, 803 insertions(+), 6107 deletions(-) diff --git a/AOFlaggerStep/AOFlaggerStep.cc b/AOFlaggerStep/AOFlaggerStep.cc index 15926629f..235bcb984 100644 --- a/AOFlaggerStep/AOFlaggerStep.cc +++ b/AOFlaggerStep/AOFlaggerStep.cc @@ -1,23 +1,7 @@ // AOFlaggerStep.cc: DPPP step class to flag data based on rficonsole -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands // -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: AOFlaggerStep.cc 31423 2015-04-03 14:06:21Z dijkema $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Andre Offringa, Ger van Diepen diff --git a/AOFlaggerStep/AOFlaggerStep.h b/AOFlaggerStep/AOFlaggerStep.h index f7608986e..d08df5e14 100644 --- a/AOFlaggerStep/AOFlaggerStep.h +++ b/AOFlaggerStep/AOFlaggerStep.h @@ -1,20 +1,8 @@ // AOFlaggerStep.h: DPPP step class to flag data using rficonsole's -// functionality Copyright (C) 2010 ASTRON (Netherlands Institute for Radio -// Astronomy) P.O.Box 2, 7990 AA Dwingeloo, The Netherlands +// functionality // -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // /// @file /// @author Andre Offringa, Ger van Diepen diff --git a/AOFlaggerStep/Register.cc b/AOFlaggerStep/Register.cc index 9a2a5452c..7203341c9 100644 --- a/AOFlaggerStep/Register.cc +++ b/AOFlaggerStep/Register.cc @@ -1,23 +1,7 @@ // Register.cc: Register steps in DPPP -// Copyright (C) 2015 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands // -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: AOFlaggerStep.cc 31423 2015-04-03 14:06:21Z dijkema $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/AOFlaggerStep/Register.h b/AOFlaggerStep/Register.h index c3c06d55e..be945a42f 100644 --- a/AOFlaggerStep/Register.h +++ b/AOFlaggerStep/Register.h @@ -1,21 +1,7 @@ // Register.h: Register AOFlag steps in DPPP -// Copyright (C) 2015 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands // -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // /// @file /// @brief Register AOFlag steps in DPPP diff --git a/AOFlaggerStep/test/CMakeLists.txt b/AOFlaggerStep/test/CMakeLists.txt index c78b3a7b5..03e726cb7 100644 --- a/AOFlaggerStep/test/CMakeLists.txt +++ b/AOFlaggerStep/test/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + # Do not use lofar_add_test, because libaoflaggerstep should not be linked in. add_executable(tAOFlaggerStep tAOFlaggerStep.cc) diff --git a/AOFlaggerStep/test/tAOFlaggerStep.cc b/AOFlaggerStep/test/tAOFlaggerStep.cc index 3c70b1a51..bf65539a1 100644 --- a/AOFlaggerStep/test/tAOFlaggerStep.cc +++ b/AOFlaggerStep/test/tAOFlaggerStep.cc @@ -1,23 +1,7 @@ // tAOFlaggerStep.cc: Test program for class AOFlaggerStep -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands // -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: tAOFlaggerStep.cc 24221 2013-03-12 12:24:48Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/Blob/BlobAipsIO.cc b/Blob/BlobAipsIO.cc index b23b8546c..4c62990dc 100644 --- a/Blob/BlobAipsIO.cc +++ b/Blob/BlobAipsIO.cc @@ -1,24 +1,7 @@ // BlobAipsIO.cc: A Blob buffer for Aips++ ByteIO // -// Copyright (C) 2006 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: BlobAipsIO.cc 31210 2015-03-17 08:51:26Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "BlobAipsIO.h" diff --git a/Blob/BlobAipsIO.h b/Blob/BlobAipsIO.h index 045841d4d..2f4476cad 100644 --- a/Blob/BlobAipsIO.h +++ b/Blob/BlobAipsIO.h @@ -1,22 +1,7 @@ // BlobAipsIO.h: A Blob buffer for Aips++ ByteIO // -// Copyright (C) 2006 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_BLOB_BLOBAIPSIO_H #define LOFAR_BLOB_BLOBAIPSIO_H diff --git a/Blob/BlobArray.cc b/Blob/BlobArray.cc index d79ff0dbc..aefcfb401 100644 --- a/Blob/BlobArray.cc +++ b/Blob/BlobArray.cc @@ -1,24 +1,7 @@ // BlobArray.cc: Blob handling for arrays // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: BlobArray.cc 25266 2013-06-11 08:09:03Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "BlobArray.h" #include "BlobHeader.h" diff --git a/Blob/BlobArray.h b/Blob/BlobArray.h index bb87dc88f..bfa3eb155 100644 --- a/Blob/BlobArray.h +++ b/Blob/BlobArray.h @@ -1,24 +1,7 @@ // BlobArray.h: Blob handling for arrays // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: BlobArray.h 29040 2014-04-23 08:45:54Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_BLOB_BLOBARRAY_H #define LOFAR_BLOB_BLOBARRAY_H diff --git a/Blob/BlobArray.tcc b/Blob/BlobArray.tcc index 7132ec456..7c55d592a 100644 --- a/Blob/BlobArray.tcc +++ b/Blob/BlobArray.tcc @@ -1,24 +1,8 @@ // BlobArray.cc: Blob handling for arrays // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: BlobArray.tcc 29040 2014-04-23 08:45:54Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later + #ifndef COMMON_BLOBARRAY_TCC #define COMMON_BLOBARRAY_TCC diff --git a/Blob/BlobException.h b/Blob/BlobException.h index 19af85c0b..948039a8d 100644 --- a/Blob/BlobException.h +++ b/Blob/BlobException.h @@ -1,22 +1,7 @@ // BlobException.h: Blob Exception class. // -// Copyright (C) 2004 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_BLOB_BLOBEXCEPTION_H #define LOFAR_BLOB_BLOBEXCEPTION_H diff --git a/Blob/BlobHeader.cc b/Blob/BlobHeader.cc index a6427692b..b15177859 100644 --- a/Blob/BlobHeader.cc +++ b/Blob/BlobHeader.cc @@ -1,24 +1,7 @@ // BlobHeader.tcc: Standard header for a blob // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the DP3 software suite. -// The DP3 software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The DP3 software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the DP3 software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: BlobHeader.cc 14057 2009-09-18 12:26:29Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // Always #include <lofar_config.h> first! diff --git a/Blob/BlobHeader.h b/Blob/BlobHeader.h index c770b3613..e3389f9da 100644 --- a/Blob/BlobHeader.h +++ b/Blob/BlobHeader.h @@ -1,22 +1,7 @@ // BlobHeader.h: Standard header for a blob // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_BLOB_BLOBHEADER_H #define LOFAR_BLOB_BLOBHEADER_H diff --git a/Blob/BlobIBufStream.cc b/Blob/BlobIBufStream.cc index 6f3d51c13..cb7375002 100644 --- a/Blob/BlobIBufStream.cc +++ b/Blob/BlobIBufStream.cc @@ -1,24 +1,7 @@ // BlobIBufStream.cc: Input buffer for a blob using an istream // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: BlobIBufStream.cc 14057 2009-09-18 12:26:29Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "BlobIBufStream.h" diff --git a/Blob/BlobIBufStream.h b/Blob/BlobIBufStream.h index 2e75d3d7d..bd00c444f 100644 --- a/Blob/BlobIBufStream.h +++ b/Blob/BlobIBufStream.h @@ -1,22 +1,7 @@ // BlobIBufStream.h: Input buffer for a blob using an istream // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_BLOB_BLOBIBUFSTREAM_H #define LOFAR_BLOB_BLOBIBUFSTREAM_H diff --git a/Blob/BlobIBuffer.h b/Blob/BlobIBuffer.h index 503d618bd..551d31795 100644 --- a/Blob/BlobIBuffer.h +++ b/Blob/BlobIBuffer.h @@ -1,22 +1,7 @@ // BlobIBuffer.h: Abstract base class for input buffer for a blob // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include <cstdint> diff --git a/Blob/BlobIStream.cc b/Blob/BlobIStream.cc index f48d372b6..3775f158b 100644 --- a/Blob/BlobIStream.cc +++ b/Blob/BlobIStream.cc @@ -1,24 +1,7 @@ // BlobIStream.h: Input stream for a blob // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: BlobIStream.cc 14057 2009-09-18 12:26:29Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // Always #include <lofar_config.h> first! #include "BlobIStream.h" diff --git a/Blob/BlobIStream.h b/Blob/BlobIStream.h index 5551a1843..397cedf68 100644 --- a/Blob/BlobIStream.h +++ b/Blob/BlobIStream.h @@ -1,22 +1,7 @@ // BlobIStream.h: Input stream for a blob // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_BLOB_BLOBISTREAM_H #define LOFAR_BLOB_BLOBISTREAM_H diff --git a/Blob/BlobOBufStream.cc b/Blob/BlobOBufStream.cc index 2ce2e0d7c..c14ac5d3d 100644 --- a/Blob/BlobOBufStream.cc +++ b/Blob/BlobOBufStream.cc @@ -1,24 +1,7 @@ // BlobOBufStream.cc: Output buffer for a blob using an ostream // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: BlobOBufStream.cc 14057 2009-09-18 12:26:29Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "BlobOBufStream.h" diff --git a/Blob/BlobOBufStream.h b/Blob/BlobOBufStream.h index 88b7f815e..c9c7028f8 100644 --- a/Blob/BlobOBufStream.h +++ b/Blob/BlobOBufStream.h @@ -1,22 +1,7 @@ // BlobOBufStream.h: Output buffer for a blob using an ostream // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_BLOB_BLOBOBUFSTREAM_H #define LOFAR_BLOB_BLOBOBUFSTREAM_H diff --git a/Blob/BlobOBuffer.h b/Blob/BlobOBuffer.h index d773408f8..ab88314f3 100644 --- a/Blob/BlobOBuffer.h +++ b/Blob/BlobOBuffer.h @@ -1,22 +1,7 @@ // BlobOBuffer.h: Abstract base class for output buffer for a blob // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_BLOB_BLOBOBUFFER_H #define LOFAR_BLOB_BLOBOBUFFER_H diff --git a/Blob/BlobOStream.cc b/Blob/BlobOStream.cc index 18508aefe..1d474e3a1 100644 --- a/Blob/BlobOStream.cc +++ b/Blob/BlobOStream.cc @@ -1,24 +1,7 @@ // BlobOStream.cc: Output stream for a blob // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: BlobOStream.cc 14057 2009-09-18 12:26:29Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // Always #include <lofar_config.h> first! #include "BlobOStream.h" diff --git a/Blob/BlobOStream.h b/Blob/BlobOStream.h index ad07926a7..ce6759d0e 100644 --- a/Blob/BlobOStream.h +++ b/Blob/BlobOStream.h @@ -1,22 +1,7 @@ // BlobOStream.h: Output stream for a blob // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_BLOB_BLOBOSTREAM_H #define LOFAR_BLOB_BLOBOSTREAM_H diff --git a/Blob/BlobSTL.h b/Blob/BlobSTL.h index 84d11a0d1..1da516c04 100644 --- a/Blob/BlobSTL.h +++ b/Blob/BlobSTL.h @@ -1,22 +1,7 @@ // BlobSTL.h: Blob handling for STL sequences // -// Copyright (C) 2007 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_BLOB_BLOBSTL_H #define LOFAR_BLOB_BLOBSTL_H diff --git a/Blob/BlobSTL.tcc b/Blob/BlobSTL.tcc index e88fce6ca..b5573f6dc 100644 --- a/Blob/BlobSTL.tcc +++ b/Blob/BlobSTL.tcc @@ -1,24 +1,8 @@ // BlobSTL.tcc: Blob handling for STLs // -// Copyright (C) 2007 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: BlobSTL.tcc 14057 2009-09-18 12:26:29Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later + #ifndef LOFAR_BLOB_BLOBSTL_TCC #define LOFAR_BLOB_BLOBSTL_TCC diff --git a/Blob/BlobStreamable.h b/Blob/BlobStreamable.h index 17188701f..285b1524b 100644 --- a/Blob/BlobStreamable.h +++ b/Blob/BlobStreamable.h @@ -1,22 +1,7 @@ // BlobStreamable.h: Interface for classes that can be streamed using blobs. // -// Copyright (C) 2006 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_BLOB_BLOBSTREAMABLE_H #define LOFAR_BLOB_BLOBSTREAMABLE_H diff --git a/CMake/FindCFITSIO.cmake b/CMake/FindCFITSIO.cmake index 11df40b30..e8ae16d42 100644 --- a/CMake/FindCFITSIO.cmake +++ b/CMake/FindCFITSIO.cmake @@ -10,25 +10,8 @@ # CFITSIO_LIBRARIES - the CFITSIO libraries # (identical to CFITSIO_LIBRARY) -# Copyright (C) 2009 -# ASTRON (Netherlands Institute for Radio Astronomy) -# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -# -# This file is part of the LOFAR software suite. -# The LOFAR software suite is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# The LOFAR software suite is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -# -# $Id: FindCFITSIO.cmake 22498 2012-10-23 10:51:12Z loose $ +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later if(NOT CFITSIO_FOUND) diff --git a/CMake/FindCasacore.cmake b/CMake/FindCasacore.cmake index 9068fdd81..5d893666a 100644 --- a/CMake/FindCasacore.cmake +++ b/CMake/FindCasacore.cmake @@ -16,19 +16,19 @@ # The dependencies in this macro were generated against casacore release 1.7.0. # # Variables used by this module: -# CASACORE_ROOT_DIR - Casacore root directory. +# CASACORE_ROOT_DIR - Casacore root directory. # BLAS_LIBS - override BLAS library # LAPACK_LIBS - override LAPACK library # # Variables defined by this module: # CASACORE_FOUND - System has Casacore, which means that the -# include dir was found, as well as all +# include dir was found, as well as all # libraries specified (not cached) # CASACORE_INCLUDE_DIR - Casacore include directory (cached) # CASACORE_INCLUDE_DIRS - Casacore include directories (not cached) # identical to CASACORE_INCLUDE_DIR # CASACORE_LIBRARIES - The Casacore libraries (not cached) -# CASA_${COMPONENT}_LIBRARY - The absolute path of Casacore library +# CASA_${COMPONENT}_LIBRARY - The absolute path of Casacore library # "component" (cached) # HAVE_AIPSPP - True if system has Casacore (cached) # for backward compatibility with AIPS++ @@ -40,29 +40,12 @@ # ATTENTION: The component names need to be in lower case, just as the # casacore library names. However, the CMake variables use all upper case. -# Copyright (C) 2009 -# ASTRON (Netherlands Institute for Radio Astronomy) -# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -# -# This file is part of the LOFAR software suite. -# The LOFAR software suite is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# The LOFAR software suite is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -# -# $Id: FindCasacore.cmake 31487 2015-04-16 11:28:17Z dijkema $ +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later # - casacore_resolve_dependencies(_result) # -# Resolve the Casacore library dependencies for the given components. +# Resolve the Casacore library dependencies for the given components. # The list of dependent libraries will be returned in the variable result. # It is sorted from least dependent to most dependent library, so it can be # directly fed to the linker. @@ -73,7 +56,7 @@ macro(casacore_resolve_dependencies _result) set(${_result} ${ARGN}) set(_index 0) # Do a breadth-first search through the dependency graph; append to the - # result list the dependent components for each item in that list. + # result list the dependent components for each item in that list. # Duplicates will be removed later. while(1) list(LENGTH ${_result} _length) @@ -94,7 +77,7 @@ endmacro(casacore_resolve_dependencies _result) # - casacore_find_library(_name) # -# Search for the library ${_name}. +# Search for the library ${_name}. # If library is found, add it to CASACORE_LIBRARIES; if not, add ${_name} # to CASACORE_MISSING_COMPONENTS and set CASACORE_FOUND to false. # @@ -280,4 +263,3 @@ else(CASACORE_FOUND) message(STATUS "${CASACORE_ERROR_MESSAGE}") endif(Casacore_FIND_REQUIRED) endif(CASACORE_FOUND) - diff --git a/CMake/PythonInstall.cmake b/CMake/PythonInstall.cmake index a1357c7d5..278e97a11 100644 --- a/CMake/PythonInstall.cmake +++ b/CMake/PythonInstall.cmake @@ -3,25 +3,8 @@ # Install Python source files and byte-compile them in the directory # ${PYTHON_INSTALL_DIR}/${install_dir}. -# Copyright (C) 2008-2009 -# ASTRON (Netherlands Foundation for Research in Astronomy) -# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# $Id: PythonInstall.cmake 32905 2015-11-17 15:31:54Z schaap $ +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later # Search for the Python interpreter. # No. We expect the toplevel CMakeLists.txt to have found python already! @@ -33,7 +16,7 @@ if(Python3_EXECUTABLE) "from distutils.sysconfig import get_python_lib" "from os.path import join" "print(join( - get_python_lib(plat_specific=True, standard_lib=True, prefix=''), + get_python_lib(plat_specific=True, standard_lib=True, prefix=''), 'site-packages'))" ) execute_process( @@ -44,14 +27,14 @@ if(Python3_EXECUTABLE) if(_pyerr) message(FATAL_ERROR "Python command failed:\n${_pyerr}") endif(_pyerr) - + if(NOT DEFINED PYTHON_BUILD_DIR) set(_PRINT_PYTHON_DIRS TRUE) endif() - - set(PYTHON_BUILD_DIR "${CMAKE_BINARY_DIR}/${_pydir}" CACHE PATH + + set(PYTHON_BUILD_DIR "${CMAKE_BINARY_DIR}/${_pydir}" CACHE PATH "Build directory for Python extensions" FORCE) - set(PYTHON_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${_pydir}" CACHE PATH + set(PYTHON_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${_pydir}" CACHE PATH "Installation directory for Python extensions" FORCE) if(_PRINT_PYTHON_DIRS) @@ -106,8 +89,8 @@ macro(python_install) foreach(_py ${_py_files}) get_filename_component(_py_path ${_py} PATH) get_filename_component(_py_abs ${_py} ABSOLUTE) - - # check if _py is a path in CMAKE_BINARY_DIR. If so, then it is most likely a configured_file. + + # check if _py is a path in CMAKE_BINARY_DIR. If so, then it is most likely a configured_file. # then strip the CMAKE_CURRENT_BINARY_DIR prefix. if(${_py} MATCHES "^(${CMAKE_CURRENT_BINARY_DIR})") string(REGEX REPLACE "^(${CMAKE_CURRENT_BINARY_DIR}/)" "" _py "${_py}") @@ -125,7 +108,7 @@ macro(python_install) "destdir = os.environ.get('DESTDIR','')" "print('-- Byte-compiling: %s${_inst_dir}/${_py}' % destdir)" "py_compile.compile('%s${DESTDIR}${_inst_dir}/${_py}' % destdir, doraise=True)") - install(CODE + install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -c \"${_py_code}\" RESULT_VARIABLE _result) if(NOT _result EQUAL 0) @@ -141,8 +124,8 @@ macro(python_install) set(_init_dir "${_init_dir}/${_dir}") execute_process(COMMAND ${CMAKE_COMMAND} -E touch "${PYTHON_BUILD_DIR}${_init_dir}/__init__.py") - install(CODE - "execute_process(COMMAND ${CMAKE_COMMAND} -E touch + install(CODE + "execute_process(COMMAND ${CMAKE_COMMAND} -E touch \"\$ENV{DESTDIR}${PYTHON_INSTALL_DIR}${_init_dir}/__init__.py\")") endforeach(_dir ${_dir_list}) diff --git a/CMakeLists.txt b/CMakeLists.txt index 88ce135c5..86ec3578e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + # FindHDF5 uses NATIVE_COMMAND in separate_arguments, which requires # CMake 3.9. cmake_minimum_required(VERSION 3.9) @@ -84,7 +87,7 @@ set(BOOSTPY ${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}) find_package(Boost COMPONENTS date_time filesystem python${BOOSTPY} numpy${BOOSTPY} program_options system unit_test_framework REQUIRED) include_directories(${Boost_INCLUDE_DIR}) -# We could use find_package(EveryBeam 0.1.0 REQUIRED), +# We could use find_package(EveryBeam 0.1.0 REQUIRED), # however conditions below make it somewhat more explicit find_package(EveryBeam) if(${EVERYBEAM_FOUND}) diff --git a/Common/BaselineSelect.cc b/Common/BaselineSelect.cc index 0a94199cf..dbd09d60a 100644 --- a/Common/BaselineSelect.cc +++ b/Common/BaselineSelect.cc @@ -1,24 +1,7 @@ // BaselineSelect.cc: Convert MSSelection baseline string to a Matrix // -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: BaselineSelect.cc 34753 2016-06-20 10:43:42Z schaap $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "BaselineSelect.h" diff --git a/Common/BaselineSelect.h b/Common/BaselineSelect.h index e616e83ce..6c5ef9e71 100644 --- a/Common/BaselineSelect.h +++ b/Common/BaselineSelect.h @@ -1,22 +1,7 @@ // BaselineSelect.h: Convert MSSelection baseline string to a Matrix // -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// Convert MSSelection baseline string to a Matrix diff --git a/Common/ClusterDesc.cc b/Common/ClusterDesc.cc index e7edef997..eb5c5dc75 100644 --- a/Common/ClusterDesc.cc +++ b/Common/ClusterDesc.cc @@ -1,24 +1,7 @@ // ClusterDesc.cc: Description of a cluster // -// Copyright (C) 2007 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ClusterDesc.cc 19594 2011-12-18 17:23:10Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen <diepen AT astron nl> diff --git a/Common/ClusterDesc.h b/Common/ClusterDesc.h index a1d0fa8b5..f5fe920f5 100644 --- a/Common/ClusterDesc.h +++ b/Common/ClusterDesc.h @@ -1,22 +1,7 @@ // ClusterDesc.h: Description of a cluster and the nodes in it // -// Copyright (C) 2005 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Description of a cluster and the nodes in it. diff --git a/Common/DataConvert.cc b/Common/DataConvert.cc index 826c2896b..470e24056 100644 --- a/Common/DataConvert.cc +++ b/Common/DataConvert.cc @@ -1,24 +1,7 @@ // DataConvert.cc: Global functions to convert data values // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: DataConvert.cc 14057 2009-09-18 12:26:29Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // Always #include <lofar_config.h> first! #include "DataConvert.h" diff --git a/Common/DataConvert.h b/Common/DataConvert.h index 5018bac5f..e13aa04d2 100644 --- a/Common/DataConvert.h +++ b/Common/DataConvert.h @@ -1,22 +1,7 @@ // DataConvert.h: Global functions to convert data values // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_COMMON_DATACONVERT_H #define LOFAR_COMMON_DATACONVERT_H diff --git a/Common/DataFormat.h b/Common/DataFormat.h index b8da7c5ae..d6cf68396 100644 --- a/Common/DataFormat.h +++ b/Common/DataFormat.h @@ -1,22 +1,7 @@ // DataFormat.h: Get the data format (endian type) // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_COMMON_DATAFORMAT_H #define LOFAR_COMMON_DATAFORMAT_H diff --git a/Common/Epsilon.h b/Common/Epsilon.h index b4f854cab..d5cb5200a 100644 --- a/Common/Epsilon.h +++ b/Common/Epsilon.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Define comparison functions that use tolerances. diff --git a/Common/KVpair.h b/Common/KVpair.h index cac501ec6..d043c83e9 100644 --- a/Common/KVpair.h +++ b/Common/KVpair.h @@ -1,22 +1,7 @@ // KVpair.h: Implements a KV pair as a pair<string, string>. // -// Copyright (C) 2002-2004 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_COMMON_KVPAIR_H #define LOFAR_COMMON_KVPAIR_H diff --git a/Common/MWError.h b/Common/MWError.h index 13a9006b2..a3f15ac08 100644 --- a/Common/MWError.h +++ b/Common/MWError.h @@ -1,22 +1,7 @@ // MWError.h: Basic exception for master/worker related errors // -// Copyright (C) 2005 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Basic exception for master/worker related errors. diff --git a/Common/Memory.cc b/Common/Memory.cc index 47aa638af..3d93de517 100644 --- a/Common/Memory.cc +++ b/Common/Memory.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include <casacore/casa/OS/HostInfo.h> diff --git a/Common/Memory.h b/Common/Memory.h index 35c1e3d15..3c8a139d1 100644 --- a/Common/Memory.h +++ b/Common/Memory.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Define common functions for memory (usage) diff --git a/Common/NodeDesc.cc b/Common/NodeDesc.cc index 52e31a7d9..8eff5fdc6 100644 --- a/Common/NodeDesc.cc +++ b/Common/NodeDesc.cc @@ -1,24 +1,7 @@ // NodeDesc.cc: Description of a node // -// Copyright (C) 2007 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: NodeDesc.cc 16886 2010-12-08 10:43:17Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen <diepen AT astron nl> diff --git a/Common/NodeDesc.h b/Common/NodeDesc.h index 5f7285ccc..f6e8110ac 100644 --- a/Common/NodeDesc.h +++ b/Common/NodeDesc.h @@ -1,22 +1,7 @@ // NodeDesc.h: Description of a node in a cluster // -// Copyright (C) 2005 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Description of a node in a cluster. diff --git a/Common/ObjectFactory.h b/Common/ObjectFactory.h index f1b84eca9..763f6944f 100644 --- a/Common/ObjectFactory.h +++ b/Common/ObjectFactory.h @@ -1,24 +1,7 @@ // ObjectFactory.h: Generic object factory // -// Copyright (C) 2006 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ObjectFactory.h 32489 2015-09-26 18:38:13Z dijkema $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// \file /// The implementation of this object factory was inspired by the article diff --git a/Common/ParameterHandler.cc b/Common/ParameterHandler.cc index 9644c9a41..855174864 100644 --- a/Common/ParameterHandler.cc +++ b/Common/ParameterHandler.cc @@ -1,24 +1,5 @@ -// ParameterHandler.cc: -// -// Copyright (C) 2007 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ParameterHandler.cc 16886 2010-12-08 10:43:17Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "ParameterHandler.h" diff --git a/Common/ParameterHandler.h b/Common/ParameterHandler.h index 65ec1df91..ad27f6afd 100644 --- a/Common/ParameterHandler.h +++ b/Common/ParameterHandler.h @@ -1,22 +1,7 @@ // ParameterHandler.h: Handle a LOFAR .parset file // -// Copyright (C) 2005 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Handle a LOFAR .parset file diff --git a/Common/ParameterRecord.cc b/Common/ParameterRecord.cc index 42deafc63..e2fd267ac 100644 --- a/Common/ParameterRecord.cc +++ b/Common/ParameterRecord.cc @@ -1,24 +1,7 @@ // ParameterRecord.cc: A record of parameter values // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ParameterRecord.cc 20264 2012-02-28 07:22:45Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "ParameterRecord.h" diff --git a/Common/ParameterRecord.h b/Common/ParameterRecord.h index 93ebcf0d2..30ba60bd5 100644 --- a/Common/ParameterRecord.h +++ b/Common/ParameterRecord.h @@ -1,22 +1,7 @@ // ParameterRecord.h: A record of parameter values // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_COMMON_PARAMETERRECORD_H #define LOFAR_COMMON_PARAMETERRECORD_H diff --git a/Common/ParameterSet.cc b/Common/ParameterSet.cc index 1a849663d..7dbafdcd4 100644 --- a/Common/ParameterSet.cc +++ b/Common/ParameterSet.cc @@ -1,24 +1,7 @@ // ParameterSet.cc: Implements a map of Key-Value pairs. // -// Copyright (C) 2002-2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ParameterSet.cc 23459 2013-01-08 08:49:52Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // Always #include <lofar_config.h> first! diff --git a/Common/ParameterSet.h b/Common/ParameterSet.h index 73a0e2deb..5dd2ae914 100644 --- a/Common/ParameterSet.h +++ b/Common/ParameterSet.h @@ -1,22 +1,7 @@ // ParameterSet.h: Implements a map of Key-Value pairs. // -// Copyright (C) 2002-2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_COMMON_PARAMETERSET_H #define LOFAR_COMMON_PARAMETERSET_H diff --git a/Common/ParameterSetImpl.cc b/Common/ParameterSetImpl.cc index 335c4477a..a89345148 100644 --- a/Common/ParameterSetImpl.cc +++ b/Common/ParameterSetImpl.cc @@ -1,24 +1,7 @@ // ParameterSet.cc: Implements a map of Key-Value pairs. // -// Copyright (C) 2002-2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ParameterSetImpl.cc 23459 2013-01-08 08:49:52Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // Always #include <lofar_config.h> first! #include "ParameterSetImpl.h" diff --git a/Common/ParameterSetImpl.h b/Common/ParameterSetImpl.h index 7110fb6b7..411926994 100644 --- a/Common/ParameterSetImpl.h +++ b/Common/ParameterSetImpl.h @@ -1,24 +1,7 @@ // ParameterSetImpl.h: Implements a map of Key-Value pairs. // -// Copyright (C) 2002-2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ParameterSetImpl.h 23459 2013-01-08 08:49:52Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_COMMON_PARAMETERSETIMPL_H #define LOFAR_COMMON_PARAMETERSETIMPL_H diff --git a/Common/ParameterValue.cc b/Common/ParameterValue.cc index b3524fb11..b537d4e03 100644 --- a/Common/ParameterValue.cc +++ b/Common/ParameterValue.cc @@ -1,24 +1,7 @@ // ParameterValue.h: The value of a parameter // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ParameterValue.cc 31197 2015-03-13 10:46:34Z amesfoort $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "ParameterValue.h" #include "ParameterRecord.h" diff --git a/Common/ParameterValue.h b/Common/ParameterValue.h index 1cfacb8f8..e5648b8a8 100644 --- a/Common/ParameterValue.h +++ b/Common/ParameterValue.h @@ -1,22 +1,7 @@ // ParameterValue.h: The value of a parameter // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_COMMON_PARAMETERVALUE_H #define LOFAR_COMMON_PARAMETERVALUE_H diff --git a/Common/PrettyUnits.cc b/Common/PrettyUnits.cc index e90d59d98..ad9329dbe 100644 --- a/Common/PrettyUnits.cc +++ b/Common/PrettyUnits.cc @@ -1,24 +1,7 @@ // PrettyUnits.cc - Print units in a human-readable way // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: PrettyUnits.cc 14057 2009-09-18 12:26:29Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // Always #include <lofar_config.h> first! diff --git a/Common/PrettyUnits.h b/Common/PrettyUnits.h index 90f7016ea..78e421de4 100644 --- a/Common/PrettyUnits.h +++ b/Common/PrettyUnits.h @@ -1,22 +1,7 @@ // PrettyUnits.h - Print units in a human-readable way // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_COMMON_PRETTY_UNITS_H #define LOFAR_COMMON_PRETTY_UNITS_H diff --git a/Common/Singleton.h b/Common/Singleton.h index ee0337dbe..05c820057 100644 --- a/Common/Singleton.h +++ b/Common/Singleton.h @@ -1,22 +1,7 @@ // Singleton.h: Implementation of a Meyers singleton class. // -// Copyright (C) 2002-2004 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_COMMON_SINGLETON_H #define LOFAR_COMMON_SINGLETON_H diff --git a/Common/StreamUtil.h b/Common/StreamUtil.h index cdb975f17..2f907dde5 100644 --- a/Common/StreamUtil.h +++ b/Common/StreamUtil.h @@ -1,22 +1,7 @@ // StreamUtil.h: useful stream manipulation methods. // -// Copyright (C) 2002-2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_COMMON_STREAMUTILX_H #define LOFAR_COMMON_STREAMUTILX_H diff --git a/Common/StringUtil.cc b/Common/StringUtil.cc index 81bd1e232..c71ada6a9 100644 --- a/Common/StringUtil.cc +++ b/Common/StringUtil.cc @@ -1,24 +1,7 @@ // StringUtil.cc: implementation of the string utilities class. // -// Copyright (C) 2002-2005 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: StringUtil.cc 38197 2017-08-22 18:33:52Z offringa $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // Always #include <lofar_config.h> first! #include "StringUtil.h" diff --git a/Common/StringUtil.h b/Common/StringUtil.h index 4e34ae5aa..5f682a80f 100644 --- a/Common/StringUtil.h +++ b/Common/StringUtil.h @@ -1,22 +1,7 @@ // StringUtil.h: useful string manipulation methods. // -// Copyright (C) 2002-2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_COMMON_STRINGUTIL_H #define LOFAR_COMMON_STRINGUTIL_H diff --git a/Common/Timer.cc b/Common/Timer.cc index 6c19faaff..35f7df6ba 100644 --- a/Common/Timer.cc +++ b/Common/Timer.cc @@ -1,24 +1,7 @@ // Timer.cc: Accurate timer // -// Copyright (C) 2004 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: Timer.cc 31468 2015-04-13 23:26:52Z amesfoort $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include <cstdlib> #include <cstring> diff --git a/Common/Timer.h b/Common/Timer.h index 48680738a..5a6f583bf 100644 --- a/Common/Timer.h +++ b/Common/Timer.h @@ -1,22 +1,7 @@ // Timer.h: Accurate timer // -// Copyright (C) 2004 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_COMMON_TIMER_H #define LOFAR_COMMON_TIMER_H diff --git a/Common/TypeNames.cc b/Common/TypeNames.cc index eb827f26c..58c5c3d90 100644 --- a/Common/TypeNames.cc +++ b/Common/TypeNames.cc @@ -1,24 +1,7 @@ // TypeNames.cc: Return a string giving the type name to be stored in blobs // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: TypeNames.cc 14057 2009-09-18 12:26:29Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // Always #include <lofar_config.h> first! diff --git a/Common/TypeNames.h b/Common/TypeNames.h index 3ac27a296..7bb908b64 100644 --- a/Common/TypeNames.h +++ b/Common/TypeNames.h @@ -1,22 +1,7 @@ // TypeNames.h: Return a string giving the type name to be stored in blobs // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_COMMON_TYPENAMES_H #define LOFAR_COMMON_TYPENAMES_H diff --git a/Common/TypeNames.tcc b/Common/TypeNames.tcc index 51613209a..e20be7921 100644 --- a/Common/TypeNames.tcc +++ b/Common/TypeNames.tcc @@ -1,24 +1,8 @@ // TypeNames.tcc: Return a string giving the type name to be stored in blobs // -// Copyright (C) 2003 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: TypeNames.tcc 14057 2009-09-18 12:26:29Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later + #ifndef COMMON_TYPENAMES_TCC diff --git a/Common/Types.h b/Common/Types.h index 64cd29997..e010dab33 100644 --- a/Common/Types.h +++ b/Common/Types.h @@ -1,21 +1,6 @@ // Types.h: Define common types. -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Define common types. diff --git a/Common/VdsDesc.cc b/Common/VdsDesc.cc index 8364b0f76..ce5c667d1 100644 --- a/Common/VdsDesc.cc +++ b/Common/VdsDesc.cc @@ -1,24 +1,7 @@ // VdsDesc.cc: Describe an entire visibility data set // -// Copyright (C) 2007 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: VdsDesc.cc 16886 2010-12-08 10:43:17Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen <diepen AT astron nl> diff --git a/Common/VdsDesc.h b/Common/VdsDesc.h index c926e0ef3..d5836ffff 100644 --- a/Common/VdsDesc.h +++ b/Common/VdsDesc.h @@ -1,22 +1,7 @@ // VdsDesc.h: Describe an entire visibility data set // -// Copyright (C) 2005 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Describe an entire visibility data set diff --git a/Common/VdsMaker.cc b/Common/VdsMaker.cc index 2df8602bc..e8bd75760 100644 --- a/Common/VdsMaker.cc +++ b/Common/VdsMaker.cc @@ -1,24 +1,7 @@ // VdsMaker.cc: Class to create the description of an MS // -// Copyright (C) 2005 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: VdsMaker.cc 19275 2011-11-16 08:03:59Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "VdsMaker.h" #include "VdsDesc.h" diff --git a/Common/VdsMaker.h b/Common/VdsMaker.h index e79ede7a2..6ebf1ca6b 100644 --- a/Common/VdsMaker.h +++ b/Common/VdsMaker.h @@ -1,22 +1,7 @@ // VdsMaker.h: Class to create the description of an MS // -// Copyright (C) 2005 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// Class to create the description of an MS diff --git a/Common/VdsPartDesc.cc b/Common/VdsPartDesc.cc index 89cf4ecfa..8105c7e43 100644 --- a/Common/VdsPartDesc.cc +++ b/Common/VdsPartDesc.cc @@ -1,24 +1,7 @@ // VdsPartDesc.cc: Description of a visibility data set or part thereof // -// Copyright (C) 2007 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: VdsPartDesc.cc 16886 2010-12-08 10:43:17Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen <diepen AT astron nl> diff --git a/Common/VdsPartDesc.h b/Common/VdsPartDesc.h index d25ca016e..3839617db 100644 --- a/Common/VdsPartDesc.h +++ b/Common/VdsPartDesc.h @@ -1,22 +1,7 @@ // VdsPartDesc.h: Description of a visibility data set or part thereof // -// Copyright (C) 2005 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Description of a visibility data set or part thereof. diff --git a/Common/buffered_lane.h b/Common/buffered_lane.h index bdbcd99be..229b5b755 100644 --- a/Common/buffered_lane.h +++ b/Common/buffered_lane.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef BUFFER_LANE_H #define BUFFER_LANE_H diff --git a/Common/test/unit/tMemory.cc b/Common/test/unit/tMemory.cc index c6325561a..a6c178df3 100644 --- a/Common/test/unit/tMemory.cc +++ b/Common/test/unit/tMemory.cc @@ -1,3 +1,6 @@ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later + #include "../../Memory.h" #include <boost/test/unit_test.hpp> diff --git a/DDECal/Constraint.cc b/DDECal/Constraint.cc index 102e531fe..400cfe265 100644 --- a/DDECal/Constraint.cc +++ b/DDECal/Constraint.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "Constraint.h" diff --git a/DDECal/Constraint.h b/DDECal/Constraint.h index 28de49bc5..68fde93bc 100644 --- a/DDECal/Constraint.h +++ b/DDECal/Constraint.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef CONSTRAINT_H #define CONSTRAINT_H diff --git a/DDECal/DDECal.cc b/DDECal/DDECal.cc index 16bec4b5d..95d9385ec 100644 --- a/DDECal/DDECal.cc +++ b/DDECal/DDECal.cc @@ -1,23 +1,6 @@ // DDECal.cc: DPPP step class to do a direction dependent gain calibration -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: DDECal.cc 21598 2012-07-16 08:07:34Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Tammo Jan Dijkema & André Offringa diff --git a/DDECal/DDECal.h b/DDECal/DDECal.h index a4160dc6c..584e8a6ee 100644 --- a/DDECal/DDECal.h +++ b/DDECal/DDECal.h @@ -1,21 +1,6 @@ // DDE.h: DPPP step class to calibrate direction dependent gains -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to apply a calibration correction to the data. diff --git a/DDECal/KLFitter.cc b/DDECal/KLFitter.cc index f6cec9732..c36ab5e68 100644 --- a/DDECal/KLFitter.cc +++ b/DDECal/KLFitter.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "KLFitter.h" diff --git a/DDECal/KLFitter.h b/DDECal/KLFitter.h index 97a6251cb..52c92c28e 100644 --- a/DDECal/KLFitter.h +++ b/DDECal/KLFitter.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef KLFITTER_H #define KLFITTER_H diff --git a/DDECal/KernelSmoother.h b/DDECal/KernelSmoother.h index 0f5705f77..3d02da2c5 100644 --- a/DDECal/KernelSmoother.h +++ b/DDECal/KernelSmoother.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef KERNEL_SMOOTHER_H #define KERNEL_SMOOTHER_H diff --git a/DDECal/MultiDirBuffer.h b/DDECal/MultiDirBuffer.h index fcf97d1bb..733075c36 100644 --- a/DDECal/MultiDirBuffer.h +++ b/DDECal/MultiDirBuffer.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef MULTI_DIR_BUFFER_H #define MULTI_DIR_BUFFER_H diff --git a/DDECal/MultiDirSolver.cc b/DDECal/MultiDirSolver.cc index 1960278c3..42d7202b1 100644 --- a/DDECal/MultiDirSolver.cc +++ b/DDECal/MultiDirSolver.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "MultiDirSolver.h" #include "QRSolver.h" diff --git a/DDECal/MultiDirSolver.h b/DDECal/MultiDirSolver.h index 90726645a..198d218a0 100644 --- a/DDECal/MultiDirSolver.h +++ b/DDECal/MultiDirSolver.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef MULTI_DIR_SOLVER_H #define MULTI_DIR_SOLVER_H diff --git a/DDECal/PieceWisePhaseFitter.h b/DDECal/PieceWisePhaseFitter.h index 3f95efe53..1e23fab0c 100644 --- a/DDECal/PieceWisePhaseFitter.h +++ b/DDECal/PieceWisePhaseFitter.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef PIECE_WISE_PHASE_FITTER_H #define PIECE_WISE_PHASE_FITTER_H diff --git a/DDECal/PiercePoint.cc b/DDECal/PiercePoint.cc index a98e7bfba..63260ba79 100644 --- a/DDECal/PiercePoint.cc +++ b/DDECal/PiercePoint.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "PiercePoint.h" diff --git a/DDECal/PiercePoint.h b/DDECal/PiercePoint.h index 5a6b7b75f..91d63d6f6 100644 --- a/DDECal/PiercePoint.h +++ b/DDECal/PiercePoint.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef PIERCEPOINT_H #define PIERCEPOINT_H diff --git a/DDECal/QRSolver.h b/DDECal/QRSolver.h index eabb4d49b..930d657e4 100644 --- a/DDECal/QRSolver.h +++ b/DDECal/QRSolver.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef QR_SOLVER_H #define QR_SOLVER_H diff --git a/DDECal/Register.cc b/DDECal/Register.cc index c0f2f183e..fbb05631d 100644 --- a/DDECal/Register.cc +++ b/DDECal/Register.cc @@ -1,23 +1,6 @@ // Register.cc: Register steps in DPPP -// Copyright (C) 2015 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: AOFlaggerStep.cc 31423 2015-04-03 14:06:21Z dijkema $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DDECal/Register.h b/DDECal/Register.h index fc995cf59..4e61454e0 100644 --- a/DDECal/Register.h +++ b/DDECal/Register.h @@ -1,21 +1,6 @@ // Register.h: Register AOFlag steps in DPPP -// Copyright (C) 2015 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Register AOFlag steps in DPPP diff --git a/DDECal/RotationAndDiagonalConstraint.cc b/DDECal/RotationAndDiagonalConstraint.cc index 4d0ff16b8..604dd09ef 100644 --- a/DDECal/RotationAndDiagonalConstraint.cc +++ b/DDECal/RotationAndDiagonalConstraint.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "RotationAndDiagonalConstraint.h" #include "RotationConstraint.h" diff --git a/DDECal/RotationAndDiagonalConstraint.h b/DDECal/RotationAndDiagonalConstraint.h index 3bcc0a27d..9fd1ebf05 100644 --- a/DDECal/RotationAndDiagonalConstraint.h +++ b/DDECal/RotationAndDiagonalConstraint.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef ROTATIONANDDIAGONAL_CONSTRAINT_H #define ROTATIONANDDIAGONAL_CONSTRAINT_H diff --git a/DDECal/RotationConstraint.cc b/DDECal/RotationConstraint.cc index 2b997a9e8..51c112824 100644 --- a/DDECal/RotationConstraint.cc +++ b/DDECal/RotationConstraint.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "RotationConstraint.h" diff --git a/DDECal/RotationConstraint.h b/DDECal/RotationConstraint.h index de840264a..6d1b7333d 100644 --- a/DDECal/RotationConstraint.h +++ b/DDECal/RotationConstraint.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef ROTATION_CONSTRAINT_H #define ROTATION_CONSTRAINT_H diff --git a/DDECal/ScreenConstraint.cc b/DDECal/ScreenConstraint.cc index e938b4e57..06afd6be4 100644 --- a/DDECal/ScreenConstraint.cc +++ b/DDECal/ScreenConstraint.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "ScreenConstraint.h" diff --git a/DDECal/ScreenConstraint.h b/DDECal/ScreenConstraint.h index 3c52ef379..125cd0ec6 100644 --- a/DDECal/ScreenConstraint.h +++ b/DDECal/ScreenConstraint.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef SCREEN_CONSTRAINT_H #define SCREEN_CONSTRAINT_H diff --git a/DDECal/SmoothnessConstraint.cc b/DDECal/SmoothnessConstraint.cc index c9590f1f2..677c8c1b7 100644 --- a/DDECal/SmoothnessConstraint.cc +++ b/DDECal/SmoothnessConstraint.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "KernelSmoother.h" #include "SmoothnessConstraint.h" diff --git a/DDECal/SmoothnessConstraint.h b/DDECal/SmoothnessConstraint.h index 4528c5977..9573916f0 100644 --- a/DDECal/SmoothnessConstraint.h +++ b/DDECal/SmoothnessConstraint.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "Constraint.h" #include "KernelSmoother.h" diff --git a/DDECal/Stopwatch.cc b/DDECal/Stopwatch.cc index c3b111256..e91766b94 100644 --- a/DDECal/Stopwatch.cc +++ b/DDECal/Stopwatch.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "Stopwatch.h" diff --git a/DDECal/Stopwatch.h b/DDECal/Stopwatch.h index 772854fa1..2ad4e97c6 100644 --- a/DDECal/Stopwatch.h +++ b/DDECal/Stopwatch.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef STOPWATCH_H #define STOPWATCH_H diff --git a/DDECal/TECConstraint.cc b/DDECal/TECConstraint.cc index f8bb8551c..493d7a3d9 100644 --- a/DDECal/TECConstraint.cc +++ b/DDECal/TECConstraint.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "TECConstraint.h" diff --git a/DDECal/TECConstraint.h b/DDECal/TECConstraint.h index 09af9a7b7..8b5e8598d 100644 --- a/DDECal/TECConstraint.h +++ b/DDECal/TECConstraint.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef TEC_CONSTRAINT_H #define TEC_CONSTRAINT_H diff --git a/DDECal/screenfitter.cc b/DDECal/screenfitter.cc index a80c443d5..8ce8a2256 100644 --- a/DDECal/screenfitter.cc +++ b/DDECal/screenfitter.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include <DPPP/screenfitter.h> diff --git a/DDECal/screenfitter.h b/DDECal/screenfitter.h index 9c8fcd1a3..7f13120a3 100644 --- a/DDECal/screenfitter.h +++ b/DDECal/screenfitter.h @@ -1,21 +1,6 @@ // screenfitter.h: Class to perform screen fitting -// Copyright (C) 2016 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /** * @file screenfitter.h Implements TEC model screen filter @ref ScreenFitter. diff --git a/DDECal/test/integration/CMakeLists.txt b/DDECal/test/integration/CMakeLists.txt index 2734d38f5..4b3aa73c0 100644 --- a/DDECal/test/integration/CMakeLists.txt +++ b/DDECal/test/integration/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + configure_file(testInit.sh.in testInit.sh) # The 'source' symbolic link simplifies running the tests manually inside diff --git a/DDECal/test/integration/tDDECal.sh b/DDECal/test/integration/tDDECal.sh index 2054718fd..4bbfe739a 100755 --- a/DDECal/test/integration/tDDECal.sh +++ b/DDECal/test/integration/tDDECal.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + set -e # Locate the executables and srcdir (script created by cmake's configure_file). diff --git a/DDECal/test/integration/tIDGPredict.sh b/DDECal/test/integration/tIDGPredict.sh index 9ad10015d..6ec01dd77 100755 --- a/DDECal/test/integration/tIDGPredict.sh +++ b/DDECal/test/integration/tIDGPredict.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + set -e # Locate the executables and srcdir (script created by cmake's configure_file). diff --git a/DDECal/test/integration/tIDGPredict_ref.py b/DDECal/test/integration/tIDGPredict_ref.py index 376f38dbc..523b2be36 100755 --- a/DDECal/test/integration/tIDGPredict_ref.py +++ b/DDECal/test/integration/tIDGPredict_ref.py @@ -1,4 +1,8 @@ #!/usr/bin/env python3 + +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + from astropy.io import fits from astropy.wcs import WCS import os diff --git a/DDECal/test/unit/tRotationConstraint.cc b/DDECal/test/unit/tRotationConstraint.cc index b097b3beb..ab29a4c04 100644 --- a/DDECal/test/unit/tRotationConstraint.cc +++ b/DDECal/test/unit/tRotationConstraint.cc @@ -1,3 +1,6 @@ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later + #include <casacore/casa/BasicMath/Math.h> // near #include <vector> diff --git a/DPPP/Apply.cc b/DPPP/Apply.cc index 80b3ace0f..d7be1bfb9 100644 --- a/DPPP/Apply.cc +++ b/DPPP/Apply.cc @@ -1,22 +1,7 @@ // Apply.cc: Apply station Jones matrices to a set of visibilities. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // $Id$ diff --git a/DPPP/Apply.h b/DPPP/Apply.h index 23cce8873..ba04ec540 100644 --- a/DPPP/Apply.h +++ b/DPPP/Apply.h @@ -1,22 +1,7 @@ // Apply.h: Apply station Jones matrices to a set of visibilities. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef DPPP_APPLY_H #define DPPP_APPLY_H diff --git a/DPPP/ApplyBeam.cc b/DPPP/ApplyBeam.cc index 6f240b0a7..f73de20f3 100644 --- a/DPPP/ApplyBeam.cc +++ b/DPPP/ApplyBeam.cc @@ -1,23 +1,6 @@ // ApplyBeam.cc: DPPP step class to ApplyBeam visibilities -// Copyright (C) 2015 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: GainCal.cc 21598 2012-07-16 08:07:34Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Tammo Jan Dijkema diff --git a/DPPP/ApplyBeam.h b/DPPP/ApplyBeam.h index 4b1399c3b..2f80ea887 100644 --- a/DPPP/ApplyBeam.h +++ b/DPPP/ApplyBeam.h @@ -1,21 +1,6 @@ // ApplyBeam.h: DPPP step class to ApplyBeam visibilities from a source model -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to apply the beam model (optionally inverted) diff --git a/DPPP/ApplyCal.cc b/DPPP/ApplyCal.cc index 63966f476..eca9d8b13 100644 --- a/DPPP/ApplyCal.cc +++ b/DPPP/ApplyCal.cc @@ -1,23 +1,6 @@ // GainCal.cc: DPPP step class to ApplyCal visibilities -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: GainCal.cc 21598 2012-07-16 08:07:34Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Tammo Jan Dijkema diff --git a/DPPP/ApplyCal.h b/DPPP/ApplyCal.h index 899a58d13..0f293132d 100644 --- a/DPPP/ApplyCal.h +++ b/DPPP/ApplyCal.h @@ -1,21 +1,6 @@ // ApplyCal.h: DPPP step class to ApplyCal visibilities from a source model -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to apply multiple calibration solutions diff --git a/DPPP/Averager.cc b/DPPP/Averager.cc index 9e06adfea..d1f5c55d1 100644 --- a/DPPP/Averager.cc +++ b/DPPP/Averager.cc @@ -1,23 +1,6 @@ // Averager.cc: DPPP step class to average in time and/or freq -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/Averager.h b/DPPP/Averager.h index bb29eff89..c454977be 100644 --- a/DPPP/Averager.h +++ b/DPPP/Averager.h @@ -1,21 +1,6 @@ // Averager.h: DPPP step class to average in time and/or freq -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to average in time and/or freq diff --git a/DPPP/BDAAverager.cc b/DPPP/BDAAverager.cc index 53b317566..74555726b 100644 --- a/DPPP/BDAAverager.cc +++ b/DPPP/BDAAverager.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "BDAAverager.h" diff --git a/DPPP/BDAAverager.h b/DPPP/BDAAverager.h index 0f2c97bfc..605fe68cb 100644 --- a/DPPP/BDAAverager.h +++ b/DPPP/BDAAverager.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Step for compressing regular data into BDA data. diff --git a/DPPP/BDABuffer.cc b/DPPP/BDABuffer.cc index 878480854..5fbdc66a8 100644 --- a/DPPP/BDABuffer.cc +++ b/DPPP/BDABuffer.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "BDABuffer.h" diff --git a/DPPP/BDABuffer.h b/DPPP/BDABuffer.h index d95f1f587..2e9ec35eb 100644 --- a/DPPP/BDABuffer.h +++ b/DPPP/BDABuffer.h @@ -1,21 +1,6 @@ // BDABuffer.h: Buffer holding BDA data -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Buffer holding base dependent averaged (BDA) data. diff --git a/DPPP/BDAIntervalBuffer.cc b/DPPP/BDAIntervalBuffer.cc index 2ce03093d..61ab77463 100644 --- a/DPPP/BDAIntervalBuffer.cc +++ b/DPPP/BDAIntervalBuffer.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "BDAIntervalBuffer.h" diff --git a/DPPP/BDAIntervalBuffer.h b/DPPP/BDAIntervalBuffer.h index 4f905cc8c..67b882ac5 100644 --- a/DPPP/BDAIntervalBuffer.h +++ b/DPPP/BDAIntervalBuffer.h @@ -1,21 +1,6 @@ // BDAIntervalBuffer.h: Provide BDA data for time intervals. -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Provide BDA data for time intervals. diff --git a/DPPP/Baseline.h b/DPPP/Baseline.h index 3013d4c84..48b927c57 100644 --- a/DPPP/Baseline.h +++ b/DPPP/Baseline.h @@ -1,22 +1,7 @@ // Baseline.h: Pair of stations that together form a baseline (interferometer). // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// \file /// \brief Pair of stations that together form a baseline (interferometer). diff --git a/DPPP/BaselineSelection.cc b/DPPP/BaselineSelection.cc index 4e58bbde5..3e8002e4c 100644 --- a/DPPP/BaselineSelection.cc +++ b/DPPP/BaselineSelection.cc @@ -1,23 +1,6 @@ // BaselineSelection.cc: Class to handle the baseline selection -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/BaselineSelection.h b/DPPP/BaselineSelection.h index 8f9327994..6c1f9e27c 100644 --- a/DPPP/BaselineSelection.h +++ b/DPPP/BaselineSelection.h @@ -1,21 +1,6 @@ // BaselineSelection.h: Class to handle the baseline selection -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Class to handle the baseline selection diff --git a/DPPP/CMakeLists.txt b/DPPP/CMakeLists.txt index b3183c721..629753a68 100644 --- a/DPPP/CMakeLists.txt +++ b/DPPP/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + include(PythonInstall) add_executable(DPPP DPPP.cc diff --git a/DPPP/ColumnReader.cc b/DPPP/ColumnReader.cc index e55e6980b..cf9a7f031 100644 --- a/DPPP/ColumnReader.cc +++ b/DPPP/ColumnReader.cc @@ -1,19 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "ColumnReader.h" diff --git a/DPPP/ColumnReader.h b/DPPP/ColumnReader.h index b2fbcb0d0..7f5952ae0 100644 --- a/DPPP/ColumnReader.h +++ b/DPPP/ColumnReader.h @@ -1,19 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Step to read a column from the measurement set and overwrite the diff --git a/DPPP/Counter.cc b/DPPP/Counter.cc index 4a85279be..4df8ccdc5 100644 --- a/DPPP/Counter.cc +++ b/DPPP/Counter.cc @@ -1,23 +1,6 @@ // Counter.cc: DPPP step class to count flags -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/Counter.h b/DPPP/Counter.h index 4ad968f32..2a4b29fc8 100644 --- a/DPPP/Counter.h +++ b/DPPP/Counter.h @@ -1,21 +1,6 @@ // Counter.h: DPPP step class to count flags -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to count flags diff --git a/DPPP/Cursor.h b/DPPP/Cursor.h index 0cfc722c3..73d43194e 100644 --- a/DPPP/Cursor.h +++ b/DPPP/Cursor.h @@ -1,22 +1,7 @@ // Cursor.h: Multi-dimensional iterators. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef DPPP_CURSOR_H #define DPPP_CURSOR_H diff --git a/DPPP/CursorUtilCasa.h b/DPPP/CursorUtilCasa.h index 19d677bb9..eec811dbf 100644 --- a/DPPP/CursorUtilCasa.h +++ b/DPPP/CursorUtilCasa.h @@ -1,22 +1,7 @@ // CursorUtilCasa.h: Helper functions for creating cursors for CASA arrays. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// \file /// \brief Helper functions for creating cursors for CASA arrays. diff --git a/DPPP/DPBuffer.cc b/DPPP/DPBuffer.cc index 08c1ccc19..88f0452c6 100644 --- a/DPPP/DPBuffer.cc +++ b/DPPP/DPBuffer.cc @@ -1,23 +1,6 @@ // DPBuffer.cc: Buffer holding the data of a timeslot/band -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/DPBuffer.h b/DPPP/DPBuffer.h index 2c7dd1ed5..4dc9d7f4c 100644 --- a/DPPP/DPBuffer.h +++ b/DPPP/DPBuffer.h @@ -1,21 +1,6 @@ // DPBuffer.h: Buffer holding the data of a timeslot/band -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Buffer holding the data of a timeslot/band diff --git a/DPPP/DPInfo.cc b/DPPP/DPInfo.cc index 611505ce1..e6167390e 100644 --- a/DPPP/DPInfo.cc +++ b/DPPP/DPInfo.cc @@ -1,23 +1,6 @@ // DPInfo.cc: General info about DPPP data processing attributes like averaging -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/DPInfo.h b/DPPP/DPInfo.h index bb57ac0d3..d12375624 100644 --- a/DPPP/DPInfo.h +++ b/DPPP/DPInfo.h @@ -1,21 +1,6 @@ // DPInfo.h: General info about DPPP data processing attributes like averaging -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief General info about DPPP data processing attributes like averaging diff --git a/DPPP/DPInput.cc b/DPPP/DPInput.cc index 94a36ef1d..731c7c156 100644 --- a/DPPP/DPInput.cc +++ b/DPPP/DPInput.cc @@ -1,23 +1,6 @@ // DPInput.cc: Abstract base class for a DPStep generating input -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/DPInput.h b/DPPP/DPInput.h index 472f31ac8..63602a655 100644 --- a/DPPP/DPInput.h +++ b/DPPP/DPInput.h @@ -1,21 +1,6 @@ // DPInput.h: Abstract base class for a DPStep generating input -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Abstract base class for a DPStep generating input diff --git a/DPPP/DPLogger.cc b/DPPP/DPLogger.cc index 3790f85cd..30fc03848 100644 --- a/DPPP/DPLogger.cc +++ b/DPPP/DPLogger.cc @@ -1,23 +1,6 @@ // DPLogger.cc: Log on cout/cerr or through the logging system -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/DPLogger.h b/DPPP/DPLogger.h index 35cd326c7..3639e6a46 100644 --- a/DPPP/DPLogger.h +++ b/DPPP/DPLogger.h @@ -1,21 +1,6 @@ // DPLogger.h: Log on cout/cerr or through the logging system -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Log on cout/cerr or through the logging system diff --git a/DPPP/DPPP.cc b/DPPP/DPPP.cc index e4c588ac1..2df0273a3 100644 --- a/DPPP/DPPP.cc +++ b/DPPP/DPPP.cc @@ -1,23 +1,6 @@ // DPPP.cc: Program to execute steps like averaging and flagging on an MS -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/DPRun.cc b/DPPP/DPRun.cc index 9dd6507ef..ea554c401 100644 --- a/DPPP/DPRun.cc +++ b/DPPP/DPRun.cc @@ -1,23 +1,6 @@ // DPRun.cc: Class to run steps like averaging and flagging on an MS -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/DPRun.h b/DPPP/DPRun.h index 4f2b691b7..d6b4cee59 100644 --- a/DPPP/DPRun.h +++ b/DPPP/DPRun.h @@ -1,21 +1,6 @@ // DPRun.h: Class to run steps like averaging and flagging on an MS -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Class to run steps like averaging and flagging on an MS diff --git a/DPPP/DPStep.cc b/DPPP/DPStep.cc index d1ca9e73c..acfb438c6 100644 --- a/DPPP/DPStep.cc +++ b/DPPP/DPStep.cc @@ -1,23 +1,6 @@ // DPStep.cc: Abstract base class for a DPPP step -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/DPStep.h b/DPPP/DPStep.h index 91d34abe4..73caa0bc0 100644 --- a/DPPP/DPStep.h +++ b/DPPP/DPStep.h @@ -1,21 +1,6 @@ // DPStep.h: Abstract base class for a DPPP step -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Class to hold code for virtual base class for Flaggers in DPPP diff --git a/DPPP/DemixInfo.cc b/DPPP/DemixInfo.cc index a170de9ed..a8c315344 100644 --- a/DPPP/DemixInfo.cc +++ b/DPPP/DemixInfo.cc @@ -1,23 +1,6 @@ // DemixInfo.cc: Struct to hold the common demix variables -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: Demixer.h 23223 2012-12-07 14:09:42Z schoenmakers $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/DemixInfo.h b/DPPP/DemixInfo.h index 954732900..3f00b0442 100644 --- a/DPPP/DemixInfo.h +++ b/DPPP/DemixInfo.h @@ -1,21 +1,6 @@ // DemixInfo.h: DPPP struct to hold the common demix variables -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP struct to hold the common demix variables diff --git a/DPPP/DemixWorker.cc b/DPPP/DemixWorker.cc index f2ae11d2c..2ead58a91 100644 --- a/DPPP/DemixWorker.cc +++ b/DPPP/DemixWorker.cc @@ -1,23 +1,6 @@ // DemixerWorker.cc: Demixing helper class to demix a time chunk -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: Demixer.cc 24221 2013-03-12 12:24:48Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/DemixWorker.h b/DPPP/DemixWorker.h index 4b11f2ad2..e4c375f93 100644 --- a/DPPP/DemixWorker.h +++ b/DPPP/DemixWorker.h @@ -1,21 +1,6 @@ // DemixWorker.h: Demixer helper class processing a time chunk -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to average in time and/or freq diff --git a/DPPP/Demixer.cc b/DPPP/Demixer.cc index d6f033090..6548fed60 100644 --- a/DPPP/Demixer.cc +++ b/DPPP/Demixer.cc @@ -1,23 +1,6 @@ // Demixer.cc: DPPP step class to subtract A-team sources -// Copyright (C) 2011 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/Demixer.h b/DPPP/Demixer.h index f13c22dae..8285398a1 100644 --- a/DPPP/Demixer.h +++ b/DPPP/Demixer.h @@ -1,21 +1,6 @@ // Demixer.h: DPPP step class to subtract A-team sources -// Copyright (C) 2011 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to average in time and/or freq diff --git a/DPPP/DemixerNew.cc b/DPPP/DemixerNew.cc index f36d40b8c..bebd21b5b 100644 --- a/DPPP/DemixerNew.cc +++ b/DPPP/DemixerNew.cc @@ -1,23 +1,6 @@ // DemixerNew.cc: DPPP step class to subtract A-team sources in adaptive way -// Copyright (C) 2011 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: DemixerNew.cc 24221 2013-03-12 12:24:48Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/DemixerNew.h b/DPPP/DemixerNew.h index c1873658b..5c90501ba 100644 --- a/DPPP/DemixerNew.h +++ b/DPPP/DemixerNew.h @@ -1,21 +1,6 @@ // DemixerNew.h: DPPP step class to subtract A-team sources in adaptive way -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to subtract A-team sources in adaptive way diff --git a/DPPP/DummyStep.cc b/DPPP/DummyStep.cc index 7dbb7aaac..7f24669b7 100644 --- a/DPPP/DummyStep.cc +++ b/DPPP/DummyStep.cc @@ -1,23 +1,6 @@ // GainCal.cc: DPPP step class to DummyStep visibilities -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: GainCal.cc 21598 2012-07-16 08:07:34Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Tammo Jan Dijkema diff --git a/DPPP/DummyStep.h b/DPPP/DummyStep.h index f0e376c28..f1dd5d6d0 100644 --- a/DPPP/DummyStep.h +++ b/DPPP/DummyStep.h @@ -1,21 +1,6 @@ // DummyStep.h: DPPP step class to DummyStep visibilities from a source model -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to DummyStep visibilities from a source model diff --git a/DPPP/EstimateMixed.cc b/DPPP/EstimateMixed.cc index 256cc4cf7..28f0dfcde 100644 --- a/DPPP/EstimateMixed.cc +++ b/DPPP/EstimateMixed.cc @@ -3,23 +3,8 @@ // mixing coefficients quantify the influence of each direction on each of the // other directions (including time and frequency smearing). // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // $Id$ diff --git a/DPPP/EstimateMixed.h b/DPPP/EstimateMixed.h index 9227f2d0d..a8439ddc9 100644 --- a/DPPP/EstimateMixed.h +++ b/DPPP/EstimateMixed.h @@ -3,23 +3,8 @@ // mixing coefficients quantify the influence of each direction on each of the // other directions (including time and frequency smearing). // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// \file /// Estimate Jones matrices for several directions simultaneously. A separate diff --git a/DPPP/EstimateNew.cc b/DPPP/EstimateNew.cc index 4181885a2..2055261ab 100644 --- a/DPPP/EstimateNew.cc +++ b/DPPP/EstimateNew.cc @@ -1,22 +1,7 @@ // EstimateNew.cc: Estimate Jones matrices for several directions and stations // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // $Id$ diff --git a/DPPP/EstimateNew.h b/DPPP/EstimateNew.h index baf57829a..a99577eba 100644 --- a/DPPP/EstimateNew.h +++ b/DPPP/EstimateNew.h @@ -1,22 +1,7 @@ // EstimateNew.h: Estimate Jones matrices for several directions and stations // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef DPPP_ESTIMATENEW_H #define DPPP_ESTIMATENEW_H diff --git a/DPPP/Exceptions.h b/DPPP/Exceptions.h index 2ee16be79..ae79b9ec6 100644 --- a/DPPP/Exceptions.h +++ b/DPPP/Exceptions.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef DPPP_EXCEPTION_H #define DPPP_EXCEPTION_H diff --git a/DPPP/Filter.cc b/DPPP/Filter.cc index 1521db51d..b1d23aaa8 100644 --- a/DPPP/Filter.cc +++ b/DPPP/Filter.cc @@ -1,23 +1,6 @@ // Filter.cc: DPPP step to filter out baselines and channels -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/Filter.h b/DPPP/Filter.h index 555884610..a263a604e 100644 --- a/DPPP/Filter.h +++ b/DPPP/Filter.h @@ -1,21 +1,6 @@ // Filter.h: DPPP step to filter out baselines and channels -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step to filter out baselines and channels diff --git a/DPPP/FlagCounter.cc b/DPPP/FlagCounter.cc index 26eb8415a..0ac2491a4 100644 --- a/DPPP/FlagCounter.cc +++ b/DPPP/FlagCounter.cc @@ -1,23 +1,6 @@ // FlagCounter.cc: Class to keep counts of nr of flagged visibilities -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/FlagCounter.h b/DPPP/FlagCounter.h index 3dd34fb8b..806c2f589 100644 --- a/DPPP/FlagCounter.h +++ b/DPPP/FlagCounter.h @@ -1,21 +1,6 @@ // FlagCounter.h: Class to keep counts of nr of flagged points -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Class to keep counts of nr of flagged points diff --git a/DPPP/GainCal.cc b/DPPP/GainCal.cc index a4a57ea91..63fe643b0 100644 --- a/DPPP/GainCal.cc +++ b/DPPP/GainCal.cc @@ -1,23 +1,6 @@ // GainCal.cc: DPPP step class to do a gain calibration -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: GainCal.cc 21598 2012-07-16 08:07:34Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Tammo Jan Dijkema diff --git a/DPPP/GainCal.h b/DPPP/GainCal.h index a42e64213..8a021b595 100644 --- a/DPPP/GainCal.h +++ b/DPPP/GainCal.h @@ -1,21 +1,6 @@ // GainCal.h: DPPP step class to calibrate (direction independent) gains -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to apply a calibration correction to the data diff --git a/DPPP/GainCalAlgorithm.cc b/DPPP/GainCalAlgorithm.cc index 870f47a72..4207405bf 100644 --- a/DPPP/GainCalAlgorithm.cc +++ b/DPPP/GainCalAlgorithm.cc @@ -1,23 +1,6 @@ // GainCalAlgorithm.cc: Perform algorithm for gain calibration -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: GainCalAlgorithm.cc 21598 2012-07-16 08:07:34Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Tammo Jan Dijkema diff --git a/DPPP/GainCalAlgorithm.h b/DPPP/GainCalAlgorithm.h index bafda76ac..a7c8ecb67 100644 --- a/DPPP/GainCalAlgorithm.h +++ b/DPPP/GainCalAlgorithm.h @@ -1,21 +1,6 @@ // GainCalAlgorithm.h: Perform algorithm for gain calibration -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to apply a calibration correction to the data diff --git a/DPPP/GaussianSource.cc b/DPPP/GaussianSource.cc index 15de92474..468715036 100644 --- a/DPPP/GaussianSource.cc +++ b/DPPP/GaussianSource.cc @@ -1,22 +1,7 @@ // GaussianSource.cc: Gaussian source model component. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // $Id$ diff --git a/DPPP/GaussianSource.h b/DPPP/GaussianSource.h index 44303c2ef..1923396dd 100644 --- a/DPPP/GaussianSource.h +++ b/DPPP/GaussianSource.h @@ -1,22 +1,7 @@ // GaussianSource.h: Gaussian source model component. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef DPPP_GAUSSIANSOURCE_H #define DPPP_GAUSSIANSOURCE_H diff --git a/DPPP/GridInterpolate.cc b/DPPP/GridInterpolate.cc index 31bc9fd6b..657a55852 100644 --- a/DPPP/GridInterpolate.cc +++ b/DPPP/GridInterpolate.cc @@ -1,23 +1,6 @@ // GridInterpolate.cc: Interpolate data from regular 2d grid to another -// Copyright (C) 2018 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: GridInterpolate.cc 37169 2017-04-19 12:41:21Z dijkema $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // #include "GridInterpolate.h" diff --git a/DPPP/GridInterpolate.h b/DPPP/GridInterpolate.h index 3c81def17..bb7a64baa 100644 --- a/DPPP/GridInterpolate.h +++ b/DPPP/GridInterpolate.h @@ -1,21 +1,6 @@ // GridInterpolate.h: Interpolate data from regular 2d grid to another -// Copyright (C) 2018 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Interpolate data from regular 2d grid to another diff --git a/DPPP/H5Parm.cc b/DPPP/H5Parm.cc index 917a3ee98..5d8484285 100644 --- a/DPPP/H5Parm.cc +++ b/DPPP/H5Parm.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "H5Parm.h" diff --git a/DPPP/H5Parm.h b/DPPP/H5Parm.h index 0480d4eba..c02b91266 100644 --- a/DPPP/H5Parm.h +++ b/DPPP/H5Parm.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef DPPP_H5PARM_H #define DPPP_H5PARM_H diff --git a/DPPP/H5ParmPredict.cc b/DPPP/H5ParmPredict.cc index 5c14d3a2b..0a979d7e5 100644 --- a/DPPP/H5ParmPredict.cc +++ b/DPPP/H5ParmPredict.cc @@ -1,23 +1,6 @@ // GainCal.cc: DPPP step class to H5ParmPredict visibilities -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: GainCal.cc 21598 2012-07-16 08:07:34Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Tammo Jan Dijkema diff --git a/DPPP/H5ParmPredict.h b/DPPP/H5ParmPredict.h index ba4bcef22..5790c3ddb 100644 --- a/DPPP/H5ParmPredict.h +++ b/DPPP/H5ParmPredict.h @@ -1,20 +1,8 @@ // H5ParmPredict.h: DPPP step class to H5ParmPredict visibilities from a source -// model Copyright (C) 2013 ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands +// model // -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to H5ParmPredict visibilities from a source model diff --git a/DPPP/Interpolate.cc b/DPPP/Interpolate.cc index 06dae5f55..5499d804a 100644 --- a/DPPP/Interpolate.cc +++ b/DPPP/Interpolate.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "Interpolate.h" #include "buffered_lane.h" diff --git a/DPPP/Interpolate.h b/DPPP/Interpolate.h index bddb11992..586864f20 100644 --- a/DPPP/Interpolate.h +++ b/DPPP/Interpolate.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef INTERPOLATE_H #define INTERPOLATE_H diff --git a/DPPP/MS.cc b/DPPP/MS.cc index 745e446af..c77e84535 100644 --- a/DPPP/MS.cc +++ b/DPPP/MS.cc @@ -1,19 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @author Lars Krombeen diff --git a/DPPP/MS.h b/DPPP/MS.h index 028f97374..029ca04ab 100644 --- a/DPPP/MS.h +++ b/DPPP/MS.h @@ -1,19 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Measurement Set constants which are not (yet) in casacore. diff --git a/DPPP/MSBDAReader.cc b/DPPP/MSBDAReader.cc index 0a255f16c..b8c639526 100644 --- a/DPPP/MSBDAReader.cc +++ b/DPPP/MSBDAReader.cc @@ -1,19 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "MSBDAReader.h" diff --git a/DPPP/MSBDAReader.h b/DPPP/MSBDAReader.h index 7fbc90a51..cfd4e3a7a 100644 --- a/DPPP/MSBDAReader.h +++ b/DPPP/MSBDAReader.h @@ -1,19 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Step for reading BDA data from an MS. diff --git a/DPPP/MSBDAWriter.cc b/DPPP/MSBDAWriter.cc index 2e85b10f7..016f75987 100644 --- a/DPPP/MSBDAWriter.cc +++ b/DPPP/MSBDAWriter.cc @@ -1,19 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include <casacore/ms/MeasurementSets/MeasurementSet.h> #include <casacore/tables/DataMan/IncrementalStMan.h> diff --git a/DPPP/MSBDAWriter.h b/DPPP/MSBDAWriter.h index e758fe701..45a45b61e 100644 --- a/DPPP/MSBDAWriter.h +++ b/DPPP/MSBDAWriter.h @@ -1,19 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Step for writing BDA data to an MS. diff --git a/DPPP/MSReader.cc b/DPPP/MSReader.cc index fb1950841..0038c570c 100644 --- a/DPPP/MSReader.cc +++ b/DPPP/MSReader.cc @@ -1,23 +1,6 @@ // MSReader.cc: DPPP step reading from an MS -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/MSReader.h b/DPPP/MSReader.h index 2c0d8054e..2307e05c2 100644 --- a/DPPP/MSReader.h +++ b/DPPP/MSReader.h @@ -1,21 +1,6 @@ // MSReader.h: DPPP step reading from an MS -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step reading from an MS diff --git a/DPPP/MSUpdater.cc b/DPPP/MSUpdater.cc index d56e9a06e..e11d3f054 100644 --- a/DPPP/MSUpdater.cc +++ b/DPPP/MSUpdater.cc @@ -1,23 +1,6 @@ // MSUpdater.cc: DPPP step updating an MS -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/MSUpdater.h b/DPPP/MSUpdater.h index 32e10fda6..b5b11a869 100644 --- a/DPPP/MSUpdater.h +++ b/DPPP/MSUpdater.h @@ -1,21 +1,6 @@ // MSUpdater.h: DPPP step writing to an MS -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step writing to an MS diff --git a/DPPP/MSWriter.cc b/DPPP/MSWriter.cc index 8124cd7a3..22c8fd22a 100644 --- a/DPPP/MSWriter.cc +++ b/DPPP/MSWriter.cc @@ -1,23 +1,6 @@ // MSWriter.cc: DPPP step writing to an MS -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/MSWriter.h b/DPPP/MSWriter.h index f17cecea0..d5667fd7b 100644 --- a/DPPP/MSWriter.h +++ b/DPPP/MSWriter.h @@ -1,21 +1,6 @@ // MSWriter.h: DPPP step writing to an MS -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step writing to an MS diff --git a/DPPP/MedFlagger.cc b/DPPP/MedFlagger.cc index 05dfa920a..4637a3b1c 100644 --- a/DPPP/MedFlagger.cc +++ b/DPPP/MedFlagger.cc @@ -1,23 +1,6 @@ // MedFlagger.cc: DPPP step class to flag data based on median filtering -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/MedFlagger.h b/DPPP/MedFlagger.h index d6863f6ca..117bc63a0 100644 --- a/DPPP/MedFlagger.h +++ b/DPPP/MedFlagger.h @@ -1,21 +1,6 @@ // MedFlagger.h: DPPP step class to flag data based on median filtering -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to flag data based on median filtering diff --git a/DPPP/ModelComponent.cc b/DPPP/ModelComponent.cc index 987231e6d..23aa8cee7 100644 --- a/DPPP/ModelComponent.cc +++ b/DPPP/ModelComponent.cc @@ -1,22 +1,7 @@ // ModelComponent.cc: Base class for model components. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // $Id$ diff --git a/DPPP/ModelComponent.h b/DPPP/ModelComponent.h index 4e5ba468a..8638fdfae 100644 --- a/DPPP/ModelComponent.h +++ b/DPPP/ModelComponent.h @@ -1,22 +1,7 @@ // ModelComponent.h: Base class for model components. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef DPPP_MODELCOMPONENT_H #define DPPP_MODELCOMPONENT_H diff --git a/DPPP/ModelComponentVisitor.cc b/DPPP/ModelComponentVisitor.cc index a732d959d..94454ae87 100644 --- a/DPPP/ModelComponentVisitor.cc +++ b/DPPP/ModelComponentVisitor.cc @@ -1,23 +1,8 @@ // ModelComponentVisitor.cc: Base class for visitors that visit model component // hierarchies. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // $Id$ diff --git a/DPPP/ModelComponentVisitor.h b/DPPP/ModelComponentVisitor.h index d196a6bba..de27d738f 100644 --- a/DPPP/ModelComponentVisitor.h +++ b/DPPP/ModelComponentVisitor.h @@ -1,23 +1,8 @@ // ModelComponentVisitor.h: Base class for visitors that visit model component // hierarchies. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef DPPP_MODELCOMPONENTVISITOR_H #define DPPP_MODELCOMPONENTVISITOR_H diff --git a/DPPP/MultiMSReader.cc b/DPPP/MultiMSReader.cc index 4928bf861..f11107fa3 100644 --- a/DPPP/MultiMSReader.cc +++ b/DPPP/MultiMSReader.cc @@ -1,23 +1,6 @@ // MultiMSReader.cc: DPPP step reading from multiple MSs -// Copyright (C) 2011 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: MSReader.cc 19257 2011-11-14 14:36:08Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/MultiMSReader.h b/DPPP/MultiMSReader.h index 48e685524..29329a06f 100644 --- a/DPPP/MultiMSReader.h +++ b/DPPP/MultiMSReader.h @@ -1,21 +1,6 @@ // MultiMSReader.h: DPPP step reading from multiple MSs -// Copyright (C) 2011 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step reading from multiple MSs diff --git a/DPPP/OneApplyCal.cc b/DPPP/OneApplyCal.cc index 8251bc3ce..7a1f5a95b 100644 --- a/DPPP/OneApplyCal.cc +++ b/DPPP/OneApplyCal.cc @@ -1,23 +1,6 @@ // OneApplyCal.cc: DPPP step class to apply a calibration correction to the data -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: OneApplyCal.cc 21598 2012-07-16 08:07:34Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Tammo Jan Dijkema diff --git a/DPPP/OneApplyCal.h b/DPPP/OneApplyCal.h index 1f3ebce02..85cb80d59 100644 --- a/DPPP/OneApplyCal.h +++ b/DPPP/OneApplyCal.h @@ -1,21 +1,6 @@ // OneApplyCal.h: DPPP step class to apply a calibration correction to the data -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to apply a calibration correction to the data diff --git a/DPPP/Patch.cc b/DPPP/Patch.cc index 8ae259166..c9befb692 100644 --- a/DPPP/Patch.cc +++ b/DPPP/Patch.cc @@ -1,23 +1,8 @@ // Patch.cc: A set of sources for which direction dependent effects are assumed // to be equal. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // $Id$ diff --git a/DPPP/Patch.h b/DPPP/Patch.h index 665e925a6..21d5df3c9 100644 --- a/DPPP/Patch.h +++ b/DPPP/Patch.h @@ -1,23 +1,8 @@ // Patch.h: A set of sources for which direction dependent effects are assumed // to be equal. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef DPPP_PATCH_H #define DPPP_PATCH_H diff --git a/DPPP/PhaseFitter.cc b/DPPP/PhaseFitter.cc index ac6794b34..e7de7777b 100644 --- a/DPPP/PhaseFitter.cc +++ b/DPPP/PhaseFitter.cc @@ -1,23 +1,6 @@ // phasefitter.cc: Class to perform phase fitting (TEC), allowing phase wraps -// Copyright (C) 2016 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: phasefitter.cc 21598 2012-07-16 08:07:34Z offringa $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Andre Offringa diff --git a/DPPP/PhaseFitter.h b/DPPP/PhaseFitter.h index 81675f481..b9096d7fd 100644 --- a/DPPP/PhaseFitter.h +++ b/DPPP/PhaseFitter.h @@ -1,23 +1,6 @@ // phasefitter.h: Class to perform phase fitting (TEC), allowing phase wraps -// Copyright (C) 2016 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: phasefitter.cc 21598 2012-07-16 08:07:34Z offringa $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // /** diff --git a/DPPP/PhaseShift.cc b/DPPP/PhaseShift.cc index 37a8f6633..d9e559a0a 100644 --- a/DPPP/PhaseShift.cc +++ b/DPPP/PhaseShift.cc @@ -1,23 +1,6 @@ // PhaseShift.cc: DPPP step class to shift the data to another phase center -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/PhaseShift.h b/DPPP/PhaseShift.h index f5826e03c..427f0fee8 100644 --- a/DPPP/PhaseShift.h +++ b/DPPP/PhaseShift.h @@ -1,21 +1,6 @@ // PhaseShift.h: DPPP step class to shift the data to another phase center -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @author Ger van Diepen diff --git a/DPPP/PointSource.cc b/DPPP/PointSource.cc index b60a48e06..21b6be22e 100644 --- a/DPPP/PointSource.cc +++ b/DPPP/PointSource.cc @@ -1,23 +1,8 @@ // PointSource.cc: Point source model component with optional spectral index // and rotation measure. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // $Id$ diff --git a/DPPP/PointSource.h b/DPPP/PointSource.h index c33fdf4b3..501c6e36a 100644 --- a/DPPP/PointSource.h +++ b/DPPP/PointSource.h @@ -1,23 +1,8 @@ // PointSource.h: Point source model component with optional spectral index and // rotation measure. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef DPPP_POINTSOURCE_H #define DPPP_POINTSOURCE_H diff --git a/DPPP/Position.cc b/DPPP/Position.cc index 8c05c27b4..290c0d715 100644 --- a/DPPP/Position.cc +++ b/DPPP/Position.cc @@ -1,22 +1,7 @@ // Position.cc: A position on the celestial sphere. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // $Id$ diff --git a/DPPP/Position.h b/DPPP/Position.h index 2f3c6cce2..f7d18fa34 100644 --- a/DPPP/Position.h +++ b/DPPP/Position.h @@ -1,22 +1,7 @@ // Position.h: A position on the celestial sphere. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef DPPP_POSITION_H #define DPPP_POSITION_H diff --git a/DPPP/PreFlagger.cc b/DPPP/PreFlagger.cc index 821f44c25..1ef5e3a29 100644 --- a/DPPP/PreFlagger.cc +++ b/DPPP/PreFlagger.cc @@ -1,23 +1,6 @@ // PreFlagger.cc: DPPP step class to (un)flag data on channel, baseline, time -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/PreFlagger.h b/DPPP/PreFlagger.h index c8bdeaa0e..52bdadfbe 100644 --- a/DPPP/PreFlagger.h +++ b/DPPP/PreFlagger.h @@ -1,21 +1,6 @@ // PreFlagger.h: DPPP step class to flag data on channel, baseline, or time -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to flag data on channel, baseline, or time diff --git a/DPPP/Predict.cc b/DPPP/Predict.cc index 1a8c477d8..6d0fca6f0 100644 --- a/DPPP/Predict.cc +++ b/DPPP/Predict.cc @@ -1,23 +1,6 @@ // GainCal.cc: DPPP step class to predict visibilities -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: GainCal.cc 21598 2012-07-16 08:07:34Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Tammo Jan Dijkema diff --git a/DPPP/Predict.h b/DPPP/Predict.h index 835bc98c0..3fb353765 100644 --- a/DPPP/Predict.h +++ b/DPPP/Predict.h @@ -1,21 +1,6 @@ // Predict.h: DPPP step class to predict visibilities from a source model -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to predict visibilities from a source model diff --git a/DPPP/ProgressMeter.cc b/DPPP/ProgressMeter.cc index 758c772fb..6e105d079 100644 --- a/DPPP/ProgressMeter.cc +++ b/DPPP/ProgressMeter.cc @@ -1,21 +1,6 @@ // ProgressMeter.cc: Visual indication of a task's progress. -// Copyright (C) 1997,2000,2001,2002 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // $Id$ diff --git a/DPPP/ProgressMeter.h b/DPPP/ProgressMeter.h index d7d2434cc..aab658a62 100644 --- a/DPPP/ProgressMeter.h +++ b/DPPP/ProgressMeter.h @@ -1,21 +1,6 @@ // ProgressMeter.h: Visual indication of a tasks progress. -// Copyright (C) 1997,2000 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_COMMON_PROGRESSMETER_H #define LOFAR_COMMON_PROGRESSMETER_H diff --git a/DPPP/ScaleData.cc b/DPPP/ScaleData.cc index b08883d7d..68f2365c5 100644 --- a/DPPP/ScaleData.cc +++ b/DPPP/ScaleData.cc @@ -1,23 +1,6 @@ // ScaleData.cc: DPPP step class for freq-dependent scaling of the data -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ScaleData.cc 23223 2012-12-07 14:09:42Z schoenmakers $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/ScaleData.h b/DPPP/ScaleData.h index 3a6f6b83d..a62097f7f 100644 --- a/DPPP/ScaleData.h +++ b/DPPP/ScaleData.h @@ -1,21 +1,6 @@ // ScaleData.h: DPPP step class for freq-dependent scaling of the data -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class for freq-dependent scaling of the data diff --git a/DPPP/SetBeam.cc b/DPPP/SetBeam.cc index fc354ad10..e8ae29e86 100644 --- a/DPPP/SetBeam.cc +++ b/DPPP/SetBeam.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include <iostream> diff --git a/DPPP/SetBeam.h b/DPPP/SetBeam.h index 71e403b0c..53ae530c8 100644 --- a/DPPP/SetBeam.h +++ b/DPPP/SetBeam.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to set the beam keywords in a ms diff --git a/DPPP/Simulate.cc b/DPPP/Simulate.cc index e0595bb67..838c5bcff 100644 --- a/DPPP/Simulate.cc +++ b/DPPP/Simulate.cc @@ -1,22 +1,7 @@ // Simulate.cc: Simulate visibilities for a patch of sources. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // $Id$ diff --git a/DPPP/Simulate.h b/DPPP/Simulate.h index 1c42a6add..27a86924d 100644 --- a/DPPP/Simulate.h +++ b/DPPP/Simulate.h @@ -1,22 +1,7 @@ // Simulate.h: Simulate visibilities for a patch of sources. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// \file /// Simulate visibilities for a patch of sources. diff --git a/DPPP/Simulator.cc b/DPPP/Simulator.cc index e06accfe6..722cde1b5 100644 --- a/DPPP/Simulator.cc +++ b/DPPP/Simulator.cc @@ -1,23 +1,8 @@ // Simulator.cc: Compute visibilities for different model components types // (implementation of ModelComponentVisitor). // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // $Id$ diff --git a/DPPP/Simulator.h b/DPPP/Simulator.h index 693ad11ac..e283544cb 100644 --- a/DPPP/Simulator.h +++ b/DPPP/Simulator.h @@ -1,23 +1,8 @@ // Simulator.h: Compute visibilities for different model components types // (implementation of ModelComponentVisitor). // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef DPPP_SIMULATOR_H #define DPPP_SIMULATOR_H diff --git a/DPPP/SolTab.cc b/DPPP/SolTab.cc index 0f8d753ab..a770f9af5 100644 --- a/DPPP/SolTab.cc +++ b/DPPP/SolTab.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "Exceptions.h" #include "H5Parm.h" diff --git a/DPPP/SolutionInterval.cc b/DPPP/SolutionInterval.cc index 87a28f7a7..bdf74371d 100644 --- a/DPPP/SolutionInterval.cc +++ b/DPPP/SolutionInterval.cc @@ -1,20 +1,7 @@ // SolutionInterval.cc // -// Copyright (C) 2020 -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "SolutionInterval.h" diff --git a/DPPP/SolutionInterval.h b/DPPP/SolutionInterval.h index 24e0a15d9..5d0592a45 100644 --- a/DPPP/SolutionInterval.h +++ b/DPPP/SolutionInterval.h @@ -1,20 +1,7 @@ // SolutionInterval.h // -// Copyright (C) 2020 -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Solution Interval that can buffer multiple DPBuffers and data that is diff --git a/DPPP/SourceDBUtil.cc b/DPPP/SourceDBUtil.cc index ec5115021..ab6a552e4 100644 --- a/DPPP/SourceDBUtil.cc +++ b/DPPP/SourceDBUtil.cc @@ -1,23 +1,8 @@ // SourceDBUtil.cc: Helper functions to extract patch and source information // from a SourceDB. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // $Id$ diff --git a/DPPP/SourceDBUtil.h b/DPPP/SourceDBUtil.h index 406ab3181..2d65c44e3 100644 --- a/DPPP/SourceDBUtil.h +++ b/DPPP/SourceDBUtil.h @@ -1,23 +1,8 @@ // SourceDBUtil.h: Helper functions to extract patch and source information // from a SourceDB. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// \file /// Helper functions to extract patch and source information from a SourceDB. diff --git a/DPPP/Split.cc b/DPPP/Split.cc index 265eb67ad..66feb2752 100644 --- a/DPPP/Split.cc +++ b/DPPP/Split.cc @@ -1,23 +1,6 @@ // Split.cc: DPPP step class to Split visibilities -// Copyright (C) 2018 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: GainCal.cc 21598 2012-07-16 08:07:34Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Tammo Jan Dijkema diff --git a/DPPP/Split.h b/DPPP/Split.h index 68878af9b..5568efb02 100644 --- a/DPPP/Split.h +++ b/DPPP/Split.h @@ -1,21 +1,6 @@ // Split.h: DPPP step class to Split visibilities from a source model -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to Split visibilities from a source model diff --git a/DPPP/StManParsetKeys.h b/DPPP/StManParsetKeys.h index 7a2c26739..89824f58d 100644 --- a/DPPP/StManParsetKeys.h +++ b/DPPP/StManParsetKeys.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef DPPP_STMANPARSETKEYS_H #define DPPP_STMANPARSETKEYS_H diff --git a/DPPP/StationAdder.cc b/DPPP/StationAdder.cc index 176eb0988..68bef9fe7 100644 --- a/DPPP/StationAdder.cc +++ b/DPPP/StationAdder.cc @@ -1,23 +1,6 @@ // StationAdder.cc: DPPP step class to add stations as a superstation -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/StationAdder.h b/DPPP/StationAdder.h index 305d5acea..c9b8219ff 100644 --- a/DPPP/StationAdder.h +++ b/DPPP/StationAdder.h @@ -1,21 +1,6 @@ // StationAdder.h: DPPP step class to add stations as a superstation -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to add stations as a superstation diff --git a/DPPP/Stokes.cc b/DPPP/Stokes.cc index 17648df0d..c17e5ce52 100644 --- a/DPPP/Stokes.cc +++ b/DPPP/Stokes.cc @@ -1,22 +1,7 @@ // Stokes.cc: Complex Stokes vector. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // $Id$ diff --git a/DPPP/Stokes.h b/DPPP/Stokes.h index 85832c53a..36af3a9f1 100644 --- a/DPPP/Stokes.h +++ b/DPPP/Stokes.h @@ -1,22 +1,7 @@ // Stokes.h: Complex Stokes vector. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef DPPP_STOKES_H #define DPPP_STOKES_H diff --git a/DPPP/SubtractMixed.cc b/DPPP/SubtractMixed.cc index 0cf7b5d45..e826adc6d 100644 --- a/DPPP/SubtractMixed.cc +++ b/DPPP/SubtractMixed.cc @@ -1,23 +1,8 @@ // SubtractMixed.cc: Subtract visibilities from a buffer after weighting by // mixing coefficients. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // $Id$ diff --git a/DPPP/SubtractMixed.h b/DPPP/SubtractMixed.h index 6726eec0e..6cf2f3d75 100644 --- a/DPPP/SubtractMixed.h +++ b/DPPP/SubtractMixed.h @@ -1,23 +1,8 @@ // SubtractMixed.h: Subtract visibilities from buffer after weighting by mixing // coefficients. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// \file /// Subtract visibilities from a buffer after weighting by mixing coefficients. diff --git a/DPPP/SubtractNew.cc b/DPPP/SubtractNew.cc index 3e371c3c3..9a9dcd983 100644 --- a/DPPP/SubtractNew.cc +++ b/DPPP/SubtractNew.cc @@ -1,23 +1,8 @@ // SubtractNew.cc: Subtract visibilities from a buffer after weighting by // mixing coefficients. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // $Id$ diff --git a/DPPP/SubtractNew.h b/DPPP/SubtractNew.h index 79bbcdd75..4ab79475a 100644 --- a/DPPP/SubtractNew.h +++ b/DPPP/SubtractNew.h @@ -1,23 +1,8 @@ // SubtractNew.h: Subtract visibilities from buffer after weighting by mixing // coefficients. // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// \file /// Subtract visibilities from a buffer after weighting by mixing coefficients. diff --git a/DPPP/UVWCalculator.cc b/DPPP/UVWCalculator.cc index 7bd0e82bf..2108d3f7a 100644 --- a/DPPP/UVWCalculator.cc +++ b/DPPP/UVWCalculator.cc @@ -1,23 +1,6 @@ // UVWCalculator.cc: Class to calculate UVW coordinates -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/UVWCalculator.h b/DPPP/UVWCalculator.h index deb55c9ec..9fd90dda0 100644 --- a/DPPP/UVWCalculator.h +++ b/DPPP/UVWCalculator.h @@ -1,21 +1,6 @@ // UVWCalculator.h: Class to calculate UVW coordinates -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Class to calculate UVW coordinates diff --git a/DPPP/UVWFlagger.cc b/DPPP/UVWFlagger.cc index ac2d86536..cb7f5d825 100644 --- a/DPPP/UVWFlagger.cc +++ b/DPPP/UVWFlagger.cc @@ -1,23 +1,6 @@ // UVWFlagger.cc: DPPP step class to flag data on UVW coordinates -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/UVWFlagger.h b/DPPP/UVWFlagger.h index 06d505eca..2f4cbaefb 100644 --- a/DPPP/UVWFlagger.h +++ b/DPPP/UVWFlagger.h @@ -1,21 +1,6 @@ // UVWFlagger.h: DPPP step class to flag data on UVW coordinates -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to flag data on UVW coordinates diff --git a/DPPP/Upsample.cc b/DPPP/Upsample.cc index 8f0193881..3020e603f 100644 --- a/DPPP/Upsample.cc +++ b/DPPP/Upsample.cc @@ -1,23 +1,6 @@ // Upsample.cc: DPPP step class to Upsample visibilities -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: GainCal.cc 21598 2012-07-16 08:07:34Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Tammo Jan Dijkema diff --git a/DPPP/Upsample.h b/DPPP/Upsample.h index 382fbd4d7..c846676c2 100644 --- a/DPPP/Upsample.h +++ b/DPPP/Upsample.h @@ -1,21 +1,6 @@ // Upsample.h: DPPP step class to upsample visibilities -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPPP step class to Upsample visibilities diff --git a/DPPP/Version.h b/DPPP/Version.h index f0e7a4a30..c7993e8ed 100644 --- a/DPPP/Version.h +++ b/DPPP/Version.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef DPPP_VERSION_H #define DPPP_VERSION_H diff --git a/DPPP/__init__.py b/DPPP/__init__.py index 5adf25334..f4c23df5e 100644 --- a/DPPP/__init__.py +++ b/DPPP/__init__.py @@ -1,25 +1,7 @@ # __init__.py: Top level .py file for DPPP flagging results plotting # -# Copyright (C) 2007 -# ASTRON (Netherlands Institute for Radio Astronomy) -# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -# -# This file is part of the LOFAR software suite. -# The LOFAR software suite is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# The LOFAR software suite is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -# -# $Id: __init__.py 17341 2011-02-07 07:15:52Z diepen $ - +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later # Plot the NDPPP count results by frequency or baseline. # Frequencies are concatenated; baselines are averaged. @@ -57,4 +39,3 @@ def plotflags (tabnames): pylab.plot (numpy.array(percs), '+') else: raise RuntimeError('Table appears not to be a NDPPP Count result; it does not contain a Frequency or Station column') - diff --git a/DPPP/etc/CMakeLists.txt b/DPPP/etc/CMakeLists.txt index 171672116..ce203d761 100644 --- a/DPPP/etc/CMakeLists.txt +++ b/DPPP/etc/CMakeLists.txt @@ -1,4 +1,7 @@ +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + # Logger configuration install(FILES DPPP.log_prop - DESTINATION etc) + DESTINATION etc) diff --git a/DPPP/test/integration/CMakeLists.txt b/DPPP/test/integration/CMakeLists.txt index f7c292c86..db0fad2f6 100644 --- a/DPPP/test/integration/CMakeLists.txt +++ b/DPPP/test/integration/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + configure_file(testInit.sh.in testInit.sh) # The 'source' symbolic link simplifies running the tests manually inside diff --git a/DPPP/test/integration/tApplyBeam.sh b/DPPP/test/integration/tApplyBeam.sh index 905534375..67df38b4b 100755 --- a/DPPP/test/integration/tApplyBeam.sh +++ b/DPPP/test/integration/tApplyBeam.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + # Locate the executables and srcdir (script created by cmake's configure_file). INIT=testInit.sh if [ ! -f $INIT ]; then diff --git a/DPPP/test/integration/tApplyCal2.sh b/DPPP/test/integration/tApplyCal2.sh index 68964148a..cbbad7f1b 100755 --- a/DPPP/test/integration/tApplyCal2.sh +++ b/DPPP/test/integration/tApplyCal2.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + set -e # Stop on any error # Locate the executables and srcdir (script created by cmake's configure_file). diff --git a/DPPP/test/integration/tDemix.sh b/DPPP/test/integration/tDemix.sh index 2abc8d1ce..84c4bc850 100755 --- a/DPPP/test/integration/tDemix.sh +++ b/DPPP/test/integration/tDemix.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + set -e # Stop on any error INIT=testInit.sh diff --git a/DPPP/test/integration/tGainCal.sh b/DPPP/test/integration/tGainCal.sh index b141e705b..4fb2aaa3e 100755 --- a/DPPP/test/integration/tGainCal.sh +++ b/DPPP/test/integration/tGainCal.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + # Locate the executables and srcdir (script created by cmake's configure_file). INIT=testInit.sh if [ ! -f $INIT ]; then diff --git a/DPPP/test/integration/tGainCalH5Parm.sh b/DPPP/test/integration/tGainCalH5Parm.sh index 9aac8b383..3a183646a 100755 --- a/DPPP/test/integration/tGainCalH5Parm.sh +++ b/DPPP/test/integration/tGainCalH5Parm.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + # Locate the executables and srcdir (script created by cmake's configure_file). INIT=testInit.sh if [ ! -f $INIT ]; then @@ -85,4 +88,3 @@ echo; echo "Test filter"; echo cmd="$dpppexe checkparset=1 msin=tNDPPP-generic.MS msout=tNDPPP-filtered.MS steps=[filter,gaincal] gaincal.sourcedb=tNDPPP-generic.MS/sky gaincal.parmdb=tNDPPP-generic.MS/inst-filter.h5 filter.baseline='!CS001HBA0&&*' gaincal.baseline='!CS002HBA1,RS305HBA&&*' gaincal.caltype=diagonal" echo $cmd $cmd - diff --git a/DPPP/test/integration/tMultiApplyCal.sh b/DPPP/test/integration/tMultiApplyCal.sh index 0503efcf6..aaebbf970 100755 --- a/DPPP/test/integration/tMultiApplyCal.sh +++ b/DPPP/test/integration/tMultiApplyCal.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + # Locate the executables and srcdir (script created by cmake's configure_file). INIT=testInit.sh if [ ! -f $INIT ]; then @@ -26,4 +29,3 @@ echo $cmd eval $cmd $taqlexe 'select from tNDPPP-generic.MS where not(all(DATA~=9*DATA3))' > taql.out diff taql.out taql.ref || exit 1 - diff --git a/DPPP/test/integration/tPredict.sh b/DPPP/test/integration/tPredict.sh index c0accc7ff..bd0aa8e37 100755 --- a/DPPP/test/integration/tPredict.sh +++ b/DPPP/test/integration/tPredict.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + # Locate the executables and srcdir (script created by cmake's configure_file). INIT=testInit.sh if [ ! -f $INIT ]; then diff --git a/DPPP/test/runtests.cc b/DPPP/test/runtests.cc index 56c122ad8..194bf4cb1 100644 --- a/DPPP/test/runtests.cc +++ b/DPPP/test/runtests.cc @@ -1,3 +1,6 @@ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later + #define BOOST_TEST_MODULE DP3 #include <boost/test/unit_test.hpp> diff --git a/DPPP/test/unit/mock/MockInput.cc b/DPPP/test/unit/mock/MockInput.cc index daa07d2f1..01b6d449a 100644 --- a/DPPP/test/unit/mock/MockInput.cc +++ b/DPPP/test/unit/mock/MockInput.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "MockInput.h" diff --git a/DPPP/test/unit/mock/MockInput.h b/DPPP/test/unit/mock/MockInput.h index 2cf9dee9b..c317fc4d4 100644 --- a/DPPP/test/unit/mock/MockInput.h +++ b/DPPP/test/unit/mock/MockInput.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef MOCK_INPUT_H #define MOCK_INPUT_H diff --git a/DPPP/test/unit/mock/MockStep.cc b/DPPP/test/unit/mock/MockStep.cc index 8f3685df5..24357f3c6 100644 --- a/DPPP/test/unit/mock/MockStep.cc +++ b/DPPP/test/unit/mock/MockStep.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "MockStep.h" diff --git a/DPPP/test/unit/mock/MockStep.h b/DPPP/test/unit/mock/MockStep.h index c2fab649b..82c4430ba 100644 --- a/DPPP/test/unit/mock/MockStep.h +++ b/DPPP/test/unit/mock/MockStep.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief DPStep mock, for use in tests. diff --git a/DPPP/test/unit/tApplyCal.cc b/DPPP/test/unit/tApplyCal.cc index 30c3014fc..a77d29d4b 100644 --- a/DPPP/test/unit/tApplyCal.cc +++ b/DPPP/test/unit/tApplyCal.cc @@ -1,23 +1,6 @@ // tApplyCal.cc: Test program for class AORFlagger -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: tApplyCal.cc 24221 2013-08-02 12:24:48Z tammo $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Tammo Jan Dijkema diff --git a/DPPP/test/unit/tApplyCalH5.cc b/DPPP/test/unit/tApplyCalH5.cc index d4bdd359f..43f8e5487 100644 --- a/DPPP/test/unit/tApplyCalH5.cc +++ b/DPPP/test/unit/tApplyCalH5.cc @@ -1,23 +1,6 @@ // tApplyCalH5.cc: Test program for class ApplyCal -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: tApplyCalH5.cc 24221 2013-08-02 12:24:48Z tammo $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Tammo Jan Dijkema diff --git a/DPPP/test/unit/tAverager.cc b/DPPP/test/unit/tAverager.cc index 791fc0e48..87d30547c 100644 --- a/DPPP/test/unit/tAverager.cc +++ b/DPPP/test/unit/tAverager.cc @@ -1,23 +1,6 @@ // tAverager.cc: Test program for class Averager -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/test/unit/tBDAAverager.cc b/DPPP/test/unit/tBDAAverager.cc index 7040ac0f1..048fe1b4c 100644 --- a/DPPP/test/unit/tBDAAverager.cc +++ b/DPPP/test/unit/tBDAAverager.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include <boost/test/unit_test.hpp> diff --git a/DPPP/test/unit/tBDABuffer.cc b/DPPP/test/unit/tBDABuffer.cc index 9517b6b4c..71435f365 100644 --- a/DPPP/test/unit/tBDABuffer.cc +++ b/DPPP/test/unit/tBDABuffer.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Unit tests for the BDABuffer class. diff --git a/DPPP/test/unit/tBDAIntervalBuffer.cc b/DPPP/test/unit/tBDAIntervalBuffer.cc index 99aad5543..5e7a59fdc 100644 --- a/DPPP/test/unit/tBDAIntervalBuffer.cc +++ b/DPPP/test/unit/tBDAIntervalBuffer.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Unit tests for the BDAIntervalBuffer class. diff --git a/DPPP/test/unit/tBaselineSelection.cc b/DPPP/test/unit/tBaselineSelection.cc index e5d5452f1..92f26bfdf 100644 --- a/DPPP/test/unit/tBaselineSelection.cc +++ b/DPPP/test/unit/tBaselineSelection.cc @@ -1,23 +1,6 @@ // tBaselineSelection.cc: Test program for class BaselneSelection -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/test/unit/tDPInfo.cc b/DPPP/test/unit/tDPInfo.cc index 496e0e5ba..03a7f7197 100644 --- a/DPPP/test/unit/tDPInfo.cc +++ b/DPPP/test/unit/tDPInfo.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "../../DPInfo.h" diff --git a/DPPP/test/unit/tDPPP.cc b/DPPP/test/unit/tDPPP.cc index ed28c5412..6e5df1558 100644 --- a/DPPP/test/unit/tDPPP.cc +++ b/DPPP/test/unit/tDPPP.cc @@ -1,23 +1,6 @@ // tDPPP.cc: test program for DPPP -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/test/unit/tDemixer.cc b/DPPP/test/unit/tDemixer.cc index 1cbf0ede2..5e802fbec 100644 --- a/DPPP/test/unit/tDemixer.cc +++ b/DPPP/test/unit/tDemixer.cc @@ -1,23 +1,6 @@ // tDemixer.cc: Test program for class Demixer -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/test/unit/tFilter.cc b/DPPP/test/unit/tFilter.cc index 0cc922115..54e1fad9a 100644 --- a/DPPP/test/unit/tFilter.cc +++ b/DPPP/test/unit/tFilter.cc @@ -1,23 +1,6 @@ // tFilter.cc: Test program for class Filter -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/test/unit/tGridInterpolate.cc b/DPPP/test/unit/tGridInterpolate.cc index 34448c687..976a3ec2f 100644 --- a/DPPP/test/unit/tGridInterpolate.cc +++ b/DPPP/test/unit/tGridInterpolate.cc @@ -1,23 +1,6 @@ // tGridInterpolate.cc: test program for GridInterpolate -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: tGridInterpolate.cc 31423 2015-04-03 14:06:21Z dijkema $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Tammo Jan Dijkema diff --git a/DPPP/test/unit/tH5Parm.cc b/DPPP/test/unit/tH5Parm.cc index 8bbf7e519..951148b39 100644 --- a/DPPP/test/unit/tH5Parm.cc +++ b/DPPP/test/unit/tH5Parm.cc @@ -1,3 +1,6 @@ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later + #include <sstream> #include <stdio.h> #include <vector> diff --git a/DPPP/test/unit/tInterpolate.cc b/DPPP/test/unit/tInterpolate.cc index e22c7ae2e..935c405d9 100644 --- a/DPPP/test/unit/tInterpolate.cc +++ b/DPPP/test/unit/tInterpolate.cc @@ -1,21 +1,6 @@ // tInterpolate.cc: Test program for class Interpolate -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/test/unit/tMSBDAReader.cc b/DPPP/test/unit/tMSBDAReader.cc index d62ba17cf..f52323d01 100644 --- a/DPPP/test/unit/tMSBDAReader.cc +++ b/DPPP/test/unit/tMSBDAReader.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "mock/MockStep.h" #include "../../MSBDAReader.h" diff --git a/DPPP/test/unit/tMedFlagger.cc b/DPPP/test/unit/tMedFlagger.cc index 605a6f77e..73ee66b2f 100644 --- a/DPPP/test/unit/tMedFlagger.cc +++ b/DPPP/test/unit/tMedFlagger.cc @@ -1,23 +1,6 @@ // tMedFlagger.cc: Test program for class MedFlagger -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/test/unit/tMirror.cc b/DPPP/test/unit/tMirror.cc index a15cf28e0..5f76f6067 100644 --- a/DPPP/test/unit/tMirror.cc +++ b/DPPP/test/unit/tMirror.cc @@ -1,23 +1,6 @@ // tMirror.cc: Test if the way of mirroring done in MedFlagger is fine -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/test/unit/tPSet.cc b/DPPP/test/unit/tPSet.cc index a167fe8e2..05cdae597 100644 --- a/DPPP/test/unit/tPSet.cc +++ b/DPPP/test/unit/tPSet.cc @@ -1,23 +1,6 @@ // tPSet.cc: Test program for class PreFlagger::PSet -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/test/unit/tPhaseShift.cc b/DPPP/test/unit/tPhaseShift.cc index 2ea813f73..0bd7928fd 100644 --- a/DPPP/test/unit/tPhaseShift.cc +++ b/DPPP/test/unit/tPhaseShift.cc @@ -1,23 +1,6 @@ // tPhaseShift.cc: Test program for class PhaseShift -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/test/unit/tPreFlagger.cc b/DPPP/test/unit/tPreFlagger.cc index 19bbadf5a..af2d5ac47 100644 --- a/DPPP/test/unit/tPreFlagger.cc +++ b/DPPP/test/unit/tPreFlagger.cc @@ -1,23 +1,6 @@ // tPreFlagger.cc: Test program for class PreFlagger -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/test/unit/tScaleData.cc b/DPPP/test/unit/tScaleData.cc index 72a70e05e..bb1855064 100644 --- a/DPPP/test/unit/tScaleData.cc +++ b/DPPP/test/unit/tScaleData.cc @@ -1,23 +1,6 @@ // tScaleData.cc: Test program for class ScaleData -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: tScaleData.cc 23691 2013-02-12 13:32:33Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/test/unit/tScaleDataBDA.cc b/DPPP/test/unit/tScaleDataBDA.cc index b707efb96..74ed34f2a 100644 --- a/DPPP/test/unit/tScaleDataBDA.cc +++ b/DPPP/test/unit/tScaleDataBDA.cc @@ -1,21 +1,6 @@ // tScaleData.cc: Test program for class ScaleData -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Lars Krombeen diff --git a/DPPP/test/unit/tSolutionInterval.cc b/DPPP/test/unit/tSolutionInterval.cc index 21c1dd941..fac6dd76d 100644 --- a/DPPP/test/unit/tSolutionInterval.cc +++ b/DPPP/test/unit/tSolutionInterval.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include <boost/test/unit_test.hpp> diff --git a/DPPP/test/unit/tStationAdder.cc b/DPPP/test/unit/tStationAdder.cc index 00943cbe7..2eb9efc11 100644 --- a/DPPP/test/unit/tStationAdder.cc +++ b/DPPP/test/unit/tStationAdder.cc @@ -1,23 +1,6 @@ // tStationAdder.cc: Test program for class StationAdder -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/test/unit/tUVWFlagger.cc b/DPPP/test/unit/tUVWFlagger.cc index 493cd0a31..a76c1aa9b 100644 --- a/DPPP/test/unit/tUVWFlagger.cc +++ b/DPPP/test/unit/tUVWFlagger.cc @@ -1,23 +1,6 @@ // tUVWFlagger.cc: Test program for class UVWFlagger -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/DPPP/test/unit/tUpsample.cc b/DPPP/test/unit/tUpsample.cc index 724cdc714..a6dc6d3e6 100644 --- a/DPPP/test/unit/tUpsample.cc +++ b/DPPP/test/unit/tUpsample.cc @@ -1,23 +1,6 @@ // tAverager.cc: Test program for class Averager -// Copyright (C) 2010 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: tAverager.cc 35179 2016-08-25 11:25:17Z dijkema $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/IDGPredict/DS9FacetFile.h b/IDGPredict/DS9FacetFile.h index d11781076..b5bf4f581 100644 --- a/IDGPredict/DS9FacetFile.h +++ b/IDGPredict/DS9FacetFile.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef DS9_FACET_FILE #define DS9_FACET_FILE diff --git a/IDGPredict/Facet.h b/IDGPredict/Facet.h index 16ae9a1ec..3992278e3 100644 --- a/IDGPredict/Facet.h +++ b/IDGPredict/Facet.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef FACET_H #define FACET_H diff --git a/IDGPredict/FacetImage.cc b/IDGPredict/FacetImage.cc index 2cbbeebe2..059dc30ad 100644 --- a/IDGPredict/FacetImage.cc +++ b/IDGPredict/FacetImage.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "FacetImage.h" diff --git a/IDGPredict/FacetImage.h b/IDGPredict/FacetImage.h index de50d0163..0bec6c4db 100644 --- a/IDGPredict/FacetImage.h +++ b/IDGPredict/FacetImage.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef FACET_IMAGE_H #define FACET_IMAGE_H diff --git a/IDGPredict/IDGConfiguration.h b/IDGPredict/IDGConfiguration.h index d795a4f9c..8d26423af 100644 --- a/IDGPredict/IDGConfiguration.h +++ b/IDGPredict/IDGConfiguration.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef IDG_CONFIGURATION_H #define IDG_CONFIGURATION_H diff --git a/IDGPredict/IDGPredict.cc b/IDGPredict/IDGPredict.cc index c4b17a8cb..ccb96ebfb 100644 --- a/IDGPredict/IDGPredict.cc +++ b/IDGPredict/IDGPredict.cc @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "IDGPredict.h" diff --git a/IDGPredict/IDGPredict.h b/IDGPredict/IDGPredict.h index df30d02e8..069bc3673 100644 --- a/IDGPredict/IDGPredict.h +++ b/IDGPredict/IDGPredict.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef IDG_PREDICT_H #define IDG_PREDICT_H diff --git a/IDGPredict/ParsetAterms.h b/IDGPredict/ParsetAterms.h index 024cdd3e5..987a805cf 100644 --- a/IDGPredict/ParsetAterms.h +++ b/IDGPredict/ParsetAterms.h @@ -1,20 +1,5 @@ -// Copyright (C) 2020 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef IDGPREDICT_PARSETATERMS_H #define IDGPREDICT_PARSETATERMS_H diff --git a/IDGPredict/test/unit/tDS9FacetFile.cc b/IDGPredict/test/unit/tDS9FacetFile.cc index 00c0a8a9a..d9e023bfe 100644 --- a/IDGPredict/test/unit/tDS9FacetFile.cc +++ b/IDGPredict/test/unit/tDS9FacetFile.cc @@ -1,3 +1,6 @@ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later + #include "../../DS9FacetFile.h" #include <boost/test/unit_test.hpp> diff --git a/IDGPredict/test/unit/tIDGPredict.cc b/IDGPredict/test/unit/tIDGPredict.cc index 889b53bba..c9fb50b50 100644 --- a/IDGPredict/test/unit/tIDGPredict.cc +++ b/IDGPredict/test/unit/tIDGPredict.cc @@ -1,3 +1,6 @@ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later + #include "../../IDGPredict.h" #include "../../../Common/ParameterSet.h" #include "../../../DPPP/DPBuffer.h" diff --git a/ParmDB/Axis.cc b/ParmDB/Axis.cc index 2537ad54b..f209396bc 100644 --- a/ParmDB/Axis.cc +++ b/ParmDB/Axis.cc @@ -1,24 +1,7 @@ // Axis.cc: Classes representing a regular or irregular axis. // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: Axis.cc 20771 2012-04-19 12:04:48Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "Axis.h" diff --git a/ParmDB/Axis.h b/ParmDB/Axis.h index 63f144924..a0ddd819b 100644 --- a/ParmDB/Axis.h +++ b/ParmDB/Axis.h @@ -1,22 +1,7 @@ // Axis.h: Classes representing a regular or irregular axis. // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Classes representing a regular or irregular axis. diff --git a/ParmDB/AxisMapping.cc b/ParmDB/AxisMapping.cc index a19c22975..85ff69e50 100644 --- a/ParmDB/AxisMapping.cc +++ b/ParmDB/AxisMapping.cc @@ -1,24 +1,7 @@ // AxisMapping.cc: Map the cells of one axis to another // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: AxisMapping.cc 14038 2009-09-17 13:59:12Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "AxisMapping.h" diff --git a/ParmDB/AxisMapping.h b/ParmDB/AxisMapping.h index 84ac175be..fc53e29ec 100644 --- a/ParmDB/AxisMapping.h +++ b/ParmDB/AxisMapping.h @@ -1,22 +1,7 @@ // AxisMapping.h: Map the cells of one axis to another // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Map the cells of one axis to another diff --git a/ParmDB/Box.cc b/ParmDB/Box.cc index a356c3e01..28f162d25 100644 --- a/ParmDB/Box.cc +++ b/ParmDB/Box.cc @@ -1,24 +1,7 @@ // Box.cc: // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: Box.cc 16977 2010-12-20 08:40:36Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "Box.h" diff --git a/ParmDB/Box.h b/ParmDB/Box.h index 129c07563..0d8e0ef46 100644 --- a/ParmDB/Box.h +++ b/ParmDB/Box.h @@ -1,22 +1,7 @@ // Box.h: Class representing a 2-dim box // -// Copyright (C) 2007 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Class representing a 2-dim box diff --git a/ParmDB/Grid.cc b/ParmDB/Grid.cc index 0395890f0..d1232956a 100644 --- a/ParmDB/Grid.cc +++ b/ParmDB/Grid.cc @@ -1,24 +1,7 @@ // Grid.cc: // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: Grid.cc 14038 2009-09-17 13:59:12Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "Grid.h" diff --git a/ParmDB/Grid.h b/ParmDB/Grid.h index b0df86a83..5ca19b4b4 100644 --- a/ParmDB/Grid.h +++ b/ParmDB/Grid.h @@ -1,22 +1,7 @@ // Grid.h: Class representing a regular or irregular 2-D grid. // -// Copyright (C) 2007 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Class representing a regular or irregular 2-D grid. diff --git a/ParmDB/Parm.cc b/ParmDB/Parm.cc index 84a35b873..0ced58199 100644 --- a/ParmDB/Parm.cc +++ b/ParmDB/Parm.cc @@ -1,24 +1,7 @@ // ParmCache.cc: A class dealing with caching and handling ParmDB entries // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: Parm.cc 22819 2012-11-16 11:02:55Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "Parm.h" #include "ParmCache.h" diff --git a/ParmDB/Parm.h b/ParmDB/Parm.h index b868e1ec6..54c99aaea 100644 --- a/ParmDB/Parm.h +++ b/ParmDB/Parm.h @@ -1,22 +1,7 @@ // Parm.h: Class giving access to a parameter // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Class giving access to a parameter diff --git a/ParmDB/ParmCache.cc b/ParmDB/ParmCache.cc index 673b7caa7..5fc6109e1 100644 --- a/ParmDB/ParmCache.cc +++ b/ParmDB/ParmCache.cc @@ -1,24 +1,7 @@ // ParmCache.cc: A class to cache ParmDB entries for a given work domain // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ParmCache.cc 14038 2009-09-17 13:59:12Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "ParmCache.h" #include "ParmValue.h" diff --git a/ParmDB/ParmCache.h b/ParmDB/ParmCache.h index 5a6ead8e7..26934ad9a 100644 --- a/ParmDB/ParmCache.h +++ b/ParmDB/ParmCache.h @@ -1,22 +1,7 @@ // ParmCache.h: A class dealing with caching and handling ParmDB entries // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief A class dealing with caching and handling ParmDB entries diff --git a/ParmDB/ParmDB.cc b/ParmDB/ParmDB.cc index 59b5fe34d..72bc1b464 100644 --- a/ParmDB/ParmDB.cc +++ b/ParmDB/ParmDB.cc @@ -1,24 +1,7 @@ // ParmDB.cc: Object to hold parameters in a table. // -// Copyright (C) 2002 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ParmDB.cc 21598 2012-07-16 08:07:34Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "ParmDB.h" #include "ParmDBCasa.h" diff --git a/ParmDB/ParmDB.h b/ParmDB/ParmDB.h index 2d9ffdade..b5f07e495 100644 --- a/ParmDB/ParmDB.h +++ b/ParmDB/ParmDB.h @@ -1,22 +1,7 @@ // ParmDB.h: Base class for a table holding parameters // -// Copyright (C) 2002 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Base class for a table holding parameters diff --git a/ParmDB/ParmDBBlob.cc b/ParmDB/ParmDBBlob.cc index 1d6cd3bd1..831c19713 100644 --- a/ParmDB/ParmDBBlob.cc +++ b/ParmDB/ParmDBBlob.cc @@ -1,24 +1,7 @@ // ParmDBBlob.cc: Dummy class to hold parmaeter values // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ParmDBBlob.cc 21598 2012-07-16 08:07:34Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "ParmDBBlob.h" diff --git a/ParmDB/ParmDBBlob.h b/ParmDB/ParmDBBlob.h index ea532447d..8e5f282f5 100644 --- a/ParmDB/ParmDBBlob.h +++ b/ParmDB/ParmDBBlob.h @@ -1,22 +1,7 @@ // ParmDBBlob.h: Dummy class to hold parameters in a Blob // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Dummy class to hold parameters in a Blob diff --git a/ParmDB/ParmDBCasa.cc b/ParmDB/ParmDBCasa.cc index f965b1a13..8f597083f 100644 --- a/ParmDB/ParmDBCasa.cc +++ b/ParmDB/ParmDBCasa.cc @@ -1,24 +1,7 @@ // ParmDBCasa.cc: Object to hold parameters in an Casa table. // -// Copyright (C) 2002 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ParmDBCasa.cc 27639 2013-12-04 08:02:12Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "ParmDBCasa.h" diff --git a/ParmDB/ParmDBCasa.h b/ParmDB/ParmDBCasa.h index b3a657920..4592856b0 100644 --- a/ParmDB/ParmDBCasa.h +++ b/ParmDB/ParmDBCasa.h @@ -1,22 +1,7 @@ // ParmDBCasa.h: Class to hold parameters in a Casa table // -// Copyright (C) 2002 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Class to hold parameters in a Casa table diff --git a/ParmDB/ParmDBLocker.cc b/ParmDB/ParmDBLocker.cc index 93e91c976..e2d358cb7 100644 --- a/ParmDB/ParmDBLocker.cc +++ b/ParmDB/ParmDBLocker.cc @@ -1,24 +1,7 @@ // ParmDBLocker.cc: Class to hold a read or write lock on ParmDBs // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ParmDBLocker.cc 14038 2009-09-17 13:59:12Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "ParmDBLocker.h" #include "ParmDB.h" diff --git a/ParmDB/ParmDBLocker.h b/ParmDB/ParmDBLocker.h index aa01893c9..3e9450bf1 100644 --- a/ParmDB/ParmDBLocker.h +++ b/ParmDB/ParmDBLocker.h @@ -1,22 +1,7 @@ // ParmDBLocker.h: Class to hold a read or write lock on ParmDBs // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Class to hold a read or write lock on ParmDBs diff --git a/ParmDB/ParmDBMeta.cc b/ParmDB/ParmDBMeta.cc index e1b251077..ba152f143 100644 --- a/ParmDB/ParmDBMeta.cc +++ b/ParmDB/ParmDBMeta.cc @@ -1,24 +1,7 @@ // ParmDBMeta.cc: one line description // -// Copyright (C) 2005 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ParmDBMeta.cc 14038 2009-09-17 13:59:12Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "ParmDBMeta.h" diff --git a/ParmDB/ParmDBMeta.h b/ParmDB/ParmDBMeta.h index 2022b88a6..a1f996910 100644 --- a/ParmDB/ParmDBMeta.h +++ b/ParmDB/ParmDBMeta.h @@ -1,22 +1,7 @@ // ParmDBMeta.h: Meta information for the name and type of a ParmDB // -// Copyright (C) 2005 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Meta information for the name and type of a ParmDB diff --git a/ParmDB/ParmFacade.cc b/ParmDB/ParmFacade.cc index 129039172..fcaedcbe1 100644 --- a/ParmDB/ParmFacade.cc +++ b/ParmDB/ParmFacade.cc @@ -1,24 +1,7 @@ // ParmFacade.cc: Object access the parameter database // -// Copyright (C) 2006 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ParmFacade.cc 27639 2013-12-04 08:02:12Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "ParmFacade.h" #include "ParmFacadeLocal.h" diff --git a/ParmDB/ParmFacade.h b/ParmDB/ParmFacade.h index e6175576a..158a82556 100644 --- a/ParmDB/ParmFacade.h +++ b/ParmDB/ParmFacade.h @@ -1,22 +1,7 @@ // ParmFacade.h: Data access the parameter database // -// Copyright (C) 2006 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_PARMDB_PARMFACADE_H #define LOFAR_PARMDB_PARMFACADE_H diff --git a/ParmDB/ParmFacadeDistr.cc b/ParmDB/ParmFacadeDistr.cc index f71f712dc..3c62a6f73 100644 --- a/ParmDB/ParmFacadeDistr.cc +++ b/ParmDB/ParmFacadeDistr.cc @@ -1,24 +1,7 @@ // ParmFacadeDistr.cc: Object access the parameter database // -// Copyright (C) 2006 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ParmFacadeDistr.cc 27747 2013-12-12 11:09:58Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "ParmFacadeDistr.h" diff --git a/ParmDB/ParmFacadeDistr.h b/ParmDB/ParmFacadeDistr.h index 8ed9f6959..f1c1bd227 100644 --- a/ParmDB/ParmFacadeDistr.h +++ b/ParmDB/ParmFacadeDistr.h @@ -1,22 +1,7 @@ // ParmFacadeDistr.h: Data access a distributed parameter database // -// Copyright (C) 2009 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// \file /// Data access the a distributed parameter database. diff --git a/ParmDB/ParmFacadeLocal.cc b/ParmDB/ParmFacadeLocal.cc index 9230f0b26..cc44bed2f 100644 --- a/ParmDB/ParmFacadeLocal.cc +++ b/ParmDB/ParmFacadeLocal.cc @@ -1,24 +1,7 @@ // ParmFacadeLocal.cc: Object access the parameter database // -// Copyright (C) 2006 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ParmFacadeLocal.cc 27639 2013-12-04 08:02:12Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "ParmFacadeLocal.h" #include "ParmDB.h" diff --git a/ParmDB/ParmFacadeLocal.h b/ParmDB/ParmFacadeLocal.h index a89f6ecff..bb79c18db 100644 --- a/ParmDB/ParmFacadeLocal.h +++ b/ParmDB/ParmFacadeLocal.h @@ -1,22 +1,7 @@ // ParmFacadeLocal.h: Data access the parameter database // -// Copyright (C) 2006 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_PARMDB_PARMFACADELOCAL_H #define LOFAR_PARMDB_PARMFACADELOCAL_H diff --git a/ParmDB/ParmFacadeRep.cc b/ParmDB/ParmFacadeRep.cc index 1ddf4eb35..82440f553 100644 --- a/ParmDB/ParmFacadeRep.cc +++ b/ParmDB/ParmFacadeRep.cc @@ -1,24 +1,7 @@ // ParmFacadeRep.cc: Base class for ParmFacades // -// Copyright (C) 2006 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ParmFacadeRep.cc 14038 2009-09-17 13:59:12Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "ParmFacadeRep.h" diff --git a/ParmDB/ParmFacadeRep.h b/ParmDB/ParmFacadeRep.h index 9e9d0daba..24d9376a0 100644 --- a/ParmDB/ParmFacadeRep.h +++ b/ParmDB/ParmFacadeRep.h @@ -1,22 +1,7 @@ // ParmFacadeRep.h: Data access the parameter database // -// Copyright (C) 2006 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef LOFAR_PARMDB_PARMFACADEREP_H #define LOFAR_PARMDB_PARMFACADEREP_H diff --git a/ParmDB/ParmMap.h b/ParmDB/ParmMap.h index 8be97e163..d4d35ff1d 100644 --- a/ParmDB/ParmMap.h +++ b/ParmDB/ParmMap.h @@ -1,22 +1,7 @@ // ParmMap.h: A map of parameter name to value set // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief A map of parameter name to value set. diff --git a/ParmDB/ParmSet.cc b/ParmDB/ParmSet.cc index 68b7aafee..b83e3a618 100644 --- a/ParmDB/ParmSet.cc +++ b/ParmDB/ParmSet.cc @@ -1,24 +1,7 @@ // ParmSet.cc: Set of parameters to be used // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ParmSet.cc 16977 2010-12-20 08:40:36Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "ParmSet.h" #include "ParmDB.h" diff --git a/ParmDB/ParmSet.h b/ParmDB/ParmSet.h index b75f24b0c..0a60b0320 100644 --- a/ParmDB/ParmSet.h +++ b/ParmDB/ParmSet.h @@ -1,22 +1,7 @@ // ParmSet.h: Set of parameters to be used // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Set of parameters to be used diff --git a/ParmDB/ParmValue.cc b/ParmDB/ParmValue.cc index 9280568ac..0d59df11c 100644 --- a/ParmDB/ParmValue.cc +++ b/ParmDB/ParmValue.cc @@ -1,24 +1,7 @@ // ParmValue.cc: A class containing the values of a parameter // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ParmValue.cc 29042 2014-04-23 08:48:38Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "ParmValue.h" diff --git a/ParmDB/ParmValue.h b/ParmDB/ParmValue.h index b9c65a711..fe28c50bf 100644 --- a/ParmDB/ParmValue.h +++ b/ParmDB/ParmValue.h @@ -1,22 +1,7 @@ // ParmValue.h: A class containing the values of a parameter // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief A class containing the values of a parameter diff --git a/ParmDB/PatchInfo.cc b/ParmDB/PatchInfo.cc index 2004f542e..47241afd3 100644 --- a/ParmDB/PatchInfo.cc +++ b/ParmDB/PatchInfo.cc @@ -1,24 +1,7 @@ // PatchInfo.cc: Info about a patch // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: PatchInfo.h 25297 2013-06-12 11:39:35Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // @file // @brief Info about a patch diff --git a/ParmDB/PatchInfo.h b/ParmDB/PatchInfo.h index 81372f654..1ee650356 100644 --- a/ParmDB/PatchInfo.h +++ b/ParmDB/PatchInfo.h @@ -1,22 +1,7 @@ // PatchInfo.h: Info about a patch // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Info about a patch diff --git a/ParmDB/SourceDB.cc b/ParmDB/SourceDB.cc index 7ad73132a..e995a36ad 100644 --- a/ParmDB/SourceDB.cc +++ b/ParmDB/SourceDB.cc @@ -1,24 +1,7 @@ // SourceDB.cc: Object to hold parameters in a table. // -// Copyright (C) 2002 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: SourceDB.cc 21605 2012-07-16 14:40:36Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "SourceDB.h" #include "SourceDBCasa.h" diff --git a/ParmDB/SourceDB.h b/ParmDB/SourceDB.h index 20978f73d..095b5af5d 100644 --- a/ParmDB/SourceDB.h +++ b/ParmDB/SourceDB.h @@ -1,22 +1,7 @@ // SourceDB.h: Base class for a table holding sources and their parameters // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Base class for a table holding sources and their parameters diff --git a/ParmDB/SourceDBBlob.cc b/ParmDB/SourceDBBlob.cc index 2851bf3f1..ff52a5046 100644 --- a/ParmDB/SourceDBBlob.cc +++ b/ParmDB/SourceDBBlob.cc @@ -1,24 +1,7 @@ // SourceDBBlob.cc: Class for a Blob file holding sources and their parameters // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: SourceDBBlob.cc 29041 2014-04-23 08:48:10Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "SourceDBBlob.h" #include "ParmMap.h" diff --git a/ParmDB/SourceDBBlob.h b/ParmDB/SourceDBBlob.h index 01aaa49e8..e412eed42 100644 --- a/ParmDB/SourceDBBlob.h +++ b/ParmDB/SourceDBBlob.h @@ -1,22 +1,7 @@ // SourceDBBlob.h: Class for a Blob file holding sources and their parameters // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Base class for a table holding sources and their parameters diff --git a/ParmDB/SourceDBCasa.cc b/ParmDB/SourceDBCasa.cc index bf31a510e..93481141e 100644 --- a/ParmDB/SourceDBCasa.cc +++ b/ParmDB/SourceDBCasa.cc @@ -1,24 +1,7 @@ // SourceDBCasa.cc: Class for a Casa table holding sources and their parameters // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: SourceDBCasa.cc 37340 2017-05-11 12:39:06Z dijkema $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "SourceDBCasa.h" #include "ParmMap.h" diff --git a/ParmDB/SourceDBCasa.h b/ParmDB/SourceDBCasa.h index 56259aa81..5089d069c 100644 --- a/ParmDB/SourceDBCasa.h +++ b/ParmDB/SourceDBCasa.h @@ -1,22 +1,7 @@ // SourceDBCasa.h: Class for a Casa table holding sources and their parameters // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Base class for a table holding sources and their parameters diff --git a/ParmDB/SourceData.cc b/ParmDB/SourceData.cc index 00943efe7..ef3adb02f 100644 --- a/ParmDB/SourceData.cc +++ b/ParmDB/SourceData.cc @@ -1,24 +1,7 @@ // SourceData.cc: Class for a Blob file holding sources and their parameters // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: SourceData.cc 37340 2017-05-11 12:39:06Z dijkema $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "SourceData.h" #include "ParmMap.h" diff --git a/ParmDB/SourceData.h b/ParmDB/SourceData.h index 7f839ba59..efbb81069 100644 --- a/ParmDB/SourceData.h +++ b/ParmDB/SourceData.h @@ -1,22 +1,7 @@ // SourceData.h: Class holding all parameters of a source // -// Copyright (C) 2012 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Base class for a table holding sources and their parameters diff --git a/ParmDB/SourceInfo.cc b/ParmDB/SourceInfo.cc index 61a68fd3c..27c9061fa 100644 --- a/ParmDB/SourceInfo.cc +++ b/ParmDB/SourceInfo.cc @@ -1,24 +1,7 @@ // SourceInfo.cc: Info about a source // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: SourceInfo.cc 37340 2017-05-11 12:39:06Z dijkema $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // @file // @brief Info about a source diff --git a/ParmDB/SourceInfo.h b/ParmDB/SourceInfo.h index ba78725de..8d03c7a60 100644 --- a/ParmDB/SourceInfo.h +++ b/ParmDB/SourceInfo.h @@ -1,22 +1,7 @@ // SourceInfo.h: Info about a source // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Info about a source diff --git a/ParmDB/makesourcedb.cc b/ParmDB/makesourcedb.cc index 99499b85e..b922a2391 100644 --- a/ParmDB/makesourcedb.cc +++ b/ParmDB/makesourcedb.cc @@ -1,24 +1,7 @@ // makesourcedb.cc: Fill a SourceDB from an ASCII file // -// Copyright (C) 2008 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: makesourcedb.cc 37340 2017-05-11 12:39:06Z dijkema $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // This program writes patch and source information into a SourceDB. // The input is read from an ASCII file that can be formatted in various ways. diff --git a/ParmDB/showsourcedb.cc b/ParmDB/showsourcedb.cc index e22aee520..f37bab55e 100644 --- a/ParmDB/showsourcedb.cc +++ b/ParmDB/showsourcedb.cc @@ -1,24 +1,7 @@ // showsourcedb.cc: Show contents of a SourceDB catalog // -// Copyright (C) 2013 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: mergesourcedb.cc 24953 2013-05-17 11:34:36Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // This program shows the contents of a SourceDB catalogs. // It can show only patches or sources or both. diff --git a/PythonDPPP/CMakeLists.txt b/PythonDPPP/CMakeLists.txt index 7e4bcad81..252f31f24 100644 --- a/PythonDPPP/CMakeLists.txt +++ b/PythonDPPP/CMakeLists.txt @@ -1,10 +1,13 @@ +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + # We set Boost-python as required in toplevel build file. if(TRUE) include(PythonInstall) add_library(_pythondppp MODULE PythonDPPP.cc) - set_target_properties(_pythondppp PROPERTIES + set_target_properties(_pythondppp PROPERTIES SOVERSION ${DPPP_GLOBAL_SOVERSION} PREFIX "" LIBRARY_OUTPUT_DIRECTORY ${PYTHON_BUILD_DIR}/lofar/pythondppp) @@ -26,6 +29,6 @@ if(TRUE) python_install(__init__.py DESTINATION lofar/pythondppp) find_package(Casacore COMPONENTS python3) - + # add_subdirectory(test) endif() diff --git a/PythonDPPP/DPStepBase.cc b/PythonDPPP/DPStepBase.cc index ac2ed84d1..526ae7a05 100644 --- a/PythonDPPP/DPStepBase.cc +++ b/PythonDPPP/DPStepBase.cc @@ -1,23 +1,6 @@ // DPStepBase.cc: Python base class for a DPStep in python -// Copyright (C) 2015 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: pyparameterset.cc 23074 2012-12-03 07:51:29Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include <lofar_config.h> #include <PythonDPPP/DPStepBase.h> diff --git a/PythonDPPP/DPStepBase.h b/PythonDPPP/DPStepBase.h index 1c46201d6..d5f71ed5b 100644 --- a/PythonDPPP/DPStepBase.h +++ b/PythonDPPP/DPStepBase.h @@ -1,21 +1,6 @@ // DPStepBase.cc: Python base class for a DPStep in python -// Copyright (C) 2015 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #ifndef DPPP_DPSTEPBASE_H #define DPPP_DPSTEPBASE_H diff --git a/PythonDPPP/PythonDPPP.cc b/PythonDPPP/PythonDPPP.cc index 40ff6261e..ef8cccd31 100644 --- a/PythonDPPP/PythonDPPP.cc +++ b/PythonDPPP/PythonDPPP.cc @@ -1,23 +1,6 @@ // PythonDPPP.cc: Python base class for a DPStep in python -// Copyright (C) 2015 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: pyparameterset.cc 23074 2012-12-03 07:51:29Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later #include "DPStepBase.h" diff --git a/PythonDPPP/PythonStep.cc b/PythonDPPP/PythonStep.cc index be3af4107..5fb40f3eb 100644 --- a/PythonDPPP/PythonStep.cc +++ b/PythonDPPP/PythonStep.cc @@ -1,23 +1,6 @@ // PythonStep.cc: A DPStep executed in some python module -// Copyright (C) 2015 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: ApplyCal.cc 21598 2012-07-16 08:07:34Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/PythonDPPP/PythonStep.h b/PythonDPPP/PythonStep.h index 73a62ff15..818650235 100644 --- a/PythonDPPP/PythonStep.h +++ b/PythonDPPP/PythonStep.h @@ -1,21 +1,6 @@ // PythonStep.h: A DPStep executed in some python module -// Copyright (C) 2015 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @author Ger van Diepen /// @file diff --git a/PythonDPPP/__init__.py b/PythonDPPP/__init__.py index bc1c6303f..19b8be2df 100644 --- a/PythonDPPP/__init__.py +++ b/PythonDPPP/__init__.py @@ -1,23 +1,7 @@ # __init__.py: Top level .py file for python DPPP step -# Copyright (C) 2015 -# ASTRON (Netherlands Institute for Radio Astronomy) -# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands # -# This file is part of the LOFAR software suite. -# The LOFAR software suite is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# The LOFAR software suite is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -# -# $Id: __init__.py 23074 2012-12-03 07:51:29Z diepen $ +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later from lofar.pythondppp._pythondppp import _DPStepBase import numpy as np @@ -112,7 +96,7 @@ class DPStep(_DPStepBase): It should call processNext to process the next DPPP step on the output of this step. - """ + """ raise ValueError("A class derived from DPStep must implement process") def finish(self): @@ -122,12 +106,12 @@ class DPStep(_DPStepBase): buffered and the last buffers have not been (fully) processed yet. In that case finish also has to call processNext. - """ + """ pass - + def show(self): """ Show the parset parameters. - + It should return a string (with newlines) that will be printed by the C++ layer. An empty string is not printed. @@ -168,7 +152,7 @@ class DPStep(_DPStepBase): This function will only be needed in very special cases where dedicated info needs to be added to the MS. - + """ pass @@ -269,4 +253,3 @@ rray") def makeArrayUVWIn(self): """ Make a numpy array for the input UVW coordinates. """ return np.empty([self.itsNBlIn, 3], dtype='float64') - diff --git a/PythonDPPP/test/CMakeLists.txt b/PythonDPPP/test/CMakeLists.txt index c7a2bfdf4..159b9acac 100644 --- a/PythonDPPP/test/CMakeLists.txt +++ b/PythonDPPP/test/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + include(LofarCTest) lofar_add_test(tPythonStep) diff --git a/PythonDPPP/test/tPythonStep.py b/PythonDPPP/test/tPythonStep.py index 33aaef591..e91e8ddf7 100644 --- a/PythonDPPP/test/tPythonStep.py +++ b/PythonDPPP/test/tPythonStep.py @@ -1,23 +1,7 @@ # tPythonStep.py: Test python DPPP class -# Copyright (C) 2015 -# ASTRON (Netherlands Institute for Radio Astronomy) -# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands # -# This file is part of the LOFAR software suite. -# The LOFAR software suite is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# The LOFAR software suite is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -# -# $Id: __init__.py 23074 2012-12-03 07:51:29Z diepen $ +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later from __future__ import print_function diff --git a/SPWCombine/CMakeLists.txt b/SPWCombine/CMakeLists.txt index 121ec107c..5dcc28908 100644 --- a/SPWCombine/CMakeLists.txt +++ b/SPWCombine/CMakeLists.txt @@ -1,4 +1,7 @@ -add_executable(combinespw +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + +add_executable(combinespw SPWCombine.cc Combiner.cc CombinerProcessControl.cc) diff --git a/SPWCombine/Combiner.cc b/SPWCombine/Combiner.cc index 19a842773..3693f114a 100644 --- a/SPWCombine/Combiner.cc +++ b/SPWCombine/Combiner.cc @@ -1,22 +1,5 @@ -// Copyright (C) 2007 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Adriaan Renting diff --git a/SPWCombine/CombinerProcessControl.cc b/SPWCombine/CombinerProcessControl.cc index e18ce64ae..328ad023f 100644 --- a/SPWCombine/CombinerProcessControl.cc +++ b/SPWCombine/CombinerProcessControl.cc @@ -1,22 +1,5 @@ -// Copyright (C) 2007 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Adriaan Renting diff --git a/SPWCombine/CombinerProcessControl.h b/SPWCombine/CombinerProcessControl.h index 09f10d98b..54409e96c 100644 --- a/SPWCombine/CombinerProcessControl.h +++ b/SPWCombine/CombinerProcessControl.h @@ -1,20 +1,5 @@ -// Copyright (C) 2007 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @author Adriaan Renting diff --git a/SPWCombine/SPWCombine.cc b/SPWCombine/SPWCombine.cc index d4c26720a..391265ea2 100644 --- a/SPWCombine/SPWCombine.cc +++ b/SPWCombine/SPWCombine.cc @@ -1,22 +1,5 @@ -// Copyright (C) 2007 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id$ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Adriaan Renting diff --git a/SPWCombine/SPWCombine.h b/SPWCombine/SPWCombine.h index f43438173..192f2ca28 100644 --- a/SPWCombine/SPWCombine.h +++ b/SPWCombine/SPWCombine.h @@ -1,20 +1,5 @@ -// Copyright (C) 2007 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @author Adriaan Renting diff --git a/TestDynDPPP/TestDynStep.cc b/TestDynDPPP/TestDynStep.cc index 34459ec0d..f5d2f0741 100644 --- a/TestDynDPPP/TestDynStep.cc +++ b/TestDynDPPP/TestDynStep.cc @@ -1,23 +1,6 @@ // TestDyn.cc: Test of a dynamically loaded DPPP step -// Copyright (C) 2015 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: Averager.h 30711 2015-01-15 14:36:28Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/TestDynDPPP/TestDynStep.h b/TestDynDPPP/TestDynStep.h index d2801fd23..c50f7b3e7 100644 --- a/TestDynDPPP/TestDynStep.h +++ b/TestDynDPPP/TestDynStep.h @@ -1,21 +1,6 @@ // TestDynStep.h: Test of a dynamically loaded DPPP step -// Copyright (C) 2015 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later /// @file /// @brief Test of a dynamically loaded DPPP step diff --git a/TestDynDPPP/test/tDynStep.cc b/TestDynDPPP/test/tDynStep.cc index 737f555ce..e87b13e15 100644 --- a/TestDynDPPP/test/tDynStep.cc +++ b/TestDynDPPP/test/tDynStep.cc @@ -1,23 +1,6 @@ // tTestDynStep.cc: Test program for class TestDynStep -// Copyright (C) 2015 -// ASTRON (Netherlands Institute for Radio Astronomy) -// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands -// -// This file is part of the LOFAR software suite. -// The LOFAR software suite is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License as published -// by the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The LOFAR software suite is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>. -// -// $Id: tAverager.cc 30718 2015-01-19 15:31:51Z diepen $ +// Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +// SPDX-License-Identifier: GPL-3.0-or-later // // @author Ger van Diepen diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 8b0e28a5d..97cd02a29 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later + cmake_minimum_required(VERSION 3.9) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../CMake) diff --git a/docs/conf.py b/docs/conf.py index bf15163d5..00caf2b57 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,6 +1,9 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- # +# Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) +# SPDX-License-Identifier: GPL-3.0-or-later +# # dppp documentation build configuration file, created by # sphinx-quickstart on Mon Jun 22 11:00:01 2020. # diff --git a/scripts/run-clang-format.sh b/scripts/run-clang-format.sh index a24a6b0e6..af16d3407 100755 --- a/scripts/run-clang-format.sh +++ b/scripts/run-clang-format.sh @@ -1,9 +1,9 @@ #!/bin/bash -# -# run-clang-format.sh: Formats source code in this repo in accordance with .clang-format file. -# This file is part of the DP3 software package. + # Copyright (C) 2020 ASTRON (Netherlands Institute for Radio Astronomy) -# License: GNU General Public License version 3 or any later version +# SPDX-License-Identifier: GPL-3.0-or-later + +# run-clang-format.sh: Formats source code in this repo in accordance with .clang-format file. # # To hook this script to pre-commit include the line # "./scripts/run-clang-format.sh" to .git/hooks/pre-commit -- GitLab