FAIRmat 2024: additional base classes in NXinstrument #1419
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lukaspie
changed the title
lukaspie
force-pushed
the
fairmat-2024-nxinstrument
branch
from
64226dd
to
5f5b269
Compare
Open
Open
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
lukaspie
commented
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
woutdenolf
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
woutdenolf
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
phyy-nx
reviewed
Sep 30, 2024
lukaspie
commented
Sep 30, 2024
base_classes/NXcalibration.nxdl.xml
Outdated
| calibration method but no actual calibration data. | ||
| </doc> | ||
| </group> | ||
| <group name="calibration_reference" type="NXidentifier"> |
There was a problem hiding this comment.
to be replaced by identifier attribute
There was a problem hiding this comment.
changed to <attribute name="identifier_calibration_reference">
There was a problem hiding this comment.
Waiting on resolution of #1486
lukaspie
commented
Sep 30, 2024
This was referenced Oct 1, 2024
Open
6 tasks
lukaspie
force-pushed
the
fairmat-2024-nxinstrument
branch
from
47d5f4a
to
ea5c4f5
Compare
# Conflicts: # base_classes/NXaperture.nxdl.xml
… version of yaml. Removing unintensional comments # Conflicts: # base_classes/NXbeam.nxdl.xml # base_classes/NXdetector.nxdl.xml # base_classes/NXentry.nxdl.xml # base_classes/NXinstrument.nxdl.xml # base_classes/NXprocess.nxdl.xml # base_classes/NXsample.nxdl.xml # base_classes/NXsource.nxdl.xml # contributed_definitions/NXcollectioncolumn.nxdl.xml # contributed_definitions/NXmpes.nxdl.xml
# Conflicts: # contributed_definitions/NXmpes.nxdl.xml # contributed_definitions/nyaml/NXmpes.yaml
# Conflicts: # base_classes/NXenvironment.nxdl.xml # base_classes/nyaml/NXinstrument.yaml # contributed_definitions/NXmpes.nxdl.xml # contributed_definitions/nyaml/NXmanipulator.yaml # contributed_definitions/nyaml/NXmpes.yaml
# Conflicts: # base_classes/NXdetector.nxdl.xml # base_classes/NXsensor.nxdl.xml # base_classes/NXsource.nxdl.xml
# Conflicts: # base_classes/NXinstrument.nxdl.xml
# Conflicts: # base_classes/nyaml/NXinstrument.yaml
…ersion # Conflicts: # applications/NXarpes.nxdl.xml # applications/nyaml/NXarpes.yaml # base_classes/NXaperture.nxdl.xml # base_classes/NXbeam.nxdl.xml # base_classes/NXdata.nxdl.xml # base_classes/NXdetector.nxdl.xml # base_classes/NXentry.nxdl.xml # base_classes/NXenvironment.nxdl.xml # base_classes/NXinstrument.nxdl.xml # base_classes/NXmonochromator.nxdl.xml # base_classes/NXroot.nxdl.xml # base_classes/NXsample.nxdl.xml # base_classes/NXsample_component.nxdl.xml # base_classes/NXsensor.nxdl.xml # base_classes/NXsource.nxdl.xml # base_classes/NXsubentry.nxdl.xml # base_classes/NXtransformations.nxdl.xml # base_classes/NXuser.nxdl.xml # base_classes/nyaml/NXaperture.yaml # base_classes/nyaml/NXbeam.yaml # base_classes/nyaml/NXdata.yaml # base_classes/nyaml/NXdetector.yaml # base_classes/nyaml/NXentry.yaml # base_classes/nyaml/NXenvironment.yaml # base_classes/nyaml/NXmonochromator.yaml # base_classes/nyaml/NXprocess.yaml # base_classes/nyaml/NXroot.yaml # base_classes/nyaml/NXsample.yaml # base_classes/nyaml/NXsample_component.yaml # base_classes/nyaml/NXsensor.yaml # base_classes/nyaml/NXsource.yaml # base_classes/nyaml/NXsubentry.yaml # base_classes/nyaml/NXtransformations.yaml # base_classes/nyaml/NXuser.yaml # contributed_definitions/nyaml/NXinstrument.yaml
move NXfabrication to base_classes pull out base classes cited in NXinstrument
Co-authored-by: Aaron S. Brewster <asbrewster@lbl.gov> Co-authored-by: Thomas A Caswell <tcaswell@gmail.com>
lukaspie
force-pushed
the
fairmat-2024-nxinstrument
branch
from
ea5c4f5
to
d79ccf5
Compare
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note that the CI/CD is failing here because we are bringing in several new base classes, which by themselves cite additional new base classes. This PR will only be ready once a decision on these new base classes has been reached.