diff --git a/tests/data/dataconverter/readers/mpes/Ref_nexus_mpes.log b/tests/data/dataconverter/readers/mpes/Ref_nexus_mpes.log index 4d6b4f6d7..0335700f5 100644 --- a/tests/data/dataconverter/readers/mpes/Ref_nexus_mpes.log +++ b/tests/data/dataconverter/readers/mpes/Ref_nexus_mpes.log @@ -5253,7 +5253,7 @@ DEBUG - increasing displacement. For general axes, an appropriate direction should be chosen. -DEBUG - ===== GROUP (//entry/sample [NXmpes::/NXentry/NXsample]): +DEBUG - ===== GROUP (//entry/sample [NXmpes::/NXentry/NXsample]): DEBUG - classpath: ['NXentry', 'NXsample'] DEBUG - classes: NXmpes.nxdl.xml:/ENTRY/SAMPLE @@ -5395,33 +5395,6 @@ DEBUG - nominal setpoint or average value - need [n] as may be a vector -DEBUG - ===== FIELD (//entry/sample/chemical_formula): -DEBUG - value: b'MoTe2' -DEBUG - classpath: ['NXentry', 'NXsample', 'NX_CHAR'] -DEBUG - classes: -NXsample.nxdl.xml:/chemical_formula -DEBUG - <> -DEBUG - documentation (NXsample.nxdl.xml:/chemical_formula): -DEBUG - - The chemical formula specified using CIF conventions. - Abbreviated version of CIF standard: - - * Only recognized element symbols may be used. - * Each element symbol is followed by a 'count' number. A count of '1' may be omitted. - * A space or parenthesis must separate each cluster of (element symbol + count). - * Where a group of elements is enclosed in parentheses, the multiplier for the - group must follow the closing parentheses. That is, all element and group - multipliers are assumed to be printed as subscripted numbers. - * Unless the elements are ordered in a manner that corresponds to their chemical - structure, the order of the elements within any group or moiety depends on - whether or not carbon is present. - * If carbon is present, the order should be: - - - C, then H, then the other elements in alphabetical order of their symbol. - - If carbon is not present, the elements are listed purely in alphabetic order of their symbol. - - * This is the *Hill* system used by Chemical Abstracts. - DEBUG - ===== FIELD (//entry/sample/depends_on): DEBUG - value: b'/entry/sample/transformations/corrected_phi' DEBUG - classpath: ['NXentry', 'NXsample', 'NX_CHAR'] @@ -5576,20 +5549,6 @@ DEBUG - documentation (NXsample.nxdl.xml:/name): DEBUG - Descriptive name of sample -DEBUG - ===== FIELD (//entry/sample/physical_form): -DEBUG - value: b'thin film' -DEBUG - classpath: ['NXentry', 'NXsample', 'NX_CHAR'] -DEBUG - classes: -NXmpes.nxdl.xml:/ENTRY/SAMPLE/physical_form -NXsample.nxdl.xml:/physical_form -DEBUG - <> -DEBUG - documentation (NXmpes.nxdl.xml:/ENTRY/SAMPLE/physical_form): -DEBUG - -DEBUG - documentation (NXsample.nxdl.xml:/physical_form): -DEBUG - - Physical form of the sample material. - Examples include single crystal, foil, pellet, powder, thin film, disc, foam, gas, liquid, amorphous. - DEBUG - ===== FIELD (//entry/sample/preparation_date): DEBUG - value: b'2019-05-22T14:00:00+00:00' DEBUG - classpath: ['NXentry', 'NXsample', 'NX_DATE_TIME'] diff --git a/tests/data/dataconverter/readers/mpes/config_file.json b/tests/data/dataconverter/readers/mpes/config_file.json index e4310363e..ba800ccf0 100644 --- a/tests/data/dataconverter/readers/mpes/config_file.json +++ b/tests/data/dataconverter/readers/mpes/config_file.json @@ -264,12 +264,10 @@ "/ENTRY[entry]/SAMPLE[sample]": { "preparation_date": "@attrs:metadata/sample/preparation_date", "sample_history/notes": "@attrs:metadata/sample/sample_history", - "chemical_formula": "@attrs:metadata/sample/chemical_formula", "description": "@attrs:metadata/sample/chemical_formula", "name": "@attrs:metadata/sample/chemical_formula", "situation": "vacuum", - "SUBSTANCE[substance]/molecular_formula_hill": "@link:/entry/sample/chemical_formula", - "physical_form": "thin film", + "SUBSTANCE[substance]/molecular_formula_hill": "@attrs:metadata/sample/chemical_formula", "temperature": { "temperature_sensor": "@link:/entry/instrument/manipulator/temperature_sensor" },