Merge pull request #8 from aapaecklar/patch-1

Update NXstress.nxdl.xml

contributed_definitions/NXstress.nxdl.xml

@@ -192,27 +192,26 @@
  </attribute>
  </field>
  <group name="CALIBRATION" type="NXnote" optional="true">
- <doc>Geometry and/or efficiency measurement(s).</doc>
- <field name="calibration_type" type="NX_CHAR">
- <doc>Describe the type of calibration</doc>
+ <doc>This group contains information about the geometry and/or efficiency measurement(s).</doc>
+ <field name="calibration_type" type="NX_CHAR" optional="true">
+ <doc>Describe the type of calibration.</doc>
  </field>
  <field name="file_name" type="NX_CHAR" optional="true">
- <doc>Name of the calibration file</doc>
+ <doc>File name(s) and/or path(s) (withing file(s)) containing data from the last calibration(s). This can be a list.</doc>
  </field>
  <field name="data" type="NX_BINARY" optional="true">
  <doc>Calibration file content.</doc>
  </field>
  <field name="type" type="NX_CHAR" optional="true">
- <doc>Mime content type of note *data* field e.g. text/plain, application/json</doc>
+ <doc>Mime content type of calibration *data* field e.g. text/plain, application/json,...</doc>
  </field>
  <field name="author" type="NX_CHAR" optional="true">
- <doc>Author or creator of note</doc>
+ <doc>Author or creator of the calibration.</doc>
  </field>
  <field name="date" type="NX_DATE_TIME" optional="true">
- <doc>Date note created/added</doc>
+ <doc>Date calibration was created/added</doc>
  </field>
  </group>
-
  <group name="source" type="NXsource" optional="false">
  <field name="type" type="NX_CHAR" optional="false">
  <doc>
@@ -237,17 +236,6 @@
  <item value="X-ray"/>
  </enumeration>
  </field>
- <field name="energy" type="NX_FLOAT" units="NX_ENERGY" optional="true">
- <doc>
- 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
- </doc>
- </field>
- <field name="wavelength" type="NX_FLOAT" optional="true">
- <doc>
- 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.
- </doc>
- </field>
  </group>
  <group name="DETECTOR" type="NXdetector" minOccurs="1" maxOccurs="unbounded">
  <doc>Zero or more of these groups describe the detectors used in the experiment.</doc>
@@ -289,7 +277,6 @@
  In this use case, the efficiency and wavelength arrays must
  have the same dimensionality.
  </doc>
-
  <dimensions rank="2">
  <dim index="1" value="i" />
  <dim index="2" value="j" />
@@ -410,6 +397,12 @@
  Describes how the beam intensity profile in the secondary horizontal direction was determined. Examples of valid entries are: ``measured``, ``theoretical``, ``estimated``, ... 
  </doc>
  </field>
+ <field name="incident_energy" type="NX_FLOAT" units="NX_ENERGY" optional="true">
+ <doc>Incident energy mostly useful for monochromatic beams.</doc>
+ </field>
+ <field name="incident_wavelength" type="NX_FLOAT" units="NX_WAVELENGTH" optional="true">
+ <doc>Incident wavelength mostly useful for monochromatic beams.</doc>
+ </field>
  </group>
  </group>
 
@@ -911,7 +904,7 @@
  </dimensions>
  </field>
  <field name="phase_name" type="NX_CHAR" optional="false">
- <doc>Name of the crystallographic phase (hematite, goethite, a-Al\ :sub:`2`\ O\ :sub:`3`\ , ...).</doc>
+ <doc>Name of the crystallographic phase (hematite, goethite, \ :math:`\alpha`-Al\ :sub:`2`\ O\ :sub:`3`\ , ...).</doc>
  <dimensions rank="1">
  <dim index="1" value="nPeaks" />
  </dimensions>
@@ -1053,4 +1046,4 @@
  </group>
 
  </group>
-</definition>
+</definition>