From 12a78ce29158a5efe1018a1ce0fb3269d6069e6f Mon Sep 17 00:00:00 2001 From: Per Inge Mathisen Date: Fri, 8 Jul 2016 10:16:47 +0200 Subject: [PATCH] Fix a frequently repeated typo --- wlauto/config_example.py | 6 +++--- wlauto/core/instrumentation.py | 2 +- wlauto/instrumentation/__init__.py | 4 ++-- wlauto/instrumentation/daq/__init__.py | 4 ++-- wlauto/instrumentation/energy_model/__init__.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/wlauto/config_example.py b/wlauto/config_example.py index 82eb31f9..032315ec 100644 --- a/wlauto/config_example.py +++ b/wlauto/config_example.py @@ -189,7 +189,7 @@ logging = { #################################################################################################### #################################### Instruments Configuration ##################################### #################################################################################################### -# Instrumention Configuration is related to specific insturment's settings. Some of the # +# Instrumention Configuration is related to specific instrument's settings. Some of the # # instrumentations require specific settings in order for them to work. These settings are # # specified here. # # Note that these settings only take effect if the corresponding instrument is @@ -222,10 +222,10 @@ logging = { #################################################################################################### ######################################### DAQ configuration ######################################## -# The host address of the machine that runs the daq Server which the insturment communicates with +# The host address of the machine that runs the daq Server which the instrument communicates with #daq_server_host = '10.1.17.56' -# The port number for daq Server in which daq insturment communicates with +# The port number for daq Server in which daq instrument communicates with #daq_server_port = 56788 # The values of resistors 1 and 2 (in Ohms) across which the voltages are measured diff --git a/wlauto/core/instrumentation.py b/wlauto/core/instrumentation.py index 5609f2a8..4aaae09c 100644 --- a/wlauto/core/instrumentation.py +++ b/wlauto/core/instrumentation.py @@ -241,7 +241,7 @@ class ManagedCallback(object): except (KeyboardInterrupt, DeviceNotRespondingError, TimeoutError): # pylint: disable=W0703 raise except Exception as e: # pylint: disable=W0703 - logger.error('Error in insturment {}'.format(self.instrument.name)) + logger.error('Error in instrument {}'.format(self.instrument.name)) global failures_detected # pylint: disable=W0603 failures_detected = True if isinstance(e, WAError): diff --git a/wlauto/instrumentation/__init__.py b/wlauto/instrumentation/__init__.py index 72db181e..ea2510a1 100644 --- a/wlauto/instrumentation/__init__.py +++ b/wlauto/instrumentation/__init__.py @@ -18,14 +18,14 @@ from wlauto.core import instrumentation def instrument_is_installed(instrument): """Returns ``True`` if the specified instrument is installed, and ``False`` - other wise. The insturment maybe specified either as a name or a subclass (or + other wise. The instrument maybe specified either as a name or a subclass (or instance of subclass) of :class:`wlauto.core.Instrument`.""" return instrumentation.is_installed(instrument) def instrument_is_enabled(instrument): """Returns ``True`` if the specified instrument is installed and is currently - enabled, and ``False`` other wise. The insturment maybe specified either + enabled, and ``False`` other wise. The instrument maybe specified either as a name or a subclass (or instance of subclass) of :class:`wlauto.core.Instrument`.""" return instrumentation.is_enabled(instrument) diff --git a/wlauto/instrumentation/daq/__init__.py b/wlauto/instrumentation/daq/__init__.py index 7eb51020..67cfa41c 100644 --- a/wlauto/instrumentation/daq/__init__.py +++ b/wlauto/instrumentation/daq/__init__.py @@ -112,10 +112,10 @@ class Daq(Instrument): Parameter('server_host', kind=str, default='localhost', global_alias='daq_server_host', description='The host address of the machine that runs the daq Server which the ' - 'insturment communicates with.'), + 'instrument communicates with.'), Parameter('server_port', kind=int, default=45677, global_alias='daq_server_port', - description='The port number for daq Server in which daq insturment communicates ' + description='The port number for daq Server in which daq instrument communicates ' 'with.'), Parameter('device_id', kind=str, default='Dev1', global_alias='daq_device_id', diff --git a/wlauto/instrumentation/energy_model/__init__.py b/wlauto/instrumentation/energy_model/__init__.py index e05258b7..904140cf 100644 --- a/wlauto/instrumentation/energy_model/__init__.py +++ b/wlauto/instrumentation/energy_model/__init__.py @@ -348,7 +348,7 @@ class EnergyModelInstrument(Instrument): desicription = """ Generates a power mode for the device based on specified workload. - This insturment will execute the workload specified by the agenda (currently, only ``sysbench`` is + This instrument will execute the workload specified by the agenda (currently, only ``sysbench`` is supported) and will use the resulting performance and power measurments to generate a power mode for the device.