From 3c04ee2988fdb115b7a559e6d2563d59d0abff6b Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Wed, 5 Sep 2012 14:26:15 +0000
Subject: [PATCH] Task #3566: Added characteristics log lines and percentage
written
---
RTCP/Storage/include/Storage/OutputThread.h | 1 +
RTCP/Storage/src/MSWriterDAL.cc | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/RTCP/Storage/include/Storage/OutputThread.h b/RTCP/Storage/include/Storage/OutputThread.h
index 4650197bb2a..c5c45a78f3b 100644
--- a/RTCP/Storage/include/Storage/OutputThread.h
+++ b/RTCP/Storage/include/Storage/OutputThread.h
@@ -69,6 +69,7 @@ class OutputThread
Queue<SmartPtr<StreamableData> > &itsFreeQueue, &itsReceiveQueue;
unsigned itsBlocksWritten, itsBlocksDropped;
+ unsigned itsNrExpectedBlocks;
unsigned itsNextSequenceNumber;
std::vector<unsigned> itsSequenceNumbers;
SmartPtr<FileStream> itsSequenceNumbersFile;
diff --git a/RTCP/Storage/src/MSWriterDAL.cc b/RTCP/Storage/src/MSWriterDAL.cc
index 9f848963593..029c2908afd 100644
--- a/RTCP/Storage/src/MSWriterDAL.cc
+++ b/RTCP/Storage/src/MSWriterDAL.cc
@@ -118,7 +118,7 @@ namespace LOFAR
itsTransposeLogic.decompose( fileno, sapNr, beamNr, stokesNr, partNr );
- unsigned nrBlocks = floor((parset.stopTime() - parset.startTime()) / parset.CNintegrationTime());
+ unsigned nrBlocks = parset.nrBeamFormedBlocks();
unsigned nrSubbands = itsInfo.subbands.size();
const vector<unsigned> &subbandIndices = itsInfo.subbands;
const vector<unsigned> allSubbands = parset.subbandList();
--
GitLab