Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update appdef for nxsts #182

Merged
merged 16 commits into from
May 3, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion contributed_definitions/NXfabrication.nxdl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,29 @@
<doc>
Details about a component as it is defined by its manufacturer.
</doc>
<field name="name" type="NX_CHAR">
sanbrock marked this conversation as resolved.
Show resolved Hide resolved
<doc>
Name of the insturment or compoenent as it is known to the manufacturer or
community.
</doc>
</field>
<field name="vendor" type="NX_CHAR">
<doc>
Company name of the manufacturer.
</doc>
</field>
<field name="model" type="NX_CHAR">
<doc>
Version or model of the component named by the manufacturer.
Version or model of the component named by the manufacturer. If Version is
different from model, use version.
</doc>
</field>
<attribute name="version" type="NX_CHAR">
<doc>
Version of the component or software if version is intended different than model
or different version of a model.
</doc>
</attribute>
<field name="identifier" type="NX_CHAR">
<doc>
Ideally, (globally) unique persistent identifier, i.e.
Expand Down
16 changes: 8 additions & 8 deletions contributed_definitions/NXlockin.nxdl.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version='1.0' encoding='UTF-8'?>
<?xml-stylesheet type="text/xsl" href="nxdlformat.xsl"?>
<!--
# NeXus - Neutron and X-ray Common Data Format
#
# Copyright (C) 2014-2022 NeXus International Advisory Committee (NIAC)
#
#
# Copyright (C) 2014-2024 NeXus International Advisory Committee (NIAC)
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
Expand All @@ -21,7 +21,7 @@
#
# For further information, see http://www.nexusformat.org
-->
<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" category="base" name="NXlockin" extends="NXobject" type="group" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" category="base" type="group" name="NXlockin" extends="NXobject" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
<doc>
Base classes definition for lock in devices.
</doc>
Expand Down Expand Up @@ -70,8 +70,8 @@
</field>
<field name="demodulated_signal">
<doc>
The input signal (STS signal) will be demodulated, in order to determine the amplitude
and phase at the frequency set in the Frequency field or harmonics, such as current,
The input signal (STS signal) will be demodulated, in order to determine the amplitude
and phase at the frequency set in the Frequency field or harmonics, such as current,
bias, et.al.
</doc>
</field>
Expand Down Expand Up @@ -126,7 +126,7 @@
(foreach DemodulatorChannels)
</doc>
</field>
<field name="ref_phase_N" type="NX_NUMBER" units="NX_FREQUENCY">
<field name="ref_phase_N" type="NX_NUMBER" units="NX_ANGLE">
<doc>
Reference phase for the sine on the demodulated signal with respect to the
modulation signal. (foreach DemodulatorChannels)
Expand Down
Loading
Loading