nxswriter 3.15.0__py3-none-any.whl → 3.16.0__py3-none-any.whl

nxswriter/DecoderPool.py

@@ -175,8 +175,10 @@ class DATAARRAYdecoder(object):
         self.__value = None
         #: ([:obj:`str`, :obj:`str`]) header and image data
         self.__data = None
-        #: (:obj:`str`) struct header format
-        self.__headerFormat = '<IHHIIHHHHHHHHIIIIIIII'
+        #: (:obj:`str`) struct header format ver < 4
+        self.__headerFormat123 = '<IHHIIHHHHHHHHIIIIIIII'
+        #: (:obj:`str`) struct header format ver >=4
+        self.__headerFormat = '<IHHIIHHHHHHHHIIIIIIQQII'
         #: (:obj:`dict` <:obj:`str`, :obj:`any` > ) header data
         self.__header = {}
         #: (:obj:`dict` <:obj:`int`, :obj:`str` > ) format modes
@@ -200,7 +202,7 @@ class DATAARRAYdecoder(object):
         """
         self.__data = data
         self.format = data[0]
-        self._loadHeader(data[1][:struct.calcsize(self.__headerFormat)])
+        self._loadHeader(data[1])
         self.__value = None
 
     def _loadHeader(self, headerData):
@@ -209,7 +211,15 @@ class DATAARRAYdecoder(object):
         :param headerData: buffer with header data
         :type headerData: :obj:`str`
         """
-        hdr = struct.unpack(self.__headerFormat, headerData)
+        try:
+            hData = headerData[:struct.calcsize(self.__headerFormat)]
+            hdr = struct.unpack(self.__headerFormat, hData)
+            if hdr[1] < 4:
+                hData = headerData[:struct.calcsize(self.__headerFormat123)]
+                hdr = struct.unpack(self.__headerFormat123, hData)
+        except Exception:
+            hData = headerData[:struct.calcsize(self.__headerFormat123)]
+            hdr = struct.unpack(self.__headerFormat123, hData)
         self.__header = {}
         self.__header['magic'] = hdr[0]
         self.__header['headerVersion'] = hdr[1]
@@ -261,7 +271,12 @@ class DATAARRAYdecoder(object):
         if not self.__header or not self.__data:
             return
         if self.__value is None:
-            image = self.__data[1][struct.calcsize(self.__headerFormat):]
+            if 'headerVersion' in self.__header and \
+               self.__header['headerVersion'] >= 4:
+                image = self.__data[1][struct.calcsize(self.__headerFormat):]
+            else:
+                image = self.__data[1][
+                    struct.calcsize(self.__headerFormat123):]
             dformat = self.__formatID[self.__header['imageMode']]
             fSize = struct.calcsize(dformat)
             self.__value = numpy.array(

nxswriter/Release.py

@@ -21,4 +21,4 @@
 
 
 #: package version
-__version__ = "3.15.0"
+__version__ = "3.16.0"

{nxswriter-3.15.0.dist-info → nxswriter-3.16.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxswriter
-Version: 3.15.0
+Version: 3.16.0
 Summary: Nexus Data writer implemented as a Tango Server
 Home-page: https://github.com/nexdatas/nxsdatawriter
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic

{nxswriter-3.15.0.dist-info → nxswriter-3.16.0.dist-info}/RECORD

@@ -4,7 +4,7 @@ nxswriter/DataHolder.py,sha256=DL08NyY0FG6snsmW0-nQ7JmWJwDc5-Hy2bC4E3Uz1fk,6164
 nxswriter/DataSourceFactory.py,sha256=W0IirDjsu38KKvBxFbkvv-ghvqil2JJStQ3WMxo8Kh4,4687
 nxswriter/DataSourcePool.py,sha256=1bDOrHhYpG_ZFz8ut2IzkNSMeGxrCBcSCneM4h1AgDc,4574
 nxswriter/DataSources.py,sha256=l40n4WTfgRjLpFsJs7JoWjsER_dCVviRI_iolQ2fENM,5303
-nxswriter/DecoderPool.py,sha256=8nsKtzwyls-YLZUJAfxdGrqb2278Er1Y20NVq1XexvY,15052
+nxswriter/DecoderPool.py,sha256=-eBLujQhuAV81yaFoWirHNULuGSDp4L0ElyFfK-Yj2c,15779
 nxswriter/EAttribute.py,sha256=hADI-LeuQMZwVoTFM4qevoz173Ma_atrk0edqvsFXS0,8878
 nxswriter/EField.py,sha256=YLbdaykGccZ4cjqheS9te50FG6HQq5kfp7gg_OBkJ9k,28034
 nxswriter/EGroup.py,sha256=Y_PuTERckQXfUXGISbnpzHj7I4y2iFxM5CGByjVD6KA,4900
@@ -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=wnY92t-42OYEn6TDj_sULeraAF84pcdjcjLMAtFU3TU,900
+nxswriter/Release.py,sha256=WvhVn3E4Fup8cqvu9a_KgMIxI73SQY45aJeFSxzBRvY,900
 nxswriter/StreamSet.py,sha256=sSvXJxoDufmt9_Xu5rFaQsp_4x9gww_zMv0NTiiyLlg,5799
 nxswriter/TangoDataWriter.py,sha256=yP6B3TVUhpHp8OBHKYQRNNtFer9xARoakNXuro4eVv8,28725
 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.15.0.data/scripts/NXSDataWriter,sha256=wO3opCCjYttfrY7CITNXHvirXv5W6rIQTY7vX5PmioI,905
-nxswriter-3.15.0.data/scripts/nxsfromxml,sha256=qxnJUtV_ueA3lGnne8ltaOF6yF5YtmzeFLIl3NWkAq8,61
-nxswriter-3.15.0.dist-info/METADATA,sha256=iuTW0TPySfQdDF6zyFliD6mOGPW58TYnB2CtmNRJY1E,9013
-nxswriter-3.15.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-nxswriter-3.15.0.dist-info/top_level.txt,sha256=29dYcOYN2MVz1NKpwobc4Zl4yjhd4VB62LDSuSy7x0Y,10
-nxswriter-3.15.0.dist-info/RECORD,,
+nxswriter-3.16.0.data/scripts/NXSDataWriter,sha256=wO3opCCjYttfrY7CITNXHvirXv5W6rIQTY7vX5PmioI,905
+nxswriter-3.16.0.data/scripts/nxsfromxml,sha256=qxnJUtV_ueA3lGnne8ltaOF6yF5YtmzeFLIl3NWkAq8,61
+nxswriter-3.16.0.dist-info/METADATA,sha256=3kKO-rih_oHQUtEzNFizUYwDDpJ3iZ1Ec1akWpKonKo,9013
+nxswriter-3.16.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+nxswriter-3.16.0.dist-info/top_level.txt,sha256=29dYcOYN2MVz1NKpwobc4Zl4yjhd4VB62LDSuSy7x0Y,10
+nxswriter-3.16.0.dist-info/RECORD,,