Skip to content

Commit

Permalink
make NXsample(_component) extend NXcomponent
Browse files Browse the repository at this point in the history
  • Loading branch information
lukaspie committed Jan 17, 2025
1 parent 91aeee3 commit ceceb6b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 45 deletions.
14 changes: 7 additions & 7 deletions base_classes/NXobject.nxdl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -198,16 +198,16 @@
</field>
<attribute name="default">
<doc>
.. index:: plotting
.. index:: plotting

Declares which child group contains a path leading
to a :ref:`NXdata` group or a group using a base class
Declares which child group contains a path leading
to a :ref:`NXdata` group or a group using a base class
extending :ref:`NXdata`.

It is recommended (as of NIAC2014) to use this attribute
to help define the path to the default dataset to be plotted.
See https://www.nexusformat.org/2014_How_to_find_default_data.html
for a summary of the discussion.
It is recommended (as of NIAC2014) to use this attribute
to help define the path to the default dataset to be plotted.
See https://www.nexusformat.org/2014_How_to_find_default_data.html
for a summary of the discussion.
</doc>
</attribute>
</definition>
20 changes: 1 addition & 19 deletions base_classes/NXsample.nxdl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
name="NXsample"
type="group" extends="NXobject"
type="group" extends="NXcomponent"
>

<symbols>
Expand Down Expand Up @@ -386,23 +386,5 @@
This group describes the shape of the sample
</doc>
</group>
<field name="depends_on" type="NX_CHAR">
<doc>
NeXus positions components by applying a set of translations and rotations
to apply to the component starting from 0, 0, 0. The order of these operations
is critical and forms what NeXus calls a dependency chain. The depends_on
field defines the path to the top most operation of the dependency chain or the
string "." if located in the origin. Usually these operations are stored in a
NXtransformations group. But NeXus allows them to be stored anywhere.
</doc>
</field>
<group type="NXtransformations">
<doc>
This is the group recommended for holding the chain of translation
and rotation operations necessary to position the component within
the instrument. The dependency chain may however traverse similar groups in
other component groups.
</doc>
</group>
</definition>

20 changes: 1 addition & 19 deletions base_classes/NXsample_component.nxdl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
name="NXsample_component"
type="group" extends="NXobject"
type="group" extends="Nxcomponent"
>

<symbols>
Expand Down Expand Up @@ -139,22 +139,4 @@
<group name="transmission" type="NXdata">
<doc>As a function of Wavelength</doc>
</group>
<field name="depends_on" type="NX_CHAR">
<doc>
NeXus positions components by applying a set of translations and rotations
to apply to the component starting from 0, 0, 0. The order of these operations
is critical and forms what NeXus calls a dependency chain. The depends_on
field defines the path to the top most operation of the dependency chain or the
string "." if located in the origin. Usually these operations are stored in a
NXtransformations group. But NeXus allows them to be stored anywhere.
</doc>
</field>
<group type="NXtransformations">
<doc>
This is the group recommended for holding the chain of translation
and rotation operations necessary to position the component within
the instrument. The dependency chain may however traverse similar groups in
other component groups.
</doc>
</group>
</definition>

0 comments on commit ceceb6b

Please sign in to comment.