Skip to content
Snippets Groups Projects
Commit 0fabbe2a authored by Sandor Brockhauser's avatar Sandor Brockhauser
Browse files

Merge branch 'Ellipsometry_example_update_for_nomad' into 'develop' 

adjustments of archive and schema for latest NXopt definition

See merge request !1881
parents 84fd44c3 2d3ca6dd
No related branches found
No related tags found
1 merge request!1881adjustments of archive and schema for latest NXopt definition
Pipeline #206751 passed
Stage: build
Stage: test
Stage: deploy
Stage: release
Hide whitespace changes
Inline Side-by-side
examples/data/ellips/ellips.archive.json
+ 42
− 33
View file @ 0fabbe2a
......@@ -9,6 +9,7 @@
],
"output": "SiO2onSi.ellips.nxs",
"filename": "test-data.dat",
"title": "RC2 Ellipsometry of 2nm SiO2 on Si",
"skip": 3,
"sep": "\\t",
"colnames": [
......@@ -20,13 +21,12 @@
"err.Psi",
"err.Delta"
],
"derived_parameter_type": "depolarization",
"definition": "NXellipsometry",
"definition/@version": "0.0.2",
"definition/@url": "https://github.com/FAIRmat-NFDI/nexus_definitions/blob/fairmat/contributed_definitions/NXellipsometry.nxdl.xml",
"experiment_identifier": "exp-ID",
"experiment_description": "RC2 scan on 2nm SiO2 on Si in air",
"experiment_type": "NIR-Vis-UV spectroscopic ellipsometry",
"experiment_type": "ellipsometry",
"ellipsometry_experiment_type": "NIR-Vis-UV spectroscopic ellipsometry",
"plot_name": "Psi and Delta",
"start_time": "2022-01-27T03:35:00+00:00",
"User": {
......@@ -35,38 +35,42 @@
"address": "Zum Großen Windkanal 2, 12489 Berlin, Germany",
"email": "surname.name@physik.hu-berlin.de"
},
"derived_parameter_type": "depolarization",
"experiment_identifier": {
"identifier": "exp-ID",
"is_persistent": "false"
},
"Instrument": {
"model": "RC2",
"model/@version": "0.0.1",
"company": "J. A. Woollam Co.",
"software": "CompleteEASE",
"software/version": "6.37",
"software/@url": "https://www.jawoollam.com/ellipsometry-software/completeease",
"software_RC2": "CompleteEASE",
"software_RC2/@version": "6.37",
"software_RC2/@url": "https://www.jawoollam.com/ellipsometry-software/completeease",
"ellipsometer_type": "dual compensator",
"rotating_element_type": "compensator (source side)",
"calibration_status": "no calibration",
"angle_of_incidence/@unit": "degree",
"Beam_path": {
"light_source": {
"source_type": "arc lamp"
},
"Detector": {
"detector_type": "CCD spectrometer",
"count_time": 1
},
"focussing_probes": {
"data_correction": false,
"angular_spread": 0.2
},
"rotating_element": {
"revolutions": 50
}
"light_source": {
"source_type": "arc lamp"
},
"Detector": {
"detector_type": "CCD spectrometer",
"count_time": 1
},
"Sample_stage": {
"stage_type": "manual stage",
"environment_conditions": {
"medium": "air"
}
"stage_type": " manual stage"
},
"focussing_probes": {
"data_correction": false,
"angular_spread": 0.2
},
"rotating_element": {
"revolutions": 50,
"revolutions/@Units": "NX_COUNT"
},
"instrument_calibration_RC2": {
"calibration_status": " no calibration"
},
"device_information": {
"vendor": "J. A. Woollam Co.",
"model": "RC2",
"model/@version": "0.0.1"
}
},
"Sample": {
......@@ -74,10 +78,15 @@
"chemical_formula": "SiO2",
"layer_structure": "2nm SiO2 on Si",
"sample_name": "2nm SiO2 on Si",
"sample_history": "Commercially purchased sample",
"sample_type": "multi layer",
"physical_form": "multi layer",
"substrate": "Si",
"backside_roughness": false
"backside_roughness": false,
"environment": {
"sample_medium": "air"
},
"history": {
"notes": "Commercially purchased sample"
}
},
"Data": {
"data_software": "WVASE",
......
examples/data/ellips/ellips.scheme.archive.yml
+ 125
− 82
View file @ 0fabbe2a
......@@ -68,17 +68,22 @@ definitions:
m_annotations:
eln:
component: StringEditQuantity
experiment_identifier:
experiment_description:
type: str
m_annotations:
eln:
component: StringEditQuantity
experiment_description:
experiment_type:
type: str
m_annotations:
eln:
component: StringEditQuantity
experiment_type:
ellipsometry_experiment_type:
type: str
m_annotations:
eln:
component: StringEditQuantity
title:
type: str
m_annotations:
eln:
......@@ -122,113 +127,116 @@ definitions:
m_annotations:
eln:
component: StringEditQuantity
Instrument:
experiment_identifier:
section:
m_annotations:
eln:
overview: true
quantities:
model:
identifier:
type: str
m_annotations:
eln:
component: StringEditQuantity
model/@version:
type: str
m_annotations:
eln:
component: StringEditQuantity
company:
is_persistent:
type: str
m_annotations:
eln:
component: StringEditQuantity
software:
Instrument:
section:
m_annotations:
eln:
overview: true
quantities:
model:
type: str
m_annotations:
eln:
component: StringEditQuantity
software/version:
model/@version:
type: str
m_annotations:
eln:
component: StringEditQuantity
software/@url:
software_RC2:
type: str
m_annotations:
eln:
component: StringEditQuantity
ellipsometer_type:
software_RC2/@version:
type: str
m_annotations:
eln:
component: StringEditQuantity
rotating_element_type:
software_RC2/@url:
type: str
m_annotations:
eln:
component: StringEditQuantity
calibration_status:
ellipsometer_type:
type: str
m_annotations:
eln:
component: StringEditQuantity
angle_of_incidence/@unit:
rotating_element_type:
type: str
m_annotations:
eln:
component: StringEditQuantity
sub_sections:
Beam_path:
light_source:
section:
quantities:
source_type:
type: str
m_annotations:
eln:
component: StringEditQuantity
Detector:
section:
sub_sections:
light_source:
section:
quantities:
source_type:
type: str
m_annotations:
eln:
component: StringEditQuantity
Detector:
section:
quantities:
detector_type:
type: str
m_annotations:
eln:
component: StringEditQuantity
count_time:
type: np.float64
unit: second
m_annotations:
eln:
component: NumberEditQuantity
minValue: 0
defaultDisplayUnit: "s"
focussing_probes:
section:
quantities:
data_correction:
type: bool
m_annotations:
eln:
component: BoolEditQuantity
angular_spread:
type: np.float64
unit: radian
m_annotations:
eln:
component: NumberEditQuantity
defaultDisplayUnit: "rad"
rotating_element:
section:
quantities:
revolutions:
type: np.float64
m_annotations:
eln:
component: NumberEditQuantity
quantities:
detector_type:
type: str
m_annotations:
eln:
component: StringEditQuantity
count_time:
type: np.float64
unit: second
m_annotations:
eln:
component: NumberEditQuantity
minValue: 0
defaultDisplayUnit: "s"
focussing_probes:
section:
quantities:
data_correction:
type: bool
m_annotations:
eln:
component: BoolEditQuantity
angular_spread:
type: np.float64
unit: radian
m_annotations:
eln:
component: NumberEditQuantity
defaultDisplayUnit: "rad"
rotating_element:
section:
quantities:
revolutions:
type: np.float64
m_annotations:
eln:
component: NumberEditQuantity
revolutions/@unit:
type: str
m_annotations:
eln:
component: StringEditQuantity
Sample_stage:
section:
quantities:
......@@ -237,15 +245,32 @@ definitions:
m_annotations:
eln:
component: StringEditQuantity
sub_sections:
environment_conditions:
section:
quantities:
medium:
type: str
m_annotations:
eln:
component: StringEditQuantity
instrument_calibration_RC2:
section:
quantities:
calibration_status:
type: str
m_annotations:
eln:
component: StringEditQuantity
device_information:
section:
quantities:
vendor:
type: str
m_annotations:
eln:
component: StringEditQuantity
model:
type: str
m_annotations:
eln:
component: StringEditQuantity
model/@version:
type: str
m_annotations:
eln:
component: StringEditQuantity
Sample:
section:
m_annotations:
......@@ -278,12 +303,7 @@ definitions:
m_annotations:
eln:
component: StringEditQuantity
sample_history:
type: str
m_annotations:
eln:
component: StringEditQuantity
sample_type:
physical_form:
type: str
m_annotations:
eln:
......@@ -293,6 +313,29 @@ definitions:
m_annotations:
eln:
component: StringEditQuantity
sub_sections:
environment:
section:
m_annotations:
eln:
overview: true
quantities:
sample_medium:
type: str
m_annotations:
eln:
component: StringEditQuantity
history:
section:
m_annotations:
eln:
overview: true
quantities:
notes:
type: str
m_annotations:
eln:
component: StringEditQuantity
Data:
section:
m_annotations:
......
examples/data/ellips/eln_data.yaml
+ 35
− 30
View file @ 0fabbe2a
......@@ -7,43 +7,44 @@ Data:
spectrum_type: wavelength
spectrum_unit: angstrom
Instrument:
Beam_path:
Detector:
count_time:
unit: s
value: 1.0
detector_type: CCD spectrometer
focussing_probes:
angular_spread:
unit: rad
value: 0.2
data_correction: false
light_source:
source_type: arc lamp
rotating_element:
revolutions: 50.0
Detector:
count_time:
unit: s
value: 1.0
detector_type: CCD spectrometer
Sample_stage:
environment_conditions:
medium: air
stage_type: manual stage
angle_of_incidence/@unit: degree
calibration_status: no calibration
company: J. A. Woollam Co.
stage_type: ' manual stage'
device_information:
model: RC2
model/@version: 0.0.1
vendor: J. A. Woollam Co.
ellipsometer_type: dual compensator
model: RC2
model/@version: 0.0.1
focussing_probes:
angular_spread:
unit: rad
value: 0.2
data_correction: false
instrument_calibration_RC2:
calibration_status: ' no calibration'
light_source:
source_type: arc lamp
rotating_element:
revolutions: 50.0
rotating_element_type: compensator (source side)
software: CompleteEASE
software/@url: https://www.jawoollam.com/ellipsometry-software/completeease
software/version: '6.37'
software_RC2: CompleteEASE
software_RC2/@url: https://www.jawoollam.com/ellipsometry-software/completeease
software_RC2/@version: '6.37'
Sample:
atom_types: Si, O
backside_roughness: false
chemical_formula: SiO2
environment:
sample_medium: air
history:
notes: Commercially purchased sample
layer_structure: 2nm SiO2 on Si
sample_history: Commercially purchased sample
physical_form: multi layer
sample_name: 2nm SiO2 on Si
sample_type: multi layer
substrate: Si
User:
address: Zum Großen Windkanal 2, 12489 Berlin, Germany
......@@ -62,11 +63,15 @@ definition: NXellipsometry
definition/@url: https://github.com/FAIRmat-NFDI/nexus_definitions/blob/fairmat/contributed_definitions/NXellipsometry.nxdl.xml
definition/@version: 0.0.2
derived_parameter_type: depolarization
ellipsometry_experiment_type: NIR-Vis-UV spectroscopic ellipsometry
experiment_description: RC2 scan on 2nm SiO2 on Si in air
experiment_identifier: exp-ID
experiment_type: NIR-Vis-UV spectroscopic ellipsometry
experiment_identifier:
identifier: exp-ID
is_persistent: 'false'
experiment_type: ellipsometry
filename: test-data.dat
plot_name: Psi and Delta
sep: \t
skip: 3
start_time: '2022-01-27T03:35:00+00:00'
title: RC2 Ellipsometry of 2nm SiO2 on Si
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment