Skip to content

Commit b7ed0f0

Browse files
committed
Minor tweaks to format
1 parent 94f05ca commit b7ed0f0

File tree

5 files changed

+30
-8
lines changed

5 files changed

+30
-8
lines changed

docs/source/feedback.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,17 @@ The setpoint is 0 in this case, which is the desired beam position.
5454
.. figure:: mono_pitch_feedback.png
5555
:align: center
5656

57+
|
58+
5759
This is the medm screen for the PID parameters in the epid record.
5860
These are adjusted to tune the feedback for the desired response and stability.
5961
The units of the integral (I) term are approximately Hz.
6062

6163
.. figure:: mono_pitch_feedback_parameters.png
6264
:align: center
6365

66+
|
67+
6468
This is the medm screen that plots the setpoint and readback of the feedback loop
6569
as a function of time.
6670

docs/source/plugins.rst

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,20 @@ Note that the first time the IOC is started all of the plugins will have EnableC
107107
It is necessary to enable each of the plugins that will be used.
108108
The value of EnableCallbacks is saved by autosave, and will be restored the next time the IOC is started.
109109

110-
This is the medm screen for all of the plugins defined in quadEM_Plugins.cmd.
110+
This is the medm screen for all of the plugins defined in quadEM_Plugins.cmd.
111111

112112
.. figure:: QECommonPlugins.png
113113
:align: center
114114

115-
This is the medm screen for the Current1: NDPluginStats plugin loaded by commonPlugins.cmd.
115+
|
116+
117+
This is the medm screen for the Current1: NDPluginStats plugin loaded by commonPlugins.cmd.
116118

117119
.. figure:: QENDStats.png
118120
:align: center
119121

122+
|
123+
120124
This is the medm screen to control the NDPluginTimeSeries plugin. In this example
121125
the time per point from the TetrAMM is 50 microseconds, and averaging time for the
122126
time series plugin is 1 millisecond, or 20 points. The plugin has 2000 time points,
@@ -125,29 +129,38 @@ and is operating in circular buffer mode.
125129
.. figure:: quadEM_TimeSeries.png
126130
:align: center
127131

132+
|
133+
128134
This is a plot of the time series for Current 1. It shows the last 2 seconds of
129135
data in circular buffer mode.
130136

131137
.. figure:: quadEM_TimeSeriesPlot.png
132138
:align: center
133139

140+
|
141+
134142
This is a plot of the time series for the horizontal currents, sum, and position.
135143
It shows the last 2 seconds of data in circular buffer mode.
136144

137145
.. figure:: quadEM_HorizontalTimeSeriesPlot.png
138146
:align: center
139147

148+
|
149+
140150
This is a plot of the FFT for Current 1. DC offset suppression is enabled and 10
141151
FFTs are being averaged to improve the signal/noise ratio.
142152

143153
.. figure:: quadEM_NDFFTFreqSpectrumPlot.png
144154
:align: center
145155

156+
|
157+
146158
This is an medm screen for control of all 11 FFT plugins.
147159

148160
.. figure:: QEFFTPlugins.png
149161
:align: center
150162

163+
|
151164
152165
This is an medm screen that displays the FFTs of the Current, Sum, and Position
153166
for the time-series data above. 100 FFTs are being averaged to improve the signal/noise

docs/source/setup.rst

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
Setup
1414
-----
1515

16-
.. |br| raw:: html
17-
18-
<br>
19-
20-
All of the device-dependent startup scripts invoke quadEM_Plugins.cmd_.
16+
All the device-dependent startup scripts invoke quadEM_Plugins.cmd_.
2117
That file loads ADCore/iocBoot/commonPlugins.cmd, and then loads
2218
additional plugins that are configured specifically for quadEM.
2319

docs/source/streaming.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ AveragingTime is set to 0.1 seconds, so NumAverage_RBV is 2000.
1818
.. figure:: HDF5_stream.png
1919
:align: center
2020

21+
|
22+
2123
The Array address in the plugin is set to 11, so it is receiving all 11 data items.
2224
FileWriteMode is set to Stream, so it will stream the NDArrays to the HDF5 file
2325
as they arrive. NumCapture is set to 200, so it will collect 200 arrays, each with
@@ -96,13 +98,14 @@ select all elements in the second dimension, even if NumAverage_RBV changes.
9698
.. figure:: ROI_stream.png
9799
:align: center
98100

101+
|
102+
99103
The HDF5 plugin is changed to have its array port be ROI1, and the array address to be 0.
100104
Note that the NDArrays being received are now [4, 2000].
101105

102106
.. figure:: HDF5_stream_ROI.png
103107
:align: center
104108

105-
The HDF5 plugin is changed to have its array port be ROI1, and the array address to be 0.
106109
The filename is changed to quadEM_HDF5_ROI_001.h5. The resulting file size is 13 MB.
107110

108111

docs/source/tetramm_scanning.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ This is a plot of Current1 after the scan.
3737
.. figure:: sscan_tetramm_free_run_plot.png
3838
:align: center
3939

40+
|
41+
4042
Step scan with TetrAMM in single acquire mode
4143
.............................................
4244
This scan type uses a step-scan for the positioner and runs the TetrAMM in single cycle mode.
@@ -65,6 +67,8 @@ This is a plot of Current1 after the scan.
6567
.. figure:: sscan_tetramm_triggered_plot.png
6668
:align: center
6769

70+
|
71+
6872
Fly scan with TetrAMM in free-run mode
6973
.............................................
7074
This scan type uses a fly-scan for the positioner and runs the TetrAMM in free-run continuous mode.
@@ -105,6 +109,8 @@ This is a plot of Current1 after the scan.
105109
.. figure:: sscan_tetramm_fly_free_run_plot.png
106110
:align: center
107111

112+
|
113+
108114
Triggered scan using TetrAMM time series plugin
109115
...............................................
110116
This scan type uses triggers from the positioner to collect the TetrAMM data in the NDPluginTimeSeries plugin.

0 commit comments

Comments
 (0)