added a workaround for py3 zip returning iterator

This commit is contained in:
2020-05-06 17:06:13 +00:00
parent 43a930912d
commit 01d4986e96
+11 -6
View File
@@ -41,7 +41,7 @@ class Scanner:
adjustables = [adjustable]
positions = make_positions(start_pos, end_pos, n_intervals)
positions = zip(positions)
positions = transpose(positions)
return self.make_scan(adjustables, positions, *args, **kwargs)
@@ -51,7 +51,7 @@ class Scanner:
positions0 = make_positions(start0_pos, end0_pos, n_intervals)
positions1 = make_positions(start1_pos, end1_pos, n_intervals)
positions = zip(positions0, positions1)
positions = transpose(positions0, positions1)
return self.make_scan(adjustables, positions, *args, **kwargs)
@@ -61,7 +61,7 @@ class Scanner:
positions = make_positions(start_pos, end_pos, n_intervals)
positions += adjustable.get_current_value()
positions = zip(positions)
positions = transpose(positions)
return self.make_scan(adjustables, positions, *args, **kwargs)
@@ -69,7 +69,7 @@ class Scanner:
def ascan_list(self, adjustable, positions, *args, **kwargs):
adjustables = [adjustable]
positions = zip(positions)
positions = transpose(positions)
return self.make_scan(adjustables, positions, *args, **kwargs)
@@ -77,7 +77,7 @@ class Scanner:
def a2scan_list(self, adjustable0, positions0, adjustable1, positions1, *args, **kwargs):
adjustables = [adjustable0, adjustable1]
positions = zip(positions0, positions1)
positions = transpose(positions0, positions1)
return self.make_scan(adjustables, positions, *args, **kwargs)
@@ -87,7 +87,7 @@ class Scanner:
adjustables = [adjustable]
positions = range(n_intervals)
positions = zip(positions)
positions = transpose(positions)
return self.make_scan(adjustables, positions, *args, **kwargs)
@@ -97,3 +97,8 @@ class Scanner:
def transpose(*args):
return list(zip(*args))