From b98b74f0be667e187d257fd3e69d1fc15c5ac970 Mon Sep 17 00:00:00 2001 From: Marc Bonnici Date: Wed, 26 Jul 2017 14:37:05 +0100 Subject: [PATCH] EnergyMeasurement: Removes parameter defaults The instrument baseclass expects None for not defined parameters instead of empty containers. --- wa/instrumentation/energy_measurement.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wa/instrumentation/energy_measurement.py b/wa/instrumentation/energy_measurement.py index 5c63b7b2..e2246100 100644 --- a/wa/instrumentation/energy_measurement.py +++ b/wa/instrumentation/energy_measurement.py @@ -161,19 +161,19 @@ class EnergyMeasurement(Instrument): Specify the parameters used to initialize the desired instrumentation. """), - Parameter('sites', kind=list_or_string, default=[], + Parameter('sites', kind=list_or_string, description=""" Specify which sites measurements should be collected from, if not specified the measurements will be collected for all available sites. """), - Parameter('kinds', kind=list_or_string, default=[], + Parameter('kinds', kind=list_or_string, description=""" Specify the kinds of measurements should be collected, if not specified measurements will be collected for all available kinds. """), - Parameter('channels', kind=list_or_string, default=[], + Parameter('channels', kind=list_or_string, description=""" Specify the channels to be collected, if not specified the measurements will be @@ -204,7 +204,7 @@ class EnergyMeasurement(Instrument): def initialize(self, context): self.instrumentation = self.backend.instrument(self.target, **self.params) - for channel in self.channels: + for channel in self.channels or []: if not self.instrumentation.get_channels(channel): raise ConfigError('No channels found for "{}"'.format(channel))