Skip to content

Commit 85cddde

Browse files
rettiglrettigl
committed
update pyntools and definitions
1 parent e0ec72b commit 85cddde

File tree

6 files changed

+92
-70
lines changed

6 files changed

+92
-70
lines changed

‎.cspell/custom-dictionary.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ ecalibdict
102102
elab
103103
elabapi
104104
elabid
105-
electronanalyser
105+
electronanalyzer
106106
Elektronen
107107
endstation
108108
energycal
@@ -379,6 +379,7 @@ toctree
379379
tofseg
380380
tqdm
381381
traceseg
382+
trarpes
382383
trseg
383384
Tsec
384385
txtsize

‎pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ dependencies = [
4545
"photutils<2.0",
4646
"psutil>=5.9.0",
4747
"pynxtools-mpes>=0.2.0",
48-
"pynxtools>=0.9.0",
48+
"pynxtools>=0.10.0",
4949
"pyyaml>=6.0.0",
5050
"scipy>=1.8.0",
5151
"symmetrize>=0.5.5",

‎src/sed/calibrator/momentum.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2004,9 +2004,9 @@ def gather_calibration_metadata(self, calibration: dict = None) -> dict:
20042004
metadata["calibration"] = calibration
20052005
# create empty calibrated axis entries, if they are not present.
20062006
if "kx_axis" not in metadata["calibration"]:
2007-
metadata["calibration"]["kx_axis"] = 0
2007+
metadata["calibration"]["kx_axis"] = 0.0
20082008
if "ky_axis" not in metadata["calibration"]:
2009-
metadata["calibration"]["ky_axis"] = 0
2009+
metadata["calibration"]["ky_axis"] = 0.0
20102010

20112011
return metadata
20122012

‎src/sed/config/NXmpes_config.json

100755100644
Lines changed: 69 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,41 @@
11
{
22
"/@default": "entry",
33
"/ENTRY/@default": "data",
4-
"/ENTRY/title": "['@eln:/ENTRY/title', '@attrs:metadata/entry_title']",
4+
"/ENTRY/title": "['@eln:/ENTRY/title', '@attrs:metadata/entry_title', '@attrs:metadata/elabFTW/scan/title']",
55
"/ENTRY/start_time": "@attrs:metadata/timing/acquisition_start",
66
"/ENTRY/experiment_institution": "Fritz Haber Institute - Max Planck Society",
77
"/ENTRY/experiment_facility": "Time Resolved ARPES",
88
"/ENTRY/experiment_laboratory": "Clean Room 4",
9-
"/ENTRY/entry_identifier": {
10-
"identifier":"@attrs:metadata/entry_identifier"
11-
},
9+
"/ENTRY/identifierNAME[entry_identifier]": "@attrs:metadata/entry_identifier",
1210
"/ENTRY/end_time": "@attrs:metadata/timing/acquisition_stop",
1311
"/ENTRY/duration": "@attrs:metadata/timing/acquisition_duration",
1412
"/ENTRY/duration/@units": "s",
1513
"/ENTRY/collection_time": "@attrs:metadata/timing/collection_time",
1614
"/ENTRY/collection_time/@units": "s",
1715
"/ENTRY/USER[user]": {
18-
"name": "!['@eln:/ENTRY/User/name', '@attrs:metadata/user0/name']",
19-
"role": "['@eln:/ENTRY/User/role', '@attrs:metadata/user0/role']",
20-
"affiliation": "!['@eln:/ENTRY/User/affiliation', '@attrs:metadata/user0/affiliation']",
21-
"address": "['@eln:/ENTRY/User/address', '@attrs:metadata/user0/address']",
22-
"email": "['@eln:/ENTRY/User/email', '@attrs:metadata/user0/email']"
16+
"name": "!['@eln:/ENTRY/User/name', '@attrs:metadata/user0/name', '@attrs:metadata/elabFTW/user/name']",
17+
"role": "['@eln:/ENTRY/User/role', '@attrs:metadata/user0/role', 'Principal Investigator']",
18+
"affiliation": "['@eln:/ENTRY/User/affiliation', '@attrs:metadata/user0/affiliation', 'Fritz Haber Institute of the Max Planck Society']",
19+
"address": "['@eln:/ENTRY/User/address', '@attrs:metadata/user0/address', 'Faradayweg 4-6, 14195 Berlin, Germany']",
20+
"email": "['@eln:/ENTRY/User/email', '@attrs:metadata/user0/email', '@attrs:metadata/elabFTW/user/email']"
2321
},
2422
"/ENTRY/INSTRUMENT[instrument]": {
2523
"name": "Time-of-flight momentum microscope equipped delay line detector, at the endstation of the high rep-rate HHG source at FHI",
2624
"name/@short_name": "TR-ARPES @ FHI",
2725
"energy_resolution": {
28-
"resolution": "!['@eln:/ENTRY/Instrument/Analyzer/energy_resolution', '@attrs:metadata/instrument/energy_resolution']",
26+
"resolution": "!['@eln:/ENTRY/Instrument/Analyzer/energy_resolution', '@attrs:metadata/instrument/energy_resolution', '@attrs:metadata/elabFTW/trarpes_metis/energy_resolution']",
2927
"resolution/@units": "meV",
3028
"physical_quantity": "energy",
3129
"type": "estimated"
3230
},
3331
"RESOLUTION[temporal_resolution]": {
34-
"resolution": 35.0,
32+
"resolution": "!['@attrs:metadata/elabFTW/laser_status/temporal_resolution', '35.0']",
3533
"resolution/@units": "fs",
3634
"physical_quantity": "time",
3735
"type": "estimated"
3836
},
3937
"RESOLUTION[momentum_resolution]": {
40-
"resolution": "@link:/entry/instrument/electronanalyser/momentum_resolution",
38+
"resolution": "@link:/entry/instrument/electronanalyzer/momentum_resolution",
4139
"resolution/@units": "1/angstrom",
4240
"physical_quantity": "momentum",
4341
"type": "estimated"
@@ -48,33 +46,33 @@
4846
"value": "!['@eln:/ENTRY/Sample/gas_pressure', '@attrs:metadata/file/trARPES:XGS600:PressureAC:P_RD']",
4947
"value/@units": "mbar"
5048
},
51-
"ELECTRONANALYSER[electronanalyser]": {
49+
"ELECTRONANALYZER[electronanalyzer]": {
5250
"description": "SPECS Metis 1000 Momentum Microscope",
5351
"device_information": {
5452
"vendor": "SPECS GmbH",
5553
"model": "Metis 1000 Momentum Microscope"
5654
},
5755
"fast_axes": ["kx", "ky", "E"],
58-
"slow_axes": "@attrs:metadata/instrument/analyzer/slow_axes",
56+
"slow_axes": "['@attrs:metadata/instrument/analyzer/slow_axes', '@attrs:metadata/elabFTW/scan/scan_type']",
5957
"energy_resolution": {
60-
"resolution": "!['@eln:/ENTRY/Instrument/Analyzer/energy_resolution', '@attrs:metadata/instrument/analyzer/energy_resolution']",
58+
"resolution": "!['@eln:/ENTRY/Instrument/Analyzer/energy_resolution', '@attrs:metadata/instrument/analyzer/energy_resolution', '@attrs:metadata/elabFTW/trarpes_metis/energy_resolution']",
6159
"resolution/@units": "meV",
6260
"physical_quantity": "energy",
6361
"type": "estimated"
6462
},
6563
"momentum_resolution": {
66-
"resolution": "!['@eln:/ENTRY/Instrument/Analyzer/momentum_resolution', '@attrs:metadata/instrument/analyzer/momentum_resolution']",
64+
"resolution": "!['@eln:/ENTRY/Instrument/Analyzer/momentum_resolution', '@attrs:metadata/instrument/analyzer/momentum_resolution', '@attrs:metadata/elabFTW/trarpes_metis/momentum_resolution']",
6765
"resolution/@units": "1/angstrom",
6866
"physical_quantity": "momentum",
6967
"type": "estimated"
7068
},
7169
"spatial_resolution": {
72-
"resolution": "!['@eln:/ENTRY/Instrument/Analyzer/spatial_resolution', '@attrs:metadata/instrument/analyzer/spatial_resolution']",
70+
"resolution": "!['@eln:/ENTRY/Instrument/Analyzer/spatial_resolution', '@attrs:metadata/instrument/analyzer/spatial_resolution', '@attrs:metadata/elabFTW/trarpes_metis/spatial_resolution']",
7371
"resolution/@units": "µm",
7472
"physical_quantity": "length",
7573
"type": "estimated"
7674
},
77-
"depends_on": "/entry/instrument/electronanalyser/transformations/trans_z",
75+
"depends_on": "/entry/instrument/electronanalyzer/transformations/trans_z",
7876
"TRANSFORMATIONS[transformations]": {
7977
"AXISNAME[trans_z]": 4.0,
8078
"AXISNAME[trans_z]/@depends_on": "rot_y",
@@ -89,7 +87,7 @@
8987
},
9088
"COLLECTIONCOLUMN[collectioncolumn]": {
9189
"projection": "@attrs:metadata/instrument/analyzer/projection",
92-
"scheme": "@attrs:metadata/instrument/analyzer/scheme",
90+
"scheme": "['@attrs:metadata/instrument/analyzer/scheme', 'momentum dispersive']",
9391
"lens_mode": "@attrs:metadata/instrument/analyzer/lens_mode",
9492
"extractor_voltage": "@attrs:metadata/file/KTOF:Lens:Extr:V",
9593
"extractor_voltage/@units": "V",
@@ -132,11 +130,9 @@
132130
"tof_distance": 0.9,
133131
"tof_distance/@units": "m"
134132
},
135-
"DETECTOR[detector]": {
133+
"ELECTRON_DETECTOR[detector]": {
136134
"amplifier_type": "MCP",
137135
"detector_type": "DLD",
138-
"sensor_pixels": [1800, 1800],
139-
"sensor_pixels/@units": "",
140136
"amplifier_bias": "@attrs:metadata/file/KTOF:Lens:MCPfront:V",
141137
"amplifier_bias/@units": "V",
142138
"amplifier_voltage": "@attrs:metadata/file/KTOF:Lens:MCPback:V",
@@ -145,59 +141,59 @@
145141
"detector_voltage/@units": "V"
146142
}
147143
},
148-
"sourceTYPE[source_probe]": {
144+
"source_probe": {
149145
"name": "HHG @ TR-ARPES @ FHI",
150146
"probe": "photon",
151147
"type": "HHG laser",
152148
"mode": "Single Bunch",
153-
"frequency": "['@eln:/ENTRY/Instrument/Source/Probe/frequency', '@attrs:metadata/instrument/beam/probe/frequency']",
149+
"frequency": "!['@eln:/ENTRY/Instrument/Source/Probe/frequency', '@attrs:metadata/instrument/beam/probe/frequency', '@attrs:metadata/elabFTW/laser_status/probe_repetition_rate']",
154150
"frequency/@units": "kHz",
155151
"associated_beam": "/entry/instrument/beam_probe"
156152
},
157-
"beamTYPE[beam_probe]": {
153+
"beam_probe": {
158154
"distance": 0.0,
159155
"distance/@units": "mm",
160-
"incident_energy": "!['@eln:/ENTRY/Instrument/Beam/Probe/incident_energy', '@attrs:metadata/instrument/beam/probe/incident_energy']",
156+
"incident_energy": "!['@eln:/ENTRY/Instrument/Beam/Probe/incident_energy', '@attrs:metadata/instrument/beam/probe/incident_energy', '@attrs:metadata/elabFTW/laser_status/probe_photon_energy']",
161157
"incident_energy/@units": "eV",
162-
"incident_energy_spread": "['@eln:/ENTRY/Instrument/Beam/Probe/incident_energy_spread', '@attrs:metadata/instrument/beam/probe/incident_energy_spread']",
158+
"incident_energy_spread": "['@eln:/ENTRY/Instrument/Beam/Probe/incident_energy_spread', '@attrs:metadata/instrument/beam/probe/incident_energy_spread', '@attrs:metadata/elabFTW/laser_status/probe_photon_energy_spread']",
163159
"incident_energy_spread/@units": "eV",
164-
"pulse_duration": "['@eln:/ENTRY/Instrument/Beam/Probe/pulse_duration', '@attrs:metadata/instrument/beam/probe/pulse_duration']",
160+
"pulse_duration": "['@eln:/ENTRY/Instrument/Beam/Probe/pulse_duration', '@attrs:metadata/instrument/beam/probe/pulse_duration', '@attrs:metadata/elabFTW/laser_status/probe_pulse_duration']",
165161
"pulse_duration/@units": "fs",
166-
"incident_polarization": "['@eln:/ENTRY/Instrument/Beam/Probe/incident_polarization', '@attrs:metadata/instrument/beam/probe/incident_polarization']",
162+
"incident_polarization": "['@eln:/ENTRY/Instrument/Beam/Probe/incident_polarization', '@attrs:metadata/instrument/beam/probe/incident_polarization', '@attrs:metadata/elabFTW/scan/probe_polarization']",
167163
"incident_polarization/@units": "V^2/mm^2",
168-
"extent": "['@eln:/ENTRY/Instrument/Beam/Probe/extent', '@attrs:metadata/instrument/beam/probe/extent']",
164+
"extent": "['@eln:/ENTRY/Instrument/Beam/Probe/extent', '@attrs:metadata/instrument/beam/probe/extent', '@attrs:metadata/elabFTW/laser_status/probe_profile']",
169165
"extent/@units": "µm",
170166
"associated_source": "/entry/instrument/source_probe"
171167
},
172-
"sourceTYPE[source_pump]": {
168+
"source_pump": {
173169
"name": "OPCPA @ TR-ARPES @ FHI",
174170
"probe": "visible light",
175171
"type": "Optical Laser",
176172
"mode": "Single Bunch",
177-
"frequency": "['@eln:/ENTRY/Instrument/Source/Pump/frequency', '@attrs:metadata/instrument/beam/pump/frequency']",
173+
"frequency": "!['@eln:/ENTRY/Instrument/Source/Pump/frequency', '@attrs:metadata/instrument/beam/pump/frequency', '@attrs:metadata/elabFTW/laser_status/pump_repetition_rate']",
178174
"frequency/@units": "kHz",
179175
"associated_beam": "/entry/instrument/beam_pump"
180176
},
181-
"beamTYPE[beam_pump]": {
177+
"beam_pump": {
182178
"distance": 0.0,
183179
"distance/@units": "mm",
184-
"incident_energy": "!['@eln:/ENTRY/Instrument/Beam/Pump/incident_energy', '@attrs:metadata/instrument/beam/pump/incident_energy']",
180+
"incident_energy": "!['@eln:/ENTRY/Instrument/Beam/Pump/incident_energy', '@attrs:metadata/instrument/beam/pump/incident_energy', '@attrs:metadata/elabFTW/laser_status/pump_photon_energy']",
185181
"incident_energy/@units": "eV",
186-
"incident_energy_spread": "['@eln:/ENTRY/Instrument/Beam/Pump/incident_energy_spread', '@attrs:metadata/instrument/beam/pump/incident_energy_spread']",
182+
"incident_energy_spread": "['@eln:/ENTRY/Instrument/Beam/Pump/incident_energy_spread', '@attrs:metadata/instrument/beam/pump/incident_energy_spread', '@attrs:metadata/elabFTW/laser_status/pump_photon_energy_spread']",
187183
"incident_energy_spread/@units": "eV",
188-
"incident_wavelength": "['@eln:/ENTRY/Instrument/Beam/Pump/incident_wavelength', '@attrs:metadata/instrument/beam/pump/incident_wavelength']",
184+
"incident_wavelength": "['@eln:/ENTRY/Instrument/Beam/Pump/incident_wavelength', '@attrs:metadata/instrument/beam/pump/incident_wavelength', '@attrs:metadata/file/trARPES:Orpheus:Wavelength']",
189185
"incident_wavelength/@units": "nm",
190-
"pulse_duration": "['@eln:/ENTRY/Instrument/Beam/Pump/pulse_duration', '@attrs:metadata/instrument/beam/pump/pulse_duration']",
186+
"pulse_duration": "['@eln:/ENTRY/Instrument/Beam/Pump/pulse_duration', '@attrs:metadata/instrument/beam/pump/pulse_duration', '@attrs:metadata/elabFTW/laser_status/pump_pulse_duration']",
191187
"pulse_duration/@units": "fs",
192-
"incident_polarization": "['@eln:/ENTRY/Instrument/Beam/Pump/incident_polarization', '@attrs:metadata/instrument/beam/pump/incident_polarization']",
188+
"incident_polarization": "['@eln:/ENTRY/Instrument/Beam/Pump/incident_polarization', '@attrs:metadata/instrument/beam/pump/incident_polarization', '@attrs:metadata/elabFTW/scan/pump_polarization']",
193189
"incident_polarization/@units": "V^2/mm^2",
194-
"pulse_energy": "['@eln:/ENTRY/Instrument/Beam/Pump/pulse_energy', '@attrs:metadata/instrument/beam/pump/pulse_energy']",
190+
"pulse_energy": "['@eln:/ENTRY/Instrument/Beam/Pump/pulse_energy', '@attrs:metadata/instrument/beam/pump/pulse_energy', '@attrs:metadata/elabFTW/scan/pump_pulse_energy']",
195191
"pulse_energy/@units": "µJ",
196-
"average_power": "['@eln:/ENTRY/Instrument/Beam/Pump/average_power', '@attrs:metadata/instrument/beam/pump/average_power']",
192+
"average_power": "['@eln:/ENTRY/Instrument/Beam/Pump/average_power', '@attrs:metadata/instrument/beam/pump/average_power', '@attrs:metadata/file/trARPES:Pump:Power.RBV']",
197193
"average_power/@units": "mW",
198-
"extent": "['@eln:/ENTRY/Instrument/Beam/Pump/extent', '@attrs:metadata/instrument/beam/pump/extent']",
194+
"extent": "['@eln:/ENTRY/Instrument/Beam/Pump/extent', '@attrs:metadata/instrument/beam/pump/extent', '@attrs:metadata/elabFTW/laser_status/pump_profile']",
199195
"extent/@units": "µm",
200-
"fluence": "['@eln:/ENTRY/Instrument/Beam/Pump/fluence', '@attrs:metadata/instrument/beam/pump/fluence']",
196+
"fluence": "['@eln:/ENTRY/Instrument/Beam/Pump/fluence', '@attrs:metadata/instrument/beam/pump/fluence', '@attrs:metadata/elabFTW/scan/pump_fluence']",
201197
"fluence/@units": "mJ/cm^2",
202198
"associated_source": "/entry/instrument/source_pump"
203199
},
@@ -235,13 +231,13 @@
235231
}
236232
},
237233
"/ENTRY/SAMPLE[sample]": {
238-
"preparation_date": "['@eln:/ENTRY/Sample/preparation_date', '@attrs:metadata/sample/preparation_date']",
239-
"history/notes/description": "['@eln:/ENTRY/Sample/sample_history', '@attrs:metadata/sample/sample_history']",
240-
"history/notes/type": "text/plain",
241-
"description": "['@eln:/ENTRY/Sample/description', '@attrs:metadata/sample/chemical_formula']",
242-
"name": "['@eln:/ENTRY/Sample/name', '@attrs:metadata/sample/name']",
234+
"preparation_date": "['@eln:/ENTRY/Sample/preparation_date', '@attrs:metadata/sample/preparation_date', '@attrs:metadata/elabFTW/sample/preparation_date']",
235+
"history/sample_preparation/start_time": "['@eln:/ENTRY/Sample/preparation_date', '@attrs:metadata/sample/preparation_date', '@attrs:metadata/elabFTW/sample/preparation_date']",
236+
"history/sample_preparation/description": "['@eln:/ENTRY/Sample/sample_history', '@attrs:metadata/sample/sample_history', '@attrs:metadata/elabFTW/sample/sample_history']",
237+
"description": "['@eln:/ENTRY/Sample/description', '@attrs:metadata/sample/chemical_formula', '@attrs:metadata/elabFTW/sample/summary']",
238+
"name": "['@eln:/ENTRY/Sample/name', '@attrs:metadata/sample/name', '@attrs:metadata/elabFTW/sample/title']",
243239
"situation": "vacuum",
244-
"SUBSTANCE[substance]/molecular_formula_hill": "['@eln:/ENTRY/Sample/chemical_formula', '@attrs:metadata/sample/chemical_formula']",
240+
"chemical_formula": "['@eln:/ENTRY/Sample/chemical_formula', '@attrs:metadata/sample/chemical_formula', '@attrs:metadata/elabFTW/sample/sample_formula']",
245241
"temperature_env": {
246242
"temperature_sensor": "@link:/entry/instrument/manipulator/temperature_sensor"
247243
},
@@ -290,7 +286,8 @@
290286
"AXISNAME[trans_x]/@vector": [1, 0, 0]
291287
}
292288
},
293-
"/ENTRY/PROCESS_MPES[process]/DISTORTION[distortion]": {
289+
"/ENTRY/DISTORTION[distortion]": {
290+
"applied": "!@attrs:metadata/momentum_correction/correction/applied",
294291
"symmetry": "!@attrs:metadata/momentum_correction/correction/rotation_symmetry",
295292
"symmetry/@units": "",
296293
"original_centre": "@attrs:metadata/momentum_correction/correction/center_point",
@@ -302,7 +299,8 @@
302299
"rdeform_field": "@attrs:metadata/momentum_correction/correction/rdeform_field",
303300
"rdeform_field/@units": ""
304301
},
305-
"/ENTRY/PROCESS_MPES[process]/REGISTRATION[registration]": {
302+
"/ENTRY/REGISTRATION[registration]": {
303+
"applied": "!@attrs:metadata/momentum_correction/registration/applied",
306304
"depends_on": "/entry/process/registration/transformations/rot_z",
307305
"TRANSFORMATIONS[transformations]": {
308306
"AXISNAME[trans_x]": "@attrs:metadata/momentum_correction/registration/trans_x/value",
@@ -323,39 +321,45 @@
323321
"AXISNAME[rot_z]/@depends_on": "@attrs:metadata/momentum_correction/registration/rot_z/depends_on"
324322
}
325323
},
326-
"/ENTRY/PROCESS_MPES[process]/energy_calibration":{
327-
"coefficients": "@attrs:metadata/energy_calibration/calibration/coefficients",
328-
"coefficients/@units": "",
329-
"fit_function": "@attrs:metadata/energy_calibration/calibration/fit_function",
324+
"/ENTRY/CALIBRATION[energy_calibration]":{
325+
"applied": "!@attrs:metadata/energy_calibration/applied",
326+
"fit_formula_inputs/TERM[coefficients]": "@attrs:metadata/energy_calibration/calibration/coefficients",
327+
"fit_formula_inputs/TERM[coefficients]/@units": "",
328+
"fit_formula_description": "@attrs:metadata/energy_calibration/calibration/fit_function",
330329
"original_axis": "@attrs:metadata/energy_calibration/tof",
331-
"original_axis/@units": "ns",
330+
"original_axis/@units": "",
332331
"calibrated_axis": "@attrs:metadata/energy_calibration/calibration/axis",
333332
"calibrated_axis/@units": "eV",
334333
"physical_quantity": "energy"
335334
},
336-
"/ENTRY/PROCESS_MPES[process]/kx_calibration": {
337-
"scaling": "@attrs:metadata/momentum_calibration/calibration/kx_scale",
338-
"scaling/@units": "",
335+
"/ENTRY/CALIBRATION[kx_calibration]": {
336+
"applied": "!@attrs:metadata/momentum_calibration/applied",
337+
"scaling_factor": "@attrs:metadata/momentum_calibration/calibration/kx_scale",
338+
"scaling_factor/@units": "",
339339
"offset": "@attrs:metadata/momentum_calibration/calibration/x_center",
340340
"offset/@units": "",
341341
"calibrated_axis": "@attrs:metadata/momentum_calibration/calibration/kx_axis",
342342
"calibrated_axis/@units": "1/angstrom",
343343
"physical_quantity": "momentum"
344344
},
345-
"/ENTRY/PROCESS_MPES[process]/ky_calibration": {
346-
"scaling": "@attrs:metadata/momentum_calibration/calibration/ky_scale",
345+
"/ENTRY/CALIBRATION[ky_calibration]": {
346+
"applied": "!@attrs:metadata/momentum_calibration/applied",
347+
"scaling_factor": "@attrs:metadata/momentum_calibration/calibration/ky_scale",
348+
"scaling_factor/@units": "",
347349
"offset": "@attrs:metadata/momentum_calibration/calibration/y_center",
350+
"offset/@units": "",
348351
"calibrated_axis": "@attrs:metadata/momentum_calibration/calibration/ky_axis",
349-
"calibrated_axis/@units": "Angstrom^-1"
352+
"calibrated_axis/@units": "1/angstrom",
353+
"physical_quantity": "momentum"
350354
},
351355
"/ENTRY/data": {
352356
"@axes": "@data:dims",
353-
"@*_indices": "@data:*.index",
357+
"AXISNAME_indices[@*_indices]": "@data:*.index",
354358
"@signal": "data",
355359
"data": "@data:data",
356360
"data/@units": "counts",
357-
"*": "@data:*.data",
358-
"*/@units": "@data:*.unit",
359-
"energy/@type": "@attrs:metadata/energy_calibration/calibration/energy_scale"
361+
"AXISNAME[*]": "@data:*.data",
362+
"AXISNAME[*]/@units": "@data:*.unit",
363+
"AXISNAME[energy]/@type": "['@attrs:metadata/energy_calibration/calibration/energy_scale', 'kinetic']"
360364
}
361365
}

0 commit comments

Comments
 (0)