Issue 122: change default user_data type to NXparameters (#123)

* change default user_data type to NXparameters

* update version

ChangeLog

@@ -1,3 +1,7 @@
+2024-01-25 Jan Kotanski <jankotan@gmail.com>
+	* change default user_data type to NXparameters (#123)
+	* tagged as v3.39.0
+
 2023-11-13 Jan Kotanski <jankotan@gmail.com>
 	* add support for user data units and other attributes (#120)
 	* tagged as v3.38.0

NXSRecSelector.xmi

@@ -111,7 +111,7 @@
     <deviceProperties name="DefaultUserDataPath" description="default NeXus User data path">
       <type xsi:type="pogoDsl:StringType"/>
       <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
-      <DefaultPropValue>/scan$var.serialno:NXentry/user_data:NXdata</DefaultPropValue>
+      <DefaultPropValue>/scan$var.serialno:NXentry/user_data:NXparameters</DefaultPropValue>
     </deviceProperties>
     <commands name="AvailableComponents" description="Return a list of available component names" execMethod="available_components" displayLevel="OPERATOR" polledPeriod="0">
       <argin description="">

doc_html/FullDocument.html

@@ -295,7 +295,7 @@
 		<td> DefaultUserDataPath </td>
 		<td> default NeXus User data path </td>
 		<td> String </td>
-		<td> /scan$var.serialno:NXentry/user_data:NXdata <br> </td>
+		<td> /scan$var.serialno:NXentry/user_data:NXparameters <br> </td>
 	</tr>
 </table>
 <br><br>

doc_html/Properties.html

@@ -149,7 +149,7 @@
 		<td> DefaultUserDataPath </td>
 		<td> default NeXus User data path </td>
 		<td> String </td>
-		<td> /scan$var.serialno:NXentry/user_data:NXdata <br> </td>
+		<td> /scan$var.serialno:NXentry/user_data:NXparameters <br> </td>
 	</tr>
 </table>
 </body>

man/nxsrecconfig.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NXSRECCONFIG" "1" "Dec 13, 2023" "3.38" "NXSRecSelector"
+.TH "NXSRECCONFIG" "1" "Jan 25, 2024" "3.39" "NXSRecSelector"
 .SH NAME
 nxsrecconfig \- nxsrecconfig Documentation
 .
@@ -951,7 +951,7 @@ constructor
 Dynamic Component
 .INDENT 0.0
 .TP
-.B class nxsrecconfig.DynamicComponent.DynamicComponent(nexusconfig_device, defaultpath="/$var.entryname#\(aqscan\(aq$var.serialno:NXentry/NXinstrument/collection", defaulttype=\(aqNX_CHAR\(aq, defaultuserpath="/$var.entryname#\(aqscan\(aq$var.serialno:NXentry/data:NXdata")
+.B class nxsrecconfig.DynamicComponent.DynamicComponent(nexusconfig_device, defaultpath="/$var.entryname#\(aqscan\(aq$var.serialno:NXentry/NXinstrument/collection", defaulttype=\(aqNX_CHAR\(aq, defaultuserpath="/$var.entryname#\(aqscan\(aq$var.serialno:NXentry/user_data:NXparameters")
 Bases: \fI\%object\fP
 .sp
 Creates dynamic component
@@ -2990,7 +2990,7 @@ Command definitions
 .UNINDENT
 .INDENT 7.0
 .TP
-.B device_property_list = {\(aqAdminDataNames\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqlist of administrator data names\(aq, []], \(aqClientRecordKeys\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqlist of record keys for CLIENT datasources\(aq, []], \(aqDefaultCanFailDataSources\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqlist of default datasources in the CanFail mode\(aq, []], \(aqDefaultMntGrp\(aq: [tango._tango.CmdArgType.DevString, \(aqdefault measurement group name\(aq, [\(aqnxsmntgrp\(aq]], \(aqDefaultNeXusPath\(aq: [tango._tango.CmdArgType.DevString, \(aqdefault NeXus path\(aq, ["/$var.entryname#\(aqscan\(aq$var.serialno:NXentry/NXinstrument/collection"]], \(aqDefaultNeXusType\(aq: [tango._tango.CmdArgType.DevString, \(aqdefault dynamic component NeXus data type\(aq, [\(aqNX_CHAR\(aq]], \(aqDefaultPreselectedComponents\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqlist of default preselected components\(aq, []], \(aqDefaultTimeZone\(aq: [tango._tango.CmdArgType.DevString, \(aqdefault Time Zone\(aq, [\(aqEurope/Berlin\(aq]], \(aqDefaultUserDataPath\(aq: [tango._tango.CmdArgType.DevString, \(aqdefault NeXus User Data path\(aq, ["/$var.entryname#\(aqscan\(aq$var.serialno:NXentry/user_data:NXdata"]], \(aqMasterTimer\(aq: [tango._tango.CmdArgType.DevBoolean, \(aqset the master timer/monitor channel for older MG\(aq, [False]], \(aqMasterTimerFirst\(aq: [tango._tango.CmdArgType.DevBoolean, \(aqthe master timer channel of MG with the index: 0\(aq, [True]], \(aqMergeProfilesToMntGrps\(aq: [tango._tango.CmdArgType.DevBoolean, \(aqmerge profiles to available measurement groups\(aq, [False]], \(aqMutedChannelFilters\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqlist of muted channel filters\(aq, []], \(aqMutedPreScanAttrFilters\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqlist of muted attribute channel filters for PreScanSnapshot\(aq, []], \(aqNumberOfThreads\(aq: [tango._tango.CmdArgType.DevLong, \(aqmaximal number of threads\(aq, [20]], \(aqPoolBlacklist\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqblacklist of pools\(aq, []], \(aqResetInvalidDoor\(aq: [tango._tango.CmdArgType.DevBoolean, \(aqreset Door when it is invalid\(aq, [True]], \(aqSyncSnapshot\(aq: [tango._tango.CmdArgType.DevBoolean, \(aqpreselection merges the current ScanSnapshot\(aq, [False]], \(aqTangoSourceErrorStates\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqlist of tango error states for tango datasources\(aq, [\(aqOFF\(aq, \(aqINIT\(aq, \(aqINSERT\(aq, \(aqCLOSE\(aq, \(aqUNKNOWN\(aq, \(aqFAULT\(aq]], \(aqTangoSourceWarningStates\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqlist of tango warning states for tango datasources\(aq, [\(aqALARM\(aq, \(aqDISABLE\(aq]], \(aqTimerFilters\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqlist of timer device name filters\(aq, []], \(aqWritePoolMotorPositions\(aq: [tango._tango.CmdArgType.DevBoolean, \(aqadd dynamic components for all pool motor positions\(aq, [False]]}
+.B device_property_list = {\(aqAdminDataNames\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqlist of administrator data names\(aq, []], \(aqClientRecordKeys\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqlist of record keys for CLIENT datasources\(aq, []], \(aqDefaultCanFailDataSources\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqlist of default datasources in the CanFail mode\(aq, []], \(aqDefaultMntGrp\(aq: [tango._tango.CmdArgType.DevString, \(aqdefault measurement group name\(aq, [\(aqnxsmntgrp\(aq]], \(aqDefaultNeXusPath\(aq: [tango._tango.CmdArgType.DevString, \(aqdefault NeXus path\(aq, ["/$var.entryname#\(aqscan\(aq$var.serialno:NXentry/NXinstrument/collection"]], \(aqDefaultNeXusType\(aq: [tango._tango.CmdArgType.DevString, \(aqdefault dynamic component NeXus data type\(aq, [\(aqNX_CHAR\(aq]], \(aqDefaultPreselectedComponents\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqlist of default preselected components\(aq, []], \(aqDefaultTimeZone\(aq: [tango._tango.CmdArgType.DevString, \(aqdefault Time Zone\(aq, [\(aqEurope/Berlin\(aq]], \(aqDefaultUserDataPath\(aq: [tango._tango.CmdArgType.DevString, \(aqdefault NeXus User Data path\(aq, ["/$var.entryname#\(aqscan\(aq$var.serialno:NXentry/user_data:NXparameters"]], \(aqMasterTimer\(aq: [tango._tango.CmdArgType.DevBoolean, \(aqset the master timer/monitor channel for older MG\(aq, [False]], \(aqMasterTimerFirst\(aq: [tango._tango.CmdArgType.DevBoolean, \(aqthe master timer channel of MG with the index: 0\(aq, [True]], \(aqMergeProfilesToMntGrps\(aq: [tango._tango.CmdArgType.DevBoolean, \(aqmerge profiles to available measurement groups\(aq, [False]], \(aqMutedChannelFilters\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqlist of muted channel filters\(aq, []], \(aqMutedPreScanAttrFilters\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqlist of muted attribute channel filters for PreScanSnapshot\(aq, []], \(aqNumberOfThreads\(aq: [tango._tango.CmdArgType.DevLong, \(aqmaximal number of threads\(aq, [20]], \(aqPoolBlacklist\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqblacklist of pools\(aq, []], \(aqResetInvalidDoor\(aq: [tango._tango.CmdArgType.DevBoolean, \(aqreset Door when it is invalid\(aq, [True]], \(aqSyncSnapshot\(aq: [tango._tango.CmdArgType.DevBoolean, \(aqpreselection merges the current ScanSnapshot\(aq, [False]], \(aqTangoSourceErrorStates\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqlist of tango error states for tango datasources\(aq, [\(aqOFF\(aq, \(aqINIT\(aq, \(aqINSERT\(aq, \(aqCLOSE\(aq, \(aqUNKNOWN\(aq, \(aqFAULT\(aq]], \(aqTangoSourceWarningStates\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqlist of tango warning states for tango datasources\(aq, [\(aqALARM\(aq, \(aqDISABLE\(aq]], \(aqTimerFilters\(aq: [tango._tango.CmdArgType.DevVarStringArray, \(aqlist of timer device name filters\(aq, []], \(aqWritePoolMotorPositions\(aq: [tango._tango.CmdArgType.DevBoolean, \(aqadd dynamic components for all pool motor positions\(aq, [False]]}
 (\fI\%dict\fP <\fI\%str\fP, [ \fI\%str\fP, \fI\%tango.CmdArgType\fP, [ \fI\%list\fP <\fI\%int\fP> ] ] > ) Device Properties
 .UNINDENT
 .UNINDENT

nxsrecconfig/DynamicComponent.py

@@ -44,7 +44,7 @@ def __init__(self, nexusconfig_device,
                  "NXinstrument/collection",
                  defaulttype="NX_CHAR",
                  defaultuserpath="/$var.entryname#'scan'$var.serialno:NXentry/"
-                 "data:NXdata"):
+                 "user_data:NXparameters"):
         """ constructor
 
         :param nexusconfig_device: configserver configuration server

nxsrecconfig/NXSConfig.py

@@ -1853,7 +1853,7 @@ class NXSRecSelectorClass(tango.DeviceClass):
         [tango.DevString,
          "default NeXus User Data path",
          ["/$var.entryname#'scan'$var.serialno:NXentry/"
-          "user_data:NXdata"]],
+          "user_data:NXparameters"]],
         'DefaultNeXusType':
         [tango.DevString,
          "default dynamic component NeXus data type",

nxsrecconfig/Release.py

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

nxsrecconfig/Settings.py

@@ -91,7 +91,7 @@ def __init__(self, server=None, numberofthreads=None,
         #: (:obj:`str`) default NeXus path
         self.defaultUserDataPath = defaultudatapath or \
             "/$var.entryname#'scan'$var.serialno:NXentry/" \
-            "user_data:NXdata"
+            "user_data:NXparameters"
 
         #: (:obj:`str`) default NeXus type
         self.defaultNeXusType = defaultnexustype or "NX_CHAR"