Skip to content
Snippets Groups Projects
Commit e68b4646 authored by Martin Gels's avatar Martin Gels
Browse files

BugID: 1005

In process() first call calculateDelays() and the increment the loop counter.
Otherwise an incorrect assertion happens.
parent c912e5b8
No related branches found
No related tags found
No related merge requests found
...@@ -90,7 +90,6 @@ namespace LOFAR ...@@ -90,7 +90,6 @@ namespace LOFAR
void WH_DelayCompensation::preprocess() void WH_DelayCompensation::preprocess()
{ {
LOG_TRACE_LIFETIME(TRACE_LEVEL_FLOW, ""); LOG_TRACE_LIFETIME(TRACE_LEVEL_FLOW, "");
itsLoopCount = 0; itsLoopCount = 0;
// Create the AMC converter. // Create the AMC converter.
...@@ -110,15 +109,15 @@ namespace LOFAR ...@@ -110,15 +109,15 @@ namespace LOFAR
void WH_DelayCompensation::process() void WH_DelayCompensation::process()
{ {
// Start by incrementing the loop count
itsLoopCount++;
LOG_TRACE_LIFETIME_STR(TRACE_LEVEL_FLOW, "count = " << itsLoopCount);
// Calculate the delays for the epoch after the end of the current time // Calculate the delays for the epoch after the end of the current time
// interval. Put the results in itsDelaysAtBegin and itsDelaysAfterEnd. // interval. Put the results in itsDelaysAtBegin and itsDelaysAfterEnd.
calculateDelays(); calculateDelays();
// Incrementing the loop count
LOG_TRACE_LIFETIME_STR(TRACE_LEVEL_FLOW, "count = " << itsLoopCount);
itsLoopCount++;
// The delays -- split into a coarse (sample) delay and a fine // The delays -- split into a coarse (sample) delay and a fine
// (subsample) delay -- need to be put into a DelayInfo struct. // (subsample) delay -- need to be put into a DelayInfo struct.
vector<DH_Delay::DelayInfo> delayInfo(itsNrDelays); vector<DH_Delay::DelayInfo> delayInfo(itsNrDelays);
...@@ -163,7 +162,6 @@ namespace LOFAR ...@@ -163,7 +162,6 @@ namespace LOFAR
void WH_DelayCompensation::postprocess() void WH_DelayCompensation::postprocess()
{ {
LOG_TRACE_LIFETIME(TRACE_LEVEL_FLOW, ""); LOG_TRACE_LIFETIME(TRACE_LEVEL_FLOW, "");
// Delete the AMC converter // Delete the AMC converter
ASSERT(itsConverter); ASSERT(itsConverter);
delete itsConverter; delete itsConverter;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment