sardana-nxsrecorder 3.32.0__py3-none-any.whl → 3.33.0__py3-none-any.whl

{sardana_nxsrecorder-3.32.0.dist-info → sardana_nxsrecorder-3.33.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sardana-nxsrecorder
-Version: 3.32.0
+Version: 3.33.0
 Summary: NeXus Sardana Scan Recorder
 Home-page: https://github.com/nexdatas/sardana-nxs-filerecorder/
 Author: Jan Kotanski

sardana_nxsrecorder-3.33.0.dist-info/RECORD

@@ -0,0 +1,6 @@
+sardananxsrecorder/__init__.py,sha256=4e2Fl7DUKh8tAn6rUcW2Fq8YwV736mYirt_mgKwkv9Q,896
+sardananxsrecorder/nxsrecorder.py,sha256=4SwxqkaeHMaP_C0GQwZy9rK-YaPPNCNDAQLY3CMZHzY,68478
+sardana_nxsrecorder-3.33.0.dist-info/METADATA,sha256=8H3pLDfI8K9FzblJOV_F7U1IYHZc2irfV8IszGznFHw,8256
+sardana_nxsrecorder-3.33.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+sardana_nxsrecorder-3.33.0.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
+sardana_nxsrecorder-3.33.0.dist-info/RECORD,,

sardananxsrecorder/__init__.py

@@ -20,4 +20,4 @@
 """ Sardana Scan Recorders """
 
 #: package version
-__version__ = "3.32.0"
+__version__ = "3.33.0"

sardananxsrecorder/nxsrecorder.py

@@ -134,6 +134,8 @@ class NXS_FileRecorder(BaseFileRecorder):
 
         #: (:obj:`str`) dynamic components
         self.__dynamicCP = "__dynamic_component__"
+        #: (:obj:`str`) cache component prefix
+        self.__cacheCPPrefix = "__configuration_"
 
         #: (:obj:`dict` <:obj:`str` , `any`> ) environment
         self.__env = macro.getAllEnv() if macro else {}
@@ -832,6 +834,7 @@ class NXS_FileRecorder(BaseFileRecorder):
 
         # (:obj:`list` <:obj:`str`>) all component source names
         allcpdss = []
+        cachedss = []
         cpReq = {}
         keyFound = set()
 
@@ -859,7 +862,7 @@ class NXS_FileRecorder(BaseFileRecorder):
         #                    "componentSources",
         #                    cmps))
         self.debug("__searchDataSources:  component loop: %s"
-                   % str([cfm, dyncp]))
+                   % str([cfm, dyncp, hascpsrcs]))
         for cp in cmps:
             self.debug("__searchDataSources:  component item: %s" % cp)
             try:
@@ -872,6 +875,11 @@ class NXS_FileRecorder(BaseFileRecorder):
                         [ds["dsname"] for ds in cpdss
                          if ("parentobj" not in ds or
                              ds["parentobj"] in ["field"])])
+                    if cp.startswith(self.__cacheCPPrefix):
+                        cachedss.extend(
+                            [ds["dsname"] for ds in cpdss
+                             if ("parentobj" not in ds or
+                                 ds["parentobj"] in ["field"])])
 
                 else:
                     cpdss = json.loads(
@@ -955,7 +963,7 @@ class NXS_FileRecorder(BaseFileRecorder):
                                 "NeXusDynamicComponents=True" % ds)
         self.debug("__searchDataSources:  "
                    "dynamic component loop end: %s" % str([cfm, dyncp]))
-        return (nds, dsNotFound, cpReq, list(missingKeys))
+        return (nds, dsNotFound, cpReq, list(missingKeys), cachedss)
 
     def __createConfiguration(self, userdata):
         """ create NeXus configuration
@@ -1010,9 +1018,10 @@ class NXS_FileRecorder(BaseFileRecorder):
 
         self.debug("__createConfiguration:  Search DataSources: %s"
                    % self.__oddmntgrp)
-        nds, dsNotFound, cpReq, missingKeys = self.__searchDataSources(
-            allnexuscomponents,
-            cfm, dyncp, userdata.keys())
+        nds, dsNotFound, cpReq, missingKeys, cachedss = \
+            self.__searchDataSources(
+                allnexuscomponents,
+                cfm, dyncp, userdata.keys())
         self.debug("__createConfiguration:  Get User data: %s"
                    % self.__oddmntgrp)
 
@@ -1038,10 +1047,11 @@ class NXS_FileRecorder(BaseFileRecorder):
         # udata = {ky: userdata[ky] for ky in missingKeys}
         if userdata:
             userdata.update(udata)
+        ids = list(set(ids or []) - set(cachedss))
         self.debug("__createConfiguration:  Create dynamic components: %s"
                    % self.__oddmntgrp)
         self.__createDynamicComponent(
-            dsNotFound if dyncp else [], ids or [], udata, nexuscomponents)
+            dsNotFound if dyncp else [], ids, udata, nexuscomponents)
         nexuscomponents.append(str(self.__dynamicCP))
         self.debug("__createConfiguration:  Add Components: %s"
                    % self.__oddmntgrp)

sardana_nxsrecorder-3.32.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-sardananxsrecorder/__init__.py,sha256=_bIX5ViOWt3Bnv7n4bn44XacPyir-PKQzzrHdOmIi-c,896
-sardananxsrecorder/nxsrecorder.py,sha256=sNY9soUv-C7Hrrcxbrnh6yh3-cSBbqmpsxRcq7anEpw,67979
-sardana_nxsrecorder-3.32.0.dist-info/METADATA,sha256=-8OWatm0mP0tl7g9eoIghSPFbBlmI5YBrbT8gCIRRX0,8256
-sardana_nxsrecorder-3.32.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-sardana_nxsrecorder-3.32.0.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
-sardana_nxsrecorder-3.32.0.dist-info/RECORD,,