diff --git a/.gitattributes b/.gitattributes index 8ce206f620678e0140ce3e9b316eca4f07bbb70a..757cccd5b29550b3939e67584af79d432590b0cb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1797,15 +1797,15 @@ RTCP/Interface/include/Interface/BFRawFormat.h -text RTCP/Interface/include/Interface/BeamCoordinates.h -text RTCP/Interface/include/Interface/BeamFormedData.h -text RTCP/Interface/include/Interface/CN_ProcessingPlan.h -text -RTCP/Interface/include/Interface/CN_Stream.h -text RTCP/Interface/include/Interface/InverseFilteredData.h -text RTCP/Interface/include/Interface/ProcessingPlan.h -text RTCP/Interface/include/Interface/StokesData.h -text +RTCP/Interface/include/Interface/Stream.h -text RTCP/Interface/include/Interface/StreamableData.h -text RTCP/Interface/include/Interface/TransposedBeamFormedData.h -text RTCP/Interface/src/BeamCoordinates.cc -text RTCP/Interface/src/CN_ProcessingPlan.cc -text -RTCP/Interface/src/CN_Stream.cc -text +RTCP/Interface/src/Stream.cc -text RTCP/LofarStMan/CMakeLists.txt -text RTCP/LofarStMan/include/LofarStMan/CMakeLists.txt -text RTCP/LofarStMan/src/CMakeLists.txt -text diff --git a/RTCP/CNProc/src/CN_Processing_main.cc b/RTCP/CNProc/src/CN_Processing_main.cc index 38bc45dd8ddbbbd2108739e4328e3fa43beb68c2..17f866792d7fa8a87f1fbcf915ec069b1f262ec0 100644 --- a/RTCP/CNProc/src/CN_Processing_main.cc +++ b/RTCP/CNProc/src/CN_Processing_main.cc @@ -24,7 +24,7 @@ #include <Interface/CN_Command.h> #include <Interface/CN_Configuration.h> #include <Interface/Exceptions.h> -#include <Interface/CN_Stream.h> +#include <Interface/Stream.h> #include <CNProc/LocationInfo.h> #include <CNProc/CN_Processing.h> #include <Common/LofarLogger.h> diff --git a/RTCP/IONProc/src/BeamletBufferToComputeNode.cc b/RTCP/IONProc/src/BeamletBufferToComputeNode.cc index 80601833fd505c6d1595110b71b3ab1a4c437cfe..3affe7d4655c10c4b620a9ef058ed7db9c0585c7 100644 --- a/RTCP/IONProc/src/BeamletBufferToComputeNode.cc +++ b/RTCP/IONProc/src/BeamletBufferToComputeNode.cc @@ -35,7 +35,7 @@ #include <Interface/BFRawFormat.h> #include <Interface/CN_Command.h> #include <Interface/CN_Mapping.h> -#include <Interface/CN_Stream.h> +#include <Interface/Stream.h> #include <Interface/SubbandMetaData.h> #include <Interface/Exceptions.h> diff --git a/RTCP/IONProc/src/ION_main.cc b/RTCP/IONProc/src/ION_main.cc index 99ede0985e1e076eb5200395a66fe64da01a3412..3e31fc0060276a185f6b1c62d2c7ff76be72a385 100644 --- a/RTCP/IONProc/src/ION_main.cc +++ b/RTCP/IONProc/src/ION_main.cc @@ -24,7 +24,7 @@ #include <Common/LofarLogger.h> #include <Common/SystemCallException.h> #include <Interface/CN_Command.h> -#include <Interface/CN_Stream.h> +#include <Interface/Stream.h> #include <Interface/CN_Mapping.h> #include <Interface/Exceptions.h> #include <Interface/Parset.h> diff --git a/RTCP/IONProc/src/InputSection.cc b/RTCP/IONProc/src/InputSection.cc index 3d43d4ac40628a94728f0a1ae4e49e764c392dae..ed2a44ed8f893951c49e977c89c61fbc0a88ea86 100644 --- a/RTCP/IONProc/src/InputSection.cc +++ b/RTCP/IONProc/src/InputSection.cc @@ -26,7 +26,7 @@ //# Includes #include <InputSection.h> #include <Stream/SocketStream.h> -#include <Interface/CN_Stream.h> +#include <Interface/Stream.h> #include <boost/format.hpp> using boost::format; diff --git a/RTCP/IONProc/src/OutputThread.cc b/RTCP/IONProc/src/OutputThread.cc index 1f06efdb71cfd0dadb78c34c08b0e2af09755a5c..08dbcd14dc6ca4e7d9b8e1ac0799b979f8487401 100644 --- a/RTCP/IONProc/src/OutputThread.cc +++ b/RTCP/IONProc/src/OutputThread.cc @@ -27,7 +27,7 @@ #include <IONProc/ION_Allocator.h> #include <IONProc/OutputThread.h> #include <IONProc/Scheduling.h> -#include <Interface/CN_Stream.h> +#include <Interface/Stream.h> #include <Stream/SocketStream.h> #include <Thread/Semaphore.h> diff --git a/RTCP/Interface/include/Interface/CMakeLists.txt b/RTCP/Interface/include/Interface/CMakeLists.txt index 363a2597688e54ca9711d0b65d19a0d3d7afb870..9a5a30f3f7f8ed3e2c2e8f1c80bc23028c12273f 100644 --- a/RTCP/Interface/include/Interface/CMakeLists.txt +++ b/RTCP/Interface/include/Interface/CMakeLists.txt @@ -8,7 +8,7 @@ set(inst_HEADERS CN_Command.h CN_Configuration.h CN_Mapping.h - CN_Stream.h + Stream.h CorrelatedData.h Config.h FilteredData.h diff --git a/RTCP/Interface/include/Interface/CN_Stream.h b/RTCP/Interface/include/Interface/Stream.h similarity index 87% rename from RTCP/Interface/include/Interface/CN_Stream.h rename to RTCP/Interface/include/Interface/Stream.h index f8fb43f30fc55c2108b72166ec369a5e98e4240e..9b6c9488f438b3f707da5c7cd84fa644f92f48ba 100644 --- a/RTCP/Interface/include/Interface/CN_Stream.h +++ b/RTCP/Interface/include/Interface/Stream.h @@ -1,4 +1,4 @@ -//# CN_Stream.h: functions to construct streams between ION/CN/Storage +//# Stream.h: functions to construct streams between ION/CN/Storage //# //# Copyright (C) 2006 //# ASTRON (Netherlands Foundation for Research in Astronomy) @@ -18,10 +18,10 @@ //# along with this program; if not, write to the Free Software //# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //# -//# $Id: CN_Stream.h 16488 2010-10-07 10:06:14Z mol $ +//# $Id: Stream.h 16488 2010-10-07 10:06:14Z mol $ -#ifndef LOFAR_INTERFACE_CN_STREAM_H -#define LOFAR_INTERFACE_CN_STREAM_H +#ifndef LOFAR_INTERFACE_STREAM_H +#define LOFAR_INTERFACE_STREAM_H #include <Stream/Stream.h> #include <string> diff --git a/RTCP/Interface/src/CMakeLists.txt b/RTCP/Interface/src/CMakeLists.txt index 1d93b026ad61a4ac79aaac4eb4357ea63221e5c3..af509877695e4e7b420731c61f53ffe6a08cebad 100644 --- a/RTCP/Interface/src/CMakeLists.txt +++ b/RTCP/Interface/src/CMakeLists.txt @@ -9,7 +9,7 @@ lofar_add_library(interface CN_Configuration.cc CN_Mapping.cc CN_ProcessingPlan.cc - CN_Stream.cc + Stream.cc Parset.cc RSPTimeStamp.cc) diff --git a/RTCP/Interface/src/CN_Stream.cc b/RTCP/Interface/src/Stream.cc similarity index 97% rename from RTCP/Interface/src/CN_Stream.cc rename to RTCP/Interface/src/Stream.cc index 519e776a478eb6437ed913760fbfbac07aa7b078..dcf606d3bd09c2a6136de56c764376013a8daa88 100644 --- a/RTCP/Interface/src/CN_Stream.cc +++ b/RTCP/Interface/src/Stream.cc @@ -1,4 +1,4 @@ -//# CN_Stream.cc: one line descriptor +//# Stream.cc: one line descriptor //# //# Copyright (C) 2006 //# ASTRON (Netherlands Foundation for Research in Astronomy) @@ -18,7 +18,7 @@ //# along with this program; if not, write to the Free Software //# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //# -//# $Id: CN_Stream.cc 16396 2010-09-27 12:12:24Z mol $ +//# $Id: Stream.cc 16396 2010-09-27 12:12:24Z mol $ //# Always #include <lofar_config.h> first! #include <lofar_config.h> @@ -26,7 +26,7 @@ //# Includes #include <Common/LofarLogger.h> #include <Interface/Exceptions.h> -#include <Interface/CN_Stream.h> +#include <Interface/Stream.h> #include <Common/StringUtil.h> #include <Stream/FileStream.h> diff --git a/RTCP/Storage/src/InputThread.cc b/RTCP/Storage/src/InputThread.cc index 7c3f8d4ec9e6baee82a06f1e420ddabdc323eab8..3b9e21901018f479f26db1e38dd1f5312a2f773a 100644 --- a/RTCP/Storage/src/InputThread.cc +++ b/RTCP/Storage/src/InputThread.cc @@ -24,7 +24,7 @@ #include <lofar_config.h> #include <Storage/InputThread.h> -#include <Interface/CN_Stream.h> +#include <Interface/Stream.h> #include <Stream/NullStream.h> #include <Stream/SocketStream.h> #include <Common/DataConvert.h>