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.

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

Jump to bottom

FAIRmat 2024: small additions to NXsource #1407

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

FAIRmat 2024: small additions to NXsource #1407

wants to merge 19 commits into from

Commits on Oct 16, 2024

  1. Readds mpes relevant changes from 4b064d9

    @domna @lukaspie
    domna authored and lukaspie committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    3210f34 View commit details
    Browse the repository at this point in the history

  2. Regeneration of the nexus file for fixing the changes coming from old… 

    … 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
    @RubelMozumder @lukaspie
    RubelMozumder authored and lukaspie committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    eae8fb7 View commit details
    Browse the repository at this point in the history

  3. Add NXfabrication to all MPES instrument-related base classes 

    # Conflicts:
#	base_classes/NXdetector.nxdl.xml
#	base_classes/NXinstrument.nxdl.xml
#	base_classes/NXsensor.nxdl.xml
#	base_classes/nyaml/NXdetector.yaml
#	base_classes/nyaml/NXinstrument.yaml
#	base_classes/nyaml/NXsensor.yaml
#	base_classes/nyaml/NXsource.yaml
    @lukaspie
    lukaspie committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    7a58238 View commit details
    Browse the repository at this point in the history

  4. Create nxdls 

    # Conflicts:
#	base_classes/NXroot.nxdl.xml
#	contributed_definitions/NXmpes.nxdl.xml
    @domna @lukaspie
    domna authored and lukaspie committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    3d03755 View commit details
    Browse the repository at this point in the history

  5. Make NXDLs

    @lukaspie
    lukaspie committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    a41a47e View commit details
    Browse the repository at this point in the history

  6. review MPES-related docstrings 

    # Conflicts:
#	base_classes/NXdata.nxdl.xml
#	base_classes/nyaml/NXdata.yaml
#	contributed_definitions/NXactuator.nxdl.xml
#	contributed_definitions/NXcalibration.nxdl.xml
#	contributed_definitions/NXelectronanalyser.nxdl.xml
#	contributed_definitions/NXresolution.nxdl.xml
#	contributed_definitions/nyaml/NXactuator.yaml
#	contributed_definitions/nyaml/NXcalibration.yaml
#	contributed_definitions/nyaml/NXelectronanalyser.yaml
#	contributed_definitions/nyaml/NXresolution.yaml
#	contributed_definitions/nyaml/NXsource.yaml
    @lukaspie
    lukaspie committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    80ee17b View commit details
    Browse the repository at this point in the history

  7. remove center_wavelength, bunch_numbers 

    # Conflicts:
#	base_classes/nyaml/NXsource.yaml
    @lukaspie
    lukaspie committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    d2b4afc View commit details
    Browse the repository at this point in the history

  8. remove photon energy, add wavelength 

    # Conflicts:
#	base_classes/nyaml/NXsource.yaml
    @lukaspie
    lukaspie committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    7f1e226 View commit details
    Browse the repository at this point in the history

  9. readd NXsource/pulse_energy 

    # Conflicts:
#	base_classes/nyaml/NXsource.yaml
    @lukaspie
    lukaspie committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    57cd626 View commit details
    Browse the repository at this point in the history

  10. remake NXsource.nxdl.xml 

    # Conflicts:
#	base_classes/nyaml/NXsource.yaml
    @lukaspie
    lukaspie committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    103fbf9 View commit details
    Browse the repository at this point in the history

  11. additions to NXsource and NXdeflector 

    # Conflicts:
#	base_classes/nyaml/NXsource.yaml
#	contributed_definitions/NXdeflector.nxdl.xml
#	contributed_definitions/nyaml/NXdeflector.yaml
    @lukaspie
    lukaspie committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    c8c4100 View commit details
    Browse the repository at this point in the history

  12. add unit categories to new fields in NXsource 

    # Conflicts:
#	base_classes/nyaml/NXsource.yaml
#	contributed_definitions/NXdeflector.nxdl.xml
#	contributed_definitions/nyaml/NXdeflector.yaml
    @lukaspie
    lukaspie committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    330e20c View commit details
    Browse the repository at this point in the history

  13. format base classes and applications in accordance to existing NIAC v… 

    …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/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/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/NXdetector.yaml
#	contributed_definitions/nyaml/NXinstrument.yaml
    @lukaspie
    lukaspie committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    5976080 View commit details
    Browse the repository at this point in the history

  14. revert unintentional changes from cherry-pick

    @lukaspie
    lukaspie committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    9a0437a View commit details
    Browse the repository at this point in the history

  15. fix copyright in NXsource

    @lukaspie
    lukaspie committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    9107180 View commit details
    Browse the repository at this point in the history

  16. update type in NXsource

    @lukaspie
    lukaspie committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    05f3513 View commit details
    Browse the repository at this point in the history

  17. Apply suggestions from code review 

    Co-authored-by: Aaron S. Brewster <[email protected]>
    @lukaspie @phyy-nx
    lukaspie and phyy-nx committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    6720925 View commit details
    Browse the repository at this point in the history

  18. changes to NXsource type

    @lukaspie
    lukaspie committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    de3cbe5 View commit details
    Browse the repository at this point in the history

  19. move attribute type_other

    @lukaspie
    lukaspie committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    274d658 View commit details
    Browse the repository at this point in the history