diff --git a/CEP/Demo/StationCorrelator/src/WH_Transpose.cc b/CEP/Demo/StationCorrelator/src/WH_Transpose.cc index 2a1a52d4f1e425a3cf439631feb8853d95c157eb..074e78299304f77497ae84bbb71d416fe5436f15 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 7a296b6a963617069f063c471db98e003e872905..afef9332095d344d461b9e2d629040d64b97b684 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 2a1a52d4f1e425a3cf439631feb8853d95c157eb..074e78299304f77497ae84bbb71d416fe5436f15 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 7a296b6a963617069f063c471db98e003e872905..afef9332095d344d461b9e2d629040d64b97b684 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();