diff --git a/examples/data/ellips/ellips.archive.json b/examples/data/ellips/ellips.archive.json
index 88dc6556e601212e5751edd03705ab4891f13c7e..cb96c42756d2be26c695680e1a42b3e5f8898ae3 100644
--- a/examples/data/ellips/ellips.archive.json
+++ b/examples/data/ellips/ellips.archive.json
@@ -2,7 +2,7 @@
"data": {
"m_def": "../upload/raw/ellips.scheme.archive.yml#/definitions/section_definitions/0",
"reader": "ellips",
- "nxdl": "NXellipsometry.nxdl",
+ "nxdl": "NXellipsometry",
"input_files": [
"test-data.data",
"eln_data.yaml"
@@ -41,7 +41,7 @@
"is_persistent": "false"
},
"Instrument": {
- "software_RC2": "CompleteEASE",
+ "software_RC2": "CompleteEASE",
"software_RC2/@version": "6.37",
"software_RC2/@url": "https://www.jawoollam.com/ellipsometry-software/completeease",
"ellipsometer_type": "dual compensator",
@@ -50,27 +50,33 @@
"source_type": "arc lamp"
},
"Detector": {
- "detector_type": "CCD spectrometer",
+ "detector_type": "CCD",
+ "detector_channel_type": "multichannel",
"count_time": 1
},
- "Sample_stage": {
- "stage_type": " manual stage"
+ "beam_source": {
+ "parameter_reliability": "nominal",
+ "associated_source": "entry/instrument/source_light",
+ "incident_wavelength": [193, 1700]
+ },
+ "sample_stage": {
+ "stage_type": "manual stage"
},
"focussing_probes": {
"data_correction": false,
- "angular_spread": 0.2
+ "angular_spread": 0.2,
+ "type": "objective"
},
"rotating_element": {
"revolutions": 50,
"revolutions/@Units": "NX_COUNT"
},
"instrument_calibration_RC2": {
- "calibration_status": " no calibration"
+ "calibration_status": "no calibration"
},
"device_information": {
"vendor": "J. A. Woollam Co.",
- "model": "RC2",
- "model/@version": "0.0.1"
+ "model": "RC2 (Vers. 0.0.1)"
}
},
"Sample": {
@@ -85,7 +91,9 @@
"sample_medium": "air"
},
"history": {
- "notes": "Commercially purchased sample"
+ "notes": {
+ "description":"Commercially purchased sample"
+ }
}
},
"Data": {
diff --git a/examples/data/ellips/ellips.scheme.archive.yml b/examples/data/ellips/ellips.scheme.archive.yml
index 6da4ae74f41cde43c6d152ea3d4fdf2268926f18..1ae368b6a6d3f81caf9716c477abe44d86d22734 100644
--- a/examples/data/ellips/ellips.scheme.archive.yml
+++ b/examples/data/ellips/ellips.scheme.archive.yml
@@ -8,7 +8,7 @@ definitions:
m_annotations:
template:
reader: ellips
- nxdl: NXellipsometry.nxdl
+ nxdl: NXellipsometry
eln:
hide: []
quantities:
@@ -201,6 +201,11 @@ definitions:
m_annotations:
eln:
component: StringEditQuantity
+ detector_channel_type:
+ type: str
+ m_annotations:
+ eln:
+ component: StringEditQuantity
count_time:
type: np.float64
unit: second
@@ -209,6 +214,27 @@ definitions:
component: NumberEditQuantity
minValue: 0
defaultDisplayUnit: "s"
+ beam_source:
+ section:
+ quantities:
+ parameter_reliability:
+ type: str
+ m_annotations:
+ eln:
+ component: StringEditQuantity
+ associated_source:
+ type: str
+ m_annotations:
+ eln:
+ component: StringEditQuantity
+ incident_wavelength:
+ type: np.float64
+ shape: ["*"]
+ unit: nanometer
+ m_annotations:
+ eln:
+ component: NumberEditQuantity
+ defaultDisplayUnit: "nm"
focussing_probes:
section:
quantities:
@@ -217,6 +243,11 @@ definitions:
m_annotations:
eln:
component: BoolEditQuantity
+ type:
+ type: str
+ m_annotations:
+ eln:
+ component: StringEditQuantity
angular_spread:
type: np.float64
unit: radian
@@ -229,15 +260,11 @@ definitions:
quantities:
revolutions:
type: np.float64
+ unit: radian / radian
m_annotations:
eln:
component: NumberEditQuantity
- revolutions/@unit:
- type: str
- m_annotations:
- eln:
- component: StringEditQuantity
- Sample_stage:
+ sample_stage:
section:
quantities:
stage_type:
@@ -245,14 +272,6 @@ definitions:
m_annotations:
eln:
component: StringEditQuantity
- instrument_calibration_RC2:
- section:
- quantities:
- calibration_status:
- type: str
- m_annotations:
- eln:
- component: StringEditQuantity
device_information:
section:
quantities:
@@ -266,7 +285,13 @@ definitions:
m_annotations:
eln:
component: StringEditQuantity
- model/@version:
+ instrument_calibration_RC2:
+ section:
+ m_annotations:
+ eln:
+ overview: true
+ quantities:
+ calibration_status:
type: str
m_annotations:
eln:
@@ -330,12 +355,18 @@ definitions:
m_annotations:
eln:
overview: true
- quantities:
+ sub_sections:
notes:
- type: str
- m_annotations:
- eln:
- component: StringEditQuantity
+ section:
+ m_annotations:
+ eln:
+ overview: true
+ quantities:
+ description:
+ type: str
+ m_annotations:
+ eln:
+ component: StringEditQuantity
Data:
section:
m_annotations:
diff --git a/examples/data/ellips/eln_data.yaml b/examples/data/ellips/eln_data.yaml
index 04d7506e67623c6e4897efaa02b093264cbf9b7b..4aa23a68ac001a50cc1cf6ac192245f045a4882c 100644
--- a/examples/data/ellips/eln_data.yaml
+++ b/examples/data/ellips/eln_data.yaml
@@ -6,17 +6,16 @@ Data:
data_type: Psi/Delta
spectrum_type: wavelength
spectrum_unit: angstrom
-Instrument:
- Detector:
+instrument:
+ detector:
count_time:
unit: s
value: 1.0
- detector_type: CCD spectrometer
- Sample_stage:
- stage_type: ' manual stage'
+ detector_type: CCD
+ sample_stage:
+ stage_type: 'manual stage'
device_information:
- model: RC2
- model/@version: 0.0.1
+ model: 'RC2 (Vers. 0.0.1)'
vendor: J. A. Woollam Co.
ellipsometer_type: dual compensator
focussing_probes:
@@ -25,7 +24,7 @@ Instrument:
value: 0.2
data_correction: false
instrument_calibration_RC2:
- calibration_status: ' no calibration'
+ calibration_status: 'no calibration'
light_source:
source_type: arc lamp
rotating_element:
@@ -34,7 +33,7 @@ Instrument:
software_RC2: CompleteEASE
software_RC2/@url: https://www.jawoollam.com/ellipsometry-software/completeease
software_RC2/@version: '6.37'
-Sample:
+sample:
atom_types: Si, O
backside_roughness: false
chemical_formula: SiO2
@@ -46,7 +45,7 @@ Sample:
physical_form: multi layer
sample_name: 2nm SiO2 on Si
substrate: Si
-User:
+user:
address: Zum Großen Windkanal 2, 12489 Berlin, Germany
affiliation: Humboldt-Universität zu Berlin
email: surname.name@physik.hu-berlin.de
diff --git a/gui/tests/artifacts.js b/gui/tests/artifacts.js
index b632aaca92ecbb50b554343398aa7d827479a31e..f8e4a5361fa3e9fc9afc750ad4a81dfaef3f29ae 100644
--- a/gui/tests/artifacts.js
+++ b/gui/tests/artifacts.js
@@ -65353,7 +65353,7 @@ window.nomadArtifacts = {
"ellips": {
"short_description": "An example for analyzing ellipsometric data.",
"description": "This example presents the capabilities of the NOMAD platform to store and standardize ellipsometry data. It shows the generation of a NeXus file according to the [NXellipsometry](https://manual.nexusformat.org/classes/contributed_definitions/NXellipsometry.html#nxellipsometry) application definition and a successive analysis of a SiO2 on Si Psi/Delta measurement.",
- "image": "gitlab-registry.mpcdf.mpg.de/nomad-lab/nomad-remote-tools-hub/ellips-jupyter",
+ "image": "gitlab-registry.mpcdf.mpg.de/nomad-lab/north/ellips/jupyter:latest",
"cmd": null,
"image_pull_policy": "Always",
"privileged": false,
diff --git a/nomad/config/defaults.yaml b/nomad/config/defaults.yaml
index 117652ea29d74af3524c1a2ae0c8346b144f0152..6bab95783a5f316a7e9f589269bd757e5a9baa68 100644
--- a/nomad/config/defaults.yaml
+++ b/nomad/config/defaults.yaml
@@ -311,7 +311,7 @@ north:
- ipynb
- nxs
icon: jupyter_logo.svg
- image: gitlab-registry.mpcdf.mpg.de/nomad-lab/nomad-remote-tools-hub/ellips-jupyter
+ image: gitlab-registry.mpcdf.mpg.de/nomad-lab/north/ellips/jupyter:latest
image_pull_policy: Always
maintainer:
- email: florian.dobener@physik.hu-berlin.de
diff --git a/ops/kubernetes/nomad/values.yaml b/ops/kubernetes/nomad/values.yaml
index b5bbfb6dc95b4b9f4faa0c8e7decc7bb7bcb0d68..0d517f73106fe79bdbaabaff3789fb9b506af91b 100644
--- a/ops/kubernetes/nomad/values.yaml
+++ b/ops/kubernetes/nomad/values.yaml
@@ -560,7 +560,7 @@ jupyterhub:
name: gitlab-registry.mpcdf.mpg.de/nomad-lab/nomad-remote-tools-hub/nexus-webtop
tag: latest
ellips:
- name: gitlab-registry.mpcdf.mpg.de/nomad-lab/nomad-remote-tools-hub/ellips-jupyter
+ name: gitlab-registry.mpcdf.mpg.de/nomad-lab/north/ellips/jupyter
tag: latest
mpes:
name: gitlab-registry.mpcdf.mpg.de/nomad-lab/north/mpes/webtop