QuLab 2.0.8__tar.gz → 2.0.9__tar.gz

{qulab-2.0.8 → qulab-2.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: QuLab
-Version: 2.0.8
+Version: 2.0.9
 Summary: contral instruments and manage data
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>

{qulab-2.0.8 → qulab-2.0.9}/QuLab.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: QuLab
-Version: 2.0.8
+Version: 2.0.9
 Summary: contral instruments and manage data
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>

{qulab-2.0.8 → qulab-2.0.9}/qulab/scan/recorder.py

@@ -216,6 +216,8 @@ class BufferList():
 class Record():
 
     def __init__(self, id, database, description=None):
+        from .scan import OptimizeSpace
+
         self.id = id
         self.database = database
         self.description = description
@@ -236,22 +238,29 @@ class Record():
             self.dims[name] = ()
         for level, range_list in self.description['loops'].items():
             for name, iterable in range_list:
-                if isinstance(iterable, (np.ndarray, list, tuple, range)):
+                if isinstance(iterable, OptimizeSpace):
+                    self.dims[name] = tuple(range(level + 1))
+                    continue
+                elif isinstance(iterable, (np.ndarray, list, tuple, range)):
                     self._items[name] = iterable
                     self.independent_variables[name] = iterable
-                    self.dims[name] = (level, )
+                self.dims[name] = (level, )
 
         for level, group in self.description['order'].items():
             for names in group:
                 for name in names:
-                    if name not in self.dims:
-                        if name not in self.description['dependents']:
+                    if name not in self.description['dependents']:
+                        if name not in self.dims:
                             self.dims[name] = (level, )
-                        else:
-                            d = set()
-                            for n in self.description['dependents'][name]:
-                                d.update(self.dims[n])
+                    else:
+                        d = set()
+                        for n in self.description['dependents'][name]:
+                            d.update(self.dims[n])
+                        if name not in self.dims:
                             self.dims[name] = tuple(sorted(d))
+                        else:
+                            self.dims[name] = tuple(
+                                sorted(set(self.dims[name]) | d))
 
         if self.is_local_record():
             self.database = Path(self.database)

{qulab-2.0.8 → qulab-2.0.9}/qulab/scan/scan.py

@@ -1,4 +1,5 @@
 import asyncio
+import copy
 import datetime
 import inspect
 import itertools
@@ -711,18 +712,18 @@ def assymbly(description):
             except:
                 pass
 
-    dependents = description['dependents'].copy()
+    dependents = copy.deepcopy(description['dependents'])
 
     for level in levels:
         range_list = description['loops'].get(level, [])
         if level > 0:
             if f'#__loop_{level}' not in description['dependents']:
-                dependents[f'#__loop_{level}'] = []
-            dependents[f'#__loop_{level}'].append(f'#__loop_{level-1}')
+                dependents[f'#__loop_{level}'] = set()
+            dependents[f'#__loop_{level}'].add(f'#__loop_{level-1}')
         for name, _ in range_list:
             if name not in description['dependents']:
-                dependents[name] = []
-            dependents[name].append(f'#__loop_{level}')
+                dependents[name] = set()
+            dependents[name].add(f'#__loop_{level}')
 
     def _get_all_depends(key, graph):
         ret = set()

qulab-2.0.9/qulab/version.py

@@ -0,0 +1 @@
+__version__ = "2.0.9"

qulab-2.0.8/qulab/version.py

@@ -1 +0,0 @@
-__version__ = "2.0.8"