Skip to content

Commit 1f460cd

Browse files
RubelMozumderca-palmatomio13
authored
Preparation for SPM proposal to NIAC goes to FAIRmat (#401)
* Fix NXobject issue scan_control with new classes NXspm_scan_region, NXspm_scan_pattern. * fix generic volatage sensor in spm and the corresponding usages of it. * Rename the SPM related base classes according NXspm_... . * Remove duplicate file NXscan_control.yaml * fix partial name in scan control, scan reagion, scan pattern * STM and slight SPM * STS * AFM * Afm and cantilever. * Resolve comments from Tamash! * New base class for piezo_sensor. remove frequency positioner, bring piezo_sensor for common xyz and X, Y and Z separately. * Fix comments for PR-407: NXafm, NXspm, NXspm_bias_spectrocopy. * Include spm_lockin and spm_cantilever * Remove test NXspm_phse_lock_loop * include phase lock loop. * Update phase lock loop. * Slight modification. * Reviews from SPM community (#405) * Review to SPM App. Def. (#408) --------- Co-authored-by: ca-palma <124777158+ca-palma@users.noreply.github.com> * Rename NXspm_lockin to NXlockin. * Rename NXlockin * Rename Phase lock loop * update manual. * minor fixes and updates that come through the review comments. * fix some requirements of fields and groups. * fix calibration coffecient. * A few changes in response to the PR comments. * consider the PR review comments. * nameType in afm. * Update according to the PR comments. * Tiny modification. * Resolve PR comments and tiny modification while fixing test cases in pynxtools-spm. * some fixes while fixing readers. * cleaning up the NXamplifier.nxdl.xml * tiny fix of nameType. * Unit fix for PLL/Ko_coefficient --------- Co-authored-by: ca-palma <124777158+ca-palma@users.noreply.github.com> Co-authored-by: T. Haraszti <haraszti@dwi.rwth-aachen.de>
1 parent eef5729 commit 1f460cd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+5494
-4997
lines changed

.cspell/custom-dictionary.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,9 @@ xdmf
505505
ydim
506506
zener
507507
zoneplate
508+
XYZpiezo
509+
XYpiezo
510+
transimpedance
508511

509512
# Names used for publications, places, companies, etc.
510513
Acta

contributed_definitions/NXafm.nxdl.xml

Lines changed: 75 additions & 157 deletions
Large diffs are not rendered by default.

contributed_definitions/NXamplifier.nxdl.xml

Lines changed: 67 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version='1.0' encoding='UTF-8'?>
22
<?xml-stylesheet type="text/xsl" href="nxdlformat.xsl"?>
33
<!--
44
# NeXus - Neutron and X-ray Common Data Format
@@ -25,6 +25,45 @@
2525
<doc>
2626
Base classed definition for amplifier devices.
2727
</doc>
28+
<field name="classification">
29+
<doc>
30+
Type of the amplifier base on the response on frequency.
31+
</doc>
32+
<enumeration open="true">
33+
<item value="low-pass">
34+
<doc>
35+
A low-pass filter is a filter that passes signals
36+
with a frequency lower than a certain cutoff frequency and
37+
attenuates signals with frequencies higher than the cutoff frequency.
38+
</doc>
39+
</item>
40+
<item value="high-pass">
41+
<doc>
42+
A high-pass filter is a filter that passes signals
43+
with a frequency higher than a certain cutoff frequency and
44+
attenuates signals with frequencies lower than the cutoff frequency.
45+
</doc>
46+
</item>
47+
<item value="band-pass">
48+
<doc>
49+
A band-pass filter is a filter that passes signals
50+
within a certain frequency range and attenuates signals outside that range.
51+
</doc>
52+
</item>
53+
<item value="band-stop">
54+
<doc>
55+
A band-stop filter is a filter (opposite to the band-pass) that attenuates signals
56+
within a certain frequency range and passes signals outside that range.
57+
</doc>
58+
</item>
59+
<item value="broadband">
60+
<doc>
61+
A broadband filter is a filter that passes signals
62+
over a wide range of frequencies with minimal attenuation.
63+
</doc>
64+
</item>
65+
</enumeration>
66+
</field>
2867
<group name="hardware" type="NXfabrication">
2968
<doc>
3069
(IC, device) (NXmanufacturer?)
@@ -37,7 +76,7 @@
3776
</field>
3877
<field name="active_channels" type="NX_NUMBER">
3978
<doc>
40-
The number of preamplifier channels are ready tp to be used. (array for active
79+
The number of preamplifier channels are ready to be used. (array for active
4180
channels)
4281
</doc>
4382
</field>
@@ -51,41 +90,52 @@
5190
doc: !!! The ratio of the amplitude of the output signal to the amplitude of the input signal. (array for active channels) # From google.-->
5291
<field name="signal_over_noise" type="NX_NUMBER">
5392
<doc>
54-
The ratio of the amplitude of the useful signal to the amplitude of the noise in
93+
The ratio of the amplitude of the target signal to the amplitude of the noise in
5594
the output signal of the amplifier. S/N=V_signal/V_noise. (array for active
5695
channels)
5796
</doc>
5897
</field>
59-
<field name="crosstalk_factor" type="NX_NUMBER">
98+
<field name="crosstalk_factor" type="NX_NUMBER" units="db">
6099
<doc>
61-
(if active &gt;1)
100+
The unwanted coupling between different channels (if active &gt;1).
101+
In ideal amplifier, channels are independent of each other, But due to different resources
102+
sharing (e.g., same power supply, electromagnetic interference), there may have some
103+
unwanted coupling between different channels, which is called crosstalk.
62104
</doc>
63105
</field>
64106
<field name="crosstalk_compensation" type="NX_BOOLEAN">
65107
<doc>
66-
for reducing interferences between different signalling pathways
108+
If measures are taken for reducing interferences between different signalling
109+
pathways.
67110
</doc>
68111
</field>
69112
<field name="bandwidth" type="NX_NUMBER" units="NX_FREQUENCY">
70113
<doc>
71114
The spectrum of frequency it can amplify, from its lowest to highest frequency
72-
limits.
115+
limits. If it is difference of the frequencies, please also provide :ref:
116+
`center_frequency &lt;/NXamplifier/center_frequency-field&gt;`.
117+
</doc>
118+
</field>
119+
<field name="center_frequency" type="NX_NUMBER" units="NX_FREQUENCY">
120+
<doc>
121+
The frequency in the middle of the bandwidth.
122+
</doc>
123+
</field>
124+
<field name="lower_cutoff_frequency" type="NX_NUMBER" units="NX_FREQUENCY">
125+
<doc>
126+
The lower frequency point of the bandwidth where gain drops significantly (e.g.,
127+
-3dB point).
73128
</doc>
74129
</field>
75-
<field name="low_pass" type="NX_NUMBER" units="NX_FREQUENCY">
130+
<field name="upper_cutoff_frequency" type="NX_NUMBER" units="NX_FREQUENCY">
76131
<doc>
77-
Order and cut-off frequency of the low-pass filter applied on the demodulated
78-
signals (X,Y). Cut-off frq (low pass filter) (foreach DemodulatorChannels)
132+
The upper frequency point of the bandwidth where gain drops significantly (e.g.,
133+
-3dB point).
79134
</doc>
80135
</field>
81-
<field name="hi_pass" type="NX_NUMBER" units="NX_FREQUENCY">
136+
<field name="gain" type="NX_NUMBER">
82137
<doc>
83-
Order and cut-off frequency of the high-pass filter applied on the demodulation
84-
signal. Cut-off frq (hi pass filter) (foreach DemodulatorChannels)
138+
The ratio of the output signal to the input signal of the amplifier.
85139
</doc>
86140
</field>
87-
<!--voltage_amplifier_factor(NX_NUMBER):
88-
doc: !!! Current Amplifier Factor typically refers to the gain of the probe current amplifier. (V/V)
89-
current_amplifier_capacitive_cross_talk_compensation(NX_CHAR):
90-
doc: !!! Reduces the effect of capacitive crosstalk in the circuit on experimental results.-->
91141
</definition>

contributed_definitions/NXcantilever_spm.nxdl.xml

Lines changed: 0 additions & 168 deletions
This file was deleted.

0 commit comments

Comments
 (0)