diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml index 10717cb594..0d720a8f54 100644 --- a/base_classes/NXsample.nxdl.xml +++ b/base_classes/NXsample.nxdl.xml @@ -36,6 +36,17 @@ 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 + number of current values + number of conductivity values + number of resistance values + number of voltage values + number of flow rates + number of values in applied strain field + number of shear values + number of values in applied surface pressure field + number of humidity values + number of viscosity values @@ -121,6 +132,93 @@ + + Sample pH value + + + + + + Applied current + + + + + + Sample electrical conductivity + + + + + + Sample electrical resistance + + + + + + Applied voltage + + + + + + Sample flow rate + + + + + + Sample strain field + + + + + + + + + + + + + Sample shear stress field + + + + + + + + + + + + + Sample surface pressure field + + + + + + + + + + + + + Sample humidity + + + + + + Sample viscosity + + + + Sample changer position @@ -338,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 @@ -348,6 +443,51 @@ Additional sample magnetic environment information + + Additional sample pH environment information + + + Additional sample pressure environment information + + + Additional sample electric field environment information + + + Additional sample current environment information + + + Additional sample conductivity environment information + + + Additional sample resistance environment information + + + Additional sample voltage environment information + + + Additional sample flow environment information + + + Additional sample stress field environment information + + + Additional sample strain field environment information + + + Additional sample shear stress field environment information + + + Additional sample surface pressure field environment information + + + Additional sample humidity environment information + + + Additional sample viscosity environment information + + + Additional sample concentration environment information + value sent to user's sample setup diff --git a/base_classes/NXsensor.nxdl.xml b/base_classes/NXsensor.nxdl.xml index d46d176038..c80ab33b29 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") @@ -65,6 +70,9 @@ + + + @@ -102,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. @@ -111,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) @@ -121,7 +129,7 @@ - Nominal/average second derivative of value + Average second derivative of value - same dimensions as "value" (may be a vector) diff --git a/nxdlTypes.xsd b/nxdlTypes.xsd index b9c972571d..6e07e954a6 100644 --- a/nxdlTypes.xsd +++ b/nxdlTypes.xsd @@ -54,23 +54,28 @@ nxdl:NX_AREA nxdl:NX_CROSS_SECTION nxdl:NX_CHARGE + nxdl:NX_CONDUCTIVITY + nxdl:NX_COUNT nxdl:NX_CURRENT nxdl:NX_DIMENSIONLESS nxdl:NX_EMITTANCE nxdl:NX_ENERGY + nxdl:NX_FLOW nxdl:NX_FLUX nxdl:NX_FREQUENCY 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 nxdl:NX_PERIOD nxdl:NX_POWER nxdl:NX_PRESSURE + nxdl:NX_PRESSURE_TIME nxdl:NX_PULSES - nxdl:NX_COUNT + nxdl:NX_RESISTANCE nxdl:NX_SCATTERING_LENGTH_DENSITY nxdl:NX_SOLID_ANGLE nxdl:NX_TEMPERATURE @@ -115,7 +120,17 @@ - + + + + + units of electrical conductivity + S/m + + + + + @@ -188,7 +203,17 @@ - + + + + + units of volumetric or mass flow rate + m^3/s, kg/s + + + + + @@ -238,6 +263,16 @@ + + + + + units of molar concentration + mol/L + + + + @@ -299,7 +334,17 @@ - + + + + + units of pressure multiplied by time + Pa * s + + + + + @@ -310,7 +355,17 @@ - + + + + + units of electrical resistance + ohm + + + + +