From 60e7f2a46723482775de53b40a847fc0c08d9f8c Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Wed, 4 Feb 2015 12:25:46 +0000
Subject: [PATCH] Task #7350: Fixed Correlator test by accepting new queue
output after changing the message format
---
.../queues/lofar.task.feedback.processing | 342 ------------------
.../queues/lofar.task.feedback.status | 14 +-
2 files changed, 9 insertions(+), 347 deletions(-)
diff --git a/SubSystems/Online_Cobalt/test/Correlator/tCorrelate_1sec_1st_5sb_noflagging.output/queues/lofar.task.feedback.processing b/SubSystems/Online_Cobalt/test/Correlator/tCorrelate_1sec_1st_5sb_noflagging.output/queues/lofar.task.feedback.processing
index 6570366b889..076b9f2b6ee 100644
--- a/SubSystems/Online_Cobalt/test/Correlator/tCorrelate_1sec_1st_5sb_noflagging.output/queues/lofar.task.feedback.processing
+++ b/SubSystems/Online_Cobalt/test/Correlator/tCorrelate_1sec_1st_5sb_noflagging.output/queues/lofar.task.feedback.processing
@@ -28,345 +28,3 @@ _isCobalt=T
</payload>
</message>
-<message>
- <header>
- <system>LOFAR</system>
- <version>1.0.0</version>
- <protocol>
- <name>lofar.task.feedback.processing</name>
- <version>1.0.0</version>
- </protocol>
- <source>
- <name>Cobalt/GPUProc/rtcp</name>
- <user></user>
- <uuid></uuid>
- <timestamp></timestamp>
- <summary>Processing feedback</summary>
- </source>
- <ids>
- <momid>0</momid>
- <sasid>76966</sasid>
- </ids>
- </header>
- <payload>
-Observation.Correlator.channelWidth=12207.03125
-Observation.Correlator.channelsPerSubband=16
-Observation.Correlator.integrationInterval=0.25165824
-Observation.DataProducts.nrOfOutput_Beamformed_=0
-Observation.DataProducts.nrOfOutput_Correlated_=5
-_isCobalt=T
-
- </payload>
-</message>
-<message>
- <header>
- <system>LOFAR</system>
- <version>1.0.0</version>
- <protocol>
- <name>lofar.task.feedback.processing</name>
- <version>1.0.0</version>
- </protocol>
- <source>
- <name>Cobalt/GPUProc/rtcp</name>
- <user></user>
- <uuid></uuid>
- <timestamp></timestamp>
- <summary>Processing feedback</summary>
- </source>
- <ids>
- <momid>0</momid>
- <sasid>192676</sasid>
- </ids>
- </header>
- <payload>
-Observation.CoherentStokes.antennaSet=HBA_ZERO
-Observation.CoherentStokes.channelWidth=195312.5
-Observation.CoherentStokes.channelsPerSubband=1
-Observation.CoherentStokes.rawSamplingTime=5.12e-06
-Observation.CoherentStokes.samplingTime=8.192e-05
-Observation.CoherentStokes.stationList=[CS002,CS501]
-Observation.CoherentStokes.stokes=I
-Observation.CoherentStokes.timeDownsamplingFactor=16
-Observation.DataProducts.nrOfOutput_Beamformed_=1
-Observation.DataProducts.nrOfOutput_Correlated_=0
-_isCobalt=T
-
- </payload>
-</message>
-<message>
- <header>
- <system>LOFAR</system>
- <version>1.0.0</version>
- <protocol>
- <name>lofar.task.feedback.processing</name>
- <version>1.0.0</version>
- </protocol>
- <source>
- <name>Cobalt/GPUProc/rtcp</name>
- <user></user>
- <uuid></uuid>
- <timestamp></timestamp>
- <summary>Processing feedback</summary>
- </source>
- <ids>
- <momid>0</momid>
- <sasid>192676</sasid>
- </ids>
- </header>
- <payload>
-Observation.CoherentStokes.antennaSet=HBA_ZERO
-Observation.CoherentStokes.channelWidth=195312.5
-Observation.CoherentStokes.channelsPerSubband=1
-Observation.CoherentStokes.rawSamplingTime=5.12e-06
-Observation.CoherentStokes.samplingTime=8.192e-05
-Observation.CoherentStokes.stationList=[CS002,CS501]
-Observation.CoherentStokes.stokes=XXYY
-Observation.CoherentStokes.timeDownsamplingFactor=16
-Observation.DataProducts.nrOfOutput_Beamformed_=4
-Observation.DataProducts.nrOfOutput_Correlated_=0
-_isCobalt=T
-
- </payload>
-</message>
-<message>
- <header>
- <system>LOFAR</system>
- <version>1.0.0</version>
- <protocol>
- <name>lofar.task.feedback.processing</name>
- <version>1.0.0</version>
- </protocol>
- <source>
- <name>Cobalt/GPUProc/rtcp</name>
- <user></user>
- <uuid></uuid>
- <timestamp></timestamp>
- <summary>Processing feedback</summary>
- </source>
- <ids>
- <momid>0</momid>
- <sasid>192676</sasid>
- </ids>
- </header>
- <payload>
-Observation.CoherentStokes.antennaSet=HBA_ZERO
-Observation.CoherentStokes.channelWidth=195312.5
-Observation.CoherentStokes.channelsPerSubband=1
-Observation.CoherentStokes.rawSamplingTime=5.12e-06
-Observation.CoherentStokes.samplingTime=8.192e-05
-Observation.CoherentStokes.stationList=[CS002,CS501]
-Observation.CoherentStokes.stokes=I
-Observation.CoherentStokes.timeDownsamplingFactor=16
-Observation.DataProducts.nrOfOutput_Beamformed_=2
-Observation.DataProducts.nrOfOutput_Correlated_=0
-Observation.FlysEye.channelWidth=195312.5
-Observation.FlysEye.channelsPerSubband=1
-Observation.FlysEye.rawSamplingTime=5.12e-06
-Observation.FlysEye.samplingTime=8.192e-05
-Observation.FlysEye.stokes=I
-Observation.FlysEye.timeDownsamplingFactor=16
-_isCobalt=T
-
- </payload>
-</message>
-<message>
- <header>
- <system>LOFAR</system>
- <version>1.0.0</version>
- <protocol>
- <name>lofar.task.feedback.processing</name>
- <version>1.0.0</version>
- </protocol>
- <source>
- <name>Cobalt/GPUProc/rtcp</name>
- <user></user>
- <uuid></uuid>
- <timestamp></timestamp>
- <summary>Processing feedback</summary>
- </source>
- <ids>
- <momid>0</momid>
- <sasid>192676</sasid>
- </ids>
- </header>
- <payload>
-Observation.DataProducts.nrOfOutput_Beamformed_=1
-Observation.DataProducts.nrOfOutput_Correlated_=0
-Observation.IncoherentStokes.antennaSet=HBA_ZERO
-Observation.IncoherentStokes.channelWidth=195312.5
-Observation.IncoherentStokes.channelsPerSubband=1
-Observation.IncoherentStokes.rawSamplingTime=5.12e-06
-Observation.IncoherentStokes.samplingTime=8.192e-05
-Observation.IncoherentStokes.stationList=[CS002,CS501]
-Observation.IncoherentStokes.stokes=I
-Observation.IncoherentStokes.timeDownsamplingFactor=16
-_isCobalt=T
-
- </payload>
-</message>
-<message>
- <header>
- <system>LOFAR</system>
- <version>1.0.0</version>
- <protocol>
- <name>lofar.task.feedback.processing</name>
- <version>1.0.0</version>
- </protocol>
- <source>
- <name>Cobalt/GPUProc/rtcp</name>
- <user></user>
- <uuid></uuid>
- <timestamp></timestamp>
- <summary>Processing feedback</summary>
- </source>
- <ids>
- <momid>0</momid>
- <sasid>192676</sasid>
- </ids>
- </header>
- <payload>
-Observation.CoherentStokes.antennaSet=HBA_ZERO
-Observation.CoherentStokes.channelWidth=195312.5
-Observation.CoherentStokes.channelsPerSubband=1
-Observation.CoherentStokes.rawSamplingTime=5.12e-06
-Observation.CoherentStokes.samplingTime=8.192e-05
-Observation.CoherentStokes.stationList=[CS002,CS501]
-Observation.CoherentStokes.stokes=I
-Observation.CoherentStokes.timeDownsamplingFactor=16
-Observation.Correlator.channelWidth=12207.03125
-Observation.Correlator.channelsPerSubband=16
-Observation.Correlator.integrationInterval=1.00663296
-Observation.DataProducts.nrOfOutput_Beamformed_=2
-Observation.DataProducts.nrOfOutput_Correlated_=3
-Observation.IncoherentStokes.antennaSet=HBA_ZERO
-Observation.IncoherentStokes.channelWidth=195312.5
-Observation.IncoherentStokes.channelsPerSubband=1
-Observation.IncoherentStokes.rawSamplingTime=5.12e-06
-Observation.IncoherentStokes.samplingTime=8.192e-05
-Observation.IncoherentStokes.stationList=[CS002,CS501]
-Observation.IncoherentStokes.stokes=I
-Observation.IncoherentStokes.timeDownsamplingFactor=16
-_isCobalt=T
-
- </payload>
-</message>
-<message>
- <header>
- <system>LOFAR</system>
- <version>1.0.0</version>
- <protocol>
- <name>lofar.task.feedback.processing</name>
- <version>1.0.0</version>
- </protocol>
- <source>
- <name>Cobalt/GPUProc/rtcp</name>
- <user></user>
- <uuid></uuid>
- <timestamp></timestamp>
- <summary>Processing feedback</summary>
- </source>
- <ids>
- <momid>0</momid>
- <sasid>76966</sasid>
- </ids>
- </header>
- <payload>
-Observation.Correlator.channelWidth=12207.03125
-Observation.Correlator.channelsPerSubband=16
-Observation.Correlator.integrationInterval=8.053063679999999
-Observation.DataProducts.nrOfOutput_Beamformed_=0
-Observation.DataProducts.nrOfOutput_Correlated_=5
-_isCobalt=T
-
- </payload>
-</message>
-<message>
- <header>
- <system>LOFAR</system>
- <version>1.0.0</version>
- <protocol>
- <name>lofar.task.feedback.processing</name>
- <version>1.0.0</version>
- </protocol>
- <source>
- <name>Cobalt/GPUProc/rtcp</name>
- <user></user>
- <uuid></uuid>
- <timestamp></timestamp>
- <summary>Processing feedback</summary>
- </source>
- <ids>
- <momid>0</momid>
- <sasid>76966</sasid>
- </ids>
- </header>
- <payload>
-Observation.Correlator.channelWidth=12207.03125
-Observation.Correlator.channelsPerSubband=16
-Observation.Correlator.integrationInterval=8.053063679999999
-Observation.DataProducts.nrOfOutput_Beamformed_=0
-Observation.DataProducts.nrOfOutput_Correlated_=5
-_isCobalt=T
-
- </payload>
-</message>
-<message>
- <header>
- <system>LOFAR</system>
- <version>1.0.0</version>
- <protocol>
- <name>lofar.task.feedback.processing</name>
- <version>1.0.0</version>
- </protocol>
- <source>
- <name>Cobalt/GPUProc/rtcp</name>
- <user></user>
- <uuid></uuid>
- <timestamp></timestamp>
- <summary>Processing feedback</summary>
- </source>
- <ids>
- <momid>0</momid>
- <sasid>76966</sasid>
- </ids>
- </header>
- <payload>
-Observation.Correlator.channelWidth=12207.03125
-Observation.Correlator.channelsPerSubband=16
-Observation.Correlator.integrationInterval=8.053063679999999
-Observation.DataProducts.nrOfOutput_Beamformed_=0
-Observation.DataProducts.nrOfOutput_Correlated_=5
-_isCobalt=T
-
- </payload>
-</message>
-<message>
- <header>
- <system>LOFAR</system>
- <version>1.0.0</version>
- <protocol>
- <name>lofar.task.feedback.processing</name>
- <version>1.0.0</version>
- </protocol>
- <source>
- <name>Cobalt/GPUProc/rtcp</name>
- <user></user>
- <uuid></uuid>
- <timestamp></timestamp>
- <summary>Processing feedback</summary>
- </source>
- <ids>
- <momid>0</momid>
- <sasid>76966</sasid>
- </ids>
- </header>
- <payload>
-Observation.Correlator.channelWidth=12207.03125
-Observation.Correlator.channelsPerSubband=16
-Observation.Correlator.integrationInterval=0.25165824
-Observation.DataProducts.nrOfOutput_Beamformed_=0
-Observation.DataProducts.nrOfOutput_Correlated_=5
-_isCobalt=T
-
- </payload>
-</message>
diff --git a/SubSystems/Online_Cobalt/test/Correlator/tCorrelate_1sec_1st_5sb_noflagging.output/queues/lofar.task.feedback.status b/SubSystems/Online_Cobalt/test/Correlator/tCorrelate_1sec_1st_5sb_noflagging.output/queues/lofar.task.feedback.status
index 6131e5d45a7..87c4cea6530 100644
--- a/SubSystems/Online_Cobalt/test/Correlator/tCorrelate_1sec_1st_5sb_noflagging.output/queues/lofar.task.feedback.status
+++ b/SubSystems/Online_Cobalt/test/Correlator/tCorrelate_1sec_1st_5sb_noflagging.output/queues/lofar.task.feedback.status
@@ -2,17 +2,21 @@
<header>
<system>LOFAR</system>
<version>1.0.0</version>
- <service>
+ <protocol>
<name>lofar.task.feedback.status</name>
<version>1.0.0</version>
- </service>
- <request>
- <source>Cobalt/GPUProc/sendStatus</source>
+ </protocol>
+ <source>
+ <name>Cobalt/GPUProc/sendStatus</name>
<user></user>
<uuid></uuid>
<timestamp></timestamp>
<summary>Status feedback</summary>
- </request>
+ </source>
+ <ids>
+ <momid>0</momid>
+ <sasid>76966</sasid>
+ </ids>
</header>
<payload>
<task>
--
GitLab