From ccbc2ebc53134fc0b1e413cb84de4d1292fb7182 Mon Sep 17 00:00:00 2001 From: Chris Broekema <broekema@astron.nl> Date: Wed, 9 Mar 2005 14:03:28 +0000 Subject: [PATCH] %[ER: 242]% make the correct number of input DHs --- CEP/Demo/StationCorrelator/src/WH_Transpose.cc | 9 +++++++-- CEP/Demo/StationCorrelator/src/WH_Transpose.h | 5 ++--- Demo/CEP/StationCorrelator/src/WH_Transpose.cc | 9 +++++++-- Demo/CEP/StationCorrelator/src/WH_Transpose.h | 5 ++--- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/CEP/Demo/StationCorrelator/src/WH_Transpose.cc b/CEP/Demo/StationCorrelator/src/WH_Transpose.cc index 2a1a52d4f1e..074e7829930 100644 --- a/CEP/Demo/StationCorrelator/src/WH_Transpose.cc +++ b/CEP/Demo/StationCorrelator/src/WH_Transpose.cc @@ -30,7 +30,7 @@ using namespace LOFAR; WH_Transpose::WH_Transpose(const string& name, - const KeyValueMap kvm) + KeyValueMap kvm) : WorkHolder(kvm.getInt("NoWH_Correlator",7), 1, name, "WH_Transpose"), itsKVM (kvm) { @@ -41,6 +41,11 @@ WH_Transpose::WH_Transpose(const string& name, int channels = itsKVM.getInt("channels", 46); int polarisations = itsKVM.getInt("polarisations", 2); + itsKVM.show(cout); + + itsNinputs = itsKVM.getInt("noWH_Correlator", 7); + itsNoutputs = 1; // there is one connection to the corresponding WH_Correlator + for (int i = 0; i < itsNinputs; i++) { // getDataManager().addInDataHolder(i, new DH_StationData()); } @@ -57,7 +62,7 @@ WH_Transpose::WH_Transpose(const string& name, WH_Transpose::~WH_Transpose() { } -WorkHolder* WH_Transpose::construct(const string& name,KeyValueMap kvm) { +WorkHolder* WH_Transpose::construct(const string& name, KeyValueMap kvm) { return new WH_Transpose(name, kvm); } diff --git a/CEP/Demo/StationCorrelator/src/WH_Transpose.h b/CEP/Demo/StationCorrelator/src/WH_Transpose.h index 7a296b6a963..afef9332095 100644 --- a/CEP/Demo/StationCorrelator/src/WH_Transpose.h +++ b/CEP/Demo/StationCorrelator/src/WH_Transpose.h @@ -38,10 +38,9 @@ namespace LOFAR { public: - explicit WH_Transpose(const string& name, const KeyValueMap kvm); + explicit WH_Transpose(const string& name, KeyValueMap kvm); virtual ~WH_Transpose(); - static WorkHolder* construct(const string& name, - const KeyValueMap kvm); + static WorkHolder* construct(const string& name, KeyValueMap kvm); virtual WH_Transpose* make(const string& name); virtual void process(); diff --git a/Demo/CEP/StationCorrelator/src/WH_Transpose.cc b/Demo/CEP/StationCorrelator/src/WH_Transpose.cc index 2a1a52d4f1e..074e7829930 100644 --- a/Demo/CEP/StationCorrelator/src/WH_Transpose.cc +++ b/Demo/CEP/StationCorrelator/src/WH_Transpose.cc @@ -30,7 +30,7 @@ using namespace LOFAR; WH_Transpose::WH_Transpose(const string& name, - const KeyValueMap kvm) + KeyValueMap kvm) : WorkHolder(kvm.getInt("NoWH_Correlator",7), 1, name, "WH_Transpose"), itsKVM (kvm) { @@ -41,6 +41,11 @@ WH_Transpose::WH_Transpose(const string& name, int channels = itsKVM.getInt("channels", 46); int polarisations = itsKVM.getInt("polarisations", 2); + itsKVM.show(cout); + + itsNinputs = itsKVM.getInt("noWH_Correlator", 7); + itsNoutputs = 1; // there is one connection to the corresponding WH_Correlator + for (int i = 0; i < itsNinputs; i++) { // getDataManager().addInDataHolder(i, new DH_StationData()); } @@ -57,7 +62,7 @@ WH_Transpose::WH_Transpose(const string& name, WH_Transpose::~WH_Transpose() { } -WorkHolder* WH_Transpose::construct(const string& name,KeyValueMap kvm) { +WorkHolder* WH_Transpose::construct(const string& name, KeyValueMap kvm) { return new WH_Transpose(name, kvm); } diff --git a/Demo/CEP/StationCorrelator/src/WH_Transpose.h b/Demo/CEP/StationCorrelator/src/WH_Transpose.h index 7a296b6a963..afef9332095 100644 --- a/Demo/CEP/StationCorrelator/src/WH_Transpose.h +++ b/Demo/CEP/StationCorrelator/src/WH_Transpose.h @@ -38,10 +38,9 @@ namespace LOFAR { public: - explicit WH_Transpose(const string& name, const KeyValueMap kvm); + explicit WH_Transpose(const string& name, KeyValueMap kvm); virtual ~WH_Transpose(); - static WorkHolder* construct(const string& name, - const KeyValueMap kvm); + static WorkHolder* construct(const string& name, KeyValueMap kvm); virtual WH_Transpose* make(const string& name); virtual void process(); -- GitLab