From b90645f6e04b5fc12bfc85b548c37097297965b7 Mon Sep 17 00:00:00 2001
From: Laurenz Rettig <rettig@pcr840.gnz.mpg.de>
Date: Fri, 18 Mar 2022 18:15:19 +0100
Subject: [PATCH] revised fields in NXdistortion
---
.../New/nxdl/NXdistortion.nxdl.xml | 23 +++++++++-------
ARPES/Base_Classes/New/yaml/NXdistortion.yml | 26 +++++++++----------
2 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/ARPES/Base_Classes/New/nxdl/NXdistortion.nxdl.xml b/ARPES/Base_Classes/New/nxdl/NXdistortion.nxdl.xml
index 54c30e6..62d393f 100644
--- a/ARPES/Base_Classes/New/nxdl/NXdistortion.nxdl.xml
+++ b/ARPES/Base_Classes/New/nxdl/NXdistortion.nxdl.xml
@@ -26,22 +26,25 @@
<dim index="1" value="2"/>
</dimensions>
</field>
- <field name="original_points_x" type="NX_FLOAT" units="NX_UNITLESS">
- <doc>For symmetry-guided distortion correction. Here we record the x coordinates of the relevant symmetry points.</doc>
- <dimensions rank="1">
+ <field name="original_points" type="NX_FLOAT" units="NX_UNITLESS">
+ <doc>For symmetry-guided distortion correction. Here we record the coordinates of the relevant symmetry points.</doc>
+ <dimensions rank="2">
<dim index="1" value="nsym"/>
+ <dim index="2" value="2"/>
</dimensions>
</field>
- <field name="original_points_y" type="NX_FLOAT" units="NX_UNITLESS">
- <doc>For symmetry-guided distortion correction. Here we record the y coordinates of the relevant symmetry points.</doc>
- <dimensions rank="1">
- <dim index="1" value="nsym"/>
+ <field name="cdeform_field" type="NX_FLOAT" units="NX_UNITLESS">
+ <doc>Column deformation field for general non-rigid distortion corrections. 2D matrix holding the column information of the mapping of each original coordinate.</doc>
+ <dimensions rank="2">
+ <dim index="1" value="ndx"/>
+ <dim index="2" value="ndy"/>
</dimensions>
</field>
- <field name="field" type="NX_FLOAT" units="NX_UNITLESS">
- <doc>For general non-rigid distortion corrections. 2D matrix mapping the original distorted field in the undistorted one.</doc>
+ <field name="rdeform_field" type="NX_FLOAT" units="NX_UNITLESS">
+ <doc>Row deformation field for general non-rigid distortion corrections. 2D matrix holding the row information of the mapping of each original coordinate.</doc>
<dimensions rank="2">
- <dim index="ndx" value="ndy"/>
+ <dim index="1" value="ndx"/>
+ <dim index="2" value="ndy"/>
</dimensions>
</field>
<group type="NXcollection">
diff --git a/ARPES/Base_Classes/New/yaml/NXdistortion.yml b/ARPES/Base_Classes/New/yaml/NXdistortion.yml
index 26bd825..7e72bcd 100644
--- a/ARPES/Base_Classes/New/yaml/NXdistortion.yml
+++ b/ARPES/Base_Classes/New/yaml/NXdistortion.yml
@@ -20,26 +20,26 @@ doc: "Draft subclass of NXprocess to describe post-processing distortion correct
dimensions:
dim: [[1,2]]
rank: 1
- original_points_x(NX_FLOAT):
- doc: "For symmetry-guided distortion correction. Here we record the x coordinates of
+ original_points(NX_FLOAT):
+ doc: "For symmetry-guided distortion correction. Here we record the coordinates of
the relevant symmetry points."
unit: NX_UNITLESS
dimensions:
- dim: [[1,nsym]]
- rank: 1
- original_points_y(NX_FLOAT):
- doc: "For symmetry-guided distortion correction. Here we record the y coordinates of
- the relevant symmetry points."
+ dim: [[1,nsym], [2,2]]
+ rank: 2
+ cdeform_field(NX_FLOAT):
+ doc: "Column deformation field for general non-rigid distortion corrections. 2D matrix holding
+ the column information of the mapping of each original coordinate."
unit: NX_UNITLESS
dimensions:
- dim: [[1,nsym]]
- rank: 1
- field(NX_FLOAT):
- doc: "For general non-rigid distortion corrections. 2D matrix mapping the original
- distorted field in the undistorted one."
+ dim: [[1,ndx], [2,ndy]]
+ rank: 2
+ rdeform_field(NX_FLOAT):
+ doc: "Row deformation field for general non-rigid distortion corrections. 2D matrix holding
+ the row information of the mapping of each original coordinate."
unit: NX_UNITLESS
dimensions:
- dim: [[ndx,ndy]]
+ dim: [[1,ndx], [2,ndy]]
rank: 2
(NXcollection):
doc: "Class to describe freely the procedures employed."
--
GitLab