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

Fairmat 2024: specialized base classes on top of NXprocess #1420

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
+2 −13
Open

Fairmat 2024: specialized base classes on top of NXprocess #1420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6bf063b
Readds base classes for mpes (from commit 843283a)
domna Aug 9, 2023
b73cd9d
Regeneration of the nexus file for fixing the changes coming from old…
RubelMozumder Aug 24, 2023
b5f8750
format base classes and applications in accordance to existing NIAC v…
lukaspie Sep 16, 2024
550138f
revert unintentional changes from cherry-pick
lukaspie Sep 23, 2024
656049d
pull out base classes cited in NXprocess
lukaspie Sep 23, 2024
29d99ea
move base classes to base_classes folder
lukaspie Sep 23, 2024
6b18a55
move NXfabrication to base_classes
lukaspie Sep 23, 2024
8dc1191
bring in NXidentifier
lukaspie Sep 23, 2024
dd5229c
bring in NXserialized
lukaspie Sep 23, 2024
5ea5eda
bring in NXfabricatipon
lukaspie Sep 23, 2024
33b7dd0
address NIAC 2024 review comments
lukaspie Oct 1, 2024
56e7c37
bring in NXcalibration from instrument branch
lukaspie Oct 17, 2024
394de8d
remove NXfabrication
lukaspie Dec 6, 2024
46d9a9c
push back NXfabrication to contributed
lukaspie Dec 6, 2024
42049c6
fix some links
lukaspie Dec 9, 2024
e0304e5
make NXregistration a subclass of NXprocess
lukaspie Dec 18, 2024
44f2450
remove NXcalibration from base classes
lukaspie Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions ...ributed_definitions/NXdistortion.nxdl.xml → base_classes/NXdistortion.nxdl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#
# For further information, see http://www.nexusformat.org
-->
<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" category="base" name="NXdistortion" extends="NXobject" type="group" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" category="base" name="NXdistortion" extends="NXprocess" type="group" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
<symbols>
<doc>
The symbols used in the schema to specify e.g. dimensions of arrays
Expand All @@ -45,11 +45,6 @@
<doc>
Subclass of NXprocess to describe post-processing distortion correction.
</doc>
<field name="last_process" type="NX_CHAR">
<doc>
Indicates the name of the last operation applied in the NXprocess sequence.
</doc>
</field>
<field name="applied" type="NX_BOOLEAN">
<doc>
Has the distortion correction been applied?
Expand Down
1 change: 0 additions & 1 deletion base_classes/NXprocess.nxdl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,3 @@
</doc>
</attribute>
</definition>

7 changes: 1 addition & 6 deletions ...buted_definitions/NXregistration.nxdl.xml → base_classes/NXregistration.nxdl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#
# For further information, see http://www.nexusformat.org
-->
<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" category="base" name="NXregistration" extends="NXobject" type="group" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" category="base" name="NXregistration" extends="NXprocess" type="group" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd">
<doc>
Describes image registration procedures.
</doc>
Expand All @@ -30,11 +30,6 @@
Has the registration been applied?
</doc>
</field>
<field name="last_process" type="NX_CHAR">
<doc>
Indicates the name of the last operation applied in the NXprocess sequence.
</doc>
</field>
<field name="depends_on" type="NX_CHAR">
<doc>
Specifies the position by pointing to the last transformation in the
Expand Down
Loading