Skip to content

Fairmat 2024: new fields for experiment description in NXentry and NXsubentry #1412

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.

Sign up for GitHub

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

Open
lukaspie wants to merge 19 commits into
base: main
Choose a base branch
from
Open

Fairmat 2024: new fields for experiment description in NXentry and NXsubentry #1412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4bcf506
Readds mpes relevant changes from 4b064d9
domna Aug 15, 2023
4154bf7
Regeneration of the nexus file for fixing the changes coming from old…
RubelMozumder Aug 24, 2023
137f0eb
Convenience functions for nyaml ⇄ nxdl and gh pages build (#67)
domna Sep 25, 2023
1187cac
use NXidentifier in NXentry
lukaspie Sep 11, 2024
b869d50
format base classes and applications in accordance to existing NIAC v…
lukaspie Sep 16, 2024
23145bb
pull out modifications for fairmat-2024-nxentry
lukaspie Sep 20, 2024
b9c8947
revert unintentional changes from cherry-pick
lukaspie Sep 23, 2024
3fc715e
bring in changes on NXsubentry
lukaspie Sep 23, 2024
62b752f
fix copyright dates
lukaspie Sep 23, 2024
a3c7eae
remove NXidentifier
lukaspie Oct 4, 2024
4d1df7a
remove NXidentifier from NXsubentry
lukaspie Oct 4, 2024
b834a23
remove NXidentifier
lukaspie Oct 16, 2024
f987eac
add new NXentry fields to NXsubentry
lukaspie Oct 16, 2024
e3318cf
undo formatting changes to NXentry
lukaspie Jan 15, 2025
2fc892b
deprecated old identifier, inherit from NXobject/identifierNAME
lukaspie Feb 6, 2025
a39bfe6
deprecate NXsubentry/*_identifier fields
lukaspie Feb 26, 2025
6f1fa81
use correct links in deprecation notes
lukaspie Feb 26, 2025
4fd3a53
Merge remote-tracking branch 'upstream/main' into fairmat-2024-nxentry
lukaspie Sep 23, 2025
75aed11
remove deprecation
lukaspie Sep 23, 2025
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
30 changes: 30 additions & 0 deletions base_classes/NXentry.nxdl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,36 @@
<doc>UUID identifier for the measurement.</doc>
<attribute name="version"><doc>Version of UUID used</doc></attribute>
</field>
<field name="experiment_location">
<doc>City and country where the experiment took place</doc>
</field>
<field name="experiment_start_date" type="NX_DATE_TIME">
<doc>
Start time of experimental run that includes the current
measurement, for example a beam time.
</doc>
</field>
<field name="experiment_end_date" type="NX_DATE_TIME">
<doc>
End time of experimental run that includes the current
measurement, for example a beam time.
</doc>
</field>
<field name="experiment_institution">
<doc>
Name of the institution hosting the facility
</doc>
</field>
<field name="experiment_facility">
<doc>
Name of the experimental facility
</doc>
</field>
<field name="experiment_laboratory">
<doc>
Name of the laboratory or beamline
</doc>
</field>
<field name="features">
<doc>
Reserved for future use by NIAC.
Expand Down
30 changes: 30 additions & 0 deletions base_classes/NXsubentry.nxdl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,36 @@
<field name="entry_identifier">
<doc>unique identifier for the measurement, defined by the facility.</doc>
</field>
<field name="experiment_location">
<doc>City and country where the experiment took place</doc>
</field>
<field name="experiment_start_date" type="NX_DATE_TIME">
<doc>
Start time of experimental run that includes the current
measurement, for example a beam time.
</doc>
</field>
<field name="experiment_end_date" type="NX_DATE_TIME">
<doc>
End time of experimental run that includes the current
measurement, for example a beam time.
</doc>
</field>
<field name="experiment_institution">
<doc>
Name of the institution hosting the facility
</doc>
</field>
<field name="experiment_facility">
<doc>
Name of the experimental facility
</doc>
</field>
<field name="experiment_laboratory">
<doc>
Name of the laboratory or beamline
</doc>
</field>
<field name="definition">
<doc>Official NeXus NXDL schema to which this subentry conforms</doc>
<attribute name="version"><doc>NXDL version number</doc></attribute>
Expand Down