From 7abdfb48214bf3a1cbb2fe833c92cd42186206f2 Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Wed, 25 Jun 2025 14:11:32 +0200 Subject: [PATCH 01/23] Adding FELDNAME field to NXobject --- base_classes/NXobject.nxdl.xml | 45 +++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/base_classes/NXobject.nxdl.xml b/base_classes/NXobject.nxdl.xml index c6ef1ce7d0..dd30e26349 100644 --- a/base_classes/NXobject.nxdl.xml +++ b/base_classes/NXobject.nxdl.xml @@ -27,23 +27,60 @@ name="NXobject" type="group"> - This is the base object of NeXus. The groups and fields contained - within this file are allowed to be present in any derived base class. + This is the base object of NeXus. The groups and fields contained + within this base class are allowed to be present in any derived base class. + + The FIELDNAME refers to a defined field of the derived base class or any + element that is not defined by the base class. If nameType="partial", the placeholders (e.g., FIELDNAME or GROUPNAME) can be replaced by the name of any object (field or group, - respectively) that exists within the same group. - + respectively). + + NXlog group containing logged values of GROUPNAME. + + + A field that is defined by the derived base class or added without + existing definition. Its type can be defined by the data_type attribute + and a meaning could be provided by the identifier attribute. + + + + Declares the NXDL data type of the field if the field (and its + type) is not defined by the derived class. + + + + + An identifier for a (persistent) resource. + + An identifier, provided by some authority, that has been assigned to an + object describing this field. + + See the type attribute of the identifierNAME field for examples of identifiers. + + + + + An identifier for a (persistent) resource. + + An identifier, provided by some authority, that has been assigned to an + object describing the units of the field. + + See the type attribute of the identifierNAME field for examples of identifiers. + + + Target values of FIELDNAME. From 99cf30777e16edb5927d9685947adbaa57cf5a76 Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Thu, 26 Jun 2025 11:43:12 +0200 Subject: [PATCH 02/23] NXobject: Rewording of the FIELDNAME field. --- base_classes/NXobject.nxdl.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base_classes/NXobject.nxdl.xml b/base_classes/NXobject.nxdl.xml index dd30e26349..e80574ca22 100644 --- a/base_classes/NXobject.nxdl.xml +++ b/base_classes/NXobject.nxdl.xml @@ -31,7 +31,7 @@ within this base class are allowed to be present in any derived base class. The FIELDNAME refers to a defined field of the derived base class or any - element that is not defined by the base class. + field that is not defined by the base class. If nameType="partial", the placeholders (e.g., FIELDNAME or GROUPNAME) can be replaced by the name of any object (field or group, From 4367f66b70f0c53effc78f531fab0e04414e8981 Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Fri, 27 Jun 2025 09:00:01 +0200 Subject: [PATCH 03/23] Restore original state --- base_classes/NXobject.nxdl.xml | 45 +++------------------------------- 1 file changed, 4 insertions(+), 41 deletions(-) diff --git a/base_classes/NXobject.nxdl.xml b/base_classes/NXobject.nxdl.xml index e80574ca22..c6ef1ce7d0 100644 --- a/base_classes/NXobject.nxdl.xml +++ b/base_classes/NXobject.nxdl.xml @@ -27,60 +27,23 @@ name="NXobject" type="group"> - This is the base object of NeXus. The groups and fields contained - within this base class are allowed to be present in any derived base class. - - The FIELDNAME refers to a defined field of the derived base class or any - field that is not defined by the base class. + This is the base object of NeXus. The groups and fields contained + within this file are allowed to be present in any derived base class. If nameType="partial", the placeholders (e.g., FIELDNAME or GROUPNAME) can be replaced by the name of any object (field or group, - respectively). - + respectively) that exists within the same group. + - NXlog group containing logged values of GROUPNAME. - - - A field that is defined by the derived base class or added without - existing definition. Its type can be defined by the data_type attribute - and a meaning could be provided by the identifier attribute. - - - - Declares the NXDL data type of the field if the field (and its - type) is not defined by the derived class. - - - - - An identifier for a (persistent) resource. - - An identifier, provided by some authority, that has been assigned to an - object describing this field. - - See the type attribute of the identifierNAME field for examples of identifiers. - - - - - An identifier for a (persistent) resource. - - An identifier, provided by some authority, that has been assigned to an - object describing the units of the field. - - See the type attribute of the identifierNAME field for examples of identifiers. - - - Target values of FIELDNAME. From 9596b4d24d257d3a4a3372ec564250ede3c6dc02 Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Fri, 27 Jun 2025 10:30:12 +0200 Subject: [PATCH 04/23] NXsensor: Adding additional options to measurement field --- base_classes/NXsensor.nxdl.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base_classes/NXsensor.nxdl.xml b/base_classes/NXsensor.nxdl.xml index d46d176038..b178dc7380 100644 --- a/base_classes/NXsensor.nxdl.xml +++ b/base_classes/NXsensor.nxdl.xml @@ -65,6 +65,9 @@ + + + From d2201f0a22ae15199edf35113f742992c4d4bc98 Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Fri, 27 Jun 2025 10:40:32 +0200 Subject: [PATCH 05/23] NXsensor: Adding a description field --- base_classes/NXsensor.nxdl.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/base_classes/NXsensor.nxdl.xml b/base_classes/NXsensor.nxdl.xml index b178dc7380..9dbba014b5 100644 --- a/base_classes/NXsensor.nxdl.xml +++ b/base_classes/NXsensor.nxdl.xml @@ -40,6 +40,11 @@ Short name of sensor used e.g. on monitor display program + + + Description of the sensor + + where sensor is attached to ("sample" | "can") From 5a7a987f06ecc4dabbe31ca7f2eb55b1261a87b0 Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Fri, 27 Jun 2025 13:05:39 +0200 Subject: [PATCH 06/23] NXsample: Adding pH, pH_env, and NX_MOLAR_MASS --- base_classes/NXsample.nxdl.xml | 10 ++++++++++ nxdlTypes.xsd | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml index 10717cb594..2c80ad1bb4 100644 --- a/base_classes/NXsample.nxdl.xml +++ b/base_classes/NXsample.nxdl.xml @@ -36,6 +36,7 @@ number of values in applied magnetic field number of values in applied pressure field number of values in applied stress field + number of pH values @@ -121,6 +122,12 @@ + + Sample pH value + + + + Sample changer position @@ -348,6 +355,9 @@ Additional sample magnetic environment information + + Additional sample pH environment information + value sent to user's sample setup diff --git a/nxdlTypes.xsd b/nxdlTypes.xsd index b9c972571d..3877e641bf 100644 --- a/nxdlTypes.xsd +++ b/nxdlTypes.xsd @@ -63,6 +63,7 @@ nxdl:NX_LENGTH nxdl:NX_MASS nxdl:NX_MASS_DENSITY + nxdl:NX_MOLAR_DENSITY nxdl:NX_MOLECULAR_WEIGHT nxdl:NX_PER_AREA nxdl:NX_PER_LENGTH @@ -238,6 +239,16 @@ + + + + + units of molar concentration + mol/L + + + + From bfcb75fa1c08dc3dd9c034c3e52139abf00d3d24 Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Fri, 27 Jun 2025 13:21:39 +0200 Subject: [PATCH 07/23] NXsample: Adding electric_field_env group --- base_classes/NXsample.nxdl.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml index 2c80ad1bb4..5fbd238f53 100644 --- a/base_classes/NXsample.nxdl.xml +++ b/base_classes/NXsample.nxdl.xml @@ -358,6 +358,9 @@ Additional sample pH environment information + + Additional sample electric field environment information + value sent to user's sample setup From 224d4ec5f4e4ebaed53649a7253320228d281bb6 Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Fri, 27 Jun 2025 13:30:38 +0200 Subject: [PATCH 08/23] NXsample: Adding current field and current_env group --- base_classes/NXsample.nxdl.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml index 5fbd238f53..631e30c23a 100644 --- a/base_classes/NXsample.nxdl.xml +++ b/base_classes/NXsample.nxdl.xml @@ -37,6 +37,7 @@ number of values in applied pressure field number of values in applied stress field number of pH values + number of current values @@ -128,6 +129,12 @@ + + Applied current + + + + Sample changer position @@ -361,6 +368,9 @@ Additional sample electric field environment information + + Additional sample current environment information + value sent to user's sample setup From 792e70cd8f972819bf9259e443e63432bd85f2ca Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Fri, 27 Jun 2025 13:54:18 +0200 Subject: [PATCH 09/23] NXsample: Adding conductivity, conductivity_env, and NX_CONDUCTIVITY --- base_classes/NXsample.nxdl.xml | 12 +++++++++++- nxdlTypes.xsd | 13 ++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml index 631e30c23a..fed356ed94 100644 --- a/base_classes/NXsample.nxdl.xml +++ b/base_classes/NXsample.nxdl.xml @@ -38,6 +38,7 @@ number of values in applied stress field number of pH values number of current values + number of conductivity values @@ -131,10 +132,16 @@ Applied current - + + + Sample electrical conductivity + + + + Sample changer position @@ -371,6 +378,9 @@ Additional sample current environment information + + Additional sample conductivity environment information + value sent to user's sample setup diff --git a/nxdlTypes.xsd b/nxdlTypes.xsd index 3877e641bf..7472974bd4 100644 --- a/nxdlTypes.xsd +++ b/nxdlTypes.xsd @@ -54,6 +54,7 @@ nxdl:NX_AREA nxdl:NX_CROSS_SECTION nxdl:NX_CHARGE + nxdl:NX_CONDUCTIVITY nxdl:NX_CURRENT nxdl:NX_DIMENSIONLESS nxdl:NX_EMITTANCE @@ -116,7 +117,17 @@ - + + + + + units of electrical conductivity + S/m + + + + + From 2ba6edb437ff280aef64ebc6556e2fb0729c7dc8 Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Wed, 2 Jul 2025 10:01:50 +0200 Subject: [PATCH 10/23] NXsample: Adding resistance, resistance_env, and NX_RESISTANCE --- base_classes/NXsample.nxdl.xml | 10 ++++++++++ nxdlTypes.xsd | 15 +++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml index fed356ed94..511712c2bd 100644 --- a/base_classes/NXsample.nxdl.xml +++ b/base_classes/NXsample.nxdl.xml @@ -39,6 +39,7 @@ number of pH values number of current values number of conductivity values + number of resistance values @@ -142,6 +143,12 @@ + + Sample electrical resistance + + + + Sample changer position @@ -381,6 +388,9 @@ Additional sample conductivity environment information + + Additional sample resistance environment information + value sent to user's sample setup diff --git a/nxdlTypes.xsd b/nxdlTypes.xsd index 7472974bd4..0755a43856 100644 --- a/nxdlTypes.xsd +++ b/nxdlTypes.xsd @@ -55,6 +55,7 @@ nxdl:NX_CROSS_SECTION nxdl:NX_CHARGE nxdl:NX_CONDUCTIVITY + nxdl:NX_COUNT nxdl:NX_CURRENT nxdl:NX_DIMENSIONLESS nxdl:NX_EMITTANCE @@ -72,7 +73,7 @@ nxdl:NX_POWER nxdl:NX_PRESSURE nxdl:NX_PULSES - nxdl:NX_COUNT + nxdl:NX_RESISTANCE nxdl:NX_SCATTERING_LENGTH_DENSITY nxdl:NX_SOLID_ANGLE nxdl:NX_TEMPERATURE @@ -332,7 +333,17 @@ - + + + + + units of electrical resistance + ohm + + + + + From 9da44085de64ae917198fd5324c3aaf74fbb5aca Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Wed, 2 Jul 2025 10:50:42 +0200 Subject: [PATCH 11/23] NXsample: Adding voltage and voltage_env --- base_classes/NXsample.nxdl.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml index 511712c2bd..1959f6e65c 100644 --- a/base_classes/NXsample.nxdl.xml +++ b/base_classes/NXsample.nxdl.xml @@ -40,6 +40,7 @@ number of current values number of conductivity values number of resistance values + number of values in applied voltage @@ -149,6 +150,12 @@ + + Applied voltage + + + + Sample changer position @@ -391,6 +398,9 @@ Additional sample resistance environment information + + Additional sample voltage environment information + value sent to user's sample setup From 4f60aeedc5a7ff8b2b0eb4bfba7364808b3b6e9d Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Wed, 2 Jul 2025 10:54:59 +0200 Subject: [PATCH 12/23] NXsample: Changing rank of voltage --- base_classes/NXsample.nxdl.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml index 1959f6e65c..dc0c75dabb 100644 --- a/base_classes/NXsample.nxdl.xml +++ b/base_classes/NXsample.nxdl.xml @@ -152,7 +152,7 @@ Applied voltage - + From 5befb15b35debad4714b4fd6ba90dfe9f9167c6a Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Wed, 2 Jul 2025 11:00:57 +0200 Subject: [PATCH 13/23] NXsample: Adding pressure_env --- base_classes/NXsample.nxdl.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml index dc0c75dabb..75e171918d 100644 --- a/base_classes/NXsample.nxdl.xml +++ b/base_classes/NXsample.nxdl.xml @@ -386,6 +386,9 @@ Additional sample pH environment information + + Additional sample pressure environment information + Additional sample electric field environment information From bd991020d89475d9079306d8991868c82fb25a92 Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Wed, 2 Jul 2025 11:12:16 +0200 Subject: [PATCH 14/23] NXsample: Adding flow, flow_env, and NX_FLOW --- base_classes/NXsample.nxdl.xml | 10 ++++++++++ nxdlTypes.xsd | 13 ++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml index 75e171918d..e79a82a8df 100644 --- a/base_classes/NXsample.nxdl.xml +++ b/base_classes/NXsample.nxdl.xml @@ -41,6 +41,7 @@ number of conductivity values number of resistance values number of values in applied voltage + number of flow rates @@ -156,6 +157,12 @@ + + Sample flow rate + + + + Sample changer position @@ -404,6 +411,9 @@ Additional sample voltage environment information + + Additional sample flow environment information + value sent to user's sample setup diff --git a/nxdlTypes.xsd b/nxdlTypes.xsd index 0755a43856..afc99c15fb 100644 --- a/nxdlTypes.xsd +++ b/nxdlTypes.xsd @@ -60,6 +60,7 @@ nxdl:NX_DIMENSIONLESS nxdl:NX_EMITTANCE nxdl:NX_ENERGY + nxdl:NX_FLOW nxdl:NX_FLUX nxdl:NX_FREQUENCY nxdl:NX_LENGTH @@ -201,7 +202,17 @@ - + + + + + units of volumetric or mass flow rate + m^3/s, kg/s + + + + + From c354fda5f9ef6ba9a7464e9a0b5b5da45ca80cbe Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Wed, 2 Jul 2025 11:22:44 +0200 Subject: [PATCH 15/23] NXsample: Adding stress_field_env --- base_classes/NXsample.nxdl.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml index e79a82a8df..962e02815c 100644 --- a/base_classes/NXsample.nxdl.xml +++ b/base_classes/NXsample.nxdl.xml @@ -414,6 +414,9 @@ Additional sample flow environment information + + Additional sample stress field environment information + value sent to user's sample setup From fc9461dd7fec28873c67642604e4105169558516 Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Wed, 2 Jul 2025 11:47:14 +0200 Subject: [PATCH 16/23] NXsample: Adding strain and strain_field_env --- base_classes/NXsample.nxdl.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml index 962e02815c..727f8a8c40 100644 --- a/base_classes/NXsample.nxdl.xml +++ b/base_classes/NXsample.nxdl.xml @@ -42,6 +42,7 @@ number of resistance values number of values in applied voltage number of flow rates + number of values in applied strain field @@ -163,6 +164,19 @@ + + Sample strain field + + + + + + + + + + + Sample changer position @@ -417,6 +431,9 @@ Additional sample stress field environment information + + Additional sample strain field environment information + value sent to user's sample setup From 02490831f8b03332b2ff6a6dfe60785125312d99 Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Wed, 2 Jul 2025 14:43:43 +0200 Subject: [PATCH 17/23] NXsample: Adding shear_field and shear_field_env --- base_classes/NXsample.nxdl.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml index 727f8a8c40..852b50974f 100644 --- a/base_classes/NXsample.nxdl.xml +++ b/base_classes/NXsample.nxdl.xml @@ -43,6 +43,7 @@ number of values in applied voltage number of flow rates number of values in applied strain field + number of shear values @@ -177,6 +178,19 @@ + + Sample shear stress field + + + + + + + + + + + Sample changer position @@ -434,6 +448,9 @@ Additional sample strain field environment information + + Additional sample shear stress field environment information + value sent to user's sample setup From 1c44f4cd22f466cf6bdfd861921495431be63b3f Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Wed, 2 Jul 2025 15:16:05 +0200 Subject: [PATCH 18/23] NXsample: Adding surface_pressure and surface_pressure_env --- base_classes/NXsample.nxdl.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml index 852b50974f..086ef29c8e 100644 --- a/base_classes/NXsample.nxdl.xml +++ b/base_classes/NXsample.nxdl.xml @@ -44,6 +44,7 @@ number of flow rates number of values in applied strain field number of shear values + number of values in applied surface pressure field @@ -191,6 +192,19 @@ + + Sample surface pressure field + + + + + + + + + + + Sample changer position @@ -451,6 +465,9 @@ Additional sample shear stress field environment information + + Additional sample surface pressure field environment information + value sent to user's sample setup From 1669b8670743330fae45f5e895a746551473bf68 Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Wed, 2 Jul 2025 15:28:31 +0200 Subject: [PATCH 19/23] NXsample: Adding humidity and humidity_env --- base_classes/NXsample.nxdl.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml index 086ef29c8e..787c043bf6 100644 --- a/base_classes/NXsample.nxdl.xml +++ b/base_classes/NXsample.nxdl.xml @@ -45,6 +45,7 @@ number of values in applied strain field number of shear values number of values in applied surface pressure field + number of humidity values @@ -205,6 +206,12 @@ + + Sample humidity + + + + Sample changer position @@ -468,6 +475,9 @@ Additional sample surface pressure field environment information + + Additional sample humidity environment information + value sent to user's sample setup From 7f57d28748cd59ae2b6e562987351d7ee139d568 Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Wed, 2 Jul 2025 15:38:09 +0200 Subject: [PATCH 20/23] NXsample: Adding viscosity, viscosity_env, and NX_PRESSURE_TIME --- base_classes/NXsample.nxdl.xml | 10 ++++++++++ nxdlTypes.xsd | 13 ++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml index 787c043bf6..bb97a89eb5 100644 --- a/base_classes/NXsample.nxdl.xml +++ b/base_classes/NXsample.nxdl.xml @@ -46,6 +46,7 @@ number of shear values number of values in applied surface pressure field number of humidity values + number of viscosity values @@ -212,6 +213,12 @@ + + Sample viscosity + + + + Sample changer position @@ -478,6 +485,9 @@ Additional sample humidity environment information + + Additional sample viscosity environment information + value sent to user's sample setup diff --git a/nxdlTypes.xsd b/nxdlTypes.xsd index afc99c15fb..6e07e954a6 100644 --- a/nxdlTypes.xsd +++ b/nxdlTypes.xsd @@ -73,6 +73,7 @@ nxdl:NX_PERIOD nxdl:NX_POWER nxdl:NX_PRESSURE + nxdl:NX_PRESSURE_TIME nxdl:NX_PULSES nxdl:NX_RESISTANCE nxdl:NX_SCATTERING_LENGTH_DENSITY @@ -333,7 +334,17 @@ - + + + + + units of pressure multiplied by time + Pa * s + + + + + From b950be315131d0713ca628eb9946449eb7a3b3f5 Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Wed, 2 Jul 2025 15:51:37 +0200 Subject: [PATCH 21/23] NXsample: Adding concentration_env --- base_classes/NXsample.nxdl.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml index bb97a89eb5..2fc3fef419 100644 --- a/base_classes/NXsample.nxdl.xml +++ b/base_classes/NXsample.nxdl.xml @@ -40,7 +40,7 @@ number of current values number of conductivity values number of resistance values - number of values in applied voltage + number of voltage values number of flow rates number of values in applied strain field number of shear values @@ -488,6 +488,9 @@ Additional sample viscosity environment information + + Additional sample concentration environment information + value sent to user's sample setup From 05b6ac657a5d2f533533d021a37106f289680c86 Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Thu, 3 Jul 2025 14:16:03 +0200 Subject: [PATCH 22/23] NXsample: Removing magnetic_field NXlog group --- base_classes/NXsample.nxdl.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml index 2fc3fef419..0d720a8f54 100644 --- a/base_classes/NXsample.nxdl.xml +++ b/base_classes/NXsample.nxdl.xml @@ -436,9 +436,6 @@ Additional sample temperature environment information - - magnetic_field.value is a link to e.g. magnetic_field_env.sensor1.value - magnetic_field_log.value is a link to e.g. magnetic_field_env.sensor1.value_log.value From 9788a8adffb481179d898fd61cf4d68d52d493db Mon Sep 17 00:00:00 2001 From: Gerrit Guenther Date: Fri, 4 Jul 2025 11:11:13 +0200 Subject: [PATCH 23/23] NXsensor: Differ between value and value_set --- base_classes/NXsensor.nxdl.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base_classes/NXsensor.nxdl.xml b/base_classes/NXsensor.nxdl.xml index 9dbba014b5..c80ab33b29 100644 --- a/base_classes/NXsensor.nxdl.xml +++ b/base_classes/NXsensor.nxdl.xml @@ -110,8 +110,8 @@ - nominal setpoint or average value - - need [n] as may be a vector + Average value of the sensor - need [n] as may be a vector. + For a nominal setpoint use the generally defined value_set field. @@ -119,7 +119,7 @@ - Nominal/average first derivative of value + Average first derivative of value e.g. strain rate - same dimensions as "value" (may be a vector) @@ -129,7 +129,7 @@ - Nominal/average second derivative of value + Average second derivative of value - same dimensions as "value" (may be a vector)