From 601b72ccfb73bdc7f2f900ea7436ad286048a70f Mon Sep 17 00:00:00 2001 From: damazdejong Date: Mon, 13 Mar 2017 17:10:52 +0100 Subject: [PATCH] Fixes to AMI430 driver change all string comparisons to int comparisons --- qcodes/instrument_drivers/american_magnetics/AMI430.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qcodes/instrument_drivers/american_magnetics/AMI430.py b/qcodes/instrument_drivers/american_magnetics/AMI430.py index 23808df2441c..6ff573e23d42 100644 --- a/qcodes/instrument_drivers/american_magnetics/AMI430.py +++ b/qcodes/instrument_drivers/american_magnetics/AMI430.py @@ -55,11 +55,11 @@ def __init__(self, name, address, port, coil_constant, current_rating, self._field_ramp_limit = coil_constant * current_ramp_limit # Make sure the ramp rate time unit is seconds - if self.ask('RAMP:RATE:UNITS?') == '1': + if int(self.ask('RAMP:RATE:UNITS?')) == 1: self.write('CONF:RAMP:RATE:UNITS 0') # Make sure the field unit is Tesla - if self.ask('FIELD:UNITS?') == '0': + if int(self.ask('FIELD:UNITS?')) == 0: self.write('CONF:FIELD:UNITS 1') self.add_parameter('field', @@ -90,15 +90,15 @@ def __init__(self, name, address, port, coil_constant, current_rating, self.add_parameter('switch_heater_enabled', get_cmd='PS?', set_cmd=self._set_persistent_switch, - val_mapping={False: '0', True: '1'}) + val_mapping={False: 0, True: 1}) self.add_parameter('in_persistent_mode', get_cmd='PERS?', - val_mapping={False: '0', True: '1'}) + val_mapping={False: 0, True: 1}) self.add_parameter('is_quenched', get_cmd='QU?', - val_mapping={False: '0', True: '1'}) + val_mapping={False: 0, True: 1}) self.add_function('reset_quench', call_cmd='QU 0') self.add_function('set_quenched', call_cmd='QU 1')