Skip to content
Snippets Groups Projects
Commit 31b42492 authored by wierenga's avatar wierenga
Browse files

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.
parent 6ef01486
No related branches found
No related tags found
No related merge requests found
...@@ -104,6 +104,7 @@ GCFEvent::TResult ACMProxy::initial(GCFEvent& e, GCFPortInterface& port) ...@@ -104,6 +104,7 @@ GCFEvent::TResult ACMProxy::initial(GCFEvent& e, GCFPortInterface& port)
{ {
RSPGetconfigackEvent ack(e); RSPGetconfigackEvent ack(e);
m_nrcus = ack.n_rcus; m_nrcus = ack.n_rcus;
m_nrspboards = ack.n_rspboards;
if (m_nrcus != m_accs.getBack().getNAntennas() * m_accs.getBack().getNPol()) if (m_nrcus != m_accs.getBack().getNAntennas() * m_accs.getBack().getNPol())
{ {
LOG_FATAL("CalServer.N_ANTENNAS does not match value from hardware"); LOG_FATAL("CalServer.N_ANTENNAS does not match value from hardware");
...@@ -336,12 +337,6 @@ GCFEvent::TResult ACMProxy::receiving(GCFEvent& e, GCFPortInterface& port) ...@@ -336,12 +337,6 @@ GCFEvent::TResult ACMProxy::receiving(GCFEvent& e, GCFPortInterface& port)
RSPSubxcstatsEvent subxc; RSPSubxcstatsEvent subxc;
subxc.timestamp = m_starttime + (long)1; // wait 1 second to get result 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; subxc.period = 1;
m_rspdriver.send(subxc); m_rspdriver.send(subxc);
......
...@@ -81,6 +81,7 @@ namespace LOFAR { ...@@ -81,6 +81,7 @@ namespace LOFAR {
int m_request_subband; // current index for request subband int m_request_subband; // current index for request subband
int m_update_subband; // current index for update 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_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 }; // namespace CAL
......
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