diff --git a/meta_info/nomad_meta_info/all.experimental.nomadmetainfo.json b/meta_info/nomad_meta_info/all.experimental.nomadmetainfo.json index f61204bed8ac42bc4e94363a9a3e6af4ba052eca..66bb4c6854c69290667a61a3b9630f99a126bff9 100644 --- a/meta_info/nomad_meta_info/all.experimental.nomadmetainfo.json +++ b/meta_info/nomad_meta_info/all.experimental.nomadmetainfo.json @@ -1,11 +1,10 @@ { "type": "nomad_meta_info_1_0", - "description": "file collecting all the meta info files (i.e. with all code specific parts)", - "dependencies": [ { - "relativePath": "general.experimental.nomadmetainfo.json" - }, { - "relativePath": "../skeletonparser/skeleton.nomadmetainfo.json" - } + "description": "file collecting all the meta info files for the ems nomad (i.e. with all method specific parts)", + "dependencies": [ + { "relativePath": "general.experimental.nomadmetainfo.json" }, + { "parser": "skeletonparser", "path": "skeleton.nomadmetainfo.json" }, + { "parser": "mpesparser", "path": "mpes.nomadmetainfo.json" } ], "metaInfos": [ ] } diff --git a/meta_info/nomad_meta_info/general.experimental.nomadmetainfo.json b/meta_info/nomad_meta_info/general.experimental.nomadmetainfo.json index f366b17235a59c2896b8bc85b2e549d382634991..6a8a3dcba9cd15e15553c125e899214a03f487aa 100644 --- a/meta_info/nomad_meta_info/general.experimental.nomadmetainfo.json +++ b/meta_info/nomad_meta_info/general.experimental.nomadmetainfo.json @@ -2,9 +2,10 @@ "type":"nomad_meta_info_1_0", "description":"General definitions for experiment data, not specific to any experimental method or parser.", "dependencies":[ - { - "relativePath":"general.nomadmetainfo.json" - } + { "relativePath":"general.nomadmetainfo.json" }, + { "relativePath":"general.experimental.method.nomadmetainfo.json" }, + { "relativePath":"general.experimental.sample.nomadmetainfo.json" }, + { "relativePath":"general.experimental.data.nomadmetainfo.json" } ], "metaInfos":[ { @@ -14,15 +15,13 @@ "superNames":[] }, { - "description":"The general name of the experimental method used", - "dtypeStr":"C", - "name":"experiment_method_name", - "superNames":[ - "section_method" - ] + "description": "A descriptive summary of the content of the experiment.", + "name": "experiment_summary", + "dtypeStr": "C", + "superNames": ["section_experiment"] }, { - "description":"The general location of the experiment", + "description":"Name of the city and country the experiment took place, format 'Country, City'", "dtypeStr":"C", "name":"experiment_location", "superNames":[ @@ -30,7 +29,19 @@ ] }, { - "description":"The datetime of the experiment in seconds since epoch.", + "description": "Name of the institution hosting the experimental facility (e.g. in full or an acronym).", + "name": "experiment_facility_institution", + "dtypeStr": "C", + "superNames": ["section_experiment"] + }, + { + "description": "Name of the experimental facility (e.g. in full or an acronym).", + "name": "experiment_facility_name", + "dtypeStr": "C", + "superNames": ["section_experiment"] + }, + { + "description":"The datetime of the beginning of the experiment in seconds since epoch.", "dtypeStr":"i64", "name":"experiment_time", "superNames":[ @@ -38,7 +49,15 @@ ], "units":"s" }, - + { + "description":"The datetime of the experiment end in seconds since epoch.", + "dtypeStr":"i64", + "name":"experiment_end_time", + "superNames":[ + "section_experiment" + ], + "units":"s" + }, { "description":"This section contains information about the stored data.", "kindStr":"type_section", @@ -64,92 +83,6 @@ "dtypeStr":"C", "name":"data_preview_url", "superNames":["section_data"] - }, - - { - "description":"The section for all sample related (meta)data that was used in the experiment.", - "kindStr":"type_section", - "name":"section_sample", - "superNames":[ - "section_experiment" - ] - }, - { - "description":"The physical state of the sample.", - "dtypeStr":"C", - "name":"sample_state", - "superNames":["section_sample"], - "values":{ - "gas":"Gas", - "liquid":"Liquid", - "solution":"Solution" - } - }, - { - "description":"The chemical formula that describes the sample", - "dtypeStr":"C", - "superNames":["section_sample"], - "name":"sample_chemical_formula" - }, - { - "description":"The chemical name that describes the sample", - "dtypeStr":"C", - "superNames":["section_sample"], - "name":"sample_chemical_name" - }, - { - "description":"The chemical name that describes the sample", - "dtypeStr":"C", - "superNames":["section_sample"], - "name":"sample_atom_labels", - "shape": ["n"] - }, - { - "description":"The temperature of the sample during the experiment in K.", - "dtypeStr":"f", - "superNames":["section_sample"], - "name":"sample_temperature", - "units": "K" - }, - { - "description": "This section contains information about the applied experimental method.", - "kindStr":"type_section", - "name":"section_method", - "superNames":["section_experiment"] - }, - { - "description":"The ...", - "dtypeStr":"C", - "superNames":["section_sample"], - "name":"sample_microstructure", - "values": [ - "thin films", - "nanoscale objects", - "bulk sample, single-crystalline", - "bulk sample, polycrystalline" - ] - }, - { - "description":"The ...", - "dtypeStr":"C", - "superNames":["section_sample"], - "name":"sample_constituents", - "values": [ - "multi phase", - "single phase" - ] - }, - { - "description":"The ...", - "dtypeStr":"C", - "superNames":["section_method"], - "name":"probing_method", - "values": [ - "laser pulses", - "electric pulsing", - "x-rays", - "electrons" - ] } ] } \ No newline at end of file