From b125713c825a814b47ccd8373b1e70dc7624a115 Mon Sep 17 00:00:00 2001 From: Arnold Paecklar <61598106+aapaecklar@users.noreply.github.com> Date: Fri, 10 May 2024 14:19:08 +0200 Subject: [PATCH 1/5] Update NXstress.nxdl.xml --- contributed_definitions/NXstress.nxdl.xml | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/contributed_definitions/NXstress.nxdl.xml b/contributed_definitions/NXstress.nxdl.xml index be795a6b8..dfdb25fe3 100644 --- a/contributed_definitions/NXstress.nxdl.xml +++ b/contributed_definitions/NXstress.nxdl.xml @@ -192,24 +192,24 @@ - Geometry and/or efficiency measurement(s). - - Describe the type of calibration + This group contains information about the geometry and/or efficiency measurement(s). + + Describe the type of calibration. - Name of the calibration file + File name(s) and/or path(s) (withing file(s)) containing data from the last calibration(s). This can be a list. Calibration file content. - Mime content type of note *data* field e.g. text/plain, application/json + Mime content type of calibration *data* field e.g. text/plain, application/json,... - Author or creator of note + Author or creator of the calibration. - Date note created/added + Date calibration was created/added @@ -240,7 +240,7 @@ Source energy. The energy should be provided in keV, but if chosen otherwise, the units must be clearly specified. For storage rings, this would be the particle beam energy. - For X-ray tubes, this would be the excitation voltage. In case of energy dispersive diffraction, the + For X-ray tubes, this would be the excitation voltage. In case of energy dispersive diffraction, the lowest and highest energy should be provided. @@ -911,7 +911,7 @@ - Name of the crystallographic phase (hematite, goethite, a-Al\ :sub:`2`\ O\ :sub:`3`\ , ...). + Name of the crystallographic phase (hematite, goethite, \ :math:`\alpha`-Al\ :sub:`2`\ O\ :sub:`3`\ , ...). @@ -1008,8 +1008,8 @@ - if *center_type="two-theta"* then *cUnit* must have the angle unit *degrees* - if *center_type="energy"* then *cUnit* must have the unit *keV* - - if *center_type="momentum-transfer"* then *cUnit* must have the unit \ :math:`Å^{-1}` - - if *center_type="d-spacing"* then *cUnit* must have the unit \ :math:`Å` + - if *center_type="momentum-transfer"* then *cUnit* must have the unit \ :math:`\unicode{x212B}^{-1}` + - if *center_type="d-spacing"* then *cUnit* must have the unit \ :math:`\unicode{x212B}` - if *center_type="channel"* then *cUnit* must be *dimensioness* - if *center_type="time-of-flight"* then *cUnit* must have the unit \ :math:`\mu\mathrm{s}` @@ -1053,4 +1053,4 @@ - \ No newline at end of file + From a7d55e59f7324b0e80195fad94e014f8c01bba38 Mon Sep 17 00:00:00 2001 From: Arnold Paecklar <61598106+aapaecklar@users.noreply.github.com> Date: Mon, 13 May 2024 14:53:46 +0200 Subject: [PATCH 2/5] Update contributed_definitions/NXstress.nxdl.xml Deleted the energy dispersive information. --- contributed_definitions/NXstress.nxdl.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contributed_definitions/NXstress.nxdl.xml b/contributed_definitions/NXstress.nxdl.xml index dfdb25fe3..5434bbadc 100644 --- a/contributed_definitions/NXstress.nxdl.xml +++ b/contributed_definitions/NXstress.nxdl.xml @@ -240,7 +240,8 @@ Source energy. The energy should be provided in keV, but if chosen otherwise, the units must be clearly specified. For storage rings, this would be the particle beam energy. - For X-ray tubes, this would be the excitation voltage. In case of energy dispersive diffraction, the lowest and highest energy should be provided. + For X-ray tubes, this would be the excitation voltage. + From cb6b1a8e3bd37ab84a4be211b387d4ea20eba7a3 Mon Sep 17 00:00:00 2001 From: Arnold Paecklar <61598106+aapaecklar@users.noreply.github.com> Date: Mon, 13 May 2024 15:09:45 +0200 Subject: [PATCH 3/5] Update contributed_definitions/NXstress.nxdl.xml Change back again the angstrom symbol --- contributed_definitions/NXstress.nxdl.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contributed_definitions/NXstress.nxdl.xml b/contributed_definitions/NXstress.nxdl.xml index 5434bbadc..432241e81 100644 --- a/contributed_definitions/NXstress.nxdl.xml +++ b/contributed_definitions/NXstress.nxdl.xml @@ -1009,7 +1009,8 @@ - if *center_type="two-theta"* then *cUnit* must have the angle unit *degrees* - if *center_type="energy"* then *cUnit* must have the unit *keV* - - if *center_type="momentum-transfer"* then *cUnit* must have the unit \ :math:`\unicode{x212B}^{-1}` + - if *center_type="momentum-transfer"* then *cUnit* must have the unit \ :math:`Å^{-1}`^{-1}` + - if *center_type="d-spacing"* then *cUnit* must have the unit \ :math:`\unicode{x212B}` - if *center_type="channel"* then *cUnit* must be *dimensioness* - if *center_type="time-of-flight"* then *cUnit* must have the unit \ :math:`\mu\mathrm{s}` From 4bd7821bf9eb777bbf70d901b951ca345cc2dcdc Mon Sep 17 00:00:00 2001 From: Wout De Nolf Date: Wed, 15 May 2024 14:01:19 +0200 Subject: [PATCH 4/5] Update contributed_definitions/NXstress.nxdl.xml Co-authored-by: Arnold Paecklar <61598106+aapaecklar@users.noreply.github.com> --- contributed_definitions/NXstress.nxdl.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contributed_definitions/NXstress.nxdl.xml b/contributed_definitions/NXstress.nxdl.xml index 432241e81..0a4c3fd78 100644 --- a/contributed_definitions/NXstress.nxdl.xml +++ b/contributed_definitions/NXstress.nxdl.xml @@ -1009,9 +1009,8 @@ - if *center_type="two-theta"* then *cUnit* must have the angle unit *degrees* - if *center_type="energy"* then *cUnit* must have the unit *keV* - - if *center_type="momentum-transfer"* then *cUnit* must have the unit \ :math:`Å^{-1}`^{-1}` - - - if *center_type="d-spacing"* then *cUnit* must have the unit \ :math:`\unicode{x212B}` + - if *center_type="momentum-transfer"* then *cUnit* must have the unit \ :math:`Å^{-1}` + - if *center_type="d-spacing"* then *cUnit* must have the unit \ :math:`Å` - if *center_type="channel"* then *cUnit* must be *dimensioness* - if *center_type="time-of-flight"* then *cUnit* must have the unit \ :math:`\mu\mathrm{s}` From 155b3716a13d2eb1945c0a6b144e2dd656dbb15f Mon Sep 17 00:00:00 2001 From: woutdenolf Date: Wed, 15 May 2024 14:11:32 +0200 Subject: [PATCH 5/5] fix misconception about energy/wavelength --- contributed_definitions/NXstress.nxdl.xml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/contributed_definitions/NXstress.nxdl.xml b/contributed_definitions/NXstress.nxdl.xml index 0a4c3fd78..317e11714 100644 --- a/contributed_definitions/NXstress.nxdl.xml +++ b/contributed_definitions/NXstress.nxdl.xml @@ -212,7 +212,6 @@ Date calibration was created/added - @@ -237,18 +236,6 @@ - - - Source energy. The energy should be provided in keV, but if chosen otherwise, the units must be clearly specified. For storage rings, this would be the particle beam energy. - For X-ray tubes, this would be the excitation voltage. - - - - - - In case of monochromatic radiation, the wavelength used during the experiment. The wavelength should be provided in \ :math:`Å`, but if chosen otherwise, the units must be clearly specified. - - Zero or more of these groups describe the detectors used in the experiment. @@ -290,7 +277,6 @@ In this use case, the efficiency and wavelength arrays must have the same dimensionality. - @@ -411,6 +397,12 @@ Describes how the beam intensity profile in the secondary horizontal direction was determined. Examples of valid entries are: ``measured``, ``theoretical``, ``estimated``, ... + + Incident energy mostly useful for monochromatic beams. + + + Incident wavelength mostly useful for monochromatic beams. +