diff --git a/dstat_interface/experiments/cv.py b/dstat_interface/experiments/cv.py index fbeda5653354d01592b20cf5ca4bba310a81d527..c679603f184787ef687561468cbc38c37c73d300 100644 --- a/dstat_interface/experiments/cv.py +++ b/dstat_interface/experiments/cv.py @@ -13,10 +13,9 @@ class CVExp(Experiment): self.ylabel = "Current (A)" self.datalength = 2 * self.parameters['scans'] # x and y for each scan self.databytes = 6 # uint16 + int32 - self.plot_format['current_voltage']['xlims'] = ( - int(self.parameters['v1']), - int(self.parameters['v2']) - ) + self.plot_format['current_voltage']['xlims'] = tuple( + sorted((int(self.parameters['v1']), int(self.parameters['v2']))) + ) self.commands += "E" self.commands[2] += "C" diff --git a/dstat_interface/experiments/lsv.py b/dstat_interface/experiments/lsv.py index 9042a5e4c01fea7eaed4d595ede6f31fe89594fd..e4c7e47ae47c0c92425f2173abd822ed183178a4 100644 --- a/dstat_interface/experiments/lsv.py +++ b/dstat_interface/experiments/lsv.py @@ -12,10 +12,12 @@ class LSVExp(Experiment): self.datatype = "linearData" self.datalength = 2 self.databytes = 6 # uint16 + int32 - self.plot_format['current_voltage']['xlims'] = ( - int(self.parameters['start']), - int(self.parameters['stop']) - ) + self.plot_format['current_voltage']['xlims'] = tuple( + sorted( + (int(self.parameters['start']), + int(self.parameters['stop'])) + ) + ) self.commands += "E" self.commands[2] += "L" diff --git a/dstat_interface/experiments/swv.py b/dstat_interface/experiments/swv.py index 2f3ba803da10e61f15078946485867b641081547..91f2ea75e047fa9f619fad28cacba4d7b17dbd69 100644 --- a/dstat_interface/experiments/swv.py +++ b/dstat_interface/experiments/swv.py @@ -38,11 +38,14 @@ class SWVExp(Experiment): 'swv' : {'labels' : ('Voltage (mV)', 'Current (A)' ), - 'xlims' : (int(self.parameters['start']), - int(self.parameters['stop'])) + 'xlims' : tuple(sorted( + (int(self.parameters['start']), + int(self.parameters['stop'])) + ) + ) } } - + self.commands += "E" self.commands[2] += "S" self.commands[2] += str(self.parameters['clean_s']) @@ -116,8 +119,11 @@ class DPVExp(SWVExp): 'swv' : {'labels' : ('Voltage (mV)', 'Current (A)' ), - 'xlims' : (int(self.parameters['start']), - int(self.parameters['stop'])) + 'xlims' : tuple(sorted( + (int(self.parameters['start']), + int(self.parameters['stop'])) + ) + ) } }