Task #4315: Slightly improved interface

RTCP/Cobalt/InputProc/src/Delays/Delays.cc

@@ -46,9 +46,13 @@ namespace LOFAR
 
     //##----------------  Public methods  ----------------##//
 
-    Delays::Delays(const Parset &parset, const std::string &stationName, const TimeStamp &startTime)
+    Delays::Delays(const Parset &parset, const std::string &stationName, const TimeStamp &startTime, size_t blockSize)
       :
       parset(parset),
+      itsStationName(stationName),
+      itsStartTime(startTime),
+      blockSize(blockSize),
+
       stop(false),
       // we need an extra entry for the central beam
       itsBuffer(bufferSize),
@@ -56,9 +60,6 @@ namespace LOFAR
       tail(0),
       bufferFree(bufferSize),
       bufferUsed(0),
-      itsStartTime(startTime),
-      blockSize(parset.nrSamplesPerSubband()),
-      itsStationName(stationName),
       itsDelayTimer("delay producer", true, true)
     {
     }

RTCP/Cobalt/InputProc/src/Delays/Delays.h

@@ -85,7 +85,7 @@ namespace LOFAR
     class Delays
     {
     public:
-      Delays(const Parset &ps, const std::string &stationName, const TimeStamp &startTime);
+      Delays(const Parset &ps, const std::string &stationName, const TimeStamp &startTime, size_t blockSize);
       ~Delays();
 
       void start();
@@ -107,6 +107,11 @@ namespace LOFAR
       void getNextDelays( AllDelays &result );
 
     private:
+      const Parset                        &parset;
+      const std::string itsStationName;
+      const TimeStamp itsStartTime;
+      const size_t blockSize;
+
       casa::MVEpoch                       toUTC( const TimeStamp &timeStamp ) const;
 
       void                                init();
@@ -115,8 +120,6 @@ namespace LOFAR
       // calculations and to avoid blocking other threads
       void                                mainLoop();
 
-      const Parset                        &parset;
-
       volatile bool stop;
 
       // the number of seconds to maintain in the buffer, must be a multiple of
@@ -141,12 +144,6 @@ namespace LOFAR
       // another to trigger the consumer that data is available.
       Semaphore bufferFree, bufferUsed;
 
-      // Sample timings.
-      const TimeStamp itsStartTime;
-      const size_t blockSize;
-
-      // Station Name.
-      const std::string itsStationName;
       casa::MeasFrame itsFrame;
 
       std::vector<casa::MDirection::Types> itsDirectionTypes; // [sap]