From 9113e2bac955a5cf3757f7e2d82d2e67d58e9b8f Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Thu, 28 Sep 2017 14:48:57 +0200 Subject: [PATCH 1/2] Dont assume that unit attribute exists --- qcodes/plots/pyqtgraph.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qcodes/plots/pyqtgraph.py b/qcodes/plots/pyqtgraph.py index bfd4c2000722..8c86a6954c15 100644 --- a/qcodes/plots/pyqtgraph.py +++ b/qcodes/plots/pyqtgraph.py @@ -527,8 +527,8 @@ def fixUnitScaling(self, startranges: Optional[Dict[str, Dict[str, Union[float,i # make a dict mapping axis labels to axis positions for axis in ('x', 'y', 'z'): if self.traces[i]['config'].get(axis): - unit = self.traces[i]['config'][axis].unit - if unit not in standardunits: + unit = getattr(self.traces[i]['config'][axis], 'unit', None) + if unit is not None and unit not in standardunits: if axis in ('x', 'y'): ax = plot.getAxis(axismapping[axis]) else: From d0c044bafe895ac8a7af7474911d20cb2ee08494 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Thu, 28 Sep 2017 16:51:45 +0200 Subject: [PATCH 2/2] Dont assume that full_name or nd_array exist either --- qcodes/plots/pyqtgraph.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qcodes/plots/pyqtgraph.py b/qcodes/plots/pyqtgraph.py index 8c86a6954c15..1c54e75fe60e 100644 --- a/qcodes/plots/pyqtgraph.py +++ b/qcodes/plots/pyqtgraph.py @@ -546,10 +546,10 @@ def fixUnitScaling(self, startranges: Optional[Dict[str, Dict[str, Union[float,i ax.update() # set limits either from dataset or - setarr = self.traces[i]['config'][axis].ndarray + setarr = getattr(self.traces[i]['config'][axis], 'ndarray', None) arrmin = None arrmax = None - if not np.all(np.isnan(setarr)): + if setarr and not np.all(np.isnan(setarr)): arrmax = setarr.max() arrmin = setarr.min() elif startranges is not None: @@ -557,7 +557,7 @@ def fixUnitScaling(self, startranges: Optional[Dict[str, Dict[str, Union[float,i paramname = self.traces[i]['config'][axis].full_name arrmax = startranges[paramname]['max'] arrmin = startranges[paramname]['min'] - except (IndexError, KeyError): + except (IndexError, KeyError, AttributeError): continue if axis == 'x':