From cc5d5ca96395f2e02eb041f0e00ccc0f823aa90f Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Thu, 27 Jun 2013 05:36:14 +0000
Subject: [PATCH] Task #3696: Moved RSPTimeStamp from CoInterface to InputProc,
 as no other package needs it anymore

---
 RTCP/Cobalt/CoInterface/src/CMakeLists.txt                   | 3 +--
 RTCP/Cobalt/CoInterface/test/CMakeLists.txt                  | 1 -
 RTCP/Cobalt/InputProc/src/Buffer/Block.h                     | 2 +-
 RTCP/Cobalt/InputProc/src/Buffer/BlockReader.h               | 2 +-
 RTCP/Cobalt/InputProc/src/Buffer/SampleBuffer.h              | 2 +-
 RTCP/Cobalt/InputProc/src/CMakeLists.txt                     | 1 +
 RTCP/Cobalt/InputProc/src/Delays/Delays.h                    | 2 +-
 RTCP/Cobalt/{CoInterface => InputProc}/src/RSPTimeStamp.cc   | 2 +-
 RTCP/Cobalt/{CoInterface => InputProc}/src/RSPTimeStamp.h    | 4 ++--
 RTCP/Cobalt/InputProc/src/Station/Generator.h                | 2 +-
 RTCP/Cobalt/InputProc/src/Station/PacketFactory.h            | 2 +-
 RTCP/Cobalt/InputProc/src/Station/PacketStream.h             | 2 +-
 RTCP/Cobalt/InputProc/src/Station/PacketWriter.tcc           | 2 +-
 RTCP/Cobalt/InputProc/src/Station/RSP.h                      | 2 +-
 RTCP/Cobalt/InputProc/src/Station/printRSP.cc                | 2 +-
 RTCP/Cobalt/InputProc/src/Transpose/MPISendStation.h         | 2 +-
 RTCP/Cobalt/InputProc/src/WallClockTime.h                    | 2 +-
 RTCP/Cobalt/InputProc/test/CMakeLists.txt                    | 1 +
 RTCP/Cobalt/InputProc/test/tMPITransfer.cc                   | 2 +-
 RTCP/Cobalt/InputProc/test/tRSP.cc                           | 2 +-
 RTCP/Cobalt/{CoInterface => InputProc}/test/tRSPTimeStamp.cc | 2 +-
 RTCP/Cobalt/InputProc/test/tRSPTimeStamp2.cc                 | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)
 rename RTCP/Cobalt/{CoInterface => InputProc}/src/RSPTimeStamp.cc (97%)
 rename RTCP/Cobalt/{CoInterface => InputProc}/src/RSPTimeStamp.h (98%)
 rename RTCP/Cobalt/{CoInterface => InputProc}/test/tRSPTimeStamp.cc (97%)

diff --git a/RTCP/Cobalt/CoInterface/src/CMakeLists.txt b/RTCP/Cobalt/CoInterface/src/CMakeLists.txt
index 6234f99bc4e..a9332aaf994 100644
--- a/RTCP/Cobalt/CoInterface/src/CMakeLists.txt
+++ b/RTCP/Cobalt/CoInterface/src/CMakeLists.txt
@@ -15,8 +15,7 @@ lofar_add_library(cointerface
   DataFactory.cc
   FinalMetaData.cc
   Stream.cc
-  Parset.cc
-  RSPTimeStamp.cc)
+  Parset.cc)
 
 lofar_add_bin_program(versioncointerface versioncointerface.cc)
 
diff --git a/RTCP/Cobalt/CoInterface/test/CMakeLists.txt b/RTCP/Cobalt/CoInterface/test/CMakeLists.txt
index 0ab67c5e49d..6723391c108 100644
--- a/RTCP/Cobalt/CoInterface/test/CMakeLists.txt
+++ b/RTCP/Cobalt/CoInterface/test/CMakeLists.txt
@@ -5,7 +5,6 @@ include(LofarCTest)
 lofar_add_test(tCorrelatedData tCorrelatedData.cc)
 lofar_add_test(tMultiDimArray tMultiDimArray.cc)
 lofar_add_test(tSparseSet tSparseSet.cc)
-lofar_add_test(tRSPTimeStamp tRSPTimeStamp.cc)
 
 if(UNITTEST++_FOUND)
   lofar_add_test(tParset tParset.cc)
diff --git a/RTCP/Cobalt/InputProc/src/Buffer/Block.h b/RTCP/Cobalt/InputProc/src/Buffer/Block.h
index f1a159e7f90..4fe3a4db6c6 100644
--- a/RTCP/Cobalt/InputProc/src/Buffer/Block.h
+++ b/RTCP/Cobalt/InputProc/src/Buffer/Block.h
@@ -24,7 +24,7 @@
 
 #include <vector>
 
-#include <CoInterface/RSPTimeStamp.h>
+#include <InputProc/RSPTimeStamp.h>
 #include <CoInterface/SubbandMetaData.h>
 
 namespace LOFAR
diff --git a/RTCP/Cobalt/InputProc/src/Buffer/BlockReader.h b/RTCP/Cobalt/InputProc/src/Buffer/BlockReader.h
index b7ae6080da9..f6b61dcbc18 100644
--- a/RTCP/Cobalt/InputProc/src/Buffer/BlockReader.h
+++ b/RTCP/Cobalt/InputProc/src/Buffer/BlockReader.h
@@ -25,10 +25,10 @@
 #include <string>
 #include <vector>
 
-#include <CoInterface/RSPTimeStamp.h>
 #include <CoInterface/SmartPtr.h>
 
 #include <InputProc/WallClockTime.h>
+#include <InputProc/RSPTimeStamp.h>
 
 #include <InputProc/Buffer/BufferSettings.h>
 #include <InputProc/Buffer/SampleBuffer.h>
diff --git a/RTCP/Cobalt/InputProc/src/Buffer/SampleBuffer.h b/RTCP/Cobalt/InputProc/src/Buffer/SampleBuffer.h
index eb00bb194db..53e9bda8077 100644
--- a/RTCP/Cobalt/InputProc/src/Buffer/SampleBuffer.h
+++ b/RTCP/Cobalt/InputProc/src/Buffer/SampleBuffer.h
@@ -27,7 +27,7 @@
 
 #include <CoInterface/MultiDimArray.h>
 #include <CoInterface/Allocator.h>
-#include <CoInterface/RSPTimeStamp.h>
+#include <InputProc/RSPTimeStamp.h>
 #include "BufferSettings.h"
 #include "SharedMemory.h"
 #include "Ranges.h"
diff --git a/RTCP/Cobalt/InputProc/src/CMakeLists.txt b/RTCP/Cobalt/InputProc/src/CMakeLists.txt
index 6d54ba88e02..52149791510 100644
--- a/RTCP/Cobalt/InputProc/src/CMakeLists.txt
+++ b/RTCP/Cobalt/InputProc/src/CMakeLists.txt
@@ -8,6 +8,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
 set(_inputproc_sources
   Package__Version.cc
   RSPBoards.cc
+  RSPTimeStamp.cc
   Buffer/BufferSettings.cc
   Buffer/Ranges.cc
   Buffer/SampleBuffer.cc
diff --git a/RTCP/Cobalt/InputProc/src/Delays/Delays.h b/RTCP/Cobalt/InputProc/src/Delays/Delays.h
index 83d456d8473..0420cae6f7d 100644
--- a/RTCP/Cobalt/InputProc/src/Delays/Delays.h
+++ b/RTCP/Cobalt/InputProc/src/Delays/Delays.h
@@ -38,8 +38,8 @@
 #include <CoInterface/MultiDimArray.h>
 #include <CoInterface/Parset.h>
 #include <CoInterface/SubbandMetaData.h>
-#include <CoInterface/RSPTimeStamp.h>
 #include <CoInterface/SmartPtr.h>
+#include <InputProc/RSPTimeStamp.h>
 
 #ifdef HAVE_CASACORE
 #include <measures/Measures/MeasConvert.h>
diff --git a/RTCP/Cobalt/CoInterface/src/RSPTimeStamp.cc b/RTCP/Cobalt/InputProc/src/RSPTimeStamp.cc
similarity index 97%
rename from RTCP/Cobalt/CoInterface/src/RSPTimeStamp.cc
rename to RTCP/Cobalt/InputProc/src/RSPTimeStamp.cc
index bb2a85136cc..f140da60804 100644
--- a/RTCP/Cobalt/CoInterface/src/RSPTimeStamp.cc
+++ b/RTCP/Cobalt/InputProc/src/RSPTimeStamp.cc
@@ -20,7 +20,7 @@
 
 #include <lofar_config.h>
 
-#include <CoInterface/RSPTimeStamp.h>
+#include "RSPTimeStamp.h"
 
 #include <Common/lofar_iostream.h>
 #include <Common/lofar_iomanip.h>
diff --git a/RTCP/Cobalt/CoInterface/src/RSPTimeStamp.h b/RTCP/Cobalt/InputProc/src/RSPTimeStamp.h
similarity index 98%
rename from RTCP/Cobalt/CoInterface/src/RSPTimeStamp.h
rename to RTCP/Cobalt/InputProc/src/RSPTimeStamp.h
index f7014887f2c..3ed7c51d7cf 100644
--- a/RTCP/Cobalt/CoInterface/src/RSPTimeStamp.h
+++ b/RTCP/Cobalt/InputProc/src/RSPTimeStamp.h
@@ -18,8 +18,8 @@
 //#
 //# $Id$
 
-#ifndef LOFAR_INTERFACE_RSPTIMESTAMP_H
-#define LOFAR_INTERFACE_RSPTIMESTAMP_H
+#ifndef LOFAR_COBALT_INPUTPROC_RSPTIMESTAMP_H
+#define LOFAR_COBALT_INPUTPROC_RSPTIMESTAMP_H
 
 #include <Common/lofar_iosfwd.h>
 #include <Common/LofarTypes.h>
diff --git a/RTCP/Cobalt/InputProc/src/Station/Generator.h b/RTCP/Cobalt/InputProc/src/Station/Generator.h
index 2f18711adfc..55a9744482f 100644
--- a/RTCP/Cobalt/InputProc/src/Station/Generator.h
+++ b/RTCP/Cobalt/InputProc/src/Station/Generator.h
@@ -25,10 +25,10 @@
 #include <vector>
 
 #include <Stream/Stream.h>
-#include <CoInterface/RSPTimeStamp.h>
 #include <CoInterface/SmartPtr.h>
 
 #include <InputProc/RSPBoards.h>
+#include <InputProc/RSPTimeStamp.h>
 #include <InputProc/Buffer/BufferSettings.h>
 
 #include "PacketFactory.h"
diff --git a/RTCP/Cobalt/InputProc/src/Station/PacketFactory.h b/RTCP/Cobalt/InputProc/src/Station/PacketFactory.h
index 2119b17f3ff..2fee4d44c84 100644
--- a/RTCP/Cobalt/InputProc/src/Station/PacketFactory.h
+++ b/RTCP/Cobalt/InputProc/src/Station/PacketFactory.h
@@ -23,7 +23,7 @@
 #define LOFAR_INPUT_PROC_PACKETFACTORY_H
 
 #include <InputProc/Buffer/BufferSettings.h>
-#include <CoInterface/RSPTimeStamp.h>
+#include <InputProc/RSPTimeStamp.h>
 
 #include "RSP.h"
 
diff --git a/RTCP/Cobalt/InputProc/src/Station/PacketStream.h b/RTCP/Cobalt/InputProc/src/Station/PacketStream.h
index fa679c616f8..0e61ba0eb32 100644
--- a/RTCP/Cobalt/InputProc/src/Station/PacketStream.h
+++ b/RTCP/Cobalt/InputProc/src/Station/PacketStream.h
@@ -24,7 +24,7 @@
 
 #include <Stream/Stream.h>
 #include <Common/Thread/Cancellation.h>
-#include <CoInterface/RSPTimeStamp.h>
+#include <InputProc/RSPTimeStamp.h>
 #include "PacketFactory.h"
 #include "RSP.h"
 
diff --git a/RTCP/Cobalt/InputProc/src/Station/PacketWriter.tcc b/RTCP/Cobalt/InputProc/src/Station/PacketWriter.tcc
index d9b83f434bd..724b8f9a5e5 100644
--- a/RTCP/Cobalt/InputProc/src/Station/PacketWriter.tcc
+++ b/RTCP/Cobalt/InputProc/src/Station/PacketWriter.tcc
@@ -24,7 +24,7 @@
 #include <Common/LofarTypes.h>
 #include <Common/LofarConstants.h>
 #include <Common/LofarLogger.h>
-#include <CoInterface/RSPTimeStamp.h>
+#include <InputProc/RSPTimeStamp.h>
 
 namespace LOFAR {
 namespace Cobalt {
diff --git a/RTCP/Cobalt/InputProc/src/Station/RSP.h b/RTCP/Cobalt/InputProc/src/Station/RSP.h
index d23648eac66..f2ee81a9aca 100644
--- a/RTCP/Cobalt/InputProc/src/Station/RSP.h
+++ b/RTCP/Cobalt/InputProc/src/Station/RSP.h
@@ -25,7 +25,7 @@
 #include <complex>
 
 #include <Common/LofarTypes.h>
-#include <CoInterface/RSPTimeStamp.h>
+#include <InputProc/RSPTimeStamp.h>
 
 namespace LOFAR
 {
diff --git a/RTCP/Cobalt/InputProc/src/Station/printRSP.cc b/RTCP/Cobalt/InputProc/src/Station/printRSP.cc
index f8411c8dd35..57e91087e45 100644
--- a/RTCP/Cobalt/InputProc/src/Station/printRSP.cc
+++ b/RTCP/Cobalt/InputProc/src/Station/printRSP.cc
@@ -32,7 +32,7 @@
 #include <Common/LofarLogger.h>
 #include <Common/DataConvert.h>
 #include <Stream/FileStream.h>
-#include <CoInterface/RSPTimeStamp.h>
+#include <InputProc/RSPTimeStamp.h>
 
 using namespace LOFAR;
 using namespace LOFAR::Cobalt;
diff --git a/RTCP/Cobalt/InputProc/src/Transpose/MPISendStation.h b/RTCP/Cobalt/InputProc/src/Transpose/MPISendStation.h
index 35033d3c510..b6650910ff4 100644
--- a/RTCP/Cobalt/InputProc/src/Transpose/MPISendStation.h
+++ b/RTCP/Cobalt/InputProc/src/Transpose/MPISendStation.h
@@ -25,10 +25,10 @@
 #include <mpi.h>
 
 #include <Common/LofarTypes.h>
-#include <CoInterface/RSPTimeStamp.h>
 #include <CoInterface/MultiDimArray.h>
 #include <CoInterface/SubbandMetaData.h>
 
+#include <InputProc/RSPTimeStamp.h>
 #include <InputProc/Buffer/Block.h>
 #include <InputProc/Buffer/BufferSettings.h>
 #include "MPIProtocol.h"
diff --git a/RTCP/Cobalt/InputProc/src/WallClockTime.h b/RTCP/Cobalt/InputProc/src/WallClockTime.h
index 5211a3ffc06..73fece5c1ac 100644
--- a/RTCP/Cobalt/InputProc/src/WallClockTime.h
+++ b/RTCP/Cobalt/InputProc/src/WallClockTime.h
@@ -28,7 +28,7 @@
 
 #include <Common/Thread/Mutex.h>
 #include <Common/Thread/Condition.h>
-#include <CoInterface/RSPTimeStamp.h>
+#include <InputProc/RSPTimeStamp.h>
 
 
 namespace LOFAR
diff --git a/RTCP/Cobalt/InputProc/test/CMakeLists.txt b/RTCP/Cobalt/InputProc/test/CMakeLists.txt
index f6d49a069e4..2f60a691ee1 100644
--- a/RTCP/Cobalt/InputProc/test/CMakeLists.txt
+++ b/RTCP/Cobalt/InputProc/test/CMakeLists.txt
@@ -12,6 +12,7 @@ if(UNITTEST++_FOUND)
 endif(UNITTEST++_FOUND)
 
 lofar_add_test(tRSP tRSP.cc)
+lofar_add_test(tRSPTimeStamp tRSPTimeStamp.cc)
 lofar_add_test(tRSPTimeStamp2 tRSPTimeStamp2.cc)
 lofar_add_test(tPacketReader tPacketReader.cc)
 lofar_add_test(tPacketFactory tPacketFactory.cc)
diff --git a/RTCP/Cobalt/InputProc/test/tMPITransfer.cc b/RTCP/Cobalt/InputProc/test/tMPITransfer.cc
index 17e4d49d974..7cf6b520009 100644
--- a/RTCP/Cobalt/InputProc/test/tMPITransfer.cc
+++ b/RTCP/Cobalt/InputProc/test/tMPITransfer.cc
@@ -35,10 +35,10 @@
 #include <Common/Thread/Mutex.h>
 #include <CoInterface/MultiDimArray.h>
 #include <CoInterface/Stream.h>
-#include <CoInterface/RSPTimeStamp.h>
 #include <Stream/Stream.h>
 #include <Stream/SocketStream.h>
 
+#include <InputProc/RSPTimeStamp.h>
 #include <InputProc/OMPThread.h>
 #include <InputProc/SampleType.h>
 #include <InputProc/Buffer/StationID.h>
diff --git a/RTCP/Cobalt/InputProc/test/tRSP.cc b/RTCP/Cobalt/InputProc/test/tRSP.cc
index 24404c358ca..b239096cc11 100644
--- a/RTCP/Cobalt/InputProc/test/tRSP.cc
+++ b/RTCP/Cobalt/InputProc/test/tRSP.cc
@@ -27,8 +27,8 @@
 #include <Common/LofarLogger.h>
 #include <Common/DataConvert.h>
 #include <Stream/FileStream.h>
-#include <CoInterface/RSPTimeStamp.h>
 
+#include <InputProc/RSPTimeStamp.h>
 #include <InputProc/Station/RSP.h>
 
 
diff --git a/RTCP/Cobalt/CoInterface/test/tRSPTimeStamp.cc b/RTCP/Cobalt/InputProc/test/tRSPTimeStamp.cc
similarity index 97%
rename from RTCP/Cobalt/CoInterface/test/tRSPTimeStamp.cc
rename to RTCP/Cobalt/InputProc/test/tRSPTimeStamp.cc
index 3248a96b417..0228225e78c 100644
--- a/RTCP/Cobalt/CoInterface/test/tRSPTimeStamp.cc
+++ b/RTCP/Cobalt/InputProc/test/tRSPTimeStamp.cc
@@ -20,12 +20,12 @@
 
 #include <lofar_config.h>
 
-#include <CoInterface/RSPTimeStamp.h>
 
 #include <stdint.h>
 
 #include <Common/LofarLogger.h>
 
+#include <InputProc/RSPTimeStamp.h>
 
 #define SAMPLERATE 195312.5
 // start the test at INT32_MAX * SAMPLERATE
diff --git a/RTCP/Cobalt/InputProc/test/tRSPTimeStamp2.cc b/RTCP/Cobalt/InputProc/test/tRSPTimeStamp2.cc
index 6814361021e..6b31279119a 100644
--- a/RTCP/Cobalt/InputProc/test/tRSPTimeStamp2.cc
+++ b/RTCP/Cobalt/InputProc/test/tRSPTimeStamp2.cc
@@ -22,7 +22,7 @@
 
 #include <Common/LofarTypes.h>
 #include <Common/LofarLogger.h>
-#include <CoInterface/RSPTimeStamp.h>
+#include <InputProc/RSPTimeStamp.h>
 
 using namespace LOFAR;
 using namespace Cobalt;
-- 
GitLab