diff --git a/AOFlaggerStep/AOFlaggerStep.cc b/AOFlaggerStep/AOFlaggerStep.cc
index 15926629f5bb8dda690e477fca227b71e8a38992..235bcb984c15056584d8e20150bffc0572532fed 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 f7608986e76b482595e34d447f9009c1f5fe611a..d08df5e14199fb04feb5d4a21831468525206644 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 9a2a5452c81deb5e45c76ed4fb3afbcef271d923..7203341c9c7d54ab77472c8b2589a78758f2d33b 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 c3c06d55efb4c0eac73af239effe183565c09c10..be945a42f96e8b8c3da73abc86a7cb660d5c2dce 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 c78b3a7b50c0ff716aa1335d64199eaa2434e71c..03e726cb793643e62e81bd0ac499eabef02da2bd 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 3c70b1a5139523ea7f6605b1e11d7cabc286b79d..bf65539a182a2624b74eca123a0780ef17dac311 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 b23b8546c0e51c5f09221734eb92ba934fa7c674..4c62990dc476252bdd998263391c027b46bb89bb 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 045841d4da85e74487b340e6d78dac3d66a0d4f1..2f4476cad2f7f5e0f44b643207f1bcc2ba75ee24 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 d79ff0dbcc0e9256d496db0257a06bd394a20e0b..aefcfb401d7ef53449e405fa0b71662b5f20fa72 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 bb87dc88f7ffb54c11997a4f652137e7a3cc89fe..bfa3eb155e0b97f568b61c180e2aab5f328caedc 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 7132ec45638ee7c4bb8058b2015e2968cc23f548..7c55d592afa6eb9221655866b44fef4e4340b8fa 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 19af85c0b0581f7d2d71b8533df0284a454fe78a..948039a8def93b86499da1ecf18b165a89791e02 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 a6427692b003df756fe8e730c741a8d24bf6bb49..b15177859dc27857e94b8c74d422c0463d588d4c 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 c770b361326b8d6359d2622087b632115ea602a3..e3389f9da054b1eb40a1d9300c0babb33558ded8 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 6f3d51c137524ade2091f7554558a80d1ce10c9d..cb7375002062eb93583efc018e4f7c0277898559 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 2e75d3d7d2d727cbf4c09a24d3c811c4ecb91a4d..bd00c444f3bc0009d699a9ede62a97fb1481985b 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 503d618bd65bb3c812cdf7e15d5ffc63c99c8e84..551d317958a4adce635998c3a7728ef23d6c3eb6 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 f48d372b6661d021e2dcce057813db3234f8cddc..3775f158b32e3483bfbe8f363f7ba9d033551aa4 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 5551a1843a518e34bfa788236958965e7bfbd744..397cedf689435cd50502131ebf870c13603f561d 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 2ce2e0d7ca352e47010ff44fc07bcba02b341f28..c14ac5d3db5d1532d1486786e56e1fd21b8baa59 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 88b7f815e01e7de5668e965094aa336393082d53..c9c7028f858f5a6c3a0f9fd84ab279a3040ded25 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 d773408f8267c0db3e077ff08c71aaabf71b7daf..ab88314f314d01e3c500d31ff65970115863df10 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 18508aefe38d9537019f18213e89881d379e58a5..1d474e3a1008912072337301b41d7383dfa0999f 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 ad07926a74ff9cc48c02afa76e6c111c00bbed0a..ce6759d0e107385ce970d81b5d460afcbdf335f8 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 84d11a0d129e4bc9472dff5571dba01076a8b358..1da516c04ec0643d10747c32eeaa248525694fff 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 e88fce6ca58d9fedbc35b3a2c4232acc851f5e0d..b5573f6dc6d554937a6646f82e185ca92cf96d2d 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 17188701f046c4a489687415281c2ebf05c9ebdd..285b1524b344e8681fe84d9108aedabfac92cb57 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 11df40b30af4f75a06926e8e384cf8966e0523c5..e8ae16d42512c6aa046ea9c32229e82f481d5a5e 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 9068fdd81080248d413e2d453e3c8a146c7a8859..5d893666af95e0da369c37b93ee534dfe7df3f64 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 a1357c7d530a887968b080b8b3782d9caa06e8a9..278e97a11ce6ed2dcc8fec4ae5c59cba0419540d 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 88ce135c5ec98cf7644257359e2662dade6514dd..86ec3578ef437305b8e71017e9019273b3b75f25 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 0a94199cf1bed8721859f07218fe20b27f333179..dbd09d60a7e739680a07457706d2d23cd16b28ca 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 e616e83cee4767804b528a0dd545057ccd56a8de..6c5ef9e716d1b240e82e1cda6900cdf4d79e5de1 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 e7edef9977b26f7c9644a915f88fd30f4316c39f..eb5c5dc759a076eb2fb4bc385c0db32a57e4b55d 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 a1d0fa8b502f6b7c38c327d168a7b0c57a2dba92..f5fe920f5cf35ef3e8d6771f3c8c65240ec6790a 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 826c2896b7f4c50f553c4896a58c8f5381b2e438..470e24056a89de5e9d31d76f32c83d2cc278b1b7 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 5018bac5fc236db9ec3134a11eecae904e8ddc0d..e13aa04d21b4e2745c8c01cb5a8e9429d1c18fb3 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 b8da7c5aece017ce1d0652266bd32103f5123ba0..d6cf68396118b4b2df4ec3d911abb89e53007ebb 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 b4f854cabfa183e8156ad2900f7fc47d1ec050cf..d5cb5200ad6d9788d7ba417efc0a76a104666ef5 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 cac501ec630fabf7b9d177ac1ed8159ea9dbe833..d043c83e9e40d248ec8710c59694be3ae05f2f73 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 13a9006b226dd6cc77c2ef5bb6815f193d731ceb..a3f15ac081def623cca9cd31c854d13c565d685b 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 47aa638aff4d52fff035bb39d645da8c30062ed7..3d93de517179621070bf56d71592e3986475995f 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 35c1e3d15cd479debcc413f4eaacd59749b5317e..3c8a139d1751f44ba189b03f9e26528ce3af53db 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 52e31a7d91e67481272b9d0892c1b91668dc479f..8eff5fdc6bd0505f41ec5841836b6d3b60113555 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 5f7285ccc5d573a8aa5a8a330695b1fed2c87897..f6e8110ac92dcf2ae379ea7c74eb14822e28629b 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 f1b84eca927c5cfedc53d70c6b3086af7c43fd37..763f6944fe9cd06b3bd0c20368159542d3885123 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 9644c9a41f1eb86d077f73c6726eba41467f6cf2..855174864dffe8444bf81e35c88c1fba23f529e4 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 65ec1df91433be7016d9e8596223510b8f30bbd8..ad27f6afd0ec9d3f285ee0708ac69d0fbbd9cf24 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 42deafc63a9e7ac2c936a20c56778f2a96f6edb9..e2fd267ac5deba0d5cf8b8cc859810e519a3bf9f 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 93ebcf0d2dabc18c88d6d74c3e7216cbc93390b7..30ba60bd51badd08f16415f9839e2174a25ee3be 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 1a849663d896cf14d4a174f3937d689f181d2d7b..7dbafdcd420c265884a7f9bad9e0e105394cb46b 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 73a0e2deb264fa704533e9723f5f779ab2ec9b41..5dd2ae9143b51cb114fb779867c74109886e3ec6 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 335c4477ac178b8dcc79bac7aa4abcb2ce5dc424..a89345148cc93a2a6df9516207e085fa8324bf52 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 7110fb6b7bf204ea4b5f1336f4510a4cbec5b932..41192699487e7aa86ba8b94448378288dd365aa1 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 b3524fb11946ce6bec0b91ff2f12af304bb7c3ab..b537d4e03a94227bdf2d8f15332927e7c95eef2c 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 1cfacb8f82e2268d7b730e1a1d9cea166f3523db..e5648b8a817bc508e69b67693e6b73f4e6a9b35c 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 e90d59d98f94aa468f4c87cbe702514a8c3ff498..ad9329dbedcd99b78c1a50f2daed8820f32321c6 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 90f7016ea5bb53d748b8aab0875284b79d585e70..78e421de4678df67f938c38cc8e52f0c76b164b2 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 ee0337dbe6f16cf0a59316a96fdfb4562ade5901..05c8200574306a84932c3b07ca09b3cb1b409be8 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 cdb975f17e9553f98ed6b1495305fdbe31c989c5..2f907dde5c784927cdefd26c4f9cbf59e830c3e5 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 81bd1e2326b7d252927195bbdb4e4dc938a32847..c71ada6a9ef2c7bfcc45f05f16151f9fe36da9fc 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 4e34ae5aadf46b08256ce795c8b7c81977c1c849..5f682a80fc5104bb662abc8b85cc7917efe61177 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 6c19faafff0c53a03d5a2619549fc8a3b8b2f7ce..35f7df6ba09f145d081be941e631e84b83ca57f0 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 48680738a2fa609b1a1fc87be5416569fb99c49d..5a6f583bf7061f4ce7a92f77c85d64987545aefc 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 eb827f26cc61b03b84e8f0309d662089c47da2a4..58c5c3d904755e153361e8cd476a521a6e66f49c 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 3ac27a296372c65ea5d2a52b5fa2abc1cd4d7c5a..7bb908b64580415e481e987f51aea6e606bfe756 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 51613209ae00808a14574eb990f36eee0d63947e..e20be7921edcd859db214bd8d4db829b52cbcddb 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 64cd29997fd6384efc00de90c5b5c135f6c3c6cd..e010dab339d6c3ef4fa95150ba19e30a76130cb0 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 8364b0f7646dca4903d98f9cf1df2840fcd4999d..ce5c667d123be1045d342772cb6b83961a772a39 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 c926e0ef34d2fb9c14c581d92536d008dd42efd1..d5836ffff855f9fe30d74d8baf36bc76457aa10a 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 2df8602bc337fa1f484b655db71639fe2a828924..e8bd75760c067c62708d05e5289cb4ecfcd003fe 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 e79ede7a2e715dc0e1a00abf317a6b308f4f3849..6ebf1ca6b0c3067b8b87adf69e6075cbb59a8284 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 89cf4ecfa0166b13867f34d46889aa4da01fe592..8105c7e43204c092555cfbd0d0d39cbff42e9380 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 d25ca016eb6c0d4ba56f35f184f47b2da164212c..3839617db20c3cd89cb8487424e9ab248eafd8cd 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 bdbcd99be4cb06d6815f1b43a0c86584d5207994..229b5b755e81de501a85e77b5a818ca59eb5d2f8 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 c6325561a993d3d719602e9989b49266d2be6e7c..a6c178df33a23d1fa094e4016c34de0e1dd5a8b5 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 102e531fed5772412254099559aafbcb138505d7..400cfe265ef7f14acb89fcfdac42e1e33d12345a 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 28de49bc53a3b4d639bffb02bd22328a0b2a4f17..68fde93bca55825155f79e8dd3706d16cac73427 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 16bec4b5db63b9add281d2be06c445800785976a..95d9385ec2dcc9ac69d5338103aec20708fc8f5a 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 a4160dc6c3d544a85d6e0fb011bc21515cd915c2..584e8a6ee0b93909dd5c4d673d7662b5120ecbe5 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 f6cec9732fc59169141ca3d5e5e4818d49ce8dcc..c36ab5e6850af6d3b19796823397fa6dee533ad8 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 97a6251cb3ca0effe911499c54d1cf7bfb26d65d..52c92c28eee4b550608a0bb0d38e9e8b1bb3ed0e 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 0f5705f77efc8467e808f89a3a8afa2bcf81c237..3d02da2c5f1eeffdc6548188fa974ebfac7e0a75 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 fcf97d1bbb25a9edfa40ad5f7774ae47ea330ca0..733075c36768a98e5e4ac724bbd5ff098bc91f26 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 1960278c35bde4600fbcefff28ac36f232cafa07..42d7202b17bbde3416687a6ed730e7bc5dd377a2 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 90726645a5b9b26a77106e7c19ee90b2bfc27efd..198d218a07e3ce00403607b4f4510e1ea71f1e80 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 3f95efe531db35e21b9bd265e400aa74dc6d4e6b..1e23fab0c111bade16d567d87c266bca71c76824 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 a98e7bfbacc233d9b6a6132c694d306bfca1216f..63260ba79026f78272dcb53b1c40506332a1f568 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 5a6b7b75f06405cd84980ac53604ed3bac19cd2d..91d63d6f662fca5cb6fccb0a272d9836cd9e2f65 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 eabb4d49bad3127c33fe256b1520bd22c4ec83da..930d657e4d3b341a87723ff7426432459f1871ca 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 c0f2f183e0795abae68468ee52e8779b74cf244e..fbb05631dd7feb1a43a5b5d9f270a8d280ad46e6 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 fc995cf599b6f57fa31b24d1ebbce7668215b546..4e61454e0a0fe2d17568c4b91d0df28e0a9682b6 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 4d0ff16b85093d206719df73926b4238d5d1ec4b..604dd09ef5127fde4be7533d7ab610228353da23 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 3bcc0a27d8c7a87429bd3e7c6bca6fda7956e57e..9fd1ebf05b1e6b0cb95ff4e77e3da3c4e6a047b2 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 2b997a9e89d5b03d791aac62c115837091345bdb..51c112824996e7e6368706a231c767ce82e1fef9 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 de840264a1a2cb3309eae6546d89a84c7a4083fe..6d1b7333d50caf028a7b55c593dcee8bc6f0616c 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 e938b4e576db1a234ccb919710c9471ee23517f3..06afd6be455175c80dc0e6aa0367874f5fd01729 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 3c52ef379a68442ae19018647a68d9c292f0a0e5..125cd0ec63c2cc302bbf5ee8100c357bce766e26 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 c9590f1f27f3604a138d5b581e442f4467e31e98..677c8c1b71f2dcc5ac95c89a74c367ad38cc3f54 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 4528c5977c6c6bb9ff2a563eebcbbb27690a6e89..9573916f09fe026192deb1785573f270c0086ad8 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 c3b111256f88622768276647e916a59ae35705df..e91766b9451df9e26dadefa669d0dbef7c504ba6 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 772854fa1b6101d485b3f5129dd90aa2558bdda0..2ad4e97c69b2e3793c24ae4f71fccac59de47815 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 f8bb8551c084ca75ac30d7e1c64c7857a01be60d..493d7a3d92bce5a373788685b3a8afcd3bfaba10 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 09af9a7b7199cbeee30a9862a9f370667ec674f3..8b5e8598d1f7df564912d1d3b40d118b4847872f 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 a80c443d5f49a30bbd5fc78dd473cacb88ecac74..8ce8a2256d2dcf09d190925fbc49222961a47467 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 9c8fcd1a39196b25363823c3a3d3ae6c3f8adf28..7f13120a39124f2b690223ab43c72707d86d148a 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 2734d38f55547530b68d9f7056bf3e97174d4f81..4b3aa73c00e454d7a5cb4ad3961cb9faaab1fb50 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 2054718fd93d4ee3ee137a59f995213cc287eaf5..4bbfe739a31d03e456cc546ee9109098447f7eac 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 9ad10015d21609ab191ff61b20925e2b9b1e194f..6ec01dd77962c72074bfbd2faf0bf668aa677f52 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 376f38dbc8e94b8337a6d00b55765b07af4ef4cc..523b2be364247d5a34329647c05a063824e12e8d 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 b097b3beb5d1f382e28bfa6c0d68b5e9cbf56130..ab29a4c04a818639d87ac6ae4da351821d0c136d 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 80b3ace0f43f1117da478f7c6706a1e9d5fc0528..d7be1bfb9fbe327938c22f476ddb7d00a79d42ad 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 23cce8873d9feaa293b9fb0f5442b7366ae5ddde..ba04ec540369ef84c4956da646fcca45e6c3ac1a 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 6f240b0a7e0da87b5bbff1252b4647e7f6f650bb..f73de20f35bf6fe825c0e1cf6e27608cff78e2a2 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 4b1399c3bf08f63cd7d8dcdd9523a78e7a8b524d..2f80ea887bf7cd5e8b15fe1fce0c562df419f492 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 63966f47670bba2ebf0126957a5c8759928c0c6e..eca9d8b130e64782e8590d9c00f1cf246b18434d 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 899a58d13f70252a968056ff02920b3eb3c597d6..0f293132dfec5e962935ee84177f7113c2cbd184 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 9e06adfead90f48628bf2d231d96a6a626058680..d1f5c55d148ae51d5aa82e1242ca7c71cfb7771c 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 bb29eff89592f6cc1e477373adc369e85ec8ca09..c454977be2ff54d38da2a6ac4c78122825a08c48 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 53b317566c28ae4f2371c2ccb28b0cdb3c43dd46..74555726be151ef83482e7555446f150a19ca4f2 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 0f2c97bfc76c512ab9e009815ef833f5c97537d2..605fe68cbe40f873f676495d9c3fdb7e2ac36be2 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 878480854d367e685fa824a49e5fb1ff546e6064..5fbdc66a89df2cfafc2151dcd4979df3ccb37ec0 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 d95f1f58723ec07641c83ca427fbac8e50613fab..2e9ec35ebbe045b6a8fe60ff2e26059ed1891aa8 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 2ce03093da9874466a9c160a23fac9f2a3c17c9d..61ab77463451424d72a96c6e86f7d78401f994cc 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 4f905cc8c4deeae12511915a188cd19342957b2c..67b882ac5cfc9d589569111d9522b9f09d1d04c0 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 3013d4c84bc4c027078d025364364685b87f2bda..48b927c57f8680335c8ada2dede5918b153acef4 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 4e58bbde5fb241b4554bdb9efa0129e0ab5ff04c..3e8002e4c67df80115161fef4a474d63096f6fad 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 8f9327994c992a283bc54b58aff7b2c3b1e52f6e..6c1f9e27caffada6964b5994fc15a54263622257 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 b3183c721a31ae1d6c1244b2f76d994a2f1d44c8..629753a6808580627a6aa4c3adc9b0f005381e6a 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 e55e6980bdfb1368299028b8fcfdaaa4c3fd0436..cf9a7f031fdea75ac9db0ed91dcc2dc00bd3b96c 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 b2fbcb0d0de5cf8ba4c5af8388d0638159ed6268..7f5952ae0995c4dd00e10f7f34fea24cbaa5724e 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 4a85279bed131b0c3e0f0ff726f8fc8382ea7d1a..4df8ccdc552015e87fa7276e5ba1b63fdd12b349 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 4ad968f3253e59457e725265d61f8eeb317c33b7..2a4b29fc8d7d11de09ab681fdd9ad8fce05263c2 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 0cfc722c34c1a08c5e4cdb10856492e68a49bc0c..73d43194ea450df42b6423d73d0a969d50956ed3 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 19d677bb9089959319947a11d097026ca64919f4..eec811dbfc9297d0422670b9f3b3833eaea56ec3 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 08c1ccc198fab8a19b2d549a25e3c15945189e75..88f0452c6492f015429a59ac5ed38f7e43174a81 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 2c7dd1ed5588bef9d12a790015b9e385384e14a3..4dc9d7f4cac9fcb3b0272a4dfa53dcddc9bfc1f4 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 611505ce1746f84a68a86c88c684cd8c9d8598c9..e6167390e460d67f35ff8329a565ac19bcb50a1a 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 bb57ac0d3b1ed5b92d22557c54f04bb2d11d2051..d1237562472a7fb073326e3bf40dc14451d6e129 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 94a36ef1dbdc87edaf8d717536263eed7eb43640..731c7c156e9257ff3232c26d6fdb1ae16038f44e 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 472f31ac8c2bd2ce71684dc8c5fb29c56cb8011a..63602a65546f1d27db2c217f72fb5a99818d9299 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 3790f85cdbe200797ab39796a4818a94b379c6fb..30fc03848a71dcdc96a0a316e6d4f281d9fa62ac 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 35cd326c75b2e1f2fd2eacbfebe83a5f288afe0d..3639e6a46d7e476ecda7942fc4ec7da203dca0d7 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 e4c588ac1936e826a2b16ca8834a938181a79a12..2df0273a359d628a4ee204f2681cf66c74a36888 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 9dd6507efaaed1fda576a3893aa3fb531b09a03c..ea554c401f1e7182badb11c73725957db9914745 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 4f2b691b7d204f98deab9ea77ebfa89ed0b69d66..d6b4cee59c434ca844650ce54304e551a4d24121 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 d1ca9e73ce7a614eb2c49125f26d100bce825208..acfb438c6016b2a02891ef4ec0f3c1b52ee91772 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 91d34abe4c772a8adc6b8c95289128eb682fb96f..73caa0bc0a96fbdc00d1a5952f1c944846b85619 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 a170de9eda077cacfbef9dd0a6665da06c57b898..a8c3153444bfdf3e077b09916781905255bae536 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 9547329008b37d7b3f16b1c6a78b2833b85f716c..3f00b04428d1d2f905f9bebb9bce4b4d7f2065ec 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 f2ae11d2ca36656f4abcdbc0e8005b0dc069172e..2ead58a91b817ed24d65c8ee38f86666840a363a 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 4b11f2ad286bdf421af92b3510d032b9dbfc422c..e4c375f93be5ade0be866b66b7198eb7453845dd 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 d6f0330905f9d5e30ebcdfa66cc277b37deb5d3e..6548fed6087037300bdec1fd42a29ad183f11e7b 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 f13c22dae07a0d291fbc112ade412b7f6e908ce3..8285398a1967ee20ff4ba091b96d42033a3f3263 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 f36d40b8c4a4c06a1281008476cdf4d91140081f..bebd21b5bef1e5e665bea4d9222f6f19bfbfd9a9 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 c1873658b7674fe8eb99289209c99089d050d588..5c90501baa0337dc0e4e9a9739a1c5f11b966153 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 7dbb7aaac86e0f8de18d0ed950a705968cfbfad7..7f24669b76b27801e5085f7c48405ed9f7d10f85 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 f0e376c28a514ab8a601176c2e0b709d3aead77a..f1dd5d6d057f11f2c661b1d9fdc1ca92a73b2a58 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 256cc4cf7d0322d85b264ae2e42c6c9e15185b48..28f0dfcdeb6642db998814c0b8f9b9112fe3e04b 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 9227f2d0db82050587e578afc4043feb7322463e..a8439ddc964b517093547b1382b5aaeb4cefc586 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 4181885a2d23b3df36204e981c1f9106eeee91a8..2055261ab26772986d464403ca69fe0d04da89ec 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 baf57829a805eb33de80d6f0aacee8fbffc96a31..a99577ebababd64ca77768514f876b899ce75168 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 2ee16be79005213cd3129a6b0de230f292a20148..ae79b9ec66cfe891b8cbbf53974f356ebf38e6c3 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 1521db51d1629630eb7773d5a295b02b9940281c..b1d23aaa8190cc4a7154d71a4f1564e4c4df092c 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 55588461076e03b1b16e32b7a02909915de074fc..a263a604e33175774a03486beda84c0fdd65a25e 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 26eb8415ad615d87da3957bcde090c5331cb4a45..0ac2491a4fe067bdaabb38b49b29b13f737a4086 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 3dd34fb8b02a33c3161c60c00ba62c36d5db2c54..806c2f589aa309f69c7b353dfd0c2b2aac30b05e 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 a4a57ea918808cc056b133e7aa0ea3ee1b661fe3..63fe643b0b67df30ba93b012bfdd40ab8e532190 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 a42e64213a6d038339f3c9d87807043666dc1148..8a021b595d03a031fc722f270762609de929a830 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 870f47a729226c076bc5aff2c41ec2182bb35e14..4207405bf9a9b3fdfc561e32a7e4a64a382788dc 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 bafda76accae467cd909e56ad9e03cacf41ec5ce..a7c8ecb678510639d8cceccff2c123cc3cdd4668 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 15de92474c1a2a717f57f1a0a0f4acdef391cedf..4687150361dfaa44c0204cec6e76158455e7bda9 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 44303c2ef26580d00973ea3bb7335b661251be91..1923396dd454f137f614c9b565fafce92b76952b 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 31bc9fd6b967bbcc7854f83762bdbfaa88ebe457..657a5585208feb43cf01cfbe07e0970e00046d3a 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 3c81def1711721af77c8c909a1b5c91ae4327034..bb7a64baa585072dcb4bf122da2f3750c277766a 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 917a3ee98216797f2f136132cba64c54d37a1754..5d84842850b031f291439791c5c1e4e8d52b8856 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 0480d4eba8428ab25b81f18201a07f5b5d678176..c02b9126667470efb1f3f83b8ad93e0a86c05ac4 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 5c14d3a2b289790572fc24e9920a38ec87704571..0a979d7e5630b1e7aee5a12f7c9c1946bf2acca3 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 ba4bcef22f42abbf8f4217881c5517f99d3f4e36..5790c3ddb4cb3276dc9f828193f83452ff5072ae 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 06dae5f5545e65643940a5dee3ac5a2a52ca81bd..5499d804a2583367b8e9d1b9200f343ddb620cf6 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 bddb1199232a6005084eb4af2390e00b65c06735..586864f2001444b33d39343b0467d89c59ea8f17 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 745e446af02a6252263d5817ad9309fc9aa83f8c..c77e84535144f7e3314a8e5b211fdc6e6f304a71 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 028f97374c0d53d83b5d0f58c4f33fd7a55dba89..029ca04ab0aad1bf60804b481100a7e45b8051c0 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 0a255f16c76a67d90491cef47980cf91612fb3e4..b8c6395268bdc3abe6715f5a8ceb9b3aa82b465e 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 7fbc90a518387d5bd3db5e5d230fb8f0123daed0..cfd4e3a7a1b5e26d78ae4f509562c49fcf39f6da 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 2e85b10f7ab61c86c5d2c36f434f38de11bc42e1..016f759873d0d54bf1575c559c5380e7951a9758 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 e758fe7011ffa148b2455201844bb9b4594443db..45a45b61e95ff8639c660f85f219b821f6894f5c 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 fb1950841ce726b90cd09dcd666fdabdd3eedbb5..0038c570c580985665d1d8900d8e3062ae19aec6 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 2c0d8054ecf1180151c8fce3c976812e12a7401a..2307e05c273f01022270fabdea565e5c4ca594a4 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 d56e9a06e28c7cecb4055c908d3a89ddf8ff1723..e11d3f054e9f09c74a0a44337e0d41b4f3c1a643 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 32e10fda6101c80cd5c939054e10042536224879..b5b11a8697900cb36c63807ccf9ea450c49131dd 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 8124cd7a36ebc3bffd79864a2acb504b9612fc3b..22c8fd22a8888d04af25b066d9d037025e22e48b 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 f17cecea08ed0d9ef27492ccfdc7ba61ffdc1f7f..d5667fd7b54905c5306904b5abb74141ce3eeed1 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 05dfa920a3584c4af390172f630b325bfa6dfbca..4637a3b1c9aee1af4ddd25136059974b59f964c3 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 d6863f6ca2ce2a32be467cd84b7e4027ea5de582..117bc63a0b208093c18f6c3f878deb8cf90e55c6 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 987231e6d515e4ab309d1a78d4eadd10e92d3205..23aa8cee70b59ba8e1daab8bc0e340d5ec58133b 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 4e5ba468a3175a45169b88960451530348570b2a..8638fdfae81976bf1eea1fdf4b4194049da0f5e7 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 a732d959d77027181e7ddc86f426e0521e175116..94454ae874251dff0d72dc657dcc4d57a1cb94ef 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 d196a6bba7187575bfdae214ae99af60180ae16d..de27d738fdcb157dc728e784f54c9c050514c103 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 4928bf861cab8b063500272788874d488d34a796..f11107fa3259d8878fd7b43266841376c6bfdf70 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 48e685524c923cbe25b9164c672b6d2dac986839..29329a06f3529a4fa8e7b56cfbb60f113324aea9 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 8251bc3cea386d657635efae0a97cfafe1e6bbea..7a1f5a95ba87beb9ccd0fca3146b2ae61a17e242 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 1f3ebce02ba86980aca1491447c167041dad797e..85cb80d59114b642bc3944631fd573a04281c6dc 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 8ae25916683482c8bd163eebdce3e2e02e1c33da..c9befb69220f1d61a7cbc9d301f35263e99f777b 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 665e925a6ebb54223f0b94a4430f7c1958c53a36..21d5df3c913c4a6cbc23afd4ccea79403cbc51b1 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 ac6794b344a409f26f363b4fdbc508b797031f30..e7de7777bf8e780057868945deca89a191ef7f9b 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 81675f481e5a970189c7273a4f94799f196abe5c..b9096d7fd09a4fe9c5f18fbaf72a69b0816dd164 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 37a8f663362d0d0857faaf0b9faae768d73bbc55..d9e559a0a3983c509daded4e31c81f0296cb461f 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 f5826e03c07cccdb5221a7d66e521e751fb76115..427f0fee881c7257c7da74d9aacbb2ef423af3d7 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 b60a48e06a62e0a56878684b7452c5e629f27bda..21b6be22e347ec3e6ef467b3fe85e0d1a8af69c3 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 c33fdf4b316487d5932ca3e766738cc682150da1..501c6e36afa5720ad366398fc6fdd26a3429f191 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 8c05c27b4ca9f4b39676186328dd9e66692a892f..290c0d715b13b47789045d4518864bd199c5396c 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 2f3c6cce22f9336030117d47bb1ae240ece9e7f7..f7d18fa34199ea173cc5c3a7b526b24bfaa662f7 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 821f44c254e720b0265f614437489a251d6dd743..1ef5e3a2929e9deb946a5c0877860dea1f32a90a 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 c8bdeaa0e22160383bd3dd7133cfafc02e22e961..52bdadfbe9a9c52c17fa2b783627a45c4b7aa8d4 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 1a8c477d80edddb2d4c97760519525c57b7e36e0..6d0fca6f0b05c49e3865f9bafb11ee964a69151a 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 835bc98c0695f74dc298054ebe13a7ced8ab4f0b..3fb3537655c577806ee7f61610ea3f20502fdc00 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 758c772fb2e045f2a1f3855bccdb3ee94e8ec180..6e105d079ec33aea9561f6533a48b78d3911e17a 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 d7d2434cccd619df0d8fafd395faa9b3aa9ca464..aab658a620f0f2e21c48c596d0d7e585bff91300 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 b08883d7dbb0e9e935eb5b609ecefcca508af54f..68f2365c5dff7bf78d00c733cfa4f072768fdc6e 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 3a6f6b83d268b2015d7abe138f6951e7fc8f6523..a62097f7fb477484cf26ec5de667ebac3ddde21b 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 fc354ad107fdea6eca7c17504ed68706278d4577..e8ae29e86e5ab135beff4b0d04c5730cf697e2b9 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 71e403b0c8ecb4fff155007db18ee4b85599ddc0..53ae530c8af68ef67ca983fdced9da30f3e940d7 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 e0595bb6763a684b48cfda287f673b9abdbd1140..838c5bcffc7111aaead667d542139da0ef4be604 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 1c42a6add40056351c03ebb4ddcf259884c33a34..27a86924de39a4b0e591f9ae275dca35483a5cf0 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 e06accfe6d3acf77974f950502d55147f6d4f09f..722cde1b50ce04e2e1d2c7cac5cc1419021e05b4 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 693ad11acd711685ee2f25f266463cc88239aebb..e283544cb0f1ca34fc205ae5049e1eed17cbe45f 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 0f8d753ab63db3c38f9f3e42064d192f8a7ae133..a770f9af5cd848dfb0182cff23a63195e174d470 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 87a28f7a78d52a2c263ccf7ea9515e456b339f67..bdf74371de687da4998ecb3394d2ccf198f436b8 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 24e0a15d90d0313d04c657233e1e1d88f1016b29..5d0592a45bc44cc18a321ad407838eb4088beab6 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 ec5115021407218b150d0951211b4f7179f0454a..ab6a552e4b51d87b6a6028e9c42e0ccdc700a3aa 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 406ab3181229f4a24558915d23451b5447b67896..2d65c44e325e162a18cfc1b32e52a15fc61861ce 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 265eb67ad9be5cd9f49b5fad30cd6ba6d2d39c83..66feb2752d83492c0f36b17c6d2e1dd13fed7c64 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 68878af9b8d1e57c8eb0059885dcbe6eac51d8a8..5568efb02a5e358631f0c87036260bff102ffb52 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 7a2c26739f02e1b61339664b0d9ccb4a380fdd13..89824f58df21bb813b6fb6f1d68e01ebac769dbb 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 176eb0988b990c35a20dd5114117c5a0138c1fbe..68bef9fe70f64a4107e4fa72381e7d9fbc03e70e 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 305d5acea3baa9abf593becad9fa90c9611599e6..c9b8219ffd35edfa8a2a590c21fff42448866751 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 17648df0d2b8d1fe7304b91bdd3fd4147599d91f..c17e5ce52750928e3d8ec407c01591d88f06cc33 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 85832c53a9bc3101a6b80aea9c61414830aa0cd3..36af3a9f113a2209c4a51bea1734c602e30f3ca6 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 0cf7b5d4513f94c16c3943df071aaa8bda0f25f1..e826adc6df82d80c6dd996204fbf8a0c89ec8856 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 6726eec0e7f1734e73b7a516f17facf9a7ac7bfd..6cf2f3d75f03f3eb080174224a8142d6e54fdf6d 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 3e371c3c356115b724703cd6e48f8014de770dbc..9a9dcd98311ac30b75505d6164cbf1e0649cf4e3 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 79bbcdd756f76d328cf298f8194240cd17c64e90..4ab79475ac73853f6de5ba1f904cd6ba5ede6036 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 7bd0e82bf36134531080bcac021efd91b6c6b696..2108d3f7ac22ce14273a38987b368f53f2ec5534 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 deb55c9ecd6df8b3edab7b9f5cad420cdd0673fd..9fd90dda0c1f946e284a1d61b3c1dc8d72b0c20d 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 ac2d8653665737d77e38dd15a8281911bf226ad5..cb7f5d82542922d2c0be382eb6df7257a98e5729 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 06d505eca64ca20e13971e1e30969f6907fdbca4..2f4cbaefb79bd6dd6cb057ca1426efd1619d4204 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 8f0193881d7a6603181d8f7a96c58498e434df22..3020e603f132751a72a720ac69be3b04dd443a74 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 382fbd4d77b1248aba7c55673167c14afeadf53a..c846676c28a0165fe4fcfb684709ed87b4fd96c4 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 f0e7a4a30b8ce990c5817ff7eade5a0148d2a418..c7993e8edf8976afe545dac7c4db1c11d34b950d 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 5adf25334be561f849232729497a031a8b93caa9..f4c23df5e9bf0af997bcfb288b8be0b9b5eadd44 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 17167211631088c4c09f620657da2716cb078ac0..ce203d7616d9d31169e9f64db88f31ad08b43c38 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 f7c292c86e723a673e06e31d4439c81e11e6762f..db0fad2f6d4769fc656bedbd7f17f2bd592c45d6 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 905534375511c77e34c652354aec42a0ad80dd59..67df38b4b2adf8bcfa6e6e8bd57d8472525ae2e1 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 68964148a5743297959dec3ec96558e7f6d1a3c5..cbbad7f1b20db7a4dc0269b576d80dc4dbf7515b 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 2abc8d1ce256340501a7ecbac426c3d81a2467be..84c4bc8502af1e7daea8d172e0948438aeb3c1eb 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 b141e705bb9b3f1f7c79a2402903b3428cb8fd2e..4fb2aaa3e4b03170f99b490ff1096df7216745e0 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 9aac8b383193216c635534eb923cafa7004a0dd7..3a183646a78f708299712c688014b53f40531155 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 0503efcf6890a975aafd0d10a7c4dbf3140a94f7..aaebbf970c9597d65ff70128e16f0094b658ef40 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 c0accc7ff7b784661fd2ac914e6e3deae2d52825..bd0aa8e37165eeed60ceffe13c0134158394625b 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 56c122ad8c3b50be642b66fbe19c99882cbfe6ef..194bf4cb1b266c507dde9bbf6379ddc8c9099060 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 daa07d2f1476ab71c089aa8d871e11fbd25f5bdd..01b6d449a32f90854f43e88a54c529ee855a6894 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 2cf9dee9b0972ed2a7557e0645ed7b8892b01004..c317fc4d4b5c421d541eb3e7861f1a83141f377a 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 8f3685df554d8d4d24f54b9ea6357af9075f3097..24357f3c669b7b4b5943ffac4fde4d0a8a39bd6a 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 c2fab649b1280ab7d37c3a59b91b4d8148053940..82c4430ba68db7944909dc62992a178f111fd69e 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 30c3014fc38b043c970a5edd87c22820f41eb169..a77d29d4b8281c9362e8131d1124d1d336dc0522 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 d4bdd359f47eef9faeef194347b88aba4d02b5c8..43f8e54876ff432c98cd059e04e31642916c86e0 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 791fc0e48c5fcc82b42cfd49753d51f318d81859..87d30547c45df2419f95bafef750eae853d72ec9 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 7040ac0f1974987d332320e63518be4839db6ab7..048fe1b4cab42d2fe631c81b954c232d1b8dbf8e 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 9517b6b4ca9017426c0102d18988ca52568daad2..71435f3656b7292e869ad4f5de1a67eb25617148 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 99aad5543f177556a49f3baa40de31ccad183f53..5e7a59fdca8dfa785ceb964fb1da9cdb8167a013 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 e5d5452f1b840394865f5aaae27cf79ff04d5768..92f26bfdf12e3cb1e1024ba41cefc014e11e6040 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 496e0e5ba03250937d37faa5cf8e0c3b307dd020..03a7f7197b2ddb748211bfe68f2065aec0fc6ff3 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 ed28c5412702c1d650b5f8dbf6581afc185cd038..6e5df155892ca0d50100e8a0f76bc95fdf24b127 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 1cbf0ede2c9113d5de55ed98ef60b397fdb24b0a..5e802fbec1021bb88f87803f393b0b2bacc6f080 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 0cc922115d4c816c61edebc94899674ce86025b5..54e1fad9ab33778a1641c80e84dbb3f019f60471 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 34448c687e6b685ebac59a17141b2abe12af4bed..976a3ec2f2f5d49fc8308c4620016165d8d0127d 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 8bbf7e519ebbd67fc59350991036424c3b91477e..951148b39b352379577e3df77da7edb87966b4e2 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 e22c7ae2e81aed95c8e3f84d3a0ab6a895a751a2..935c405d99711cb04df64552e6e5062da8d88e78 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 d62ba17cfdc80c59f049a35cd8d841c5e43e3214..f52323d012570da6dc4f605e8920850047e165e2 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 605a6f77ea4249a06c30548eb3669858c84d42f9..73ee66b2f67c41786b766fe73be57c7c8aeab765 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 a15cf28e06f3479f0a741dc27431aa9f303da7e5..5f76f606767b577a74318552c2ba5e99ad549d77 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 a167fe8e25d6fbfbd189c5244851a5ecce9e4404..05cdae5972dd7b0ba809ec7a4a69f21b29e2456c 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 2ea813f73d73ce5d31041877967df6e217ab3493..0bd7928fd69d1475d82eb8cab11ef1f1c18dae1a 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 19bbadf5a8a4a01b190db2f858c234e8b328c921..af2d5ac4797059e5746305292153658e9f8196ac 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 72a70e05ecbc7c4c041a959d5598cda1206018c5..bb1855064b4a062f4b55e939888509f39c32fa6b 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 b707efb96ee8fa83e6500887bc29afaa808c7455..74ed34f2a10188cba66a6b52f4646549311af634 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 21c1dd9410b89342863967e45277a0460c2974f3..fac6dd76d19e5e5954de464f4d8f63e976d0d865 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 00943cbe7832fe7dea6b79afc70635e0282a4469..2eb9efc115545541efdd3629f28ff7c5450e0078 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 493cd0a3117e1e5e5c8a04c3f0609a5a156774ef..a76c1aa9b65e71d9f64e8e413ffa2d2e2c932eb7 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 724cdc714dfed3a092103b5d27becccc7c8b8a93..a6dc6d3e6caa94639a852162e171de94b60443c9 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 d1178107610f4806e86f08ccbff0d4ca324e937a..b5bf4f5815af7adfbf2583c8775796859941a8c9 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 16ae9a1ec1f4f8b69d57caf87341793749ef3203..3992278e351c2598cfe347a15f80d1442a52b3be 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 2cbbeebe25ed0c43841a7a832540efac7321b175..059dc30adcb38b52221a059637b6ff82467db3ad 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 de50d0163f4cca6d0111c0d3946270bd551bbcfe..0bec6c4db9fe97771bed9746c4be92ca03c70618 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 d795a4f9c7b80c0a1051232277c6dd6dbadda96d..8d26423af892e1ceb07166a2e5dac4f3c45bd0e1 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 c4b17a8cb7d83431c45185c518b6093d1729edd6..ccb96ebfbcd80feaf3bcad12826c43ec17860b10 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 df30d02e8f04a1f20a1259d2e78db807aed0b8c3..069bc36734c2fe83efb70232017a27f124a9cdd7 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 024cdd3e57f4ecfa7b9df16b918442fbfdf867c0..987a805cf508d1c798e505196ac06618c12e5418 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 00c0a8a9a638174db5589418ac189e44d3b92d27..d9e023bfe18d3f9206c78c8ce05bd5c82b87ae7d 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 889b53bba0829a920cd67829288cf636a1a7bf8b..c9fb50b50112d1f53399bf59e63cf2b9a9d72a65 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 2537ad54bc733a1f4d8979ac468ece87bb365850..f209396bcaafd03e847f44d03d79451d149ec3dc 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 63f1449244d7718feb6c3ad75fcfe677d18c47f0..a0ddd819b5c88dfb9d6b03a2176990fe956e8d73 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 a19c2297547c1cc79cdaa2c300ec7db5cd2ea030..85ff69e504da275959a32f8c035ae9e23a6b046d 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 84ac175be00381fedf5555566ef7bfefddd5bf9c..fc53e29ec95c4935591997d61eb77775e1ec563f 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 a356c3e016484cf8f71d5c13aff94f2eefff252f..28f162d25aa7644de9f255409740f966adda7ae8 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 129c075638d066a9c2041f5f7ce5ce42b67f471c..0d8e0ef46b23f75ba51d6f319365a96a8afc6b82 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 0395890f0bf1641c94c8aed8679006974c184664..d1232956a707bbb5061ad30e6e546ab81875f45a 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 b0df86a83a81d837a56746617e487cda71ab0e78..5ca19b4b47e8f0b5b7e3bab57dde6ed136d9a298 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 84a35b873649c077207926cc7947dcf7a04c5d00..0ced58199f207d6f8044e72bc52ba7485f9a7895 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 b868e1ec6f240cff5e69d66a4fbd189da176a743..54c99aaeab3d753c6b1cb6c64386ef7557f24854 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 673b7caa76eb79ecb04381cd6e1ae7eb853c39b2..5fc6109e1e5cc2094427201613552a80c469d5c1 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 5a6ead8e7d2bd011e93fefa0423160d03c56a264..26934ad9ac94cac1473aed5e8f7be22882b61dec 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 59b5fe34d090d19f97f3b6efcef8f5565ea2071a..72bc1b46414b2782e54589032c159918e850de8e 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 2d9ffdadeb4cca00807744af1e612d117f827fa9..b5f07e49525505c80909cd67f0a885459019e95b 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 1d6cd3bd1f52ac719a32f8cdb6c5f38500409496..831c19713ea66fd2032c513ec5dc18dd2c141cbf 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 ea532447da106bae38f77322b7ecaac84b8ce9ad..8e5f282f57390d79315ad1b7249da4af2988e16c 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 f965b1a138264e715d512d32b547d29ce871d70a..8f597083f35e4e5a9a48b0a01ff4ba1a7178805a 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 b3a6579200ce6104f7399542ed2581a9a4090283..4592856b06ea806361aa84d5057c4af6d3373e0a 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 93e91c976e494d8b404d815f0d6c77c8ad274c70..e2d358cb7323d80d6f189490460979a0d6c7b6e2 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 aa01893c9d32f7cf59c0f7c487af6de0309a3612..3e9450bf16dc15ae6bc2345a9710f48d0f9fb2ed 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 e1b2510776d49fbe6f9cf5fe9f5fa7d59894a022..ba152f1439a20657fe865e4f8af62d33530e6ae0 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 2022b88a66ac4381517917ea166ce00d55dfbe27..a1f996910a562e0ba6971f1e22eb6869f9fe613a 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 1290391723c0e4b23541d85072c8187a918ca5c2..fcaedcbe1d8692a712c3dbaa06d76547db8c59dc 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 e6175576a5c7ce91b8c30f5c2dd8d4d5d42cc5ec..158a82556fd73b6f81c556cff095ef9081371e54 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 f71f712dc1ef9eaf038aa91fa9bc81cdb84aa05b..3c62a6f73e1c69781f6e96ceff0968d0e71a9539 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 8ed9f6959440c0eca1b29c08084bad66d6da1dab..f1c1bd22742baa6efa204638428a5a68e0504258 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 9230f0b26c77198e34740e9c4759875125813600..cc44bed2fe940f68fb66acd16ade9825c747054a 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 a89f6ecffa46f5fea6d7df0b1c124595322feda9..bb79c18db1a7bc5ffcea395cadfa751fcbf029af 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 1ddf4eb35dd34fa21d90381f7ce47f30f3e92578..82440f553717d959182eea57ecf1d40be28c0193 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 9e9d0daba9bdee6726bf0d4df430244537037326..24d9376a0848ad3d2a49a6f7e9389f55e38ce3ba 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 8be97e1637e1f29378832ac44ed3fe6b4222087a..d4d35ff1d15e94a9ebde21964a12e5fe6bf0e2be 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 68b7aafeebac36ab0e0b6716dbeee5d1fe13492d..b83e3a618f13e6c780aae1d1d6284964a042c29a 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 b75f24b0c6bafb0b83ee3d86cf0facafa78bff80..0a60b032019b1ae18d1f232786d151f5f640d9d2 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 9280568ac5bbb373dc1b8f89fb1ceb461ec392fc..0d59df11cf18e06dbf337dad85ec9480c99cd4c2 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 b9c65a71120fedbc68b898c261defd4657f6c7bd..fe28c50bfd165c35dc5a0547618b94b676590497 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 2004f542ea1f36df50218cb1b11d1118822cc231..47241afd3de901f0e1047d240ada0bf844f31bc5 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 81372f65471014daac52a152f1ecf94f1774d1c6..1ee650356702e9a2a5cc388f951cd21130f849ec 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 7ad73132ad50055c53fc7d816215416a6abb5b9c..e995a36add2b4ee65c3431adf01c6a4919ce9326 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 20978f73deaf91ebb454fbaee51f22d714fa19a7..095b5af5d8e23f0c6d72e6683f644cea49eb6de0 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 2851bf3f1adfaa63ae005300a2658bc8306e0a68..ff52a50460bda29031f5f3a4bb0c878f7919cf8e 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 01aaa49e8ae812e77cc7f147a259a9c69ab7a5d7..e412eed42d241ae941980012440f92616725c950 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 bf31a510e555062b59c77b4d2d023edadd58bff9..93481141eed3b3d3f03c04807e7c7519b8663a87 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 56259aa81e5cab8800923fa068c549dc438cf810..5089d069c922266db14b25c526e2ad146b470048 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 00943efe751dc5281c001f03244b61b19a283e3c..ef3adb02f590b25865078056b928409724c0e12e 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 7f839ba5935f91c6aa4fe14330195e58b0e76623..efbb81069e295458123f7006f3651cfc1c80df0a 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 61a68fd3c62957008d4d533898e0f099872fd9b0..27c9061fa98e85a5cc6fe026c80b8532eb25350d 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 ba78725dedb55d31ce018ef2500b79d3f15c0ec9..8d03c7a602076aab97ece4b83a415cc0920e53ad 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 99499b85e0c5d274126c397a0c3e58c56992ba47..b922a2391aff6077b9a6f118025c5d7606103fe7 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 e22aee5201e1ed62e2c029851e995858cefc8bc9..f37bab55eba3e2f468b007dd0cc0f030f93c4ec2 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 7e4bcad81144c3b5730464299eaa47a2f0a579c2..252f31f24d2f440e9c1238548168b99c2166c798 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 ac2ed84d1478015dd35caebb652b85d8d7368cbe..526ae7a05ca4880406d683946161022d2979a73f 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 1c46201d6f96f6a458bc3ee85463125afbd3d651..d5f71ed5be88e605547c5fbf050cbd21680fa712 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 40ff6261ef3bc42fa1683a2b28c80a5aa18453b5..ef8cccd310361ba25a9ba7be4700ad2b87df1efb 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 be3af41072e777546702a28ea4832f9efba85bee..5fb40f3eb64f72d7b24a10bb6948a26c45f1f7f0 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 73a62ff1534f160f59f4ada0a66447974b627a29..818650235c183f187fdb6eb4769f85590945ea21 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 bc1c6303f30eca08f16b8973cef6b46bea5a7b13..19b8be2dffe599bf00c108d920847ee0bb777279 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 c7a2bfdf4cec1362573ed975ea90ce61280493a6..159b9acac9cd41b2bad8189976947ab31622e8ff 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 33aaef591c40cae0ee6580a4d5ddacd0e22ff5b9..e91e8ddf7dfd6ce40e54b57f2024dede3326fab5 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 121ec107ca05737c95991266bac0b5ebbca2ca51..5dcc28908ed08b65353854567a889bdab705e39d 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 19a8427735890280b987259fca02f3eb9634f8e8..3693f114ae5ff7202d3fb43aede06f853c735f83 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 e18ce64aeadbff5f33bf958441cecebe589c7681..328ad023fcbc70c0fcbe38d29074169d2785226d 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 09f10d98b845dfeac874cbd3872fa5dd98df5cf3..54409e96c7280ab67b1e82f5bc9e2dcb3e2851d6 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 d4c26720a090a75fdb49d23aeff62e578741e8be..391265ea2fdcd339403885d1a6a6d2063393401f 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 f43438173396048445539d78b7f0cdcebbd1ab32..192f2ca285c5194f6a9a8aaeb8a86b1f11ecce66 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 34459ec0dd2bc910faf1511dc5254377e6d4d70e..f5d2f07415f0ac59188fdfbb9ea46818c908af27 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 d2801fd231a047ab679e7d1cd9702c656b95ba55..c50f7b3e747f0c7451c9211455fc4f81944a1978 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 737f555ce51998efb40391db775ff255561d2093..e87b13e159f02673a6cc29917c88f8c8f86e0cf5 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 8b0e28a5ddcabf5cce021858773cb65cac536624..97cd02a2977d69ca1cd14abcb84632bd20124004 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 bf15163d563987cfae3b769a9637e029e79c2380..00caf2b5761da040e6fb5fd7d11063aa02f98e03 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 a24a6b0e6b59258e884df690408a472955fd8cf5..af16d34071a64dafbee2c54775e44072ebc6654d 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