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 fields in NXdetector #1411

Merged
merged 11 commits into from
Oct 22, 2024

Conversation

lukaspie
Copy link
Contributor

No description provided.

@lukaspie lukaspie force-pushed the fairmat-2024-nxdetector branch from 80b53a3 to 6b5db5f Compare September 23, 2024 15:03
@sanbrock sanbrock mentioned this pull request Sep 26, 2024
@lukaspie lukaspie linked an issue Sep 29, 2024 that may be closed by this pull request
@mkuehbach
Copy link
Contributor

mkuehbach commented Sep 29, 2024

  • Reconsider whether at all to specify the dimensionality in efficiency explicitly
  • Concepts sensor_* of type NX_INT should be NX_POSINT, sensor_count, sensor_pixels instead

@phyy-nx
Copy link
Contributor

phyy-nx commented Sep 29, 2024

NIAC: Move the electron detector specific fields to a new subclass of NXdetector. Remove the new NXdata group.

@lukaspie
Copy link
Contributor Author

lukaspie commented Oct 7, 2024

NIAC: Move the electron detector specific fields to a new subclass of NXdetector. Remove the new NXdata group.

Done and done. @sanbrock this should be ready.

domna and others added 9 commits October 16, 2024 10:28
# Conflicts:
#	base_classes/NXaperture.nxdl.xml
#	base_classes/NXdetector.nxdl.xml
… version of yaml.

Removing unintensional comments

# Conflicts:
#	base_classes/NXbeam.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
# Conflicts:
#	base_classes/NXinstrument.nxdl.xml
#	base_classes/NXsensor.nxdl.xml
#	base_classes/NXsource.nxdl.xml
#	base_classes/nyaml/NXdetector.yaml
#	base_classes/nyaml/NXinstrument.yaml
#	base_classes/nyaml/NXsensor.yaml
#	base_classes/nyaml/NXsource.yaml
# Conflicts:
#	contributed_definitions/nyaml/NXdetector.yaml
# Conflicts:
#	base_classes/nyaml/NXdetector.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/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/NXsubentry.yaml
#	base_classes/nyaml/NXtransformations.yaml
#	base_classes/nyaml/NXuser.yaml
#	contributed_definitions/nyaml/NXinstrument.yaml
#	contributed_definitions/nyaml/NXsource.yaml
@lukaspie lukaspie force-pushed the fairmat-2024-nxdetector branch from 7a0d085 to 6cb6b83 Compare October 16, 2024 08:28
Copy link
Contributor

@RubelMozumder RubelMozumder left a comment

Choose a reason for hiding this comment

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

Capitalization

Copy link
Contributor

@PeterC-DLS PeterC-DLS left a comment

Choose a reason for hiding this comment

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

LGTM

@lukaspie lukaspie merged commit fa09ecd into nexusformat:main Oct 22, 2024
2 checks passed
@lukaspie lukaspie deleted the fairmat-2024-nxdetector branch October 22, 2024 09:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

NXdetector
6 participants