-
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: actuators and sensors in NXenvironment #1414
base: main
Are you sure you want to change the base?
Fairmat 2024: actuators and sensors in NXenvironment #1414
Conversation
34a85f6
to
c840b48
Compare
Dev notes to keep track:
depends on / blocked by:
ToDo:
|
6f8b898
to
4e9cb80
Compare
@lukaspie can you write a description at the top of the file? Also, can you say more about the TODO comment on NXpid? NXpid was not voted on. Indeed, only the changes voted on are allowed, otherwise we need a new vote. Thanks! |
I added a description. My understanding is that accepted base classes should only make use of base classes that are themselves also accepted. Since |
# Conflicts: # base_classes/nyaml/NXenvironment.yaml # contributed_definitions/NXmpes.nxdl.xml # contributed_definitions/nyaml/NXmpes.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/NXentry.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
# Conflicts: # base_classes/NXdetector.nxdl.xml # base_classes/NXinstrument.nxdl.xml # base_classes/NXsensor.nxdl.xml # base_classes/NXsource.nxdl.xml
# Conflicts: # base_classes/NXinstrument.nxdl.xml # base_classes/nyaml/NXenvironment.yaml
…s in the catchen test # Conflicts: # base_classes/NXdata.nxdl.xml
…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/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
bring back files lost during cherry pick
Co-authored-by: Aaron S. Brewster <[email protected]>
4e9cb80
to
1820ea0
Compare
@phyy-nx following up on the discussion here and in #1407, I removed |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was already approved by NIAC vote (#1451 (comment)). After these changes are done, we can merge.
<doc> | ||
Describe where the actuator is attached to. | ||
This could be an instance of NXsample or a device on NXinstrument. | ||
</doc> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
attached_to --> actuation_target
Should be a NeXus path as opposed to a description
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
changed
Co-authored-by: Aaron S. Brewster <[email protected]>
@phyy-nx all comments addressed, feel free to finally review and merge. Thanks! |
This PR is aimed at further elaborating
NXenvironment
:NXactuator
is added that closely resemblesNXsensor
, but instead of sensing something (like e.g. anNXsensor
describing a thermocouple), it produces an actuation/output (think a sample heater for example).NXsensor
andNXactuator
are added toNXenvironment
. In addtion, avalue
field is added toNXenvironment
, which shall only be used when there is no ctuator/sensor that controls/measures the environment parameters, but the user would still like to give a value for it. An example would be a measured at room temperature where the temperature is only estimated.NXfabrication
was added, containing information about the vendor, model, serial number, etc.The base classEDIT:NXpid
was moved fromcontributed
tobase_classes
, since it is used inNXactuator
and accepted base classes should (as far as we understand) only make use of base classes that are themselves also accepted (see discussion below).NXpid
to be handled in MoveNXpid
to base classes #1522.