fix: adjust toymodel to work with the expanded array_ids

qdev-dk-archive · May 26, 2016 · e3ebe20 · e3ebe20
1 parent ae5315e
commit e3ebe20
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/docs/examples/toymodel.py b/docs/examples/toymodel.py
@@ -120,7 +120,11 @@ def __init__(self, measured_param, sweep_values, delay):
     def get(self):
         loop = Loop(self.sweep_values, self.delay).each(self.measured_param)
         data = loop.run_temp()
-        return data.arrays[self.measured_param.name].mean()
+        if self.measured_param._instrument.name is not None:
+            inst = self.measured_param._instrument.name + '_'
+        else:
+            inst = ''
+        return data.arrays[inst+self.measured_param.name].mean()
 
 
 class AverageAndRaw(Parameter):
@@ -141,5 +145,9 @@ def __init__(self, measured_param, sweep_values, delay):
     def get(self):
         loop = Loop(self.sweep_values, self.delay).each(self.measured_param)
         data = loop.run_temp()
-        array = data.arrays[self.measured_param.name]
+        if self.measured_param._instrument.name is not None:
+            inst = self.measured_param._instrument.name + '_'
+        else:
+            inst = ''
+        array = data.arrays[inst+self.measured_param.name]
         return (array, array.mean())