nxswriter 3.17.1__py3-none-any.whl → 3.18.1__py3-none-any.whl

nxswriter/ClientSource.py

@@ -25,6 +25,18 @@ from lxml.etree import XMLParser
 from .DataSources import DataSource
 from .Errors import DataSourceSetupError
 
+try:
+    try:
+        import tango
+    except Exception:
+        import PyTango as tango
+    #: (:obj:`str`) global variable if tango module installed
+    PYTANGO_AVAILABLE = True
+except ImportError as e:
+    PYTANGO_AVAILABLE = False
+    sys.stdout.write("PYTANGO not available: %s" % e)
+    sys.stdout.flush()
+
 
 class ClientSource(DataSource):
 
@@ -106,4 +118,13 @@ class ClientSource(DataSource):
         names = [self.name]
         if self.name:
             names.append(self.name.lower())
+            if PYTANGO_AVAILABLE and "/" in self.name and \
+               not self.name.startswith("tango://"):
+                if ":" in self.name:
+                    names.append("tango://%s" % (self.name.lower()))
+                else:
+                    db = tango.Database()
+                    names.append("tango://%s:%s/%s" %
+                                 (db.get_db_host().split(".")[0],
+                                  db.get_db_port(), self.name.lower()))
         return self._getJSONData(names, self.__globalJSON, self.__localJSON)

nxswriter/EVirtualField.py

@@ -525,7 +525,7 @@ class EVirtualField(FElementWithAttr):
         # shape
         self.__shape = self.__getShape()
         self.__vfl = FileWriter.virtual_field_layout(
-            self.__shape, self.__dtype)
+            self.__shape, self.__dtype, parent=self._lastObject())
         for vmap in self.__vmaps:
             self.__vfl.append_vmap(vmap)
         self.__vmaps = []
@@ -581,7 +581,7 @@ class EVirtualField(FElementWithAttr):
     def __createVDS(self):
         """ create the virtual field object
         """
-        self.__vfl.process_target_field_views(self._lastObject())
+        self.__vfl.process_target_field_views()
         self.h5Object = self._lastObject().create_virtual_field(
             self.__name, self.__vfl)
 

nxswriter/Release.py

@@ -21,4 +21,4 @@
 
 
 #: package version
-__version__ = "3.17.1"
+__version__ = "3.18.1"

nxswriter/TangoDataWriter.py

@@ -491,12 +491,17 @@ class TangoDataWriter(object):
         :brief: It parse the XML settings, creates thread pools
                 and runs the INIT pool.
         """
+        tt0 = time.time()
+        if self._streams:
+            self._streams.debug("openEntry: INIT")
         if self.xmlsettings:
             # flag for INIT mode
             self.__datasources.counter = -1
             self.__datasources.nxroot = self.__nxRoot
             errorHandler = sax.ErrorHandler()
             parser = sax.make_parser()
+            if self._streams:
+                self._streams.debug("openEntry: Create NexusXMLHnadler")
             handler = NexusXMLHandler(
                 self.__nxPath[-1] if self.__nxPath else self.__eFile,
                 self.__datasources,
@@ -517,6 +522,8 @@ class TangoDataWriter(object):
                 else:
                     inpsrc.setByteStream(StringIO(self.xmlsettings))
 
+            if self._streams:
+                self._streams.debug("openEntry: Parse NexusXMLHnadler")
             parser.parse(inpsrc)
 
             self.__initPool = handler.initPool
@@ -540,10 +547,18 @@ class TangoDataWriter(object):
                 self.__triggerPools[pool].maxRuntime = \
                     self.maxElementRuntime
 
+            if self._streams:
+                self._streams.debug("openEntry: SET JSON")
             self.__initPool.setJSON(json.loads(self.jsonrecord))
+            if self._streams:
+                self._streams.debug("openEntry: RUN INIT")
+            tt1 = time.time()
             if not self.skipacquisition:
                 self.__initPool.runAndWait()
                 self.__initPool.checkErrors()
+            tt2 = time.time()
+            if self._streams:
+                self._streams.debug("openEntry: ADD LOGS")
             self.skipacquisition = False
             if self.addingLogs:
                 self.__entryCounter += 1
@@ -554,6 +569,9 @@ class TangoDataWriter(object):
                     "string")
                 lfield.write(self.xmlsettings)
                 lfield.close()
+            tt3 = time.time()
+            if self._streams:
+                self._streams.debug("openEntry: FLUSH")
             if self.__nxFile and hasattr(self.__nxFile, "flush"):
                 self.__nxFile.flush()
             if self.stepsperfile > 0:
@@ -562,9 +580,34 @@ class TangoDataWriter(object):
                 self.__nextfile()
             elif "swmr" in self.__pars.keys() and self.__pars["swmr"]:
                 self.__nxFile.reopen(readonly=False, **self.__pars)
+            tt4 = time.time()
+        else:
+            tt4 = time.time()
+            tt1 = tt4
+            tt2 = tt4
+            tt3 = tt4
+        if self._streams:
+            self._streams.debug("openEntry: PREPARE")
         if self.__nxFile and hasattr(self.__nxFile, "prepare"):
             # print("START")
             self.__nxFile.prepare()
+        tt5 = time.time()
+        if self._streams:
+            dt = tt5 - tt0
+            dt1 = tt1 - tt0
+            dt2 = tt2 - tt1
+            dt3 = tt3 - tt2
+            dt4 = tt4 - tt3
+            dt5 = tt5 - tt4
+            message = "openEntry: END TotalTime = %ss, " \
+                "ParseXMLTime=%ss, INITRunTime=%ss, " \
+                "AddLogsTime=%ss, FlushTime=%ss, " \
+                "PrepateTime=%ss" % (dt, dt1, dt2, dt3, dt4, dt5)
+            if dt and self.maxRecordRuntime and \
+                    dt > self.maxRecordRuntime:
+                self._streams.warn(message)
+            else:
+                self._streams.debug(message)
 
     def __nextfile(self):
         self.__nxFile.close()

{nxswriter-3.17.1.dist-info → nxswriter-3.18.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxswriter
-Version: 3.17.1
+Version: 3.18.1
 Summary: Nexus Data writer implemented as a Tango Server
 Home-page: https://github.com/nexdatas/nxsdatawriter
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic
@@ -95,7 +95,7 @@ Extract sources and run
 Debian packages
 """""""""""""""
 
-Debian `trixie`, `bookworm`, `bullseye`  or Ubuntu `plucky`,  `noble`, `jammy`  packages can be found in the HDRI repository.
+Debian `trixie`, `bookworm`, `bullseye`  or Ubuntu `questing`,  `noble`, `jammy`  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
@@ -110,7 +110,7 @@ and then download the corresponding source list
 .. code-block:: console
 
 	  $ cd /etc/apt/sources.list.d
-	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.list
+	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.sources
 
 To install tango server
 

{nxswriter-3.17.1.dist-info → nxswriter-3.18.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-nxswriter/ClientSource.py,sha256=t231lmoc1t3k15ej2KssSfuIdq83X_gYFSFWiMuB1r0,3893
+nxswriter/ClientSource.py,sha256=QLrnnOOmBm9V0M4rgwAneNmKtqifrLn6GNJLRNI6Kzg,4681
 nxswriter/DBaseSource.py,sha256=_w1PCBcoIFoSCOLz9vxRastPPqTGJOla2ObLxNrcrx4,9072
 nxswriter/DataHolder.py,sha256=DL08NyY0FG6snsmW0-nQ7JmWJwDc5-Hy2bC4E3Uz1fk,6164
 nxswriter/DataSourceFactory.py,sha256=W0IirDjsu38KKvBxFbkvv-ghvqil2JJStQ3WMxo8Kh4,4687
@@ -10,7 +10,7 @@ nxswriter/EField.py,sha256=YLbdaykGccZ4cjqheS9te50FG6HQq5kfp7gg_OBkJ9k,28034
 nxswriter/EGroup.py,sha256=Y_PuTERckQXfUXGISbnpzHj7I4y2iFxM5CGByjVD6KA,4900
 nxswriter/ELink.py,sha256=FO7SRF1bpJhqRzK2FBSkRHhFwH1Mw5BRCgt8X8qJbr0,8820
 nxswriter/EStrategy.py,sha256=3RX8E6Ee-Klv9DGlMPvXJacdNDmuKWLQrcnuerR0IQI,3992
-nxswriter/EVirtualField.py,sha256=n7hAqAGT0Z7t3gekCtShGQdyDxBxLbb2SrED8rXGGVI,21584
+nxswriter/EVirtualField.py,sha256=EXqzmMxP4Fstt_yj6MaCQYaac3MNo487xrNG4QguacI,21593
 nxswriter/Element.py,sha256=dnIUS_U0fqJK3FxV_raQBx6qTGPT7sUFkWVzxI5YuEY,3019
 nxswriter/ElementThread.py,sha256=gCZRpzjji8TRfWLkwFRXG_K55d0yUkv9Gzi2DZ22EyQ,2099
 nxswriter/Errors.py,sha256=dYXtJ7rVWv59kAalNMMZO4X3SxSplhoWICeCb3_rFGc,1660
@@ -23,16 +23,16 @@ nxswriter/NXSFromXML.py,sha256=932BivWZnf-3tnIkbpSRFwfGV0PTwcT9pYb2FMmVd_4,9077
 nxswriter/NXSWriter.py,sha256=raHykC9mpUXU8pPtsqePuz3CI-24qYjIUSoyux2zCgo,31345
 nxswriter/NexusXMLHandler.py,sha256=IrZ2mWLuovdBIHcWTqKmr4HZxpMEWLun8A94O6pavr8,14131
 nxswriter/PyEvalSource.py,sha256=7-7Gc2_3CGd3XMHD3LBPCBOZx4Q6b1guzt1xgrSLxMs,11234
-nxswriter/Release.py,sha256=yjkS8yYPt_cwXO9xtoZA-RUM39La_mMqkJoRWPKhRIQ,900
+nxswriter/Release.py,sha256=9w2Bhfe7fB4nlm07lhbkezYrXohSKVDtNRru13zf5Go,900
 nxswriter/StreamSet.py,sha256=sSvXJxoDufmt9_Xu5rFaQsp_4x9gww_zMv0NTiiyLlg,5799
-nxswriter/TangoDataWriter.py,sha256=yP6B3TVUhpHp8OBHKYQRNNtFer9xARoakNXuro4eVv8,28725
+nxswriter/TangoDataWriter.py,sha256=9Y1EaGXC2gCFtUsmV2Ncp4I-LnTW_kWqG3XhD71JiDs,30354
 nxswriter/TangoSource.py,sha256=jiFGUsoX2N5-i2gpBqkHi2KjmTBd46TI22Cjkt_2btw,29410
 nxswriter/ThreadPool.py,sha256=TKvOStVUUyuyHowk0MRaBM4GmRKtl0VPVVPdFHu332M,6039
 nxswriter/Types.py,sha256=haH578_GqBwWWUhPC6x9KQOubhhEOsxHdI63j0_AkdE,7906
 nxswriter/__init__.py,sha256=M0w3HGjZgfdqjMdQNaLcq5jazqQeRekx84YSbQCA8-0,1760
-nxswriter-3.17.1.data/scripts/NXSDataWriter,sha256=wO3opCCjYttfrY7CITNXHvirXv5W6rIQTY7vX5PmioI,905
-nxswriter-3.17.1.data/scripts/nxsfromxml,sha256=qxnJUtV_ueA3lGnne8ltaOF6yF5YtmzeFLIl3NWkAq8,61
-nxswriter-3.17.1.dist-info/METADATA,sha256=GBoIxJobnaPPZDWSOLW7T9HczptmA2uIxL8xl6fsqkM,9011
-nxswriter-3.17.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-nxswriter-3.17.1.dist-info/top_level.txt,sha256=29dYcOYN2MVz1NKpwobc4Zl4yjhd4VB62LDSuSy7x0Y,10
-nxswriter-3.17.1.dist-info/RECORD,,
+nxswriter-3.18.1.data/scripts/NXSDataWriter,sha256=wO3opCCjYttfrY7CITNXHvirXv5W6rIQTY7vX5PmioI,905
+nxswriter-3.18.1.data/scripts/nxsfromxml,sha256=qxnJUtV_ueA3lGnne8ltaOF6yF5YtmzeFLIl3NWkAq8,61
+nxswriter-3.18.1.dist-info/METADATA,sha256=cr1A54HiRC7eFmXuBxpbO2CBSJ1ruV-K10qJK5wuyC0,9016
+nxswriter-3.18.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+nxswriter-3.18.1.dist-info/top_level.txt,sha256=29dYcOYN2MVz1NKpwobc4Zl4yjhd4VB62LDSuSy7x0Y,10
+nxswriter-3.18.1.dist-info/RECORD,,