From 31b42492fdfbaf58f27f0fe3cc328f42502bdc3b Mon Sep 17 00:00:00 2001
From: wierenga <sdos@astron.nl>
Date: Wed, 27 Sep 2006 10:05:01 +0000
Subject: [PATCH] BugID: 919 Selection of subarray of cross-correlation is no
longer done in RSPDriver. Clients always receive the full array and need to
do their own selection.
---
MAC/APL/PAC/CalServer/src/ACMProxy.cc | 7 +------
MAC/APL/PAC/CalServer/src/ACMProxy.h | 1 +
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/MAC/APL/PAC/CalServer/src/ACMProxy.cc b/MAC/APL/PAC/CalServer/src/ACMProxy.cc
index 98371f8216e..3d198cfc17b 100644
--- a/MAC/APL/PAC/CalServer/src/ACMProxy.cc
+++ b/MAC/APL/PAC/CalServer/src/ACMProxy.cc
@@ -104,6 +104,7 @@ GCFEvent::TResult ACMProxy::initial(GCFEvent& e, GCFPortInterface& port)
{
RSPGetconfigackEvent ack(e);
m_nrcus = ack.n_rcus;
+ m_nrspboards = ack.n_rspboards;
if (m_nrcus != m_accs.getBack().getNAntennas() * m_accs.getBack().getNPol())
{
LOG_FATAL("CalServer.N_ANTENNAS does not match value from hardware");
@@ -336,12 +337,6 @@ GCFEvent::TResult ACMProxy::receiving(GCFEvent& e, GCFPortInterface& port)
RSPSubxcstatsEvent subxc;
subxc.timestamp = m_starttime + (long)1; // wait 1 second to get result
- subxc.rcumask.reset();
-
- LOG_DEBUG_STR("nRCU's=" << m_accs.getBack().getNAntennas() * m_accs.getBack().getNPol());
- for (int i = 0; i < m_accs.getBack().getNAntennas() * m_accs.getBack().getNPol(); i++) {
- subxc.rcumask.set(i);
- }
subxc.period = 1;
m_rspdriver.send(subxc);
diff --git a/MAC/APL/PAC/CalServer/src/ACMProxy.h b/MAC/APL/PAC/CalServer/src/ACMProxy.h
index 6aa88c1b9c8..07a74ff7ac3 100644
--- a/MAC/APL/PAC/CalServer/src/ACMProxy.h
+++ b/MAC/APL/PAC/CalServer/src/ACMProxy.h
@@ -81,6 +81,7 @@ namespace LOFAR {
int m_request_subband; // current index for request subband
int m_update_subband; // current index for update subband
int m_nrcus; // the number of RCU's in the station (as reported by the RSPDriver)
+ int m_nrspboards; // the number of RSP boards in the station (as reported by the RSPDriver)
};
}; // namespace CAL
--
GitLab