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

Conversation

lukaspie
Copy link
Contributor

No description provided.

@sanbrock sanbrock mentioned this pull request Sep 26, 2024
Open
@lukaspie lukaspie linked an issue Sep 29, 2024 that may be closed by this pull request
NXsource #1459
Open
phyy-nx
phyy-nx reviewed Sep 30, 2024
View reviewed changes
base_classes/NXsource.nxdl.xml Outdated
<item value="Broadband Tunable Light Source"/>
<item value="Halogen lamp"/>
<item value="LED"/>
<item value="Mercury Cadmium Telluride"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add Lamp

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

phyy-nx
phyy-nx reviewed Sep 30, 2024
View reviewed changes
base_classes/NXsource.nxdl.xml Outdated
<item value="other"/>
</enumeration>
</field>
<field name="type_other">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to attribute instead

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

phyy-nx
phyy-nx reviewed Sep 30, 2024
View reviewed changes
base_classes/NXsource.nxdl.xml
<doc>
Gas pressure inside ionization source.
</doc>
</field>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move these into sub-classes (wavelength through gas_pressure)

@phyy-nx
Copy link
Contributor

phyy-nx commented Sep 30, 2024 •
edited
Loading

Proposal: accept changes with additions requested. Cannot merge until NXlens_em is reviewed.

Accepted by vote in NIAC2024

domna and others added 18 commits October 16, 2024 10:33
@domna @lukaspie
Readds mpes relevant changes from 4b064d9
3210f34
@RubelMozumder @lukaspie
Regeneration of the nexus file for fixing the changes coming from old…
eae8fb7 
… 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
@lukaspie
Add NXfabrication to all MPES instrument-related base classes
7a58238 
# 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
@domna @lukaspie
Create nxdls
3d03755 
# Conflicts:
#	base_classes/NXroot.nxdl.xml
#	contributed_definitions/NXmpes.nxdl.xml
@lukaspie
Make NXDLs
a41a47e
@lukaspie
review MPES-related docstrings
80ee17b 
# 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
remove center_wavelength, bunch_numbers
d2b4afc 
# Conflicts:
#	base_classes/nyaml/NXsource.yaml
@lukaspie
remove photon energy, add wavelength
7f1e226 
# Conflicts:
#	base_classes/nyaml/NXsource.yaml
@lukaspie
readd NXsource/pulse_energy
57cd626 
# Conflicts:
#	base_classes/nyaml/NXsource.yaml
@lukaspie
remake NXsource.nxdl.xml
103fbf9 
# Conflicts:
#	base_classes/nyaml/NXsource.yaml
@lukaspie
additions to NXsource and NXdeflector
c8c4100 
# Conflicts:
#	base_classes/nyaml/NXsource.yaml
#	contributed_definitions/NXdeflector.nxdl.xml
#	contributed_definitions/nyaml/NXdeflector.yaml
@lukaspie
add unit categories to new fields in NXsource
330e20c 
# Conflicts:
#	base_classes/nyaml/NXsource.yaml
#	contributed_definitions/NXdeflector.nxdl.xml
#	contributed_definitions/nyaml/NXdeflector.yaml
@lukaspie
format base classes and applications in accordance to existing NIAC v…
5976080 
…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
revert unintentional changes from cherry-pick
9a0437a
@lukaspie
fix copyright in NXsource
9107180
@lukaspie
update type in NXsource
05f3513
@lukaspie @phyy-nx
Apply suggestions from code review
6720925 
Co-authored-by: Aaron S. Brewster <[email protected]>
@lukaspie
changes to NXsource type
de3cbe5
@lukaspie lukaspie added the NIAC vote needed PR needs an approving vote from NIAC before merge label Oct 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@phyy-nx phyy-nx phyy-nx left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
NIAC vote needed PR needs an approving vote from NIAC before merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

NXsource
4 participants
@lukaspie @phyy-nx @domna @RubelMozumder