diff --git a/docs/src/serverupgrade.rst b/docs/src/serverupgrade.rst index c6fe1675a..a215da8ae 100644 --- a/docs/src/serverupgrade.rst +++ b/docs/src/serverupgrade.rst @@ -1,4 +1,5 @@ .. _Detector Server Upgrade: + Upgrade ======== diff --git a/docs/src/slsreceiver.rst b/docs/src/slsreceiver.rst index 847f12a05..8e96ca8aa 100644 --- a/docs/src/slsreceiver.rst +++ b/docs/src/slsreceiver.rst @@ -23,16 +23,21 @@ Receiver Variants ----------------- There are three main receiver types. How to start them is described :ref:`below`. ++----------------------+--------------------+-----------------------------------------+--------------------------------+ +| Receiver Type | slsReceiver | slsMultiReceiver |slsFrameSynchronizer | ++======================+====================+=========================================+================================+ +| Modules Supported | 1 | Multiple | Multiple | ++----------------------+--------------------+-----------------------------------------+--------------------------------+ +| Internal Architecture| Threads per porttt | Multiple child processes of slsReceiver | Multi-threading of slsReceiver | ++----------------------+--------------------+-----------------------------------------+--------------------------------+ +| ZMQ Streaming | Disabled by default| Disabled by default | Enabled, not optional | ++----------------------+--------------------+-----------------------------------------+--------------------------------+ +| ZMQ Synchronization | No | No | Yes, across ports | ++----------------------+--------------------+-----------------------------------------+--------------------------------+ +| Image Reconstruction | No | No | No | ++----------------------+--------------------+-----------------------------------------+--------------------------------+ + -+----------------------+------------------+-----------------------------------------+--------------------+--------------------+---------------------+ -| Receiver Type | Modules Supported| Internal Architecture | ZMQ Streaming | ZMQ Synchronization| Image Reconstruction| -+======================+==================+=========================================+====================+====================+=====================+ -| slsReceiver | 1 | Threads per port | Disabled by default| No | No | -+----------------------+------------------+-----------------------------------------+--------------------+--------------------+---------------------+ -| slsMultiReceiver | Multiple | Multiple child processes of slsReceiver | Disabled by default| No | No | -+----------------------+------------------+-----------------------------------------+--------------------+--------------------+---------------------+ -| slsFrameSynchronizer | Multiple | Multi-threading of slsReceiver | Enabled | Yes, across ports | No | -+----------------------+------------------+-----------------------------------------+--------------------+--------------------+---------------------+ .. _Starting up the Receiver: diff --git a/docs/src/virtualserver.rst b/docs/src/virtualserver.rst index ae1073d8e..226a94c98 100644 --- a/docs/src/virtualserver.rst +++ b/docs/src/virtualserver.rst @@ -1,4 +1,5 @@ .. _Virtual Detector Servers: + Simulators ===========