nxstools 4.32.0__tar.gz → 4.35.1__tar.gz

{nxstools-4.32.0 → nxstools-4.35.1}/ChangeLog

@@ -1,3 +1,19 @@
+2025-12-11 Jan Kotanski <jankotan@gmail.com>
+	* add prodigyremote  component (#845)
+	* tagged as v4.35.1
+
+2025-12-08 Jan Kotanski <jankotan@gmail.com>
+	* add prodigyremote  component (#842)
+	* tagged as v4.35.0
+
+2025-11-27 Jan Kotanski <jankotan@gmail.com>
+	* pilcslavevds component (#839)
+	* tagged as v4.34.0
+
+2025-11-18 Jan Kotanski <jankotan@gmail.com>
+	* add scatter plots to h5rediswriter (#835)
+	* tagged as v4.33.0
+
 2025-11-10 Jan Kotanski <jankotan@gmail.com>
 	* avoid to recreate redis data store because of memory leak (#832)
 	* tagged as v4.32.0

{nxstools-4.32.0/nxstools.egg-info → nxstools-4.35.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxstools
-Version: 4.32.0
+Version: 4.35.1
 Summary: Configuration tools for NeXDaTaS Tango Servers
 Home-page: http://github.com/nexdatas/nxstools
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic

{nxstools-4.32.0 → nxstools-4.35.1}/nxstools/h5rediswriter.py

@@ -129,6 +129,10 @@ progattrdesc = {
     "beamtime_id": ["beamtime_id", str, False],
 }
 
+titleplots = {
+    "mesh": {"kind": "scatter-plot", "items": [{"kind": "scatter"}]},
+}
+
 
 def nptype(dtype):
     """ converts to numpy types
@@ -1706,6 +1710,12 @@ class H5RedisField(H5Field):
                             np = str(filewriter.first(attrs[vl[0]].read()))
                         if vl[2] or np:
                             self.set_scaninfo(np, [key])
+                            if isinstance(np, str):
+                                macro_name = np.split(" ")[0]
+                            for mn, plot in titleplots.items():
+                                if mn in macro_name:
+                                    self.append_scaninfo(plot, ["plots"])
+
                     except Exception as e:
                         print(str(e))
                         pass

{nxstools-4.32.0 → nxstools-4.35.1}/nxstools/release.py

@@ -19,4 +19,4 @@
 """  NXS tools release version"""
 
 #: (:obj:`str`) package version
-__version__ = "4.32.0"
+__version__ = "4.35.1"

{nxstools-4.32.0 → nxstools-4.35.1}/nxstools/xmltemplates/__init__.py

@@ -1766,6 +1766,7 @@ standardComponentTemplateFiles = {
 #:     xml template files of modules
 moduleTemplateFiles = {
     'mythen2': ['mythen2.xml'],
+    'prodigyremote': ['prodigyremote.xml'],
     'cobold': ['cobold.xml'],
     'mythen': ['mythen.xml',
                'mythen_postrun.ds.xml',
@@ -1778,8 +1779,14 @@ moduleTemplateFiles = {
                 'pilcvds_encoder2map.ds.xml',
                 'pilcvds_encoder3map.ds.xml',
                 'pilcvds_encoder4map.ds.xml',
-                'pilcvds_encoder5map.ds.xml'
-                ],
+                'pilcvds_encoder5map.ds.xml'],
+    'pilcslavevds': ['pilcslavevds.xml',
+                     'pilcslavevds_exposuretimemap.ds.xml',
+                     'pilcslavevds_value1map.ds.xml',
+                     'pilcslavevds_value2map.ds.xml',
+                     'pilcslavevds_value3map.ds.xml',
+                     'pilcslavevds_value4map.ds.xml',
+                     'pilcslavevds_value5map.ds.xml'],
     'pilcvds4': ['pilcvds4.xml',
                  'pilcvds_countermap.ds.xml',
                  'pilcvds_encoder1map.ds.xml',
@@ -1981,6 +1988,17 @@ moduleMultiAttributes = {
     'mca_xia@pool': [
         'CountsRoI', 'RoIEnd', 'RoIStart',
     ],
+    'prodigyremote': [
+        'FullSpectrum', 'IntegratedSpectrum', 'EnergyPoints',
+        'LensMode', 'EntrySlit',
+        'StartEnergy', 'PassEnergy', 'StepWidth', 'StopEnergy',
+        # 'ExitSlit',
+        'KinEnergy', 'KinEnergyBase',
+        'NumberOfAcquiredPoints', 'ExpectedNumberOfPoints',
+        'DwellTime', 'ScanRange',
+        'Samples', 'RetardingRatio', 'Mode',
+        'NonEnergyChannels', 'ScanVariable',
+    ],
     'limaccd': [
         'camera_type', 'camera_pixelsize', 'camera_model',
         'acq_mode', 'acq_nb_frames', 'acq_trigger_mode',
@@ -2117,6 +2135,22 @@ moduleMultiAttributes = {
         # 'Encoder2Data', 'Encoder3Data', 'Encoder4Data', 'Encoder5Data',
         # 'Position2Data', 'Position3Data', 'Position4Data', 'Position5Data'
     ],
+    'pilcslavevds': [
+        'NbTriggers', 'ManualMode', 'FilePrefix', 'FileDir',
+        # 'Arm',
+        'RemainingTriggers', 'BufferLoad', 'PiLCTGConnected',
+        'MaskDataToWrite',
+        # 'ExposureTime',
+        'Metadata1', 'Metadata2', 'Metadata3', 'Metadata4', 'Metadata5',
+        'TriggersPerFile', 'GateControl', 'GateExpTime',
+        # 'ExposureTimeData',
+        # 'ADC1', 'ADC2', 'ADC3', 'ADC4', 'ADC5',
+        'VFCConversion1', 'VFCConversion2', 'VFCConversion3',
+        'VFCConversion4', 'VFCConversion5',
+        'VFCConversionHzV1', 'VFCConversionHzV2', 'VFCConversionHzV3',
+        'VFCConversionHzV4', 'VFCConversionHzV5',
+        # 'ADC1Data', 'ADC2Data', 'ADC3Data', 'ADC4Data', 'ADC5Data'
+    ],
     'pilcvds': [
         'PositionTriggerStart', 'PositionTriggerStepSize',
         'PositionTriggerStop',

nxstools-4.35.1/nxstools/xmltemplates/pilcslavevds.xml

@@ -0,0 +1,115 @@
+<?xml version='1.0'?>
+<definition>
+  <group type="NXentry" name="$var.entryname#'$(__entryname__)'$var.serialno">
+    <group type="NXinstrument" name="$(__insname__)">
+      <group type="NXcollection" name="$(name)">
+	<group type="NXcollection" name="collection">
+          <field type="NX_INT32" name="nb_triggers">
+            <strategy mode="FINAL"/>$datasources.$(name)_nbtriggers</field>
+          <field type="NX_INT32" name="manual_mode">
+            <strategy mode="FINAL"/>$datasources.$(name)_manualmode</field>
+          <field type="NX_CHAR" name="file_prefix">
+            <strategy mode="FINAL"/>$datasources.$(name)_fileprefix</field> 
+          <field type="NX_CHAR" name="file_dir">
+            <strategy mode="FINAL"/>$datasources.$(name)_filedir</field> 
+          <field type="NX_INT32" name="remaining_triggers">
+            <strategy mode="FINAL"/>$datasources.$(name)_remainingtriggers</field>
+          <field type="NX_INT32" name="buffer_load">
+            <strategy mode="FINAL"/>$datasources.$(name)_bufferload</field>
+          <field type="NX_INT32" name="pilc_tg_connected">
+            <strategy mode="FINAL"/>$datasources.$(name)_pilctgconnected</field>
+          <field type="NX_FLOAT64" name="mask_data_to_write">
+            <strategy mode="FINAL"/>$datasources.$(name)_maskdatatowrite</field>
+          <field type="NX_CHAR" name="metadata_1">
+            <strategy mode="FINAL"/>$datasources.$(name)_metadata1</field> 
+          <field type="NX_CHAR" name="metadata_2">
+            <strategy mode="FINAL"/>$datasources.$(name)_metadata2</field> 
+          <field type="NX_CHAR" name="metadata_3">
+            <strategy mode="FINAL"/>$datasources.$(name)_metadata3</field> 
+          <field type="NX_CHAR" name="metadata_4">
+            <strategy mode="FINAL"/>$datasources.$(name)_metadata4</field> 
+          <field type="NX_CHAR" name="metadata_5">
+            <strategy mode="FINAL"/>$datasources.$(name)_metadata5</field> 
+          <field type="NX_INT32" name="triggers_per_file">
+            <strategy mode="FINAL"/>$datasources.$(name)_triggersperfile</field>
+          <field type="NX_INT32" name="gate_control">
+            <strategy mode="FINAL"/>$datasources.$(name)_gatecontrol</field>
+          <field type="NX_FLOAT64" name="gate_exp_time">
+            <strategy mode="FINAL"/>$datasources.$(name)_gateexptime</field>
+          <field type="NX_INT32" name="vfc_conversion_1">
+            <strategy mode="FINAL"/>$datasources.$(name)_vfcconversion1</field>
+          <field type="NX_INT32" name="vfc_conversion_2">
+            <strategy mode="FINAL"/>$datasources.$(name)_vfcconversion2</field>
+          <field type="NX_INT32" name="vfc_conversion_3">
+            <strategy mode="FINAL"/>$datasources.$(name)_vfcconversion3</field>
+          <field type="NX_INT32" name="vfc_conversion_4">
+            <strategy mode="FINAL"/>$datasources.$(name)_vfcconversion4</field>
+          <field type="NX_INT32" name="vfc_conversion_5">
+            <strategy mode="FINAL"/>$datasources.$(name)_vfcconversion5</field>
+          <field type="NX_INT32" name="vfc_conversion_hz_v_1">
+            <strategy mode="FINAL"/>$datasources.$(name)_vfcconversionhzv1</field>
+          <field type="NX_INT32" name="vfc_conversion_hz_v_2">
+            <strategy mode="FINAL"/>$datasources.$(name)_vfcconversionhzv2</field>
+          <field type="NX_INT32" name="vfc_conversion_hz_v_3">
+            <strategy mode="FINAL"/>$datasources.$(name)_vfcconversionhzv3</field>
+          <field type="NX_INT32" name="vfc_conversion_hz_v_4">
+            <strategy mode="FINAL"/>$datasources.$(name)_vfcconversionhzv4</field>
+          <field type="NX_INT32" name="vfc_conversion_hz_v_5">
+            <strategy mode="FINAL"/>$datasources.$(name)_vfcconversionhzv5</field>
+	</group>
+        <group type="NXdata" name="data">	  
+	  <vds name="exposure_time" type="NX_FLOAT32">
+	    <dimensions rank="2" />
+	    <map>
+	      $datasources.$(name)_exposuretimemap
+	      <strategy mode="STEP"/>
+	    </map>
+	  </vds>
+	  <vds name="value_1" type="NX_FLOAT32">
+	    <dimensions rank="2" />
+	    <map>
+	      $datasources.$(name)_value1map
+	      <strategy mode="STEP"/>
+	    </map>
+	  </vds>
+	  <vds name="value_2" type="NX_FLOAT32">
+	    <dimensions rank="2" />
+	    <map>
+	      $datasources.$(name)_value2map
+	      <strategy mode="STEP"/>
+	    </map>
+	  </vds>
+	  <vds name="value_3" type="NX_FLOAT32">
+	    <dimensions rank="2" />
+	    <map>
+	      $datasources.$(name)_value3map
+	      <strategy mode="STEP"/>
+	    </map>
+	  </vds>
+	  <vds name="value_4" type="NX_FLOAT32">
+	    <dimensions rank="2" />
+	    <map>
+	      $datasources.$(name)_value4map
+	      <strategy mode="STEP"/>
+	    </map>
+	  </vds>
+	  <vds name="value_5" type="NX_FLOAT32">
+	    <dimensions rank="2" />
+	    <map>
+	      $datasources.$(name)_value5map
+	      <strategy mode="STEP"/>
+	    </map>
+	  </vds>
+        </group>
+      </group>
+    </group>
+    <group type="NXdata" name="data">
+      <link name="$(name)_exposure_time" target="/$var.entryname#'$(__entryname__)'$var.serialno/$(__insname__)/$(name)/data/exposure_time" />
+      <link name="$(name)_value_1" target="/$var.entryname#'$(__entryname__)'$var.serialno/$(__insname__)/$(name)/data/value_1" />
+      <link name="$(name)_value_2" target="/$var.entryname#'$(__entryname__)'$var.serialno/$(__insname__)/$(name)/data/value_2" />
+      <link name="$(name)_value_3" target="/$var.entryname#'$(__entryname__)'$var.serialno/$(__insname__)/$(name)/data/value_3" />
+      <link name="$(name)_value_4" target="/$var.entryname#'$(__entryname__)'$var.serialno/$(__insname__)/$(name)/data/value_4" />
+      <link name="$(name)_value_5" target="/$var.entryname#'$(__entryname__)'$var.serialno/$(__insname__)/$(name)/data/value_5" />
+    </group>
+  </group>
+</definition>

nxstools-4.35.1/nxstools/xmltemplates/pilcslavevds_exposuretimemap.ds.xml

@@ -0,0 +1,13 @@
+<?xml version='1.0'?>
+<definition>
+  <datasource type="PYEVAL" name="$(name)_exposuretimemap">
+    <result name="result">
+from nxstools.pyeval import pilcvds
+ds.result = pilcvds.vmap(commonblock, "$(name)", "exposure_time", None, ds.$(name)_nbtriggers, ds.$(name)_triggersperfile, "$(hostname)", "$(device)", "$var.filename", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", ds.$(name)_fileprefix, ds.$(name)_filedir)
+    </result>
+    $datasources.$(name)_nbtriggers
+    $datasources.$(name)_triggersperfile
+    $datasources.$(name)_fileprefix
+    $datasources.$(name)_filedir
+  </datasource>
+</definition>

nxstools-4.35.1/nxstools/xmltemplates/pilcslavevds_value1map.ds.xml

@@ -0,0 +1,13 @@
+<?xml version='1.0'?>
+<definition>
+  <datasource type="PYEVAL" name="$(name)_value1map">
+    <result name="result">
+from nxstools.pyeval import pilcvds
+ds.result = pilcvds.vmap(commonblock, "$(name)", "value_1", None, ds.$(name)_nbtriggers, ds.$(name)_triggersperfile, "$(hostname)", "$(device)", "$var.filename", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", ds.$(name)_fileprefix, ds.$(name)_filedir)
+    </result>
+    $datasources.$(name)_nbtriggers
+    $datasources.$(name)_triggersperfile
+    $datasources.$(name)_fileprefix
+    $datasources.$(name)_filedir
+  </datasource>
+</definition>

nxstools-4.35.1/nxstools/xmltemplates/pilcslavevds_value2map.ds.xml

@@ -0,0 +1,13 @@
+<?xml version='1.0'?>
+<definition>
+  <datasource type="PYEVAL" name="$(name)_value2map">
+    <result name="result">
+from nxstools.pyeval import pilcvds
+ds.result = pilcvds.vmap(commonblock, "$(name)", "value_2", None, ds.$(name)_nbtriggers, ds.$(name)_triggersperfile, "$(hostname)", "$(device)", "$var.filename", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", ds.$(name)_fileprefix, ds.$(name)_filedir)
+    </result>
+    $datasources.$(name)_nbtriggers
+    $datasources.$(name)_triggersperfile
+    $datasources.$(name)_fileprefix
+    $datasources.$(name)_filedir
+  </datasource>
+</definition>

nxstools-4.35.1/nxstools/xmltemplates/pilcslavevds_value3map.ds.xml

@@ -0,0 +1,13 @@
+<?xml version='1.0'?>
+<definition>
+  <datasource type="PYEVAL" name="$(name)_value3map">
+    <result name="result">
+from nxstools.pyeval import pilcvds
+ds.result = pilcvds.vmap(commonblock, "$(name)", "value_3", None, ds.$(name)_nbtriggers, ds.$(name)_triggersperfile, "$(hostname)", "$(device)", "$var.filename", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", ds.$(name)_fileprefix, ds.$(name)_filedir)
+    </result>
+    $datasources.$(name)_nbtriggers
+    $datasources.$(name)_triggersperfile
+    $datasources.$(name)_fileprefix
+    $datasources.$(name)_filedir
+  </datasource>
+</definition>

nxstools-4.35.1/nxstools/xmltemplates/pilcslavevds_value4map.ds.xml

@@ -0,0 +1,13 @@
+<?xml version='1.0'?>
+<definition>
+  <datasource type="PYEVAL" name="$(name)_value4map">
+    <result name="result">
+from nxstools.pyeval import pilcvds
+ds.result = pilcvds.vmap(commonblock, "$(name)", "value_4", None, ds.$(name)_nbtriggers, ds.$(name)_triggersperfile, "$(hostname)", "$(device)", "$var.filename", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", ds.$(name)_fileprefix, ds.$(name)_filedir)
+    </result>
+    $datasources.$(name)_nbtriggers
+    $datasources.$(name)_triggersperfile
+    $datasources.$(name)_fileprefix
+    $datasources.$(name)_filedir
+  </datasource>
+</definition>

nxstools-4.35.1/nxstools/xmltemplates/pilcslavevds_value5map.ds.xml

@@ -0,0 +1,13 @@
+<?xml version='1.0'?>
+<definition>
+  <datasource type="PYEVAL" name="$(name)_value5map">
+    <result name="result">
+from nxstools.pyeval import pilcvds
+ds.result = pilcvds.vmap(commonblock, "$(name)", "value_5", None, ds.$(name)_nbtriggers, ds.$(name)_triggersperfile, "$(hostname)", "$(device)", "$var.filename", "$var.entryname#'$(__entryname__)'$var.serialno", "$(__insname__)", ds.$(name)_fileprefix, ds.$(name)_filedir)
+    </result>
+    $datasources.$(name)_nbtriggers
+    $datasources.$(name)_triggersperfile
+    $datasources.$(name)_fileprefix
+    $datasources.$(name)_filedir
+  </datasource>
+</definition>

nxstools-4.35.1/nxstools/xmltemplates/prodigyremote.xml

@@ -0,0 +1,78 @@
+<?xml version='1.0'?>
+<definition>
+  <group type="NXentry" name="$var.entryname#'$(__entryname__)'$var.serialno">
+    <group type="NXinstrument" name="instrument">
+      <group type="NXelectronanalyzer" name="$(name)">
+	<group type="NXelectron_detector" name="electron_detector">
+	  <group type="NXdata" name="raw_data">
+            <attribute type="NX_CHAR" name="signal">
+              <strategy mode="INIT"/>raw
+            </attribute>
+            <field type="NX_FLOAT64" name="raw">
+              <strategy mode="STEP"/>$datasources.$(name)_integratedspectrum<dimensions rank="1"/>
+            </field>
+            <field units="eV" type="NX_FLOAT64" name="energy">
+              <strategy mode="STEP"/>$datasources.$(name)_energypoints<dimensions rank="1"/>
+            </field>
+	  </group>
+          <field units="eV" type="NX_FLOAT64" name="data">
+            <strategy mode="STEP"/>$datasources.$(name)_fullspectrum<dimensions rank="2"/>
+          </field>
+  	</group>
+        <group type="NXcollectioncolumn" name="collectioncolumn">
+          <field type="NX_CHAR" name="lens_mode">
+            <strategy mode="FINAL"/>$datasources.$(name)_lensmode</field>
+	</group>
+	<group type="NXenergydispersion" name="energydispersion">
+	  <group type="NXaperture" name="entrance_slit">
+          <field type="NX_CHAR" name="description">
+            <strategy mode="FINAL"/>$datasources.$(name)_entryslit</field>
+	  </group>
+          <field units="eV" type="NX_FLOAT64" name="pass_energy">
+            <strategy mode="FINAL"/>$datasources.$(name)_passenergy</field>
+        </group>
+	<group type="NXresolution" name="energy_resolution">
+          <field units="eV" type="NX_CHAR" name="physical_quantity">
+          <strategy mode="FINAL"/>energy</field>
+          <field units="eV" type="NX_FLOAT64" name="resolution">
+          <strategy mode="FINAL"/>$datasources.$(name)_stepwidth</field>
+          <group type="NXcollection" name="collection">
+            <field units="eV" type="NX_FLOAT64" name="start_energy">
+            <strategy mode="FINAL"/>$datasources.$(name)_startenergy</field>
+            <field units="eV" type="NX_FLOAT64" name="stop_energy">
+            <strategy mode="FINAL"/>$datasources.$(name)_stopenergy</field>
+            <field units="eV" type="NX_FLOAT64" name="kin_energy">
+            <strategy mode="FINAL"/>$datasources.$(name)_kinenergy</field>
+            <field units="eV" type="NX_FLOAT64" name="kin_energybase">
+            <strategy mode="FINAL"/>$datasources.$(name)_kinenergybase</field>
+	  </group>
+	</group>
+        <group type="NXcollection" name="collection">
+          <field units="s" type="NX_FLOAT64" name="dwell_time">
+            <strategy mode="FINAL"/>$datasources.$(name)_dwelltime</field>
+          <field type="NX_INT64" name="number_of_acquired_points">
+            <strategy mode="FINAL"/>$datasources.$(name)_numberofacquiredpoints</field>
+          <field type="NX_INT64" name="expected_number_of_points">
+            <strategy mode="FINAL"/>$datasources.$(name)_expectednumberofpoints</field>
+          <field type="NX_INT64" name="samples">
+            <strategy mode="FINAL"/>$datasources.$(name)_samples</field>
+          <field type="NX_FLOAT64" name="retarding_ratio">
+            <strategy mode="FINAL"/>$datasources.$(name)_retardingratio</field>
+          <field type="NX_CHAR" name="scan_range">
+            <strategy mode="FINAL"/>$datasources.$(name)_scanrange</field>
+          <field type="NX_INT64" name="mode">
+            <strategy mode="FINAL"/>$datasources.$(name)_mode</field>
+          <field type="NX_INT64" name="non_energy_channels">
+            <strategy mode="FINAL"/>$datasources.$(name)_nonenergychannels</field>
+          <field type="NX_CHAR" name="scan_variable">
+            <strategy mode="FINAL"/>$datasources.$(name)_scanvariable</field>
+        </group>
+      </group>
+    </group>
+    <group type="NXdata" name="data">
+      <link target="/scan$var.serialno/instrument/$(name)/electron_detector/raw_data/raw" name="$(name)_integratedspectrum"/>
+      <link target="/scan$var.serialno/instrument/$(name)/electron_detector/raw_data/energy" name="$(name)_energy"/>
+      <link target="/scan$var.serialno/instrument/$(name)/electron_detector/data" name="$(name)_fullspectrum"/>
+    </group>
+  </group>
+</definition>

{nxstools-4.32.0 → nxstools-4.35.1/nxstools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxstools
-Version: 4.32.0
+Version: 4.35.1
 Summary: Configuration tools for NeXDaTaS Tango Servers
 Home-page: http://github.com/nexdatas/nxstools
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic

{nxstools-4.32.0 → nxstools-4.35.1}/nxstools.egg-info/SOURCES.txt

@@ -273,6 +273,13 @@ nxstools/xmltemplates/pilatus_mxparameters_cb.ds.xml
 nxstools/xmltemplates/pilatus_postrun.ds.xml
 nxstools/xmltemplates/pilc.xml
 nxstools/xmltemplates/pilc_triggermode_cb.ds.xml
+nxstools/xmltemplates/pilcslavevds.xml
+nxstools/xmltemplates/pilcslavevds_exposuretimemap.ds.xml
+nxstools/xmltemplates/pilcslavevds_value1map.ds.xml
+nxstools/xmltemplates/pilcslavevds_value2map.ds.xml
+nxstools/xmltemplates/pilcslavevds_value3map.ds.xml
+nxstools/xmltemplates/pilcslavevds_value4map.ds.xml
+nxstools/xmltemplates/pilcslavevds_value5map.ds.xml
 nxstools/xmltemplates/pilctimeid.xml
 nxstools/xmltemplates/pilctimeid_triggermode_cb.ds.xml
 nxstools/xmltemplates/pilcvds.xml
@@ -286,6 +293,7 @@ nxstools/xmltemplates/pilcvds_encoder4map.ds.xml
 nxstools/xmltemplates/pilcvds_encoder5map.ds.xml
 nxstools/xmltemplates/pinhole.xml
 nxstools/xmltemplates/pointdet.xml
+nxstools/xmltemplates/prodigyremote.xml
 nxstools/xmltemplates/qbpm.xml
 nxstools/xmltemplates/qbpm_foil.ds.xml
 nxstools/xmltemplates/sample_description.ds.xml

{nxstools-4.32.0 → nxstools-4.35.1}/test/NXSCreateOnlineCPFS_test.py

@@ -336,8 +336,9 @@ class NXSCreateOnlineCPFSTest(unittest.TestCase):
                      "perkinelmerdetector",
                      "pilatus", "pilatus100k",
                      "pilatus1m", "pilatus2m", "pilatus300k",
-                     "pilatus6m", "pilc", "pilctimeid", "pilcvds",
-                     "pilcvds4",
+                     "pilatus6m", "pilc", "pilcslavevds", "pilctimeid",
+                     "pilcvds", "pilcvds4",
+                     "prodigyremote",
                      "tangovimba", "xspress3"])
         finally:
             os.remove(fname)
@@ -378,9 +379,11 @@ class NXSCreateOnlineCPFSTest(unittest.TestCase):
             'pco',
             'pilatus6m',            #
             "pilc",
+            "pilcslavevds",
             "pilctimeid",
             "pilcvds",
             "pilcvds4",
+            "prodigyremote",
             'marccd',               # +
             'pcoedge',              #
             'pilatus100k',          #
@@ -456,8 +459,9 @@ class NXSCreateOnlineCPFSTest(unittest.TestCase):
                              "perkinelmerdetector",
                              "pilatus", "pilatus100k",
                              "pilatus1m", "pilatus2m", "pilatus300k",
-                             "pilatus6m", "pilc", "pilctimeid", "pilcvds",
-                             "pilcvds4",
+                             "pilatus6m", "pilc", "pilcslavevds", "pilctimeid",
+                             "pilcvds", "pilcvds4",
+                             "prodigyremote",
                              "tangovimba", "xspress3"])
                 finally:
                     os.remove(fname)
@@ -535,7 +539,9 @@ class NXSCreateOnlineCPFSTest(unittest.TestCase):
                  "perkinelmerdetector",
                  "pilatus", "pilatus100k",
                  "pilatus1m", "pilatus2m", "pilatus300k",
-                 "pilatus6m", "pilc", "pilctimeid", "pilcvds", "pilcvds4",
+                 "pilatus6m", "pilc", "pilcslavevds", "pilctimeid",
+                 "pilcvds", "pilcvds4",
+                 "prodigyremote",
                  "tangovimba", "xspress3"])
         finally:
             os.remove(fname)