From db90a36ee9ca86a9e9d287aa26106f92e746c5c1 Mon Sep 17 00:00:00 2001 From: zwart <sdos@astron.nl> Date: Wed, 10 May 2006 14:51:44 +0000 Subject: [PATCH] BugID: 719 Use the right key for SubbandsPerCell --- Appl/CEP/CS1/CS1_InputSection/src/AH_InputSection.cc | 6 +++--- Appl/CEP/CS1/CS1_InputSection/src/WH_RSPInput.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Appl/CEP/CS1/CS1_InputSection/src/AH_InputSection.cc b/Appl/CEP/CS1/CS1_InputSection/src/AH_InputSection.cc index 9312113f521..d71d452e63c 100644 --- a/Appl/CEP/CS1/CS1_InputSection/src/AH_InputSection.cc +++ b/Appl/CEP/CS1/CS1_InputSection/src/AH_InputSection.cc @@ -108,7 +108,7 @@ namespace LOFAR { comp.addBlock(RSPSteps[r]); // Connect the Delay Controller - itsInputStub->connect(r, (RSPSteps.back())->getInDataManager(0), 0); + //itsInputStub->connect(r, (RSPSteps.back())->getInDataManager(0), 0); } LOG_TRACE_FLOW_STR("Create output side interface stubs"); @@ -131,15 +131,15 @@ namespace LOFAR { } } // connect outputs to FIR stub +#if 0 for (int core = 0; core < nNodesPerCell; core++) { -#if 1 //collectSteps.back()->getOutDataManager(0).setOutBuffer(core, false, 10); itsOutputStub->connect(cell, core, (collectSteps.back())->getOutDataManager(0), core); -#endif } +#endif } LOG_TRACE_FLOW_STR("Finished define()"); diff --git a/Appl/CEP/CS1/CS1_InputSection/src/WH_RSPInput.cc b/Appl/CEP/CS1/CS1_InputSection/src/WH_RSPInput.cc index 34577c6816a..a90955f9df2 100644 --- a/Appl/CEP/CS1/CS1_InputSection/src/WH_RSPInput.cc +++ b/Appl/CEP/CS1/CS1_InputSection/src/WH_RSPInput.cc @@ -44,7 +44,7 @@ namespace LOFAR { ACC::APS::ParameterSet& ps, TransportHolder& th) : WorkHolder (1, - ps.getInt32("Observation.NSubbands") * ps.getInt32("Observation.NStations") / (ps.getInt32("Input.NRSPBoards") * ps.getInt32("General.NSubbandsPerCell")), + ps.getInt32("Observation.NSubbands") * ps.getInt32("Observation.NStations") / (ps.getInt32("Input.NRSPBoards") * ps.getInt32("General.SubbandsPerCell")), name, "WH_RSPInput"), itsTH(th), -- GitLab