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.

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: additional base classes in NXinstrument #1419

Draft
wants to merge 22 commits into
base: main
Choose a base branch
from

Commits on Oct 17, 2024

  1. Readds base classes for mpes (from commit 843283a)

    # Conflicts:
    #	base_classes/NXaperture.nxdl.xml
    domna authored and lukaspie committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    1be94c5 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 authored and lukaspie committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    c1b4876 View commit details
    Browse the repository at this point in the history
  3. Store NXsensor on NXinstrument (and NXmanipulator) instead of NXsample

    # Conflicts:
    #	contributed_definitions/NXmpes.nxdl.xml
    #	contributed_definitions/nyaml/NXmpes.yaml
    lukaspie committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    19b73ca View commit details
    Browse the repository at this point in the history
  4. Add NXactuator base class

    # 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
    lukaspie committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    f8d6dec View commit details
    Browse the repository at this point in the history
  5. Add NXfabrication to all MPES instrument-related base classes

    # Conflicts:
    #	base_classes/NXdetector.nxdl.xml
    #	base_classes/NXsensor.nxdl.xml
    #	base_classes/NXsource.nxdl.xml
    lukaspie committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    06d8bb6 View commit details
    Browse the repository at this point in the history
  6. remove explicit resolution names from NXinstrument

    # Conflicts:
    #	base_classes/NXinstrument.nxdl.xml
    lukaspie committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    d5de6d6 View commit details
    Browse the repository at this point in the history
  7. add NXhistory to NXinstrument

    # Conflicts:
    #	base_classes/nyaml/NXinstrument.yaml
    lukaspie committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    c0db855 View commit details
    Browse the repository at this point in the history
  8. 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/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
    lukaspie committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    014c9ec View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    f54a81d View commit details
    Browse the repository at this point in the history
  10. pull out base classes cited in NXinstrument

    move NXfabrication to base_classes
    
    pull out base classes cited in NXinstrument
    lukaspie committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    5967df7 View commit details
    Browse the repository at this point in the history
  11. bring in NXactivity

    lukaspie committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    63ed671 View commit details
    Browse the repository at this point in the history
  12. bring in NXcalibration

    lukaspie committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    3a0eb72 View commit details
    Browse the repository at this point in the history
  13. bring in NXserialized

    lukaspie committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    c82eb1d View commit details
    Browse the repository at this point in the history
  14. Apply suggestions from code review on NXserialized

    Co-authored-by: Aaron S. Brewster <asbrewster@lbl.gov>
    Co-authored-by: Thomas A Caswell <tcaswell@gmail.com>
    3 people committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    aef694c View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    8e5e6fb View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    0c961a9 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    51cf4ff View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    24c0d3e View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    74011bd View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    d79ccf5 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    e7af7a2 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    ede44f3 View commit details
    Browse the repository at this point in the history