From 1ea33abfa57ef86c8edc3b1f70bc650b373326e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=BCrges?= <jurges@astron.nl>
Date: Tue, 29 Jan 2019 17:10:10 +0100
Subject: [PATCH] SW-546: Change the TBB data set template to std::complex<
int16_ t >
---
dal/hdf5/Dataset.i | 1 +
dal/lofar/TBB_File.cc | 4 ++--
dal/lofar/TBB_File.h | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/dal/hdf5/Dataset.i b/dal/hdf5/Dataset.i
index 78fd44a..9eb9b60 100644
--- a/dal/hdf5/Dataset.i
+++ b/dal/hdf5/Dataset.i
@@ -79,6 +79,7 @@ DATASETTYPE(std::complex<float>, NPY_CFLOAT, size_t);
}
namespace dal {
+ %template(DatasetComplexShort) Dataset< std::complex < int16_t > >;
%template(DatasetShort) Dataset<short>;
%template(DatasetFloat) Dataset<float>;
%template(DatasetComplexFloat) Dataset< std::complex<float> >;
diff --git a/dal/lofar/TBB_File.cc b/dal/lofar/TBB_File.cc
index 1c38b76..dc33778 100644
--- a/dal/lofar/TBB_File.cc
+++ b/dal/lofar/TBB_File.cc
@@ -749,12 +749,12 @@ Attribute<string> TBB_DipoleDataset::dispersionMeasureUnit()
TBB_SubbandDataset::TBB_SubbandDataset( Group &parent, const std::string &name )
:
- Dataset<short>(parent, name)
+ Dataset< std::complex< int16_t > >(parent, name)
{
}
void TBB_SubbandDataset::initNodes() {
- Dataset<short>::initNodes();
+ Dataset< std::complex< int16_t > >::initNodes();
addNode( new Attribute<unsigned>(*this, "TIME") );
addNode( new Attribute<double>(*this, "CENTRAL_FREQUENCY") );
addNode( new Attribute<string>(*this, "CENTRAL_FREQUENCY_UNIT") );
diff --git a/dal/lofar/TBB_File.h b/dal/lofar/TBB_File.h
index a60494d..ab0f524 100644
--- a/dal/lofar/TBB_File.h
+++ b/dal/lofar/TBB_File.h
@@ -20,6 +20,7 @@
#include <string>
#include <vector>
#include <complex>
+#include <stdint.h>
#include <hdf5.h>
#include "CLA_File.h"
#include "Flagging.h"
@@ -274,7 +275,7 @@ protected:
virtual void initNodes();
};
-class TBB_SubbandDataset: public Dataset<short> {
+class TBB_SubbandDataset: public Dataset<std::complex < int16_t > > {
public:
TBB_SubbandDataset( Group &parent, const std::string &name );
--
GitLab