QuLab 2.0.8__cp311-cp311-macosx_10_9_universal2.whl → 2.0.9__cp311-cp311-macosx_10_9_universal2.whl

{QuLab-2.0.8.dist-info → QuLab-2.0.9.dist-info}/METADATA

@@ -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.dist-info → QuLab-2.0.9.dist-info}/RECORD

@@ -1,7 +1,7 @@
 qulab/__init__.py,sha256=8zLGg-DfQhnDl2Ky0n-zXpN-8e-g7iR0AcaI4l4Vvpk,32
 qulab/__main__.py,sha256=eupSsrNVfnTFRpjgrY_knPvZIs0-Dk577LaN7qB15hI,487
-qulab/fun.cpython-311-darwin.so,sha256=ViKY32QAxiRA0YikENlCASKoPT3irUXG4sUs8UGbRHk,159616
-qulab/version.py,sha256=DfI-RPnMF5c2VXIHTsOnE09mUWlPr23ZlXLyX4lCZxY,21
+qulab/fun.cpython-311-darwin.so,sha256=7hiuuqL-uKl1Bp5o4urKyawPF1NtVXIpBVAg4Jf4i3w,159616
+qulab/version.py,sha256=KmRUsw1os9zycj-k3YLWzgxp2vob6KBciPMbxED0Lqk,21
 qulab/monitor/__init__.py,sha256=nTHelnDpxRS_fl_B38TsN0njgq8eVTEz9IAnN3NbDlM,42
 qulab/monitor/__main__.py,sha256=w3yUcqq195LzSnXTkQcuC1RSFRhy4oQ_PEBmucXguME,97
 qulab/monitor/config.py,sha256=fQ5JcsMApKc1UwANEnIvbDQZl8uYW0tle92SaYtX9lI,744
@@ -18,8 +18,8 @@ qulab/scan/expression.py,sha256=-aTYbjFQNI1mwOcoSBztqhKfGJpu_n4a1QnWro_xnTU,1569
 qulab/scan/models.py,sha256=S8Q9hC8nOzxyoNB10EYg-miDKqoNMnjyAECjD-TuORw,17117
 qulab/scan/optimize.py,sha256=vErjRTCtn2MwMF5Xyhs1P4gHF2IFHv_EqxsUvH_4y7k,2287
 qulab/scan/query_record.py,sha256=BVkNgv3yfbMXX_Kguq18fvowKOBmBiiTvUwj_CqpiF4,11493
-qulab/scan/recorder.py,sha256=0GXayspGWs-qFs5PZz25aMwTrl9Y0P-me0QDNmBQTeQ,22163
-qulab/scan/scan.py,sha256=FGqzU6mmbp2uE792HitG8ZBREE9gGVNz1nbp1AoBHQA,28418
+qulab/scan/recorder.py,sha256=uovxS752kCAJYK3PF3abP57kyZyVUS2jWBTVgs4zPzM,22532
+qulab/scan/scan.py,sha256=Te5PgJDAdbgaGVXOLOdTMzuGGUp-VzPW_9_z9hj52lQ,28438
 qulab/scan/server.py,sha256=W8z3vr0cqSSKWzIG6_b0d-lpBpDXGpHSwN6VJuv3w9U,2844
 qulab/scan/utils.py,sha256=n5yquKlz2QYMzciPgD9vkpBJVgzVzOqAlfvB4Qu6oOk,2551
 qulab/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -77,9 +77,9 @@ qulab/visualization/plot_layout.py,sha256=clNw9QjE_kVNpIIx2Ob4YhAz2fucPGMuzkoIrO
 qulab/visualization/plot_seq.py,sha256=lphYF4VhkEdc_wWr1kFBwrx2yujkyFPFaJ3pjr61awI,2693
 qulab/visualization/qdat.py,sha256=ZeevBYWkzbww4xZnsjHhw7wRorJCBzbG0iEu-XQB4EA,5735
 qulab/visualization/widgets.py,sha256=6KkiTyQ8J-ei70LbPQZAK35wjktY47w2IveOa682ftA,3180
-QuLab-2.0.8.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-QuLab-2.0.8.dist-info/METADATA,sha256=9WjXsA882EnQ23zQUzm6nl4KOsv7EOvI1S5DjzDlHW8,3510
-QuLab-2.0.8.dist-info/WHEEL,sha256=eupBwbXGAhwNAPJSvj5BiShZwdZO8jnQ5yHfv-9aUGw,115
-QuLab-2.0.8.dist-info/entry_points.txt,sha256=ohBzutEnQimP_BZWiuXdSliu4QAYSHHcN0PZD8c7ZCY,46
-QuLab-2.0.8.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-QuLab-2.0.8.dist-info/RECORD,,
+QuLab-2.0.9.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+QuLab-2.0.9.dist-info/METADATA,sha256=NeeeZDjT_WmdUgOo03cVKLo23y1BOjfhB4GO_eji-UY,3510
+QuLab-2.0.9.dist-info/WHEEL,sha256=eupBwbXGAhwNAPJSvj5BiShZwdZO8jnQ5yHfv-9aUGw,115
+QuLab-2.0.9.dist-info/entry_points.txt,sha256=ohBzutEnQimP_BZWiuXdSliu4QAYSHHcN0PZD8c7ZCY,46
+QuLab-2.0.9.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.0.9.dist-info/RECORD,,

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/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/version.py

@@ -1 +1 @@
-__version__ = "2.0.8"
+__version__ = "2.0.9"