From 57f2bcdf24d4cdb8b7b8041ab0ebf5e825ed2b1d Mon Sep 17 00:00:00 2001
From: Alexander van Amesfoort <amesfoort@astron.nl>
Date: Tue, 26 Mar 2013 11:14:29 +0000
Subject: [PATCH] Task #4268: add svn props to Cobalt sources, last few license
 comment style to //#

---
 .gitattributes                                | 227 ------------------
 .../Cobalt/CoInterface/src/BeamCoordinates.cc |   2 +-
 RTCP/Cobalt/CoInterface/src/BeamCoordinates.h |   2 +-
 RTCP/Cobalt/CoInterface/src/BeamFormedData.h  |   2 +-
 RTCP/Cobalt/CoInterface/src/DataFactory.cc    |   2 +-
 RTCP/Cobalt/CoInterface/src/DataFactory.h     |   2 +-
 RTCP/Cobalt/CoInterface/src/FakeData.h        |   2 +-
 RTCP/Cobalt/CoInterface/src/FinalMetaData.cc  |   2 +-
 RTCP/Cobalt/CoInterface/src/FinalMetaData.h   |   2 +-
 .../CoInterface/src/InverseFilteredData.h     |   2 +-
 RTCP/Cobalt/CoInterface/src/OutputTypes.h     |   2 +-
 RTCP/Cobalt/CoInterface/src/SetOperations.h   |   2 +-
 RTCP/Cobalt/CoInterface/src/SmartPtr.h        |   2 +-
 RTCP/Cobalt/CoInterface/src/Stream.cc         |   2 +-
 RTCP/Cobalt/CoInterface/src/Stream.h          |   2 +-
 RTCP/Cobalt/CoInterface/src/StreamableData.h  |   2 +-
 .../src/TransposedBeamFormedData.h            |   2 +-
 RTCP/Cobalt/CoInterface/src/TriggerData.h     |   2 +-
 .../CoInterface/test/tCorrelatedData.cc       |   2 +-
 .../Cobalt/CoInterface/test/tMultiDimArray.cc |   2 +-
 RTCP/Cobalt/CoInterface/test/tParset.cc       |   2 +-
 RTCP/Cobalt/GPUProc/src/BandPass.cc           |   2 +-
 RTCP/Cobalt/GPUProc/src/BandPass.h            |   2 +-
 .../GPUProc/src/BeamFormer/BeamFormer.cl      |   2 +-
 .../GPUProc/src/BeamFormer/CoherentStokes.cl  |   2 +-
 .../GPUProc/src/BeamFormer/Dedispersion.cl    |   2 +-
 .../src/BeamFormer/IncoherentStokes.cl        |   2 +-
 .../GPUProc/src/BeamFormer/IntToFloat.cl      |   2 +-
 .../GPUProc/src/BeamFormer/Transpose.cl       |   2 +-
 RTCP/Cobalt/GPUProc/src/BestEffortQueue.h     |   2 +-
 RTCP/Cobalt/GPUProc/src/BestEffortQueue.tcc   |   2 +-
 RTCP/Cobalt/GPUProc/src/Correlator.cl         |   2 +-
 RTCP/Cobalt/GPUProc/src/DelayAndBandPass.cl   |   2 +-
 RTCP/Cobalt/GPUProc/src/FIR.cl                |   2 +-
 RTCP/Cobalt/GPUProc/src/FilterBank.cc         |   2 +-
 RTCP/Cobalt/GPUProc/src/FilterBank.h          |   2 +-
 .../Cobalt/GPUProc/src/Input/BeamletBuffer.cc |   2 +-
 RTCP/Cobalt/GPUProc/src/Input/BeamletBuffer.h |   2 +-
 .../src/Input/BeamletBufferToComputeNode.cc   |   2 +-
 .../src/Input/BeamletBufferToComputeNode.h    |   2 +-
 RTCP/Cobalt/GPUProc/src/Input/Delays.cc       |   2 +-
 RTCP/Cobalt/GPUProc/src/Input/Delays.h        |   2 +-
 RTCP/Cobalt/GPUProc/src/Input/InputSection.cc |   2 +-
 RTCP/Cobalt/GPUProc/src/Input/InputSection.h  |   2 +-
 RTCP/Cobalt/GPUProc/src/Input/InputThread.cc  |   2 +-
 RTCP/Cobalt/GPUProc/src/Input/InputThread.h   |   2 +-
 RTCP/Cobalt/GPUProc/src/Input/LockedRanges.h  |   2 +-
 RTCP/Cobalt/GPUProc/src/Input/LogThread.cc    |   2 +-
 RTCP/Cobalt/GPUProc/src/Input/LogThread.h     |   2 +-
 RTCP/Cobalt/GPUProc/src/Input/RSP.h           |   2 +-
 .../src/Input/ReaderWriterSynchronization.cc  |   2 +-
 .../src/Input/ReaderWriterSynchronization.h   |   2 +-
 RTCP/Cobalt/GPUProc/src/Input/WallClockTime.h |   2 +-
 RTCP/Cobalt/GPUProc/src/Kernel.cc             |   2 +-
 RTCP/Cobalt/GPUProc/src/Kernel.h              |   2 +-
 .../GPUProc/src/Kernels/BeamFormerKernel.cc   |   2 +-
 .../GPUProc/src/Kernels/BeamFormerKernel.h    |   2 +-
 .../src/Kernels/BeamFormerTransposeKernel.cc  |   2 +-
 .../src/Kernels/BeamFormerTransposeKernel.h   |   2 +-
 .../src/Kernels/CoherentStokesKernel.cc       |   2 +-
 .../src/Kernels/CoherentStokesKernel.h        |   2 +-
 .../GPUProc/src/Kernels/CorrelatorKernel.cc   |   2 +-
 .../GPUProc/src/Kernels/CorrelatorKernel.h    |   2 +-
 .../Kernels/DedispersionBackwardFFTkernel.cc  |   2 +-
 .../Kernels/DedispersionBackwardFFTkernel.h   |   2 +-
 .../src/Kernels/DedispersionChirpKernel.cc    |   2 +-
 .../src/Kernels/DedispersionChirpKernel.h     |   2 +-
 .../Kernels/DedispersionForwardFFTkernel.cc   |   2 +-
 .../Kernels/DedispersionForwardFFTkernel.h    |   2 +-
 .../src/Kernels/DelayAndBandPassKernel.cc     |   2 +-
 .../src/Kernels/DelayAndBandPassKernel.h      |   2 +-
 RTCP/Cobalt/GPUProc/src/Kernels/FFT_Kernel.cc |   2 +-
 RTCP/Cobalt/GPUProc/src/Kernels/FFT_Kernel.h  |   2 +-
 RTCP/Cobalt/GPUProc/src/Kernels/FFT_Plan.cc   |   2 +-
 RTCP/Cobalt/GPUProc/src/Kernels/FFT_Plan.h    |   2 +-
 .../GPUProc/src/Kernels/FIR_FilterKernel.cc   |   2 +-
 .../GPUProc/src/Kernels/FIR_FilterKernel.h    |   2 +-
 .../GPUProc/src/Kernels/Filter_FFT_Kernel.cc  |   2 +-
 .../GPUProc/src/Kernels/Filter_FFT_Kernel.h   |   2 +-
 .../src/Kernels/IncoherentStokesKernel.cc     |   2 +-
 .../src/Kernels/IncoherentStokesKernel.h      |   2 +-
 .../GPUProc/src/Kernels/IntToFloatKernel.cc   |   2 +-
 .../GPUProc/src/Kernels/IntToFloatKernel.h    |   2 +-
 .../src/Kernels/UHEP_BeamFormerKernel.cc      |   2 +-
 .../src/Kernels/UHEP_BeamFormerKernel.h       |   2 +-
 .../GPUProc/src/Kernels/UHEP_InvFFT_Kernel.cc |   2 +-
 .../GPUProc/src/Kernels/UHEP_InvFFT_Kernel.h  |   2 +-
 .../GPUProc/src/Kernels/UHEP_InvFIR_Kernel.cc |   2 +-
 .../GPUProc/src/Kernels/UHEP_InvFIR_Kernel.h  |   2 +-
 .../src/Kernels/UHEP_TransposeKernel.cc       |   2 +-
 .../src/Kernels/UHEP_TransposeKernel.h        |   2 +-
 .../GPUProc/src/Kernels/UHEP_TriggerKernel.cc |   2 +-
 .../GPUProc/src/Kernels/UHEP_TriggerKernel.h  |   2 +-
 RTCP/Cobalt/GPUProc/src/NewCorrelator.cl      |   2 +-
 RTCP/Cobalt/GPUProc/src/OpenCL_Support.cc     |   2 +-
 RTCP/Cobalt/GPUProc/src/OpenCL_Support.h      |   2 +-
 RTCP/Cobalt/GPUProc/src/OpenMP_Support.h      |   2 +-
 RTCP/Cobalt/GPUProc/src/PerformanceCounter.cc |   2 +-
 RTCP/Cobalt/GPUProc/src/PerformanceCounter.h  |   2 +-
 RTCP/Cobalt/GPUProc/src/Pipeline.cc           |   2 +-
 RTCP/Cobalt/GPUProc/src/Pipeline.h            |   2 +-
 .../src/Pipelines/BeamFormerPipeline.cc       |   2 +-
 .../src/Pipelines/BeamFormerPipeline.h        |   2 +-
 .../src/Pipelines/CorrelatorPipeline.cc       |   2 +-
 .../src/Pipelines/CorrelatorPipeline.h        |   2 +-
 .../Pipelines/CorrelatorPipelinePrograms.h    |   2 +-
 .../GPUProc/src/Pipelines/UHEP_Pipeline.cc    |   2 +-
 .../GPUProc/src/Pipelines/UHEP_Pipeline.h     |   2 +-
 RTCP/Cobalt/GPUProc/src/Scheduling.cc         |   2 +-
 RTCP/Cobalt/GPUProc/src/Scheduling.h          |   2 +-
 RTCP/Cobalt/GPUProc/src/SlidingPointer.h      |   2 +-
 RTCP/Cobalt/GPUProc/src/Storage/SSH.cc        |   2 +-
 RTCP/Cobalt/GPUProc/src/Storage/SSH.h         |   2 +-
 .../GPUProc/src/Storage/StorageProcess.cc     |   2 +-
 .../GPUProc/src/Storage/StorageProcess.h      |   2 +-
 .../GPUProc/src/Storage/StorageProcesses.cc   |   2 +-
 .../GPUProc/src/Storage/StorageProcesses.h    |   2 +-
 RTCP/Cobalt/GPUProc/src/UHEP/BeamFormer.cl    |   2 +-
 RTCP/Cobalt/GPUProc/src/UHEP/InvFFT.cl        |   2 +-
 RTCP/Cobalt/GPUProc/src/UHEP/InvFIR.cl        |   2 +-
 .../src/UHEP/InvertedStationPPFWeights.cc     |   2 +-
 .../src/UHEP/InvertedStationPPFWeights.h      |   2 +-
 RTCP/Cobalt/GPUProc/src/UHEP/Transpose.cl     |   2 +-
 RTCP/Cobalt/GPUProc/src/UHEP/Trigger.cl       |   2 +-
 RTCP/Cobalt/GPUProc/src/UnitTest.cc           |   2 +-
 RTCP/Cobalt/GPUProc/src/UnitTest.h            |   2 +-
 .../src/WorkQueues/BeamFormerWorkQueue.cc     |   2 +-
 .../src/WorkQueues/BeamFormerWorkQueue.h      |   2 +-
 .../src/WorkQueues/CorrelatorWorkQueue.cc     |   2 +-
 .../src/WorkQueues/CorrelatorWorkQueue.h      |   2 +-
 .../GPUProc/src/WorkQueues/UHEP_WorkQueue.cc  |   2 +-
 .../GPUProc/src/WorkQueues/UHEP_WorkQueue.h   |   2 +-
 .../GPUProc/src/WorkQueues/WorkQueue.cc       |   2 +-
 .../Cobalt/GPUProc/src/WorkQueues/WorkQueue.h |   2 +-
 RTCP/Cobalt/GPUProc/src/createProgram.cc      |   2 +-
 RTCP/Cobalt/GPUProc/src/createProgram.h       |   2 +-
 RTCP/Cobalt/GPUProc/src/global_defines.cc     |   2 +-
 RTCP/Cobalt/GPUProc/src/global_defines.h      |   2 +-
 RTCP/Cobalt/GPUProc/src/math.cl               |   2 +-
 RTCP/Cobalt/GPUProc/src/rtcp.cc               |   2 +-
 RTCP/Cobalt/GPUProc/test/DummyStorage.cc      |   2 +-
 .../GPUProc/test/Kernels/AMD_FFT_Test.h       |  39 ++-
 .../GPUProc/test/Kernels/BeamFormerTest.h     |  39 ++-
 .../test/Kernels/BeamFormerTransposeTest.h    |  39 ++-
 .../GPUProc/test/Kernels/CoherentStokesTest.h |  39 ++-
 .../test/Kernels/CorrelateRectangleTest.h     |  39 ++-
 .../test/Kernels/CorrelateTriangleTest.h      |  39 ++-
 .../GPUProc/test/Kernels/CorrelatorTest.h     |  39 ++-
 .../test/Kernels/DedispersionChirpTest.h      |  39 ++-
 RTCP/Cobalt/GPUProc/test/Kernels/FFT_Test.h   |  39 ++-
 .../GPUProc/test/Kernels/FIR_FilterTest.h     |  39 ++-
 .../test/Kernels/IncoherentStokesTest.h       |  39 ++-
 .../GPUProc/test/Kernels/IntToFloatTest.h     |  39 ++-
 .../test/Kernels/UHEP_BeamFormerTest.h        |  39 ++-
 .../GPUProc/test/Kernels/UHEP_TransposeTest.h |  39 ++-
 .../GPUProc/test/Kernels/UHEP_TriggerTest.h   |  39 ++-
 RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.cc     |   2 +-
 .../GPUProc/test/UnitTests/BeamFormerTest.cc  |  55 +++--
 .../test/UnitTests/new_style_unittest.cc      |  55 +++--
 RTCP/Cobalt/GPUProc/test/tBestEffortQueue.cc  |   2 +-
 RTCP/Cobalt/GPUProc/test/tContext.cc          |   2 +-
 .../Cobalt/GPUProc/test/tDelayCompensation.cc |  64 ++---
 .../GPUProc/test/tPerformanceCounter.cc       |   2 +-
 RTCP/Cobalt/GPUProc/test/tSSH.cc              |   2 +-
 RTCP/Cobalt/GPUProc/test/tStorageProcesses.cc |   2 +-
 RTCP/Cobalt/InputProc/src/OMPThread.h         |   2 +-
 RTCP/Cobalt/InputProc/src/RSPBoards.cc        |   2 +-
 RTCP/Cobalt/InputProc/src/RSPBoards.h         |   2 +-
 RTCP/Cobalt/InputProc/src/SampleType.h        |   2 +-
 RTCP/Cobalt/InputProc/src/WallClockTime.h     |   2 +-
 RTCP/Cobalt/InputProc/src/newInputSection.cc  |   2 +-
 RTCP/Cobalt/InputProc/test/tGenerator.cc      |   2 +-
 RTCP/Cobalt/InputProc/test/tPacketReader.cc   |   2 +-
 RTCP/Cobalt/InputProc/test/tPacketWriter.cc   |   2 +-
 .../Cobalt/InputProc/test/tPacketsToBuffer.cc |   2 +-
 RTCP/Cobalt/InputProc/test/tRSP.cc            |   2 +-
 RTCP/Cobalt/InputProc/test/tRSPTimeStamp2.cc  |   2 +-
 RTCP/Cobalt/InputProc/test/tRanges.cc         |   2 +-
 RTCP/Cobalt/InputProc/test/tSampleBuffer.cc   |   2 +-
 RTCP/Cobalt/InputProc/test/tSharedMemory.cc   |   2 +-
 .../OutputProc/src/ExitOnClosedStdin.cc       |   2 +-
 .../Cobalt/OutputProc/src/ExitOnClosedStdin.h |   2 +-
 RTCP/Cobalt/OutputProc/src/FastFileStream.cc  |   2 +-
 RTCP/Cobalt/OutputProc/src/FastFileStream.h   |   2 +-
 RTCP/Cobalt/OutputProc/src/Format.cc          |   2 +-
 RTCP/Cobalt/OutputProc/src/Format.h           |   2 +-
 RTCP/Cobalt/OutputProc/src/HDF5Attributes.h   |   2 +-
 RTCP/Cobalt/OutputProc/src/IOPriority.h       |   2 +-
 .../OutputProc/src/MSWriterCorrelated.cc      |   2 +-
 .../OutputProc/src/MSWriterCorrelated.h       |   2 +-
 RTCP/Cobalt/OutputProc/src/MSWriterDAL.cc     |   2 +-
 RTCP/Cobalt/OutputProc/src/MSWriterDAL.h      |   2 +-
 RTCP/Cobalt/OutputProc/src/MSWriterFile.cc    |   2 +-
 RTCP/Cobalt/OutputProc/src/MSWriterFile.h     |   2 +-
 RTCP/Cobalt/OutputProc/src/MSWriterNull.cc    |   2 +-
 RTCP/Cobalt/OutputProc/src/MSWriterNull.h     |   2 +-
 .../OutputProc/src/MeasurementSetFormat.cc    |   2 +-
 .../OutputProc/src/MeasurementSetFormat.h     |   2 +-
 RTCP/Cobalt/OutputProc/src/OutputThread.cc    |   2 +-
 RTCP/Cobalt/OutputProc/src/OutputThread.h     |   2 +-
 .../OutputProc/src/TBB_StaticMapping.cc       |   2 +-
 .../Cobalt/OutputProc/src/TBB_StaticMapping.h |   2 +-
 RTCP/Cobalt/OutputProc/src/TBB_Writer.cc      |   2 +-
 RTCP/Cobalt/OutputProc/src/TBB_Writer.h       |   2 +-
 RTCP/Cobalt/OutputProc/src/TBB_Writer_main.cc |   2 +-
 RTCP/Cobalt/OutputProc/src/createHeaders.cc   |   2 +-
 RTCP/Cobalt/OutputProc/src/plotMS.cc          |   2 +-
 RTCP/Cobalt/OutputProc/test/tDAL.cc           |   2 +-
 .../Cobalt/OutputProc/test/tFastFileStream.cc |   2 +-
 .../OutputProc/test/tMSWriterCorrelated.cc    |   2 +-
 RTCP/Cobalt/OutputProc/test/tMSWriterDAL.cc   |   2 +-
 .../OutputProc/test/tTBB_StaticMapping.cc     |   2 +-
 212 files changed, 564 insertions(+), 808 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index c3bd242c8f9..aa00f5a1411 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3684,26 +3684,6 @@ RTCP/CNProc/test/tStokes.cc -text
 RTCP/CNProc/test/tStokes.sh -text
 RTCP/CNProc/test/tStokesAsm.cc -text
 RTCP/Cobalt/CMakeLists.txt -text
-RTCP/Cobalt/CoInterface/src/BeamCoordinates.cc -text
-RTCP/Cobalt/CoInterface/src/BeamCoordinates.h -text
-RTCP/Cobalt/CoInterface/src/BeamFormedData.h -text
-RTCP/Cobalt/CoInterface/src/DataFactory.cc -text
-RTCP/Cobalt/CoInterface/src/DataFactory.h -text
-RTCP/Cobalt/CoInterface/src/FakeData.h -text
-RTCP/Cobalt/CoInterface/src/FinalMetaData.cc -text
-RTCP/Cobalt/CoInterface/src/FinalMetaData.h -text
-RTCP/Cobalt/CoInterface/src/InverseFilteredData.h -text
-RTCP/Cobalt/CoInterface/src/OutputTypes.h -text
-RTCP/Cobalt/CoInterface/src/SetOperations.h -text
-RTCP/Cobalt/CoInterface/src/SmartPtr.h -text
-RTCP/Cobalt/CoInterface/src/Stream.cc -text
-RTCP/Cobalt/CoInterface/src/Stream.h -text
-RTCP/Cobalt/CoInterface/src/StreamableData.h -text
-RTCP/Cobalt/CoInterface/src/TransposedBeamFormedData.h -text
-RTCP/Cobalt/CoInterface/src/TriggerData.h -text
-RTCP/Cobalt/CoInterface/test/tCorrelatedData.cc -text
-RTCP/Cobalt/CoInterface/test/tMultiDimArray.cc -text
-RTCP/Cobalt/CoInterface/test/tParset.cc -text
 RTCP/Cobalt/CoInterface/test/tParset.parset_obs99275 -text
 RTCP/Cobalt/CoInterface/test/tParset.sh -text
 RTCP/Cobalt/GPUProc/CMakeLists.txt -text
@@ -3724,170 +3704,14 @@ RTCP/Cobalt/GPUProc/VisualStudio/Cobalt/Cobalt_test/ReadMe.txt -text
 RTCP/Cobalt/GPUProc/VisualStudio/Cobalt/Cobalt_test/stdafx.cpp -text
 RTCP/Cobalt/GPUProc/VisualStudio/Cobalt/Cobalt_test/stdafx.h -text
 RTCP/Cobalt/GPUProc/VisualStudio/Cobalt/Cobalt_test/targetver.h -text
-RTCP/Cobalt/GPUProc/src/BandPass.cc -text
-RTCP/Cobalt/GPUProc/src/BandPass.h -text
-RTCP/Cobalt/GPUProc/src/BeamFormer/BeamFormer.cl -text
-RTCP/Cobalt/GPUProc/src/BeamFormer/BeamFormer.cl.4x3 -text
-RTCP/Cobalt/GPUProc/src/BeamFormer/BeamFormer.cl.6x3 -text
-RTCP/Cobalt/GPUProc/src/BeamFormer/BeamFormer.cl.bak -text
-RTCP/Cobalt/GPUProc/src/BeamFormer/BeamFormer.cl.not -text
-RTCP/Cobalt/GPUProc/src/BeamFormer/BeamFormer.cl.ok -text
-RTCP/Cobalt/GPUProc/src/BeamFormer/BeamFormer.cl.orig -text
-RTCP/Cobalt/GPUProc/src/BeamFormer/CoherentStokes.cl -text
-RTCP/Cobalt/GPUProc/src/BeamFormer/CoherentStokes.cl.ok -text
-RTCP/Cobalt/GPUProc/src/BeamFormer/Dedispersion.cl -text
-RTCP/Cobalt/GPUProc/src/BeamFormer/IncoherentStokes.cl -text
-RTCP/Cobalt/GPUProc/src/BeamFormer/IntToFloat.cl -text
-RTCP/Cobalt/GPUProc/src/BeamFormer/Transpose.cl -text
-RTCP/Cobalt/GPUProc/src/BestEffortQueue.h -text
-RTCP/Cobalt/GPUProc/src/BestEffortQueue.tcc -text
 RTCP/Cobalt/GPUProc/src/CMakeLists.txt -text
-RTCP/Cobalt/GPUProc/src/Correlator.cl -text
-RTCP/Cobalt/GPUProc/src/DelayAndBandPass.cl -text
-RTCP/Cobalt/GPUProc/src/FFT.cl -text
-RTCP/Cobalt/GPUProc/src/FIR.cl -text
-RTCP/Cobalt/GPUProc/src/FilterBank.cc -text
-RTCP/Cobalt/GPUProc/src/FilterBank.h -text
-RTCP/Cobalt/GPUProc/src/Input/BeamletBuffer.cc -text
-RTCP/Cobalt/GPUProc/src/Input/BeamletBuffer.h -text
-RTCP/Cobalt/GPUProc/src/Input/BeamletBufferToComputeNode.cc -text
-RTCP/Cobalt/GPUProc/src/Input/BeamletBufferToComputeNode.h -text
-RTCP/Cobalt/GPUProc/src/Input/Delays.cc -text
-RTCP/Cobalt/GPUProc/src/Input/Delays.h -text
-RTCP/Cobalt/GPUProc/src/Input/InputSection.cc -text
-RTCP/Cobalt/GPUProc/src/Input/InputSection.h -text
-RTCP/Cobalt/GPUProc/src/Input/InputThread.cc -text
-RTCP/Cobalt/GPUProc/src/Input/InputThread.h -text
-RTCP/Cobalt/GPUProc/src/Input/LockedRanges.h -text
-RTCP/Cobalt/GPUProc/src/Input/LogThread.cc -text
-RTCP/Cobalt/GPUProc/src/Input/LogThread.h -text
-RTCP/Cobalt/GPUProc/src/Input/RSP.h -text
-RTCP/Cobalt/GPUProc/src/Input/ReaderWriterSynchronization.cc -text
-RTCP/Cobalt/GPUProc/src/Input/ReaderWriterSynchronization.h -text
-RTCP/Cobalt/GPUProc/src/Input/WallClockTime.h -text
-RTCP/Cobalt/GPUProc/src/Kernel.cc -text
-RTCP/Cobalt/GPUProc/src/Kernel.h -text
-RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerKernel.cc -text
-RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerKernel.h -text
-RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerTransposeKernel.cc -text
-RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerTransposeKernel.h -text
-RTCP/Cobalt/GPUProc/src/Kernels/CoherentStokesKernel.cc -text
-RTCP/Cobalt/GPUProc/src/Kernels/CoherentStokesKernel.h -text
-RTCP/Cobalt/GPUProc/src/Kernels/CorrelatorKernel.cc -text
-RTCP/Cobalt/GPUProc/src/Kernels/CorrelatorKernel.h -text
-RTCP/Cobalt/GPUProc/src/Kernels/DedispersionBackwardFFTkernel.cc -text
-RTCP/Cobalt/GPUProc/src/Kernels/DedispersionBackwardFFTkernel.h -text
-RTCP/Cobalt/GPUProc/src/Kernels/DedispersionChirpKernel.cc -text
-RTCP/Cobalt/GPUProc/src/Kernels/DedispersionChirpKernel.h -text
-RTCP/Cobalt/GPUProc/src/Kernels/DedispersionForwardFFTkernel.cc -text
-RTCP/Cobalt/GPUProc/src/Kernels/DedispersionForwardFFTkernel.h -text
-RTCP/Cobalt/GPUProc/src/Kernels/DelayAndBandPassKernel.cc -text
-RTCP/Cobalt/GPUProc/src/Kernels/DelayAndBandPassKernel.h -text
-RTCP/Cobalt/GPUProc/src/Kernels/FFT_Kernel.cc -text
-RTCP/Cobalt/GPUProc/src/Kernels/FFT_Kernel.h -text
-RTCP/Cobalt/GPUProc/src/Kernels/FFT_Plan.cc -text
-RTCP/Cobalt/GPUProc/src/Kernels/FFT_Plan.h -text
-RTCP/Cobalt/GPUProc/src/Kernels/FIR_FilterKernel.cc -text
-RTCP/Cobalt/GPUProc/src/Kernels/FIR_FilterKernel.h -text
-RTCP/Cobalt/GPUProc/src/Kernels/Filter_FFT_Kernel.cc -text
-RTCP/Cobalt/GPUProc/src/Kernels/Filter_FFT_Kernel.h -text
-RTCP/Cobalt/GPUProc/src/Kernels/IncoherentStokesKernel.cc -text
-RTCP/Cobalt/GPUProc/src/Kernels/IncoherentStokesKernel.h -text
-RTCP/Cobalt/GPUProc/src/Kernels/IntToFloatKernel.cc -text
-RTCP/Cobalt/GPUProc/src/Kernels/IntToFloatKernel.h -text
-RTCP/Cobalt/GPUProc/src/Kernels/UHEP_BeamFormerKernel.cc -text
-RTCP/Cobalt/GPUProc/src/Kernels/UHEP_BeamFormerKernel.h -text
-RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFFT_Kernel.cc -text
-RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFFT_Kernel.h -text
-RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFIR_Kernel.cc -text
-RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFIR_Kernel.h -text
-RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TransposeKernel.cc -text
-RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TransposeKernel.h -text
-RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TriggerKernel.cc -text
-RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TriggerKernel.h -text
-RTCP/Cobalt/GPUProc/src/NewCorrelator.cl -text
-RTCP/Cobalt/GPUProc/src/OpenCL_Support.cc -text
-RTCP/Cobalt/GPUProc/src/OpenCL_Support.h -text
-RTCP/Cobalt/GPUProc/src/OpenMP_Support.h -text
-RTCP/Cobalt/GPUProc/src/PerformanceCounter.cc -text
-RTCP/Cobalt/GPUProc/src/PerformanceCounter.h -text
-RTCP/Cobalt/GPUProc/src/Pipeline.cc -text
-RTCP/Cobalt/GPUProc/src/Pipeline.h -text
-RTCP/Cobalt/GPUProc/src/Pipelines/BeamFormerPipeline.cc -text
-RTCP/Cobalt/GPUProc/src/Pipelines/BeamFormerPipeline.h -text
-RTCP/Cobalt/GPUProc/src/Pipelines/CorrelatorPipeline.cc -text
-RTCP/Cobalt/GPUProc/src/Pipelines/CorrelatorPipeline.h -text
-RTCP/Cobalt/GPUProc/src/Pipelines/CorrelatorPipelinePrograms.h -text
-RTCP/Cobalt/GPUProc/src/Pipelines/UHEP_Pipeline.cc -text
-RTCP/Cobalt/GPUProc/src/Pipelines/UHEP_Pipeline.h -text
-RTCP/Cobalt/GPUProc/src/Scheduling.cc -text
-RTCP/Cobalt/GPUProc/src/Scheduling.h -text
-RTCP/Cobalt/GPUProc/src/SlidingPointer.h -text
-RTCP/Cobalt/GPUProc/src/Storage/SSH.cc -text
-RTCP/Cobalt/GPUProc/src/Storage/SSH.h -text
-RTCP/Cobalt/GPUProc/src/Storage/StorageProcess.cc -text
-RTCP/Cobalt/GPUProc/src/Storage/StorageProcess.h -text
-RTCP/Cobalt/GPUProc/src/Storage/StorageProcesses.cc -text
-RTCP/Cobalt/GPUProc/src/Storage/StorageProcesses.h -text
-RTCP/Cobalt/GPUProc/src/UHEP/BeamFormer.cl -text
-RTCP/Cobalt/GPUProc/src/UHEP/BeamFormer.cl.4groups -text
-RTCP/Cobalt/GPUProc/src/UHEP/BeamFormer.cl.hop -text
-RTCP/Cobalt/GPUProc/src/UHEP/BeamFormer.cl.not -text
-RTCP/Cobalt/GPUProc/src/UHEP/BeamFormer.cl.ok -text
-RTCP/Cobalt/GPUProc/src/UHEP/InvFFT.cl -text
-RTCP/Cobalt/GPUProc/src/UHEP/InvFIR.cl -text
-RTCP/Cobalt/GPUProc/src/UHEP/InvertedStationPPFWeights.cc -text
-RTCP/Cobalt/GPUProc/src/UHEP/InvertedStationPPFWeights.h -text
-RTCP/Cobalt/GPUProc/src/UHEP/Transpose.cl -text
-RTCP/Cobalt/GPUProc/src/UHEP/Transpose.cl.ok -text
-RTCP/Cobalt/GPUProc/src/UHEP/Trigger.cl -text
-RTCP/Cobalt/GPUProc/src/UHEP/Trigger.cl.8 -text
-RTCP/Cobalt/GPUProc/src/UHEP/Trigger.cl.ok -text
-RTCP/Cobalt/GPUProc/src/UnitTest.cc -text
-RTCP/Cobalt/GPUProc/src/UnitTest.h -text
-RTCP/Cobalt/GPUProc/src/WorkQueues/BeamFormerWorkQueue.cc -text
-RTCP/Cobalt/GPUProc/src/WorkQueues/BeamFormerWorkQueue.h -text
-RTCP/Cobalt/GPUProc/src/WorkQueues/CorrelatorWorkQueue.cc -text
-RTCP/Cobalt/GPUProc/src/WorkQueues/CorrelatorWorkQueue.h -text
-RTCP/Cobalt/GPUProc/src/WorkQueues/UHEP_WorkQueue.cc -text
-RTCP/Cobalt/GPUProc/src/WorkQueues/UHEP_WorkQueue.h -text
-RTCP/Cobalt/GPUProc/src/WorkQueues/WorkQueue.cc -text
-RTCP/Cobalt/GPUProc/src/WorkQueues/WorkQueue.h -text
 RTCP/Cobalt/GPUProc/src/backward/CL/cl.hpp -text
-RTCP/Cobalt/GPUProc/src/createProgram.cc -text
-RTCP/Cobalt/GPUProc/src/createProgram.h -text
-RTCP/Cobalt/GPUProc/src/fft2.cl -text
-RTCP/Cobalt/GPUProc/src/global_defines.cc -text
-RTCP/Cobalt/GPUProc/src/global_defines.h -text
-RTCP/Cobalt/GPUProc/src/math.cl -text
-RTCP/Cobalt/GPUProc/src/rtcp.cc -text
 RTCP/Cobalt/GPUProc/test/CMakeLists.txt -text
-RTCP/Cobalt/GPUProc/test/DummyStorage.cc -text
 RTCP/Cobalt/GPUProc/test/DummyStorage.debug -text
-RTCP/Cobalt/GPUProc/test/Kernels/AMD_FFT_Test.h -text
-RTCP/Cobalt/GPUProc/test/Kernels/BeamFormerTest.h -text
-RTCP/Cobalt/GPUProc/test/Kernels/BeamFormerTransposeTest.h -text
-RTCP/Cobalt/GPUProc/test/Kernels/CoherentStokesTest.h -text
-RTCP/Cobalt/GPUProc/test/Kernels/CorrelateRectangleTest.h -text
-RTCP/Cobalt/GPUProc/test/Kernels/CorrelateTriangleTest.h -text
-RTCP/Cobalt/GPUProc/test/Kernels/CorrelatorTest.h -text
-RTCP/Cobalt/GPUProc/test/Kernels/DedispersionChirpTest.h -text
-RTCP/Cobalt/GPUProc/test/Kernels/FFT_Test.h -text
-RTCP/Cobalt/GPUProc/test/Kernels/FIR_FilterTest.h -text
-RTCP/Cobalt/GPUProc/test/Kernels/IncoherentStokesTest.h -text
-RTCP/Cobalt/GPUProc/test/Kernels/IntToFloatTest.h -text
-RTCP/Cobalt/GPUProc/test/Kernels/UHEP_BeamFormerTest.h -text
-RTCP/Cobalt/GPUProc/test/Kernels/UHEP_TransposeTest.h -text
-RTCP/Cobalt/GPUProc/test/Kernels/UHEP_TriggerTest.h -text
-RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.cc -text
 RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.parset.77_Stations -text
 RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.parset.AARTFAAC -text
 RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.parset.small-test -text
-RTCP/Cobalt/GPUProc/test/UnitTests/BeamFormerTest.cc -text
-RTCP/Cobalt/GPUProc/test/UnitTests/new_style_unittest.cc -text
 RTCP/Cobalt/GPUProc/test/cmpfloat.py -text
-RTCP/Cobalt/GPUProc/test/tBestEffortQueue.cc -text
-RTCP/Cobalt/GPUProc/test/tContext.cc -text
 RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB0.MS -text
 RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB1.MS -text
 RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB2.MS -text
@@ -3912,13 +3736,9 @@ RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB4.MS -text
 RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.parset -text
 RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.run -text
 RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.sh -text
-RTCP/Cobalt/GPUProc/test/tDelayCompensation.cc -text
-RTCP/Cobalt/GPUProc/test/tPerformanceCounter.cc -text
-RTCP/Cobalt/GPUProc/test/tSSH.cc -text
 RTCP/Cobalt/GPUProc/test/tSSH.run -text
 RTCP/Cobalt/GPUProc/test/tSSH.sh -text
 RTCP/Cobalt/GPUProc/test/tSSH.stdout -text
-RTCP/Cobalt/GPUProc/test/tStorageProcesses.cc -text
 RTCP/Cobalt/GPUProc/test/tStorageProcesses.sh -text
 RTCP/Cobalt/GPUProc/test/tStorageProcesses.stdout -text
 RTCP/Cobalt/GPUProc/test/testParset.sh -text
@@ -3935,10 +3755,6 @@ RTCP/Cobalt/InputProc/src/Buffer/SharedMemory.h -text
 RTCP/Cobalt/InputProc/src/Buffer/StationID.cc -text
 RTCP/Cobalt/InputProc/src/Buffer/StationID.h -text
 RTCP/Cobalt/InputProc/src/CMakeLists.txt -text
-RTCP/Cobalt/InputProc/src/OMPThread.h -text
-RTCP/Cobalt/InputProc/src/RSPBoards.cc -text
-RTCP/Cobalt/InputProc/src/RSPBoards.h -text
-RTCP/Cobalt/InputProc/src/SampleType.h -text
 RTCP/Cobalt/InputProc/src/Station/Generator.cc -text
 RTCP/Cobalt/InputProc/src/Station/Generator.h -text
 RTCP/Cobalt/InputProc/src/Station/PacketReader.cc -text
@@ -3952,35 +3768,24 @@ RTCP/Cobalt/InputProc/src/Station/filterRSP.cc -text
 RTCP/Cobalt/InputProc/src/Station/printRSP.cc -text
 RTCP/Cobalt/InputProc/src/Transpose/MPITransferStations.h -text
 RTCP/Cobalt/InputProc/src/Transpose/MPITransferStations.tcc -text
-RTCP/Cobalt/InputProc/src/WallClockTime.h -text
-RTCP/Cobalt/InputProc/src/newInputSection.cc -text
 RTCP/Cobalt/InputProc/src/obsolete/MPI_RMA.h -text
 RTCP/Cobalt/InputProc/src/obsolete/Poll.h -text
 RTCP/Cobalt/InputProc/src/obsolete/TimeSync.h -text
 RTCP/Cobalt/InputProc/test/CMakeLists.txt -text
-RTCP/Cobalt/InputProc/test/tGenerator.cc -text
-RTCP/Cobalt/InputProc/test/tPacketReader.cc -text
 RTCP/Cobalt/InputProc/test/tPacketReader.in_16bit -text
 RTCP/Cobalt/InputProc/test/tPacketReader.in_8bit -text
 RTCP/Cobalt/InputProc/test/tPacketReader.sh -text
-RTCP/Cobalt/InputProc/test/tPacketWriter.cc -text
 RTCP/Cobalt/InputProc/test/tPacketWriter.in_16bit -text
 RTCP/Cobalt/InputProc/test/tPacketWriter.in_8bit -text
 RTCP/Cobalt/InputProc/test/tPacketWriter.sh -text
-RTCP/Cobalt/InputProc/test/tPacketsToBuffer.cc -text
 RTCP/Cobalt/InputProc/test/tPacketsToBuffer.in_16bit -text
 RTCP/Cobalt/InputProc/test/tPacketsToBuffer.in_8bit -text
 RTCP/Cobalt/InputProc/test/tPacketsToBuffer.sh -text
-RTCP/Cobalt/InputProc/test/tRSP.cc -text
 RTCP/Cobalt/InputProc/test/tRSP.in_16bit -text
 RTCP/Cobalt/InputProc/test/tRSP.in_8bit -text
 RTCP/Cobalt/InputProc/test/tRSP.sh -text
 RTCP/Cobalt/InputProc/test/tRSP.stdout -text
-RTCP/Cobalt/InputProc/test/tRSPTimeStamp2.cc -text
-RTCP/Cobalt/InputProc/test/tRanges.cc -text
-RTCP/Cobalt/InputProc/test/tSampleBuffer.cc -text
 RTCP/Cobalt/InputProc/test/tSampleBuffer.sh -text
-RTCP/Cobalt/InputProc/test/tSharedMemory.cc -text
 RTCP/Cobalt/InputProc/test/tSharedMemory.sh -text
 RTCP/Cobalt/OpenCL_FFT/CMakeLists.txt -text
 RTCP/Cobalt/OpenCL_FFT/src/AccelerateError.pdf -text
@@ -4002,49 +3807,17 @@ RTCP/Cobalt/OpenCL_FFT/src/libOpenCL_FFT.a.not -text
 RTCP/Cobalt/OpenCL_FFT/src/main.cpp -text
 RTCP/Cobalt/OpenCL_FFT/src/param.txt -text
 RTCP/Cobalt/OpenCL_FFT/src/procs.h -text
-RTCP/Cobalt/OutputProc/src/ExitOnClosedStdin.cc -text
-RTCP/Cobalt/OutputProc/src/ExitOnClosedStdin.h -text
-RTCP/Cobalt/OutputProc/src/FastFileStream.cc -text
-RTCP/Cobalt/OutputProc/src/FastFileStream.h -text
-RTCP/Cobalt/OutputProc/src/Format.cc -text
-RTCP/Cobalt/OutputProc/src/Format.h -text
-RTCP/Cobalt/OutputProc/src/HDF5Attributes.h -text
-RTCP/Cobalt/OutputProc/src/IOPriority.h -text
-RTCP/Cobalt/OutputProc/src/MSWriterCorrelated.cc -text
-RTCP/Cobalt/OutputProc/src/MSWriterCorrelated.h -text
-RTCP/Cobalt/OutputProc/src/MSWriterDAL.cc -text
-RTCP/Cobalt/OutputProc/src/MSWriterDAL.h -text
-RTCP/Cobalt/OutputProc/src/MSWriterFile.cc -text
-RTCP/Cobalt/OutputProc/src/MSWriterFile.h -text
-RTCP/Cobalt/OutputProc/src/MSWriterNull.cc -text
-RTCP/Cobalt/OutputProc/src/MSWriterNull.h -text
-RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.cc -text
-RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.h -text
-RTCP/Cobalt/OutputProc/src/OutputThread.cc -text
-RTCP/Cobalt/OutputProc/src/OutputThread.h -text
-RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.cc -text
-RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.h -text
-RTCP/Cobalt/OutputProc/src/TBB_Writer.cc -text
-RTCP/Cobalt/OutputProc/src/TBB_Writer.h -text
-RTCP/Cobalt/OutputProc/src/TBB_Writer_main.cc -text
-RTCP/Cobalt/OutputProc/src/createHeaders.cc -text
 RTCP/Cobalt/OutputProc/src/gnuplotMS.sh -text
-RTCP/Cobalt/OutputProc/src/plotMS.cc -text
-RTCP/Cobalt/OutputProc/test/tDAL.cc -text
-RTCP/Cobalt/OutputProc/test/tFastFileStream.cc -text
-RTCP/Cobalt/OutputProc/test/tMSWriterCorrelated.cc -text
 RTCP/Cobalt/OutputProc/test/tMSWriterCorrelated.in_1/AntennaSets.conf -text
 RTCP/Cobalt/OutputProc/test/tMSWriterCorrelated.in_1/CS013-AntennaField.conf -text
 RTCP/Cobalt/OutputProc/test/tMSWriterCorrelated.parset -text
 RTCP/Cobalt/OutputProc/test/tMSWriterCorrelated.run -text
 RTCP/Cobalt/OutputProc/test/tMSWriterCorrelated.sh -text
 RTCP/Cobalt/OutputProc/test/tMSWriterCorrelated.stdout -text
-RTCP/Cobalt/OutputProc/test/tMSWriterDAL.cc -text
 RTCP/Cobalt/OutputProc/test/tMSWriterDAL.parset -text
 RTCP/Cobalt/OutputProc/test/tMSWriterDAL.sh -text
 RTCP/Cobalt/OutputProc/test/tMeasurementSetFormat.parset-j2000 -text
 RTCP/Cobalt/OutputProc/test/tMeasurementSetFormat.parset-sun -text
-RTCP/Cobalt/OutputProc/test/tTBB_StaticMapping.cc -text
 RTCP/Cobalt/OutputProc/test/tTBB_StaticMapping.sh -text
 RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.parset -text
 RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.parset -text
diff --git a/RTCP/Cobalt/CoInterface/src/BeamCoordinates.cc b/RTCP/Cobalt/CoInterface/src/BeamCoordinates.cc
index de8bcc01d2a..f0779246ed1 100644
--- a/RTCP/Cobalt/CoInterface/src/BeamCoordinates.cc
+++ b/RTCP/Cobalt/CoInterface/src/BeamCoordinates.cc
@@ -16,7 +16,7 @@
 //# You should have received a copy of the GNU General Public License along
 //# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
-//# $Id: BeamCoordinates.cc 24239 2013-03-12 18:40:13Z amesfoort $
+//# $Id$
 
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
diff --git a/RTCP/Cobalt/CoInterface/src/BeamCoordinates.h b/RTCP/Cobalt/CoInterface/src/BeamCoordinates.h
index 2ab96f9654b..605ee1993ea 100644
--- a/RTCP/Cobalt/CoInterface/src/BeamCoordinates.h
+++ b/RTCP/Cobalt/CoInterface/src/BeamCoordinates.h
@@ -16,7 +16,7 @@
 //# You should have received a copy of the GNU General Public License along
 //# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
-//# $Id: BeamCoordinates.h 24239 2013-03-12 18:40:13Z amesfoort $
+//# $Id$
 
 #ifndef LOFAR_INTERFACE_BEAMCOORDINATES_H
 #define LOFAR_INTERFACE_BEAMCOORDINATES_H
diff --git a/RTCP/Cobalt/CoInterface/src/BeamFormedData.h b/RTCP/Cobalt/CoInterface/src/BeamFormedData.h
index 00cf2158d41..df98ce7dc88 100644
--- a/RTCP/Cobalt/CoInterface/src/BeamFormedData.h
+++ b/RTCP/Cobalt/CoInterface/src/BeamFormedData.h
@@ -16,7 +16,7 @@
 //# You should have received a copy of the GNU General Public License along
 //# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
-//# $Id: BeamFormedData.h 24239 2013-03-12 18:40:13Z amesfoort $
+//# $Id$
 
 #ifndef LOFAR_INTERFACE_BEAMFORMED_DATA_H
 #define LOFAR_INTERFACE_BEAMFORMED_DATA_H
diff --git a/RTCP/Cobalt/CoInterface/src/DataFactory.cc b/RTCP/Cobalt/CoInterface/src/DataFactory.cc
index 927fd41dd41..9a285d4baf9 100644
--- a/RTCP/Cobalt/CoInterface/src/DataFactory.cc
+++ b/RTCP/Cobalt/CoInterface/src/DataFactory.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
diff --git a/RTCP/Cobalt/CoInterface/src/DataFactory.h b/RTCP/Cobalt/CoInterface/src/DataFactory.h
index 7a5e468b58c..65da893bf76 100644
--- a/RTCP/Cobalt/CoInterface/src/DataFactory.h
+++ b/RTCP/Cobalt/CoInterface/src/DataFactory.h
@@ -16,7 +16,7 @@
 //# You should have 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_INTERFACE_DATA_FACTORY_H
 #define LOFAR_INTERFACE_DATA_FACTORY_H
diff --git a/RTCP/Cobalt/CoInterface/src/FakeData.h b/RTCP/Cobalt/CoInterface/src/FakeData.h
index 139eff66773..8c7b5fcd8f5 100644
--- a/RTCP/Cobalt/CoInterface/src/FakeData.h
+++ b/RTCP/Cobalt/CoInterface/src/FakeData.h
@@ -16,7 +16,7 @@
 //# You should have 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_INTERFACE_FAKE_DATA_H
 #define LOFAR_INTERFACE_FAKE_DATA_H
diff --git a/RTCP/Cobalt/CoInterface/src/FinalMetaData.cc b/RTCP/Cobalt/CoInterface/src/FinalMetaData.cc
index c75dad1f89c..4df082be411 100644
--- a/RTCP/Cobalt/CoInterface/src/FinalMetaData.cc
+++ b/RTCP/Cobalt/CoInterface/src/FinalMetaData.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/CoInterface/src/FinalMetaData.h b/RTCP/Cobalt/CoInterface/src/FinalMetaData.h
index 4b70a31c42a..45d918ca7c9 100644
--- a/RTCP/Cobalt/CoInterface/src/FinalMetaData.h
+++ b/RTCP/Cobalt/CoInterface/src/FinalMetaData.h
@@ -16,7 +16,7 @@
 //# You should have 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_INTERFACE_FINAL_METADATA_H
 #define LOFAR_INTERFACE_FINAL_METADATA_H
diff --git a/RTCP/Cobalt/CoInterface/src/InverseFilteredData.h b/RTCP/Cobalt/CoInterface/src/InverseFilteredData.h
index b5dc27f1e20..18b90b456aa 100644
--- a/RTCP/Cobalt/CoInterface/src/InverseFilteredData.h
+++ b/RTCP/Cobalt/CoInterface/src/InverseFilteredData.h
@@ -16,7 +16,7 @@
 //# You should have 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_INTERFACE_INVERSE_FILTERED_DATA_H
 #define LOFAR_INTERFACE_INVERSE_FILTERED_DATA_H
diff --git a/RTCP/Cobalt/CoInterface/src/OutputTypes.h b/RTCP/Cobalt/CoInterface/src/OutputTypes.h
index abd2aa9f66b..bc1c08d4037 100644
--- a/RTCP/Cobalt/CoInterface/src/OutputTypes.h
+++ b/RTCP/Cobalt/CoInterface/src/OutputTypes.h
@@ -16,7 +16,7 @@
 //# You should have 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_RTCP_INTERFACE_OUTPUT_TYPES_H
 #define LOFAR_RTCP_INTERFACE_OUTPUT_TYPES_H
diff --git a/RTCP/Cobalt/CoInterface/src/SetOperations.h b/RTCP/Cobalt/CoInterface/src/SetOperations.h
index 80f9fd1b5a3..bedb287d6da 100644
--- a/RTCP/Cobalt/CoInterface/src/SetOperations.h
+++ b/RTCP/Cobalt/CoInterface/src/SetOperations.h
@@ -16,7 +16,7 @@
 //# You should have 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_INTERFACE_SET_OPERATIONS_H
 #define LOFAR_INTERFACE_SET_OPERATIONS_H
diff --git a/RTCP/Cobalt/CoInterface/src/SmartPtr.h b/RTCP/Cobalt/CoInterface/src/SmartPtr.h
index f63a8200ead..06dc8484e95 100644
--- a/RTCP/Cobalt/CoInterface/src/SmartPtr.h
+++ b/RTCP/Cobalt/CoInterface/src/SmartPtr.h
@@ -16,7 +16,7 @@
 //# You should have 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_INTERFACE_SMART_PTR_H
 #define LOFAR_INTERFACE_SMART_PTR_H
diff --git a/RTCP/Cobalt/CoInterface/src/Stream.cc b/RTCP/Cobalt/CoInterface/src/Stream.cc
index b22e780c5b2..d817169352c 100644
--- a/RTCP/Cobalt/CoInterface/src/Stream.cc
+++ b/RTCP/Cobalt/CoInterface/src/Stream.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
diff --git a/RTCP/Cobalt/CoInterface/src/Stream.h b/RTCP/Cobalt/CoInterface/src/Stream.h
index e384a5de0fc..7d83f70aff3 100644
--- a/RTCP/Cobalt/CoInterface/src/Stream.h
+++ b/RTCP/Cobalt/CoInterface/src/Stream.h
@@ -16,7 +16,7 @@
 //# You should have 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_INTERFACE_STREAM_H
 #define LOFAR_INTERFACE_STREAM_H
diff --git a/RTCP/Cobalt/CoInterface/src/StreamableData.h b/RTCP/Cobalt/CoInterface/src/StreamableData.h
index 88919ea26e9..ef81b6caf35 100644
--- a/RTCP/Cobalt/CoInterface/src/StreamableData.h
+++ b/RTCP/Cobalt/CoInterface/src/StreamableData.h
@@ -16,7 +16,7 @@
 //# You should have 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_INTERFACE_STREAMABLE_DATA_H
 #define LOFAR_INTERFACE_STREAMABLE_DATA_H
diff --git a/RTCP/Cobalt/CoInterface/src/TransposedBeamFormedData.h b/RTCP/Cobalt/CoInterface/src/TransposedBeamFormedData.h
index 3bc5774bf11..5a7ad5b739b 100644
--- a/RTCP/Cobalt/CoInterface/src/TransposedBeamFormedData.h
+++ b/RTCP/Cobalt/CoInterface/src/TransposedBeamFormedData.h
@@ -16,7 +16,7 @@
 //# You should have 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_CNPROC_TRANSPOSED_BEAMFORMED_DATA_H
 #define LOFAR_CNPROC_TRANSPOSED_BEAMFORMED_DATA_H
diff --git a/RTCP/Cobalt/CoInterface/src/TriggerData.h b/RTCP/Cobalt/CoInterface/src/TriggerData.h
index c45d190ae54..9e6d6860412 100644
--- a/RTCP/Cobalt/CoInterface/src/TriggerData.h
+++ b/RTCP/Cobalt/CoInterface/src/TriggerData.h
@@ -16,7 +16,7 @@
 //# You should have 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_INTERFACE_TRIGGER_DATA_H
 #define LOFAR_INTERFACE_TRIGGER_DATA_H
diff --git a/RTCP/Cobalt/CoInterface/test/tCorrelatedData.cc b/RTCP/Cobalt/CoInterface/test/tCorrelatedData.cc
index 000f99b07c5..770ff8a3ffc 100644
--- a/RTCP/Cobalt/CoInterface/test/tCorrelatedData.cc
+++ b/RTCP/Cobalt/CoInterface/test/tCorrelatedData.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/CoInterface/test/tMultiDimArray.cc b/RTCP/Cobalt/CoInterface/test/tMultiDimArray.cc
index 01e45beb650..fa445c12a73 100644
--- a/RTCP/Cobalt/CoInterface/test/tMultiDimArray.cc
+++ b/RTCP/Cobalt/CoInterface/test/tMultiDimArray.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/CoInterface/test/tParset.cc b/RTCP/Cobalt/CoInterface/test/tParset.cc
index e7c3c91ad34..a8c4767f7eb 100644
--- a/RTCP/Cobalt/CoInterface/test/tParset.cc
+++ b/RTCP/Cobalt/CoInterface/test/tParset.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/src/BandPass.cc b/RTCP/Cobalt/GPUProc/src/BandPass.cc
index f87ea7b4664..91ee03ff61d 100644
--- a/RTCP/Cobalt/GPUProc/src/BandPass.cc
+++ b/RTCP/Cobalt/GPUProc/src/BandPass.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/src/BandPass.h b/RTCP/Cobalt/GPUProc/src/BandPass.h
index ebaaac3f06f..e12f5227448 100644
--- a/RTCP/Cobalt/GPUProc/src/BandPass.h
+++ b/RTCP/Cobalt/GPUProc/src/BandPass.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_BANDPASS_H
 #define LOFAR_GPUPROC_BANDPASS_H
diff --git a/RTCP/Cobalt/GPUProc/src/BeamFormer/BeamFormer.cl b/RTCP/Cobalt/GPUProc/src/BeamFormer/BeamFormer.cl
index dcc60a2ce5b..aec27fa0e5f 100644
--- a/RTCP/Cobalt/GPUProc/src/BeamFormer/BeamFormer.cl
+++ b/RTCP/Cobalt/GPUProc/src/BeamFormer/BeamFormer.cl
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #define MAX(A,B) ((A)>(B) ? (A) : (B))
 #define NR_PASSES MAX((NR_STATIONS + 6) / 16, 1) // gives best results on GTX 680
diff --git a/RTCP/Cobalt/GPUProc/src/BeamFormer/CoherentStokes.cl b/RTCP/Cobalt/GPUProc/src/BeamFormer/CoherentStokes.cl
index e8691f85157..29230e01ab9 100644
--- a/RTCP/Cobalt/GPUProc/src/BeamFormer/CoherentStokes.cl
+++ b/RTCP/Cobalt/GPUProc/src/BeamFormer/CoherentStokes.cl
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 __kernel void coherentStokes(__global void//#restrict stokesDataPtr,
                              __global const void *restrict complexVoltagesPtr)
diff --git a/RTCP/Cobalt/GPUProc/src/BeamFormer/Dedispersion.cl b/RTCP/Cobalt/GPUProc/src/BeamFormer/Dedispersion.cl
index ec09ae231ea..d51a9e1b877 100644
--- a/RTCP/Cobalt/GPUProc/src/BeamFormer/Dedispersion.cl
+++ b/RTCP/Cobalt/GPUProc/src/BeamFormer/Dedispersion.cl
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "math.cl"
 
diff --git a/RTCP/Cobalt/GPUProc/src/BeamFormer/IncoherentStokes.cl b/RTCP/Cobalt/GPUProc/src/BeamFormer/IncoherentStokes.cl
index c78620b2a05..51edf76e3dc 100644
--- a/RTCP/Cobalt/GPUProc/src/BeamFormer/IncoherentStokes.cl
+++ b/RTCP/Cobalt/GPUProc/src/BeamFormer/IncoherentStokes.cl
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 typedef __global float (*IncoherentStokesType)[NR_INCOHERENT_STOKES][NR_SAMPLES_PER_CHANNEL / INCOHERENT_STOKES_TIME_INTEGRATION_FACTOR][NR_CHANNELS];
 typedef __global float4 (*InputType)[NR_STATIONS][NR_CHANNELS][NR_SAMPLES_PER_CHANNEL / INCOHERENT_STOKES_TIME_INTEGRATION_FACTOR][INCOHERENT_STOKES_TIME_INTEGRATION_FACTOR];
diff --git a/RTCP/Cobalt/GPUProc/src/BeamFormer/IntToFloat.cl b/RTCP/Cobalt/GPUProc/src/BeamFormer/IntToFloat.cl
index 5fd5e608391..4ead4d543f7 100644
--- a/RTCP/Cobalt/GPUProc/src/BeamFormer/IntToFloat.cl
+++ b/RTCP/Cobalt/GPUProc/src/BeamFormer/IntToFloat.cl
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #if NR_BITS_PER_SAMPLE == 16
 typedef short2 SampleType;
diff --git a/RTCP/Cobalt/GPUProc/src/BeamFormer/Transpose.cl b/RTCP/Cobalt/GPUProc/src/BeamFormer/Transpose.cl
index 206bc345e74..971883fe628 100644
--- a/RTCP/Cobalt/GPUProc/src/BeamFormer/Transpose.cl
+++ b/RTCP/Cobalt/GPUProc/src/BeamFormer/Transpose.cl
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #if 0
 typedef __global float2 (*TransposedDataType)[NR_TABS][NR_POLARIZATIONS][NR_SAMPLES_PER_CHANNEL][NR_CHANNELS];
diff --git a/RTCP/Cobalt/GPUProc/src/BestEffortQueue.h b/RTCP/Cobalt/GPUProc/src/BestEffortQueue.h
index ed483b859a2..90b10567ddd 100644
--- a/RTCP/Cobalt/GPUProc/src/BestEffortQueue.h
+++ b/RTCP/Cobalt/GPUProc/src/BestEffortQueue.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_BEST_EFFORT_QUEUE_H
 #define LOFAR_GPUPROC_BEST_EFFORT_QUEUE_H
diff --git a/RTCP/Cobalt/GPUProc/src/BestEffortQueue.tcc b/RTCP/Cobalt/GPUProc/src/BestEffortQueue.tcc
index 5948c32c3e0..633bb5e8da0 100644
--- a/RTCP/Cobalt/GPUProc/src/BestEffortQueue.tcc
+++ b/RTCP/Cobalt/GPUProc/src/BestEffortQueue.tcc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 namespace LOFAR
 {
diff --git a/RTCP/Cobalt/GPUProc/src/Correlator.cl b/RTCP/Cobalt/GPUProc/src/Correlator.cl
index c8de222d397..977f8e90791 100644
--- a/RTCP/Cobalt/GPUProc/src/Correlator.cl
+++ b/RTCP/Cobalt/GPUProc/src/Correlator.cl
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "math.cl"
 
diff --git a/RTCP/Cobalt/GPUProc/src/DelayAndBandPass.cl b/RTCP/Cobalt/GPUProc/src/DelayAndBandPass.cl
index c40e0a268ee..71e69b160a3 100644
--- a/RTCP/Cobalt/GPUProc/src/DelayAndBandPass.cl
+++ b/RTCP/Cobalt/GPUProc/src/DelayAndBandPass.cl
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "math.cl"
 
diff --git a/RTCP/Cobalt/GPUProc/src/FIR.cl b/RTCP/Cobalt/GPUProc/src/FIR.cl
index bb7312b0996..7018cae6a61 100644
--- a/RTCP/Cobalt/GPUProc/src/FIR.cl
+++ b/RTCP/Cobalt/GPUProc/src/FIR.cl
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #define COMPLEX 2       // do not change
 
diff --git a/RTCP/Cobalt/GPUProc/src/FilterBank.cc b/RTCP/Cobalt/GPUProc/src/FilterBank.cc
index d601093d275..a1e2cc9bfd5 100644
--- a/RTCP/Cobalt/GPUProc/src/FilterBank.cc
+++ b/RTCP/Cobalt/GPUProc/src/FilterBank.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
diff --git a/RTCP/Cobalt/GPUProc/src/FilterBank.h b/RTCP/Cobalt/GPUProc/src/FilterBank.h
index b8eaf9c26f2..4e9b057b219 100644
--- a/RTCP/Cobalt/GPUProc/src/FilterBank.h
+++ b/RTCP/Cobalt/GPUProc/src/FilterBank.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_FILTER_BANK_H
 #define LOFAR_GPUPROC_FILTER_BANK_H
diff --git a/RTCP/Cobalt/GPUProc/src/Input/BeamletBuffer.cc b/RTCP/Cobalt/GPUProc/src/Input/BeamletBuffer.cc
index e64e815929a..7a204a026f6 100644
--- a/RTCP/Cobalt/GPUProc/src/Input/BeamletBuffer.cc
+++ b/RTCP/Cobalt/GPUProc/src/Input/BeamletBuffer.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
diff --git a/RTCP/Cobalt/GPUProc/src/Input/BeamletBuffer.h b/RTCP/Cobalt/GPUProc/src/Input/BeamletBuffer.h
index 4329bd7ce44..2e4db9017d0 100644
--- a/RTCP/Cobalt/GPUProc/src/Input/BeamletBuffer.h
+++ b/RTCP/Cobalt/GPUProc/src/Input/BeamletBuffer.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_BEAMLET_BUFFER_H
 #define LOFAR_GPUPROC_BEAMLET_BUFFER_H
diff --git a/RTCP/Cobalt/GPUProc/src/Input/BeamletBufferToComputeNode.cc b/RTCP/Cobalt/GPUProc/src/Input/BeamletBufferToComputeNode.cc
index 5c54d27892f..3de70cb0150 100644
--- a/RTCP/Cobalt/GPUProc/src/Input/BeamletBufferToComputeNode.cc
+++ b/RTCP/Cobalt/GPUProc/src/Input/BeamletBufferToComputeNode.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
diff --git a/RTCP/Cobalt/GPUProc/src/Input/BeamletBufferToComputeNode.h b/RTCP/Cobalt/GPUProc/src/Input/BeamletBufferToComputeNode.h
index 060762f1663..5f7d65a318e 100644
--- a/RTCP/Cobalt/GPUProc/src/Input/BeamletBufferToComputeNode.h
+++ b/RTCP/Cobalt/GPUProc/src/Input/BeamletBufferToComputeNode.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_BEAMLET_BUFFER_TO_COMPUTE_NODE_H
 #define LOFAR_GPUPROC_BEAMLET_BUFFER_TO_COMPUTE_NODE_H
diff --git a/RTCP/Cobalt/GPUProc/src/Input/Delays.cc b/RTCP/Cobalt/GPUProc/src/Input/Delays.cc
index 948c7d83dda..b1f5484e771 100644
--- a/RTCP/Cobalt/GPUProc/src/Input/Delays.cc
+++ b/RTCP/Cobalt/GPUProc/src/Input/Delays.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
diff --git a/RTCP/Cobalt/GPUProc/src/Input/Delays.h b/RTCP/Cobalt/GPUProc/src/Input/Delays.h
index 68f901a762f..556af5d8a0c 100644
--- a/RTCP/Cobalt/GPUProc/src/Input/Delays.h
+++ b/RTCP/Cobalt/GPUProc/src/Input/Delays.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_DELAYS_H
 #define LOFAR_GPUPROC_DELAYS_H
diff --git a/RTCP/Cobalt/GPUProc/src/Input/InputSection.cc b/RTCP/Cobalt/GPUProc/src/Input/InputSection.cc
index 209b8f87193..77364b95038 100644
--- a/RTCP/Cobalt/GPUProc/src/Input/InputSection.cc
+++ b/RTCP/Cobalt/GPUProc/src/Input/InputSection.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
diff --git a/RTCP/Cobalt/GPUProc/src/Input/InputSection.h b/RTCP/Cobalt/GPUProc/src/Input/InputSection.h
index db63c86651e..a0457fbe5f4 100644
--- a/RTCP/Cobalt/GPUProc/src/Input/InputSection.h
+++ b/RTCP/Cobalt/GPUProc/src/Input/InputSection.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_INPUT_SECTION_H
 #define LOFAR_GPUPROC_INPUT_SECTION_H
diff --git a/RTCP/Cobalt/GPUProc/src/Input/InputThread.cc b/RTCP/Cobalt/GPUProc/src/Input/InputThread.cc
index 327a8f9be7d..c9ebf7131e4 100644
--- a/RTCP/Cobalt/GPUProc/src/Input/InputThread.cc
+++ b/RTCP/Cobalt/GPUProc/src/Input/InputThread.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
diff --git a/RTCP/Cobalt/GPUProc/src/Input/InputThread.h b/RTCP/Cobalt/GPUProc/src/Input/InputThread.h
index b8af6542fca..6b9dc7fc993 100644
--- a/RTCP/Cobalt/GPUProc/src/Input/InputThread.h
+++ b/RTCP/Cobalt/GPUProc/src/Input/InputThread.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_INPUT_THREAD_H
 #define LOFAR_GPUPROC_INPUT_THREAD_H
diff --git a/RTCP/Cobalt/GPUProc/src/Input/LockedRanges.h b/RTCP/Cobalt/GPUProc/src/Input/LockedRanges.h
index 1e27bde08f3..6ae014e60ca 100644
--- a/RTCP/Cobalt/GPUProc/src/Input/LockedRanges.h
+++ b/RTCP/Cobalt/GPUProc/src/Input/LockedRanges.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_LOCKED_RANGES_H
 #define LOFAR_GPUPROC_LOCKED_RANGES_H
diff --git a/RTCP/Cobalt/GPUProc/src/Input/LogThread.cc b/RTCP/Cobalt/GPUProc/src/Input/LogThread.cc
index c3b714fab0b..9909b977bbf 100644
--- a/RTCP/Cobalt/GPUProc/src/Input/LogThread.cc
+++ b/RTCP/Cobalt/GPUProc/src/Input/LogThread.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
diff --git a/RTCP/Cobalt/GPUProc/src/Input/LogThread.h b/RTCP/Cobalt/GPUProc/src/Input/LogThread.h
index 734d3c3308c..02d9979e1a6 100644
--- a/RTCP/Cobalt/GPUProc/src/Input/LogThread.h
+++ b/RTCP/Cobalt/GPUProc/src/Input/LogThread.h
@@ -17,7 +17,7 @@
 //# You should have 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_GPUPROC_LOG_THREAD_H
 #define LOFAR_GPUPROC_LOG_THREAD_H
diff --git a/RTCP/Cobalt/GPUProc/src/Input/RSP.h b/RTCP/Cobalt/GPUProc/src/Input/RSP.h
index 059f2b689d8..1ffa08785c8 100644
--- a/RTCP/Cobalt/GPUProc/src/Input/RSP.h
+++ b/RTCP/Cobalt/GPUProc/src/Input/RSP.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_RSP_H
 #define LOFAR_GPUPROC_RSP_H
diff --git a/RTCP/Cobalt/GPUProc/src/Input/ReaderWriterSynchronization.cc b/RTCP/Cobalt/GPUProc/src/Input/ReaderWriterSynchronization.cc
index 78b50d3a752..ba50c6b4ad3 100644
--- a/RTCP/Cobalt/GPUProc/src/Input/ReaderWriterSynchronization.cc
+++ b/RTCP/Cobalt/GPUProc/src/Input/ReaderWriterSynchronization.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
diff --git a/RTCP/Cobalt/GPUProc/src/Input/ReaderWriterSynchronization.h b/RTCP/Cobalt/GPUProc/src/Input/ReaderWriterSynchronization.h
index f0d15492edc..f39182aad10 100644
--- a/RTCP/Cobalt/GPUProc/src/Input/ReaderWriterSynchronization.h
+++ b/RTCP/Cobalt/GPUProc/src/Input/ReaderWriterSynchronization.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_READER_WRITER_SYNCHRONIZATION
 #define LOFAR_GPUPROC_READER_WRITER_SYNCHRONIZATION
diff --git a/RTCP/Cobalt/GPUProc/src/Input/WallClockTime.h b/RTCP/Cobalt/GPUProc/src/Input/WallClockTime.h
index 8ec908caa15..ce126310d73 100644
--- a/RTCP/Cobalt/GPUProc/src/Input/WallClockTime.h
+++ b/RTCP/Cobalt/GPUProc/src/Input/WallClockTime.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_WALL_CLOCK_TIME_H
 #define LOFAR_GPUPROC_WALL_CLOCK_TIME_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernel.cc b/RTCP/Cobalt/GPUProc/src/Kernel.cc
index 8d8243874e1..800b9b438b6 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernel.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernel.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernel.h b/RTCP/Cobalt/GPUProc/src/Kernel.h
index 268a254d5e5..b1a3c05e2c1 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernel.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernel.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_KERNEL_H
 #define LOFAR_GPUPROC_KERNEL_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerKernel.cc b/RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerKernel.cc
index 76466c07745..3f9114512c0 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerKernel.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerKernel.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "lofar_config.h"
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerKernel.h b/RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerKernel.h
index 396e9fee0da..da406798413 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerKernel.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerKernel.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_BEAM_FORMER_KERNEL_H
 #define LOFAR_GPUPROC_BEAM_FORMER_KERNEL_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerTransposeKernel.cc b/RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerTransposeKernel.cc
index 47a6efaadbc..55211061c3d 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerTransposeKernel.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerTransposeKernel.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "lofar_config.h"
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerTransposeKernel.h b/RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerTransposeKernel.h
index 7f9cdf39bf9..333ead17be3 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerTransposeKernel.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/BeamFormerTransposeKernel.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_BEAM_FORMER_TRANSPOSE_KERNEL_H
 #define LOFAR_GPUPROC_BEAM_FORMER_TRANSPOSE_KERNEL_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/CoherentStokesKernel.cc b/RTCP/Cobalt/GPUProc/src/Kernels/CoherentStokesKernel.cc
index 165fb10b80e..99876802a15 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/CoherentStokesKernel.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/CoherentStokesKernel.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "lofar_config.h"
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/CoherentStokesKernel.h b/RTCP/Cobalt/GPUProc/src/Kernels/CoherentStokesKernel.h
index 87cb58b3131..ee592c9e586 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/CoherentStokesKernel.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/CoherentStokesKernel.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_COHERENT_STOKES_KERNEL_H
 #define LOFAR_GPUPROC_COHERENT_STOKES_KERNEL_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/CorrelatorKernel.cc b/RTCP/Cobalt/GPUProc/src/Kernels/CorrelatorKernel.cc
index 48767dc563a..d7558d35f5c 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/CorrelatorKernel.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/CorrelatorKernel.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "lofar_config.h"
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/CorrelatorKernel.h b/RTCP/Cobalt/GPUProc/src/Kernels/CorrelatorKernel.h
index 716141ab17d..3755b4ba245 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/CorrelatorKernel.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/CorrelatorKernel.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_CORRELATOR_KERNEL_H
 #define LOFAR_GPUPROC_CORRELATOR_KERNEL_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionBackwardFFTkernel.cc b/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionBackwardFFTkernel.cc
index 965af5db58f..5ace352d04c 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionBackwardFFTkernel.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionBackwardFFTkernel.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "lofar_config.h"
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionBackwardFFTkernel.h b/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionBackwardFFTkernel.h
index aa0de4ecd77..3629c2fc911 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionBackwardFFTkernel.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionBackwardFFTkernel.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_DEDISPERSION_BACKWARD_FFTKERNEL_H
 #define LOFAR_GPUPROC_DEDISPERSION_BACKWARD_FFTKERNEL_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionChirpKernel.cc b/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionChirpKernel.cc
index df39a1ef9fe..90bd19c86f3 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionChirpKernel.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionChirpKernel.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "lofar_config.h"
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionChirpKernel.h b/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionChirpKernel.h
index 60faf56c14a..878585e5bf2 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionChirpKernel.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionChirpKernel.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_DEDISPERSION_CHIRP_KERNEL_H
 #define LOFAR_GPUPROC_DEDISPERSION_CHIRP_KERNEL_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionForwardFFTkernel.cc b/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionForwardFFTkernel.cc
index 25cf532587c..735041c6c0e 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionForwardFFTkernel.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionForwardFFTkernel.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "lofar_config.h"
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionForwardFFTkernel.h b/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionForwardFFTkernel.h
index 04c70fee31f..ad2112f8968 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionForwardFFTkernel.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/DedispersionForwardFFTkernel.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_DEDISPERSION_FORWARD_FFTKERNEL_H
 #define LOFAR_GPUPROC_DEDISPERSION_FORWARD_FFTKERNEL_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/DelayAndBandPassKernel.cc b/RTCP/Cobalt/GPUProc/src/Kernels/DelayAndBandPassKernel.cc
index 4634a18979a..94c7c70648b 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/DelayAndBandPassKernel.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/DelayAndBandPassKernel.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "lofar_config.h"
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/DelayAndBandPassKernel.h b/RTCP/Cobalt/GPUProc/src/Kernels/DelayAndBandPassKernel.h
index 7c12d3eb86b..65106f337a2 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/DelayAndBandPassKernel.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/DelayAndBandPassKernel.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_DELAY_AND_BAND_PASS_KERNEL_H
 #define LOFAR_GPUPROC_DELAY_AND_BAND_PASS_KERNEL_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/FFT_Kernel.cc b/RTCP/Cobalt/GPUProc/src/Kernels/FFT_Kernel.cc
index fb21b863eaf..ab20c30c2f0 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/FFT_Kernel.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/FFT_Kernel.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "lofar_config.h"
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/FFT_Kernel.h b/RTCP/Cobalt/GPUProc/src/Kernels/FFT_Kernel.h
index 92630cbb510..1b4e12324c2 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/FFT_Kernel.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/FFT_Kernel.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_FFT_KERNEL_H
 #define LOFAR_GPUPROC_FFT_KERNEL_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/FFT_Plan.cc b/RTCP/Cobalt/GPUProc/src/Kernels/FFT_Plan.cc
index d084e2b9587..4da95c9993c 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/FFT_Plan.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/FFT_Plan.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "lofar_config.h"
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/FFT_Plan.h b/RTCP/Cobalt/GPUProc/src/Kernels/FFT_Plan.h
index 1de73243154..351af486ed3 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/FFT_Plan.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/FFT_Plan.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_FFT_PLAN_H
 #define LOFAR_GPUPROC_FFT_PLAN_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/FIR_FilterKernel.cc b/RTCP/Cobalt/GPUProc/src/Kernels/FIR_FilterKernel.cc
index b629a628fbf..52b796d8a61 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/FIR_FilterKernel.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/FIR_FilterKernel.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "lofar_config.h"
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/FIR_FilterKernel.h b/RTCP/Cobalt/GPUProc/src/Kernels/FIR_FilterKernel.h
index 669904695f4..b2b8e878276 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/FIR_FilterKernel.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/FIR_FilterKernel.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_FIR_FILTER_KERNEL_H
 #define LOFAR_GPUPROC_FIR_FILTER_KERNEL_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/Filter_FFT_Kernel.cc b/RTCP/Cobalt/GPUProc/src/Kernels/Filter_FFT_Kernel.cc
index 226cb130253..3a54d1c5726 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/Filter_FFT_Kernel.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/Filter_FFT_Kernel.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "lofar_config.h"
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/Filter_FFT_Kernel.h b/RTCP/Cobalt/GPUProc/src/Kernels/Filter_FFT_Kernel.h
index 06c1b9abfde..8348b788dc6 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/Filter_FFT_Kernel.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/Filter_FFT_Kernel.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_FILTER_FFT_KERNEL_H
 #define LOFAR_GPUPROC_FILTER_FFT_KERNEL_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/IncoherentStokesKernel.cc b/RTCP/Cobalt/GPUProc/src/Kernels/IncoherentStokesKernel.cc
index ac723df0e7e..9a1496d7a65 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/IncoherentStokesKernel.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/IncoherentStokesKernel.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "lofar_config.h"
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/IncoherentStokesKernel.h b/RTCP/Cobalt/GPUProc/src/Kernels/IncoherentStokesKernel.h
index 02e23b55059..2d9522de492 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/IncoherentStokesKernel.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/IncoherentStokesKernel.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_INCOHERENT_STOKES_KERNEL_H
 #define LOFAR_GPUPROC_INCOHERENT_STOKES_KERNEL_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/IntToFloatKernel.cc b/RTCP/Cobalt/GPUProc/src/Kernels/IntToFloatKernel.cc
index 256a5b6370d..147602b05fd 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/IntToFloatKernel.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/IntToFloatKernel.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "lofar_config.h"
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/IntToFloatKernel.h b/RTCP/Cobalt/GPUProc/src/Kernels/IntToFloatKernel.h
index 08500aa30dd..7ba6dc118bf 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/IntToFloatKernel.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/IntToFloatKernel.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_INT_TO_FLOAT_KERNEL_H
 #define LOFAR_GPUPROC_INT_TO_FLOAT_KERNEL_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_BeamFormerKernel.cc b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_BeamFormerKernel.cc
index 2b8a92d4f43..0d0a0c4ca8d 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_BeamFormerKernel.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_BeamFormerKernel.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "lofar_config.h"
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_BeamFormerKernel.h b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_BeamFormerKernel.h
index 541a92dbf4f..1a4a7e837ca 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_BeamFormerKernel.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_BeamFormerKernel.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_UHEP_BEAM_FORMER_KERNEL_H
 #define LOFAR_GPUPROC_UHEP_BEAM_FORMER_KERNEL_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFFT_Kernel.cc b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFFT_Kernel.cc
index dca0ce2584f..d34d58c10af 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFFT_Kernel.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFFT_Kernel.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "lofar_config.h"
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFFT_Kernel.h b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFFT_Kernel.h
index 08a77fcc154..b952c8f3e7d 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFFT_Kernel.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFFT_Kernel.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_UHEP_INV_FFT_KERNEL_H
 #define LOFAR_GPUPROC_UHEP_INV_FFT_KERNEL_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFIR_Kernel.cc b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFIR_Kernel.cc
index 445f4f955b1..923f3c5382e 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFIR_Kernel.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFIR_Kernel.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "lofar_config.h"
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFIR_Kernel.h b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFIR_Kernel.h
index 3394ae23d64..e383745fd62 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFIR_Kernel.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_InvFIR_Kernel.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_UHEP_INV_FIR_KERNEL_H
 #define LOFAR_GPUPROC_UHEP_INV_FIR_KERNEL_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TransposeKernel.cc b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TransposeKernel.cc
index 9677e170114..8e96b1ec386 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TransposeKernel.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TransposeKernel.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "lofar_config.h"
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TransposeKernel.h b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TransposeKernel.h
index e8e0481c387..0367b2dfba1 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TransposeKernel.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TransposeKernel.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_UHEP_TRANSPOSE_KERNEL_H
 #define LOFAR_GPUPROC_UHEP_TRANSPOSE_KERNEL_H
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TriggerKernel.cc b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TriggerKernel.cc
index 7768bd9a69a..5a4ef5bb7f6 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TriggerKernel.cc
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TriggerKernel.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "lofar_config.h"
 
diff --git a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TriggerKernel.h b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TriggerKernel.h
index 0ac565dc995..09df9ccc179 100644
--- a/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TriggerKernel.h
+++ b/RTCP/Cobalt/GPUProc/src/Kernels/UHEP_TriggerKernel.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_UHEP_TRIGGER_KERNEL_H
 #define LOFAR_GPUPROC_UHEP_TRIGGER_KERNEL_H
diff --git a/RTCP/Cobalt/GPUProc/src/NewCorrelator.cl b/RTCP/Cobalt/GPUProc/src/NewCorrelator.cl
index 48fa406f3e8..a81ab255f82 100644
--- a/RTCP/Cobalt/GPUProc/src/NewCorrelator.cl
+++ b/RTCP/Cobalt/GPUProc/src/NewCorrelator.cl
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "math.cl"
 
diff --git a/RTCP/Cobalt/GPUProc/src/OpenCL_Support.cc b/RTCP/Cobalt/GPUProc/src/OpenCL_Support.cc
index ff419933266..f045975ac53 100644
--- a/RTCP/Cobalt/GPUProc/src/OpenCL_Support.cc
+++ b/RTCP/Cobalt/GPUProc/src/OpenCL_Support.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/src/OpenCL_Support.h b/RTCP/Cobalt/GPUProc/src/OpenCL_Support.h
index bcbced5c4dd..b5b4701abd8 100644
--- a/RTCP/Cobalt/GPUProc/src/OpenCL_Support.h
+++ b/RTCP/Cobalt/GPUProc/src/OpenCL_Support.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_OPENCL_SUPPORT_H
 #define LOFAR_GPUPROC_OPENCL_SUPPORT_H
diff --git a/RTCP/Cobalt/GPUProc/src/OpenMP_Support.h b/RTCP/Cobalt/GPUProc/src/OpenMP_Support.h
index a0719fa6ec1..62b3f49340f 100644
--- a/RTCP/Cobalt/GPUProc/src/OpenMP_Support.h
+++ b/RTCP/Cobalt/GPUProc/src/OpenMP_Support.h
@@ -16,7 +16,7 @@
 //# You should have 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 OPEN_MP_SUPPORT_H
 #define OPEN_MP_SUPPORT_H
diff --git a/RTCP/Cobalt/GPUProc/src/PerformanceCounter.cc b/RTCP/Cobalt/GPUProc/src/PerformanceCounter.cc
index 5bc88d00c5f..a0ce8d5b047 100644
--- a/RTCP/Cobalt/GPUProc/src/PerformanceCounter.cc
+++ b/RTCP/Cobalt/GPUProc/src/PerformanceCounter.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/src/PerformanceCounter.h b/RTCP/Cobalt/GPUProc/src/PerformanceCounter.h
index d71f3f78aac..644a7b65394 100644
--- a/RTCP/Cobalt/GPUProc/src/PerformanceCounter.h
+++ b/RTCP/Cobalt/GPUProc/src/PerformanceCounter.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_PERFORMANCECOUNTER_H
 #define LOFAR_GPUPROC_PERFORMANCECOUNTER_H
diff --git a/RTCP/Cobalt/GPUProc/src/Pipeline.cc b/RTCP/Cobalt/GPUProc/src/Pipeline.cc
index b4965ef0610..7ba22ddb665 100644
--- a/RTCP/Cobalt/GPUProc/src/Pipeline.cc
+++ b/RTCP/Cobalt/GPUProc/src/Pipeline.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/src/Pipeline.h b/RTCP/Cobalt/GPUProc/src/Pipeline.h
index 08a175b986c..8de2104832d 100644
--- a/RTCP/Cobalt/GPUProc/src/Pipeline.h
+++ b/RTCP/Cobalt/GPUProc/src/Pipeline.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_PIPELINE_H
 #define LOFAR_GPUPROC_PIPELINE_H
diff --git a/RTCP/Cobalt/GPUProc/src/Pipelines/BeamFormerPipeline.cc b/RTCP/Cobalt/GPUProc/src/Pipelines/BeamFormerPipeline.cc
index b0713488a23..67af2dec364 100644
--- a/RTCP/Cobalt/GPUProc/src/Pipelines/BeamFormerPipeline.cc
+++ b/RTCP/Cobalt/GPUProc/src/Pipelines/BeamFormerPipeline.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/src/Pipelines/BeamFormerPipeline.h b/RTCP/Cobalt/GPUProc/src/Pipelines/BeamFormerPipeline.h
index 79c80f39313..82289823c43 100644
--- a/RTCP/Cobalt/GPUProc/src/Pipelines/BeamFormerPipeline.h
+++ b/RTCP/Cobalt/GPUProc/src/Pipelines/BeamFormerPipeline.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_BEAMFORMERPIPELINE_H
 #define LOFAR_GPUPROC_BEAMFORMERPIPELINE_H
diff --git a/RTCP/Cobalt/GPUProc/src/Pipelines/CorrelatorPipeline.cc b/RTCP/Cobalt/GPUProc/src/Pipelines/CorrelatorPipeline.cc
index 244a818f7f6..4f2d5899e2d 100644
--- a/RTCP/Cobalt/GPUProc/src/Pipelines/CorrelatorPipeline.cc
+++ b/RTCP/Cobalt/GPUProc/src/Pipelines/CorrelatorPipeline.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/src/Pipelines/CorrelatorPipeline.h b/RTCP/Cobalt/GPUProc/src/Pipelines/CorrelatorPipeline.h
index 2f5ed26b2e7..91aa9873f19 100644
--- a/RTCP/Cobalt/GPUProc/src/Pipelines/CorrelatorPipeline.h
+++ b/RTCP/Cobalt/GPUProc/src/Pipelines/CorrelatorPipeline.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_CORRELATOR_PIPELINE_H
 #define LOFAR_GPUPROC_CORRELATOR_PIPELINE_H
diff --git a/RTCP/Cobalt/GPUProc/src/Pipelines/CorrelatorPipelinePrograms.h b/RTCP/Cobalt/GPUProc/src/Pipelines/CorrelatorPipelinePrograms.h
index 1fdbd8cb697..6addb4c0670 100644
--- a/RTCP/Cobalt/GPUProc/src/Pipelines/CorrelatorPipelinePrograms.h
+++ b/RTCP/Cobalt/GPUProc/src/Pipelines/CorrelatorPipelinePrograms.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_CORRELATOR_PIPELINE_PROGRAMS_H
 #define LOFAR_GPUPROC_CORRELATOR_PIPELINE_PROGRAMS_H
diff --git a/RTCP/Cobalt/GPUProc/src/Pipelines/UHEP_Pipeline.cc b/RTCP/Cobalt/GPUProc/src/Pipelines/UHEP_Pipeline.cc
index b4b5eb0c93d..88b06e5b647 100644
--- a/RTCP/Cobalt/GPUProc/src/Pipelines/UHEP_Pipeline.cc
+++ b/RTCP/Cobalt/GPUProc/src/Pipelines/UHEP_Pipeline.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/src/Pipelines/UHEP_Pipeline.h b/RTCP/Cobalt/GPUProc/src/Pipelines/UHEP_Pipeline.h
index b63fd7c17f6..c96743902b4 100644
--- a/RTCP/Cobalt/GPUProc/src/Pipelines/UHEP_Pipeline.h
+++ b/RTCP/Cobalt/GPUProc/src/Pipelines/UHEP_Pipeline.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_UHEP_PIPELINE_H
 #define LOFAR_GPUPROC_UHEP_PIPELINE_H
diff --git a/RTCP/Cobalt/GPUProc/src/Scheduling.cc b/RTCP/Cobalt/GPUProc/src/Scheduling.cc
index cb55342b3d3..25ce346eceb 100644
--- a/RTCP/Cobalt/GPUProc/src/Scheduling.cc
+++ b/RTCP/Cobalt/GPUProc/src/Scheduling.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
diff --git a/RTCP/Cobalt/GPUProc/src/Scheduling.h b/RTCP/Cobalt/GPUProc/src/Scheduling.h
index 0fa4321509f..c8d89184fa1 100644
--- a/RTCP/Cobalt/GPUProc/src/Scheduling.h
+++ b/RTCP/Cobalt/GPUProc/src/Scheduling.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_SCHEDULING_H
 #define LOFAR_GPUPROC_SCHEDULING_H
diff --git a/RTCP/Cobalt/GPUProc/src/SlidingPointer.h b/RTCP/Cobalt/GPUProc/src/SlidingPointer.h
index 3b7f3cb64db..d967af85103 100644
--- a/RTCP/Cobalt/GPUProc/src/SlidingPointer.h
+++ b/RTCP/Cobalt/GPUProc/src/SlidingPointer.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_SLIDING_POINTER_H
 #define LOFAR_GPUPROC_SLIDING_POINTER_H
diff --git a/RTCP/Cobalt/GPUProc/src/Storage/SSH.cc b/RTCP/Cobalt/GPUProc/src/Storage/SSH.cc
index bd9d30574f0..fe80cdad829 100644
--- a/RTCP/Cobalt/GPUProc/src/Storage/SSH.cc
+++ b/RTCP/Cobalt/GPUProc/src/Storage/SSH.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
diff --git a/RTCP/Cobalt/GPUProc/src/Storage/SSH.h b/RTCP/Cobalt/GPUProc/src/Storage/SSH.h
index d86dc3a7fae..d3bb73e84cc 100644
--- a/RTCP/Cobalt/GPUProc/src/Storage/SSH.h
+++ b/RTCP/Cobalt/GPUProc/src/Storage/SSH.h
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 //# Never #include <config.h> or #include <lofar_config.h> in a header file!
 
diff --git a/RTCP/Cobalt/GPUProc/src/Storage/StorageProcess.cc b/RTCP/Cobalt/GPUProc/src/Storage/StorageProcess.cc
index 39b7e24f17e..4a3fd397b1d 100644
--- a/RTCP/Cobalt/GPUProc/src/Storage/StorageProcess.cc
+++ b/RTCP/Cobalt/GPUProc/src/Storage/StorageProcess.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/src/Storage/StorageProcess.h b/RTCP/Cobalt/GPUProc/src/Storage/StorageProcess.h
index 5b9c5e0e952..510bcb12625 100644
--- a/RTCP/Cobalt/GPUProc/src/Storage/StorageProcess.h
+++ b/RTCP/Cobalt/GPUProc/src/Storage/StorageProcess.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_STORAGE_PROCESS
 #define LOFAR_GPUPROC_STORAGE_PROCESS
diff --git a/RTCP/Cobalt/GPUProc/src/Storage/StorageProcesses.cc b/RTCP/Cobalt/GPUProc/src/Storage/StorageProcesses.cc
index d7fb16fbe7d..769471cdb99 100644
--- a/RTCP/Cobalt/GPUProc/src/Storage/StorageProcesses.cc
+++ b/RTCP/Cobalt/GPUProc/src/Storage/StorageProcesses.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/src/Storage/StorageProcesses.h b/RTCP/Cobalt/GPUProc/src/Storage/StorageProcesses.h
index 291b18e4685..ddc5f6fb072 100644
--- a/RTCP/Cobalt/GPUProc/src/Storage/StorageProcesses.h
+++ b/RTCP/Cobalt/GPUProc/src/Storage/StorageProcesses.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_STORAGE_PROCESSES
 #define LOFAR_GPUPROC_STORAGE_PROCESSES
diff --git a/RTCP/Cobalt/GPUProc/src/UHEP/BeamFormer.cl b/RTCP/Cobalt/GPUProc/src/UHEP/BeamFormer.cl
index 148afb8a4eb..78a9526da81 100644
--- a/RTCP/Cobalt/GPUProc/src/UHEP/BeamFormer.cl
+++ b/RTCP/Cobalt/GPUProc/src/UHEP/BeamFormer.cl
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #define MAX(A,B) ((A)>(B) ? (A) : (B))
 #define NR_PASSES MAX((NR_STATIONS + 6) / 16, 1) // gives best results on GTX 680
diff --git a/RTCP/Cobalt/GPUProc/src/UHEP/InvFFT.cl b/RTCP/Cobalt/GPUProc/src/UHEP/InvFFT.cl
index 3ddbf78abb7..ec9554deb1e 100644
--- a/RTCP/Cobalt/GPUProc/src/UHEP/InvFFT.cl
+++ b/RTCP/Cobalt/GPUProc/src/UHEP/InvFFT.cl
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "math.cl"
 
diff --git a/RTCP/Cobalt/GPUProc/src/UHEP/InvFIR.cl b/RTCP/Cobalt/GPUProc/src/UHEP/InvFIR.cl
index 9901bb2ba7c..a1333052860 100644
--- a/RTCP/Cobalt/GPUProc/src/UHEP/InvFIR.cl
+++ b/RTCP/Cobalt/GPUProc/src/UHEP/InvFIR.cl
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 typedef __global float (*InvFIRredDataType)[NR_TABS][NR_POLARIZATIONS][NR_SAMPLES_PER_SUBBAND][1024];
 typedef __global float (*InvFFTedDataType)[NR_TABS][NR_POLARIZATIONS][NR_SAMPLES_PER_SUBBAND + NR_STATION_FILTER_TAPS - 1][1024];
diff --git a/RTCP/Cobalt/GPUProc/src/UHEP/InvertedStationPPFWeights.cc b/RTCP/Cobalt/GPUProc/src/UHEP/InvertedStationPPFWeights.cc
index 4fb0d5750ad..76031f41aca 100644
--- a/RTCP/Cobalt/GPUProc/src/UHEP/InvertedStationPPFWeights.cc
+++ b/RTCP/Cobalt/GPUProc/src/UHEP/InvertedStationPPFWeights.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/src/UHEP/InvertedStationPPFWeights.h b/RTCP/Cobalt/GPUProc/src/UHEP/InvertedStationPPFWeights.h
index aa0553ff0d3..8417f7205c5 100644
--- a/RTCP/Cobalt/GPUProc/src/UHEP/InvertedStationPPFWeights.h
+++ b/RTCP/Cobalt/GPUProc/src/UHEP/InvertedStationPPFWeights.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_INVERTED_STATION_PPF_WEIGHTS_H
 #define LOFAR_GPUPROC_INVERTED_STATION_PPF_WEIGHTS_H
diff --git a/RTCP/Cobalt/GPUProc/src/UHEP/Transpose.cl b/RTCP/Cobalt/GPUProc/src/UHEP/Transpose.cl
index cc71f3466d4..11ab07ec679 100644
--- a/RTCP/Cobalt/GPUProc/src/UHEP/Transpose.cl
+++ b/RTCP/Cobalt/GPUProc/src/UHEP/Transpose.cl
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 typedef __global float2 (*TransposedDataType)[NR_TABS][NR_POLARIZATIONS][NR_SAMPLES_PER_SUBBAND + NR_STATION_FILTER_TAPS - 1][512];
 typedef __global float4 (*ComplexVoltagesType)[NR_SUBBANDS][NR_SAMPLES_PER_SUBBAND + NR_STATION_FILTER_TAPS - 1][NR_TABS];
diff --git a/RTCP/Cobalt/GPUProc/src/UHEP/Trigger.cl b/RTCP/Cobalt/GPUProc/src/UHEP/Trigger.cl
index ae3990c2ccc..602a0b0ce27 100644
--- a/RTCP/Cobalt/GPUProc/src/UHEP/Trigger.cl
+++ b/RTCP/Cobalt/GPUProc/src/UHEP/Trigger.cl
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 typedef __global struct {
   float mean, variance, bestValue;
diff --git a/RTCP/Cobalt/GPUProc/src/UnitTest.cc b/RTCP/Cobalt/GPUProc/src/UnitTest.cc
index a2a003d9675..43ac9ccec2a 100644
--- a/RTCP/Cobalt/GPUProc/src/UnitTest.cc
+++ b/RTCP/Cobalt/GPUProc/src/UnitTest.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/src/UnitTest.h b/RTCP/Cobalt/GPUProc/src/UnitTest.h
index 72cfa1b8e87..6d4f65730d1 100644
--- a/RTCP/Cobalt/GPUProc/src/UnitTest.h
+++ b/RTCP/Cobalt/GPUProc/src/UnitTest.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_UNITTEST_H
 #define LOFAR_GPUPROC_UNITTEST_H
diff --git a/RTCP/Cobalt/GPUProc/src/WorkQueues/BeamFormerWorkQueue.cc b/RTCP/Cobalt/GPUProc/src/WorkQueues/BeamFormerWorkQueue.cc
index 496f3c2eb37..ca791de6670 100644
--- a/RTCP/Cobalt/GPUProc/src/WorkQueues/BeamFormerWorkQueue.cc
+++ b/RTCP/Cobalt/GPUProc/src/WorkQueues/BeamFormerWorkQueue.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/src/WorkQueues/BeamFormerWorkQueue.h b/RTCP/Cobalt/GPUProc/src/WorkQueues/BeamFormerWorkQueue.h
index 99a2e27c246..8d1a680d3aa 100644
--- a/RTCP/Cobalt/GPUProc/src/WorkQueues/BeamFormerWorkQueue.h
+++ b/RTCP/Cobalt/GPUProc/src/WorkQueues/BeamFormerWorkQueue.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_BEAM_FORMER_WORKQUEUE_H
 #define LOFAR_GPUPROC_BEAM_FORMER_WORKQUEUE_H
diff --git a/RTCP/Cobalt/GPUProc/src/WorkQueues/CorrelatorWorkQueue.cc b/RTCP/Cobalt/GPUProc/src/WorkQueues/CorrelatorWorkQueue.cc
index 3d14c1d1a18..3cdb759f0ae 100644
--- a/RTCP/Cobalt/GPUProc/src/WorkQueues/CorrelatorWorkQueue.cc
+++ b/RTCP/Cobalt/GPUProc/src/WorkQueues/CorrelatorWorkQueue.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/src/WorkQueues/CorrelatorWorkQueue.h b/RTCP/Cobalt/GPUProc/src/WorkQueues/CorrelatorWorkQueue.h
index c8181116289..c2b5497925b 100644
--- a/RTCP/Cobalt/GPUProc/src/WorkQueues/CorrelatorWorkQueue.h
+++ b/RTCP/Cobalt/GPUProc/src/WorkQueues/CorrelatorWorkQueue.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_CORRELATOR_WORKQUEUE_H
 #define LOFAR_GPUPROC_CORRELATOR_WORKQUEUE_H
diff --git a/RTCP/Cobalt/GPUProc/src/WorkQueues/UHEP_WorkQueue.cc b/RTCP/Cobalt/GPUProc/src/WorkQueues/UHEP_WorkQueue.cc
index a4091f9f1f9..dc618b3a66e 100644
--- a/RTCP/Cobalt/GPUProc/src/WorkQueues/UHEP_WorkQueue.cc
+++ b/RTCP/Cobalt/GPUProc/src/WorkQueues/UHEP_WorkQueue.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/src/WorkQueues/UHEP_WorkQueue.h b/RTCP/Cobalt/GPUProc/src/WorkQueues/UHEP_WorkQueue.h
index 020e11ec125..b692787971a 100644
--- a/RTCP/Cobalt/GPUProc/src/WorkQueues/UHEP_WorkQueue.h
+++ b/RTCP/Cobalt/GPUProc/src/WorkQueues/UHEP_WorkQueue.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_UHEP_WORKQUEUE_H
 #define LOFAR_GPUPROC_UHEP_WORKQUEUE_H
diff --git a/RTCP/Cobalt/GPUProc/src/WorkQueues/WorkQueue.cc b/RTCP/Cobalt/GPUProc/src/WorkQueues/WorkQueue.cc
index 19eee2f72d3..a203b319fe8 100644
--- a/RTCP/Cobalt/GPUProc/src/WorkQueues/WorkQueue.cc
+++ b/RTCP/Cobalt/GPUProc/src/WorkQueues/WorkQueue.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/src/WorkQueues/WorkQueue.h b/RTCP/Cobalt/GPUProc/src/WorkQueues/WorkQueue.h
index 7fe2a6ec8d9..93313432c56 100644
--- a/RTCP/Cobalt/GPUProc/src/WorkQueues/WorkQueue.h
+++ b/RTCP/Cobalt/GPUProc/src/WorkQueues/WorkQueue.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_WORKQUEUE_H
 #define LOFAR_GPUPROC_WORKQUEUE_H
diff --git a/RTCP/Cobalt/GPUProc/src/createProgram.cc b/RTCP/Cobalt/GPUProc/src/createProgram.cc
index fd77ec31e85..180b47b9c1a 100644
--- a/RTCP/Cobalt/GPUProc/src/createProgram.cc
+++ b/RTCP/Cobalt/GPUProc/src/createProgram.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/src/createProgram.h b/RTCP/Cobalt/GPUProc/src/createProgram.h
index 7736c7323a6..84012a73041 100644
--- a/RTCP/Cobalt/GPUProc/src/createProgram.h
+++ b/RTCP/Cobalt/GPUProc/src/createProgram.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_CREATE_PROGRAM_H
 #define LOFAR_GPUPROC_CREATE_PROGRAM_H
diff --git a/RTCP/Cobalt/GPUProc/src/global_defines.cc b/RTCP/Cobalt/GPUProc/src/global_defines.cc
index f423d541023..27c0b2ba12c 100644
--- a/RTCP/Cobalt/GPUProc/src/global_defines.cc
+++ b/RTCP/Cobalt/GPUProc/src/global_defines.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 #include <lofar_config.h>
 
 #include "global_defines.h"
diff --git a/RTCP/Cobalt/GPUProc/src/global_defines.h b/RTCP/Cobalt/GPUProc/src/global_defines.h
index c88e79b7fd9..cecbc278748 100644
--- a/RTCP/Cobalt/GPUProc/src/global_defines.h
+++ b/RTCP/Cobalt/GPUProc/src/global_defines.h
@@ -16,7 +16,7 @@
 //# You should have 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_GPUPROC_GLOBAL_DEFINES_H
 #define LOFAR_GPUPROC_GLOBAL_DEFINES_H
diff --git a/RTCP/Cobalt/GPUProc/src/math.cl b/RTCP/Cobalt/GPUProc/src/math.cl
index 8343009da1c..9620d47ab97 100644
--- a/RTCP/Cobalt/GPUProc/src/math.cl
+++ b/RTCP/Cobalt/GPUProc/src/math.cl
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 typedef float2 fcomplex;
 typedef float4 fcomplex2;
diff --git a/RTCP/Cobalt/GPUProc/src/rtcp.cc b/RTCP/Cobalt/GPUProc/src/rtcp.cc
index 50654ae2382..8358930a44d 100644
--- a/RTCP/Cobalt/GPUProc/src/rtcp.cc
+++ b/RTCP/Cobalt/GPUProc/src/rtcp.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/test/DummyStorage.cc b/RTCP/Cobalt/GPUProc/test/DummyStorage.cc
index 300a5924f62..c1072cc678e 100644
--- a/RTCP/Cobalt/GPUProc/test/DummyStorage.cc
+++ b/RTCP/Cobalt/GPUProc/test/DummyStorage.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/test/Kernels/AMD_FFT_Test.h b/RTCP/Cobalt/GPUProc/test/Kernels/AMD_FFT_Test.h
index af11aa0fade..b7ce89c5e23 100644
--- a/RTCP/Cobalt/GPUProc/test/Kernels/AMD_FFT_Test.h
+++ b/RTCP/Cobalt/GPUProc/test/Kernels/AMD_FFT_Test.h
@@ -1,23 +1,22 @@
-/* AMD_FFT_Test.h
- * Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
- * P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
- *
- * This file is part of the LOFAR software suite.
- * The LOFAR software suite is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The LOFAR software suite is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id: $
- */
+//# AMD_FFT_Test.h
+//# Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
 
 #ifndef GPUPROC_AMD_FFT_TEST_H
 #define GPUPROC_AMD_FFT_TEST_H
diff --git a/RTCP/Cobalt/GPUProc/test/Kernels/BeamFormerTest.h b/RTCP/Cobalt/GPUProc/test/Kernels/BeamFormerTest.h
index c553159a746..4e2f5cab4d7 100644
--- a/RTCP/Cobalt/GPUProc/test/Kernels/BeamFormerTest.h
+++ b/RTCP/Cobalt/GPUProc/test/Kernels/BeamFormerTest.h
@@ -1,23 +1,22 @@
-/* BeamFormerTest.h
- * Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
- * P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
- *
- * This file is part of the LOFAR software suite.
- * The LOFAR software suite is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The LOFAR software suite is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id: $
- */
+//# BeamFormerTest.h
+//# Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
 
 #ifndef GPUPROC_BEAMFORMERTEST_H
 #define GPUPROC_BEAMFORMERTEST_H
diff --git a/RTCP/Cobalt/GPUProc/test/Kernels/BeamFormerTransposeTest.h b/RTCP/Cobalt/GPUProc/test/Kernels/BeamFormerTransposeTest.h
index 7dcbd1ac3f6..6b3809ef496 100644
--- a/RTCP/Cobalt/GPUProc/test/Kernels/BeamFormerTransposeTest.h
+++ b/RTCP/Cobalt/GPUProc/test/Kernels/BeamFormerTransposeTest.h
@@ -1,23 +1,22 @@
-/* BeamFormerTransposeTest.h
- * Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
- * P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
- *
- * This file is part of the LOFAR software suite.
- * The LOFAR software suite is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The LOFAR software suite is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id: $
- */
+//# BeamFormerTransposeTest.h
+//# Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
 
 #ifndef GPUPROC_BEAMFORMERTRANSPOSETEST_H
 #define GPUPROC_BEAMFORMERTRANSPOSETEST_H
diff --git a/RTCP/Cobalt/GPUProc/test/Kernels/CoherentStokesTest.h b/RTCP/Cobalt/GPUProc/test/Kernels/CoherentStokesTest.h
index 4cd483366dd..dae26c8a9ea 100644
--- a/RTCP/Cobalt/GPUProc/test/Kernels/CoherentStokesTest.h
+++ b/RTCP/Cobalt/GPUProc/test/Kernels/CoherentStokesTest.h
@@ -1,23 +1,22 @@
-/* CoherentStokesTest.h
- * Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
- * P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
- *
- * This file is part of the LOFAR software suite.
- * The LOFAR software suite is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The LOFAR software suite is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id: $
- */
+//# CoherentStokesTest.h
+//# Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
 
 #ifndef GPUPROC_COHERENTSTOKESTEST_H
 #define GPUPROC_COHERENTSTOKESTEST_H
diff --git a/RTCP/Cobalt/GPUProc/test/Kernels/CorrelateRectangleTest.h b/RTCP/Cobalt/GPUProc/test/Kernels/CorrelateRectangleTest.h
index a3582b7b712..9a1cebb0187 100644
--- a/RTCP/Cobalt/GPUProc/test/Kernels/CorrelateRectangleTest.h
+++ b/RTCP/Cobalt/GPUProc/test/Kernels/CorrelateRectangleTest.h
@@ -1,23 +1,22 @@
-/* CorrelateRectangleTest.h
- * Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
- * P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
- *
- * This file is part of the LOFAR software suite.
- * The LOFAR software suite is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The LOFAR software suite is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id: $
- */
+//# CorrelateRectangleTest.h
+//# Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
 
 #ifndef GPUPROC_CORRELATERECTANGETEST_H
 #define GPUPROC_CORRELATERECTANGETEST_H
diff --git a/RTCP/Cobalt/GPUProc/test/Kernels/CorrelateTriangleTest.h b/RTCP/Cobalt/GPUProc/test/Kernels/CorrelateTriangleTest.h
index e3a543f58cd..cb5222ff2b2 100644
--- a/RTCP/Cobalt/GPUProc/test/Kernels/CorrelateTriangleTest.h
+++ b/RTCP/Cobalt/GPUProc/test/Kernels/CorrelateTriangleTest.h
@@ -1,23 +1,22 @@
-/* CorrelateTriangleTest.h
- * Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
- * P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
- *
- * This file is part of the LOFAR software suite.
- * The LOFAR software suite is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The LOFAR software suite is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id: $
- */
+//# CorrelateTriangleTest.h
+//# Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
 
 #ifndef GPUPROC_CORRELATETRIANGLETEST_H
 #define GPUPROC_CORRELATETRIANGLETEST_H
diff --git a/RTCP/Cobalt/GPUProc/test/Kernels/CorrelatorTest.h b/RTCP/Cobalt/GPUProc/test/Kernels/CorrelatorTest.h
index 996fbe4e26c..a6d38b0ad96 100644
--- a/RTCP/Cobalt/GPUProc/test/Kernels/CorrelatorTest.h
+++ b/RTCP/Cobalt/GPUProc/test/Kernels/CorrelatorTest.h
@@ -1,23 +1,22 @@
-/* CorrelatorTest.h
- * Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
- * P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
- *
- * This file is part of the LOFAR software suite.
- * The LOFAR software suite is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The LOFAR software suite is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id: $
- */
+//# CorrelatorTest.h
+//# Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
 
 #ifndef GPUPROC_CORRELATORTEST_H
 #define GPUPROC_CORRELATORTEST_H
diff --git a/RTCP/Cobalt/GPUProc/test/Kernels/DedispersionChirpTest.h b/RTCP/Cobalt/GPUProc/test/Kernels/DedispersionChirpTest.h
index 189218ade64..2efba83d59b 100644
--- a/RTCP/Cobalt/GPUProc/test/Kernels/DedispersionChirpTest.h
+++ b/RTCP/Cobalt/GPUProc/test/Kernels/DedispersionChirpTest.h
@@ -1,23 +1,22 @@
-/* DedispersionChirpTest.h
- * Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
- * P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
- *
- * This file is part of the LOFAR software suite.
- * The LOFAR software suite is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The LOFAR software suite is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id: $
- */
+//# DedispersionChirpTest.h
+//# Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
 
 #ifndef GPUPROC_DEDISPERSIONCHIRPTEST_H
 #define GPUPROC_DEDISPERSIONCHIRPTEST_H
diff --git a/RTCP/Cobalt/GPUProc/test/Kernels/FFT_Test.h b/RTCP/Cobalt/GPUProc/test/Kernels/FFT_Test.h
index 8b7e3e2a060..4474a4f737e 100644
--- a/RTCP/Cobalt/GPUProc/test/Kernels/FFT_Test.h
+++ b/RTCP/Cobalt/GPUProc/test/Kernels/FFT_Test.h
@@ -1,23 +1,22 @@
-/* FFT_Test.h
- * Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
- * P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
- *
- * This file is part of the LOFAR software suite.
- * The LOFAR software suite is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The LOFAR software suite is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id: $
- */
+//# FFT_Test.h
+//# Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
 
 #ifndef GPUPROC_FFT_TEST_H
 #define GPUPROC_FFT_TEST_H
diff --git a/RTCP/Cobalt/GPUProc/test/Kernels/FIR_FilterTest.h b/RTCP/Cobalt/GPUProc/test/Kernels/FIR_FilterTest.h
index f911ab83edc..483d5cca326 100644
--- a/RTCP/Cobalt/GPUProc/test/Kernels/FIR_FilterTest.h
+++ b/RTCP/Cobalt/GPUProc/test/Kernels/FIR_FilterTest.h
@@ -1,23 +1,22 @@
-/* FIR_FilterTest.h
- * Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
- * P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
- *
- * This file is part of the LOFAR software suite.
- * The LOFAR software suite is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The LOFAR software suite is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id: $
- */
+//# FIR_FilterTest.h
+//# Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
 
 #ifndef GPUPROC_FIR_FILTERTEST_H
 #define GPUPROC_FIR_FILTERTEST_H
diff --git a/RTCP/Cobalt/GPUProc/test/Kernels/IncoherentStokesTest.h b/RTCP/Cobalt/GPUProc/test/Kernels/IncoherentStokesTest.h
index 41a7e39c7a1..bdc3685629d 100644
--- a/RTCP/Cobalt/GPUProc/test/Kernels/IncoherentStokesTest.h
+++ b/RTCP/Cobalt/GPUProc/test/Kernels/IncoherentStokesTest.h
@@ -1,23 +1,22 @@
-/* IncoherentStokesTest.h
- * Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
- * P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
- *
- * This file is part of the LOFAR software suite.
- * The LOFAR software suite is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The LOFAR software suite is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id: $
- */
+//# IncoherentStokesTest.h
+//# Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
 
 #ifndef GPUPROC_INCOHERENTSTOKESTEST_H
 #define GPUPROC_INCOHERENTSTOKESTEST_H
diff --git a/RTCP/Cobalt/GPUProc/test/Kernels/IntToFloatTest.h b/RTCP/Cobalt/GPUProc/test/Kernels/IntToFloatTest.h
index 2fbaa9c2021..070958a7a7f 100644
--- a/RTCP/Cobalt/GPUProc/test/Kernels/IntToFloatTest.h
+++ b/RTCP/Cobalt/GPUProc/test/Kernels/IntToFloatTest.h
@@ -1,23 +1,22 @@
-/* IntToFloatTest.h
- * Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
- * P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
- *
- * This file is part of the LOFAR software suite.
- * The LOFAR software suite is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The LOFAR software suite is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id: $
- */
+//# IntToFloatTest.h
+//# Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
 
 #ifndef GPUPROC_INTTOFLOATTEST_H
 #define GPUPROC_INTTOFLOATTEST_H
diff --git a/RTCP/Cobalt/GPUProc/test/Kernels/UHEP_BeamFormerTest.h b/RTCP/Cobalt/GPUProc/test/Kernels/UHEP_BeamFormerTest.h
index 00a9b174169..6833f38c905 100644
--- a/RTCP/Cobalt/GPUProc/test/Kernels/UHEP_BeamFormerTest.h
+++ b/RTCP/Cobalt/GPUProc/test/Kernels/UHEP_BeamFormerTest.h
@@ -1,23 +1,22 @@
-/* UHEP_BeamFormerTest.h
- * Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
- * P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
- *
- * This file is part of the LOFAR software suite.
- * The LOFAR software suite is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The LOFAR software suite is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id: $
- */
+//# UHEP_BeamFormerTest.h
+//# Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
 
 #ifndef GPUPROC_UHEP_BEAMFORMERTEST_H
 #define GPUPROC_UHEP_BEAMFORMERTEST_H
diff --git a/RTCP/Cobalt/GPUProc/test/Kernels/UHEP_TransposeTest.h b/RTCP/Cobalt/GPUProc/test/Kernels/UHEP_TransposeTest.h
index 76aa513acc3..2ebd4bd3001 100644
--- a/RTCP/Cobalt/GPUProc/test/Kernels/UHEP_TransposeTest.h
+++ b/RTCP/Cobalt/GPUProc/test/Kernels/UHEP_TransposeTest.h
@@ -1,23 +1,22 @@
-/* UHEP_TransposeTest.h
- * Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
- * P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
- *
- * This file is part of the LOFAR software suite.
- * The LOFAR software suite is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The LOFAR software suite is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id: $
- */
+//# UHEP_TransposeTest.h
+//# Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
 
 #ifndef GPUPROC_UHEP_TRANSPOSETEST_H
 #define GPUPROC_UHEP_TRANSPOSETEST_H
diff --git a/RTCP/Cobalt/GPUProc/test/Kernels/UHEP_TriggerTest.h b/RTCP/Cobalt/GPUProc/test/Kernels/UHEP_TriggerTest.h
index beba3c87e68..086303ea105 100644
--- a/RTCP/Cobalt/GPUProc/test/Kernels/UHEP_TriggerTest.h
+++ b/RTCP/Cobalt/GPUProc/test/Kernels/UHEP_TriggerTest.h
@@ -1,23 +1,22 @@
-/* UHEP_TriggerTest.h
- * Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
- * P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
- *
- * This file is part of the LOFAR software suite.
- * The LOFAR software suite is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The LOFAR software suite is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id: $
- */
+//# UHEP_TriggerTest.h
+//# Copyright (C) 2012-2013  ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
 
 #ifndef GPUPROC_UHEP_TRIGGERTEST_H
 #define GPUPROC_UHEP_TRIGGERTEST_H
diff --git a/RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.cc b/RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.cc
index 19e8b6f2ae8..7f6c2bf45ac 100644
--- a/RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.cc
+++ b/RTCP/Cobalt/GPUProc/test/RTCP_UnitTest.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/test/UnitTests/BeamFormerTest.cc b/RTCP/Cobalt/GPUProc/test/UnitTests/BeamFormerTest.cc
index bec86c2ace0..d6a39ac9fc4 100644
--- a/RTCP/Cobalt/GPUProc/test/UnitTests/BeamFormerTest.cc
+++ b/RTCP/Cobalt/GPUProc/test/UnitTests/BeamFormerTest.cc
@@ -1,28 +1,27 @@
-/* BeamFormerTest.cc
- * Copyright (C) 2013  ASTRON (Netherlands Institute for Radio Astronomy)
- * P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
- *
- * This file is part of the LOFAR software suite.
- * The LOFAR software suite is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The LOFAR software suite is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id: $
- */
-
-#include <UnitTest++.h>
-
-TEST(FailSpectacularly2)
-{
-  CHECK(true);
-}
-
+//# BeamFormerTest.cc
+//# Copyright (C) 2013  ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
+
+#include <UnitTest++.h>
+
+TEST(FailSpectacularly2)
+{
+  CHECK(true);
+}
+
diff --git a/RTCP/Cobalt/GPUProc/test/UnitTests/new_style_unittest.cc b/RTCP/Cobalt/GPUProc/test/UnitTests/new_style_unittest.cc
index 5516331bbc8..0477c30aec8 100644
--- a/RTCP/Cobalt/GPUProc/test/UnitTests/new_style_unittest.cc
+++ b/RTCP/Cobalt/GPUProc/test/UnitTests/new_style_unittest.cc
@@ -1,28 +1,27 @@
-/* new_style_unittest.cc
- * Copyright (C) 2013  ASTRON (Netherlands Institute for Radio Astronomy)
- * P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
- *
- * This file is part of the LOFAR software suite.
- * The LOFAR software suite is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The LOFAR software suite is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id: $
- */
-
-#include <UnitTest++.h>
-
-TEST(FailSpectacularly)
-{
-  CHECK(true);
-}
-
+//# new_style_unittest.cc
+//# Copyright (C) 2013  ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
+
+#include <UnitTest++.h>
+
+TEST(FailSpectacularly)
+{
+  CHECK(true);
+}
+
diff --git a/RTCP/Cobalt/GPUProc/test/tBestEffortQueue.cc b/RTCP/Cobalt/GPUProc/test/tBestEffortQueue.cc
index 4b7022d5de2..010b6f1cb89 100644
--- a/RTCP/Cobalt/GPUProc/test/tBestEffortQueue.cc
+++ b/RTCP/Cobalt/GPUProc/test/tBestEffortQueue.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/test/tContext.cc b/RTCP/Cobalt/GPUProc/test/tContext.cc
index c434188e562..e1f406f88e5 100644
--- a/RTCP/Cobalt/GPUProc/test/tContext.cc
+++ b/RTCP/Cobalt/GPUProc/test/tContext.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/test/tDelayCompensation.cc b/RTCP/Cobalt/GPUProc/test/tDelayCompensation.cc
index c0d94037d4a..9cf0190bf4a 100644
--- a/RTCP/Cobalt/GPUProc/test/tDelayCompensation.cc
+++ b/RTCP/Cobalt/GPUProc/test/tDelayCompensation.cc
@@ -1,32 +1,32 @@
-//# tDelayCompensation.cc
-//# Copyright (C) 2013  ASTRON (Netherlands Institute for Radio Astronomy)
-//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
-//#
-//# This file is part of the LOFAR software suite.
-//# The LOFAR software suite is free software: you can redistribute it and/or
-//# modify it under the terms of the GNU General Public License as published
-//# by the Free Software Foundation, either version 3 of the License, or
-//# (at your option) any later version.
-//#
-//# The LOFAR software suite is distributed in the hope that it will be useful,
-//# but WITHOUT ANY WARRANTY; without even the implied warranty of
-//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//# GNU General Public License for more details.
-//#
-//# You should have received a copy of the GNU General Public License along
-//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
-//#
-//# $Id: $
-
-#include <UnitTest++.h>
-
-TEST(FailSpectacularly)
-{
-  CHECK(false);
-}
-
-int main()
-{
-  return UnitTest::RunAllTests();
-}
-
+//# tDelayCompensation.cc
+//# Copyright (C) 2013  ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+//#
+//# $Id$
+
+#include <UnitTest++.h>
+
+TEST(FailSpectacularly)
+{
+  CHECK(false);
+}
+
+int main()
+{
+  return UnitTest::RunAllTests();
+}
+
diff --git a/RTCP/Cobalt/GPUProc/test/tPerformanceCounter.cc b/RTCP/Cobalt/GPUProc/test/tPerformanceCounter.cc
index 0cfad1f5d2a..74c4073014b 100644
--- a/RTCP/Cobalt/GPUProc/test/tPerformanceCounter.cc
+++ b/RTCP/Cobalt/GPUProc/test/tPerformanceCounter.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/test/tSSH.cc b/RTCP/Cobalt/GPUProc/test/tSSH.cc
index f250860b0e5..2ad969275e9 100644
--- a/RTCP/Cobalt/GPUProc/test/tSSH.cc
+++ b/RTCP/Cobalt/GPUProc/test/tSSH.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/GPUProc/test/tStorageProcesses.cc b/RTCP/Cobalt/GPUProc/test/tStorageProcesses.cc
index f1937ad207f..86ac41e2755 100644
--- a/RTCP/Cobalt/GPUProc/test/tStorageProcesses.cc
+++ b/RTCP/Cobalt/GPUProc/test/tStorageProcesses.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/InputProc/src/OMPThread.h b/RTCP/Cobalt/InputProc/src/OMPThread.h
index bf15947bdcc..7890b678587 100644
--- a/RTCP/Cobalt/InputProc/src/OMPThread.h
+++ b/RTCP/Cobalt/InputProc/src/OMPThread.h
@@ -16,7 +16,7 @@
 //# You should have 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_INPUT_PROC_OMP_THREAD_H 
 #define LOFAR_INPUT_PROC_OMP_THREAD_H
diff --git a/RTCP/Cobalt/InputProc/src/RSPBoards.cc b/RTCP/Cobalt/InputProc/src/RSPBoards.cc
index 894a2a9753a..b9ecea9d3b4 100644
--- a/RTCP/Cobalt/InputProc/src/RSPBoards.cc
+++ b/RTCP/Cobalt/InputProc/src/RSPBoards.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/InputProc/src/RSPBoards.h b/RTCP/Cobalt/InputProc/src/RSPBoards.h
index 925f3790fd4..c3e571aa51e 100644
--- a/RTCP/Cobalt/InputProc/src/RSPBoards.h
+++ b/RTCP/Cobalt/InputProc/src/RSPBoards.h
@@ -16,7 +16,7 @@
 //# You should have 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_INPUT_PROC_RSP_BOARDS_H 
 #define LOFAR_INPUT_PROC_RSP_BOARDS_H
diff --git a/RTCP/Cobalt/InputProc/src/SampleType.h b/RTCP/Cobalt/InputProc/src/SampleType.h
index 9855c42f0b4..2d2562c175f 100644
--- a/RTCP/Cobalt/InputProc/src/SampleType.h
+++ b/RTCP/Cobalt/InputProc/src/SampleType.h
@@ -16,7 +16,7 @@
 //# You should have 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_INPUT_PROC_SAMPLE_TYPE_H 
 #define LOFAR_INPUT_PROC_SAMPLE_TYPE_H
diff --git a/RTCP/Cobalt/InputProc/src/WallClockTime.h b/RTCP/Cobalt/InputProc/src/WallClockTime.h
index 007e9a57d3e..5211a3ffc06 100644
--- a/RTCP/Cobalt/InputProc/src/WallClockTime.h
+++ b/RTCP/Cobalt/InputProc/src/WallClockTime.h
@@ -16,7 +16,7 @@
 //# You should have 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_INPUT_PROC_WALL_CLOCK_TIME_H
 #define LOFAR_INPUT_PROC_WALL_CLOCK_TIME_H
diff --git a/RTCP/Cobalt/InputProc/src/newInputSection.cc b/RTCP/Cobalt/InputProc/src/newInputSection.cc
index bfdba8a4971..03f1377ac74 100644
--- a/RTCP/Cobalt/InputProc/src/newInputSection.cc
+++ b/RTCP/Cobalt/InputProc/src/newInputSection.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/InputProc/test/tGenerator.cc b/RTCP/Cobalt/InputProc/test/tGenerator.cc
index 60999790dad..e58af9b2b07 100644
--- a/RTCP/Cobalt/InputProc/test/tGenerator.cc
+++ b/RTCP/Cobalt/InputProc/test/tGenerator.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/InputProc/test/tPacketReader.cc b/RTCP/Cobalt/InputProc/test/tPacketReader.cc
index 6e9a97dec59..3419dac3efb 100644
--- a/RTCP/Cobalt/InputProc/test/tPacketReader.cc
+++ b/RTCP/Cobalt/InputProc/test/tPacketReader.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/InputProc/test/tPacketWriter.cc b/RTCP/Cobalt/InputProc/test/tPacketWriter.cc
index 9bfb4ca08f3..df008b50fde 100644
--- a/RTCP/Cobalt/InputProc/test/tPacketWriter.cc
+++ b/RTCP/Cobalt/InputProc/test/tPacketWriter.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/InputProc/test/tPacketsToBuffer.cc b/RTCP/Cobalt/InputProc/test/tPacketsToBuffer.cc
index ae23c94343c..e66ade321b5 100644
--- a/RTCP/Cobalt/InputProc/test/tPacketsToBuffer.cc
+++ b/RTCP/Cobalt/InputProc/test/tPacketsToBuffer.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/InputProc/test/tRSP.cc b/RTCP/Cobalt/InputProc/test/tRSP.cc
index 5063e691b7a..06e66c951c0 100644
--- a/RTCP/Cobalt/InputProc/test/tRSP.cc
+++ b/RTCP/Cobalt/InputProc/test/tRSP.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
diff --git a/RTCP/Cobalt/InputProc/test/tRSPTimeStamp2.cc b/RTCP/Cobalt/InputProc/test/tRSPTimeStamp2.cc
index 78ab26ab3d4..86dc1cb4c54 100644
--- a/RTCP/Cobalt/InputProc/test/tRSPTimeStamp2.cc
+++ b/RTCP/Cobalt/InputProc/test/tRSPTimeStamp2.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/InputProc/test/tRanges.cc b/RTCP/Cobalt/InputProc/test/tRanges.cc
index 50dca50d4cd..611a82ca62a 100644
--- a/RTCP/Cobalt/InputProc/test/tRanges.cc
+++ b/RTCP/Cobalt/InputProc/test/tRanges.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/InputProc/test/tSampleBuffer.cc b/RTCP/Cobalt/InputProc/test/tSampleBuffer.cc
index cc943a650cf..3085174dbe6 100644
--- a/RTCP/Cobalt/InputProc/test/tSampleBuffer.cc
+++ b/RTCP/Cobalt/InputProc/test/tSampleBuffer.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/InputProc/test/tSharedMemory.cc b/RTCP/Cobalt/InputProc/test/tSharedMemory.cc
index b62598f8814..b18a7f0b9a2 100644
--- a/RTCP/Cobalt/InputProc/test/tSharedMemory.cc
+++ b/RTCP/Cobalt/InputProc/test/tSharedMemory.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/OutputProc/src/ExitOnClosedStdin.cc b/RTCP/Cobalt/OutputProc/src/ExitOnClosedStdin.cc
index a2a8c503638..ac8e9d17394 100644
--- a/RTCP/Cobalt/OutputProc/src/ExitOnClosedStdin.cc
+++ b/RTCP/Cobalt/OutputProc/src/ExitOnClosedStdin.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/OutputProc/src/ExitOnClosedStdin.h b/RTCP/Cobalt/OutputProc/src/ExitOnClosedStdin.h
index b5f90d477fd..a2498a68258 100644
--- a/RTCP/Cobalt/OutputProc/src/ExitOnClosedStdin.h
+++ b/RTCP/Cobalt/OutputProc/src/ExitOnClosedStdin.h
@@ -16,7 +16,7 @@
 //# You should have 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_STORAGE_EXIT_ON_CLOSED_STDIN_H
 #define LOFAR_STORAGE_EXIT_ON_CLOSED_STDIN_H
diff --git a/RTCP/Cobalt/OutputProc/src/FastFileStream.cc b/RTCP/Cobalt/OutputProc/src/FastFileStream.cc
index 89a5a48bfbb..74441847dbc 100644
--- a/RTCP/Cobalt/OutputProc/src/FastFileStream.cc
+++ b/RTCP/Cobalt/OutputProc/src/FastFileStream.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/OutputProc/src/FastFileStream.h b/RTCP/Cobalt/OutputProc/src/FastFileStream.h
index 1847fec24f3..966167032f7 100644
--- a/RTCP/Cobalt/OutputProc/src/FastFileStream.h
+++ b/RTCP/Cobalt/OutputProc/src/FastFileStream.h
@@ -16,7 +16,7 @@
 //# You should have 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_STORAGE_FASTFILESTREAM_H
 #define LOFAR_STORAGE_FASTFILESTREAM_H
diff --git a/RTCP/Cobalt/OutputProc/src/Format.cc b/RTCP/Cobalt/OutputProc/src/Format.cc
index e96c72cd8a5..0dcebc75e54 100644
--- a/RTCP/Cobalt/OutputProc/src/Format.cc
+++ b/RTCP/Cobalt/OutputProc/src/Format.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include "Format.h"
 
diff --git a/RTCP/Cobalt/OutputProc/src/Format.h b/RTCP/Cobalt/OutputProc/src/Format.h
index d7742779e8e..09295143dc7 100644
--- a/RTCP/Cobalt/OutputProc/src/Format.h
+++ b/RTCP/Cobalt/OutputProc/src/Format.h
@@ -16,7 +16,7 @@
 //# You should have 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_STORAGE_FORMAT_H
 #define LOFAR_STORAGE_FORMAT_H
diff --git a/RTCP/Cobalt/OutputProc/src/HDF5Attributes.h b/RTCP/Cobalt/OutputProc/src/HDF5Attributes.h
index 76155eabf58..52773230452 100644
--- a/RTCP/Cobalt/OutputProc/src/HDF5Attributes.h
+++ b/RTCP/Cobalt/OutputProc/src/HDF5Attributes.h
@@ -16,7 +16,7 @@
 //# You should have 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_STORAGE_HDF5ATTRIBUTES_H
 #define LOFAR_STORAGE_HDF5ATTRIBUTES_H
diff --git a/RTCP/Cobalt/OutputProc/src/IOPriority.h b/RTCP/Cobalt/OutputProc/src/IOPriority.h
index 4dd75127f6f..d1b49777011 100644
--- a/RTCP/Cobalt/OutputProc/src/IOPriority.h
+++ b/RTCP/Cobalt/OutputProc/src/IOPriority.h
@@ -16,7 +16,7 @@
 //# You should have 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_STORAGE_IOPRIORITY_H
 #define LOFAR_STORAGE_IOPRIORITY_H
diff --git a/RTCP/Cobalt/OutputProc/src/MSWriterCorrelated.cc b/RTCP/Cobalt/OutputProc/src/MSWriterCorrelated.cc
index b4b23239dc4..a71473aa8a8 100644
--- a/RTCP/Cobalt/OutputProc/src/MSWriterCorrelated.cc
+++ b/RTCP/Cobalt/OutputProc/src/MSWriterCorrelated.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/OutputProc/src/MSWriterCorrelated.h b/RTCP/Cobalt/OutputProc/src/MSWriterCorrelated.h
index 586853569b2..d9eab39fdb4 100644
--- a/RTCP/Cobalt/OutputProc/src/MSWriterCorrelated.h
+++ b/RTCP/Cobalt/OutputProc/src/MSWriterCorrelated.h
@@ -16,7 +16,7 @@
 //# You should have 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_STORAGE_MSWRITERCORRELATED_H
 #define LOFAR_STORAGE_MSWRITERCORRELATED_H
diff --git a/RTCP/Cobalt/OutputProc/src/MSWriterDAL.cc b/RTCP/Cobalt/OutputProc/src/MSWriterDAL.cc
index e4904b81a83..e74d37fed99 100644
--- a/RTCP/Cobalt/OutputProc/src/MSWriterDAL.cc
+++ b/RTCP/Cobalt/OutputProc/src/MSWriterDAL.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/OutputProc/src/MSWriterDAL.h b/RTCP/Cobalt/OutputProc/src/MSWriterDAL.h
index 37a305b292e..f95c496c44f 100644
--- a/RTCP/Cobalt/OutputProc/src/MSWriterDAL.h
+++ b/RTCP/Cobalt/OutputProc/src/MSWriterDAL.h
@@ -16,7 +16,7 @@
 //# You should have 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_STORAGE_MSWRITERDAL_H
 #define LOFAR_STORAGE_MSWRITERDAL_H
diff --git a/RTCP/Cobalt/OutputProc/src/MSWriterFile.cc b/RTCP/Cobalt/OutputProc/src/MSWriterFile.cc
index 3c08c58cc80..18ed73cba38 100644
--- a/RTCP/Cobalt/OutputProc/src/MSWriterFile.cc
+++ b/RTCP/Cobalt/OutputProc/src/MSWriterFile.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/OutputProc/src/MSWriterFile.h b/RTCP/Cobalt/OutputProc/src/MSWriterFile.h
index 1f5ac8c580d..c2ed7f72aa8 100644
--- a/RTCP/Cobalt/OutputProc/src/MSWriterFile.h
+++ b/RTCP/Cobalt/OutputProc/src/MSWriterFile.h
@@ -16,7 +16,7 @@
 //# You should have 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_STORAGE_MSWRITERFILE_H
 #define LOFAR_STORAGE_MSWRITERFILE_H
diff --git a/RTCP/Cobalt/OutputProc/src/MSWriterNull.cc b/RTCP/Cobalt/OutputProc/src/MSWriterNull.cc
index 21c3e734961..99b5a0eb673 100644
--- a/RTCP/Cobalt/OutputProc/src/MSWriterNull.cc
+++ b/RTCP/Cobalt/OutputProc/src/MSWriterNull.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/OutputProc/src/MSWriterNull.h b/RTCP/Cobalt/OutputProc/src/MSWriterNull.h
index 639c81659b7..47265128a44 100644
--- a/RTCP/Cobalt/OutputProc/src/MSWriterNull.h
+++ b/RTCP/Cobalt/OutputProc/src/MSWriterNull.h
@@ -16,7 +16,7 @@
 //# You should have 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_STORAGE_MSWRITERNULL_H
 #define LOFAR_STORAGE_MSWRITERNULL_H
diff --git a/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.cc b/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.cc
index 5f1b6e863cc..613e6ae7d6b 100644
--- a/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.cc
+++ b/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.cc
@@ -17,7 +17,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.h b/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.h
index 0c1a497625f..073ac820ce5 100644
--- a/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.h
+++ b/RTCP/Cobalt/OutputProc/src/MeasurementSetFormat.h
@@ -16,7 +16,7 @@
 //# You should have 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_STORAGE_MEASUREMENT_SET_FORMAT_H
 #define LOFAR_STORAGE_MEASUREMENT_SET_FORMAT_H
diff --git a/RTCP/Cobalt/OutputProc/src/OutputThread.cc b/RTCP/Cobalt/OutputProc/src/OutputThread.cc
index 45a839b2f5d..f71c521ddcf 100644
--- a/RTCP/Cobalt/OutputProc/src/OutputThread.cc
+++ b/RTCP/Cobalt/OutputProc/src/OutputThread.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
diff --git a/RTCP/Cobalt/OutputProc/src/OutputThread.h b/RTCP/Cobalt/OutputProc/src/OutputThread.h
index 122830bb2c3..3b62ca5179e 100644
--- a/RTCP/Cobalt/OutputProc/src/OutputThread.h
+++ b/RTCP/Cobalt/OutputProc/src/OutputThread.h
@@ -16,7 +16,7 @@
 //# You should have 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_RTCP_STORAGE_OUTPUT_THREAD_H
 #define LOFAR_RTCP_STORAGE_OUTPUT_THREAD_H
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.cc b/RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.cc
index 780ed5ea2f4..12b87ab4ced 100644
--- a/RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.cc
+++ b/RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.h b/RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.h
index c049c38ac99..b16ea085bbd 100644
--- a/RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.h
+++ b/RTCP/Cobalt/OutputProc/src/TBB_StaticMapping.h
@@ -17,7 +17,7 @@
 //# You should have 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 TBB_STATIC_MAPPING_H
 #define TBB_STATIC_MAPPING_H 1
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_Writer.cc b/RTCP/Cobalt/OutputProc/src/TBB_Writer.cc
index 0a6c7c9352a..477115c1f9f 100644
--- a/RTCP/Cobalt/OutputProc/src/TBB_Writer.cc
+++ b/RTCP/Cobalt/OutputProc/src/TBB_Writer.cc
@@ -16,7 +16,7 @@
 //# You should have received a copy of the GNU General Public License along
 //# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
-//# $Id: TBB_Writer.cc 47912 2012-09-07 11:54:53Z amesfoort $
+//# $Id$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_Writer.h b/RTCP/Cobalt/OutputProc/src/TBB_Writer.h
index aef49477354..07e40b3af9b 100644
--- a/RTCP/Cobalt/OutputProc/src/TBB_Writer.h
+++ b/RTCP/Cobalt/OutputProc/src/TBB_Writer.h
@@ -16,7 +16,7 @@
 //# You should have received a copy of the GNU General Public License along
 //# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
-//# $Id: TBB_Writer.h 14188 2012-09-07 15:41:22Z amesfoort $
+//# $Id$
 
 #ifndef LOFAR_STORAGE_TBB_WRITER_H
 #define LOFAR_STORAGE_TBB_WRITER_H 1
diff --git a/RTCP/Cobalt/OutputProc/src/TBB_Writer_main.cc b/RTCP/Cobalt/OutputProc/src/TBB_Writer_main.cc
index fb06197655d..2390be87731 100644
--- a/RTCP/Cobalt/OutputProc/src/TBB_Writer_main.cc
+++ b/RTCP/Cobalt/OutputProc/src/TBB_Writer_main.cc
@@ -15,7 +15,7 @@
 //# You should have received a copy of the GNU General Public License along
 //# with the LOFAR software suite.  If not, see <http://www.gnu.org/licenses/>.
 //#
-//# $Id: TBB_Writer_main.cc 17261 2012-09-07 18:58:53Z amesfoort $
+//# $Id$
 
 #include <lofar_config.h>               // before any other include
 
diff --git a/RTCP/Cobalt/OutputProc/src/createHeaders.cc b/RTCP/Cobalt/OutputProc/src/createHeaders.cc
index 2e84519b340..4a9fa256525 100644
--- a/RTCP/Cobalt/OutputProc/src/createHeaders.cc
+++ b/RTCP/Cobalt/OutputProc/src/createHeaders.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
diff --git a/RTCP/Cobalt/OutputProc/src/plotMS.cc b/RTCP/Cobalt/OutputProc/src/plotMS.cc
index 843e22702fd..918f53346e4 100644
--- a/RTCP/Cobalt/OutputProc/src/plotMS.cc
+++ b/RTCP/Cobalt/OutputProc/src/plotMS.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
diff --git a/RTCP/Cobalt/OutputProc/test/tDAL.cc b/RTCP/Cobalt/OutputProc/test/tDAL.cc
index d39ffcdbc7a..e922e5fd983 100644
--- a/RTCP/Cobalt/OutputProc/test/tDAL.cc
+++ b/RTCP/Cobalt/OutputProc/test/tDAL.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/OutputProc/test/tFastFileStream.cc b/RTCP/Cobalt/OutputProc/test/tFastFileStream.cc
index bceff87f748..ca909939ab6 100644
--- a/RTCP/Cobalt/OutputProc/test/tFastFileStream.cc
+++ b/RTCP/Cobalt/OutputProc/test/tFastFileStream.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/OutputProc/test/tMSWriterCorrelated.cc b/RTCP/Cobalt/OutputProc/test/tMSWriterCorrelated.cc
index d1f9044ef5f..365a2b5e48a 100644
--- a/RTCP/Cobalt/OutputProc/test/tMSWriterCorrelated.cc
+++ b/RTCP/Cobalt/OutputProc/test/tMSWriterCorrelated.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/OutputProc/test/tMSWriterDAL.cc b/RTCP/Cobalt/OutputProc/test/tMSWriterDAL.cc
index 2ccf4262aee..0817704448c 100644
--- a/RTCP/Cobalt/OutputProc/test/tMSWriterDAL.cc
+++ b/RTCP/Cobalt/OutputProc/test/tMSWriterDAL.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_StaticMapping.cc b/RTCP/Cobalt/OutputProc/test/tTBB_StaticMapping.cc
index ad00a7b30a8..e487bec0caa 100644
--- a/RTCP/Cobalt/OutputProc/test/tTBB_StaticMapping.cc
+++ b/RTCP/Cobalt/OutputProc/test/tTBB_StaticMapping.cc
@@ -16,7 +16,7 @@
 //# You should have 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$
 
 #include <lofar_config.h>
 
-- 
GitLab