Issue 104: add DefaultNeXusType property

ChangeLog

@@ -1,3 +1,7 @@
+2023-09-05 Jan Kotanski <[email protected]>
+	* add DefaultNeXusType property (#105)
+	* tagged as v3.34.0
+
 2023-08-10 Jan Kotanski <[email protected]>
 	* dont change order of channels in the MG configuration (#101)
 	* tagged as v3.33.0

NXSRecSelector.xmi

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="NXSRecSelector" pogoRevision="9.7">
-    <description description="Tango server with Sardana Recorder settings&#xA;&#xA;Source code: https://github.com/nexdatas/nxsrecselector&#xA;Web page: https://nexdatas.github.io/nxsrecselector&#xA;NexDaTaS Web page: https://nexdatas.github.io&#xA;" title="Selector Server for NeXus Sardana Recorder" sourcePath="/home/jkotan/ndts/nexdatas.recselector" language="Python" filestogenerate="XMI   file,Code files,Protected Regions,html Pages" license="GPL" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false" descriptionHtmlExists="false">
+    <description description="Tango server with Sardana Recorder settings&#xA;&#xA;Source code: https://github.com/nexdatas/nxsrecselector&#xA;Web page: https://nexdatas.github.io/nxsrecselector&#xA;NexDaTaS Web page: https://nexdatas.github.io&#xA;" title="Selector Server for NeXus Sardana Recorder" sourcePath="/home/jkotan/ndts/nexdatas.recselector" language="Python" filestogenerate="XMI   file,Protected Regions,html Pages" license="GPL" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false" descriptionHtmlExists="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <identification contact="at desy.de - jan.kotanski" author="jan.kotanski" emailDomain="desy.de" classFamily="Acquisition" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="DESY" reference=""/>
     </description>
@@ -93,6 +93,11 @@
       <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
       <DefaultPropValue>False</DefaultPropValue>
     </deviceProperties>
+    <deviceProperties name="DefaultNeXusType" description="default dynamic component NeXus type">
+      <type xsi:type="pogoDsl:StringType"/>
+      <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
+      <DefaultPropValue>NX_CHAR</DefaultPropValue>
+    </deviceProperties>
     <commands name="AvailableComponents" description="Return a list of available component names" execMethod="available_components" displayLevel="OPERATOR" polledPeriod="0">
       <argin description="">
         <type xsi:type="pogoDsl:VoidType"/>

doc_html/FullDocument.html

@@ -273,6 +273,12 @@
 		<td> boolean </td>
 		<td> False <br> </td>
 	</tr>
+	<tr>
+		<td> DefaultNeXusType </td>
+		<td> default dynamic component NeXus type </td>
+		<td> String </td>
+		<td> NX_CHAR <br> </td>
+	</tr>
 </table>
 <br><br>
 <hr>

doc_html/Properties.html

@@ -127,6 +127,12 @@
 		<td> boolean </td>
 		<td> False <br> </td>
 	</tr>
+	<tr>
+		<td> DefaultNeXusType </td>
+		<td> default dynamic component NeXus type </td>
+		<td> String </td>
+		<td> NX_CHAR <br> </td>
+	</tr>
 </table>
 </body>
 </html>

nxsrecconfig/DynamicComponent.py

@@ -41,7 +41,8 @@ class DynamicComponent(object):
 
     def __init__(self, nexusconfig_device,
                  defaultpath="/$var.entryname#'scan'$var.serialno:NXentry/"
-                 "NXinstrument/collection"):
+                 "NXinstrument/collection",
+                 defaulttype="NX_CHAR"):
         """ constructor
 
         :param nexusconfig_device: configserver configuration server
@@ -93,6 +94,8 @@ def __init__(self, nexusconfig_device,
         self.__links = True
         #: (:obj:`bool`) standard dynamic link flag for INIT strategy
         self.__ilinks = False
+        #: (:obj:`str`) default data type
+        self.__defaulttype = defaulttype
 
         #: (:obj:`dict` <:obj:`str` , :obj:`str`> ) \
         #:    map of numpy types : NEXUS
@@ -285,7 +288,7 @@ def __createNonSardanaNodes(self, created, avds, definition,
                     definition, path, link)
                 created.append(ds)
 
-                shape, nxtype = None, 'NX_CHAR'
+                shape, nxtype = None, self.__defaulttype
                 if ds in avds:
                     dsource = TangoUtils.command(
                         self.__nexusconfig_device, "dataSources",
@@ -302,7 +305,7 @@ def __createNonSardanaNodes(self, created, avds, definition,
                     if dss and shape is None:
                         shape, nxtype = self.__shapeFromTango(dss[0])
                         if not nxtype:
-                            nxtype = 'NX_CHAR'
+                            nxtype = self.__defaulttype
 
                 nxtype = self.__getProp(
                     self.__nexustypes, self.__nexuslabels, ds, nxtype)

nxsrecconfig/NXSConfig.py

@@ -95,11 +95,12 @@ def init_device(self):
         defaultpath = self.DefaultNeXusPath or None
         defaultzone = self.DefaultTimeZone or None
         defaultmntgrp = self.DefaultMntGrp or None
+        defaultnexustype = self.DefaultNeXusType or None
         syncsnapshot = bool(self.SyncSnapshot)
         writepoolmotorpositions = bool(self.WritePoolMotorPositions)
         self.__stg = STG(self, numberofthreads, defaultpath,
                          defaultzone, defaultmntgrp, syncsnapshot,
-                         writepoolmotorpositions)
+                         writepoolmotorpositions, defaultnexustype)
         self.set_state(tango.DevState.ON)
         self.__stg.poolBlacklist = self.PoolBlacklist or []
         self.__stg.timerFilters = self.TimerFilters or [
@@ -1844,6 +1845,10 @@ class NXSRecSelectorClass(tango.DeviceClass):
          "default NeXus path",
          ["/$var.entryname#'scan'$var.serialno:NXentry/"
           "NXinstrument/collection"]],
+        'DefaultNeXusType':
+        [tango.DevString,
+         "default dynamic component NeXus data type",
+         ["NX_CHAR"]],
         'DefaultTimeZone':
         [tango.DevString,
          "default Time Zone",

nxsrecconfig/Release.py

@@ -20,4 +20,4 @@
 """  NeXus Sardana Recorder Settings - Release """
 
 #: (:obj:`str`) package version
-__version__ = "3.33.0"
+__version__ = "3.34.0"

nxsrecconfig/Settings.py

@@ -54,7 +54,8 @@ class Settings(object):
     def __init__(self, server=None, numberofthreads=None,
                  defaultnexuspath=None,
                  defaulttimezone=None, defaultmntgrp=None,
-                 syncsnapshot=False, writepoolmotorpositions=False):
+                 syncsnapshot=False, writepoolmotorpositions=False,
+                 defaultnexustype=None):
         """ contructor
 
         :param server: NXSRecSelector server
@@ -68,6 +69,8 @@ def __init__(self, server=None, numberofthreads=None,
         :param writepoolmotorpositions: add dynamic components
                                         for all pool motor positions
         :type writepoolmotorpositions: :obj:`bool`
+        :param defaultnexustype:  default dynamic component nexus type
+        :type defaultnexustype: :obj:`str`
         """
         #: (:class:`nxsrecconfig.NXSConfig.NXSRecSelector`) Tango server
         self.__server = server
@@ -82,6 +85,9 @@ def __init__(self, server=None, numberofthreads=None,
             "/$var.entryname#'scan'$var.serialno:NXentry/" \
             "NXinstrument/collection"
 
+        #: (:obj:`str`) default NeXus type
+        self.defaultNeXusType = defaultnexustype or "NX_CHAR"
+
         #: (:obj:`list` <:obj:`str`>) default CanFail DataSources
         self.defaultCanFailDataSources = []
 
@@ -1322,7 +1328,7 @@ def createDynamicComponent(self, params):
         """
         nexusconfig_device = self.__selector.setConfigInstance()
         dcpcreator = DynamicComponent(
-            nexusconfig_device, self.defaultNeXusPath)
+            nexusconfig_device, self.defaultNeXusPath, self.defaultNeXusType)
         if isinstance(params, (list, tuple)):
             if len(params) > 0 and params[0]:
                 dcpcreator.setStepDSources(