diff --git a/.gitattributes b/.gitattributes
index c3bd242c8f937ad2d613dc6369001db1fa15ede6..aa00f5a1411104e3f3f03c0aec5d41dd97890318 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 de8bcc01d2a021429ba0e250c8430c60004c9b33..f0779246ed1b6e5cac5c63412ab30729bc477aec 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 2ab96f9654b5697eb38b4e61aecb791bafc808db..605ee1993ea12bae3fb580ac4bae9cb2d3a9bef6 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 00cf2158d41f58da743da30deae067b5ffd964ec..df98ce7dc887b5b7152e80fc8c4905b6775ca5e0 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 927fd41dd41b193c97706f4b61bb4af9d9410c68..9a285d4baf9b3ad8672f6008b3d35bcabfeb0d8c 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 7a5e468b58c9cffa7f8a6d91fdb6b9348ed8ce1c..65da893bf76943b3a6a6319faf4704d01ec66efb 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 139eff66773fb83370cf1da2d027142febbba9d3..8c7b5fcd8f5020f299870809c00676350729925c 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 c75dad1f89c391fbcb5f5196d35ddec42cca5377..4df082be4110e1e441cc8d37b256afcbcfc225ad 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 4b70a31c42a41925510c57363f7e26a05ecfa6f0..45d918ca7c968580b785b0e734c4027bcc882cb2 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 b5dc27f1e20a193e69424ae94e130d225ec3c51f..18b90b456aa7ddd6b40132f3b6f340daa4f31efd 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 abd2aa9f66b47a46e451a27c30d3610fbc1edb85..bc1c08d40376e4d7a1df196fb5a10257bf2b7fef 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 80f9fd1b5a3a8a350b024af106745c506a6a59dc..bedb287d6da617e1b9457dd29da5b763a5c43a61 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 f63a8200ead463ca2e080e072692ef30dad77bed..06dc8484e9558be8a490c111d07fa5c5e1d673a1 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 b22e780c5b2fbbf71d53084fc619a3e13d6bd36b..d817169352cc9f03f911ebce38ddc897f84f7803 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 e384a5de0fcc240b3170044a3ca46870e7df3f2d..7d83f70aff31188e7a1c8a6db79e8cabf3da2892 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 88919ea26e9b091b2984810f291b053207d5b877..ef81b6caf35d35163475d4a5c6c0fa20c5734214 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 3bc5774bf11b929d539870efcae46e73d0dc35ad..5a7ad5b739b86c227591fdf4e4e07d2cf43206bd 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 c45d190ae5416470f63f9d37626b2d12a45fb69a..9e6d6860412bc288f18aa168f8279a6b2ad0d68a 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 000f99b07c5c6f54a62fbf132edc52238d1a4351..770ff8a3ffce0f2df2ce0cf8d9f300b23a8d6142 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 01e45beb650f50c7ea82306cf53a520b0b19f413..fa445c12a739b68a295d5b1297605c33fc695c2a 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 e7c3c91ad348b7668939e048a41ab4bef9d43531..a8c4767f7ebc8e6764edd2a6770428e938de67f0 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 f87ea7b46641b7751c564d5120a3c7c4355ec6fc..91ee03ff61d6c30219e747ce506c6f003d54e3fe 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 ebaaac3f06f41c3f5255eb1c9273376712cb03b0..e12f52274489cea6f0ef4e953b2723eb9e0eece5 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 dcc60a2ce5b18de46815595bbc14217587994806..aec27fa0e5f7f87406b08be5c7100a9415fe18d9 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 e8691f85157c0310b37a3e6c5b01c4e564a22e79..29230e01ab9e930ccc304923012ec4b2d52f4783 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 ec09ae231ea1039211752b36b11b76f1f8b6022c..d51a9e1b877309e06012bb0910c0a5ca28ce2cf3 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 c78620b2a0530509624f01c9d354b220dc5fb64b..51edf76e3dcfe4fc92ac0552abb829b7c7738fe4 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 5fd5e608391c7ffb4d12695836e2e947800c1a68..4ead4d543f73899bc8f113d7bd6794eac4ef88d5 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 206bc345e747d73bfa44d4f2e7c88850a669dcdd..971883fe6284c0ddd6500e9817f911094f061875 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 ed483b859a2051e118791af269f676db4033b965..90b10567ddda4bf170d3f2e25b5820b63317d2d0 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 5948c32c3e01eee9e5218bf69eaea567b8f93aa4..633bb5e8da0800a078feb81cb958988d3fa2efa0 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 c8de222d397524f30bba7c30434e10be629f584c..977f8e90791807e4c8f9833d900054478bcba6e6 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 c40e0a268eec11710fd4dc147a0307aed4f62459..71e69b160a352a3ba26c7336a203f15876c094b1 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 bb7312b0996cbc85e544c83e1f89ea2198428abf..7018cae6a6197ae83432c53dde31bf2ead5bfa48 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 d601093d275eaa94e39a0d192067eaf4708da3af..a1e2cc9bfd5ea38c05e64494e4e278959a0f3ad0 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 b8eaf9c26f24f1e858eb2c17dfe969fd8c1f78c6..4e9b057b21914259771c0dfe08e6f06673bc9a7c 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 e64e815929a157b70260aed798a020e984e7ff15..7a204a026f68b824b1dec235c810d0ca93819828 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 4329bd7ce4485beb65b12a8a5467c3f02d8abca4..2e4db9017d0708726a2df82d35444984e9ee52dc 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 5c54d27892f08a1ae7142d3c43c4f57c02b2f46b..3de70cb0150a80d03a2cd10cf9b2ea9f55be9300 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 060762f1663e060a4cbe0b9b93a2b5df8e25df84..5f7d65a318ef39ae11af83aa14e0c2b6ad3559fe 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 948c7d83ddadfe33378216063c0a43d78ed2f957..b1f5484e77131ebae0462943cfed9a3ab202ede1 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 68f901a762f6239802e9f7b6826027992a7a7d17..556af5d8a0c8a1f767e0939a9aa4c4e8cf6d29ca 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 209b8f8719345c1469f1020e1fac7829267097eb..77364b95038722ef1bf52c4dd92f8ef20fc5bb9d 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 db63c86651e7add83afbecc682486cf00c2e09a3..a0457fbe5f41ad5ffbdf293f953714c1416346fb 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 327a8f9be7de27ca04bdebcd73ac08fc6579d631..c9ebf7131e4eaa93581f4d6af30c84abdae93ce5 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 b8af6542fcaf8004ac5fe82952c843e8d114429f..6b9dc7fc9939ab645df162bdbf22fe76edd63dc1 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 1e27bde08f37c96567d499573159a3ce92839242..6ae014e60ca7f4044d94c6a9abf4951aaa5298a2 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 c3b714fab0bbce7e5102351e2ce8d00d85f7b4fe..9909b977bbf72e30ec95462980a4343df3f0b8d9 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 734d3c3308cbdf68e997418571c690ad7c861e78..02d9979e1a66388088c5f168abd22a54906764d8 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 059f2b689d8865b68fcf487328543863ed31af40..1ffa08785c8c643a78a98c567b9e635fcea5f389 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 78b50d3a752a5d8dc4d015ff65f94ea186f12f78..ba50c6b4ad33f1fff48b797c2950853eef7a7373 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 f0d15492edc35dc6d7fd9168856f426a6537c547..f39182aad108be00ffac1ae6f698490c477148c4 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 8ec908caa1513d3c69caf6354e3905cd89ff80dd..ce126310d73fc3c3e094aafc1891f6767da35a1d 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 8d8243874e1d2cc7a69d9de4ece89fdbb1a274a1..800b9b438b62c9962f831161a14a0cb0d3331ad8 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 268a254d5e53b06baeaa7baaccd43326fca0e0e7..b1a3c05e2c19e686fcc0afe720224c61951843fc 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 76466c07745fcc9c1fb6283a44873a54a4c18820..3f9114512c0a3a8650d06f4ba0c7eb1929050629 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 396e9fee0daa64f08a40b3adaa9550b8223df672..da406798413258031764fde9e16c976322b63d51 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 47a6efaadbc8dcdd37f4044b41c9c5453c3d4a6c..55211061c3df69b1192d0f61734b0e2978e6a1fe 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 7f9cdf39bf9a90811b229e52f9ee3cbe89af6c29..333ead17be3904fb1785865e5f56db202cf9d087 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 165fb10b80e6ed37f4da099616c1a9ed7fdb086e..99876802a15b7d85800e7b68b983a51dc0bff9cc 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 87cb58b313102de98bfdcaf98d848c03ef7e0ac9..ee592c9e586c2546de4edc73702aa74cfc823ea6 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 48767dc563a19ce365b3d3fb5ce783e5789b5cf1..d7558d35f5c1f904b816ee428887d989532fbf59 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 716141ab17d9f1ce04f92c7cdf2f484709aa0fa2..3755b4ba2457f53a21bf274c53e78fd63a6b7e26 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 965af5db58f3ac594352979f63fefb894f91a276..5ace352d04ce4cda143caff1aeb5cd374e1fc1cb 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 aa0de4ecd772aa14e007d4fb3b7288768f37a79b..3629c2fc911c4b02f63b04489a55ab829233f03f 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 df39a1ef9feba8775b6b2b09f6e03b89af2a5f04..90bd19c86f3b71d8322d253d68f50ff937c47724 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 60faf56c14a448b25065c48a60da9251abc2582b..878585e5bf28139ffbf372dcc3908f3767dc336b 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 25cf532587c18f51dd226628ec50ebde315c44d2..735041c6c0ead7086f29b2fd6b0e670c4fc46881 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 04c70fee31f20c7ef7b676df6f8a66a02f183757..ad2112f8968878919e46569feb992fca55550740 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 4634a18979ad031050bf5d1f3f09c82482f1ed99..94c7c70648bef4c09c660431270268a4c44cd312 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 7c12d3eb86b1feb747782c43f54d94b67b03a5f6..65106f337a2c0d5b7823cd805e45870c6e050a8c 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 fb21b863eaf1ce8f084c9c3c80e4b77e012a0498..ab20c30c2f0226cdf4ddfcac7e3782b77011cfac 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 92630cbb51002871618987e2a82b8a9d8a5604ce..1b4e12324c2818aa403cabe2f815d07a25218c5b 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 d084e2b95870624f3ede11eb3aa77a1aa09f96d1..4da95c9993c19c908bf7966be3a29d8c5f116140 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 1de732431549aa15ea7b8198d1c99fd26bdf9ff6..351af486ed393fb0a04a9158de0ce4843dc9ce76 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 b629a628fbf476162daa97bef529750d4d979eb4..52b796d8a61061d2acdd18425dbe0a794a522d6f 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 669904695f4d7fd984dd7b0671938e4b3e16e6cf..b2b8e878276c1572f3a029aa0fa2aa3bc2cc6f84 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 226cb13025383d6c64c1ba6f6cf7bd40f70d77e1..3a54d1c572649ebed72e84b473ed03d121cf3cea 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 06c1b9abfdec198e137a18cb65dac26e9b87dac5..8348b788dc619a5501496c9873820764c606d339 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 ac723df0e7e32b8307c8d82ab0fdd6beddb1cf38..9a1496d7a65715ba61cff52813b6d760c8222bd2 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 02e23b55059acb80897746c5e817bc2650129b24..2d9522de492cf3c14150bd13012047f57a3dac0c 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 256a5b6370d9e04c1ae6865b88bfd41570d6ad7e..147602b05fd2f21b980e560bed639a74d4c7ceef 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 08500aa30dd37e8f9ecc39425b57029510d2bf97..7ba6dc118bfdf33a3a8e3f6c5cc79289c292449b 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 2b8a92d4f4300e925e3b7d00e598e14a469340ea..0d0a0c4ca8d49ba6b44c2b7f785f19c04125a7e4 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 541a92dbf4f05d77f8cb7e7658f604aeed8b0fbc..1a4a7e837caef83a94e8b210b66e143b41122288 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 dca0ce2584f6e70a1d0b73787a74e9afb194e71f..d34d58c10af3ec0936269e555ecabc1a6e121d1a 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 08a77fcc1547b5c57de36b9af02a3843a6df0a30..b952c8f3e7db6e49d9771c58ac632b97c9e69b7f 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 445f4f955b13efbc2927bedec9ba383ccb89b8ea..923f3c5382ea7baac46ec46123972d2c5867e2d4 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 3394ae23d645dbdc9a39d0807d63b2d560ac19fc..e383745fd62a252eface8baba9ed95ed28ea243a 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 9677e170114a6224af652665edc3c5c112b3909e..8e96b1ec386bbf86d3cc99c1c6eeb155dcb64d38 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 e8e0481c387c9e5b442a4b4f30d4d9025e3c551b..0367b2dfba14549e51c9b08976539cb60ff9d4a2 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 7768bd9a69a0656f7bd4a9bc5791dfa77a7d44c7..5a4ef5bb7f60feb02ddbc3b0747cd844751ab7e7 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 0ac565dc99523c6e1f5c31c53c297376403efb39..09df9ccc17985da35ee35db4c8526bf0fe14cd32 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 48fa406f3e84dfdbf307751ee011399087f9ffc0..a81ab255f82b8d6b3a0c1d7cf7adca9e06675e67 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 ff419933266024ee884406e034037f9a8457d216..f045975ac53f4890320624fbf88f05304cd6c98d 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 bcbced5c4dd1a4935910ec901af9987646412b47..b5b4701abd88267bb00e486f5cf9ed1f3e8429d0 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 a0719fa6ec1ea0be079943510abdf649be26d830..62b3f49340fa698eec042807303f6b26e0373d41 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 5bc88d00c5fb0d6d5bec44bfc5c3c1a2a9d97ad5..a0ce8d5b04727bc940fd34c7ab23769ad221f164 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 d71f3f78aac7ad6b3f1cfefac73678d3223890d8..644a7b65394f039737bd3958368a105861d0af22 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 b4965ef0610c63ee7d91e3ca33f6df62092413f8..7ba22ddb665e07c7d549eb124132fef1411954c3 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 08a175b986cdab1f75b14c19917deaba1a596190..8de2104832dcd0fd547b272f831d87d18d468069 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 b0713488a23180342ad8c7640875b14daa87f130..67af2dec364767f54d1e3f018ae50b2e3166f1d8 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 79c80f3931319ed769d7a94512e61741dd14d9be..82289823c434b5218722154d5acc49d16e0574e6 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 244a818f7f621ae9a48a7c14838d8e3a7f3a57ba..4f2d5899e2d6031449255c5f1c481b6668c7c8d5 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 2f5ed26b2e7b18f90f1cb6a283a725eae7c53d89..91aa9873f1906e2b5258ffe0cf2ed73a60bab025 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 1fdbd8cb6974c26b5a5c23b0f3c9135c9e762fa3..6addb4c0670f76aa1f3777adae5253cf3bf5de6d 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 b4b5eb0c93d4928851c26cbfdcf1af255366542c..88b06e5b647f148d880895c0b079b68ef04aad79 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 b63fd7c17f60f36f4b743d1118c04731c986218d..c96743902b48b7d8fb96e6b62b30226e40669932 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 cb55342b3d361921d6aeccc6c40c729c64c498d6..25ce346eceb215d8e5fa6d28e7b8457a3938c665 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 0fa4321509f89fccfe38895dcb69970fe6b61c2c..c8d89184fa1fe14e2d97ccfdc0bc4270167ef1d6 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 3b7f3cb64db8615af18e1714c207c9f079ed78ad..d967af8510343ff7b5aec3bc082f521e9a585e4f 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 bd9d30574f0173867af10556236b5686a3afd590..fe80cdad829cdd0bc0a4f2f0db310bdc98e29aa0 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 d86dc3a7fae4d608944f9d5723236b3ff490e12a..d3bb73e84cc9fa410d8f3b28fd55fe2b28948e4f 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 39b7e24f17eda1e0b0df1f6d0dd649bb44ac56f6..4a3fd397b1daba43e4eb95f0207922cd47551826 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 5b9c5e0e95261b59c78b62081fbcfb23092eb03e..510bcb126251c8ae519e5800b99e473050b154cf 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 d7fb16fbe7da56c5d76dc2a7c7558a6187e6cd22..769471cdb995202999c3056db86aef3d09ff889c 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 291b18e4685d51f65d0d26e5574cf198c81f2a5d..ddc5f6fb072dd2a1200051c7176941d057e2b931 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 148afb8a4eb0cb7dea2757503f64421a73fe7081..78a9526da817a3c7f445c4b2c8a99e43444b5ee8 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 3ddbf78abb72d29b12d290d24d49b25fb2c2cb8a..ec9554deb1ef351acafbad9618524655ace91204 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 9901bb2ba7ca17ac8a7efe287d464f6fc508de2e..a1333052860d3198ba5ce9b3d1f3d11094610a5a 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 4fb0d5750ad64cfa50238bb5657154d4c9937b69..76031f41aca8db844e9409e54a8d4b3580b3f285 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 aa0553ff0d3f20ed555cd72b36b7397efa84753b..8417f7205c5e477b9a1705f7f29eb2850944c97f 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 cc71f3466d487fa6cf4d8ccc3279f8e1cf918972..11ab07ec679d8a5fbbc8f9b46c245949a07e0575 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 ae3990c2ccc3c566837978ff412372b7530dc6e0..602a0b0ce2752503fac37f19d1640860444aefa7 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 a2a003d9675f3c5b7c79955af8173442eb1e34a0..43ac9ccec2a54a838b7ef45bff780f2c4aacca97 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 72cfa1b8e8733906059abeeed0031118255dac8e..6d4f65730d17afa251579a37f3ebde3543c112c7 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 496f3c2eb37e70810dbfcd4c571b4eebfd7d89d7..ca791de6670bddc5459fb078ff6bd9791c33d0c1 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 99a2e27c246da344c5bb8d3640a8c71e57ecb667..8d1a680d3aa5a38802413078c54f32c8efc290b4 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 3d14c1d1a18c627b7d4517046eb2b45481da3188..3cdb759f0ae8ed715b1f8657b7f14753cb236570 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 c81811162891364fa9c4ea2475563f455f3d73b3..c2b5497925b988f4a9d7542201311f949bcd224f 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 a4091f9f1f990896e0032dd9b7e969b103c4af4a..dc618b3a66e8d8d0ab93113c423b0c3c76ef75cb 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 020e11ec1257366eb8ec08a8a3d8358c5bdae004..b692787971a5eb5caa1b041629bc110cc1a568da 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 19eee2f72d3864a4d64c0dd274a96a1711af64b3..a203b319fe87500f143f547acfa3e2376abf28e8 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 7fe2a6ec8d917f268b6825ed33d4b380615388a7..93313432c56a2045b240d6d11d1a3da0662814cb 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 fd77ec31e8519dba2b8c859bb1c2c91dd7192f43..180b47b9c1a61abaa14aff34ae0ea00e9e1cb647 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 7736c7323a66fd35010c6266e33914c6b73d12e5..84012a7304169f354102303edb347b9eba25039a 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 f423d5410236a4af788d44b85261abc7f70375e6..27c0b2ba12c46628f56ec6097b49d80b2d57e500 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 c88e79b7fd90c6507617718232af32e133d6ab38..cecbc2787487733afc5dd7303bdb74a476afa49f 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 8343009da1c27e3f71ab57fcc8cbf1e29856b999..9620d47ab97e22d9a345b077ed4a1add292f7e7c 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 50654ae2382ab7ee6f9c74834adada9f236a04be..8358930a44d6c137298d258d6e8c3eea0f0f2c6f 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 300a5924f62c46e705e86f0710309eff682e72ef..c1072cc678edaf258c99c937fd85cc402dfb9b85 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 af11aa0fadeb516fcf1172508e306e4869911de0..b7ce89c5e2323f459ccc6c613bbdd1523b5e15da 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 c553159a74630649576ff316d74601c2addc7175..4e2f5cab4d79eb4cedb8785d30a48b3f07e845a6 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 7dcbd1ac3f680eb35e119854dea2056064e1bb2e..6b3809ef496dda2bb1b54124de6b74bcbaaf6924 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 4cd483366dd0e68fdbe4f6903f3c94229581a24d..dae26c8a9ea8fec7f8c2961d72e78e03cf381d4d 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 a3582b7b7120f28548dc7374e9fa121e3b6ec01b..9a1cebb01875a1e40fe421b06fcc1c6aaa0b4113 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 e3a543f58cd7c3b60a1b63f1a61b891790c5afed..cb5222ff2b26795724c4a19c9f0181ca9e0b0dd8 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 996fbe4e26c3521f6dd68567ff3d11c79e89fd6b..a6d38b0ad96a0364ea676d9b7f76c550e7dfdfb8 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 189218ade64fe8add86a80c613ee5f2936bc5447..2efba83d59b5f047989d3673ddc3b0f8c5352c97 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 8b7e3e2a0606ceff14d9b546c6c0f402cff674c5..4474a4f737e026ebe032e39245a34573d9c3416c 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 f911ab83edc4e4763c6e9a6f95efec657591f96d..483d5cca32651a76e5a3008296b6a732684d70e6 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 41a7e39c7a1fab2e2c741cad2b2656ceb1565db3..bdc3685629d22f5767ef6c747604a50542fde66a 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 2fbaa9c20213a8a04f6dd77f07f5be248bead0d0..070958a7a7fcf55b3ecde4a301025cc9a8276e38 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 00a9b17416990a450e7e41ad17011214f7f01ca1..6833f38c9052c406db1ab5e5e99c0f3123e2d744 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 76aa513acc350eadf7fd8f426a6a4ebf7cd144b6..2ebd4bd3001e299cb58c2f265833b563482fd017 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 beba3c87e68a7c7314bbc9851db4b60cd35fdea3..086303ea105da1a86e19e363234fb7663816fad4 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 19e8b6f2ae8021f410ea6880c6035ef2ab9340aa..7f6c2bf45ac3b2f3ceb6697a16e0a51928862108 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 bec86c2ace0239db77381be4a1a601fb198687ce..d6a39ac9fc426e22c74edf3c13a13f1cd8103191 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 5516331bbc84d4595f74b1e4fd219a04f63492b2..0477c30aec89e36f3806000705085105fe0fdb55 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 4b7022d5de2ccb36519d99cdc5277df7d8d36ba3..010b6f1cb89d58c65056f29b78a02b349bf2a868 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 c434188e562911929e55127bb625f9ad759be7b0..e1f406f88e5e5e5d3129a767885040173765cee4 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 c0d94037d4aa6a01d40323003c70cbb4281a9faf..9cf0190bf4a6a8eb0a2a02674b016c3d8ad7fb42 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 0cfad1f5d2aa29debfde0a51950e150a683adf4d..74c4073014b09d9f2d7132691681f1722baad3e7 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 f250860b0e5ee03b27aee4883cc9b7451762216b..2ad969275e9ac5d2da106a551df659beca75ede8 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 f1937ad207f212a6e03f8b63dd899de662ec3f63..86ac41e27556ea3e599961f211fb1503ab7cb189 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 bf15947bdcc27de037a6ced3f020d354bcaba5de..7890b6785879075b8abc5d5c3b69ed00526ee81a 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 894a2a9753a5dacd4113f32e13dbda1cd792595b..b9ecea9d3b4d8ad49340e6fe445e4b7f45b1b163 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 925f3790fd4ce4cd5e3f37e5727c5eab9850f9e6..c3e571aa51e5483cc53fc804a7c47cc59b348998 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 9855c42f0b44bc71e7fff9ca1bf09e13d76576d8..2d2562c175f2dd27ce2a36e53a982988d7ebec8a 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 007e9a57d3e3a7df6ad7613fb7d5fcb90ea37e3d..5211a3ffc060a7190a1f4e4a13223631bc1bd297 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 bfdba8a4971fee1c13237752a3cb7898a0386314..03f1377ac74b6a83d4b43e3d87f5e64b7f7887f2 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 60999790dad8a4e7311a9fdca10913b0e1df4cd7..e58af9b2b073709ff14b16cbe74d7aa722e6cd36 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 6e9a97dec596316e975fa31b7e0dd9f821440247..3419dac3efba61b23c5c53b9a8197ddc6f6c2982 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 9bfb4ca08f3e9ad0264940c7b85e70baa56142fe..df008b50fde204aaf5feb8791ca07bddb57b3886 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 ae23c94343ca33bb5d557eb62587dfb8541fdae5..e66ade321b5d4c66b8ad724ef795a17975c35f64 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 5063e691b7a811ecb09558faefdcb1d73705d25d..06e66c951c0d2f07767840a1824248da5861197e 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 78ab26ab3d44cbc0b326ed4e836303c348db0f9c..86dc1cb4c54d7f8fee2751ea77591963b3a75506 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 50dca50d4cdd9a28d3623f1f26f48753ba212846..611a82ca62a825e52ac209f08c8e9e5d2fe6da3a 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 cc943a650cf8f52b63e060d74446b6dae499fe0b..3085174dbe6f4e2767ba533d4ad836b8e372c154 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 b62598f88140a4c228d8b5d130077feaa0dbd3e7..b18a7f0b9a2818449f3f7abe3aee83fda7f50919 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 a2a8c5036386cd12828e0dfbc7807e5b057a3446..ac8e9d173949803d7fecd21a6721821c99a1e782 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 b5f90d477fd9002860bb07f9e135feb82a3001ee..a2498a68258e45f2695b780e3d5c584ffa8ce727 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 89a5a48bfbb7988131dcd858d200401b6d8982ee..74441847dbce674d93ce86b161a0c945acf79ff2 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 1847fec24f3360feefb107d9f1eeaabfa2509e1f..966167032f7a9a3aeaf5d8816417f3b6be8a0270 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 e96c72cd8a531bac562b7f9e112ac06fe41a65a0..0dcebc75e54bed1d24f324f2d99627873a601a71 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 d7742779e8e0bc3ab398b4caf5918b934a66fa66..09295143dc71eeaf88984cb69c9c096eeb24a703 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 76155eabf58915d5d74424fb8abacf918b721271..52773230452be9b0cd3d7d271363c888462923b1 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 4dd75127f6f4b10fd3969816d90da540f59ce756..d1b49777011365dae02a19507deb1be521cf8c59 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 b4b23239dc41d6b6630d44922206b435ec221c96..a71473aa8a84f3aa240b203833194ec400725794 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 586853569b20594ce0884de9bc50408cb63cfba3..d9eab39fdb443ec0bf4c538b668efdf32cf1cc37 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 e4904b81a83b010a5c9350c590410a44f3e40cf3..e74d37fed99b48a969e7c72e5c6fd1012a000cbd 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 37a305b292e7011e02c7bd2e4282eab82f1e38fb..f95c496c44f5d53ce16183f2e73391316eb0b5fb 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 3c08c58cc80c1edeedd237a77c8ee2e10bf6d88d..18ed73cba384c466ee1e2411af6b24f6699c2e61 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 1f5ac8c580df6606365819fa257c2e6721341d0a..c2ed7f72aa8e78ef8d17a92a483b40d6af2012f0 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 21c3e73496105ab576ba4bebe17fc79ec09dcdca..99b5a0eb673e00446fe71e662647424c2ab6def5 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 639c81659b7a13e7adeeb5c71e08e24d6c197c8f..47265128a44f35a0f9c12d746c5ad7355877c8ac 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 5f1b6e863cc5333448575d5837a1333f018a7b3c..613e6ae7d6b39a054d8d050de349664acde6397a 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 0c1a497625fba8e5b24b7b1c0c8a6de09629db0f..073ac820ce5a3338e548be785a4f5c5d628ce55b 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 45a839b2f5d728d2ad9e12fd489cd902689f1829..f71c521ddcf1f26fb217ea11e8cf5d7debb2fcae 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 122830bb2c372a8cd533f11a60de051fbbe0720e..3b62ca5179e870bc838fd0a507ffdb0d0bd56f29 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 780ed5ea2f458056992e5e1ff52b3feb4f6f30ed..12b87ab4ced97b767e3d2bd5656a08e5a3bc1455 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 c049c38ac9934123be9875e0babff6d1d9c9a6d8..b16ea085bbd16a25bd42c434143d71349760a2a5 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 0a6c7c9352a8b93c1ad7e3a91e136e99f1858cee..477115c1f9f96dcbc6a75c189b8739c9bd838892 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 aef49477354107fc7a39d78e3e6ec37a14f03d48..07e40b3af9b90517005069334bdb2660c6dc2cba 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 fb06197655d3a959b62b5b50bfacab13cbd83dc0..2390be87731d9b219d678e70c8e40775366e02dc 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 2e84519b340fbe48218597d852f6fb9eba3835b9..4a9fa25652504b562dec8fbe9db50ed2c8b74aaf 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 843e22702fd8a582d71cc1d14a1169a25a226ac1..918f53346e46192f82b25849cf0788d9d10c72f3 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 d39ffcdbc7ab3a8731496c8f5588d9b59da2114f..e922e5fd9832843a1ac8ce21bcbb7718c4823edb 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 bceff87f748d906511717fc4ac0fc6eab0b3b3d1..ca909939ab6da6711e6192769c412ae7959c00f6 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 d1f9044ef5ff89232083cdb8f81c95001746e643..365a2b5e48a022c4109c191485690ecc2065f4ee 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 2ccf4262aee8d65aa5c4ef904e3f8a2d584d2238..0817704448cd6df719b42e2903a66782a6b96846 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 ad00a7b30a81644080b577b5e90e2b0ce4f11eb3..e487bec0caaa0e7e9d8add25536ed65fa066d2c3 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>