Skip to content

Commit 0f31944

Browse files
authored
Merge pull request #150 from FAIRmat-NFDI/voltage_scan_range
Move voltage scan range to NXelectronanalyser
2 parents d2fdad4 + 0a5a742 commit 0f31944

File tree

6 files changed

+20
-27
lines changed

6 files changed

+20
-27
lines changed

contributed_definitions/NXelectronanalyser.nxdl.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,12 @@
8888
accurately determine the binding energy scale.
8989
</doc>
9090
</field>
91+
<field name="voltage_energy_range" type="NX_FLOAT" units="NX_VOLTAGE">
92+
<doc>
93+
Energy range of the voltage supplies. This influences the noise of the supplies,
94+
and thereby the energy resolution.
95+
</doc>
96+
</field>
9197
<group name="energy_resolution" type="NXresolution">
9298
<doc>
9399
Energy resolution of the analyser with the current setting. May be linked from an

contributed_definitions/NXenergydispersion.nxdl.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,6 @@
142142
Length of the tof drift electrode
143143
</doc>
144144
</field>
145-
<field name="voltage_scan_range" type="NX_FLOAT" units="NX_VOLTAGE">
146-
<doc>
147-
Maximum/minimum voltage range of the energy dispersion, i.e., the voltage that is set on
148-
the two hemispheres. If this range is set to `k` V, it means that the voltage can be varied
149-
-`k` and `k` V. Influences the energy resolution.
150-
</doc>
151-
</field>
152145
<group type="NXaperture">
153146
<doc>
154147
Size, position and shape of a slit in dispersive analyzer, e.g. entrance and

contributed_definitions/NXmpes.nxdl.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@
293293
</field>
294294
<field name="pass_energy" type="NX_FLOAT" units="NX_ENERGY"/>
295295
<field name="energy_scan_mode" recommended="true"/>
296-
<field name="voltage_scan_range" type="NX_FLOAT" optional="true"/>
297296
<group name="entrance_slit" type="NXaperture" optional="true">
298297
<doc>
299298
Size, position and shape of the entrance slit in dispersive analyzers.

contributed_definitions/nyaml/NXelectronanalyser.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ NXelectronanalyser(NXobject):
5151
As a result, the measured kinetic energy :math:`E_K^{\mathrm{meas.}}` of a photoelectron is `independent`
5252
of the sample work function. Nonetheless, the work function :math:`\phi_s` needs to be known to
5353
accurately determine the binding energy scale.
54+
voltage_energy_range(NX_FLOAT):
55+
unit: NX_VOLTAGE
56+
doc: |
57+
Energy range of the voltage supplies. This influences the noise of the supplies,
58+
and thereby the energy resolution.
5459
energy_resolution(NXresolution):
5560
doc:
5661
- |
@@ -201,7 +206,7 @@ NXelectronanalyser(NXobject):
201206
Any other resolution not explicitly named in this base class.
202207
203208
# ++++++++++++++++++++++++++++++++++ SHA HASH ++++++++++++++++++++++++++++++++++
204-
# 46e66ca4964b0e498516c08eae405b5ee657527c29a0b88c956704fa61e59c83
209+
# a713eabad7ec1246a1ceba9da426fd1188b23ddbd16fe7db6271b823ca6dbcd7
205210
# <?xml version='1.0' encoding='UTF-8'?>
206211
# <?xml-stylesheet type="text/xsl" href="nxdlformat.xsl"?>
207212
# <!--
@@ -292,6 +297,12 @@ NXelectronanalyser(NXobject):
292297
# accurately determine the binding energy scale.
293298
# </doc>
294299
# </field>
300+
# <field name="voltage_energy_range" type="NX_FLOAT" units="NX_VOLTAGE">
301+
# <doc>
302+
# Energy range of the voltage supplies. This influences the noise of the supplies,
303+
# and thereby the energy resolution.
304+
# </doc>
305+
# </field>
295306
# <group name="energy_resolution" type="NXresolution">
296307
# <doc>
297308
# Energy resolution of the analyser with the current setting. May be linked from an

contributed_definitions/nyaml/NXenergydispersion.yaml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,6 @@ NXenergydispersion(NXobject):
106106
unit: NX_LENGTH
107107
doc: |
108108
Length of the tof drift electrode
109-
voltage_scan_range(NX_FLOAT):
110-
unit: NX_VOLTAGE
111-
doc: |
112-
Maximum/minimum voltage range of the energy dispersion, i.e., the voltage that is set on
113-
the two hemispheres. If this range is set to `k` V, it means that the voltage can be varied
114-
-`k` and `k` V. Influences the energy resolution.
115109
(NXaperture):
116110
doc: |
117111
Size, position and shape of a slit in dispersive analyzer, e.g. entrance and
@@ -139,7 +133,7 @@ NXenergydispersion(NXobject):
139133
the reference coordinate system.
140134
141135
# ++++++++++++++++++++++++++++++++++ SHA HASH ++++++++++++++++++++++++++++++++++
142-
# 8085fec6b4fd2c46cfbe73186288cec3345d8383985940f7c417693f901825cd
136+
# e084c20fefdccbc249b32694d11fe8411402d9470fd37fb15b410d3af6fa0fd8
143137
# <?xml version='1.0' encoding='UTF-8'?>
144138
# <?xml-stylesheet type="text/xsl" href="nxdlformat.xsl"?>
145139
# <!--
@@ -284,13 +278,6 @@ NXenergydispersion(NXobject):
284278
# Length of the tof drift electrode
285279
# </doc>
286280
# </field>
287-
# <field name="voltage_scan_range" type="NX_FLOAT" units="NX_VOLTAGE">
288-
# <doc>
289-
# Maximum/minimum voltage range of the energy dispersion, i.e., the voltage that is set on
290-
# the two hemispheres. If this range is set to `k` V, it means that the voltage can be varied
291-
# -`k` and `k` V. Influences the energy resolution.
292-
# </doc>
293-
# </field>
294281
# <group type="NXaperture">
295282
# <doc>
296283
# Size, position and shape of a slit in dispersive analyzer, e.g. entrance and

contributed_definitions/nyaml/NXmpes.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,6 @@ NXmpes(NXobject):
245245
unit: NX_ENERGY
246246
energy_scan_mode:
247247
exists: recommended
248-
voltage_scan_range(NX_FLOAT):
249-
exists: optional
250248
entrance_slit(NXaperture):
251249
exists: optional
252250
doc: |
@@ -755,7 +753,7 @@ NXmpes(NXobject):
755753
@energy_depends: 'entry/process/energy_calibration'
756754
757755
# ++++++++++++++++++++++++++++++++++ SHA HASH ++++++++++++++++++++++++++++++++++
758-
# 602ff2166c0a864186722c2f92db7636511b889b04e5843a6f765d47c441829a
756+
# 0858e4c498e1d031bbe35e761fdbb30b8db75d6725f7b39b320d53a90ec23587
759757
# <?xml version='1.0' encoding='UTF-8'?>
760758
# <?xml-stylesheet type="text/xsl" href="nxdlformat.xsl"?>
761759
# <!--
@@ -1051,7 +1049,6 @@ NXmpes(NXobject):
10511049
# </field>
10521050
# <field name="pass_energy" type="NX_FLOAT" units="NX_ENERGY"/>
10531051
# <field name="energy_scan_mode" recommended="true"/>
1054-
# <field name="voltage_scan_range" type="NX_FLOAT" optional="true"/>
10551052
# <group name="entrance_slit" type="NXaperture" optional="true">
10561053
# <doc>
10571054
# Size, position and shape of the entrance slit in dispersive analyzers.

0 commit comments

Comments
 (0)