Skip to content

Commit e82bc06

Browse files
committed
Merge branch 'master' of github.com:areaDetector/ADCore
2 parents 00efd96 + 0d264c3 commit e82bc06

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

docs/ADCore/NDPluginDriver.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,9 @@ in the correct order. This sorting option is enabled by setting SortMode=Sorted,
248248
and works using the following algorithm:
249249

250250
- An std::multiset object is created to store the NDArray output pointers as they
251-
are received in NDArrayDriver::doNDArrayCallbacks. This is the method that all derived
251+
are received in NDArrayDriver::endProcessCallbacks. This is the method that all derived
252252
classes must call to output NDArrays to downstream plugins. This std::multiset also
253-
stores the time at which each NDArray was received by the NDArrayDriver::doNDArrayCallbacks
253+
stores the time at which each NDArray was received by the NDArrayDriver::endProcessCallbacks
254254
method. This multiset is automatically sorted by the uniqueId of each NDArray.
255255

256256
- A worker thread is created which processes at the time interval specified by SortTime.

docs/ADCore/NDPluginStats.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,14 +357,14 @@ are just a single name, for example ``NDPluginStatsComputeStatistics``.
357357
- bo, bi
358358
* - NDPluginStats |br| ProfileSizeX
359359
- asynInt32
360-
- r/w
360+
- r/o
361361
- Number of array elements in the X profiles.
362362
- PROFILE_SIZE_X
363363
- $(P)$(R)ProfileSizeX_RBV
364364
- longin
365365
* - NDPluginStats |br| ProfileSizeY
366366
- asynInt32
367-
- r/w
367+
- r/o
368368
- Number of array elements in the Y profiles.
369369
- PROFILE_SIZE_Y
370370
- $(P)$(R)ProfileSizeY_RBV

0 commit comments

Comments
 (0)