fix(measurement): fixed sparse experiment to use scan naming convention rather than loop.

Author: rsbrost

pyscan/measurement/sparse_experiment.py

@@ -6,18 +6,18 @@
 
 
 class SparseExperiment(AbstractExperiment):
-    '''Experiment class that takes data after each loop0 iteration if
+    '''Experiment class that takes data after each scan0 iteration if
     runinfo.sparse_points[self.runinfo.indicies] = 1, allowing the experiment
     to skip taking data points. Inherits from :class:`pyscan.measurement.abstract_experiment.AbstractExperiment`.
 
     Parameters
     ----------
     runinfo: :class:`pyscan.measurement.runinfo.Runinfo`
-        Runinfo instance. The Runinfo loop containing the dependent variable
+        Runinfo instance. The Runinfo scan containing the dependent variable
         that you want to average should be an instance of
         :class:`AverageScan<pyscan.measurement.scans.AverageScan>`.
         There should be only one dependent variable to be averaged.
-        The loops representing independent variables can be instances of
+        The scans representing independent variables can be instances of
         :class:`PropertyScan<pyscan.measurement.scans.PropertyScan>`.
     devices :
         ItemAttribute instance containing all experiment devices
@@ -47,29 +47,29 @@ def run(self):
 
         self.runinfo.running = True
 
-        # Use for loop, but break if self.runinfo.running=False
-        for m in range(self.runinfo.loop3.n):
-            self.runinfo.loop3.i = m
-            self.runinfo.loop3.iterate(m, self.devices)
-            sleep(self.runinfo.loop3.dt)
+        # Use for scan, but break if self.runinfo.running=False
+        for m in range(self.runinfo.scan3.n):
+            self.runinfo.scan3.i = m
+            self.runinfo.scan3.iterate(m, self.devices)
+            sleep(self.runinfo.scan3.dt)
 
-            for k in range(self.runinfo.loop2.n):
-                self.runinfo.loop2.i = k
-                self.runinfo.loop2.iterate(k, self.devices)
-                sleep(self.runinfo.loop2.dt)
+            for k in range(self.runinfo.scan2.n):
+                self.runinfo.scan2.i = k
+                self.runinfo.scan2.iterate(k, self.devices)
+                sleep(self.runinfo.scan2.dt)
 
-                for j in range(self.runinfo.loop1.n):
-                    self.runinfo.loop1.i = j
-                    self.runinfo.loop1.iterate(j, self.devices)
-                    sleep(self.runinfo.loop1.dt)
+                for j in range(self.runinfo.scan1.n):
+                    self.runinfo.scan1.i = j
+                    self.runinfo.scan1.iterate(j, self.devices)
+                    sleep(self.runinfo.scan1.dt)
 
-                    for i in range(self.runinfo.loop0.n):
-                        self.runinfo.loop0.i = i
+                    for i in range(self.runinfo.scan0.n):
+                        self.runinfo.scan0.i = i
                         sample = self.runinfo.sparse_points[self.runinfo.indicies]
 
                         if (sample) or (np.all(np.array(self.runinfo.indicies) == 0)):
-                            self.runinfo.loop0.iterate(i, self.devices)
-                            sleep(self.runinfo.loop0.dt)
+                            self.runinfo.scan0.iterate(i, self.devices)
+                            sleep(self.runinfo.scan0.dt)
 
                             data = self.runinfo.measure_function(self)
                             if np.all(np.array(self.runinfo.indicies) == 0):
@@ -100,7 +100,7 @@ def run(self):
                     break
 
             if self.runinfo.verbose:
-                print('Scan {}/{} Complete'.format(m + 1, self.runinfo.loop3.n))
+                print('Scan {}/{} Complete'.format(m + 1, self.runinfo.scan3.n))
             if self.runinfo.running is False:
                 self.runinfo.complete = 'stopped'
                 break