Skip to content
Snippets Groups Projects
Commit e7443489 authored by Jan David Mol's avatar Jan David Mol
Browse files

Task #8264: Remove superfluous check for 4-bit mode in BandPassCorrection...

Task #8264: Remove superfluous check for 4-bit mode in BandPassCorrection (station data is not even used in that kernel)
parent b0d7cb92
No related branches found
No related tags found
No related merge requests found
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
* - @c NR_CHANNELS_1: a multiple of 16 * - @c NR_CHANNELS_1: a multiple of 16
* - @c NR_CHANNELS_2: > 0 * - @c NR_CHANNELS_2: > 0
* - @c NR_SAMPLES_PER_CHANNEL: > a multiple of 16 * - @c NR_SAMPLES_PER_CHANNEL: > a multiple of 16
* - @c NR_BITS_PER_SAMPLE: 8 or 16
* - @c DO_BANDPASS_CORRECTION: if defined, perform bandpass correction * - @c DO_BANDPASS_CORRECTION: if defined, perform bandpass correction
*/ */
...@@ -59,11 +58,6 @@ ...@@ -59,11 +58,6 @@
#error Precondition violated: NR_SAMPLES_PER_CHANNEL > 0 #error Precondition violated: NR_SAMPLES_PER_CHANNEL > 0
#endif #endif
#if !(NR_BITS_PER_SAMPLE == 16 || NR_BITS_PER_SAMPLE == 8)
#error Precondition violated: NR_BITS_PER_SAMPLE == 16 || NR_BITS_PER_SAMPLE == 8
#endif
typedef fcomplex (* OutputDataType)[NR_STATIONS][NR_CHANNELS_1 * NR_CHANNELS_2][NR_SAMPLES_PER_CHANNEL][NR_POLARIZATIONS]; typedef fcomplex (* OutputDataType)[NR_STATIONS][NR_CHANNELS_1 * NR_CHANNELS_2][NR_SAMPLES_PER_CHANNEL][NR_POLARIZATIONS];
typedef fcomplex (* InputDataType)[NR_STATIONS][NR_POLARIZATIONS][NR_CHANNELS_1][NR_SAMPLES_PER_CHANNEL][NR_CHANNELS_2]; typedef fcomplex (* InputDataType)[NR_STATIONS][NR_POLARIZATIONS][NR_CHANNELS_1][NR_SAMPLES_PER_CHANNEL][NR_CHANNELS_2];
typedef const float (* BandPassFactorsType)[NR_CHANNELS_1 * NR_CHANNELS_2]; typedef const float (* BandPassFactorsType)[NR_CHANNELS_1 * NR_CHANNELS_2];
......
...@@ -47,7 +47,6 @@ namespace LOFAR ...@@ -47,7 +47,6 @@ namespace LOFAR
BandPassCorrectionKernel::Parameters::Parameters(const Parset& ps) : BandPassCorrectionKernel::Parameters::Parameters(const Parset& ps) :
Kernel::Parameters("bandpassCorrection"), Kernel::Parameters("bandpassCorrection"),
nrStations(ps.settings.antennaFields.size()), nrStations(ps.settings.antennaFields.size()),
nrBitsPerSample(ps.settings.nrBitsPerSample),
nrDelayCompensationChannels(ps.settings.beamFormer.nrDelayCompensationChannels), nrDelayCompensationChannels(ps.settings.beamFormer.nrDelayCompensationChannels),
nrHighResolutionChannels(ps.settings.beamFormer.nrHighResolutionChannels), nrHighResolutionChannels(ps.settings.beamFormer.nrHighResolutionChannels),
...@@ -127,8 +126,6 @@ namespace LOFAR ...@@ -127,8 +126,6 @@ namespace LOFAR
KernelFactoryBase::compileDefinitions(itsParameters); KernelFactoryBase::compileDefinitions(itsParameters);
defs["NR_STATIONS"] = lexical_cast<string>(itsParameters.nrStations); defs["NR_STATIONS"] = lexical_cast<string>(itsParameters.nrStations);
defs["NR_BITS_PER_SAMPLE"] =
lexical_cast<string>(itsParameters.nrBitsPerSample);
defs["NR_CHANNELS_1"] = defs["NR_CHANNELS_1"] =
lexical_cast<string>(itsParameters.nrDelayCompensationChannels); lexical_cast<string>(itsParameters.nrDelayCompensationChannels);
......
...@@ -51,7 +51,6 @@ namespace LOFAR ...@@ -51,7 +51,6 @@ namespace LOFAR
{ {
Parameters(const Parset& ps); Parameters(const Parset& ps);
unsigned nrStations; unsigned nrStations;
unsigned nrBitsPerSample;
unsigned nrDelayCompensationChannels; unsigned nrDelayCompensationChannels;
unsigned nrHighResolutionChannels; unsigned nrHighResolutionChannels;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment