From 13c194b5fdff84e09a5be46ccd5f1776c54f927c Mon Sep 17 00:00:00 2001
From: Ger van Diepen <diepen@astron.nl>
Date: Thu, 17 Sep 2009 13:22:45 +0000
Subject: [PATCH] bug 1408: Inserted new copyright headers

---
 CEP/MWCommon/include/MWCommon/ClusterDesc.h   | 18 +++++------
 CEP/MWCommon/include/MWCommon/Controller.h    | 18 +++++------
 .../include/MWCommon/ControllerBase.h         | 18 +++++------
 CEP/MWCommon/include/MWCommon/DomainShape.h   | 18 +++++------
 CEP/MWCommon/include/MWCommon/MPIConnection.h | 18 +++++------
 .../include/MWCommon/MPIConnectionSet.h       | 20 ++++++-------
 CEP/MWCommon/include/MWCommon/MWBlobIO.h      | 18 +++++------
 CEP/MWCommon/include/MWCommon/MWConnection.h  | 18 +++++------
 .../include/MWCommon/MWConnectionSet.h        | 18 +++++------
 CEP/MWCommon/include/MWCommon/MWError.h       | 18 +++++------
 CEP/MWCommon/include/MWCommon/MWGlobalStep.h  | 18 +++++------
 CEP/MWCommon/include/MWCommon/MWIos.h         | 16 ++++++++++
 CEP/MWCommon/include/MWCommon/MWLocalStep.h   | 18 +++++------
 CEP/MWCommon/include/MWCommon/MWMultiStep.h   | 18 +++++------
 CEP/MWCommon/include/MWCommon/MWStep.h        | 18 +++++------
 CEP/MWCommon/include/MWCommon/MWStepFactory.h | 18 +++++------
 CEP/MWCommon/include/MWCommon/MWStepVisitor.h | 18 +++++------
 CEP/MWCommon/include/MWCommon/MasterControl.h | 18 +++++------
 CEP/MWCommon/include/MWCommon/MemConnection.h | 18 +++++------
 .../include/MWCommon/MemConnectionSet.h       | 18 +++++------
 CEP/MWCommon/include/MWCommon/NodeDesc.h      | 18 +++++------
 CEP/MWCommon/include/MWCommon/ObsDomain.h     | 18 +++++------
 .../include/MWCommon/ParameterHandler.h       | 18 +++++------
 .../include/MWCommon/SocketConnection.h       | 18 +++++------
 .../include/MWCommon/SocketConnectionSet.h    | 18 +++++------
 .../include/MWCommon/SocketListener.h         | 18 +++++------
 CEP/MWCommon/include/MWCommon/VdsDesc.h       | 18 +++++------
 CEP/MWCommon/include/MWCommon/VdsPartDesc.h   | 18 +++++------
 .../include/MWCommon/WorkDomainSpec.h         | 18 +++++------
 CEP/MWCommon/include/MWCommon/WorkerControl.h | 18 +++++------
 CEP/MWCommon/include/MWCommon/WorkerFactory.h | 18 +++++------
 CEP/MWCommon/include/MWCommon/WorkerInfo.h    | 18 +++++------
 CEP/MWCommon/include/MWCommon/WorkerProxy.h   | 18 +++++------
 CEP/MWCommon/include/MWCommon/WorkersDesc.h   | 18 +++++------
 CEP/MWCommon/src/ClusterDesc.cc               | 16 +++++-----
 CEP/MWCommon/src/Controller.cc                | 16 ++++++++++
 CEP/MWCommon/src/ControllerBase.cc            | 16 ++++++++++
 CEP/MWCommon/src/DomainShape.cc               | 19 ++++++++++--
 CEP/MWCommon/src/MPIConnection.cc             | 19 ++++++++++--
 CEP/MWCommon/src/MPIConnectionSet.cc          | 19 ++++++++++--
 CEP/MWCommon/src/MWBlobIO.cc                  | 19 ++++++++++--
 CEP/MWCommon/src/MWConnection.cc              | 19 ++++++++++--
 CEP/MWCommon/src/MWConnectionSet.cc           | 19 ++++++++++--
 CEP/MWCommon/src/MWGlobalStep.cc              | 19 ++++++++++--
 CEP/MWCommon/src/MWIos.cc                     | 16 ++++++++++
 CEP/MWCommon/src/MWLocalStep.cc               | 19 ++++++++++--
 CEP/MWCommon/src/MWMultiStep.cc               | 19 ++++++++++--
 CEP/MWCommon/src/MWStep.cc                    | 19 ++++++++++--
 CEP/MWCommon/src/MWStepFactory.cc             | 19 ++++++++++--
 CEP/MWCommon/src/MWStepVisitor.cc             | 19 ++++++++++--
 CEP/MWCommon/src/MasterControl.cc             | 19 ++++++++++--
 CEP/MWCommon/src/MemConnection.cc             | 19 ++++++++++--
 CEP/MWCommon/src/MemConnectionSet.cc          | 19 ++++++++++--
 CEP/MWCommon/src/NodeDesc.cc                  | 16 +++++-----
 CEP/MWCommon/src/ObsDomain.cc                 | 19 ++++++++++--
 CEP/MWCommon/src/ParameterHandler.cc          | 16 ++++++++++
 CEP/MWCommon/src/SocketConnection.cc          | 19 ++++++++++--
 CEP/MWCommon/src/SocketConnectionSet.cc       | 19 ++++++++++--
 CEP/MWCommon/src/SocketListener.cc            | 19 ++++++++++--
 CEP/MWCommon/src/VdsDesc.cc                   | 16 +++++-----
 CEP/MWCommon/src/VdsPartDesc.cc               | 16 +++++-----
 CEP/MWCommon/src/WorkDomainSpec.cc            | 19 ++++++++++--
 CEP/MWCommon/src/WorkerControl.cc             | 19 ++++++++++--
 CEP/MWCommon/src/WorkerFactory.cc             | 19 ++++++++++--
 CEP/MWCommon/src/WorkerInfo.cc                | 19 ++++++++++--
 CEP/MWCommon/src/WorkerProxy.cc               | 19 ++++++++++--
 CEP/MWCommon/src/WorkersDesc.cc               | 16 +++++-----
 CEP/MWCommon/src/finddproc.cc                 | 18 +++++------
 CEP/MWCommon/src/showclusterdesc.cc           | 18 +++++------
 CEP/MWCommon/src/socketrun                    | 30 +++++++++----------
 CEP/MWCommon/src/startdistproc                | 28 ++++++++---------
 CEP/MWCommon/test/tClusterDesc.cc             | 16 ++++++++++
 CEP/MWCommon/test/tNodeDesc.cc                | 16 ++++++++++
 CEP/MWCommon/test/tSocketConnection.cc        | 16 ++++++++++
 CEP/MWCommon/test/tSocketConnection.run       | 25 ++++++++++++++++
 CEP/MWCommon/test/tVdsDesc.cc                 | 16 ++++++++++
 CEP/MWCommon/test/tVdsPartDesc.cc             | 16 ++++++++++
 CEP/MWCommon/test/tWorkersDesc.cc             | 16 ++++++++++
 CEP/MWCommon/test/tfinddproc.run              | 25 ++++++++++++++++
 CEP/MWCommon/test/tstartdproc.run             | 25 ++++++++++++++++
 80 files changed, 1044 insertions(+), 433 deletions(-)

diff --git a/CEP/MWCommon/include/MWCommon/ClusterDesc.h b/CEP/MWCommon/include/MWCommon/ClusterDesc.h
index eb1e187d357..a57c06118fd 100644
--- a/CEP/MWCommon/include/MWCommon/ClusterDesc.h
+++ b/CEP/MWCommon/include/MWCommon/ClusterDesc.h
@@ -1,22 +1,22 @@
 //# ClusterDesc.h:  Description of a cluster and the nodes in it
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 //#
diff --git a/CEP/MWCommon/include/MWCommon/Controller.h b/CEP/MWCommon/include/MWCommon/Controller.h
index 87e9fee22a3..d3ad2bbb9e7 100644
--- a/CEP/MWCommon/include/MWCommon/Controller.h
+++ b/CEP/MWCommon/include/MWCommon/Controller.h
@@ -1,22 +1,22 @@
 //# Controller.h: Class to execute the master and the workers
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/ControllerBase.h b/CEP/MWCommon/include/MWCommon/ControllerBase.h
index 1105d4a9c67..e80849a30d3 100644
--- a/CEP/MWCommon/include/MWCommon/ControllerBase.h
+++ b/CEP/MWCommon/include/MWCommon/ControllerBase.h
@@ -1,22 +1,22 @@
 //# ControllerBase.h: Base class to execute the master and the workers
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/DomainShape.h b/CEP/MWCommon/include/MWCommon/DomainShape.h
index a1dd25ed611..957437db407 100644
--- a/CEP/MWCommon/include/MWCommon/DomainShape.h
+++ b/CEP/MWCommon/include/MWCommon/DomainShape.h
@@ -1,22 +1,22 @@
 //# DomainShape.h: Define the shape of a domain
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/MPIConnection.h b/CEP/MWCommon/include/MWCommon/MPIConnection.h
index 90196f51da9..31a4d65741d 100644
--- a/CEP/MWCommon/include/MWCommon/MPIConnection.h
+++ b/CEP/MWCommon/include/MWCommon/MPIConnection.h
@@ -1,22 +1,22 @@
 //# MPIConnection.h: Connection to workers based on MPI
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/MPIConnectionSet.h b/CEP/MWCommon/include/MWCommon/MPIConnectionSet.h
index 7a3c076b2a5..5e741c988a3 100644
--- a/CEP/MWCommon/include/MWCommon/MPIConnectionSet.h
+++ b/CEP/MWCommon/include/MWCommon/MPIConnectionSet.h
@@ -1,24 +1,24 @@
 //# MPIConnectionSet.h: Class to hold a set of MPI connections
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
+//# $Id$
 
 #ifndef LOFAR_MWCOMMON_MPICONNECTIONSET_H
 #define LOFAR_MWCOMMON_MPICONNECTIONSET_H
diff --git a/CEP/MWCommon/include/MWCommon/MWBlobIO.h b/CEP/MWCommon/include/MWCommon/MWBlobIO.h
index b613489d848..d81e60439fa 100644
--- a/CEP/MWCommon/include/MWCommon/MWBlobIO.h
+++ b/CEP/MWCommon/include/MWCommon/MWBlobIO.h
@@ -1,22 +1,22 @@
 //# MWBlobIO.h: Class to convert a message from a blob
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWConnection.h b/CEP/MWCommon/include/MWCommon/MWConnection.h
index ddb77dcac24..83ed801e05e 100644
--- a/CEP/MWCommon/include/MWCommon/MWConnection.h
+++ b/CEP/MWCommon/include/MWCommon/MWConnection.h
@@ -1,22 +1,22 @@
 //# MWConnection.h: Abstract base class for all MWConnections
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWConnectionSet.h b/CEP/MWCommon/include/MWCommon/MWConnectionSet.h
index e1aff1f21e2..d1a8b5089c4 100644
--- a/CEP/MWCommon/include/MWCommon/MWConnectionSet.h
+++ b/CEP/MWCommon/include/MWCommon/MWConnectionSet.h
@@ -1,22 +1,22 @@
 //# MWConnectionSet.h: Abstract base class for all MWConnectionSets
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWError.h b/CEP/MWCommon/include/MWCommon/MWError.h
index 54006ad05f4..ba977288d69 100644
--- a/CEP/MWCommon/include/MWCommon/MWError.h
+++ b/CEP/MWCommon/include/MWCommon/MWError.h
@@ -1,22 +1,22 @@
 //# MWError.h: Basic exception for master/worker related errors
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWGlobalStep.h b/CEP/MWCommon/include/MWCommon/MWGlobalStep.h
index 116c129cdd1..c49c35a2d15 100644
--- a/CEP/MWCommon/include/MWCommon/MWGlobalStep.h
+++ b/CEP/MWCommon/include/MWCommon/MWGlobalStep.h
@@ -1,22 +1,22 @@
 //# MWGlobalStep.h: Base classes for global MW commands (like subtract)
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWIos.h b/CEP/MWCommon/include/MWCommon/MWIos.h
index f13db38d50f..4337595f27b 100644
--- a/CEP/MWCommon/include/MWCommon/MWIos.h
+++ b/CEP/MWCommon/include/MWCommon/MWIos.h
@@ -21,6 +21,22 @@
 //#  MWIos.h: 
 //#
 //#  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$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWLocalStep.h b/CEP/MWCommon/include/MWCommon/MWLocalStep.h
index 28ba2fd771c..6fa24c885ce 100644
--- a/CEP/MWCommon/include/MWCommon/MWLocalStep.h
+++ b/CEP/MWCommon/include/MWCommon/MWLocalStep.h
@@ -1,22 +1,22 @@
 //# MWLocalStep.h: Base class for a step to process a local MW command
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWMultiStep.h b/CEP/MWCommon/include/MWCommon/MWMultiStep.h
index 5f3e8ea61af..76df439b2b4 100644
--- a/CEP/MWCommon/include/MWCommon/MWMultiStep.h
+++ b/CEP/MWCommon/include/MWCommon/MWMultiStep.h
@@ -1,22 +1,22 @@
 //# MWMultiStep.h: A step consisting of several other steps
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWStep.h b/CEP/MWCommon/include/MWCommon/MWStep.h
index 78276eae694..6455bb20b9d 100644
--- a/CEP/MWCommon/include/MWCommon/MWStep.h
+++ b/CEP/MWCommon/include/MWCommon/MWStep.h
@@ -1,22 +1,22 @@
 //# MWStep.h: Abstract base class for steps to process MW commands
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWStepFactory.h b/CEP/MWCommon/include/MWCommon/MWStepFactory.h
index 034efca65d0..4f752e74e03 100644
--- a/CEP/MWCommon/include/MWCommon/MWStepFactory.h
+++ b/CEP/MWCommon/include/MWCommon/MWStepFactory.h
@@ -1,22 +1,22 @@
 //# MWStepFactory.h: Factory pattern to make the correct MWStep object
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWStepVisitor.h b/CEP/MWCommon/include/MWCommon/MWStepVisitor.h
index 67471d7116d..a9e7b3fc3fb 100644
--- a/CEP/MWCommon/include/MWCommon/MWStepVisitor.h
+++ b/CEP/MWCommon/include/MWCommon/MWStepVisitor.h
@@ -1,22 +1,22 @@
 //# MWStepVisitor.h: Base visitor class to visit an MWStep hierarchy
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/MasterControl.h b/CEP/MWCommon/include/MWCommon/MasterControl.h
index 1d28cb9a25c..6921998ebc5 100644
--- a/CEP/MWCommon/include/MWCommon/MasterControl.h
+++ b/CEP/MWCommon/include/MWCommon/MasterControl.h
@@ -1,22 +1,22 @@
 //# MasterControl.h: Master control of a distributed process
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/MemConnection.h b/CEP/MWCommon/include/MWCommon/MemConnection.h
index 7e29a632103..a90d8667be2 100644
--- a/CEP/MWCommon/include/MWCommon/MemConnection.h
+++ b/CEP/MWCommon/include/MWCommon/MemConnection.h
@@ -1,22 +1,22 @@
 //# MemConnection.h: Connection to workers based on memory
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/MemConnectionSet.h b/CEP/MWCommon/include/MWCommon/MemConnectionSet.h
index 2636bdd7a66..ddbfae5c2d3 100644
--- a/CEP/MWCommon/include/MWCommon/MemConnectionSet.h
+++ b/CEP/MWCommon/include/MWCommon/MemConnectionSet.h
@@ -1,22 +1,22 @@
 //# MemConnectionSet.h: Set of Memory connections
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/NodeDesc.h b/CEP/MWCommon/include/MWCommon/NodeDesc.h
index e650d7fe587..5c62b10b9ba 100644
--- a/CEP/MWCommon/include/MWCommon/NodeDesc.h
+++ b/CEP/MWCommon/include/MWCommon/NodeDesc.h
@@ -1,22 +1,22 @@
 //# NodeDesc.h: Description of a node in a cluster
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/ObsDomain.h b/CEP/MWCommon/include/MWCommon/ObsDomain.h
index 457be83628b..e591ef955eb 100644
--- a/CEP/MWCommon/include/MWCommon/ObsDomain.h
+++ b/CEP/MWCommon/include/MWCommon/ObsDomain.h
@@ -1,22 +1,22 @@
 //# ObsDomain.h:  Define the boundary values of a domain
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/ParameterHandler.h b/CEP/MWCommon/include/MWCommon/ParameterHandler.h
index 3a98573de91..383cf0ca183 100644
--- a/CEP/MWCommon/include/MWCommon/ParameterHandler.h
+++ b/CEP/MWCommon/include/MWCommon/ParameterHandler.h
@@ -1,22 +1,22 @@
 //# ParameterHandler.h: Handle a LOFAR .parset file
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/SocketConnection.h b/CEP/MWCommon/include/MWCommon/SocketConnection.h
index fe95b0dc846..0c65a29aae3 100644
--- a/CEP/MWCommon/include/MWCommon/SocketConnection.h
+++ b/CEP/MWCommon/include/MWCommon/SocketConnection.h
@@ -1,22 +1,22 @@
 //# SocketConnection.h: Connection to workers based on a socket
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/SocketConnectionSet.h b/CEP/MWCommon/include/MWCommon/SocketConnectionSet.h
index f0f46dfd651..40296e2bc2a 100644
--- a/CEP/MWCommon/include/MWCommon/SocketConnectionSet.h
+++ b/CEP/MWCommon/include/MWCommon/SocketConnectionSet.h
@@ -1,22 +1,22 @@
 //# SocketConnectionSet.h: Set of socket connections
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/SocketListener.h b/CEP/MWCommon/include/MWCommon/SocketListener.h
index 8f6ecb2dd17..71cd6c7cfa6 100644
--- a/CEP/MWCommon/include/MWCommon/SocketListener.h
+++ b/CEP/MWCommon/include/MWCommon/SocketListener.h
@@ -1,22 +1,22 @@
 //# SocketListener.h: Class that creates a socket and accepts connections
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/VdsDesc.h b/CEP/MWCommon/include/MWCommon/VdsDesc.h
index fb1dd1a746d..42e3e4c1bcd 100644
--- a/CEP/MWCommon/include/MWCommon/VdsDesc.h
+++ b/CEP/MWCommon/include/MWCommon/VdsDesc.h
@@ -1,22 +1,22 @@
 //# VdsDesc.h: Describe an entire visibility data set
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/VdsPartDesc.h b/CEP/MWCommon/include/MWCommon/VdsPartDesc.h
index b9955659229..ebc52d96d9d 100644
--- a/CEP/MWCommon/include/MWCommon/VdsPartDesc.h
+++ b/CEP/MWCommon/include/MWCommon/VdsPartDesc.h
@@ -1,22 +1,22 @@
 //# VdsPartDesc.h: Description of a visibility data set or part thereof
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/WorkDomainSpec.h b/CEP/MWCommon/include/MWCommon/WorkDomainSpec.h
index e8c7218cb67..859f368ee87 100644
--- a/CEP/MWCommon/include/MWCommon/WorkDomainSpec.h
+++ b/CEP/MWCommon/include/MWCommon/WorkDomainSpec.h
@@ -1,22 +1,22 @@
 //# WorkDomainSpec.h: Define the specifications of the work domain
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/WorkerControl.h b/CEP/MWCommon/include/MWCommon/WorkerControl.h
index eccc3b3da5a..9538ba5caab 100644
--- a/CEP/MWCommon/include/MWCommon/WorkerControl.h
+++ b/CEP/MWCommon/include/MWCommon/WorkerControl.h
@@ -1,22 +1,22 @@
 //# WorkerControl.h: High level worker control
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/WorkerFactory.h b/CEP/MWCommon/include/MWCommon/WorkerFactory.h
index ea74078b572..a5a599c5e76 100644
--- a/CEP/MWCommon/include/MWCommon/WorkerFactory.h
+++ b/CEP/MWCommon/include/MWCommon/WorkerFactory.h
@@ -1,22 +1,22 @@
 //# WorkerFactory.h: Factory pattern to generate a WorkerProxy object
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/WorkerInfo.h b/CEP/MWCommon/include/MWCommon/WorkerInfo.h
index db3891de78a..736d52a8379 100644
--- a/CEP/MWCommon/include/MWCommon/WorkerInfo.h
+++ b/CEP/MWCommon/include/MWCommon/WorkerInfo.h
@@ -1,22 +1,22 @@
 //# WorkerInfo.h: Information about a worker
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/WorkerProxy.h b/CEP/MWCommon/include/MWCommon/WorkerProxy.h
index f33a5420f74..40d8531f0d7 100644
--- a/CEP/MWCommon/include/MWCommon/WorkerProxy.h
+++ b/CEP/MWCommon/include/MWCommon/WorkerProxy.h
@@ -1,22 +1,22 @@
 //# WorkerProxy.h: Abstract base class for all worker proxies
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/include/MWCommon/WorkersDesc.h b/CEP/MWCommon/include/MWCommon/WorkersDesc.h
index 9817f97bf70..49e23970c48 100644
--- a/CEP/MWCommon/include/MWCommon/WorkersDesc.h
+++ b/CEP/MWCommon/include/MWCommon/WorkersDesc.h
@@ -1,22 +1,22 @@
 //# WorkerDesc.h: Description of all workers
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/src/ClusterDesc.cc b/CEP/MWCommon/src/ClusterDesc.cc
index f4915e5f020..6bbc71f0d10 100644
--- a/CEP/MWCommon/src/ClusterDesc.cc
+++ b/CEP/MWCommon/src/ClusterDesc.cc
@@ -1,22 +1,22 @@
 //# ClusterDesc.cc: Description of a cluster
 //#
 //# Copyright (C) 2007
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# ASTRON (Netherlands Institute for Radio Astronomy)
 //# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This file is part of the LOFAR software suite LOFARsoft.
-//# LOFARsoft is free software: you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation, either version 3 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# LOFARsoft is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with LOFARsoft. If not, see <http://www.gnu.org/licenses/>.
+//# You should 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$
 //#
diff --git a/CEP/MWCommon/src/Controller.cc b/CEP/MWCommon/src/Controller.cc
index 8fd8972d108..e89eb52a351 100644
--- a/CEP/MWCommon/src/Controller.cc
+++ b/CEP/MWCommon/src/Controller.cc
@@ -1,6 +1,22 @@
 //#  Controller.cc: Class to execute the master and workers
 //#
 //#  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$
 
diff --git a/CEP/MWCommon/src/ControllerBase.cc b/CEP/MWCommon/src/ControllerBase.cc
index 360e695498d..07ad7186a73 100644
--- a/CEP/MWCommon/src/ControllerBase.cc
+++ b/CEP/MWCommon/src/ControllerBase.cc
@@ -1,6 +1,22 @@
 //#  ControllerBase.cc: Base class to execute the master and workers
 //#
 //#  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$
 
diff --git a/CEP/MWCommon/src/DomainShape.cc b/CEP/MWCommon/src/DomainShape.cc
index 2cee5047684..f554366fa70 100644
--- a/CEP/MWCommon/src/DomainShape.cc
+++ b/CEP/MWCommon/src/DomainShape.cc
@@ -1,7 +1,22 @@
 //# DomainShape.cc: Define the shape of a domain
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/MPIConnection.cc b/CEP/MWCommon/src/MPIConnection.cc
index 4a72ddf9261..9917cbed32b 100644
--- a/CEP/MWCommon/src/MPIConnection.cc
+++ b/CEP/MWCommon/src/MPIConnection.cc
@@ -1,7 +1,22 @@
 //# MPIConnection.cc: Connection to workers based on MPI
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/MPIConnectionSet.cc b/CEP/MWCommon/src/MPIConnectionSet.cc
index 7f79b9d66de..67c969d4ea7 100644
--- a/CEP/MWCommon/src/MPIConnectionSet.cc
+++ b/CEP/MWCommon/src/MPIConnectionSet.cc
@@ -1,7 +1,22 @@
 //# MPIConnectionSet.cc: Set of MPI connections
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/MWBlobIO.cc b/CEP/MWCommon/src/MWBlobIO.cc
index e58a9192791..39d10efdad0 100644
--- a/CEP/MWCommon/src/MWBlobIO.cc
+++ b/CEP/MWCommon/src/MWBlobIO.cc
@@ -1,7 +1,22 @@
 //# MWBlobIO.cc: 
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/MWConnection.cc b/CEP/MWCommon/src/MWConnection.cc
index 8e9dcf6ff44..7fe1a9418c6 100644
--- a/CEP/MWCommon/src/MWConnection.cc
+++ b/CEP/MWCommon/src/MWConnection.cc
@@ -1,7 +1,22 @@
 //# MWConnection.cc: Abstract base class for all MWConnections
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/MWConnectionSet.cc b/CEP/MWCommon/src/MWConnectionSet.cc
index 946d89b252a..98128c40cbd 100644
--- a/CEP/MWCommon/src/MWConnectionSet.cc
+++ b/CEP/MWCommon/src/MWConnectionSet.cc
@@ -1,7 +1,22 @@
 //# MWConnectionSet.cc: Abstract base class for all MWConnectionSets
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/MWGlobalStep.cc b/CEP/MWCommon/src/MWGlobalStep.cc
index 1c388191c02..7a9fb65cf2c 100644
--- a/CEP/MWCommon/src/MWGlobalStep.cc
+++ b/CEP/MWCommon/src/MWGlobalStep.cc
@@ -1,7 +1,22 @@
 //# MWGlobalStep.cc: Base classes for global MW commands
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/MWIos.cc b/CEP/MWCommon/src/MWIos.cc
index 57de2e7c16c..3b6273a7fbc 100644
--- a/CEP/MWCommon/src/MWIos.cc
+++ b/CEP/MWCommon/src/MWIos.cc
@@ -1,6 +1,22 @@
 //#  MWIos.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$
 
diff --git a/CEP/MWCommon/src/MWLocalStep.cc b/CEP/MWCommon/src/MWLocalStep.cc
index b688e7287cb..c6fcb702a13 100644
--- a/CEP/MWCommon/src/MWLocalStep.cc
+++ b/CEP/MWCommon/src/MWLocalStep.cc
@@ -1,7 +1,22 @@
 //# MWLocalStep.cc: Base classes for local MW commands
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/MWMultiStep.cc b/CEP/MWCommon/src/MWMultiStep.cc
index 028529ab14a..b15d094b69f 100644
--- a/CEP/MWCommon/src/MWMultiStep.cc
+++ b/CEP/MWCommon/src/MWMultiStep.cc
@@ -1,7 +1,22 @@
 //# MWMultiStep.cc: A step consisting of several other steps.
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/MWStep.cc b/CEP/MWCommon/src/MWStep.cc
index 078729846b4..cb9ec6d0b3e 100644
--- a/CEP/MWCommon/src/MWStep.cc
+++ b/CEP/MWCommon/src/MWStep.cc
@@ -1,7 +1,22 @@
 //# MWStep.cc: Step to process the MW commands
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/MWStepFactory.cc b/CEP/MWCommon/src/MWStepFactory.cc
index 327d10fd70a..2db50d581f0 100644
--- a/CEP/MWCommon/src/MWStepFactory.cc
+++ b/CEP/MWCommon/src/MWStepFactory.cc
@@ -1,7 +1,22 @@
 //# MWStepFactory.cc: Factory pattern to make the correct MWStep object
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/MWStepVisitor.cc b/CEP/MWCommon/src/MWStepVisitor.cc
index 7255a13918f..e97f2150c7d 100644
--- a/CEP/MWCommon/src/MWStepVisitor.cc
+++ b/CEP/MWCommon/src/MWStepVisitor.cc
@@ -1,7 +1,22 @@
 //# MWStepVisitor.cc: Base visitor class to visit an MWStep hierarchy
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/MasterControl.cc b/CEP/MWCommon/src/MasterControl.cc
index b9b6ef4b056..1b3f9e07df7 100644
--- a/CEP/MWCommon/src/MasterControl.cc
+++ b/CEP/MWCommon/src/MasterControl.cc
@@ -1,7 +1,22 @@
 //# MasterControl.cc: Master controller of distributed VDS processing
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/MemConnection.cc b/CEP/MWCommon/src/MemConnection.cc
index f7fbd4be0d2..10c4c4051df 100644
--- a/CEP/MWCommon/src/MemConnection.cc
+++ b/CEP/MWCommon/src/MemConnection.cc
@@ -1,7 +1,22 @@
 //# MemConnection.cc: Memory connection to a worker
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/MemConnectionSet.cc b/CEP/MWCommon/src/MemConnectionSet.cc
index 8b3c376fa1a..460fc3a5c3b 100644
--- a/CEP/MWCommon/src/MemConnectionSet.cc
+++ b/CEP/MWCommon/src/MemConnectionSet.cc
@@ -1,7 +1,22 @@
 //# MemConnectionSet.cc: Set of Memory connections
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/NodeDesc.cc b/CEP/MWCommon/src/NodeDesc.cc
index 6a1f080ea06..a6f1d204024 100644
--- a/CEP/MWCommon/src/NodeDesc.cc
+++ b/CEP/MWCommon/src/NodeDesc.cc
@@ -1,22 +1,22 @@
 //# NodeDesc.cc: Description of a node
 //#
 //# Copyright (C) 2007
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# ASTRON (Netherlands Institute for Radio Astronomy)
 //# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This file is part of the LOFAR software suite LOFARsoft.
-//# LOFARsoft is free software: you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation, either version 3 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# LOFARsoft is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with LOFARsoft. If not, see <http://www.gnu.org/licenses/>.
+//# You should 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$
 //#
diff --git a/CEP/MWCommon/src/ObsDomain.cc b/CEP/MWCommon/src/ObsDomain.cc
index d5ec9961d9e..2bd5bb204f3 100644
--- a/CEP/MWCommon/src/ObsDomain.cc
+++ b/CEP/MWCommon/src/ObsDomain.cc
@@ -1,7 +1,22 @@
 //# ObsDomain.cc: Define the shape of a domain
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/ParameterHandler.cc b/CEP/MWCommon/src/ParameterHandler.cc
index 5afebde343d..27dfa915a46 100644
--- a/CEP/MWCommon/src/ParameterHandler.cc
+++ b/CEP/MWCommon/src/ParameterHandler.cc
@@ -1,6 +1,22 @@
 //#  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$
 
diff --git a/CEP/MWCommon/src/SocketConnection.cc b/CEP/MWCommon/src/SocketConnection.cc
index 554c2e829c7..37c8ac5c5a0 100644
--- a/CEP/MWCommon/src/SocketConnection.cc
+++ b/CEP/MWCommon/src/SocketConnection.cc
@@ -1,7 +1,22 @@
 //# SocketConnection.cc: Connection to workers based on a socket
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/SocketConnectionSet.cc b/CEP/MWCommon/src/SocketConnectionSet.cc
index 46c7197c211..1d3e5972309 100644
--- a/CEP/MWCommon/src/SocketConnectionSet.cc
+++ b/CEP/MWCommon/src/SocketConnectionSet.cc
@@ -1,7 +1,22 @@
 //# SocketConnectionSet.cc: Set of socket connections
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/SocketListener.cc b/CEP/MWCommon/src/SocketListener.cc
index 79d23df5ee4..7153cb3a790 100644
--- a/CEP/MWCommon/src/SocketListener.cc
+++ b/CEP/MWCommon/src/SocketListener.cc
@@ -1,7 +1,22 @@
 //# SocketListener.cc: Class that creates a socket and accepts connections
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/VdsDesc.cc b/CEP/MWCommon/src/VdsDesc.cc
index 7d62b51c3c0..14908043e50 100644
--- a/CEP/MWCommon/src/VdsDesc.cc
+++ b/CEP/MWCommon/src/VdsDesc.cc
@@ -1,22 +1,22 @@
 //# VdsDesc.cc: Describe an entire visibility data set
 //#
 //# Copyright (C) 2007
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# ASTRON (Netherlands Institute for Radio Astronomy)
 //# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This file is part of the LOFAR software suite LOFARsoft.
-//# LOFARsoft is free software: you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation, either version 3 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# LOFARsoft is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with LOFARsoft. If not, see <http://www.gnu.org/licenses/>.
+//# You should 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$
 //#
diff --git a/CEP/MWCommon/src/VdsPartDesc.cc b/CEP/MWCommon/src/VdsPartDesc.cc
index 41e2d280380..5276e0bad09 100644
--- a/CEP/MWCommon/src/VdsPartDesc.cc
+++ b/CEP/MWCommon/src/VdsPartDesc.cc
@@ -1,22 +1,22 @@
 //# VdsPartDesc.cc: Description of a visibility data set or part thereof
 //#
 //# Copyright (C) 2007
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# ASTRON (Netherlands Institute for Radio Astronomy)
 //# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This file is part of the LOFAR software suite LOFARsoft.
-//# LOFARsoft is free software: you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation, either version 3 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# LOFARsoft is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with LOFARsoft. If not, see <http://www.gnu.org/licenses/>.
+//# You should 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$
 //#
diff --git a/CEP/MWCommon/src/WorkDomainSpec.cc b/CEP/MWCommon/src/WorkDomainSpec.cc
index f6f288aaf68..843cceae171 100644
--- a/CEP/MWCommon/src/WorkDomainSpec.cc
+++ b/CEP/MWCommon/src/WorkDomainSpec.cc
@@ -1,7 +1,22 @@
 //# WorkDomainSpec.cc: Define the specifications of the work domain
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/WorkerControl.cc b/CEP/MWCommon/src/WorkerControl.cc
index 62e866e05db..15c7d9e3b19 100644
--- a/CEP/MWCommon/src/WorkerControl.cc
+++ b/CEP/MWCommon/src/WorkerControl.cc
@@ -1,7 +1,22 @@
 //# WorkerControl.cc: Worker connection of distributed VDS processing
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/WorkerFactory.cc b/CEP/MWCommon/src/WorkerFactory.cc
index c8ed3a5b7d0..16ff7b096ce 100644
--- a/CEP/MWCommon/src/WorkerFactory.cc
+++ b/CEP/MWCommon/src/WorkerFactory.cc
@@ -1,7 +1,22 @@
 //# WorkerFactory.cc: Factory pattern to generate a workerproxy object
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/WorkerInfo.cc b/CEP/MWCommon/src/WorkerInfo.cc
index 75858061958..2cadee69d2b 100644
--- a/CEP/MWCommon/src/WorkerInfo.cc
+++ b/CEP/MWCommon/src/WorkerInfo.cc
@@ -1,7 +1,22 @@
 //# WorkerInfo.cc: 
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/WorkerProxy.cc b/CEP/MWCommon/src/WorkerProxy.cc
index 4a98c6bb334..2d73e469c8d 100644
--- a/CEP/MWCommon/src/WorkerProxy.cc
+++ b/CEP/MWCommon/src/WorkerProxy.cc
@@ -1,7 +1,22 @@
 //# WorkerProxy.cc: Base class for the proxy of a worker
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# 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$
 
diff --git a/CEP/MWCommon/src/WorkersDesc.cc b/CEP/MWCommon/src/WorkersDesc.cc
index 7ba67350aaa..2045c90680d 100644
--- a/CEP/MWCommon/src/WorkersDesc.cc
+++ b/CEP/MWCommon/src/WorkersDesc.cc
@@ -1,22 +1,22 @@
 //# WorkersDesc.cc: Description of a workers
 //#
 //# Copyright (C) 2007
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# ASTRON (Netherlands Institute for Radio Astronomy)
 //# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This file is part of the LOFAR software suite LOFARsoft.
-//# LOFARsoft is free software: you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation, either version 3 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# LOFARsoft is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with LOFARsoft. If not, see <http://www.gnu.org/licenses/>.
+//# You should 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$
 //#
diff --git a/CEP/MWCommon/src/finddproc.cc b/CEP/MWCommon/src/finddproc.cc
index fc37c034709..61036b9d87b 100644
--- a/CEP/MWCommon/src/finddproc.cc
+++ b/CEP/MWCommon/src/finddproc.cc
@@ -1,22 +1,22 @@
 //# finddproc.cc: Create machinefile based on 
 //#
 //# Copyright (C) 2006
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/src/showclusterdesc.cc b/CEP/MWCommon/src/showclusterdesc.cc
index 6265045dc1d..8daa7ebedaa 100644
--- a/CEP/MWCommon/src/showclusterdesc.cc
+++ b/CEP/MWCommon/src/showclusterdesc.cc
@@ -1,21 +1,21 @@
 //# showclusterdesc.cc: show the (expanded) ClusterDesc
 //# Copyright (C) 2009
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# 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
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+//# You should 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$
 
diff --git a/CEP/MWCommon/src/socketrun b/CEP/MWCommon/src/socketrun
index f832a1de75f..473f11a70de 100755
--- a/CEP/MWCommon/src/socketrun
+++ b/CEP/MWCommon/src/socketrun
@@ -1,24 +1,24 @@
 #!/bin/sh
 
-# socketrun.cc: Start a distributed process using socket connections
+# socketrun: Start a distributed process using socket connections
 #
-#  @copyright (c) 2008, ASTRON
-#  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# Copyright: 2008
+# ASTRON (Netherlands Institute for Radio Astronomy)
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 #
-#  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 file is part of the LOFAR software suite.
+# The LOFAR software suite is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 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.
+# The LOFAR software suite is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+# You should have received a copy of the GNU General Public License along
+# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 #
 # @author Ger van Diepen <diepen AT astron nl>
 #
diff --git a/CEP/MWCommon/src/startdistproc b/CEP/MWCommon/src/startdistproc
index f87e2ed643c..43479f1e4f4 100755
--- a/CEP/MWCommon/src/startdistproc
+++ b/CEP/MWCommon/src/startdistproc
@@ -2,23 +2,23 @@
 
 # startdistproc: Start a distributed process
 #
-#  @copyright (c) 2008, ASTRON
-#  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# Copyright: 2008
+# ASTRON (Netherlands Institute for Radio Astronomy)
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 #
-#  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 file is part of the LOFAR software suite.
+# The LOFAR software suite is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 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.
+# The LOFAR software suite is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR 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
+# You should have received a copy of the GNU General Public License along
+# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 #
 # @author Ger van Diepen <diepen AT astron nl>
 #
diff --git a/CEP/MWCommon/test/tClusterDesc.cc b/CEP/MWCommon/test/tClusterDesc.cc
index c1f9f207363..e0345065afd 100644
--- a/CEP/MWCommon/test/tClusterDesc.cc
+++ b/CEP/MWCommon/test/tClusterDesc.cc
@@ -1,6 +1,22 @@
 //# tClusterDesc.cc: Test program for class ClusterDesc
 //#
 //# 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$
 
diff --git a/CEP/MWCommon/test/tNodeDesc.cc b/CEP/MWCommon/test/tNodeDesc.cc
index f21d59e217b..b590db6dd1a 100644
--- a/CEP/MWCommon/test/tNodeDesc.cc
+++ b/CEP/MWCommon/test/tNodeDesc.cc
@@ -1,6 +1,22 @@
 //# tNodeDesc.cc: Test program for class NodeDesc
 //#
 //# 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$
 
diff --git a/CEP/MWCommon/test/tSocketConnection.cc b/CEP/MWCommon/test/tSocketConnection.cc
index 3dc920f12b3..b5eadde203a 100644
--- a/CEP/MWCommon/test/tSocketConnection.cc
+++ b/CEP/MWCommon/test/tSocketConnection.cc
@@ -1,6 +1,22 @@
 //#  tSocketConnection.cc: Program to test SocketConnection
 //#
 //#  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$
 
diff --git a/CEP/MWCommon/test/tSocketConnection.run b/CEP/MWCommon/test/tSocketConnection.run
index f0b0030d764..7659bf39a95 100755
--- a/CEP/MWCommon/test/tSocketConnection.run
+++ b/CEP/MWCommon/test/tSocketConnection.run
@@ -1,5 +1,30 @@
 #!/bin/sh
 
+# tSocketConnection: Test class SocketConnection in various ways
+#
+# Copyright: 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/>.
+#
+# @author Ger van Diepen <diepen AT astron nl>
+#
+# $Id$
+
+
 # Run the tSocketConnection test program by starting it twice,
 # once as server and once as client.
 ./tSocketConnection 3851 > tSocketConnection_tmp.outs1 &
diff --git a/CEP/MWCommon/test/tVdsDesc.cc b/CEP/MWCommon/test/tVdsDesc.cc
index 1c2d03d164e..9f26db2cacb 100644
--- a/CEP/MWCommon/test/tVdsDesc.cc
+++ b/CEP/MWCommon/test/tVdsDesc.cc
@@ -1,6 +1,22 @@
 //# tVdsDesc.cc: Test program for class VdsDesc
 //#
 //# 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$
 
diff --git a/CEP/MWCommon/test/tVdsPartDesc.cc b/CEP/MWCommon/test/tVdsPartDesc.cc
index 610e8203ebb..337c102a112 100644
--- a/CEP/MWCommon/test/tVdsPartDesc.cc
+++ b/CEP/MWCommon/test/tVdsPartDesc.cc
@@ -1,6 +1,22 @@
 //# tVdsPartDesc.cc: Test program for class VdsPartDesc
 //#
 //# 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$
 
diff --git a/CEP/MWCommon/test/tWorkersDesc.cc b/CEP/MWCommon/test/tWorkersDesc.cc
index ba72924077c..812be5f32f8 100644
--- a/CEP/MWCommon/test/tWorkersDesc.cc
+++ b/CEP/MWCommon/test/tWorkersDesc.cc
@@ -1,6 +1,22 @@
 //# tWorkersDesc.cc: Test program for class WorkersDesc
 //#
 //# 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$
 
diff --git a/CEP/MWCommon/test/tfinddproc.run b/CEP/MWCommon/test/tfinddproc.run
index a7f3a3ae82d..ff7dac0d4b8 100755
--- a/CEP/MWCommon/test/tfinddproc.run
+++ b/CEP/MWCommon/test/tfinddproc.run
@@ -1,3 +1,28 @@
 #!/bin/sh
 
+# tfinddproc: Test program finddproc
+#
+# Copyright: 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/>.
+#
+# @author Ger van Diepen <diepen AT astron nl>
+#
+# $Id$
+
+
 ../src/finddproc tfinddproc.in_vd tfinddproc.in_cd
diff --git a/CEP/MWCommon/test/tstartdproc.run b/CEP/MWCommon/test/tstartdproc.run
index 873d24f5681..902fc934236 100755
--- a/CEP/MWCommon/test/tstartdproc.run
+++ b/CEP/MWCommon/test/tstartdproc.run
@@ -1,5 +1,30 @@
 #!/bin/sh
 
+# tstartdproc: Test script startdistproc in various ways
+#
+# Copyright: 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/>.
+#
+# @author Ger van Diepen <diepen AT astron nl>
+#
+# $Id$
+
+
 if test "$srcdir" = ""; then
   srcdir=../../../src
 fi
-- 
GitLab