Skip to content

Commit cb9c06c

Browse files
committed
fix Flash Nexus config
1 parent a60da54 commit cb9c06c

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

src/sed/config/NXmpes_config-HEXTOF.json

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
"/ENTRY[entry]/experiment_institution": "Deutsches Elektronen-Synchrotron DESY",
77
"/ENTRY[entry]/experiment_facility": "Free-Electron Laser FLASH",
88
"/ENTRY[entry]/experiment_laboratory": "@attrs:metadata/creationLocation",
9-
"/ENTRY/entry_identifier": {
10-
"identifier":"@attrs:metadata/pid"
11-
},
9+
"/ENTRY/identifierNAME[entry_identifier]": "@attrs:metadata/pid",
1210
"/ENTRY[entry]/USER[user0]": {
1311
"name": "!@attrs:metadata/principalInvestigator",
1412
"role": "Principal investigator",
@@ -114,12 +112,11 @@
114112
"tof_distance": 0.8,
115113
"tof_distance/@units": "m"
116114
},
117-
"/ENTRY[entry]/INSTRUMENT[instrument]/ELECTRONANALYZER[electronanalyzer]/DETECTOR[detector]": {
115+
"/ENTRY[entry]/INSTRUMENT[instrument]/ELECTRONANALYZER[electronanalyzer]/ELECTRON_DETECTOR[detector]": {
118116
"amplifier_type": "MCP",
119-
"detector_type": "DLD",
120-
"sensor_pixels": [2024, 2048]
117+
"detector_type": "DLD"
121118
},
122-
"/ENTRY[entry]/INSTRUMENT[instrument]/sourceTYPE[source_probe]": {
119+
"/ENTRY[entry]/INSTRUMENT[instrument]/source_probe": {
123120
"name": "@attrs:metadata/scientificMetadata/Source/name",
124121
"probe": "@attrs:metadata/scientificMetadata/Source/probe",
125122
"type": "@attrs:metadata/scientificMetadata/Source/type",
@@ -128,7 +125,7 @@
128125
"frequency/@units": "@attrs:metadata/scientificMetadata/Source/repetition_rate/unit",
129126
"associated_beam": "/entry/instrument/beam_probe"
130127
},
131-
"/ENTRY[entry]/INSTRUMENT[instrument]/beamTYPE[beam_probe]": {
128+
"/ENTRY[entry]/INSTRUMENT[instrument]/beam_probe": {
132129
"distance": 0.0,
133130
"distance/@units": "mm",
134131
"incident_energy": "@attrs:metadata/scientificMetadata/Source/photon_energy/value",
@@ -146,16 +143,16 @@
146143
"energy_dispersion": "@attrs:metadata/scientificMetadata/Source/dispersion/value",
147144
"energy_dispersion/@units": "@attrs:metadata/scientificMetadata/Source/dispersion/unit"
148145
},
149-
"/ENTRY[entry]/INSTRUMENT[instrument]/sourceTYPE[source_pump]": {
146+
"/ENTRY[entry]/INSTRUMENT[instrument]/source_pump": {
150147
"name": "PIGLET @ FLASH @ DESY",
151148
"probe": "visible light",
152149
"type": "Optical Laser",
153150
"mode": "Single Bunch",
154-
"frequency": 1000,
151+
"frequency": 1000.0,
155152
"frequency/@units": "kHz",
156153
"associated_beam": "/entry/instrument/beam_pump"
157154
},
158-
"/ENTRY[entry]/INSTRUMENT[instrument]/beamTYPE[beam_pump]": {
155+
"/ENTRY[entry]/INSTRUMENT[instrument]/beam_pump": {
159156
"distance": 0.0,
160157
"distance/@units": "mm",
161158
"incident_wavelength": "@attrs:metadata/scientificMetadata/Laser/wavelength/value",
@@ -195,7 +192,7 @@
195192
"gas_pressure_env": {
196193
"pressure_gauge": "@link:/entry/instrument/pressure_gauge"
197194
},
198-
"bias": {
195+
"bias_env": {
199196
"voltmeter": "@link:/entry/instrument/manipulator/sample_bias_voltmeter"
200197
}
201198
},
@@ -207,6 +204,6 @@
207204
"data/@units": "counts",
208205
"AXISNAME[*]": "@data:*.data",
209206
"AXISNAME[*]/@units": "@data:*.unit",
210-
"energy/@type": "@attrs:metadata/energy_calibration/calibration/energy_scale"
207+
"AXISNAME[energy]/@type": "@attrs:metadata/energy_calibration/calibration/energy_scale"
211208
}
212209
}

tutorial/4_hextof_workflow.ipynb

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -894,13 +894,21 @@
894894
"metadata = load_config(meta_path + \"/44824_20230324T060430.json\")\n",
895895
"\n",
896896
"# Fix metadata\n",
897+
"metadata[\"scientificMetadata\"][\"Source\"][\"photon_energy\"][\"value\"] = float(metadata[\"scientificMetadata\"][\"Source\"][\"photon_energy\"][\"value\"])\n",
898+
"metadata[\"scientificMetadata\"][\"Source\"][\"repetition_rate\"][\"value\"] = float(metadata[\"scientificMetadata\"][\"Source\"][\"repetition_rate\"][\"value\"])\n",
897899
"metadata[\"scientificMetadata\"][\"Laser\"][\"wavelength\"][\"value\"] = float(metadata[\"scientificMetadata\"][\"Laser\"][\"wavelength\"][\"value\"][:-2])\n",
900+
"metadata[\"scientificMetadata\"][\"Laser\"][\"pulse duration\"][\"value\"] = float(metadata[\"scientificMetadata\"][\"Laser\"][\"pulse duration\"][\"value\"])\n",
901+
"metadata[\"scientificMetadata\"][\"Laser\"][\"pulse_energy\"][\"value\"] = float(metadata[\"scientificMetadata\"][\"Laser\"][\"pulse_energy\"][\"value\"])\n",
898902
"metadata[\"scientificMetadata\"][\"Laser\"][\"energy\"] = {\"value\": 1239.84/metadata[\"scientificMetadata\"][\"Laser\"][\"wavelength\"][\"value\"], \"unit\": \"eV\"}\n",
899903
"metadata[\"scientificMetadata\"][\"Laser\"][\"polarization\"] = [1, 1, 0, 0]\n",
904+
"metadata[\"scientificMetadata\"][\"Manipulator\"][\"sample_bias\"] = float(metadata[\"scientificMetadata\"][\"Manipulator\"][\"sample_bias\"])\n",
905+
"metadata[\"scientificMetadata\"][\"Collection\"][\"tof_voltage\"] = float(metadata[\"scientificMetadata\"][\"Collection\"][\"tof_voltage\"])\n",
906+
"metadata[\"scientificMetadata\"][\"Collection\"][\"extractor_voltage\"] = float(metadata[\"scientificMetadata\"][\"Collection\"][\"extractor_voltage\"])\n",
907+
"metadata[\"scientificMetadata\"][\"Collection\"][\"field_aperture\"] = float(metadata[\"scientificMetadata\"][\"Collection\"][\"field_aperture\"])\n",
900908
"metadata[\"scientificMetadata\"][\"Collection\"][\"field_aperture_x\"] = float(metadata[\"scientificMetadata\"][\"Collection\"][\"field_aperture_x\"])\n",
901909
"metadata[\"scientificMetadata\"][\"Collection\"][\"field_aperture_y\"] = float(metadata[\"scientificMetadata\"][\"Collection\"][\"field_aperture_y\"])\n",
902910
"metadata[\"pi\"] = {\"institute\": \"JGU Mainz\"}\n",
903-
"metadata[\"proposer\"] = {\"institute\": \"TU Dortmund\"}\n"
911+
"metadata[\"proposer\"] = {\"institute\": \"TU Dortmund\"}"
904912
]
905913
},
906914
{

0 commit comments

Comments
 (0)