nxswriter 3.15.0__tar.gz → 3.16.0__tar.gz

{nxswriter-3.15.0 → nxswriter-3.16.0}/ChangeLog

@@ -1,3 +1,7 @@
+2025-03-28 Jan Kotanski <jankotan@gmail.com>
+	* add support for DATA_ARRAY v4 (#182)
+	* tagged as 3.16.0
+
 2025-03-28 Jan Kotanski <jankotan@gmail.com>
 	* make fixes for numpy2  (#179)
 	* recommends nxstools 4.23.0

{nxswriter-3.15.0/nxswriter.egg-info → nxswriter-3.16.0}/PKG-INFO

@@ -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 → nxswriter-3.16.0}/man/nxswriter.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "NXSWRITER" "1" "Jan 13, 2025" "3.13" "NXSDataWriter"
+.TH "NXSWRITER" "1" "Jun 04, 2025" "3.16" "NXSDataWriter"
 .SH NAME
 nxswriter \- nxswriter Documentation
 .sp
@@ -1250,6 +1250,31 @@ During its thread run it fetches the data from the source
 .UNINDENT
 .INDENT 7.0
 .TP
+.B setLength(index, value)
+sets lengths dict element
+.INDENT 7.0
+.TP
+.B Parameters
+.INDENT 7.0
+.IP \(bu 2
+\fBindex\fP (\fI\%int\fP) \-\- length index
+.IP \(bu 2
+\fBvalue\fP (\fI\%int\fP or \fI\%str\fP) \-\- length value
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.INDENT 7.0
+.TP
+.B setRank(rank)
+sets dimension rank
+.INDENT 7.0
+.TP
+.B Parameters
+\fBindex\fP (\fBsrc\fP) \-\- dimension rank
+.UNINDENT
+.UNINDENT
+.INDENT 7.0
+.TP
 .B store(xml=None, globalJSON=None)
 stores the tag content
 .INDENT 7.0
@@ -1370,6 +1395,31 @@ During its thread run it fetches the data from the source
 .UNINDENT
 .INDENT 7.0
 .TP
+.B setLength(index, value)
+sets lengths dict element
+.INDENT 7.0
+.TP
+.B Parameters
+.INDENT 7.0
+.IP \(bu 2
+\fBindex\fP (\fI\%int\fP) \-\- length index
+.IP \(bu 2
+\fBvalue\fP (\fI\%int\fP or \fI\%str\fP) \-\- length value
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.INDENT 7.0
+.TP
+.B setRank(rank)
+sets dimension rank
+.INDENT 7.0
+.TP
+.B Parameters
+\fBindex\fP (\fBsrc\fP) \-\- dimension rank
+.UNINDENT
+.UNINDENT
+.INDENT 7.0
+.TP
 .B shuffle
 (\fI\%bool\fP) compression shuffle
 .UNINDENT
@@ -2145,6 +2195,119 @@ constructor
 .UNINDENT
 .INDENT 0.0
 .TP
+.B class  nxswriter.H5Elements.ESelection(attrs, last, streams=None)
+Bases: \fI\%Element\fP
+.sp
+selection tag element
+.sp
+constructor
+.INDENT 7.0
+.TP
+.B Parameters
+.INDENT 7.0
+.IP \(bu 2
+\fBattrs\fP (\fI\%dict\fP <\fI\%str\fP, \fI\%str\fP>) \-\- dictionary of the tag attributes
+.IP \(bu 2
+\fBlast\fP (\fI\%nxswriter.Element.Element\fP) \-\- the last element from the stack
+.IP \(bu 2
+\fBstreams\fP (\fBStreamSet\fP or \fI\%tango.LatestDeviceImpl\fP) \-\- tango\-like steamset class
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.INDENT 0.0
+.TP
+.B class  nxswriter.H5Elements.ESlab(attrs, last, streams=None)
+Bases: \fI\%Element\fP
+.sp
+slab tag element
+.sp
+constructor
+.INDENT 7.0
+.TP
+.B Parameters
+.INDENT 7.0
+.IP \(bu 2
+\fBattrs\fP (\fI\%dict\fP <\fI\%str\fP, \fI\%str\fP>) \-\- dictionary of the tag attributes
+.IP \(bu 2
+\fBlast\fP (\fI\%nxswriter.Element.Element\fP) \-\- the last element from the stack
+.IP \(bu 2
+\fBstreams\fP (\fBStreamSet\fP or \fI\%tango.LatestDeviceImpl\fP) \-\- tango\-like steamset class
+.UNINDENT
+.UNINDENT
+.INDENT 7.0
+.TP
+.B content
+(\fI\%list\fP <\fI\%str\fP>) tag content
+.UNINDENT
+.INDENT 7.0
+.TP
+.B source
+(\fI\%nxswriter.DataSources.DataSource\fP) data source
+.UNINDENT
+.INDENT 7.0
+.TP
+.B store(xml=None, globalJSON=None)
+stores the tag content
+.INDENT 7.0
+.TP
+.B Parameters
+.INDENT 7.0
+.IP \(bu 2
+\fBxml\fP \-\- xml setting
+.IP \(bu 2
+\fBglobalJSON\fP (:     \fI\%dict\fP <\fI\%str\fP, \fI\%dict\fP <\fI\%str\fP, any>>) \-\- global JSON string
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.INDENT 0.0
+.TP
+.B class  nxswriter.H5Elements.ESlice(attrs, last, streams=None)
+Bases: \fI\%Element\fP
+.sp
+slice tag element
+.sp
+constructor
+.INDENT 7.0
+.TP
+.B Parameters
+.INDENT 7.0
+.IP \(bu 2
+\fBattrs\fP (\fI\%dict\fP <\fI\%str\fP, \fI\%str\fP>) \-\- dictionary of the tag attributes
+.IP \(bu 2
+\fBlast\fP (\fI\%nxswriter.Element.Element\fP) \-\- the last element from the stack
+.IP \(bu 2
+\fBstreams\fP (\fBStreamSet\fP or \fI\%tango.LatestDeviceImpl\fP) \-\- tango\-like steamset class
+.UNINDENT
+.UNINDENT
+.INDENT 7.0
+.TP
+.B content
+(\fI\%list\fP <\fI\%str\fP>) tag content
+.UNINDENT
+.INDENT 7.0
+.TP
+.B source
+(\fI\%nxswriter.DataSources.DataSource\fP) data source
+.UNINDENT
+.INDENT 7.0
+.TP
+.B store(xml=None, globalJSON=None)
+stores the tag content
+.INDENT 7.0
+.TP
+.B Parameters
+.INDENT 7.0
+.IP \(bu 2
+\fBxml\fP \-\- xml setting
+.IP \(bu 2
+\fBglobalJSON\fP (:     \fI\%dict\fP <\fI\%str\fP, \fI\%dict\fP <\fI\%str\fP, any>>) \-\- global JSON string
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.INDENT 0.0
+.TP
 .B class  nxswriter.H5Elements.ESymbol(attrs, last, streams=None)
 Bases: \fI\%Element\fP
 .sp

{nxswriter-3.15.0 → nxswriter-3.16.0}/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-3.15.0 → nxswriter-3.16.0}/nxswriter/Release.py

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

{nxswriter-3.15.0 → nxswriter-3.16.0/nxswriter.egg-info}/PKG-INFO

@@ -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