-
Notifications
You must be signed in to change notification settings - Fork 56
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
Fairmat 2024: new fields for experiment description in NXentry and NXsubentry #1412
Open
lukaspie
wants to merge
14
commits into
nexusformat:main
Choose a base branch
from
FAIRmat-NFDI:fairmat-2024-nxentry
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
… 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
* Add appdef/bc yaml files to gitignore * Improve Makefile for nxdl build * Tricking make to avoid circular dependency * Generalization and cleanup * Change chmod 755 to 644 for NXentry * Reintroduce for-loop for make nyaml * Adds push to github pages * Set correct docs dir * Prepare building * Change id to name * Build and deploy * Push pages to fairmat-docs * Adds clean flag * Use docs folder * Target fairmat branch to rebuild live-docs * Removes old workflows * Updates color and logo * Optimise styling * Add logo padding * Run ci on pr * Adds cleanup ci * Removes yaml files from .gitignore # Conflicts: # .gitignore # Makefile # manual/source/_static/to_alabaster.css # manual/source/img/FAIRmat_new.png
# Conflicts: # base_classes/NXsubentry.nxdl.xml # base_classes/nyaml/NXentry.yaml # base_classes/nyaml/NXsubentry.yaml # contributed_definitions/NXsts.nxdl.xml # contributed_definitions/nyaml/NXsensor_scan.yaml # contributed_definitions/nyaml/NXsts.yaml # contributed_definitions/nyaml/NXtransmission.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/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/NXinstrument.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
lukaspie
force-pushed
the
fairmat-2024-nxentry
branch
from
September 23, 2024 15:13
ff097f7
to
e0b24a6
Compare
Do we know what these are identifiers of? There is an issue about it: #1043 |
Instead of this, add PID to NXobject as an attribute. |
Will a group ever need more than one PID? |
lukaspie
changed the title
Fairmat 2024: introduce NXidentfier, use in NXentry and NXsubentry
Fairmat 2024: introduce NXidentifier, use in NXentry and NXsubentry
Oct 7, 2024
lukaspie
changed the title
Fairmat 2024: introduce NXidentifier, use in NXentry and NXsubentry
Fairmat 2024: new fields for experiment description in NXentry and NXsubentry
Oct 16, 2024
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.
No description provided.