Compare commits
199 Commits
10.0.1.rc
...
dev/fix_m3
| Author | SHA1 | Date | |
|---|---|---|---|
| dae88ad689 | |||
| 7c232cbd48 | |||
| f4219ac879 | |||
| e54ffa9904 | |||
| d174d9a2ec | |||
| c92830f854 | |||
| e77fd8d85d | |||
| cd0fb1b7bb | |||
| 50ab20317d | |||
| d0a946a919 | |||
|
|
ed142aa34e | ||
| 1227574590 | |||
|
|
3ac7b579a0 | ||
|
|
feb1b0868e | ||
|
|
6d2f34ef1d | ||
| b36a5b9933 | |||
|
|
d8ce5eabb8 | ||
|
|
ceecb0ca27 | ||
| ac3670dcd2 | |||
| 1c7bc61531 | |||
| 58245a62a4 | |||
| a464262558 | |||
| 995d3e0034 | |||
| 90d57cb6a9 | |||
|
|
30eab42294 | ||
| 1d0eeea7ee | |||
| d7c012d306 | |||
| 1665937540 | |||
|
|
9343e3c667 | ||
|
|
b4c8fc1765 | ||
|
|
3ad4e01a5d | ||
| 015b4add65 | |||
| 9051dae787 | |||
| 68bdd75c9c | |||
| a53873b695 | |||
| 77a39b4ef2 | |||
| 64be8b1e89 | |||
| 68bd9fb4f7 | |||
| 0d5d851585 | |||
| eb3d51d20c | |||
| 9f4298ac15 | |||
| fb79ba768c | |||
| 7bc48e3111 | |||
| 53b90d92d7 | |||
| fb6ef8b818 | |||
| 8bb9de0de1 | |||
| 451b50dfed | |||
| 22f2662e3b | |||
| ce3f555c08 | |||
|
|
dedab6010d | ||
| 62a5fda33f | |||
| 5073769403 | |||
| aabec193ff | |||
| d4a1044fce | |||
| dca0edcfcc | |||
| 5a24a79bf7 | |||
| 91f9c4fa83 | |||
| 3940d6f56e | |||
| f09879a46c | |||
| 1b0e891912 | |||
| 292d65491a | |||
| 36faec6ad3 | |||
|
|
062002243e | ||
|
|
98b1e287a4 | ||
| adf0124ea3 | |||
| e1f46d4747 | |||
|
|
d8c3fa0df3 | ||
|
|
27530fca31 | ||
|
|
cc7f13a10e | ||
|
|
625f4353fb | ||
|
|
2815913d10 | ||
| 5fa2402ec5 | |||
| 4d7d3c9138 | |||
|
|
c3f1d05033 | ||
|
|
0e4cb7cbcd | ||
|
|
bace9edf89 | ||
|
|
99735c3ee5 | ||
|
|
2571397c70 | ||
|
|
497c3abfc2 | ||
|
|
fca31cc432 | ||
|
|
8fe4a78feb | ||
|
|
ee170fa2e0 | ||
|
|
da760b2b93 | ||
| 2c8c2a46ea | |||
| 9625a8058c | |||
|
|
4d8bdae836 | ||
|
|
3297707ab7 | ||
|
|
598154645c | ||
|
|
9d8f9a9ba9 | ||
| 68f163b757 | |||
| b8c5bb2045 | |||
| b45df191e5 | |||
| 01cc745787 | |||
|
|
f9bc2eb126 | ||
|
|
4c86ad3198 | ||
|
|
5be0724f82 | ||
|
|
7c652498e4 | ||
|
|
721d536350 | ||
| 361437428d | |||
|
|
aadbfeaf2d | ||
|
|
f119d14e7c | ||
| f8b12201f8 | |||
| 585c92be66 | |||
| 7c8639b8ae | |||
| a138b5b365 | |||
|
|
9fde62ae30 | ||
|
|
29fe988583 | ||
|
|
6740d9b363 | ||
|
|
1d1b55b864 | ||
| c32732b22e | |||
| 1e6b6fef0a | |||
|
|
5ab2c1693e | ||
| 0b3cd499a8 | |||
| 884e17f0c4 | |||
|
|
d0ccf236c0 | ||
|
|
396b955db7 | ||
|
|
5f14eb32aa | ||
|
|
cfec7c18ec | ||
|
|
04583acb21 | ||
|
|
95e11d668a | ||
| 772e58c743 | |||
| 470e2633c3 | |||
|
|
3312adddd1 | ||
| 46152d2419 | |||
|
|
b5c82783d6 | ||
| dc85a48864 | |||
| dc8a34592a | |||
| 96ae1a1cca | |||
| 3793e7b7d4 | |||
| 713e4f6822 | |||
|
|
fada23365e | ||
|
|
6dd0a5b0dd | ||
|
|
c3b197f209 | ||
|
|
9f49ac6457 | ||
|
|
0b3ead6353 | ||
| 8b3625fc01 | |||
|
|
0da508a8b7 | ||
|
|
608eb1a436 | ||
|
|
c0bc6fe25a | ||
|
|
a0d540fd72 | ||
|
|
46a46b65e5 | ||
|
|
4f62b1a05c | ||
| 45dadf8b90 | |||
| e8e84a4e72 | |||
|
|
2f390971e6 | ||
| b7e17d1320 | |||
| c54b1cb6af | |||
| ddb89bce34 | |||
| f056f9d31b | |||
|
|
d9a50ad9f4 | ||
| ce0450d498 | |||
| 7b531059a0 | |||
|
|
bc187bb198 | ||
|
|
eb8c34f53b | ||
| d9a50705e4 | |||
| f4626c2c81 | |||
| e0a48e1e75 | |||
| ec4eb1978e | |||
| 842b376801 | |||
| 13b2cada66 | |||
|
|
3c2f149c22 | ||
| 0a5b5aac4b | |||
| 6e5b058fc1 | |||
| ace2b3a938 | |||
| 5a8213024e | |||
| bd66228b30 | |||
| e1c9754cd2 | |||
| ff101e19cd | |||
| e8ac048114 | |||
| 3c79e8d7b2 | |||
| a74fb2bcd1 | |||
| 63bb79d727 | |||
| 8d87a6ee4e | |||
| ab01940769 | |||
| 23aa9c2814 | |||
| 010f736e80 | |||
| 4dcbcad435 | |||
| 8f8a92b9c5 | |||
| 684eee984d | |||
| 297c3752e3 | |||
| fa504e6675 | |||
| b9b4f1ae35 | |||
| 3c2062f23e | |||
| e7247f1fee | |||
|
|
905a509a17 | ||
| b4dc1dde6c | |||
| 964ab19b42 | |||
| ce8911de10 | |||
| d1e5b0bc42 | |||
| 4b3ed22f76 | |||
| aad1ab0cf4 | |||
| 117637863d | |||
| e933a25453 | |||
| f1f369b48c | |||
| 6b149244d3 | |||
| 436d180e93 | |||
| c43a4030a5 | |||
| 6e826d2840 | |||
| 315d49f8df |
64
.github/workflows/build_wheel.yml
vendored
@@ -1,64 +0,0 @@
|
||||
name: Build wheel
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
pull_request:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
release:
|
||||
types:
|
||||
- published
|
||||
|
||||
|
||||
jobs:
|
||||
build_wheels:
|
||||
name: Build wheels on ${{ matrix.os }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-latest,]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Build wheels
|
||||
run: pipx run cibuildwheel==2.23.0
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
|
||||
path: ./wheelhouse/*.whl
|
||||
|
||||
build_sdist:
|
||||
name: Build source distribution
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Build sdist
|
||||
run: pipx run build --sdist
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: cibw-sdist
|
||||
path: dist/*.tar.gz
|
||||
|
||||
upload_pypi:
|
||||
needs: [build_wheels, build_sdist]
|
||||
runs-on: ubuntu-latest
|
||||
environment: pypi
|
||||
permissions:
|
||||
id-token: write
|
||||
if: github.event_name == 'release' && github.event.action == 'published'
|
||||
# or, alternatively, upload to PyPI on every tag starting with 'v' (remove on: release above to use this)
|
||||
# if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
|
||||
steps:
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
# unpacks all CIBW artifacts into dist/
|
||||
pattern: cibw-*
|
||||
path: dist
|
||||
merge-multiple: true
|
||||
|
||||
- uses: pypa/gh-action-pypi-publish@release/v1
|
||||
2
.github/workflows/cmake.yaml
vendored
@@ -19,7 +19,7 @@ jobs:
|
||||
with:
|
||||
python-version: 3.12
|
||||
cache: 'pip'
|
||||
- run: pip install pytest numpy colorama
|
||||
- run: pip install pytest numpy
|
||||
|
||||
- uses: awalsh128/cache-apt-pkgs-action@latest
|
||||
with:
|
||||
|
||||
56
README.md
@@ -1,33 +1,24 @@
|
||||
## Dependencies
|
||||
Before building from source make sure that you have the [dependencies](https://slsdetectorgroup.github.io/devdoc/dependencies.html) installed. If installing using conda, conda will manage the dependencies. Avoid also installing dependency packages with pip.
|
||||
Before building from source make sure that you have the [software wiki](https://slsdetectorgroup.github.io/devdoc/dependencies.html) installed. If installing using conda, conda will manage the dependencies. Avoid also installing packages with pip.
|
||||
|
||||
## Documentaion
|
||||
Detailed documentation including installation can be found in the [software wiki](https://slsdetectorgroup.github.io/devdoc/index.html).
|
||||
|
||||
List of releases can be found on the [official site](https://www.psi.ch/en/lxn/software-releases).
|
||||
Different releases can be found on the [official site](https://www.psi.ch/en/lxn/software-releases).
|
||||
|
||||
Firmware compatiblity can be found in [firmware page](https://github.com/slsdetectorgroup/slsDetectorFirmware)
|
||||
|
||||
## Installation
|
||||
|
||||
The slsDetectorPackage provides core detector software implemented in C++, along with Python bindings packaged as the slsdet Python extension module. Choose the option that best fits your environment and use case.
|
||||
|
||||
1. **Install pre-built binaries using conda (Recommended)**: Install pre-built binaries for the C++ client, receiver, GUI and the Python API (`slsdet`), simplifying setup across platforms.
|
||||
|
||||
2. **Pip**: Install only the Python extension module, either by downloading the pre-built library from PyPI or by building the extension locally from source. Available only from v9.2.0 onwards.
|
||||
|
||||
3. **Build from source**: Compile the entire package yourself, including both the C++ core and the Python bindings, for maximum control and customization. However, make sure that you have the dependencies installed. If installing using conda, conda will manage the dependencies. Avoid installing packages with pip and conda simultaneously.
|
||||
|
||||
### 1. Install pre-built binaries using conda (Recommended)
|
||||
### 1. Install binaries using conda
|
||||
Conda is not only useful to manage python environments but can also
|
||||
be used as a user space package manager. Dates in the tag (for eg. 2020.07.23.dev0)
|
||||
are from the developer branch. Please use released tags for stability.
|
||||
|
||||
We have three different packages available:
|
||||
* **slsdetlib** Shared libraries and command line utilities
|
||||
* **slsdetlib** shared libraries and command line utilities
|
||||
* **slsdetgui** GUI
|
||||
* **slsdet** Python bindings
|
||||
* **moenchzmq** Moench
|
||||
|
||||
```
|
||||
#Add channels for dependencies and our library
|
||||
@@ -53,26 +44,11 @@ conda search slsdetlib
|
||||
conda search slsdet
|
||||
# gui
|
||||
conda search slsdetgui
|
||||
# moench
|
||||
conda search moenchzmq
|
||||
```
|
||||
|
||||
## 2. Pip
|
||||
The Python extension module `slsdet` can be installed using pip. This is available from v9.2.0 onwards.
|
||||
## 2. Build from source
|
||||
|
||||
```
|
||||
#Install the Python extension module from PyPI
|
||||
pip install slsdet
|
||||
|
||||
# or install the python extension locally from source
|
||||
git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git --branch 9.2.0
|
||||
cd slsDetectorPackage
|
||||
pip install .
|
||||
```
|
||||
|
||||
## 3. Build from source
|
||||
|
||||
### 3.1. Download Source Code from github
|
||||
### 2.1 Download Source Code from github
|
||||
```
|
||||
git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git --branch 7.0.0
|
||||
```
|
||||
@@ -80,11 +56,10 @@ git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git --branch 7.
|
||||
> **Note:** For v6.x.x of slsDetectorPackage and older, refer [pybind11 notes on cloning](#Pybind-and-Zeromq).
|
||||
|
||||
|
||||
### 3.2. Build from source
|
||||
### 2.2 Build from source
|
||||
|
||||
One can either build using cmake or use the in-built cmk.sh script.
|
||||
|
||||
### 3.2.1. Build using CMake
|
||||
### Build using CMake
|
||||
|
||||
```
|
||||
# outside slsDetecorPackage folder
|
||||
@@ -124,7 +99,7 @@ ccmake ..
|
||||
|
||||
> **Note:** For v7.x.x of slsDetectorPackage and older, refer [zeromq notes for cmake option to hint library location](#Pybind-and-Zeromq).
|
||||
|
||||
### 3.2.2. Build using in-built cmk.sh script
|
||||
### Build using in-built cmk.sh script
|
||||
|
||||
```
|
||||
The binaries are generated in slsDetectorPackage/build/bin directory.
|
||||
@@ -169,9 +144,9 @@ Usage: $0 [-b] [-c] [-d <HDF5 directory>] [-e] [-g] [-h] [-i]
|
||||
|
||||
> **Note:** For v7.x.x of slsDetectorPackage and older, refer [zeromq notes for cmk script option to hint library location](#Pybind-and-Zeromq).
|
||||
|
||||
### 3.3. Build on old distributions using conda
|
||||
### Build on old distributions
|
||||
|
||||
If your linux distribution doesn't come with a C++17 compiler (gcc>8) then
|
||||
If your linux distribution doesn't come with a C++11 compiler (gcc>4.8) then
|
||||
it's possible to install a newer gcc using conda and build the slsDetectorPackage
|
||||
using this compiler
|
||||
|
||||
@@ -189,7 +164,7 @@ make -j12
|
||||
> **Note:** For v7.x.x of slsDetectorPackage and older, refer [zeromq notes for dependencies for conda](#Pybind-and-Zeromq).
|
||||
|
||||
|
||||
### 3.4. Build slsDetectorGui (Qt5)
|
||||
### Build slsDetectorGui (Qt5)
|
||||
|
||||
1. Using pre-built binary on conda
|
||||
```
|
||||
@@ -240,7 +215,7 @@ cd slsDetectorPackage
|
||||
|
||||
> **Note:** For v7.x.x of slsDetectorPackage and older, refer [zeromq notes for dependencies for conda](#Pybind-and-Zeromq).
|
||||
|
||||
### 3.5. Build documentation from package
|
||||
### Build documentation from package
|
||||
The documentation for the slsDetectorPackage is build using a combination
|
||||
of Doxygen, Sphinx and Breathe. The easiest way to install the dependencies
|
||||
is to use conda
|
||||
@@ -261,7 +236,7 @@ make rst # rst only, saves time in case the API did not change
|
||||
|
||||
|
||||
|
||||
## 4. Pybind and Zeromq
|
||||
## Pybind and Zeromq
|
||||
|
||||
### Pybind11 for Python
|
||||
**v8.0.0+**:
|
||||
@@ -303,5 +278,4 @@ zeromq-devel must be installed and one can hint its location using
|
||||
|
||||
## Support
|
||||
dhanya.thattil@psi.ch
|
||||
erik.frojdh@psi.ch
|
||||
alice.mazzoleni@psi.ch
|
||||
erik.frojdh@psi.ch
|
||||
@@ -1,65 +1,45 @@
|
||||
SLS Detector Package Minor Release 10.0.1 released on ?
|
||||
================================================================
|
||||
SLS Detector Package Major Release x.x.x released on xx.xx.202x
|
||||
===============================================================
|
||||
|
||||
This document describes the differences between v10.0.1 and v10.0.0
|
||||
This document describes the differences between vx.x.x and vx.0.2
|
||||
|
||||
|
||||
|
||||
CONTENTS
|
||||
--------
|
||||
1 Changes
|
||||
1.1 Compilation Changes
|
||||
1.2 New or Changed Features
|
||||
1.2.1 Breaking API
|
||||
1.2.2 Resolved or Changed Features
|
||||
1.2.3 New Features
|
||||
3 On-board Detector Server Compatibility
|
||||
4 Firmware Requirements
|
||||
5 Kernel Requirements
|
||||
6 Download, Documentation & Support
|
||||
1 New, Changed or Resolved Features
|
||||
1.1 Compilation
|
||||
1.2 Callback
|
||||
1.3 Python
|
||||
1.4 Client
|
||||
1.5 Detector Server
|
||||
1.6 Simulator
|
||||
1.7 Receiver
|
||||
1.8 Gui
|
||||
2 On-board Detector Server Compatibility
|
||||
3 Firmware Requirements
|
||||
4 Kernel Requirements
|
||||
5 Download, Documentation & Support
|
||||
|
||||
|
||||
|
||||
1 Changes
|
||||
==========
|
||||
|
||||
1 New, Changed or Resolved Features
|
||||
=====================================
|
||||
|
||||
|
||||
1.1 Compilation Changes
|
||||
========================
|
||||
|
||||
|
||||
1.2 New or Changed Features
|
||||
============================
|
||||
|
||||
Python
|
||||
-------
|
||||
|
||||
* receiver ROI can be set from Python using command ``rx_roi``(it supports any sequence of four or two (for mythen3 and gotthard) ints e.g. a tuple (xmin, xmax, ymin, ymax) or a sequence of such for multiple ROIS)
|
||||
* one can clear all ROI's from Python using command ``rx_clearroi``
|
||||
|
||||
|
||||
1.2.1 Breaking API
|
||||
===================
|
||||
|
||||
|
||||
1.2.2 Resolved or Changed Features
|
||||
===================================
|
||||
|
||||
|
||||
|
||||
1.2.3 New Features
|
||||
===================
|
||||
|
||||
|
||||
|
||||
2 On-board Detector Server Compatibility
|
||||
==========================================
|
||||
|
||||
|
||||
Eiger 10.0.0
|
||||
Jungfrau 10.0.0
|
||||
Mythen3 10.0.0
|
||||
Gotthard2 10.0.0
|
||||
Moench 10.0.0
|
||||
Eiger 9.0.0
|
||||
Jungfrau 9.0.0
|
||||
Mythen3 9.0.0
|
||||
Gotthard2 9.0.0
|
||||
Moench 9.0.0
|
||||
|
||||
|
||||
On-board Detector Server Upgrade
|
||||
@@ -82,16 +62,17 @@ This document describes the differences between v10.0.1 and v10.0.0
|
||||
3 Firmware Requirements
|
||||
========================
|
||||
|
||||
|
||||
Eiger 02.10.2023 (v32) (updated in 7.0.3)
|
||||
|
||||
Jungfrau 09.02.2025 (v1.6, HW v1.0) (updated in 9.1.0)
|
||||
08.02.2025 (v2.6, HW v2.0) (updated in 9.1.0)
|
||||
Jungfrau 20.09.2023 (v1.5, HW v1.0) (updated in 8.0.0)
|
||||
21.09.2023 (v2.5, HW v2.0) (updated in 8.0.0)
|
||||
|
||||
Mythen3 13.11.2024 (v2.0) (updated in 9.0.0)
|
||||
Mythen3 11.10.2024 (v1.5) (updated in 9.0.0)
|
||||
|
||||
Gotthard2 03.10.2024 (v1.0) (updated in 9.0.0)
|
||||
|
||||
Moench 26.10.2023 (v2.0) (updated in 8.0.2)
|
||||
Moench 26.10.2023 (v2.0) (updated in 9.0.0)
|
||||
|
||||
|
||||
Detector Upgrade
|
||||
@@ -167,7 +148,7 @@ This document describes the differences between v10.0.1 and v10.0.0
|
||||
|
||||
Quick Start Guide:
|
||||
https://slsdetectorgroup.github.io/devdoc/quick_start_guide.html
|
||||
|
||||
|
||||
Firmware Upgrade:
|
||||
https://slsdetectorgroup.github.io/devdoc/firmware.html
|
||||
|
||||
@@ -180,15 +161,6 @@ This document describes the differences between v10.0.1 and v10.0.0
|
||||
Consuming slsDetectorPackage:
|
||||
https://slsdetectorgroup.github.io/devdoc/consuming.html
|
||||
|
||||
Software Architecture
|
||||
https://slsdetectorgroup.github.io/devdoc/softwarearchitecture.html
|
||||
|
||||
Set up commands in config file
|
||||
https://slsdetectorgroup.github.io/devdoc/configcommands.html
|
||||
|
||||
Image Size and Output Characteristics
|
||||
https://slsdetectorgroup.github.io/devdoc/dataformat.html
|
||||
|
||||
API Examples:
|
||||
https://github.com/slsdetectorgroup/api-examples
|
||||
|
||||
@@ -215,14 +187,6 @@ This document describes the differences between v10.0.1 and v10.0.0
|
||||
https://slsdetectorgroup.github.io/devdoc/udpheader.html
|
||||
https://slsdetectorgroup.github.io/devdoc/udpdetspec.html
|
||||
|
||||
Output Data:
|
||||
https://slsdetectorgroup.github.io/devdoc/dataformat.html
|
||||
https://slsdetectorgroup.github.io/devdoc/fileformat.html
|
||||
https://slsdetectorgroup.github.io/devdoc/slsreceiverheaderformat.html
|
||||
https://slsdetectorgroup.github.io/devdoc/masterfileattributes.html
|
||||
https://slsdetectorgroup.github.io/devdoc/binaryfileformat.html
|
||||
https://slsdetectorgroup.github.io/devdoc/hdf5fileformat.html
|
||||
|
||||
slsReceiver Zmq Format:
|
||||
https://slsdetectorgroup.github.io/devdoc/slsreceiver.html#zmq-json-header-format
|
||||
|
||||
@@ -242,4 +206,3 @@ This document describes the differences between v10.0.1 and v10.0.0
|
||||
|
||||
dhanya.thattil@psi.ch
|
||||
erik.frojdh@psi.ch
|
||||
alice.mazzoleni@psi.ch
|
||||
@@ -42,7 +42,6 @@ set(SPHINX_SOURCE_FILES
|
||||
src/pyexamples.rst
|
||||
src/pyPatternGenerator.rst
|
||||
src/servers.rst
|
||||
src/multidet.rst
|
||||
src/receiver_api.rst
|
||||
src/result.rst
|
||||
src/type_traits.rst
|
||||
@@ -67,9 +66,6 @@ set(SPHINX_SOURCE_FILES
|
||||
src/binaryfileformat.rst
|
||||
src/hdf5fileformat.rst
|
||||
src/zmqjsonheaderformat.rst
|
||||
src/dataformat.rst
|
||||
src/softwarearchitecture.rst
|
||||
src/configcommands.rst
|
||||
)
|
||||
|
||||
foreach(filename ${SPHINX_SOURCE_FILES})
|
||||
@@ -87,16 +83,11 @@ configure_file(
|
||||
"${SPHINX_BUILD}/gen_server_doc.py"
|
||||
@ONLY)
|
||||
|
||||
configure_file(
|
||||
configure_file(
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/static/extra.css"
|
||||
"${SPHINX_BUILD}/static/css/extra.css"
|
||||
@ONLY)
|
||||
|
||||
|
||||
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/images
|
||||
DESTINATION ${SPHINX_BUILD}/src)
|
||||
|
||||
|
||||
add_custom_target(server_rst python gen_server_doc.py)
|
||||
|
||||
add_custom_target(docs
|
||||
|
||||
@@ -1,787 +0,0 @@
|
||||
<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/139.0.0.0 Safari/537.36" version="28.1.0">
|
||||
<diagram name="Page-1" id="SqHbah1k9D3XqnipfQD4">
|
||||
<mxGraphModel grid="0" page="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
|
||||
<root>
|
||||
<mxCell id="0" />
|
||||
<mxCell id="1" parent="0" />
|
||||
<mxCell id="kpcteDQP5Q-WdnKVJ5EM-1" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#BBDDFF;strokeColor=#BBEEFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="459" y="71" width="171" height="134" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="QgYz-w7MwsADk0cZRM1J-27" value="<p><font face="Courier New" style="">Client listening to&nbsp;<br><font style="">zmqport</font> : <font style=""><b style="">30001</b></font><br><font style="">zmqip</font>&nbsp; &nbsp;: <font style=""><b style="">129.129.100.115</b></font></font></p>" style="text;html=1;align=left;verticalAlign=middle;resizable=1;points=[];autosize=1;strokeColor=#4A7B72;fillColor=default;fontColor=#4A7B72;movable=1;rotatable=1;deletable=1;editable=1;locked=0;connectable=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="-351.99" y="2247" width="186.49" height="51" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-13" value="<font face="Comic Sans MS">Client/ GUI</font>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#AAAAFF;strokeColor=#AAAAFF;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="457.65" y="2121" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-164" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#E6E6E6;" vertex="1" parent="1">
|
||||
<mxGeometry x="-340" y="4949" width="810" height="621" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-162" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#DDEEDD;fontColor=#333333;strokeColor=#E6E6E6;" vertex="1" parent="1">
|
||||
<mxGeometry x="-240" y="5215" width="680" height="325" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-149" value="<font face="Courier New">&lt;&lt;class&gt;&gt; Module</font>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#AAEEEE;strokeColor=#77BBBB;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="58.870000000000005" y="5418" width="196" height="84" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-148" value="<font face="Courier New">&lt;&lt;class&gt;&gt; Module</font>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#99DDDD;strokeColor=#77BBBB;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="47.629999999999995" y="5405" width="196" height="84" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-147" value="<font face="Courier New">&lt;&lt;class&gt;&gt; Module</font>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#88CCCC;strokeColor=#77BBBB;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="37.129999999999995" y="5392" width="196" height="84" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-146" value="<font face="Courier New">&lt;&lt;class&gt;&gt; Module (s)</font>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#77BBBB;strokeColor=#77BBBB;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="25.239999999999995" y="5381" width="196" height="84" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-80" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#E6E6E6;" vertex="1" parent="1">
|
||||
<mxGeometry x="-277" y="4445" width="732" height="426" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-123" value="<font face="Courier New">Data Streamer</font>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#9AC7BF;strokeColor=#77BBBB;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;dashed=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="197.2" y="4642.5" width="179.12" height="84" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-122" value="Data Processor" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#AAAAFF;strokeColor=#9999FF;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;dashed=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="-7.720000000000024" y="4643" width="167.88" height="84" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-119" value="<font face="Courier New">Listener</font>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#99BBEE;strokeColor=#77AADD;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;dashed=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="-192" y="4651" width="146" height="84" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-62" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#E6E6E6;" vertex="1" parent="1">
|
||||
<mxGeometry x="-242.75" y="4184" width="762.75" height="176" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-54" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#E6E6E6;" vertex="1" parent="1">
|
||||
<mxGeometry x="-119" y="3595" width="547" height="397" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-36" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#EEEEFF;fontColor=#333333;strokeColor=#E6E6E6;" vertex="1" parent="1">
|
||||
<mxGeometry x="157.39" y="3717" width="200.61" height="243" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-33" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#CCE5FF;fontColor=#333333;strokeColor=#E6E6E6;" vertex="1" parent="1">
|
||||
<mxGeometry x="-67" y="3727" width="187" height="233" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-7" value="Module 3" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#99CCFF;strokeColor=#99CCFF;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="490" y="128" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-2" value="Module 2" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#88BBEE;strokeColor=#88BBEE;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="482" y="121" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-6" value="Module 1" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#77AADD;strokeColor=#77AADD;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="474" y="113" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-3" value="Module (s)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#6699CC;strokeColor=#6699CC;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="466.29999999999995" y="106" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="J8_Ag6N0oFm1g001oKw5-6" value="TCP" style="shape=doubleArrow;whiteSpace=wrap;html=1;strokeColor=#BBBBFF;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=12;fontColor=#FFFFFF;fillColor=#BBBBFF;gradientColor=none;arrowWidth=0.39080459770114734;arrowSize=0.11650485436893204;rotation=15;" vertex="1" parent="1">
|
||||
<mxGeometry x="197" y="889" width="241.01" height="30" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-63" value="" style="shape=doubleArrow;whiteSpace=wrap;html=1;strokeColor=#CCCCFF;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=12;fontColor=default;fillColor=#CCCCFF;gradientColor=none;" vertex="1" parent="1">
|
||||
<mxGeometry x="298.5" y="137" width="150" height="30" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-62" value="" style="shape=doubleArrow;whiteSpace=wrap;html=1;strokeColor=#BBBBFF;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=12;fontColor=default;fillColor=#BBBBFF;gradientColor=none;" vertex="1" parent="1">
|
||||
<mxGeometry x="294.62" y="133" width="150" height="30" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-61" value="" style="shape=doubleArrow;whiteSpace=wrap;html=1;strokeColor=#AAAAFF;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=12;fontColor=default;fillColor=#AAAAFF;gradientColor=none;" vertex="1" parent="1">
|
||||
<mxGeometry x="290.62" y="129" width="150" height="30" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-22" value="" style="shape=singleArrow;direction=south;whiteSpace=wrap;html=1;fillColor=#99CCFF;gradientColor=none;strokeColor=#99CCFF;arrowWidth=0.3473368342085482;arrowSize=0.26612903225806445;" vertex="1" parent="1">
|
||||
<mxGeometry x="517" y="246.87" width="43" height="130" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-20" value="" style="shape=singleArrow;direction=south;whiteSpace=wrap;html=1;fillColor=#88BBEE;gradientColor=none;strokeColor=#88BBEE;arrowWidth=0.2813203300825186;arrowSize=0.28179723502304177;" vertex="1" parent="1">
|
||||
<mxGeometry x="512" y="240" width="43" height="130" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-21" value="" style="shape=singleArrow;direction=south;whiteSpace=wrap;html=1;fillColor=#77AADD;gradientColor=none;strokeColor=#77AADD;arrowWidth=0.26856714178544006;arrowSize=0.24723502304147474;" vertex="1" parent="1">
|
||||
<mxGeometry x="505.88" y="232" width="43" height="130" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-16" value="UDP" style="shape=singleArrow;direction=south;whiteSpace=wrap;html=1;fillColor=#6699CC;gradientColor=none;strokeColor=#6699CC;arrowWidth=0.2713178294573608;arrowSize=0.23333333333333386;fontColor=#FFFFFF;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;textDirection=vertical-lr;spacing=0;spacingBottom=0;spacingLeft=-2;" vertex="1" parent="1">
|
||||
<mxGeometry x="499" y="224" width="43" height="130" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-5" value="Client / GUI" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#AAAAFF;strokeColor=#AAAAFF;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="125" y="109" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-1" value="" style="points=[[0.35,0,0],[0.98,0.51,0],[1,0.71,0],[0.67,1,0],[0,0.795,0],[0,0.65,0]];verticalLabelPosition=bottom;sketch=0;html=1;verticalAlign=top;aspect=fixed;align=center;pointerEvents=1;shape=mxgraph.cisco19.user;fillColor=#AAAAFF;strokeColor=none;" vertex="1" parent="1">
|
||||
<mxGeometry x="166" y="59" width="50" height="50" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-35" value="" style="shape=singleArrow;direction=east;whiteSpace=wrap;html=1;fillColor=#BBFFDD;gradientColor=none;strokeColor=#BBFFDD;arrowWidth=0.3640710382513589;arrowSize=0.1682103825136619;flipH=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="255.375" y="433.625" width="150" height="30" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-36" value="" style="shape=singleArrow;direction=east;whiteSpace=wrap;html=1;fillColor=#AAEECC;gradientColor=none;strokeColor=#AAEECC;arrowWidth=0.39166666666667427;arrowSize=0.1850757575757575;flipH=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="256.625" y="428.375" width="150" height="30" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-37" value="" style="shape=singleArrow;direction=east;whiteSpace=wrap;html=1;fillColor=#99DDBB;gradientColor=none;strokeColor=#99DDBB;arrowWidth=0.3072404371584601;arrowSize=0.20247267759562873;flipH=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="260.875" y="424.625" width="150" height="30" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-38" value="ZMQ" style="shape=singleArrow;direction=east;whiteSpace=wrap;html=1;fillColor=#88CCAA;gradientColor=none;strokeColor=#88CCAA;arrowWidth=0.3015258215962414;arrowSize=0.21895539906103256;flipH=1;fontSize=10;fontColor=#FFFFFF;spacing=0;spacingBottom=2;" vertex="1" parent="1">
|
||||
<mxGeometry x="264" y="416" width="150" height="35" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-43" value="" style="shape=singleArrow;direction=east;whiteSpace=wrap;html=1;fillColor=#BBFFDD;gradientColor=none;strokeColor=#BBFFDD;arrowWidth=0.30195728510032327;arrowSize=0.10804578407150964;rotation=45;flipV=0;flipH=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="188.495" y="295.625" width="270" height="40" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-44" value="" style="shape=singleArrow;direction=east;whiteSpace=wrap;html=1;fillColor=#AAEECC;gradientColor=none;strokeColor=#AAEECC;arrowWidth=0.3059021565555355;arrowSize=0.11059978613932724;rotation=45;flipV=0;flipH=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="187.745" y="288.375" width="270" height="40" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-45" value="" style="shape=singleArrow;direction=east;whiteSpace=wrap;html=1;fillColor=#99DDBB;gradientColor=none;strokeColor=#99DDBB;arrowWidth=0.2606119807565733;arrowSize=0.11229881466462685;rotation=45;flipV=0;flipH=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="185.995" y="281.625" width="270" height="40" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-46" value="ZMQ" style="shape=singleArrow;direction=east;whiteSpace=wrap;html=1;fillColor=#88CCAA;gradientColor=none;strokeColor=#88CCAA;arrowWidth=0.26899866177272147;arrowSize=0.11295618290402748;rotation=45;flipV=0;flipH=1;fontColor=#FFFFFF;fontSize=10;" vertex="1" parent="1">
|
||||
<mxGeometry x="185.12" y="274" width="270" height="40" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-47" value="" style="shape=singleArrow;direction=north;whiteSpace=wrap;html=1;fillColor=#BBFFDD;gradientColor=none;strokeColor=#BBFFDD;arrowWidth=0.3881614350818457;arrowSize=0.13584129099660103;flipH=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="162.115" y="191.255" width="30" height="200" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-48" value="" style="shape=singleArrow;direction=north;whiteSpace=wrap;html=1;fillColor=#AAEECC;gradientColor=none;strokeColor=#AAEECC;arrowWidth=0.4039236188616011;arrowSize=0.13625893792486793;flipH=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="166.365" y="194.005" width="30" height="200" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-49" value="" style="shape=singleArrow;direction=north;whiteSpace=wrap;html=1;fillColor=#99DDBB;gradientColor=none;strokeColor=#99DDBB;arrowWidth=0.278008144362146;arrowSize=0.14744102244191368;flipH=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="170.615" y="196.255" width="30" height="200" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-50" value="ZMQ" style="shape=singleArrow;direction=north;whiteSpace=wrap;html=1;fillColor=#88CCAA;gradientColor=none;strokeColor=#88CCAA;arrowWidth=0.29264320269609984;arrowSize=0.15799814659217704;flipH=1;textDirection=vertical-lr;fontSize=10;fontColor=#FFFFFF;spacingLeft=-1;spacing=0;" vertex="1" parent="1">
|
||||
<mxGeometry x="175" y="198.63" width="32.74" height="200" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-51" value="External&nbsp;<div>Processing</div><div>Chain</div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#99DDBB;strokeColor=#99DDBB;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="126.99" y="409.37" width="115.01" height="85.63" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-56" value="" style="shape=doubleArrow;whiteSpace=wrap;html=1;rotation=45;arrowWidth=0.27989643421967686;arrowSize=0.14277638849485402;fillColor=#CCCCFF;strokeColor=#CCCCFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="244.9904832720494" y="263.6209665440989" width="250" height="40" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-57" value="" style="shape=doubleArrow;whiteSpace=wrap;html=1;rotation=45;arrowWidth=0.27989643421967686;arrowSize=0.14277638849485402;fillColor=#BBBBFF;strokeColor=#BBBBFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="245.7404832720494" y="257.8709665440989" width="250" height="40" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-58" value="" style="shape=doubleArrow;whiteSpace=wrap;html=1;rotation=45;arrowWidth=0.27989643421967686;arrowSize=0.14277638849485402;fillColor=#AAAAFF;strokeColor=#AAAAFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="245.9904832720494" y="251.8709665440989" width="250" height="40" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-59" value="TCP" style="shape=doubleArrow;whiteSpace=wrap;html=1;rotation=45;arrowWidth=0.27989643421967686;arrowSize=0.14277638849485402;fillColor=#9999FF;strokeColor=#9999FF;fontColor=#FFFFFF;fontSize=10;" vertex="1" parent="1">
|
||||
<mxGeometry x="245.73999999999995" y="245.25048327204945" width="250" height="40" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-60" value="TCP" style="shape=doubleArrow;whiteSpace=wrap;html=1;strokeColor=#9999FF;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=10;fontColor=#FFFFFF;fillColor=#9999FF;gradientColor=none;" vertex="1" parent="1">
|
||||
<mxGeometry x="285.62" y="125" width="150" height="30" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-67" value="Control 1:N" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="325" y="114" width="79" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-68" value="Control 1:N" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;rotation=45;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="343" y="243" width="79" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-69" value="Raw Data Packets&nbsp;<span style="background-color: transparent; color: light-dark(rgb(102, 102, 102), rgb(149, 149, 149));">1:1</span>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;rotation=90;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="499" y="285.25" width="137" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-70" value="Image Data 1:N" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;rotation=45;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="285.00493141924176" y="277.62493141924176" width="102" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-71" value="Assembled Data 1:N" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;rotation=0;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="289.6190475583121" y="407.6190475583121" width="128" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-72" value="Processed Data 1:1" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;rotation=90;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="143.87" y="303.87" width="123" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-99" value="UDP" style="shape=singleArrow;direction=south;whiteSpace=wrap;html=1;fillColor=#77AADD;gradientColor=none;strokeColor=#77AADD;arrowWidth=0.2713178294573608;arrowSize=0.23333333333333386;fontColor=#FFFFFF;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;textDirection=vertical-lr;spacing=0;spacingBottom=0;spacingLeft=-2;" vertex="1" parent="1">
|
||||
<mxGeometry x="295.39" y="1604" width="43" height="188" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-101" value="Client" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#AAAAFF;strokeColor=#AAAAFF;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="54.37" y="836" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-102" value="Module
1952 / 1953
bchip100" style="rounded=1;whiteSpace=wrap;fillColor=#88BBEE;strokeColor=#88BBEE;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="599" y="816" width="137" height="85" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-103" value="" style="points=[[0.35,0,0],[0.98,0.51,0],[1,0.71,0],[0.67,1,0],[0,0.795,0],[0,0.65,0]];verticalLabelPosition=bottom;sketch=0;html=1;verticalAlign=top;aspect=fixed;align=center;pointerEvents=1;shape=mxgraph.cisco19.user;fillColor=#AAAAFF;strokeColor=none;" vertex="1" parent="1">
|
||||
<mxGeometry x="95.37" y="786" width="50" height="50" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-111" value="Receiver<div>pc1234</div><div><b><font style="color: rgb(0, 76, 153);">10.0.1</font></b>.100</div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#88BBEE;strokeColor=#88BBEE;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="258.39" y="1811" width="132" height="95" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-117" value="ZMQ" style="shape=singleArrow;direction=east;whiteSpace=wrap;html=1;fillColor=#99DDBB;gradientColor=none;strokeColor=#99DDBB;arrowWidth=0.2417936862291299;arrowSize=0.08753046681068456;rotation=38;flipV=0;flipH=1;fontColor=#FFFFFF;fontSize=10;" vertex="1" parent="1">
|
||||
<mxGeometry x="-393.75" y="2375.63" width="285.05" height="40" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-122" value="<font face="Comic Sans MS">External&nbsp;</font><div><font face="Comic Sans MS">Process</font></div><div><span><font face="Comic Sans MS" style="color: rgb(0, 76, 153);">129.129.200.175</font></span></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#99DDBB;strokeColor=#99DDBB;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="449.19" y="2444" width="139.01" height="72.63" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-127" value="TCP" style="shape=doubleArrow;whiteSpace=wrap;html=1;strokeColor=#BBBBFF;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=10;fontColor=#FFFFFF;fillColor=#BBBBFF;gradientColor=none;arrowWidth=0.39080459770114734;arrowSize=0.11650485436893204;rotation=0;" vertex="1" parent="1">
|
||||
<mxGeometry x="200" y="854" width="235" height="30" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-128" value="Control" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="309" y="838" width="57" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-130" value="Raw Data&nbsp;<div>Packets</div>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;rotation=0;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="240.76" y="1654" width="74" height="41" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-133" value="Processed Data" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;rotation=0;fontColor=#004C99;" vertex="1" parent="1">
|
||||
<mxGeometry x="472.15000000000003" y="2363" width="103" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="OOa9Ru9pQldXh4IZuxHQ-135" value="<font style="" face="Courier New">port&nbsp; &nbsp; &nbsp;= 1952<br>stopport = 1953<br>hostname = bchip100</font>" style="text;align=left;verticalAlign=middle;resizable=1;points=[];autosize=1;strokeColor=#8888FF;fillColor=default;movable=1;rotatable=1;deletable=1;editable=1;locked=0;connectable=1;html=1;fontColor=#6666DD;" vertex="1" parent="1">
|
||||
<mxGeometry x="446" y="845" width="142" height="58" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="J8_Ag6N0oFm1g001oKw5-7" value="<pre style=""><pre>udp src port: hardcoded (32410)<br><span style="background-color: transparent;">udp_srcip&nbsp; : <b><font style="">10.0.1</font></b>.15</span></pre></pre>" style="text;html=1;align=left;verticalAlign=middle;resizable=1;points=[];autosize=1;strokeColor=#004C99;fillColor=default;fontColor=#004C99;movable=1;rotatable=1;deletable=1;editable=1;locked=0;connectable=1;fontFamily=Helvetica;fontSize=12;" vertex="1" parent="1">
|
||||
<mxGeometry x="17.11" y="1530.5" width="226.52" height="40" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="J8_Ag6N0oFm1g001oKw5-10" value="Module<div>bchip100</div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#88BBEE;strokeColor=#88BBEE;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="255.39" y="1520" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="J8_Ag6N0oFm1g001oKw5-14" value="<pre style="">udp_dstport: 50001<br><span style="background-color: transparent;">udp_dstip&nbsp; : <b><font style="">10.0.1</font></b>.100<br></span><span style="background-color: transparent;">udp_dstmac : (specify for<br></span><span style="background-color: transparent;"> custom receivers)</span></pre>" style="text;html=1;align=left;verticalAlign=middle;resizable=1;points=[];autosize=1;strokeColor=#004C99;fillColor=default;fontColor=#004C99;movable=1;rotatable=1;deletable=1;editable=1;locked=0;connectable=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="20.47" y="1831" width="225.52" height="64" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="J8_Ag6N0oFm1g001oKw5-16" value="UDP" style="shape=singleArrow;direction=south;whiteSpace=wrap;html=1;fillColor=#77AADD;gradientColor=none;strokeColor=#77AADD;arrowWidth=0.2713178294573608;arrowSize=0.23333333333333386;fontColor=#FFFFFF;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;textDirection=vertical-lr;spacing=0;spacingBottom=0;spacingLeft=-2;" vertex="1" parent="1">
|
||||
<mxGeometry x="450.9" y="1602" width="43" height="188" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="J8_Ag6N0oFm1g001oKw5-17" value="Receiver<div>pc1234</div><div><font style="color: rgb(0, 76, 153);"><b style="">10.0.2</b></font>.100</div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#88BBEE;strokeColor=#88BBEE;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="413.9" y="1809" width="132" height="95" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="J8_Ag6N0oFm1g001oKw5-18" value="Raw Data&nbsp;<div>Packets</div>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;rotation=0;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="396.27" y="1652" width="74" height="41" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="J8_Ag6N0oFm1g001oKw5-19" value="Module<div>bchip101</div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#88BBEE;strokeColor=#88BBEE;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="410.9" y="1518" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="J8_Ag6N0oFm1g001oKw5-20" value="<pre style=""><pre>udp src port: hardcoded (32410)<br><span style="background-color: transparent;">udp_srcip&nbsp; : <b><font style="">10.0.2</font></b>.15</span></pre></pre>" style="text;html=1;align=left;verticalAlign=middle;resizable=1;points=[];autosize=1;strokeColor=#004C99;fillColor=default;fontColor=#004C99;movable=1;rotatable=1;deletable=1;editable=1;locked=0;connectable=1;fontFamily=Helvetica;fontSize=12;" vertex="1" parent="1">
|
||||
<mxGeometry x="553.6999999999999" y="1533.5" width="227.61" height="37" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="J8_Ag6N0oFm1g001oKw5-21" value="<pre style="">udp_dstport: 50002<br><span style="background-color: transparent;">udp_dstip&nbsp; : <b><font style="">10.0.2</font></b>.100<br></span><span style="background-color: transparent;">udp_dstmac : (specify for<br></span><span style="background-color: transparent;"> custom receivers)</span></pre>" style="text;html=1;align=left;verticalAlign=middle;resizable=1;points=[];autosize=1;strokeColor=#004C99;fillColor=default;fontColor=#004C99;movable=1;rotatable=1;deletable=1;editable=1;locked=0;connectable=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="558" y="1820" width="227" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="J8_Ag6N0oFm1g001oKw5-24" value="TCP" style="shape=doubleArrow;whiteSpace=wrap;html=1;strokeColor=#BBBBFF;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=12;fontColor=#FFFFFF;fillColor=#BBBBFF;gradientColor=none;arrowWidth=0.3696597117203055;arrowSize=0.07695194442744;rotation=45;" vertex="1" parent="1">
|
||||
<mxGeometry x="165.19" y="1269.62" width="328.51" height="30" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="J8_Ag6N0oFm1g001oKw5-25" value="Client" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#AAAAFF;strokeColor=#AAAAFF;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="62.99999999999999" y="1131" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="J8_Ag6N0oFm1g001oKw5-27" value="" style="points=[[0.35,0,0],[0.98,0.51,0],[1,0.71,0],[0.67,1,0],[0,0.795,0],[0,0.65,0]];verticalLabelPosition=bottom;sketch=0;html=1;verticalAlign=top;aspect=fixed;align=center;pointerEvents=1;shape=mxgraph.cisco19.user;fillColor=#AAAAFF;strokeColor=none;" vertex="1" parent="1">
|
||||
<mxGeometry x="104" y="1081" width="50" height="50" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="J8_Ag6N0oFm1g001oKw5-28" value="TCP" style="shape=doubleArrow;whiteSpace=wrap;html=1;strokeColor=#BBBBFF;align=center;verticalAlign=middle;fontFamily=Helvetica;fontSize=10;fontColor=#FFFFFF;fillColor=#BBBBFF;gradientColor=none;arrowWidth=0.3826240220923713;arrowSize=0.09377242087427196;rotation=32;" vertex="1" parent="1">
|
||||
<mxGeometry x="190.48" y="1225.3" width="272.63" height="30" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="J8_Ag6N0oFm1g001oKw5-29" value="Control" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="317.2" y="1199" width="57" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="J8_Ag6N0oFm1g001oKw5-33" value="Module
1952 / 1953
bchip101" style="rounded=1;whiteSpace=wrap;fillColor=#88BBEE;strokeColor=#88BBEE;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;fontFamily=Helvetica;" vertex="1" parent="1">
|
||||
<mxGeometry x="599" y="912" width="137" height="85" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="J8_Ag6N0oFm1g001oKw5-34" value="<font face="Courier New">Receiver</font><div><span style="background-color: transparent; color: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));">1954</span></div><div>pc1234<span style="background-color: transparent; color: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));"></span></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#88BBEE;strokeColor=#88BBEE;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="648" y="1273.5" width="137" height="85" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="J8_Ag6N0oFm1g001oKw5-35" value="<font face="Courier New">Receiver<br></font><div><span style="background-color: transparent; color: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));">1955</span></div><div>pc1234</div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#88BBEE;strokeColor=#88BBEE;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;fontFamily=Helvetica;" vertex="1" parent="1">
|
||||
<mxGeometry x="648" y="1369.5" width="137" height="85" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="J8_Ag6N0oFm1g001oKw5-43" value="ZMQ" style="shape=singleArrow;direction=east;whiteSpace=wrap;html=1;fillColor=#99DDBB;gradientColor=none;strokeColor=#99DDBB;arrowWidth=0.27577655701663845;arrowSize=0.06779431315598941;rotation=48;flipV=0;flipH=1;fontColor=#FFFFFF;fontSize=10;" vertex="1" parent="1">
|
||||
<mxGeometry x="-419.7" y="2435.9" width="336.9" height="40" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-4" value="<font style="" face="Courier New">port&nbsp; &nbsp; &nbsp;= 1952<br>stopport = 1953<br>hostname = bchip101</font>" style="text;align=left;verticalAlign=middle;resizable=1;points=[];autosize=1;strokeColor=#8888FF;fillColor=default;movable=1;rotatable=1;deletable=1;editable=1;locked=0;connectable=1;html=1;fontColor=#6666DD;" vertex="1" parent="1">
|
||||
<mxGeometry x="446" y="912" width="141" height="58" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-5" value="<font face="Courier New" style="">rx_tcpport&nbsp; = 1954<br>rx_hostname = pc1234</font>" style="text;align=left;verticalAlign=middle;resizable=1;points=[];autosize=1;strokeColor=#8888FF;fillColor=default;movable=1;rotatable=1;deletable=1;editable=1;locked=0;connectable=1;html=1;fontColor=#6666DD;" vertex="1" parent="1">
|
||||
<mxGeometry x="461.43" y="1294.5" width="150.45" height="43" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-6" value="<font face="Courier New" style="">rx_tcpport&nbsp; = 1955<br>rx_hostname = pc1234</font>" style="text;align=left;verticalAlign=middle;resizable=1;points=[];autosize=1;strokeColor=#8888FF;fillColor=default;movable=1;rotatable=1;deletable=1;editable=1;locked=0;connectable=1;html=1;fontColor=#6666DD;" vertex="1" parent="1">
|
||||
<mxGeometry x="458.5" y="1395" width="153.38" height="43" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-7" value="<font>GUI:&nbsp;&nbsp;</font><div>rx_zmqport (30001)&nbsp;<span style="background-color: transparent; color: light-dark(rgb(136, 136, 255), rgb(105, 105, 207));">=&nbsp;</span><span style="background-color: transparent; color: light-dark(rgb(136, 136, 255), rgb(105, 105, 207));">zmqport (30001)</span></div>" style="text;html=1;align=left;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#8888FF;fontSize=17;" vertex="1" parent="1">
|
||||
<mxGeometry x="-135.12" y="2343.0000000000005" width="310" height="53" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-11" value="" style="endArrow=classic;html=1;rounded=0;fontColor=#AAAAFF;strokeColor=#AAAAFF;exitX=0.296;exitY=0.054;exitDx=0;exitDy=0;exitPerimeter=0;entryX=1.002;entryY=0.486;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="IUwO_ccEPv4BRx6tuxwP-7" target="QgYz-w7MwsADk0cZRM1J-27">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="-362.87" y="2530.63" as="sourcePoint" />
|
||||
<mxPoint x="-463.99579291044756" y="2345" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-12" value="" style="endArrow=classic;html=1;rounded=0;fontColor=#AAAAFF;strokeColor=#AAAAFF;exitX=0.48;exitY=1.008;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0.548;entryY=-0.039;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="IUwO_ccEPv4BRx6tuxwP-7" target="QgYz-w7MwsADk0cZRM1J-18">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="-354.5" y="2562" as="sourcePoint" />
|
||||
<mxPoint x="-146.5" y="2600" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-14" value="" style="points=[[0.35,0,0],[0.98,0.51,0],[1,0.71,0],[0.67,1,0],[0,0.795,0],[0,0.65,0]];verticalLabelPosition=bottom;sketch=0;html=1;verticalAlign=top;aspect=fixed;align=center;pointerEvents=1;shape=mxgraph.cisco19.user;fillColor=#AAAAFF;strokeColor=none;" vertex="1" parent="1">
|
||||
<mxGeometry x="498.64999999999986" y="2071" width="50" height="50" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-15" value="ZMQ" style="shape=singleArrow;direction=east;whiteSpace=wrap;html=1;fillColor=#77AADD;gradientColor=none;strokeColor=#77AADD;arrowWidth=0.29750455482560484;arrowSize=0.24452443902291207;rotation=0;flipV=0;flipH=1;fontColor=#FFFFFF;fontSize=10;" vertex="1" parent="1">
|
||||
<mxGeometry x="658" y="2504.9" width="90" height="40" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-16" value="<pre style=""><span style="background-color: transparent;"><font style="">Receiver streaming out<br><font style="">rx_zmqport</font>&nbsp;= <font style=""><b style="">30001</b></font></font></span><br></pre>" style="text;html=1;align=left;verticalAlign=middle;resizable=1;points=[];autosize=1;strokeColor=#4A7B72;fillColor=default;fontColor=#4A7B72;movable=1;rotatable=1;deletable=1;editable=1;locked=0;connectable=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="755" y="2501.7000000000003" width="166" height="43.2" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-17" value="<font face="Comic Sans MS">Receiver</font><div><font face="Comic Sans MS">pc1234</font></div><div><span><font style="color: rgb(74, 123, 114);" face="Comic Sans MS">129.129.100.115</font></span></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#88BBEE;strokeColor=#88BBEE;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="932" y="2459.9" width="137" height="85" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-18" value="<font face="Comic Sans MS">Receiver</font><div><font face="Comic Sans MS">pc1234</font></div><div><span><font face="Comic Sans MS" style="color: rgb(74, 123, 114);">129.129.100.115</font></span></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#88BBEE;strokeColor=#88BBEE;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;fontFamily=Helvetica;" vertex="1" parent="1">
|
||||
<mxGeometry x="932" y="2561" width="137" height="85" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-19" value="<pre style=""><pre><span style="background-color: transparent;"><font style="">Receiver streaming out<br><font style="">rx_zmqport</font>&nbsp;= <font style=""><b style="">30002</b></font></font></span></pre></pre>" style="text;html=1;align=left;verticalAlign=middle;resizable=1;points=[];autosize=1;strokeColor=#4A7B72;fillColor=default;fontColor=#4A7B72;movable=1;rotatable=1;deletable=1;editable=1;locked=0;connectable=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="755" y="2561" width="166" height="44" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-20" value="ZMQ" style="shape=singleArrow;direction=east;whiteSpace=wrap;html=1;fillColor=#77AADD;gradientColor=none;strokeColor=#77AADD;arrowWidth=0.3650504445573688;arrowSize=0.19810994147613833;rotation=0;flipV=0;flipH=1;fontColor=#FFFFFF;fontSize=10;" vertex="1" parent="1">
|
||||
<mxGeometry x="656" y="2561" width="90" height="40" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-22" value="<p><font face="Courier New" style="">Client listening to&nbsp;<br><font>zmqport</font> : <font style=""><b style="">30004</b></font><br><font>zmqip</font>&nbsp; &nbsp;: <font style=""><b style="">129.129.200.175 </b></font></font></p>" style="text;html=1;align=left;verticalAlign=middle;resizable=1;points=[];autosize=1;strokeColor=#004C99;fillColor=default;fontColor=#004C99;movable=1;rotatable=1;deletable=1;editable=1;locked=0;connectable=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="320.39" y="2204" width="198" height="49" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-23" value="<font style="font-size: 17px;">External Process:</font><div><font style="font-size: 17px;">rx_zmqport (30001)&nbsp;</font><span style="font-size: 17px; background-color: transparent; color: light-dark(rgb(136, 136, 255), rgb(105, 105, 207));">!=&nbsp;</span><span style="font-size: 17px; background-color: transparent; color: light-dark(rgb(136, 136, 255), rgb(105, 105, 207));">zmqport (30004)</span></div>" style="text;html=1;align=left;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#8888FF;" vertex="1" parent="1">
|
||||
<mxGeometry x="754" y="2312.0000000000005" width="315" height="53" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-25" value="" style="endArrow=classic;html=1;rounded=0;fontColor=#AAAAFF;strokeColor=#AAAAFF;exitX=0.497;exitY=0.986;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0.482;entryY=0.009;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="IUwO_ccEPv4BRx6tuxwP-23" target="IUwO_ccEPv4BRx6tuxwP-16">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="612.31" y="2482" as="sourcePoint" />
|
||||
<mxPoint x="820.31" y="2520" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-27" value="ZMQ" style="shape=singleArrow;direction=north;whiteSpace=wrap;html=1;fillColor=#99DDBB;gradientColor=none;strokeColor=#99DDBB;arrowWidth=0.26530437257911216;arrowSize=0.11592009478500508;rotation=0;flipV=0;flipH=1;fontColor=#FFFFFF;fontSize=10;textDirection=vertical-lr;" vertex="1" parent="1">
|
||||
<mxGeometry x="527.5699999999999" y="2258.1" width="40" height="100" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-28" value="<p><font style="" face="Courier New">Client listening to&nbsp;<br><font>zmqport</font> : <font style=""><b style="">30003</b></font><br><font>zmqip</font>&nbsp; &nbsp;: <font style=""><b style="">129.129.200.175 </b></font></font></p>" style="text;html=1;align=left;verticalAlign=middle;resizable=1;points=[];autosize=1;strokeColor=#004C99;fillColor=default;fontColor=#004C99;movable=1;rotatable=1;deletable=1;editable=1;locked=0;connectable=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="528.9" y="2204" width="198" height="49" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-30" value="ZMQ" style="shape=singleArrow;direction=north;whiteSpace=wrap;html=1;fillColor=#99DDBB;gradientColor=none;strokeColor=#99DDBB;arrowWidth=0.3197480273847759;arrowSize=0.13373882001308657;rotation=0;flipV=0;flipH=1;fontColor=#FFFFFF;fontSize=10;textDirection=vertical-lr;" vertex="1" parent="1">
|
||||
<mxGeometry x="478.2" y="2258.1" width="40" height="100" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-31" value="Assembled Data" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;rotation=-90;fontColor=#4A7B72;" vertex="1" parent="1">
|
||||
<mxGeometry x="594" y="2535" width="106" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-33" value="<p><font face="Courier New" style="">External Process&nbsp;listening to&nbsp;<br>Ports : <font style=""><b>30001, 30002</b></font><br>Ip&nbsp; &nbsp; : <font style=""><b style="">129.129.100.115 </b></font></font></p>" style="text;align=left;verticalAlign=middle;resizable=1;points=[];autosize=1;strokeColor=#4A7B72;fillColor=default;fontColor=#4A7B72;movable=1;rotatable=1;deletable=1;editable=1;locked=0;connectable=1;html=1;spacing=0;spacingLeft=5;" vertex="1" parent="1">
|
||||
<mxGeometry x="414" y="2525.63" width="221" height="51.37" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-37" value="" style="endArrow=classic;html=1;rounded=0;fontColor=#AAAAFF;strokeColor=#AAAAFF;entryX=1.005;entryY=0.41;entryDx=0;entryDy=0;entryPerimeter=0;exitX=0.476;exitY=-0.014;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="1" source="IUwO_ccEPv4BRx6tuxwP-23" target="IUwO_ccEPv4BRx6tuxwP-28">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="803" y="2313" as="sourcePoint" />
|
||||
<mxPoint x="519.31" y="2373.93" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-46" value="<p><font style="" face="Courier New">External Process&nbsp;streaming out&nbsp;<br>Ports : <b>30003, 30004</b></font></p>" style="text;align=left;verticalAlign=middle;resizable=1;points=[];autosize=1;strokeColor=#004C99;fillColor=default;fontColor=#004C99;movable=1;rotatable=1;deletable=1;editable=1;locked=0;connectable=1;html=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="418.9" y="2396" width="222.1" height="36" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-50" value="" style="shape=image;editableCssRules=.*;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=data:image/svg+xml,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9Ii0wLjUgLTAuNSAyOCAyOCIgaGVpZ2h0PSIyOCIgd2lkdGg9IjI4IiBzdHlsZT0iY29sb3Itc2NoZW1lOiBsaWdodCBkYXJrOyI+JiN4YTsJICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPi5zdDAgeyBzdG9wLWNvbG9yOiBsaWdodC1kYXJrKHJnYigxNzAsIDE3MCwgMjU1KSwgcmdiKDAsIDIwNiwgMTcyKSk7IH0gLnN0MSB7IHN0b3AtY29sb3I6IGxpZ2h0LWRhcmsocmdiKDE3OCwgMTAyLCAyNTUpLCByZ2IoNywgMTMxLCAxNDMpKTsgfSA8L3N0eWxlPiYjeGE7CTxkZWZzPiYjeGE7CQk8bGluZWFyR3JhZGllbnQgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHkyPSIyNS4zMDkiIHgyPSIyMy40NTQiIHkxPSIzLjQ3NCIgeDE9IjIuMDM5IiBpZD0iQSI+JiN4YTsJCQk8c3RvcCBjbGFzcz0ic3QwIi8+JiN4YTsJCQk8c3RvcCBjbGFzcz0ic3QxIiBvZmZzZXQ9IjEiLz4mI3hhOwkJPC9saW5lYXJHcmFkaWVudD4mI3hhOwk8L2RlZnM+JiN4YTsJPHBhdGggZmlsbD0idXJsKCNBKSIgZD0iTTE1LjI1IDEzLjE3M2ExLjcgMS43IDAgMCAwLS4xMTYtLjY4Yy0uMDg1LS4yMTYtLjIxMy0uNDEzLS4zNzYtLjU3OHMtLjM2Mi0uMjkxLS41NzgtLjM3Ni0uNDQ4LS4xMjQtLjY4LS4xMTZjLS4yMzItLjAwOC0uNDY0LjAzMS0uNjguMTE2cy0uNDEzLjIxMy0uNTc4LjM3Ni0uMjkxLjM2Mi0uMzc2LjU3OGExLjcgMS43IDAgMCAwLS4xMTYuNjh2N2MwIC40NzIuMTY1Ljg5Mi40OTIgMS4yNTguMTY1LjE2My4zNjIuMjkxLjU3OS4zNzVzLjQ0OC4xMjMuNjguMTE1YTEuNyAxLjcgMCAwIDAgMS4yNTgtLjQ5Yy4zMjctLjM2Ni40OTItLjc4NC40OTItMS4yNnYtN3pNMTMuNS0uNWMxLjkzMiAwIDMuNzM2LjM2NiA1LjQxNCAxLjA5NCAxLjcxMy43MyAzLjIwOCAxLjczMiA0LjQ4MyAzLjAwOCAxLjI4MyAxLjI4NyAyLjMwNSAyLjgxIDMuMDA4IDQuNDg1LjczIDEuNjc2IDEuMDk0IDMuNDgyIDEuMDk0IDUuNDEzYTEzLjgyIDEzLjgyIDAgMCAxLTEuMDk0IDUuNDY5Yy0uNzEzIDEuNjU0LTEuNzM0IDMuMTU4LTMuMDA4IDQuNDMxLTEuMjg2IDEuMjgyLTIuODA5IDIuMzAzLTQuNDgzIDMuMDA2LTEuNzEuNzM2LTMuNTUzIDEuMTA4LTUuNDE0IDEuMDk0LTEuODc4LjAxMS0zLjczOS0uMzYxLTUuNDY5LTEuMDk0YTE0LjIzIDE0LjIzIDAgMCAxLTcuNDM3LTcuNDM3QTEzLjgyIDEzLjgyIDAgMCAxLS41IDEzLjVjMC0xLjkzMi4zNjQtMy43MzYgMS4wOTQtNS40MTMuNzMtMS43MTUgMS43MzItMy4yMDkgMy4wMDgtNC40ODVTNi4zNzggMS4zMDcgOC4wMzEuNTk0QTEzLjgyIDEzLjgyIDAgMCAxIDEzLjUtLjV6bTAgOS43MzVhMi4wMSAyLjAxIDAgMCAwIDEuNDc3LS42MDIgMi4wMSAyLjAxIDAgMCAwIC42MDItMS40NzdjMC0uNTgzLS4yMDEtMS4wNzQtLjYwMi0xLjQ3NS0uMTg0LS4yMS0uNDExLS4zNzctLjY2Ni0uNDkxcy0uNTMyLS4xNy0uODExLS4xNjZjLS4yNzktLjAwNC0uNTU2LjA1Mi0uODExLjE2NnMtLjQ4Mi4yODEtLjY2Ni40OTFjLS40MDEuNDAxLS42Ljg5Mi0uNiAxLjQ3NXMuMiAxLjA3Ni42IDEuNDc3Ljg5My42MDIgMS40NzcuNjAyeiIvPiYjeGE7PC9zdmc+;" vertex="1" parent="1">
|
||||
<mxGeometry x="-169" y="2355.5" width="28" height="28" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-52" value="" style="shape=image;editableCssRules=.*;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=data:image/svg+xml,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9Ii0wLjUgLTAuNSAyOCAyOCIgaGVpZ2h0PSIyOCIgd2lkdGg9IjI4IiBzdHlsZT0iY29sb3Itc2NoZW1lOiBsaWdodCBkYXJrOyI+JiN4YTsJICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPi5zdDAgeyBzdG9wLWNvbG9yOiBsaWdodC1kYXJrKHJnYigxNzAsIDE3MCwgMjU1KSwgcmdiKDAsIDIwNiwgMTcyKSk7IH0gLnN0MSB7IHN0b3AtY29sb3I6IGxpZ2h0LWRhcmsocmdiKDE3OCwgMTAyLCAyNTUpLCByZ2IoNywgMTMxLCAxNDMpKTsgfSA8L3N0eWxlPiYjeGE7CTxkZWZzPiYjeGE7CQk8bGluZWFyR3JhZGllbnQgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHkyPSIyNS4zMDkiIHgyPSIyMy40NTQiIHkxPSIzLjQ3NCIgeDE9IjIuMDM5IiBpZD0iQSI+JiN4YTsJCQk8c3RvcCBjbGFzcz0ic3QwIi8+JiN4YTsJCQk8c3RvcCBjbGFzcz0ic3QxIiBvZmZzZXQ9IjEiLz4mI3hhOwkJPC9saW5lYXJHcmFkaWVudD4mI3hhOwk8L2RlZnM+JiN4YTsJPHBhdGggZmlsbD0idXJsKCNBKSIgZD0iTTE1LjI1IDEzLjE3M2ExLjcgMS43IDAgMCAwLS4xMTYtLjY4Yy0uMDg1LS4yMTYtLjIxMy0uNDEzLS4zNzYtLjU3OHMtLjM2Mi0uMjkxLS41NzgtLjM3Ni0uNDQ4LS4xMjQtLjY4LS4xMTZjLS4yMzItLjAwOC0uNDY0LjAzMS0uNjguMTE2cy0uNDEzLjIxMy0uNTc4LjM3Ni0uMjkxLjM2Mi0uMzc2LjU3OGExLjcgMS43IDAgMCAwLS4xMTYuNjh2N2MwIC40NzIuMTY1Ljg5Mi40OTIgMS4yNTguMTY1LjE2My4zNjIuMjkxLjU3OS4zNzVzLjQ0OC4xMjMuNjguMTE1YTEuNyAxLjcgMCAwIDAgMS4yNTgtLjQ5Yy4zMjctLjM2Ni40OTItLjc4NC40OTItMS4yNnYtN3pNMTMuNS0uNWMxLjkzMiAwIDMuNzM2LjM2NiA1LjQxNCAxLjA5NCAxLjcxMy43MyAzLjIwOCAxLjczMiA0LjQ4MyAzLjAwOCAxLjI4MyAxLjI4NyAyLjMwNSAyLjgxIDMuMDA4IDQuNDg1LjczIDEuNjc2IDEuMDk0IDMuNDgyIDEuMDk0IDUuNDEzYTEzLjgyIDEzLjgyIDAgMCAxLTEuMDk0IDUuNDY5Yy0uNzEzIDEuNjU0LTEuNzM0IDMuMTU4LTMuMDA4IDQuNDMxLTEuMjg2IDEuMjgyLTIuODA5IDIuMzAzLTQuNDgzIDMuMDA2LTEuNzEuNzM2LTMuNTUzIDEuMTA4LTUuNDE0IDEuMDk0LTEuODc4LjAxMS0zLjczOS0uMzYxLTUuNDY5LTEuMDk0YTE0LjIzIDE0LjIzIDAgMCAxLTcuNDM3LTcuNDM3QTEzLjgyIDEzLjgyIDAgMCAxLS41IDEzLjVjMC0xLjkzMi4zNjQtMy43MzYgMS4wOTQtNS40MTMuNzMtMS43MTUgMS43MzItMy4yMDkgMy4wMDgtNC40ODVTNi4zNzggMS4zMDcgOC4wMzEuNTk0QTEzLjgyIDEzLjgyIDAgMCAxIDEzLjUtLjV6bTAgOS43MzVhMi4wMSAyLjAxIDAgMCAwIDEuNDc3LS42MDIgMi4wMSAyLjAxIDAgMCAwIC42MDItMS40NzdjMC0uNTgzLS4yMDEtMS4wNzQtLjYwMi0xLjQ3NS0uMTg0LS4yMS0uNDExLS4zNzctLjY2Ni0uNDkxcy0uNTMyLS4xNy0uODExLS4xNjZjLS4yNzktLjAwNC0uNTU2LjA1Mi0uODExLjE2NnMtLjQ4Mi4yODEtLjY2Ni40OTFjLS40MDEuNDAxLS42Ljg5Mi0uNiAxLjQ3NXMuMiAxLjA3Ni42IDEuNDc3Ljg5My42MDIgMS40NzcuNjAyeiIvPiYjeGE7PC9zdmc+;" vertex="1" parent="1">
|
||||
<mxGeometry x="726" y="2324.5" width="28" height="28" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-57" value="Module 3" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#99CCFF;strokeColor=#99CCFF;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="475.70000000000005" y="413.27" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-58" value="Module 2" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#88BBEE;strokeColor=#88BBEE;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="467.70000000000005" y="406.27" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-59" value="Module 1" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#77AADD;strokeColor=#77AADD;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="459.70000000000005" y="398.27" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-60" value="Receiver (s)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#6699CC;strokeColor=#6699CC;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="452" y="391.27" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-61" value="Option 1: Directly&nbsp;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;rotation=45;" vertex="1" parent="1">
|
||||
<mxGeometry x="255.39" y="309.63" width="113" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="IUwO_ccEPv4BRx6tuxwP-62" value="Option 2: Indirectly" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;rotation=0;" vertex="1" parent="1">
|
||||
<mxGeometry x="291.99605691619604" y="446.99605691619604" width="118" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-14" value="Client" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="-173" y="3875.5" width="47" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-15" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;entryX=0.016;entryY=0.505;entryDx=0;entryDy=0;entryPerimeter=0;fontColor=#666666;strokeColor=#666666;" edge="1" parent="1">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="-132" y="3889" as="sourcePoint" />
|
||||
<mxPoint x="-46.998000000000104" y="3889.405" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-57" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeColor=#666666;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-27" target="hmBfKhxy8mBhXzrh4bXw-28">
|
||||
<mxGeometry relative="1" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-27" value="<div><font face="Courier New">Control Server</font></div><div><font face="Courier New">( C 98 )</font></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#77AADD;strokeColor=#77AADD;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="-47" y="3750" width="146" height="60" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-28" value="<div><font face="Courier New">Stop Server</font></div><div><font face="Courier New">( C 98 )</font></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#77AADD;strokeColor=#77AADD;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="-47" y="3853" width="146" height="60" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-29" value="Client&nbsp;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="-173" y="3766.5" width="50" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-30" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;fontColor=#666666;strokeColor=#666666;" edge="1" parent="1" target="hmBfKhxy8mBhXzrh4bXw-27">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="-133" y="3780" as="sourcePoint" />
|
||||
<mxPoint x="-48" y="3783" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-34" value="On-board CPU" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=17;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="-34" y="3921" width="120" height="32" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-35" value="Registers" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#AAAAFF;strokeColor=#AAAAFF;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="182.34000000000003" y="3872.5" width="152" height="40" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-37" value="FPGA ( VHDL )" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=17;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="184.00000000000003" y="3921" width="131" height="32" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-38" value="UDP Generator" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#AAAAFF;strokeColor=#AAAAFF;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="182.75" y="3820" width="152" height="40" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-39" value="Readout and Processing Logic" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#AAAAFF;strokeColor=#AAAAFF;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="183.5" y="3740" width="152" height="70" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-40" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontColor=#666666;strokeColor=#666666;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-28" target="hmBfKhxy8mBhXzrh4bXw-35">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="64.37" y="3696" as="sourcePoint" />
|
||||
<mxPoint x="176.37" y="3696" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-41" value="<span style="background-color: transparent;">Stop</span>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;rotation=5;" vertex="1" parent="1">
|
||||
<mxGeometry x="117.61000000000001" y="3867" width="40" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-42" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;fontColor=#666666;strokeColor=#666666;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-27" target="hmBfKhxy8mBhXzrh4bXw-35">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="69.37" y="3580" as="sourcePoint" />
|
||||
<mxPoint x="176.37" y="3696" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-43" value="<span style="background-color: transparent;">Control</span>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;rotation=53;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="113" y="3811" width="55" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-46" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.75;exitDx=0;exitDy=0;fontColor=#666666;strokeColor=#666666;dashed=1;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-38">
|
||||
<mxGeometry relative="1" as="geometry">
|
||||
<mxPoint x="446" y="3849" as="targetPoint" />
|
||||
<mxPoint x="350.27" y="3843" as="sourcePoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-48" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#FFFFDD;fontColor=#333333;strokeColor=#E6E6E6;" vertex="1" parent="1">
|
||||
<mxGeometry x="157" y="3626" width="202" height="57" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-49" value="Sensor &amp; Chip" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=17;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="198.2" y="3638.5" width="119" height="32" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-50" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=0;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;fontColor=#666666;strokeColor=#666666;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-36" target="hmBfKhxy8mBhXzrh4bXw-48">
|
||||
<mxGeometry relative="1" as="geometry">
|
||||
<mxPoint x="213.19" y="3721" as="sourcePoint" />
|
||||
<mxPoint x="212.19" y="3689" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-51" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.644;exitY=0.993;exitDx=0;exitDy=0;entryX=0.65;entryY=0.007;entryDx=0;entryDy=0;entryPerimeter=0;exitPerimeter=0;fontColor=#666666;strokeColor=#666666;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-48" target="hmBfKhxy8mBhXzrh4bXw-36">
|
||||
<mxGeometry relative="1" as="geometry">
|
||||
<mxPoint x="281.19" y="3689" as="sourcePoint" />
|
||||
<mxPoint x="281.19" y="3721" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-52" value="Control" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="154.39000000000001" y="3686" width="55" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-53" value="Data" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="285.62" y="3686" width="41" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-55" value="MODULE" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=17;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="-19" y="3642" width="91" height="32" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-58" value="<span style="background-color: transparent;">Spawns</span>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="22" y="3817" width="55" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-59" value="<font face="Courier New">On-board&nbsp;</font><div><font face="Courier New">Detector&nbsp;</font><span style="font-family: &quot;Courier New&quot;; background-color: transparent; color: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));">Server</span></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#77AADD;strokeColor=#77AADD;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="-202.75" y="4236" width="160" height="84" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-60" value="Firmware&nbsp;<div>( *.bit, *.pof, *.rbf )</div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#9999FF;strokeColor=#9999FF;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="37.86" y="4236" width="160" height="84" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-61" value="<font face="Courier New">slsDetectorPackage</font><div><font face="Courier New">( Client /&amp; Receiver )</font></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#77BBBB;strokeColor=#77BBBB;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="278.75" y="4236" width="200" height="84" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-64" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.25;exitDx=0;exitDy=0;fontColor=#666666;strokeColor=#666666;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-38">
|
||||
<mxGeometry relative="1" as="geometry">
|
||||
<mxPoint x="447" y="3830" as="targetPoint" />
|
||||
<mxPoint x="356" y="3811" as="sourcePoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-66" value="UDP Port" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="350.12" y="3810" width="65" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-67" value="UDP Port 2" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="349.62" y="3829" width="74" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-68" value="TCP Port<div><span style="background-color: transparent; color: light-dark(rgb(102, 102, 102), rgb(149, 149, 149));">Control</span></div>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="-124" y="3759" width="63" height="41" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-69" value="<span style="background-color: transparent; color: light-dark(rgb(102, 102, 102), rgb(149, 149, 149));">TCP Port</span><div><span style="background-color: transparent; color: light-dark(rgb(102, 102, 102), rgb(149, 149, 149));">Stop</span></div>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="-125" y="3868" width="63" height="41" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-71" value="Receiver" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="438.20000000000005" y="3817" width="61" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-72" value="Receiver" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="438.38" y="3836" width="61" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-75" value="<font face="Courier New">Listener</font>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#77AADD;strokeColor=#77AADD;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="-208" y="4630.5" width="146" height="84" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-77" value="Data Processor" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#9999FF;strokeColor=#9999FF;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="-22.51" y="4628" width="167.88" height="84" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-79" value="<font face="Courier New">Data Streamer</font>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#77BBBB;strokeColor=#77BBBB;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="182.34" y="4628" width="179.12" height="84" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-82" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;fontColor=#666666;strokeColor=#666666;" edge="1" parent="1" target="hmBfKhxy8mBhXzrh4bXw-84">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="-289" y="4550" as="sourcePoint" />
|
||||
<mxPoint x="-253" y="4554.5" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-106" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;strokeColor=#666666;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-84" target="hmBfKhxy8mBhXzrh4bXw-75">
|
||||
<mxGeometry relative="1" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-107" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;strokeColor=#666666;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-84" target="hmBfKhxy8mBhXzrh4bXw-77">
|
||||
<mxGeometry relative="1" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-108" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.25;exitDx=0;exitDy=0;strokeColor=#666666;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-84" target="hmBfKhxy8mBhXzrh4bXw-79">
|
||||
<mxGeometry relative="1" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-84" value="<font face="Courier New">TCP Server</font>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#AAAADD;strokeColor=#77AADD;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="-208" y="4508" width="146" height="84" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-85" value="Client&nbsp;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="-330" y="4537" width="50" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-86" value="TCP Port<div><span style="background-color: transparent; color: light-dark(rgb(102, 102, 102), rgb(149, 149, 149));">Control</span></div>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="-276" y="4529.5" width="63" height="41" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-87" value="" style="endArrow=classic;html=1;rounded=0;entryX=0.01;entryY=0.83;entryDx=0;entryDy=0;strokeColor=#666666;entryPerimeter=0;" edge="1" parent="1" target="hmBfKhxy8mBhXzrh4bXw-75">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="-291" y="4700" as="sourcePoint" />
|
||||
<mxPoint x="-265" y="4672" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-88" value="Module" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="-339" y="4686" width="55" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-89" value="UDP Port" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="-278" y="4679.5" width="65" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-91" value="Data" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="351.12" y="3846.5" width="41" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-94" value="" style="endArrow=classic;html=1;rounded=0;strokeColor=#666666;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-75" target="hmBfKhxy8mBhXzrh4bXw-95">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="-50" y="4739" as="sourcePoint" />
|
||||
<mxPoint y="4689" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-95" value="Assembles&nbsp;<div><span style="background-color: transparent; color: light-dark(rgb(102, 102, 102), rgb(149, 149, 149));">into images in memory</span></div>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=#666666;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="-199" y="4754" width="129" height="41" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-96" value="Optional callbacks&nbsp;<div>for online processing</div>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=#666666;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="-39.62" y="4754" width="119" height="41" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-98" value="" style="endArrow=classic;html=1;rounded=0;strokeColor=#666666;exitX=0.25;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-77" target="hmBfKhxy8mBhXzrh4bXw-96">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="54.370000000000005" y="4719" as="sourcePoint" />
|
||||
<mxPoint x="54.370000000000005" y="4754" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-99" value="Optional File" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=#666666;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="63" y="4810" width="82" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-100" value="" style="endArrow=classic;html=1;rounded=0;strokeColor=#666666;exitX=0.754;exitY=0.979;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-77" target="hmBfKhxy8mBhXzrh4bXw-99">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="86.62" y="4759" as="sourcePoint" />
|
||||
<mxPoint x="121.99000000000001" y="4801" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-101" value="Optional Data Streaming" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=#666666;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="203.5" y="4774" width="138" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-102" value="" style="endArrow=classic;html=1;rounded=0;strokeColor=#666666;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-79" target="hmBfKhxy8mBhXzrh4bXw-101">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="275.12" y="4724" as="sourcePoint" />
|
||||
<mxPoint x="310.49" y="4766" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-103" value="" style="endArrow=classic;html=1;rounded=0;entryX=-0.002;entryY=0.873;entryDx=0;entryDy=0;strokeColor=#666666;dashed=1;entryPerimeter=0;" edge="1" parent="1" target="hmBfKhxy8mBhXzrh4bXw-119">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="-291" y="4723" as="sourcePoint" />
|
||||
<mxPoint x="-208" y="4723.5" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-104" value="Module" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="-339" y="4708" width="55" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-105" value="UDP Port 2" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="-284" y="4702.5" width="74" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-116" value="RECEIVER" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=17;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="24.71" y="4472" width="101" height="32" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-117" value="UPGRADE COMPONENTS" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=17;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="11.369999999999997" y="4196" width="218" height="32" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-121" value="<div><span style="background-color: transparent; color: light-dark(rgb(102, 102, 102), rgb(149, 149, 149));">Data packets</span></div>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="-284" y="4657" width="80" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-124" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1.001;exitY=0.818;exitDx=0;exitDy=0;fontColor=#666666;strokeColor=#666666;dashed=1;exitPerimeter=0;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-123">
|
||||
<mxGeometry relative="1" as="geometry">
|
||||
<mxPoint x="469" y="4711" as="targetPoint" />
|
||||
<mxPoint x="382.62" y="4711" as="sourcePoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-125" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.75;exitDx=0;exitDy=0;fontColor=#666666;strokeColor=#666666;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-79">
|
||||
<mxGeometry relative="1" as="geometry">
|
||||
<mxPoint x="470" y="4691" as="targetPoint" />
|
||||
<mxPoint x="382.62" y="4691" as="sourcePoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-126" value="ZMQ Port" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="370.74" y="4671" width="68" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-127" value="ZMQ Port 2" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="369.24" y="4690" width="77" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-128" value="GUI" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="462.82000000000005" y="4678" width="39" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-129" value="GUI" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="462" y="4697" width="39" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-130" value="Images" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="370.24" y="4653" width="53" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-131" value="<font face="Courier New">C++ API</font>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#77BBBB;strokeColor=#77BBBB;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="-199" y="4999" width="146" height="84" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-132" value="<font face="Courier New">Python API</font><span style="color: rgba(0, 0, 0, 0); font-family: monospace; font-size: 0px; text-align: start; text-wrap-mode: nowrap;">%3CmxGraphModel%3E%3Croot%3E%3CmxCell%20id%3D%220%22%2F%3E%3CmxCell%20id%3D%221%22%20parent%3D%220%22%2F%3E%3CmxCell%20id%3D%222%22%20value%3D%22%26lt%3Bfont%20face%3D%26quot%3BCourier%20New%26quot%3B%26gt%3BC%2B%2B%20API%26lt%3B%2Ffont%26gt%3B%22%20style%3D%22rounded%3D1%3BwhiteSpace%3Dwrap%3Bhtml%3D1%3BfillColor%3D%2377AADD%3BstrokeColor%3D%2377AADD%3BlabelPosition%3Dcenter%3BverticalLabelPosition%3Dmiddle%3Balign%3Dcenter%3BverticalAlign%3Dmiddle%3BfontSize%3D17%3BgradientColor%3Dnone%3BfontColor%3D%23FFFFFF%3B%22%20vertex%3D%221%22%20parent%3D%221%22%3E%3CmxGeometry%20x%3D%22-180%22%20y%3D%224998%22%20width%3D%22146%22%20height%3D%2284%22%20as%3D%22geometry%22%2F%3E%3C%2FmxCell%3E%3C%2Froot%3E%3C%2FmxGraphModel%3E</span>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#77BBBB;strokeColor=#77BBBB;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="-202.75" y="5120" width="146" height="84" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-133" value="<font face="Courier New">CLI</font>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#77BBBB;strokeColor=#77BBBB;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="-202.75" y="5240" width="146" height="84" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-134" value="<font face="Courier New">Qt GUI</font>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#77BBBB;strokeColor=#77BBBB;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="-202.75" y="5360" width="146" height="84" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-135" value="" style="points=[[0.35,0,0],[0.98,0.51,0],[1,0.71,0],[0.67,1,0],[0,0.795,0],[0,0.65,0]];verticalLabelPosition=bottom;sketch=0;html=1;verticalAlign=top;aspect=fixed;align=center;pointerEvents=1;shape=mxgraph.cisco19.user;fillColor=#77BBBB;strokeColor=#77BBBB;" vertex="1" parent="1">
|
||||
<mxGeometry x="-336.5" y="5154" width="50" height="50" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-137" value="<font face="Courier New">&lt;&lt;class&gt;&gt; Detector</font>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#77BBBB;strokeColor=#77BBBB;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="24.710000000000004" y="5239" width="196" height="84" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-138" value="Module 3" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#99CCFF;strokeColor=#99CCFF;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="-61.06999999999997" y="5622" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-139" value="Module 2" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#88BBEE;strokeColor=#88BBEE;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="-72.06999999999996" y="5615" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-140" value="Module 1" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#77AADD;strokeColor=#77AADD;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="-80.06999999999996" y="5607" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-141" value="Module (s)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#6699CC;strokeColor=#6699CC;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="-87.77000000000001" y="5600" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-142" value="Module 3" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#99CCFF;strokeColor=#99CCFF;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="132.00000000000006" y="5622" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-143" value="Module 2" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#88BBEE;strokeColor=#88BBEE;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="121.00000000000006" y="5615" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-144" value="Module 1" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#77AADD;strokeColor=#77AADD;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="113.00000000000006" y="5607" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-145" value="Receiver (s)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#6699CC;strokeColor=#6699CC;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="105.30000000000001" y="5600" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-150" value="" style="endArrow=classic;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#666666;" edge="1" parent="1" target="hmBfKhxy8mBhXzrh4bXw-131">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="-284" y="5189" as="sourcePoint" />
|
||||
<mxPoint x="-234" y="5139" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-151" value="" style="endArrow=classic;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#666666;" edge="1" parent="1" target="hmBfKhxy8mBhXzrh4bXw-132">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="-284" y="5190" as="sourcePoint" />
|
||||
<mxPoint x="-234" y="5140" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-152" value="" style="endArrow=classic;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#666666;" edge="1" parent="1" target="hmBfKhxy8mBhXzrh4bXw-133">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="-284" y="5190" as="sourcePoint" />
|
||||
<mxPoint x="-234" y="5140" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-153" value="" style="endArrow=classic;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#666666;" edge="1" parent="1" target="hmBfKhxy8mBhXzrh4bXw-134">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="-284" y="5190" as="sourcePoint" />
|
||||
<mxPoint x="-234" y="5140" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-154" value="" style="endArrow=classic;html=1;rounded=0;strokeColor=#666666;exitX=1;exitY=0.401;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-131" target="hmBfKhxy8mBhXzrh4bXw-137">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="-30.629999999999995" y="5028" as="sourcePoint" />
|
||||
<mxPoint x="10" y="5010" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-155" value="" style="endArrow=classic;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#666666;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-132" target="hmBfKhxy8mBhXzrh4bXw-137">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="-53" y="5162" as="sourcePoint" />
|
||||
<mxPoint x="28" y="5134" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-156" value="" style="endArrow=classic;html=1;rounded=0;strokeColor=#666666;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-133" target="hmBfKhxy8mBhXzrh4bXw-137">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="-40" y="5178" as="sourcePoint" />
|
||||
<mxPoint x="20" y="5170" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-157" value="" style="endArrow=classic;html=1;rounded=0;strokeColor=#666666;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-134" target="hmBfKhxy8mBhXzrh4bXw-137">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="-50" y="5328" as="sourcePoint" />
|
||||
<mxPoint x="10" y="5040" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-159" value="" style="endArrow=classic;html=1;rounded=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeColor=#666666;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-137" target="hmBfKhxy8mBhXzrh4bXw-146">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="-10" y="5606" as="sourcePoint" />
|
||||
<mxPoint x="71" y="5578" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-160" value="" style="endArrow=classic;html=1;rounded=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeColor=#666666;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-146" target="hmBfKhxy8mBhXzrh4bXw-141">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="150" y="5518" as="sourcePoint" />
|
||||
<mxPoint x="231" y="5490" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-161" value="" style="endArrow=classic;html=1;rounded=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeColor=#666666;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-146" target="hmBfKhxy8mBhXzrh4bXw-145">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="123" y="5470" as="sourcePoint" />
|
||||
<mxPoint x="341" y="5430" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-163" value="slsDetectorPackage<div>Client ( C++17 )</div>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=17;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="-191" y="5478" width="160" height="50" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-165" value="CLIENT" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=17;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="172.38" y="5083" width="80" height="30" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-166" value="<font face="Courier New">Shared Memory (s)</font>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#77BBBB;strokeColor=#77BBBB;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="250" y="5311" width="169" height="70" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-167" value="" style="endArrow=classic;html=1;rounded=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeColor=#666666;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-137" target="hmBfKhxy8mBhXzrh4bXw-166">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="120" y="5350" as="sourcePoint" />
|
||||
<mxPoint x="120" y="5408" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="hmBfKhxy8mBhXzrh4bXw-168" value="" style="endArrow=classic;html=1;rounded=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;strokeColor=#666666;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="hmBfKhxy8mBhXzrh4bXw-146" target="hmBfKhxy8mBhXzrh4bXw-166">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="260" y="5340" as="sourcePoint" />
|
||||
<mxPoint x="260" y="5398" as="targetPoint" />
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="QgYz-w7MwsADk0cZRM1J-14" value="Assembled Data" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;rotation=40;fontColor=#666666;" vertex="1" parent="1">
|
||||
<mxGeometry x="-271.5" y="2438" width="106" height="26" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="QgYz-w7MwsADk0cZRM1J-18" value="<pre style=""><span style="background-color: transparent;"><font style="">Receiver streaming out<br><font style="">rx_zmqport</font>&nbsp;= <font style=""><b style="">30001</b></font></font></span><br></pre>" style="text;html=1;align=left;verticalAlign=middle;resizable=1;points=[];autosize=1;strokeColor=#4A7B72;fillColor=default;fontColor=#4A7B72;movable=1;rotatable=1;deletable=1;editable=1;locked=0;connectable=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="-130.5" y="2471.13" width="166" height="43.2" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="QgYz-w7MwsADk0cZRM1J-19" value="<font face="Comic Sans MS">Receiver</font><div><font face="Comic Sans MS">pc1234</font></div><div><span><font style="color: rgb(74, 123, 114);" face="Comic Sans MS">129.129.100.115</font></span></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#88BBEE;strokeColor=#88BBEE;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="46.5" y="2448" width="137" height="85" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="QgYz-w7MwsADk0cZRM1J-20" value="<font face="Courier New">Receiver</font><div>pc1234</div><div><span><font style="color: rgb(74, 123, 114);">129.129.100.115</font></span></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#88BBEE;strokeColor=#88BBEE;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;fontFamily=Helvetica;" vertex="1" parent="1">
|
||||
<mxGeometry x="46.5" y="2549.1" width="137" height="85" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="QgYz-w7MwsADk0cZRM1J-21" value="<pre style=""><pre><span style="background-color: transparent;"><font style="">Receiver streaming out<br><font style="">rx_zmqport</font>&nbsp;= <font style=""><b style="">30002</b></font></font></span></pre></pre>" style="text;html=1;align=left;verticalAlign=middle;resizable=1;points=[];autosize=1;strokeColor=#4A7B72;fillColor=default;fontColor=#4A7B72;movable=1;rotatable=1;deletable=1;editable=1;locked=0;connectable=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="-130.5" y="2563.1" width="166" height="44" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="QgYz-w7MwsADk0cZRM1J-24" value="<font face="Comic Sans MS">Client/ GUI</font>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#AAAAFF;strokeColor=#AAAAFF;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;fontSize=17;gradientColor=none;fontColor=#FFFFFF;" vertex="1" parent="1">
|
||||
<mxGeometry x="-498" y="2235" width="132" height="68" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="QgYz-w7MwsADk0cZRM1J-25" value="" style="points=[[0.35,0,0],[0.98,0.51,0],[1,0.71,0],[0.67,1,0],[0,0.795,0],[0,0.65,0]];verticalLabelPosition=bottom;sketch=0;html=1;verticalAlign=top;aspect=fixed;align=center;pointerEvents=1;shape=mxgraph.cisco19.user;fillColor=#AAAAFF;strokeColor=none;" vertex="1" parent="1">
|
||||
<mxGeometry x="-457.0000000000001" y="2185" width="50" height="50" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="QgYz-w7MwsADk0cZRM1J-26" value="<p><font face="Courier New" style="">Client listening to&nbsp;<br><font style="">zmqport</font> : <font style=""><b style="">30001</b></font><br><font style="">zmqip</font>&nbsp; &nbsp;: <font style=""><b style="">129.129.100.115</b></font></font></p>" style="text;html=1;align=left;verticalAlign=middle;resizable=1;points=[];autosize=1;strokeColor=#4A7B72;fillColor=default;fontColor=#4A7B72;movable=1;rotatable=1;deletable=1;editable=1;locked=0;connectable=1;" vertex="1" parent="1">
|
||||
<mxGeometry x="-559" y="2319.63" width="187" height="56" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="kpcteDQP5Q-WdnKVJ5EM-2" value="<font style="font-size: 17px;" face="Comic Sans MS">Detector</font>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontColor=#737373;" vertex="1" parent="1">
|
||||
<mxGeometry x="499.15" y="71" width="77" height="32" as="geometry" />
|
||||
</mxCell>
|
||||
</root>
|
||||
</mxGraphModel>
|
||||
</diagram>
|
||||
</mxfile>
|
||||
@@ -1,5 +1,3 @@
|
||||
.. _binary file format:
|
||||
|
||||
Binary File Format
|
||||
====================
|
||||
|
||||
@@ -33,7 +31,6 @@ Data File
|
||||
|
||||
* Each frame includes a :ref:`**sls_receiver_header** <sls receiver header format>` structure, followed by the actual frame data.
|
||||
|
||||
* More details on :ref:`slsReceiverHeader<sls receiver header format>` and the actual image data is described in the :ref:`Detector Image Size and Format <data format>` section.
|
||||
|
||||
|
||||
.. _json master file examples:
|
||||
|
||||
@@ -6,8 +6,6 @@ Usage
|
||||
|
||||
The syntax is *'[detector index]-[module index]:[command]'*, where the indices are by default '0', when not specified.
|
||||
|
||||
.. _cl-module-index-label:
|
||||
|
||||
Module index
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
Modules are indexed based on their order in the hostname command. They are used to configure a specific module within a detector and are followed by a ':' in syntax.
|
||||
|
||||
@@ -1,242 +0,0 @@
|
||||
.. _setup commands:
|
||||
|
||||
Setup Commands
|
||||
================================
|
||||
|
||||
|
||||
Introduction
|
||||
-------------
|
||||
|
||||
To connect to any device, one needs a unique combination of **IP address** (which identifies the device) and **port number** (which specifies the service).
|
||||
|
||||
This package typically deals with two types of network interfaces:
|
||||
|
||||
* **1 GbE public interface** - Accessible from anywhere on the network. Connectivity can be verified by pinging this interface from any PC.
|
||||
|
||||
* **10 GbE private interface** - Dedicated to high-speed data transfer with a specific PC. In addition to the 1 GbE public interface (MTU 1500), the device may include one or more private 10 GbE interfaces (MTU 9000), which are not accessible from other machines.
|
||||
|
||||
Client to Module
|
||||
-----------------
|
||||
|
||||
.. figure:: images/Client_module_commands.png
|
||||
:target: _images/Client_module_commands.png
|
||||
:width: 700px
|
||||
:align: center
|
||||
:alt: Client Module Commands
|
||||
|
||||
Client Module TCP Commands
|
||||
|
||||
The client configures and controls modules via the 1 GbE public TCP interface.
|
||||
|
||||
* Should be able to ping the module's hostname from any PC on the network.
|
||||
* If one cannot ping, ensure that it is powered on.
|
||||
* If the command cannot connect to the port (`hostname command <commandline.html#term-hostname>`_ failed), the onboard servers may not have started yet.
|
||||
|
||||
Each physical module has its own unique IP address. As the IPs are already different, all modules can share the same default ports:
|
||||
|
||||
* 1952 - Default Module TCP Control Port
|
||||
* 1953 - Default Module TCP Stop port
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
# Therefore, one can use
|
||||
hostname bchip100+bchip101+
|
||||
# instead of
|
||||
hostname bchip100:1952+bchip101:1954+
|
||||
|
||||
|
||||
**Simulators**, however, usually run on the same PC. See `virtual servers <https://slsdetectorgroup.github.io/devdoc/virtualserver.html>`_ for more details. In that case, each instance must use a different port. By incrementing port numbers, you can also use the virtual command for convenience.
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
# Therefore, one can use
|
||||
virtual 2 1952
|
||||
# instead of
|
||||
hostname localhost:1952+localhost:1954+
|
||||
|
||||
|
||||
|
||||
|
||||
Client to Receiver
|
||||
--------------------
|
||||
|
||||
.. figure:: images/Client_receiver_commands.png
|
||||
:target: _images/Client_receiver_commands.png
|
||||
:align: center
|
||||
:alt: Client Receiver Commands
|
||||
|
||||
Client Receiver TCP Commands
|
||||
|
||||
Each module has a receiver, which can be either local or remote.
|
||||
|
||||
The client can configure and control receivers via the 1 GbE public TCP interface:
|
||||
|
||||
* Should be able to ping the receiver's hostname from any PC on the network.
|
||||
* If one cannot ping, ensure that it is powered on.
|
||||
* If the command cannot connect to the port (`rx_hostname command <commandline.html#term-rx_hostname-hostname-or-ip-address>`_ failed), the receivers may not have started yet.
|
||||
|
||||
|
||||
Since multiple receiver processes typically run on the same PC, they share the same IP. Here, each receiver process must use a different TCP port for a unique connection.
|
||||
|
||||
* 1954 - Default Receiver TCP port
|
||||
|
||||
Configuring the receiver with the command `rx_hostname command <commandline.html#term-rx_hostname-hostname-or-ip-address>`_, sets up a receiver for every module in shared memory automatically ie. every module's receiver TCP port will automatically increment in shared memory. The starting port is defined by the command `rx_tcpport <commandline.html#term-rx_tcpport-port>`_ with the default being 1954.
|
||||
|
||||
|
||||
A multi-module command (without colon or module index) sets incremental ports starting from the specified port number.
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
hostname bchip100+bchip101+bchip102+bchip103+
|
||||
rx_tcport 2000 # sets the receiver port to 2000, 2001, 2002, 2003
|
||||
|
||||
|
||||
For example, using default TCP ports (1954, 1955):
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
hostname bchip100+bchip101+
|
||||
rx_hostname localhost
|
||||
# Equivalent to:
|
||||
rx_hostname localhost:1954+localhost:1955+
|
||||
|
||||
# or set to another set of ports (automatically incremented)
|
||||
rx_tcpport 1984
|
||||
rx_hostname localhost
|
||||
# instead of
|
||||
rx_hostname localhost:1984+localhost:1985+
|
||||
|
||||
|
||||
|
||||
|
||||
Module to Receiver
|
||||
-------------------
|
||||
|
||||
.. figure:: images/Module_receiver_commands.png
|
||||
:target: _images/Module_receiver_commands.png
|
||||
:align: center
|
||||
:alt: Module Receiver Commands
|
||||
|
||||
Module Receiver UDP Commands
|
||||
|
||||
**10GbE Interface**
|
||||
|
||||
The module typically sends images to the receiver via a 10 GbE private interface on the receiver PC, which has an MTU of 9000 to support jumbo packets. The private interface is not reachable from other machines, so it cannot be pinged from anywhere.
|
||||
|
||||
**Multiple UDP Packets**
|
||||
|
||||
Images are split into UDP packets for transmission. Unlike TCP, UDP is connectionless and does not guarantee delivery. Therefore, the receiver PC must be tuned for reliable reception. See `Troubleshooting <https://slsdetectorgroup.github.io/devdoc/troubleshooting.html>`_.
|
||||
|
||||
**UDP Configuration**
|
||||
|
||||
Unlike TCP, the module (hardware) requires explicit configuration for sending images via UDP, including:
|
||||
|
||||
* Source and destination IPs
|
||||
* Source and destination MAC addresses
|
||||
* Source and destination ports
|
||||
|
||||
**UDP Destination**
|
||||
|
||||
Info on where to send the image from the module to.
|
||||
|
||||
**UDP Desination IP** - The IP of the receiver PC's 10 GbE interface, usually found via ``ifconfig``. Command: `udp_dstip <commandline.html#term-udp_dstip-x.x.x.x-or-auto>`_. For 1GbE interface and for this command, one can use 'auto' as an argument, which will pick up the IP from the `rx_hostname command <commandline.html#term-rx_hostname-hostname-or-ip-address>`_.
|
||||
|
||||
**UDP desintation MAC** - Also obtained from the interface using ``ifconfig``. For built-in receivers, the module configures this automatically from the ``UDP destination IP``. For custom receivers, it must be explicitly provided. Command: `udp_dstmac <commandline.html#term-udp_dstmac-x-x-x-x-x-x>`_
|
||||
|
||||
**UDP destination port** - Ensure uniqueness if multiple users share the interface. Command: `udp_dstport <commandline.html#term-udp_dstport-n>`_
|
||||
|
||||
* 50001 - Default Receiver UDP port
|
||||
|
||||
|
||||
**UDP Source**
|
||||
|
||||
As it is a one-way communication (module to receiver with no reply or acknowledgements), info on the source of the image is more for debugging purposes and prevent packet rejection.
|
||||
|
||||
**UDP source IP** - Must be on the same subnet as the destination IP (same first three octets) to prevent packet rejection by the receiver interface. For 1GbE interface and for this command (except for Eiger), one can use ``auto`` as an argument, which will pick up the IP from the `hostname command <commandline.html#term-hostname>`_. Command: `udp_srcip <commandline.html#term-udp_srcip-x.x.x.x-or-auto>`_
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
# 10 GbE interface
|
||||
hostname bchip100
|
||||
udp_dstip 10.0.2.1
|
||||
udp_srcip 10.0.2.19
|
||||
rx_hostname localhost
|
||||
|
||||
# 1 GbE interface
|
||||
hostname bchip100
|
||||
rx_hostname localhost
|
||||
udp_dstip auto # this command uses IP from rx_hostname. So, it comes after.
|
||||
udp_srcip auto # this command uses IP from hostname
|
||||
|
||||
**UDP source MAC** - By default, it is set to ``aa:bb:cc:dd:xx:yy`` where ``xx`` and ``yy`` are module row and column indices to differentiate the modules while debugging. Command: `udp_srcmac <commandline.html#term-udp_srcmac-x-x-x-x-x-x>`_
|
||||
|
||||
|
||||
**UDP source port** - This is hardcoded in every module to the same value in the detector server and cannot be changed.
|
||||
|
||||
Note: If there is a second UDP port on the module, use 'udp_dstport2' or 'udp_dstip2'etc. See `here <https://slsdetectorgroup.github.io/devdoc/dataformat.html>`_ for more detector specific info.
|
||||
|
||||
Receiver to GUI
|
||||
-----------------
|
||||
|
||||
.. figure:: images/Receiver_gui_commands.png
|
||||
:target: _images/Receiver_gui_commands.png
|
||||
:align: center
|
||||
:alt: Receiver GUI Commands
|
||||
|
||||
Receiver GUI Commands
|
||||
|
||||
|
||||
Enabling the GUI automatically streams images from the receiver via ZMQ sockets. Even without the GUI, streaming can be activated explicitly using the command `rx_zmqstream <commandline.html#term-rx_zmqstream-0-1>`_. ZMQ streaming uses TCP/IP, so the ports must be configured appropriately.
|
||||
|
||||
**Receiver ZMQ Port** - Port from which the receiver streams ZMQ packets. Command: `rx_zmqport <commandline.html#term-rx_zmqport-port>`_
|
||||
|
||||
* 30001 - Default Receiver ZMQ Port (stream out from)
|
||||
|
||||
**Client ZMQ Port** - Port that the client ZMQ socket listens to. Command: `zmqport <commandline.html#term-zmqport-port>`_
|
||||
|
||||
* 30001 - Default Client ZMQ Port (listens to)
|
||||
|
||||
**Client ZMQ IP** - IP address the client ZMQ socket listens to. Command: `zmqip <commandline.html#term-zmqip-x.x.x.x>`_. By default, this is set to the IP of ``rx_hostname``, but can be set to any IP address that the client can reach.
|
||||
|
||||
* Default: Receiver’s hostname (rx_hostname)
|
||||
|
||||
|
||||
.. note ::
|
||||
|
||||
``zmqport`` and ``zmqip`` need to be set up in shared memory before starting up the Gui. If the Gui is already running, change it in the Advanced Tab directly in the Gui.
|
||||
|
||||
``rx_zmqstream`` is set to 1 when the GUI is started, but has to be manually set back to 0 to disable zmq streaming in the receiver for better performance when not using the Gui.
|
||||
|
||||
The GUI hwm (high water mark, which is like a measurement of the number of enqueued zmq packets) values are set to a low number (from library default of possibly 1000 to 2) to reduce the zmq buffer to display only some of the images. Resetting it back to -1 or 1000 should only matter if one plans to not use the Gui and still zmq stream without wanting to drop zmq images (eg. for external processing chain).
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Receiver to External Processing
|
||||
--------------------------------
|
||||
|
||||
.. figure:: images/Receiver_external_process_commands.png
|
||||
:target: _images/Receiver_external_process_commands.png
|
||||
:align: center
|
||||
:alt: Click to zoom
|
||||
|
||||
Receiver External Process Commands
|
||||
|
||||
Images from the receiver can also be streamed to an external processing chain for further processing or storage. In this setup:
|
||||
|
||||
* The external processor listens to the ZMQ ports and IPs that the receiver streams from.
|
||||
|
||||
* The client ZMQ sockets now listen to the ports and IPs that the external processor streams from instead of the receiver.
|
||||
|
||||
**Receiver ZMQ Port** - Port from which the receiver streams ZMQ packets. Command: `rx_zmqport <commandline.html#term-rx_zmqport-port>`_
|
||||
|
||||
* 30001 - Default Receiver ZMQ Port (stream out from)
|
||||
|
||||
**Client ZMQ Port** - Port that the client ZMQ socket listens to. Command: `zmqport <commandline.html#term-zmqport-port>`_. In this set up, it should listen to the zmq port that the external process is streaming out from.
|
||||
|
||||
* 30001 - Default Client ZMQ Port (listens to)
|
||||
|
||||
**Client ZMQ IP** - IP address the client ZMQ socket listens to. Command: `zmqip <commandline.html#term-zmqip-x.x.x.x>`_. By default, this is set to the IP of ``rx_hostname``, but in this set up, it should listen to the zmq IP that the external process is streaming out from.
|
||||
|
||||
* Default: Receiver’s hostname (rx_hostname)
|
||||
@@ -1,330 +0,0 @@
|
||||
.. _data format:
|
||||
|
||||
Detector Image Size and Format
|
||||
================================
|
||||
|
||||
Each UDP port creates its own output file, which contains the data of the image transmitted over that port. More on number of files and naming for each file in the `File format <fileformat.html>`_ section.
|
||||
|
||||
Jungfrau
|
||||
-------------
|
||||
|
||||
Single Port Configuration
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
.. image:: images/Jungfrau_module.png
|
||||
:target: _images/Jungfrau_module.png
|
||||
:width: 650px
|
||||
:align: center
|
||||
:alt: Jungfrau Module Single Port Configuration
|
||||
|
||||
By default, only the outer 10GbE interface is enabled, transmitting the full image over a single UDP port. This results in one file per module containing the complete image.
|
||||
|
||||
Total image size = 524,288 bytes
|
||||
- 8 chips (2 x 4 grid)
|
||||
- 256 x 256 pixels (chip size)
|
||||
- 2 bytes (pixel width)
|
||||
|
||||
|
||||
|
||||
Double Port Configuration
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
.. image:: images/Jungfrau_two_port.png
|
||||
:target: _images/Jungfrau_two_port.png
|
||||
:width: 500px
|
||||
:align: center
|
||||
:alt: Jungfrau Module Two Port Configuration
|
||||
|
||||
If both interfaces are enabled using the `numinterfaces <commandline.html#term-numinterfaces-1-2>`_ command on compatible hardware and firmware, the image splits into top and bottom halves sent over two UDP ports:
|
||||
|
||||
- The top half transmits via the inner interface (`udp_dstport2 <commandline.html#term-udp_dstport2-n>`_ and `udp_dstip2 <commandline.html#term-udp_dstip2-x.x.x.x-or-auto>`_).
|
||||
|
||||
- The bottom half uses the outer interface(`udp_dstport <commandline.html#term-udp_dstport-n>`_ and `udp_dstip <commandline.html#term-udp_dstip-x.x.x.x-or-auto>`_).
|
||||
|
||||
The number of files per module equals the active UDP ports—two files per module when both interfaces are used.
|
||||
|
||||
Image size per UDP port or File = 262,144 bytes
|
||||
- **Complete Image size / 2**
|
||||
|
||||
|
||||
|
||||
Read Partial Rows
|
||||
^^^^^^^^^^^^^^^^^^
|
||||
|
||||
.. image:: images/Jungfrau_read_rows.png
|
||||
:target: _images/Jungfrau_read_rows.png
|
||||
:width: 550px
|
||||
:align: center
|
||||
:alt: Jungfrau Module Read Partial Rows Configuration
|
||||
|
||||
|
||||
The number of image rows per port can be adjusted using the `readnrows <commandline.html#term-readnrows>`_ command. By default, 512 rows are read, but a smaller value centers the readout vertically (e.g., 8 rows reads 4 above and 4 below the center). Increasing the value symmetrically expands the region toward the top and bottom. Permissible values are multiples of 8.
|
||||
|
||||
|
||||
Total image size = 32,768 bytes
|
||||
- 8 chips (2 x 4 grid)
|
||||
- **8** x 256 pixels (chip size: **8 rows**)
|
||||
- 2 bytes (pixel width)
|
||||
|
||||
Note: Still in prototype stage, writes complete image (padded or not depending on `rx_padding <commandline.html#term-rx_padding-0-1>`_ parameter) to file. Only the summary written to console in the receiver handles the `readnrows <commandline.html#term-readnrows>`_ to calculate to calculate complete images received. Only reduces network load, not file size. Use `rx_roi <commandline.html#term-rx_roi-xmin-xmax-ymin-ymax>`_ for file size.
|
||||
|
||||
Moench
|
||||
-------------
|
||||
|
||||
Single Port Configuration
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
.. image:: images/Moench_module.png
|
||||
:target: _images/Moench_module.png
|
||||
:width: 550px
|
||||
:align: center
|
||||
:alt: Moench Module Single Port Configuration
|
||||
|
||||
By default, only the outer 10GbE interface is enabled, transmitting the full image over a single UDP port. This results in one file per module containing the complete image.
|
||||
|
||||
Total image size = 320,000 bytes
|
||||
- 400 x 400 pixels (chip size)
|
||||
- 2 bytes (pixel width)
|
||||
|
||||
|
||||
|
||||
Double Port Configuration
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
.. image:: images/Moench_two_port.png
|
||||
:target: _images/Moench_two_port.png
|
||||
:width: 400px
|
||||
:align: center
|
||||
:alt: Moench Module Two Port Configuration
|
||||
|
||||
If both interfaces are enabled using the `numinterfaces <commandline.html#term-numinterfaces-1-2>`_ command on compatible hardware and firmware, the image splits into top and bottom halves sent over two UDP ports:
|
||||
|
||||
- The top half transmits via the inner interface (`udp_dstport2 <commandline.html#term-udp_dstport2-n>`_ and `udp_dstip2 <commandline.html#term-udp_dstip2-x.x.x.x-or-auto>`_).
|
||||
|
||||
- The bottom half uses the outer interface(`udp_dstport <commandline.html#term-udp_dstport-n>`_ and `udp_dstip <commandline.html#term-udp_dstip-x.x.x.x-or-auto>`_).
|
||||
|
||||
The number of files per module equals the active UDP ports—two files per module when both interfaces are used.
|
||||
|
||||
Image size per UDP port or File = 160,000 bytes
|
||||
- **Complete Image size / 2**
|
||||
|
||||
|
||||
|
||||
Read Partial Rows
|
||||
^^^^^^^^^^^^^^^^^^
|
||||
|
||||
.. image:: images/Moench_read_rows.png
|
||||
:target: _images/Moench_read_rows.png
|
||||
:width: 400px
|
||||
:align: center
|
||||
:alt: Moench Module Read Partial Rows Configuration
|
||||
|
||||
|
||||
The number of image rows per port can be adjusted using the `readnrows <commandline.html#term-readnrows>`_ command. By default, 400 rows are read, but a smaller value centers the readout vertically (e.g., 16 rows reads 8 above and 8 below the center). Increasing the value symmetrically expands the region toward the top and bottom. Permissible values are multiples of 16.
|
||||
|
||||
|
||||
Total image size = 12,800 bytes
|
||||
- **16** x 400 pixels (chip size: **16 rows**)
|
||||
- 2 bytes (pixel width)
|
||||
|
||||
Note: Still in prototype stage, writes complete image (padded or not depending on `rx_padding <commandline.html#term-rx_padding-0-1>`_ parameter) to file. Only the summary written to console in the receiver handles the read n rows to calculate complete images received. Only reduces network load, not file size. Use `rx_roi <commandline.html#term-rx_roi-xmin-xmax-ymin-ymax>`_ for file size.
|
||||
|
||||
Eiger
|
||||
-------------
|
||||
|
||||
Default Configuration
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
.. image:: images/Eiger_module.png
|
||||
:target: _images/Eiger_module.png
|
||||
:width: 350px
|
||||
:align: center
|
||||
:alt: Eiger Module Default Configuration
|
||||
|
||||
|
||||
Each Eiger module has two independent identical readout systems (other than firmware), each with its own control port and `hostname <commandline.html#term-hostname>`_ to be configured with. They are referred to as the 'top' and 'bottom' half modules. The bottom half module is flipped vertically.
|
||||
|
||||
Each half module has 2 parallel UDP ports for 2 chips each. The left UDP port is configured with `udp_dstport <commandline.html#term-udp_dstport-n>`_, while the right UDP port is configured with `udp_dstport2 <commandline.html#term-udp_dstport2-n>`_. This is vice versa for the bottom half module.
|
||||
|
||||
|
||||
Image size per UDP port or File = 262,144 bytes
|
||||
- 2 chips (1 x 2 grid)
|
||||
- 256 x 256 pixels (chip size)
|
||||
- 2 bytes (default pixel width)
|
||||
|
||||
|
||||
The myth, the legend, the bottom ports: Demystifying them
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
|
||||
.. figure:: images/Eiger_bottom_1.png
|
||||
:target: _images/Eiger_bottom_1.png
|
||||
:width: 350px
|
||||
:align: center
|
||||
:alt: Eiger Bottom as Firmware gets it
|
||||
|
||||
How the firmware gets the images
|
||||
|
||||
|
||||
.. figure:: images/Eiger_bottom_2.png
|
||||
:target: _images/Eiger_bottom_2.png
|
||||
:width: 350px
|
||||
:align: center
|
||||
:alt: Eiger Bottom after the firmware flips it horizontally
|
||||
|
||||
After the firmware flips it horizontally
|
||||
|
||||
|
||||
.. figure:: images/Eiger_bottom_3.png
|
||||
:target: _images/Eiger_bottom_3.png
|
||||
:width: 350px
|
||||
:align: center
|
||||
:alt: After the software swaps the udp ports
|
||||
|
||||
After the software swaps the udp ports
|
||||
|
||||
|
||||
.. figure:: images/Eiger_bottom_4.png
|
||||
:target: _images/Eiger_bottom_4.png
|
||||
:width: 400px
|
||||
:align: center
|
||||
:alt: After the gui has flipped the bottom vertically
|
||||
|
||||
After the gui has flipped the bottom vertically
|
||||
|
||||
|
||||
Note: The same process happens for the bottom 2 udp ports of the quad.
|
||||
|
||||
|
||||
Pixel width
|
||||
^^^^^^^^^^^^^
|
||||
|
||||
The pixel width can be configured to 4, 8, 16 (default) or 32 bits using the command `dr <commandline.html#term-dr-value>`_. This affects image size per UDP port or file.
|
||||
|
||||
Flip rows
|
||||
^^^^^^^^^^
|
||||
|
||||
One can use the command `fliprows <commandline.html#term-fliprows-0-1>`_ to flip the rows vertically for the bottom or top half module. It is sent out to the reciever, but does not flip rows in the output file itself, but rather streams out this info via the json header and thus instructs the GUI to display them correctly.
|
||||
|
||||
1GbE/ 10GbE Interfaces
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
Both UDP ports `udp_dstport <commandline.html#term-udp_dstport-n>`_ and `udp_dstport2 <commandline.html#term-udp_dstport2-n>`_ are used in Eiger as shows in the figure. Both of them can be set to use either the 1GbE or the 10GbE interface for data. The 1GbE interface is used also for control and configuration. For data, the 1GbE interface is enabled by default. It can be disabled by enabling the `tengiga <commandline.html#term-tengiga-0-1>`_ command and updating both the `udp_dstport <commandline.html#term-udp_dstport-n>`_ , `udp_dstport2 <commandline.html#term-udp_dstport2-n>`_ , `udp_dstip <commandline.html#term-udp_dstip-x.x.x.x-or-auto>`_ commands to match the 1GbE or 10GbE interface. This setting only affects packetsize and number of packets, but does not affect the total image size.
|
||||
|
||||
Reducing network load
|
||||
^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
**Activate**: By default, the `hostname <commandline.html#term-hostname>`_ command activates the respective half module it connects to, enabling all UDP ports. To deactivate an entire half module (i.e., both UDP ports), use the `activate <commandline.html#term-activate-0-1>`_ command. This disables both UDP ports for that half module, so no data is transmitted from it — only half of the module is read out. To specify which half module to activate or deactivate, use the module index (for Eiger, each half module has its own module index).
|
||||
|
||||
|
||||
**Datastream**: The `datastream <commandline.html#term-datastream-left-right-0-1>`_ command with arguments to specify which port can be used to disable the data streaming from one or both the two UDP ports in a half module. This allows for more flexible configurations, such as reading only two chips or one UDP port of a half module. To specify which half module to activate or deactivate, use the module index (for Eiger, each half module has its own module index).
|
||||
|
||||
Note: Only the activated ports will write data as it does not make sense to write an empty file.
|
||||
|
||||
**Read Partial Rows**: The number of image rows per port can be adjusted using the `readnrows <commandline.html#term-readnrows>`_ command. By default, 256 rows are read, but a smaller value centers the readout vertically (e.g., 8 rows reads 4 above and 4 below the center). Increasing the value symmetrically expands the region toward the top and bottom. Permissible values depend on dynamic range and 10GbE enable.
|
||||
|
||||
.. image:: images/Eiger_read_rows.png
|
||||
:target: _images/Eiger_read_rows.png
|
||||
:width: 400px
|
||||
:align: center
|
||||
:alt: Eiger Module Read Partial Rows Configuration
|
||||
|
||||
|
||||
|
||||
Total image size per UDP Port = 8,192 bytes
|
||||
- 2 chips (1 x 2 grid)
|
||||
- **8** x 256 pixels (chip size: **8 rows**)
|
||||
- 2 bytes (default pixel width)
|
||||
|
||||
Note: Still in prototype stage, writes complete image (padded or not depending on `rx_padding <commandline.html#term-rx_padding-0-1>`_ parameter) to file. Only the summary written to console in the receiver handles the `readnrows <commandline.html#term-readnrows>`_ to calculate complete images received. Only reduces network load, not file size. Use `rx_roi <commandline.html#term-rx_roi-xmin-xmax-ymin-ymax>`_ for file size.
|
||||
|
||||
Quad
|
||||
^^^^^^
|
||||
|
||||
The Eiger quad is a special hardware configuration that uses only the top half-module to create a quad layout. In this setup, the second half of the top module—normally associated with the right-side UDP port—is used to represent the inverted bottom half of the quad.
|
||||
|
||||
As with any standard half-module, it includes one control TCP port (with a hostname) and two UDP data ports (top and bottom). When the quad option is enabled, the firmware automatically flips the second UDP port vertically.
|
||||
|
||||
In this configuration, the fliprows command cannot be used to flip the entire half-module. Instead, the receiver automatically includes row-flipping information only for the second UDP port in the JSON header, so the GUI can apply the correct orientation during display
|
||||
|
||||
.. image:: images/Eiger_quad.png
|
||||
:target: _images/Eiger_quad.png
|
||||
:width: 300px
|
||||
:align: center
|
||||
:alt: Eiger Quad Configuration
|
||||
|
||||
Image size per UDP port = same as a normal Eiger UDP port
|
||||
|
||||
Mythen3
|
||||
-------------
|
||||
|
||||
|
||||
|
||||
Default Configuration
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
.. image:: images/Mythen3_module.png
|
||||
:target: _images/Mythen3_module.png
|
||||
:align: center
|
||||
:alt: Mythen3 Module Default Configuration
|
||||
|
||||
Each Mythen3 module is a 1D detector with 10 chips, each with 128 channels. Each channel has 3 counters that are enabled by default.
|
||||
|
||||
Image size = 15,360 bytes
|
||||
- 10 chips (1 x 10 grid)
|
||||
- 128 channels
|
||||
- 3 counters
|
||||
- 4 bytes (default pixel width)
|
||||
|
||||
Counters
|
||||
^^^^^^^^^^^
|
||||
|
||||
If all 3 counters are enabeld, the frame size for each channel is multiplied by 3. The counters are stored consecutively per channel. One can disable one or more of the counters using the `counters <commandline.html#term-counters-i0-i1-i2-...>`_ command. The frame size will then be reduced accordingly.
|
||||
|
||||
Image size = 10,240 bytes
|
||||
- 10 chips (1 x 10 grid)
|
||||
- 128 channels
|
||||
- 2 counters (0, 1 enabled)
|
||||
- 4 bytes (default pixel width)
|
||||
|
||||
Pixel width
|
||||
^^^^^^^^^^^^^
|
||||
|
||||
The pixel width can be configured to 8, 16 or 32 (default) bits using the command `dr <commandline.html#term-dr-value>`_. 32 bits is actually 24 bits in the chip. This setting does affect image size.
|
||||
|
||||
1GbE/ 10GbE Interfaces
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
|
||||
The UDP port can be set to use either the 1GbE or the 10GbE interface for data. The 1GbE interface is used also for control and configuration. For data, the 10GbE interface is enabled by default. It can be disabled by using the `tengiga <commandline.html#term-tengiga-0-1>`_ command and updating the `udp_dstport <commandline.html#term-udp_dstport-n>`_ and `udp_dstip <commandline.html#term-udp_dstip-x.x.x.x-or-auto>`_ commands to match the 1GbE or 10GbE interface. This setting only affects packetsize and number of packets, but does not affect the total image size.
|
||||
|
||||
|
||||
Gotthard2
|
||||
-------------
|
||||
|
||||
|
||||
Default Configuration
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
.. image:: images/Gotthard2_module.png
|
||||
:target: _images/Gotthard2_module.png
|
||||
:align: center
|
||||
:alt: Gotthard2 Module Default Configuration
|
||||
|
||||
Each Gotthard2 module is a 1D detector with 10 chips, each with 128 channels.
|
||||
|
||||
Image size = 2,560 bytes
|
||||
- 10 chips (1 x 10 grid)
|
||||
- 128 channels
|
||||
- 2 bytes (pixel width)
|
||||
|
||||
Veto Info
|
||||
^^^^^^^^^^^
|
||||
|
||||
One can enable veto data in the chip of the Gotthard2 module using the `veto <commandline.html#term-veto-0-1>`_ command. By default, this is disabled. This does not affect the image size as veto information is not sent out through the same 10GbE interface.
|
||||
|
||||
One can either stream out the veto info through the low latency link (2.5 gbps) or for debugging purposes through another 10GbE interface.
|
||||
|
||||
For debugging purposes, the veto info can be enabled using the `numinterfaces <commandline.html#term-numinterfaces-1-2>`_ command and the following parameters are updated: `udp_dstport2 <commandline.html#term-udp_dstport2-n>`_ and `udp_dstip2 <commandline.html#term-udp_dstip2-x.x.x.x-or-auto>`_. The veto data from this port is of course written to a separate file and is not combined in the virtual HDF5 file mapping (complete image mapped).
|
||||
|
||||
|
||||
@@ -14,12 +14,7 @@ the shared libraries these are needed:
|
||||
|
||||
* Linux, preferably recent kernel (currently no cross platform support)
|
||||
* CMake >= 3.14
|
||||
* C++17 compatible compiler. (We test with gcc and clang)
|
||||
|
||||
.. note ::
|
||||
|
||||
For v9.x.x of slsDetectorPackage and older, C++11 compatible compiler.
|
||||
|
||||
* C++11 compatible compiler. (We test with gcc and clang)
|
||||
|
||||
-----------------------
|
||||
Python bindings
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
.. _file format:
|
||||
|
||||
File format
|
||||
================================
|
||||
|
||||
@@ -62,14 +60,3 @@ There are 2 file formats supported by the receiver:
|
||||
|
||||
The default is binary. HDF5 can be enabled by compiling the package with HDF5 option enabled. The file format is set using the command `fformat <commandline.html#term-fformat-binary-hdf5>`_.
|
||||
|
||||
|
||||
Content
|
||||
--------
|
||||
|
||||
| `Master File`: Contains the metadata of the acquisition. The content is described in :ref:`master file attributes <master file attributes>`.
|
||||
|
||||
|
||||
| `Data File`: Contains the metadata for each image (:ref:`slsReceiverHeader<sls receiver header format>`) and the `data of the image` transmitted over that port. The image data is described in :ref:`Detector Image Size and Format <data format>` section.
|
||||
|
||||
|
||||
| More content and examples are found in the :ref:`HDF5 file format <hdf5 file format>` and :ref:`Binary file format <binary file format>` sections.
|
||||
@@ -1,5 +1,3 @@
|
||||
.. _firmware upgrade:
|
||||
|
||||
Firmware Upgrade
|
||||
=================
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
.. _hdf5 file format:
|
||||
|
||||
|
||||
HDF5 File Format
|
||||
================================
|
||||
@@ -76,8 +76,6 @@ Data File
|
||||
|
||||
* File Name: [fpath]/[fname]_dx_fy_[findex].h5 :ref:`Details here<file name format>`
|
||||
|
||||
* More details on :ref:`slsReceiverHeader<sls receiver header format>` and the actual image data is described in the :ref:`Detector Image Size and Format <data format>` section.
|
||||
|
||||
|
||||
Virtual Data File
|
||||
------------------
|
||||
|
||||
|
Before Width: | Height: | Size: 111 KiB |
|
Before Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 43 KiB |
|
Before Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 118 KiB |
|
Before Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 96 KiB |
|
Before Width: | Height: | Size: 47 KiB |
|
Before Width: | Height: | Size: 42 KiB |
|
Before Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 73 KiB |
|
Before Width: | Height: | Size: 88 KiB |
|
Before Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 43 KiB |
|
Before Width: | Height: | Size: 66 KiB |
|
Before Width: | Height: | Size: 113 KiB |
|
Before Width: | Height: | Size: 95 KiB |
|
Before Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 71 KiB |
@@ -18,17 +18,6 @@ Welcome to slsDetectorPackage's documentation!
|
||||
installation
|
||||
dependencies
|
||||
consuming
|
||||
|
||||
|
||||
.. toctree::
|
||||
:caption: how to
|
||||
:maxdepth: 2
|
||||
|
||||
softwarearchitecture
|
||||
configcommands
|
||||
quick_start_guide
|
||||
dataformat
|
||||
multidet
|
||||
|
||||
.. toctree::
|
||||
:caption: C++ API
|
||||
@@ -39,9 +28,6 @@ Welcome to slsDetectorPackage's documentation!
|
||||
receiver_api
|
||||
examples
|
||||
|
||||
|
||||
|
||||
|
||||
.. toctree::
|
||||
:caption: Python API
|
||||
:maxdepth: 2
|
||||
@@ -58,7 +44,7 @@ Welcome to slsDetectorPackage's documentation!
|
||||
:maxdepth: 1
|
||||
|
||||
commandline
|
||||
|
||||
quick_start_guide
|
||||
|
||||
.. toctree::
|
||||
:caption: Developer
|
||||
@@ -105,7 +91,6 @@ Welcome to slsDetectorPackage's documentation!
|
||||
|
||||
fileformat
|
||||
slsreceiverheaderformat
|
||||
dataformat
|
||||
masterfileattributes
|
||||
binaryfileformat
|
||||
hdf5fileformat
|
||||
|
||||
@@ -123,45 +123,22 @@ One can either build using cmake or use the in-built cmk.sh script.
|
||||
3.2.1. Build using CMake
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
# outside slsDetecorPackage folder
|
||||
mkdir build && cd build
|
||||
|
||||
# configure & generate Makefiles using cmake by listing all your options
|
||||
# (alternately use ccmake described below)
|
||||
# cmake3 instead of cmake for some systems
|
||||
|
||||
# eg. enable gui option (without conda)
|
||||
cmake ../slsDetectorPacakge -DSLS_USE_GUI=ON
|
||||
# eg. enable python from virtual env, hdf5 and simulator options
|
||||
cmake ../slsDetectorPackage -DSLS_USE_PYTHON=ON -DPython_FIND_VIRTUALENV=ONLY -DSLS_USE_HDF5=ON -DSLS_USE_SIMULATOR=ON
|
||||
# configure & generate Makefiles using cmake
|
||||
# by listing all your options (alternately use ccmake described below)
|
||||
# cmake3 for some systems
|
||||
cmake ../slsDetectorPackage -DCMAKE_INSTALL_PREFIX=/your/install/path
|
||||
|
||||
# compiled to the build/bin directory
|
||||
make -j12 #or whatever number of cores you are using to build
|
||||
|
||||
|
||||
To install in a clean custom directory and to use the slsDetectorPackage
|
||||
libraries and headers in your project, specify the install directory
|
||||
(eg. /your/install/path).
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
# outside slsDetecorPackage folder
|
||||
mkdir build && cd build
|
||||
# configure & generate Makefiles
|
||||
cmake ../slsDetectorPackage -DCMAKE_INSTALL_PREFIX=/your/install/path
|
||||
# compile
|
||||
make -j12
|
||||
# install headers and libs in /your/install/path directory
|
||||
make install
|
||||
|
||||
.. note ::
|
||||
|
||||
Please refer to `api examples <https://github.com/slsdetectorgroup/api-examples>`__
|
||||
on how to compile your project using the installed headers and libs.
|
||||
|
||||
|
||||
Instead of the cmake command, one can use ccmake to get a list of options to configure and generate Makefiles at ease.
|
||||
|
||||
@@ -243,7 +220,7 @@ Example cmake options Comment
|
||||
3.3. Build on old distributions using conda
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
If your linux distribution doesn't come with a C++17 compiler (gcc>8) then
|
||||
If your linux distribution doesn't come with a C++11 compiler (gcc>4.8) then
|
||||
it's possible to install a newer gcc using conda and build the slsDetectorPackage
|
||||
using this compiler
|
||||
|
||||
|
||||
@@ -1,230 +0,0 @@
|
||||
.. _using multiple detectors:
|
||||
|
||||
Using multiple detectors
|
||||
==========================
|
||||
|
||||
The slsDetectorPackage supports using several detectors on the same computer.
|
||||
This can either be two users, that need to use the same computer without interfering
|
||||
with each other, or the same user that wants to use multiple detectors at the same time.
|
||||
The detectors in turn can consist of multiple modules. For example, a 9M Jungfrau detector
|
||||
consists of 18 modules which typically are addressed at once as a single detector.
|
||||
|
||||
.. note ::
|
||||
|
||||
To address a single module of a multi-module detector you can use the module index.
|
||||
|
||||
- Command line: :ref:`cl-module-index-label`
|
||||
- Python: :ref:`py-module-index-label`
|
||||
|
||||
|
||||
Coming back to multiple detectors we have two tools to our disposal:
|
||||
|
||||
#. Detector index
|
||||
#. The SLSDETNAME environment variable
|
||||
|
||||
They can be used together or separately depending on the use case.
|
||||
|
||||
Detector index
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
When configuring a detector you can specify a detector index. The default is 0.
|
||||
|
||||
**Command line**
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
# Given that we have two detectors (my-det and my-det2) that we want to use,
|
||||
# we can configure them with different indices.
|
||||
|
||||
# Configure the first detector with index 0
|
||||
$ sls_detector_put hostname my-det
|
||||
|
||||
# Set number of frames for detector 0 to 10
|
||||
$ sls_detector_put frames 10
|
||||
|
||||
|
||||
#
|
||||
#Configure the second detector with index 1 (notice the 1- before hostname)
|
||||
$ sls_detector_put 1-hostname my-det2
|
||||
|
||||
|
||||
# Further configuration
|
||||
...
|
||||
|
||||
# Set number of frames for detector 1 to 19
|
||||
$ sls_detector_put 1-frames 19
|
||||
|
||||
# Note that if we call sls_detector_get without specifying the index,
|
||||
# it will return the configuration of detector 0
|
||||
$ sls_detector_get frames
|
||||
10
|
||||
|
||||
The detector index is added to the name of the shared memory segment, so in this case
|
||||
the shared memory segments would be:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
|
||||
#First detector
|
||||
/dev/shm/slsDetectorPackage_detector_0
|
||||
/dev/shm/slsDetectorPackage_detector_0_module_0
|
||||
|
||||
#Second detector
|
||||
/dev/shm/slsDetectorPackage_detector_1
|
||||
/dev/shm/slsDetectorPackage_detector_1_module_0
|
||||
|
||||
|
||||
**Python**
|
||||
|
||||
The main difference between the command line and the Python API is that you set the index
|
||||
when you create the detector object and you don't have to repeat it for every call.
|
||||
|
||||
The C++ API works int the same way.
|
||||
|
||||
.. code-block:: python
|
||||
|
||||
from slsdet import Detector
|
||||
|
||||
|
||||
# The same can be achieved in Python by creating a detector object with an index.
|
||||
# Again we have two detectors (my-det and my-det2) that we want to use:
|
||||
|
||||
# Configure detector with index 0
|
||||
d = Detector()
|
||||
|
||||
# If the detector has already been configured and has a shared memory
|
||||
# segment, you can omit setting the hostname again
|
||||
d.hostname = 'my-det'
|
||||
|
||||
#Further configuration
|
||||
...
|
||||
|
||||
# Configure a second detector with index 1
|
||||
d2 = Detector(1)
|
||||
d2.hostname = 'my-det2'
|
||||
|
||||
d.frames = 10
|
||||
d2.frames = 19
|
||||
|
||||
|
||||
$SLSDETNAME
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
To avoid interfering with other users on shared PCs it is best to always set the SLSDETNAME environmental variable.
|
||||
Imagining a fictive user: Anna, we can set SLSDETNAME from the shell before configuring the detector:
|
||||
|
||||
**Command line**
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
# Set the SLSDETNAME variable
|
||||
$ export SLSDETNAME=Anna
|
||||
|
||||
# You can check that it is set
|
||||
$ echo $SLSDETNAME
|
||||
Anna
|
||||
|
||||
# Now configures a detector with index 0 and prefixed with the name Anna
|
||||
# /dev/shm/slsDetectorPackage_detector_0_Anna
|
||||
$ sls_detector_put hostname my-det
|
||||
|
||||
|
||||
.. tip ::
|
||||
|
||||
Set SLSDETNAME in your .bashrc in order to not forget it when opening a new terminal.
|
||||
|
||||
|
||||
**Python**
|
||||
|
||||
With python the best way is to set the SLSDETNAME from the command line before starting the python interpreter.
|
||||
|
||||
Bash:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
$ export SLSDETNAME=Anna
|
||||
|
||||
Python:
|
||||
|
||||
.. code-block:: python
|
||||
|
||||
from slsdet import Detector
|
||||
|
||||
# Now configures a detector with index 0 and prefixed with the name Anna
|
||||
# /dev/shm/slsDetectorPackage_detector_0_Anna
|
||||
d = Detector()
|
||||
d.hostname = 'my-det'
|
||||
|
||||
You can also set SLSDETNAME from within the Python interpreter, but you have to be aware that it will only
|
||||
affect the current process and not the whole shell session.
|
||||
|
||||
.. code-block:: python
|
||||
|
||||
import os
|
||||
os.environ['SLSDETNAME'] = 'Anna'
|
||||
|
||||
# You can check that it is set
|
||||
print(os.environ['SLSDETNAME']) # Output: Anna
|
||||
|
||||
#Now SLSDETNAME is set to Anna but as soon as you exit the python interpreter
|
||||
# it will not be set anymore
|
||||
|
||||
.. note ::
|
||||
|
||||
Python has two ways of reading environment variables: `**os.environ**` as shown above which throws a
|
||||
KeyError if the variable is not set and `os.getenv('SLSDETNAME')` which returns None if the variable is not set.
|
||||
|
||||
For more details see the official python documentation on: https://docs.python.org/3/library/os.html#os.environ
|
||||
|
||||
|
||||
Checking for other detectors
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
If using shared accounts on a shared computer (which you anyway should not do), it is good practice to check
|
||||
if there are other detectors configured by other users before configuring your own detector.
|
||||
|
||||
You can do this by listing the files in the shared memory directory `/dev/shm/` that start with `sls`. In this
|
||||
example we can see that two single module detectors are configured one with index 0 and one with index 1.
|
||||
SLSDETNAME is set to `Anna` so it makes sense to assume that she is the user that configured these detectors.
|
||||
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
# List the files in /dev/shm that starts with sls
|
||||
$ ls /dev/shm/sls*
|
||||
/dev/shm/slsDetectorPackage_detector_0_Anna
|
||||
/dev/shm/slsDetectorPackage_detector_0_module_0_Anna
|
||||
/dev/shm/slsDetectorPackage_detector_1_Anna
|
||||
/dev/shm/slsDetectorPackage_detector_1_module_0_Anna
|
||||
|
||||
We also provide a command: user, which gets information about the shared memory segment that
|
||||
the client points to without doing any changes.
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
#in this case 3 simulated Mythen3 modules
|
||||
$ sls_detector_get user
|
||||
user
|
||||
Hostname: localhost+localhost+localhost+
|
||||
Type: Mythen3
|
||||
PID: 1226078
|
||||
User: l_msdetect
|
||||
Date: Mon Jun 2 05:46:20 PM CEST 2025
|
||||
|
||||
|
||||
Other considerations
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
The shared memory is not the only way to interfere with other users. You also need to make sure that you are not
|
||||
using the same:
|
||||
|
||||
* rx_tcpport
|
||||
* Unique combination of udp_dstip and udp_dstport
|
||||
* rx_zmqport
|
||||
* zmqport
|
||||
|
||||
.. attention ::
|
||||
|
||||
The computer that you are using need to have enough resources to run multiple detectors at the same time.
|
||||
This includes CPU and network bandwidth. Please coordinate with the other users!
|
||||
|
||||
@@ -123,47 +123,6 @@ in a large detector.
|
||||
# Set exposure time for module 1, 5 and 7
|
||||
d.setExptime(0.1, [1,5,7])
|
||||
|
||||
|
||||
|
||||
.. _py-module-index-label:
|
||||
|
||||
----------------------------------
|
||||
Accessing individual modules
|
||||
----------------------------------
|
||||
|
||||
Using the C++ like API you can access individual modules in a large detector
|
||||
by passing in the module index as an argument to the function.
|
||||
|
||||
::
|
||||
|
||||
# Read the UDP destination port for all modules
|
||||
>>> d.getDestinationUDPPort()
|
||||
[50001, 50002, 50003]
|
||||
|
||||
|
||||
# Read it for module 0 and 1
|
||||
>>> d.getDestinationUDPPort([0, 1])
|
||||
[50001, 50002]
|
||||
|
||||
>>> d.setDestinationUDPPort(50010, 1)
|
||||
>>> d.getDestinationUDPPort()
|
||||
[50001, 50010, 50003]
|
||||
|
||||
From the more pythonic API there is no way to read from only one module but you can read
|
||||
and then use list slicing to get the values for the modules you are interested in.
|
||||
|
||||
::
|
||||
|
||||
>>> d.udp_dstport
|
||||
[50001, 50010, 50003]
|
||||
>>> d.udp_dstport[0]
|
||||
50001
|
||||
|
||||
#For some but not all properties you can also pass in a dictionary with module index as key
|
||||
>>> ip = IpAddr('127.0.0.1')
|
||||
>>> d.udp_dstip = {1:ip}
|
||||
|
||||
|
||||
--------------------
|
||||
Finding functions
|
||||
--------------------
|
||||
|
||||
@@ -19,14 +19,14 @@ For a Single Module
|
||||
slsReceiver
|
||||
|
||||
# custom port 2012
|
||||
slsReceiver -p 2012
|
||||
slsReceiver -t2012
|
||||
|
||||
|
||||
For Multiple Modules
|
||||
.. code-block:: bash
|
||||
|
||||
# slsMultiReceiver [-p: starting port, -n: number of receivers]
|
||||
slsMultiReceiver -p 2012 -n 2
|
||||
# slsMultiReceiver [starting port] [number of receivers] [print each frame header for debugging]
|
||||
slsMultiReceiver 2012 2 0
|
||||
|
||||
|
||||
Client
|
||||
@@ -131,27 +131,6 @@ For Multiple Modules
|
||||
.. note ::
|
||||
The **hostname** and **detsize** command in a multi module system can affect the row and column values in the udp/zmq header. The modules are stacked row by row until they reach the y-axis limit set by detsize (if specified). Then, stacking continues in the next column and so on.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Data
|
||||
-----
|
||||
|
||||
Check out the :ref:`UDP header section<detector udp header>` for details on output UDP header data format.`
|
||||
|
||||
Check out the :ref:`Detector image size and format section<data format>` for details on output data format.
|
||||
|
||||
|
||||
Receiver
|
||||
---------
|
||||
|
||||
When using `slsReceiver`, `slsMultiReceiver` or `slsFrameSynchronizer`, check out the following sections:
|
||||
|
||||
- :ref:`File format<file format>`
|
||||
- :ref:`slsReceiver header format<sls receiver header format>`
|
||||
- :ref:`Master file attributes<master file attributes>`
|
||||
|
||||
|
||||
Gui
|
||||
----
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
.. _detector_servers:
|
||||
|
||||
Getting Started
|
||||
===============
|
||||
|
||||
|
||||
@@ -38,41 +38,18 @@ There are three main receiver types. How to start them is described :ref:`below<
|
||||
+----------------------+--------------------+-----------------------------------------+--------------------------------+
|
||||
|
||||
|
||||
|
||||
|
||||
.. _Starting up the Receiver:
|
||||
|
||||
Starting up the Receiver
|
||||
-------------------------
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
Usage: slsReceiver Options:
|
||||
-v, --version : Version.
|
||||
-p, --port : TCP port to communicate with client for configuration. Non-zero and 16 bit.
|
||||
-u, --uid : Set effective user id if receiver started with privileges.
|
||||
|
||||
Usage: slsMultiReceiver Options:
|
||||
-v, --version : Version.
|
||||
-n, --num-receivers : Number of receivers.
|
||||
-p, --port : TCP port to communicate with client for configuration. Non-zero and 16 bit.
|
||||
-c, --callback : Enable dummy callbacks for debugging. Disabled by default.
|
||||
-u, --uid : Set effective user id if receiver started with privileges.
|
||||
|
||||
Usage: slsFrameSynchronizer Options:
|
||||
-v, --version : Version.
|
||||
-n, --num-receivers : Number of receivers.
|
||||
-p, --port : TCP port to communicate with client for configuration. Non-zero and 16 bit.
|
||||
-c, --print-headers : Print callback headers for debugging. Disabled by default.
|
||||
-u, --uid : Set effective user id if receiver started with privileges.
|
||||
|
||||
|
||||
|
||||
|
||||
For a Single Module
|
||||
.. code-block:: bash
|
||||
|
||||
slsReceiver # default port 1954
|
||||
|
||||
slsReceiver -p 2012 # custom port 2012
|
||||
slsReceiver -t2012 # custom port 2012
|
||||
|
||||
|
||||
For Multiple Modules
|
||||
@@ -82,13 +59,13 @@ For Multiple Modules
|
||||
|
||||
# option 1 (one for each module)
|
||||
slsReceiver
|
||||
slsReceiver -p 1955
|
||||
slsReceiver -t1955
|
||||
|
||||
# option 2
|
||||
slsMultiReceiver -p 2012 -n 2
|
||||
slsMultiReceiver 2012 2
|
||||
|
||||
# option 3
|
||||
slsFrameSynchronizer -p 2012 -n 2
|
||||
slsFrameSynchronizer 2012 2
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,147 +0,0 @@
|
||||
.. _software architecture:
|
||||
|
||||
Software Architecture
|
||||
================================
|
||||
|
||||
|
||||
Introduction
|
||||
------------------------------------
|
||||
|
||||
.. figure:: images/System_communication_architecture.png
|
||||
:target: _images/System_communication_architecture.png
|
||||
:width: 700px
|
||||
:align: center
|
||||
:alt: System communication architecture
|
||||
|
||||
Software Communication Architecture
|
||||
|
||||
|
||||
**Detector**
|
||||
|
||||
A detector can consist of a single module or multiple modules combined.
|
||||
|
||||
**Module**
|
||||
|
||||
Each module sends its data via UDP over distinct ports. Since UDP does not provide acknowledgements, data is transmitted as fast as possible, which can lead to packet loss if the network is not properly configured, among other causes. A single image streamed out could be split into multiple UDP packets and each module can have one or two UDP ports to transmit in parallel different physical sections of the image.
|
||||
|
||||
**Receiver**
|
||||
|
||||
UDP data is received by one or more receivers—either built-in or custom. In the diagram above, there is one built-in receiver per module (1:1). For example, a detector with two modules (two hostnames) will have two built-in receivers. Each receiver could listen to one or two UDP ports (depending on the module it listens to). For each UDP port, the receiver reassembles these packets into sub-images and optionally saved to file.
|
||||
|
||||
**ZMQ**
|
||||
|
||||
Each UDP port in the receiver can also stream out independently sub-images via ZMQ (core: TCP/IP).
|
||||
|
||||
* Directly to the GUI for display.
|
||||
* To an external processing chain for post-processing and optional storage, which can in turn stream the processed data back to the GUI.
|
||||
|
||||
**Client**
|
||||
|
||||
A single client can configure and control individual modules and receivers, or multiple of them in parallel. This communication is handled over TCP/IP, ensuring acknowledgements.
|
||||
|
||||
It can also listen to multiple ZMQ sockets from the Receiver(s) or the external processing chain to assemble the full image for GUI display or Client call backs.
|
||||
|
||||
Next, each component is examined in detail.
|
||||
|
||||
Module
|
||||
-------
|
||||
|
||||
.. figure:: images/Module_architecture.png
|
||||
:target: _images/Module_architecture.png
|
||||
:width: 700px
|
||||
:align: center
|
||||
:alt: Module architecture
|
||||
|
||||
Module Architecture
|
||||
|
||||
|
||||
**Detector Server**
|
||||
|
||||
The module contains an onboard CPU (type depends on the detector — e.g., Nios for Mythen3, Blackfin for Jungfrau). The detector server and detector configuration files are stored here, with the server compiled in C using the CPU-specific compiler. Running the binary starts a Control Server and a Stop Server. Client control/configuration requests go to the Control Server via the TCP control port, while stop/status requests go to the Stop Server via the TCP stop port as the Control Server may be busy with an acquisition. For more details see :ref:`detector server <detector_servers>` and :ref:`detector simulators<Virtual Detector Servers>` to play around with.
|
||||
|
||||
**Firmware**
|
||||
|
||||
The module also includes an FPGA with VHDL firmware (file format depends on the detector — e.g., Mythen3 uses .rbf, Jungfrau uses .pof). Client requests trigger register read/write operations in the FPGA, which manages chip readout and processing. Data from the chips is sent through a UDP generator in the FPGA and output as UDP packets via the UDP port. A single image may be split across multiple packets. A module could have 1 or 2 UDP ports to transmit in parallel different physical sections of the image.
|
||||
|
||||
Upgrade
|
||||
^^^^^^^^
|
||||
|
||||
.. figure:: images/Soft_upgrade_components.png
|
||||
:target: _images/Soft_upgrade_components.png
|
||||
:width: 700px
|
||||
:align: center
|
||||
:alt: Software Upgrade Components
|
||||
|
||||
Software Upgrade Components
|
||||
|
||||
There are mainly three components to the soft upgrade:
|
||||
|
||||
* Detector Server upgrade: The server running on the module.
|
||||
* Firmware upgrade: The VHDL code running on the FPGA.
|
||||
* slsDetectorPackage upgrade: The client code running on the host PC to control the module(s) and receiver(s) if any.
|
||||
|
||||
Please use the `update command <commandline.html#term-update>`_ when updating both the server and firmware simulataneously and `programfpga command <commandline.html#term-programfpga-fname.pof-fname.rbf-full-path-opitonal-force-delete-normal-file>`_ when only updating the firmware. See :ref:`firmware upgrade <firmware upgrade>` for details.
|
||||
|
||||
When only updating the detector server, use the `updatedetectorserver command <commandline.html#term-updatedetectorserver-server_name-with-full-path>`_ command. See :ref:`detector server upgrade <Detector Server Upgrade>` for details.
|
||||
|
||||
.. note::
|
||||
|
||||
**Compatibility**
|
||||
|
||||
When updating anything on the module via the client (server or firmware), the server and client will have to be compatible (same major version). If not, the client and server will not communicate properly.
|
||||
|
||||
Since they are ideally compatible before the upgrade, upgrade the server and firmware first, then the slsDetectorPackage.
|
||||
|
||||
|
||||
|
||||
Receiver
|
||||
--------
|
||||
|
||||
.. figure:: images/Receiver_architecture.png
|
||||
:target: _images/Receiver_architecture.png
|
||||
:align: center
|
||||
:alt: Receiver Architecture
|
||||
|
||||
Receiver Architecture
|
||||
|
||||
The receiver mainly consists of:
|
||||
|
||||
* A TCP server that listens to client TCP requests for configuration and control.
|
||||
* One or 2 listeners that listen to a UDP port each, reassembling the UDP packets into sub-images in memory.
|
||||
* One or 2 data processors that processes the sub-images with optional callbacks for online processing and file writing.
|
||||
* One or 2 data streamers that stream the processed sub-images to the GUI or external processing chain via ZMQ.
|
||||
|
||||
Few characteristics of the receiver:
|
||||
|
||||
* It can be run on the same host as the client or on a different host.
|
||||
* There is a receiver process for every module and a file for every UDP port.
|
||||
* Each receiver process is independent and asynchronized for performance. So are the UDP ports.
|
||||
|
||||
|
||||
Client
|
||||
--------
|
||||
|
||||
.. figure:: images/Client_architecture.png
|
||||
:target: _images/Client_architecture.png
|
||||
:align: center
|
||||
:alt: Client Architecture
|
||||
|
||||
Client Architecture
|
||||
|
||||
Users can control the detector and receivers through four interfaces:
|
||||
|
||||
* their C++ API,
|
||||
* their Python API,
|
||||
* the command-line interface, or
|
||||
* the Qt-based GUI.
|
||||
|
||||
Regardless of the interface, each ultimately invokes our Detector class—either directly (CLI and GUI) or through our C++/Python libraries (when using their APIs). The Detector class then calls the appropriate module functions, either for a specific module or in parallel for all modules. Each module object sends requests over TCP to its corresponding module and, if needed, to the receiver.
|
||||
|
||||
**Shared Memory**
|
||||
|
||||
As the command-line interface is supported, shared memory is used to store essential information such as the module hostname and TCP port, or the receiver hostname and TCP port. This ensures the system knows which components to communicate with, without requiring the user to re-enter this information for every command-line call.
|
||||
|
||||
.. note::
|
||||
|
||||
Only the client maintains shared memory. Care must be taken when multiple users operate from the same PC. See :ref:`multi detector and user section <using multiple detectors>` for more details.
|
||||
|
||||
@@ -202,56 +202,6 @@ Receiver PC Tuning Options
|
||||
ethtool -K xth1 gro
|
||||
|
||||
|
||||
* **permanent ethtool settings**
|
||||
|
||||
There are two main methods.
|
||||
|
||||
1. ``systemd service`` (recommended for Fedora and modern RHEL)
|
||||
|
||||
This is the preferred method on systems using systemd and NetworkManager, such as Fedora and RHEL 8+.
|
||||
|
||||
Create a systemd service template:
|
||||
.. code-block:: ini
|
||||
|
||||
# /etc/systemd/system/ethtool@.service
|
||||
|
||||
[Unit]
|
||||
Description=Set RX buffer size with ethtool
|
||||
After=network-online.target
|
||||
Wants=network-online.target
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/sbin/ethtool -G %i rx 8192
|
||||
Type=oneshot
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
||||
|
||||
Enable the service for a specific interface:
|
||||
.. code-block:: bash
|
||||
|
||||
sudo systemctl enable ethtool@xth1.service
|
||||
|
||||
This ensures the setting is applied at every boot once the network is online.
|
||||
|
||||
|
||||
2. ``ETHTOOL_OPTS in ifcfg scripts`` (legacy method for RHEL 7 and earlier)
|
||||
|
||||
This method applies only to systems using the legacy network-scripts backend, typically RHEL 7 and earlier.
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
# edit the corresponding ``ifcfg-*`` file
|
||||
# file: /etc/sysconfig/network-scripts/ifcfg-eth0
|
||||
|
||||
# add or modify the following line:
|
||||
ETHTOOL_OPTS="-K ${DEVICE} gro on; -G ${DEVICE} rx 4096; -L ${DEVICE} combined 4; -C ${DEVICE} rx-usecs 100; -C ${DEVICE} adaptive-rx on"
|
||||
|
||||
# restart the interface
|
||||
ifdown eth0 && ifup eth0
|
||||
|
||||
|
||||
#. Disable power saving in CPU frequency scaling and set system to performance
|
||||
* Check current policy (default might be powersave or schedutil)
|
||||
.. code-block:: bash
|
||||
|
||||
@@ -99,7 +99,6 @@ Detector Enum
|
||||
MYTHEN3 6
|
||||
GOTTHARD2 7
|
||||
================ ========
|
||||
|
||||
* deprecated since v10.0.0
|
||||
|
||||
|
||||
|
||||
@@ -13,17 +13,13 @@ import subprocess
|
||||
import argparse
|
||||
import sys
|
||||
import time
|
||||
import ctypes.util, re # to check libclang version
|
||||
from pathlib import Path
|
||||
from parse import system_include_paths, clang_format_version
|
||||
|
||||
REDC = "\033[91m"
|
||||
GREENC = "\033[92m"
|
||||
YELLOWC = "\033[93m"
|
||||
ENDC = "\033[0m"
|
||||
|
||||
def yellow(msg):
|
||||
return f"{YELLOWC}{msg}{ENDC}"
|
||||
|
||||
def red(msg):
|
||||
return f"{REDC}{msg}{ENDC}"
|
||||
@@ -33,25 +29,6 @@ def green(msg):
|
||||
return f"{GREENC}{msg}{ENDC}"
|
||||
|
||||
|
||||
def check_libclang_version(required="12"):
|
||||
# Use already-loaded libclang, or let cindex resolve it
|
||||
lib = ctypes.CDLL(cindex.Config.library_file or ctypes.util.find_library("clang"))
|
||||
|
||||
# Get version string
|
||||
lib.clang_getClangVersion.restype = ctypes.c_void_p
|
||||
version_ptr = lib.clang_getClangVersion()
|
||||
version_str = ctypes.cast(version_ptr, ctypes.c_char_p).value.decode()
|
||||
|
||||
# Parse and check version
|
||||
match = re.search(r"version\s+(\d+)", version_str)
|
||||
if not match or match.group(1) != required:
|
||||
msg = red(f"libclang version {match.group(1) if match else '?'} found, but version {required} required. Bye!")
|
||||
print(msg)
|
||||
sys.exit(1)
|
||||
msg = green(f"Found libclang version {required}")
|
||||
print(msg)
|
||||
|
||||
|
||||
def check_clang_format_version(required_version):
|
||||
if (ver := clang_format_version()) != required_version:
|
||||
msg = red(
|
||||
@@ -143,24 +120,6 @@ def time_return_lambda(node, args):
|
||||
|
||||
|
||||
def visit(node):
|
||||
|
||||
loc = node.location
|
||||
# skip if ndoe is outside project directory
|
||||
if loc.file and not str(loc.file).startswith(str(cargs.build_path.parent)):
|
||||
return
|
||||
|
||||
'''
|
||||
# to see which file was causing the error (not in Detector.h, so skipping others in the above code)
|
||||
try:
|
||||
kind = node.kind
|
||||
except ValueError as e:
|
||||
loc = node.location
|
||||
file_name = loc.file.name if loc.file else "<unknown file>"
|
||||
msg = yellow(f"\nWarning: skipping node with unknown CursorKind id {node._kind_id} at {file_name}:{loc.line}:{loc.column}")
|
||||
print(msg)
|
||||
return
|
||||
'''
|
||||
|
||||
if node.kind == cindex.CursorKind.CLASS_DECL:
|
||||
if node.displayname == "Detector":
|
||||
for child in node.get_children():
|
||||
@@ -202,7 +161,6 @@ if __name__ == "__main__":
|
||||
)
|
||||
cargs = parser.parse_args()
|
||||
|
||||
check_libclang_version("12")
|
||||
check_clang_format_version(12)
|
||||
check_for_compile_commands_json(cargs.build_path)
|
||||
|
||||
|
||||
@@ -15,8 +15,6 @@ from .gaincaps import Mythen3GainCapsWrapper
|
||||
from .PatternGenerator import PatternGenerator
|
||||
|
||||
from . import _slsdet
|
||||
from ._slsdet import freeSharedMemory, getUserDetails
|
||||
|
||||
xy = _slsdet.xy
|
||||
defs = _slsdet.slsDetectorDefs
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ defs = slsDetectorDefs
|
||||
|
||||
from .utils import element_if_equal, all_equal, get_set_bits, list_to_bitmask
|
||||
from .utils import Geometry, to_geo, element, reduce_time, is_iterable, hostname_list
|
||||
from ._slsdet import xy, freeSharedMemory, getUserDetails
|
||||
from ._slsdet import xy
|
||||
from .gaincaps import Mythen3GainCapsWrapper
|
||||
from . import utils as ut
|
||||
from .proxy import JsonProxy, SlowAdcProxy, ClkDivProxy, MaxPhaseProxy, ClkFreqProxy, PatLoopProxy, PatNLoopProxy, PatWaitProxy, PatWaitTimeProxy
|
||||
@@ -24,7 +24,6 @@ import datetime as dt
|
||||
|
||||
from functools import wraps
|
||||
from collections import namedtuple
|
||||
from collections.abc import Sequence
|
||||
import socket
|
||||
import numpy as np
|
||||
|
||||
@@ -91,7 +90,7 @@ class Detector(CppDetectorApi):
|
||||
|
||||
def free(self):
|
||||
"""Free detector shared memory"""
|
||||
freeSharedMemory(self.getShmId())
|
||||
self.freeSharedMemory()
|
||||
|
||||
@property
|
||||
def config(self):
|
||||
@@ -302,46 +301,6 @@ class Detector(CppDetectorApi):
|
||||
def rx_arping(self, value):
|
||||
ut.set_using_dict(self.setRxArping, value)
|
||||
|
||||
@property
|
||||
def rx_roi(self):
|
||||
"""Gets the list of ROIs configured in the receiver.
|
||||
|
||||
Note
|
||||
-----
|
||||
Each ROI is represented as a tuple of (x_start, y_start, x_end, y_end). \n
|
||||
If no ROIs are configured, returns [[-1,-1,-1,-1]].
|
||||
"""
|
||||
return self.getRxROI() #vector of Roi structs how represented?
|
||||
|
||||
@rx_roi.setter
|
||||
def rx_roi(self, rois):
|
||||
"""
|
||||
Sets the list of ROIs in the receiver.
|
||||
Can only set multiple ROIs at multi module level without gap pixels. If more than 1 ROI per
|
||||
UDP port, it will throw. Setting number of udp interfaces will clear the
|
||||
roi. Cannot be set for CTB or Xilinx CTB.
|
||||
|
||||
Note
|
||||
-----
|
||||
Each ROI should be represented as a sequence of 4 ints (x_start, y_start, x_end, y_end). \n
|
||||
For mythen3 or gotthard2 pass a sequence of 2 ints (x_start, x_end) \n
|
||||
For multiple ROI's pass a sequence of sequence \n
|
||||
Example: [[0, 100, 50, 100], [260, 270, 50,100]] \n
|
||||
"""
|
||||
# TODO: maybe better to accept py::object in setRxROI and handle there?
|
||||
if not isinstance(rois, Sequence):
|
||||
raise TypeError(
|
||||
"setRxROI failed: expected a tuple/list of ints x_min, x_max, y_min, y_max "
|
||||
"or a sequence of such."
|
||||
)
|
||||
if(not isinstance(rois[0], Sequence)):
|
||||
self.setRxROI([rois])
|
||||
else:
|
||||
self.setRxROI(rois)
|
||||
|
||||
def rx_clearroi(self):
|
||||
"""Clears all the ROIs configured in the receiver."""
|
||||
self.clearRxROI()
|
||||
|
||||
@property
|
||||
@element
|
||||
@@ -1578,7 +1537,7 @@ class Detector(CppDetectorApi):
|
||||
"""
|
||||
Retrieve user details from shared memory (hostname, type, PID, User, Date)
|
||||
"""
|
||||
return getUserDetails(self.getShmId())
|
||||
return self.getUserDetails()
|
||||
|
||||
@property
|
||||
@element
|
||||
@@ -2225,7 +2184,6 @@ class Detector(CppDetectorApi):
|
||||
|
||||
:setter: It loads trim files from settingspath.\n [Mythen3] An energy of -1 will pick up values from detector.
|
||||
"""
|
||||
|
||||
if self.type == detectorType.MYTHEN3:
|
||||
return self.getAllThresholdEnergy()
|
||||
return self.getThresholdEnergy()
|
||||
|
||||
@@ -281,6 +281,6 @@ def hostname_list(args):
|
||||
|
||||
|
||||
def validate_port(value):
|
||||
if value < 1024 or value > 65535:
|
||||
raise ValueError("port must be in range 1024 - 65535")
|
||||
if value <= 0 or value > 65535:
|
||||
raise ValueError("port must be in range 1 - 65535")
|
||||
|
||||
|
||||
@@ -25,9 +25,6 @@ void init_det(py::module &m) {
|
||||
(void (*)(const int, const int)) & sls::freeSharedMemory,
|
||||
py::arg() = 0, py::arg() = -1);
|
||||
|
||||
m.def("getUserDetails", (std::string(*)(const int)) & sls::getUserDetails,
|
||||
py::arg() = 0);
|
||||
|
||||
py::class_<Detector> CppDetectorApi(m, "CppDetectorApi");
|
||||
CppDetectorApi.def(py::init<int>());
|
||||
|
||||
@@ -112,13 +109,6 @@ void init_det(py::module &m) {
|
||||
(Result<defs::xy>(Detector::*)(sls::Positions) const) &
|
||||
Detector::getModuleSize,
|
||||
py::arg() = Positions{});
|
||||
CppDetectorApi.def("getPortPerModuleGeometry",
|
||||
(defs::xy(Detector::*)() const) &
|
||||
Detector::getPortPerModuleGeometry);
|
||||
CppDetectorApi.def("getPortSize",
|
||||
(Result<defs::xy>(Detector::*)(sls::Positions) const) &
|
||||
Detector::getPortSize,
|
||||
py::arg() = Positions{});
|
||||
CppDetectorApi.def("getDetectorSize", (defs::xy(Detector::*)() const) &
|
||||
Detector::getDetectorSize);
|
||||
CppDetectorApi.def("setDetectorSize",
|
||||
@@ -934,15 +924,15 @@ void init_det(py::module &m) {
|
||||
(void (Detector::*)(bool, sls::Positions)) &
|
||||
Detector::setRxArping,
|
||||
py::arg(), py::arg() = Positions{});
|
||||
CppDetectorApi.def("getRxROI",
|
||||
(std::vector<defs::ROI>(Detector::*)(int) const) &
|
||||
Detector::getRxROI,
|
||||
py::arg() = -1);
|
||||
CppDetectorApi.def("setRxROI",
|
||||
(void (Detector::*)(const std::vector<defs::ROI> &)) &
|
||||
Detector::setRxROI,
|
||||
CppDetectorApi.def("getIndividualRxROIs",
|
||||
(Result<defs::ROI>(Detector::*)(sls::Positions) const) &
|
||||
Detector::getIndividualRxROIs,
|
||||
py::arg());
|
||||
|
||||
CppDetectorApi.def("getRxROI",
|
||||
(defs::ROI(Detector::*)() const) & Detector::getRxROI);
|
||||
CppDetectorApi.def(
|
||||
"setRxROI", (void (Detector::*)(const defs::ROI)) & Detector::setRxROI,
|
||||
py::arg());
|
||||
CppDetectorApi.def("clearRxROI",
|
||||
(void (Detector::*)()) & Detector::clearRxROI);
|
||||
CppDetectorApi.def(
|
||||
@@ -1353,11 +1343,10 @@ void init_det(py::module &m) {
|
||||
(void (Detector::*)(const int, const std::string &, sls::Positions)) &
|
||||
Detector::setVetoFile,
|
||||
py::arg(), py::arg(), py::arg() = Positions{});
|
||||
CppDetectorApi.def(
|
||||
"getBurstMode",
|
||||
(Result<defs::burstMode>(Detector::*)(sls::Positions) const) &
|
||||
Detector::getBurstMode,
|
||||
py::arg() = Positions{});
|
||||
CppDetectorApi.def("getBurstMode",
|
||||
(Result<defs::burstMode>(Detector::*)(sls::Positions)) &
|
||||
Detector::getBurstMode,
|
||||
py::arg() = Positions{});
|
||||
CppDetectorApi.def("setBurstMode",
|
||||
(void (Detector::*)(defs::burstMode, sls::Positions)) &
|
||||
Detector::setBurstMode,
|
||||
@@ -2067,5 +2056,7 @@ void init_det(py::module &m) {
|
||||
(Result<sls::ns>(Detector::*)(sls::Positions) const) &
|
||||
Detector::getMeasurementTime,
|
||||
py::arg() = Positions{});
|
||||
CppDetectorApi.def("getUserDetails", (std::string(Detector::*)() const) &
|
||||
Detector::getUserDetails);
|
||||
;
|
||||
}
|
||||
|
||||
@@ -19,8 +19,6 @@ void init_det(py::module &m) {
|
||||
using sls::Result;
|
||||
|
||||
m.def("freeSharedMemory", (void (*)(const int, const int)) &sls::freeSharedMemory, py::arg() = 0, py::arg() = -1);
|
||||
|
||||
m.def("getUserDetails", (std::string (*)(const int)) &sls::getUserDetails, py::arg() = 0);
|
||||
|
||||
py::class_<Detector> CppDetectorApi(m, "CppDetectorApi");
|
||||
CppDetectorApi.def(py::init<int>());
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
// SPDX-License-Identifier: LGPL-3.0-or-other
|
||||
// Copyright (C) 2021 Contributors to the SLS Detector Package
|
||||
#pragma once
|
||||
#include <datetime.h>
|
||||
#include <pybind11/pybind11.h>
|
||||
#include <datetime.h>
|
||||
|
||||
#include "DurationWrapper.h"
|
||||
#include "sls/Result.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
#include "DurationWrapper.h"
|
||||
|
||||
namespace py = pybind11;
|
||||
namespace pybind11 {
|
||||
@@ -15,130 +14,84 @@ template <typename Type, typename Alloc>
|
||||
struct type_caster<sls::Result<Type, Alloc>>
|
||||
: list_caster<sls::Result<Type, Alloc>, Type> {};
|
||||
|
||||
|
||||
// Based on the typecaster in pybind11/chrono.h
|
||||
template <> struct type_caster<std::chrono::nanoseconds> {
|
||||
public:
|
||||
PYBIND11_TYPE_CASTER(std::chrono::nanoseconds,
|
||||
const_name("DurationWrapper"));
|
||||
public:
|
||||
PYBIND11_TYPE_CASTER(std::chrono::nanoseconds, const_name("DurationWrapper"));
|
||||
|
||||
// signed 25 bits required by the standard.
|
||||
using days = std::chrono::duration<int_least32_t, std::ratio<86400>>;
|
||||
// signed 25 bits required by the standard.
|
||||
using days = std::chrono::duration<int_least32_t, std::ratio<86400>>;
|
||||
|
||||
/**
|
||||
* Conversion part 1 (Python->C++): convert a PyObject into
|
||||
* std::chrono::nanoseconds try datetime.timedelta, floats and our
|
||||
* DurationWrapper wrapper
|
||||
*/
|
||||
/**
|
||||
* Conversion part 1 (Python->C++): convert a PyObject into std::chrono::nanoseconds
|
||||
* try datetime.timedelta, floats and our DurationWrapper wrapper
|
||||
*/
|
||||
|
||||
bool load(handle src, bool) {
|
||||
using namespace std::chrono;
|
||||
bool load(handle src, bool) {
|
||||
using namespace std::chrono;
|
||||
|
||||
// Lazy initialise the PyDateTime import
|
||||
if (!PyDateTimeAPI) {
|
||||
PyDateTime_IMPORT;
|
||||
}
|
||||
// Lazy initialise the PyDateTime import
|
||||
if (!PyDateTimeAPI) {
|
||||
PyDateTime_IMPORT;
|
||||
}
|
||||
|
||||
if (!src) {
|
||||
return false;
|
||||
}
|
||||
// If invoked with datetime.delta object, same as in chrono.h
|
||||
if (PyDelta_Check(src.ptr())) {
|
||||
value = duration_cast<nanoseconds>(
|
||||
days(PyDateTime_DELTA_GET_DAYS(src.ptr())) +
|
||||
seconds(PyDateTime_DELTA_GET_SECONDS(src.ptr())) +
|
||||
microseconds(PyDateTime_DELTA_GET_MICROSECONDS(src.ptr()))
|
||||
|
||||
);
|
||||
return true;
|
||||
}
|
||||
// If invoked with a float we assume it is seconds and convert, same as
|
||||
// in chrono.h
|
||||
if (PyFloat_Check(src.ptr())) {
|
||||
value = duration_cast<nanoseconds>(
|
||||
duration<double>(PyFloat_AsDouble(src.ptr())));
|
||||
return true;
|
||||
}
|
||||
// If invoked with an int we assume it is nanoseconds and convert, same
|
||||
// as in chrono.h
|
||||
if (PyLong_Check(src.ptr())) {
|
||||
value = duration_cast<nanoseconds>(
|
||||
duration<int64_t>(PyLong_AsLongLong(src.ptr())));
|
||||
return true;
|
||||
}
|
||||
|
||||
// Lastly if we were actually called with a DurationWrapper object we
|
||||
// get the number of nanoseconds and create a std::chrono::nanoseconds
|
||||
// from it
|
||||
py::object py_cls =
|
||||
py::module::import("slsdet._slsdet").attr("DurationWrapper");
|
||||
if (py::isinstance(src, py_cls)) {
|
||||
sls::DurationWrapper *cls = src.cast<sls::DurationWrapper *>();
|
||||
value = nanoseconds(cls->count());
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Conversion part 2 (C++ -> Python)
|
||||
* import the module to get a handle to the wrapped class
|
||||
* Default construct an object of (wrapped) DurationWrapper
|
||||
* set the count from chrono::nanoseconds and return
|
||||
*/
|
||||
static handle cast(std::chrono::nanoseconds src,
|
||||
return_value_policy /* policy */, handle /* parent */) {
|
||||
py::object py_cls =
|
||||
py::module::import("slsdet._slsdet").attr("DurationWrapper");
|
||||
py::object *obj = new py::object;
|
||||
*obj = py_cls();
|
||||
sls::DurationWrapper *dur = obj->cast<sls::DurationWrapper *>();
|
||||
dur->set_count(src.count());
|
||||
return *obj;
|
||||
}
|
||||
};
|
||||
|
||||
// Type caster for sls::defs::ROI from tuple
|
||||
template <> struct type_caster<sls::defs::ROI> {
|
||||
PYBIND11_TYPE_CASTER(sls::defs::ROI, _("Sequence[int, int, int, int] or "
|
||||
"Sequence[int, int]"));
|
||||
|
||||
// convert c++ ROI to python tuple
|
||||
static handle cast(const sls::defs::ROI &roi, return_value_policy, handle) {
|
||||
return py::make_tuple(roi.xmin, roi.xmax, roi.ymin, roi.ymax).release();
|
||||
}
|
||||
|
||||
// convert from python to c++ ROI
|
||||
bool load(handle roi, bool /*allow implicit conversion*/) {
|
||||
|
||||
// accept tuple, list, numpy array any sequence
|
||||
py::sequence seq;
|
||||
try {
|
||||
seq = py::reinterpret_borrow<py::sequence>(roi);
|
||||
} catch (...) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (seq.size() != 4 && seq.size() != 2)
|
||||
return false;
|
||||
// Check if each element is an int
|
||||
for (auto item : seq) {
|
||||
if (!py::isinstance<py::int_>(item)) {
|
||||
if (!src) {
|
||||
return false;
|
||||
}
|
||||
// If invoked with datetime.delta object, same as in chrono.h
|
||||
if (PyDelta_Check(src.ptr())) {
|
||||
value = duration_cast<nanoseconds>(
|
||||
days(PyDateTime_DELTA_GET_DAYS(src.ptr())) +
|
||||
seconds(PyDateTime_DELTA_GET_SECONDS(src.ptr())) +
|
||||
microseconds(PyDateTime_DELTA_GET_MICROSECONDS(src.ptr()))
|
||||
|
||||
);
|
||||
return true;
|
||||
}
|
||||
// If invoked with a float we assume it is seconds and convert, same as in chrono.h
|
||||
if (PyFloat_Check(src.ptr())) {
|
||||
value = duration_cast<nanoseconds>(duration<double>(PyFloat_AsDouble(src.ptr())));
|
||||
return true;
|
||||
}
|
||||
// If invoked with an int we assume it is nanoseconds and convert, same as in chrono.h
|
||||
if (PyLong_Check(src.ptr())) {
|
||||
value = duration_cast<nanoseconds>(duration<int64_t>(PyLong_AsLongLong(src.ptr())));
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
// Lastly if we were actually called with a DurationWrapper object we get
|
||||
// the number of nanoseconds and create a std::chrono::nanoseconds from it
|
||||
py::object py_cls = py::module::import("slsdet._slsdet").attr("DurationWrapper");
|
||||
if (py::isinstance(src, py_cls)){
|
||||
sls::DurationWrapper *cls = src.cast<sls::DurationWrapper *>();
|
||||
value = nanoseconds(cls->count());
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
value.xmin = seq[0].cast<int>();
|
||||
value.xmax = seq[1].cast<int>();
|
||||
|
||||
if (seq.size() == 4) {
|
||||
value.ymin = seq[2].cast<int>();
|
||||
value.ymax = seq[3].cast<int>();
|
||||
/**
|
||||
* Conversion part 2 (C++ -> Python)
|
||||
* import the module to get a handle to the wrapped class
|
||||
* Default construct an object of (wrapped) DurationWrapper
|
||||
* set the count from chrono::nanoseconds and return
|
||||
*/
|
||||
static handle cast(std::chrono::nanoseconds src, return_value_policy /* policy */, handle /* parent */) {
|
||||
py::object py_cls = py::module::import("slsdet._slsdet").attr("DurationWrapper");
|
||||
py::object* obj = new py::object;
|
||||
*obj = py_cls();
|
||||
sls::DurationWrapper *dur = obj->cast<sls::DurationWrapper *>();
|
||||
dur->set_count(src.count());
|
||||
return *obj;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace detail
|
||||
} // namespace pybind11
|
||||
@@ -1,85 +0,0 @@
|
||||
import pytest
|
||||
import sys
|
||||
import traceback
|
||||
|
||||
from pathlib import Path
|
||||
|
||||
current_dir = Path(__file__).resolve().parents[2]
|
||||
|
||||
scripts_dir = current_dir / "tests" / "scripts"
|
||||
|
||||
sys.path.append(str(scripts_dir))
|
||||
|
||||
print(sys.path)
|
||||
|
||||
from utils_for_test import (
|
||||
Log,
|
||||
LogLevel,
|
||||
cleanup,
|
||||
startReceiver,
|
||||
startDetectorVirtualServer,
|
||||
loadConfig,
|
||||
loadBasicSettings,
|
||||
)
|
||||
|
||||
def pytest_addoption(parser):
|
||||
parser.addoption(
|
||||
"--with-detector-simulators", action="store_true", default=False, help="Run tests that require detector simulators"
|
||||
)
|
||||
|
||||
def pytest_configure(config):
|
||||
config.addinivalue_line("markers", "withdetectorsimulators: mark test as needing detector simulators to run")
|
||||
|
||||
def pytest_collection_modifyitems(config, items):
|
||||
if config.getoption("--with-detector-simulators"):
|
||||
return
|
||||
skip = pytest.mark.skip(reason="need --with-detector-simulators option to run")
|
||||
for item in items:
|
||||
if "withdetectorsimulators" in item.keywords:
|
||||
item.add_marker(skip)
|
||||
|
||||
#helper fixture for servers
|
||||
@pytest.fixture
|
||||
def servers(request):
|
||||
try:
|
||||
return request.param # comes from @pytest.mark.parametrize(..., indirect=True)
|
||||
except AttributeError:
|
||||
# fallback default if the test did not parametrize
|
||||
return ['eiger', 'jungfrau', 'mythen3', 'gotthard2', 'ctb', 'moench', 'xilinx_ctb']
|
||||
return request.param
|
||||
|
||||
@pytest.fixture
|
||||
def test_with_simulators(servers):
|
||||
""" Fixture to automatically setup virtual detector servers for testing. """
|
||||
|
||||
LOG_PREFIX_FNAME = '/tmp/slsDetectorPackage_virtual_PythonAPI_test'
|
||||
MAIN_LOG_FNAME = LOG_PREFIX_FNAME + '_log.txt'
|
||||
|
||||
with open(MAIN_LOG_FNAME, 'w') as fp:
|
||||
try:
|
||||
nmods = 2
|
||||
for server in servers:
|
||||
for ninterfaces in range(1,2):
|
||||
if ninterfaces == 2 and server != 'jungfrau' and server != 'moench':
|
||||
continue
|
||||
|
||||
msg = f'Starting Python API Tests for {server}'
|
||||
|
||||
if server == 'jungfrau' or server == 'moench':
|
||||
msg += f' with {ninterfaces} interfaces'
|
||||
|
||||
Log(LogLevel.INFOBLUE, msg, fp)
|
||||
cleanup(fp)
|
||||
startDetectorVirtualServer(server, nmods, fp)
|
||||
startReceiver(nmods, fp)
|
||||
d = loadConfig(name=server, log_file_fp=fp, num_mods=nmods, num_frames=1, num_interfaces=ninterfaces)
|
||||
loadBasicSettings(name=server, d=d, fp=fp)
|
||||
yield # run test
|
||||
cleanup(fp) # teardown
|
||||
except Exception as e:
|
||||
with open(MAIN_LOG_FNAME, 'a') as fp_error:
|
||||
traceback.print_exc(file=fp_error)
|
||||
Log(LogLevel.ERROR, f'Tests Failed.', fp)
|
||||
cleanup(fp)
|
||||
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
import pytest
|
||||
import sys
|
||||
|
||||
from conftest import test_with_simulators
|
||||
|
||||
from slsdet import Detector
|
||||
|
||||
@pytest.mark.withdetectorsimulators
|
||||
@pytest.mark.parametrize("servers", [["moench"]], indirect=True)
|
||||
def test_rx_ROI_moench(test_with_simulators, servers):
|
||||
""" Test setting and getting rx_ROI property of Detector class for moench. """
|
||||
|
||||
d = Detector()
|
||||
d.rx_roi = (0, 10, 10, 20)
|
||||
roi = d.rx_roi
|
||||
assert roi == [(0, 10, 10, 20)]
|
||||
|
||||
d.rx_roi = [5,15,15,25]
|
||||
|
||||
assert d.rx_roi == [(5,15,15,25)]
|
||||
|
||||
d.rx_roi = [[0,10,0,20], [5,20,410,420]]
|
||||
|
||||
roi = d.rx_roi
|
||||
assert roi == [(0,10,0,20), (5,20,410,420)]
|
||||
|
||||
d.rx_clearroi()
|
||||
roi = d.rx_roi
|
||||
assert roi == [(-1,-1,-1,-1)]
|
||||
|
||||
@pytest.mark.withdetectorsimulators
|
||||
@pytest.mark.parametrize("servers", [["mythen3"]], indirect=True)
|
||||
def test_rx_ROI_mythen(test_with_simulators, servers):
|
||||
""" Test setting and getting rx_ROI property of Detector class for mythen. """
|
||||
|
||||
d = Detector()
|
||||
d.rx_roi = (0, 10)
|
||||
roi = d.rx_roi
|
||||
assert roi == [(0, 10, -1, -1)]
|
||||
|
||||
#d.rx_roi = [[5,15, 0, 1]] # not allowed for mythen3
|
||||
|
||||
d.rx_roi = [0,10, -1, -1]
|
||||
|
||||
assert d.rx_roi == [(0,10,-1,-1)]
|
||||
|
||||
|
||||
|
||||
1
serverBin/ctbDetectorServer_developer
Symbolic link
@@ -0,0 +1 @@
|
||||
../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
|
||||
1
serverBin/eigerDetectorServer_developer
Symbolic link
@@ -0,0 +1 @@
|
||||
../slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
|
||||
1
serverBin/gotthard2DetectorServer_developer
Symbolic link
@@ -0,0 +1 @@
|
||||
../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
|
||||
1
serverBin/gotthardDetectorServer_developer
Symbolic link
@@ -0,0 +1 @@
|
||||
../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
|
||||
1
serverBin/jungfrauDetectorServer_developer
Symbolic link
@@ -0,0 +1 @@
|
||||
../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
|
||||
1
serverBin/moenchDetectorServer_developer
Symbolic link
@@ -0,0 +1 @@
|
||||
../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
|
||||
1
serverBin/mythen3DetectorServer_developer
Symbolic link
@@ -0,0 +1 @@
|
||||
../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
|
||||
1
serverBin/xilinx_ctbDetectorServer_developer
Symbolic link
@@ -0,0 +1 @@
|
||||
../slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer
|
||||
@@ -48,9 +48,8 @@ add_executable(moench03Interpolation moench03Interpolation.cpp)
|
||||
#no compile defs
|
||||
list(APPEND MOENCH_EXECUTABLES moench03Interpolation)
|
||||
|
||||
add_executable(moench03NoInterpolation moench03Interpolation.cpp)
|
||||
add_executable(moench03NoInterpolation moench03NoInterpolation.cpp)
|
||||
#no compile defs
|
||||
target_compile_definitions(moench03NoInterpolation PRIVATE NOINTERPOLATION)
|
||||
list(APPEND MOENCH_EXECUTABLES moench03NoInterpolation)
|
||||
|
||||
|
||||
@@ -88,4 +87,4 @@ foreach(exe ${MOENCH_EXECUTABLES})
|
||||
|
||||
endforeach(exe ${MOENCH_EXECUTABLES})
|
||||
|
||||
install(TARGETS ${MOENCH_EXECUTABLES} DESTINATION bin)
|
||||
install(TARGETS ${MOENCH_EXECUTABLES} DESTINATION bin)
|
||||
@@ -126,11 +126,11 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
int quad;
|
||||
#ifndef FF
|
||||
double int_x, int_y;
|
||||
int *img;
|
||||
#ifndef NOINTERPOLATION
|
||||
char fname[10000];
|
||||
int ok;
|
||||
double int_x, int_y;
|
||||
int *img;
|
||||
cout << "read ff " << argv[2] << endl;
|
||||
sprintf(fname, "%s", argv[2]);
|
||||
interp->readFlatField(fname);
|
||||
|
||||
@@ -40,7 +40,6 @@ class qDrawPlot : public QWidget, private Ui::PlotObject {
|
||||
void SetDataCallBack(bool enable);
|
||||
void SetBinary(bool enable, int from = 0, int to = 0);
|
||||
void StartAcquisition();
|
||||
void UpdateROI();
|
||||
|
||||
public slots:
|
||||
void SetPersistency(int val);
|
||||
@@ -167,8 +166,8 @@ class qDrawPlot : public QWidget, private Ui::PlotObject {
|
||||
int64_t currentFrame{0};
|
||||
mutable std::mutex mPlots;
|
||||
int64_t currentAcqIndex{0};
|
||||
bool hasRoi{false};
|
||||
bool roiDisplayInitialized{false};
|
||||
slsDetectorDefs::ROI rxRoi{};
|
||||
bool isRxRoiDisplayed{false};
|
||||
bool isGapPixels{false};
|
||||
|
||||
unsigned int nPixelsX{0};
|
||||
@@ -177,7 +176,6 @@ class qDrawPlot : public QWidget, private Ui::PlotObject {
|
||||
uint32_t gainMask{0};
|
||||
int gainOffset{0};
|
||||
bool gotthard25;
|
||||
std::vector<slsDetectorDefs::ROI> roi{1};
|
||||
};
|
||||
|
||||
} // namespace sls
|
||||
|
||||
@@ -5,8 +5,6 @@
|
||||
|
||||
#include "SlsQt1DZoomer.h"
|
||||
#include "sls/ansi.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
#include <array>
|
||||
#include <qwt_plot.h>
|
||||
#include <qwt_plot_curve.h>
|
||||
@@ -143,9 +141,8 @@ class SlsQt1DPlot : public QwtPlot {
|
||||
void SetLogX(bool yes = 1);
|
||||
void SetLogY(bool yes = 1);
|
||||
|
||||
void EnableRoiBoxes(std::vector<slsDetectorDefs::ROI> roi, int ymin,
|
||||
int ymax);
|
||||
void DisableRoiBoxes();
|
||||
void EnableRoiBox(std::array<int, 4> roi);
|
||||
void DisableRoiBox();
|
||||
|
||||
private:
|
||||
bool gainPlot{false};
|
||||
@@ -172,7 +169,6 @@ class SlsQt1DPlot : public QwtPlot {
|
||||
friend void SlsQtH1D::Attach(SlsQt1DPlot *p);
|
||||
friend void SlsQtH1D::Detach(SlsQt1DPlot *p);
|
||||
|
||||
std::vector<std::unique_ptr<QwtPlotShapeItem>> roiBoxes{};
|
||||
QwtPlotShapeItem *roiBox{nullptr};
|
||||
|
||||
signals:
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
#pragma once
|
||||
#include "SlsQt2DHist.h"
|
||||
#include "SlsQt2DZoomer.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
#include <array>
|
||||
#include <qlist.h>
|
||||
#include <qwt_plot.h>
|
||||
@@ -73,8 +71,8 @@ class SlsQt2DPlot : public QwtPlot {
|
||||
void SetLogz(bool enable, bool isMin, bool isMax, double min, double max);
|
||||
void SetZRange(bool isMin, bool isMax, double min, double max);
|
||||
void LogZ(bool on = 1);
|
||||
void EnableRoiBoxes(std::vector<slsDetectorDefs::ROI> roi);
|
||||
void DisableRoiBoxes();
|
||||
void EnableRoiBox(std::array<int, 4> roi);
|
||||
void DisableRoiBox();
|
||||
|
||||
public slots:
|
||||
void showSpectrogram(bool on);
|
||||
@@ -103,7 +101,7 @@ class SlsQt2DPlot : public QwtPlot {
|
||||
QList<double> contourLevelsLog;
|
||||
bool disableZoom{false};
|
||||
int isLog;
|
||||
std::vector<std::unique_ptr<QwtPlotShapeItem>> roiBoxes{};
|
||||
QwtPlotShapeItem *roiBox{nullptr};
|
||||
};
|
||||
|
||||
} // namespace sls
|
||||
|
||||
@@ -462,26 +462,24 @@ void SlsQt1DPlot::SetLog(int axisId, bool yes) {
|
||||
Update();
|
||||
}
|
||||
|
||||
void SlsQt1DPlot::EnableRoiBoxes(std::vector<slsDetectorDefs::ROI> roi,
|
||||
int ymin, int ymax) {
|
||||
roiBoxes.clear();
|
||||
for (auto &r : roi) {
|
||||
auto box = std::make_unique<QwtPlotShapeItem>();
|
||||
box->setPen(QColor(Qt::yellow), 2.0, Qt::SolidLine);
|
||||
// TopLeft - BottomRight (max points are +1 on graph)
|
||||
QRectF myRect(QPointF(r.xmin, ymin), QPointF(r.xmax - 1, ymax - 1));
|
||||
box->setRect(myRect);
|
||||
box->attach(this);
|
||||
roiBoxes.push_back(std::move(box));
|
||||
void SlsQt1DPlot::EnableRoiBox(std::array<int, 4> roi) {
|
||||
if (roiBox == nullptr) {
|
||||
roiBox = new QwtPlotShapeItem();
|
||||
roiBox->attach(this);
|
||||
roiBox->setPen(QColor(Qt::yellow), 2.0, Qt::SolidLine);
|
||||
}
|
||||
|
||||
// TopLeft - BottomRight (max points are +1 on graph)
|
||||
QRect myRect(QPoint(roi[0], roi[2]), QPoint(roi[1] - 1, roi[3] - 1));
|
||||
roiBox->setRect(QRectF(myRect));
|
||||
replot();
|
||||
}
|
||||
|
||||
void SlsQt1DPlot::DisableRoiBoxes() {
|
||||
for (auto &r : roiBoxes) {
|
||||
r->detach();
|
||||
void SlsQt1DPlot::DisableRoiBox() {
|
||||
if (roiBox != nullptr) {
|
||||
roiBox->detach();
|
||||
replot();
|
||||
}
|
||||
replot();
|
||||
}
|
||||
|
||||
void SlsQt1DPlot::SetZoomX(const QRectF &rect) {
|
||||
|
||||
@@ -350,25 +350,25 @@ void SlsQt2DPlot::showSpectrogram(bool on) {
|
||||
Update();
|
||||
}
|
||||
|
||||
void SlsQt2DPlot::EnableRoiBoxes(std::vector<slsDetectorDefs::ROI> roi) {
|
||||
roiBoxes.clear();
|
||||
for (auto &r : roi) {
|
||||
auto box = std::make_unique<QwtPlotShapeItem>();
|
||||
box->setPen(QColor(Qt::yellow), 2.0, Qt::SolidLine);
|
||||
// TopLeft - BottomRight (max points are +1 on graph)
|
||||
QRectF myRect(QPointF(r.xmin, r.ymin), QPointF(r.xmax - 1, r.ymax - 1));
|
||||
box->setRect(myRect);
|
||||
box->attach(this);
|
||||
roiBoxes.push_back(std::move(box));
|
||||
void SlsQt2DPlot::EnableRoiBox(std::array<int, 4> roi) {
|
||||
if (roiBox == nullptr) {
|
||||
roiBox = new QwtPlotShapeItem();
|
||||
}
|
||||
roiBox->setPen(QColor(Qt::yellow), 2.0, Qt::SolidLine);
|
||||
|
||||
// TopLeft - BottomRight (max points are +1 on graph)
|
||||
QRect myRect(QPoint(roi[0], roi[2]), QPoint(roi[1] - 1, roi[3] - 1));
|
||||
roiBox->setRect(QRectF(myRect));
|
||||
|
||||
roiBox->attach(this);
|
||||
replot();
|
||||
}
|
||||
|
||||
void SlsQt2DPlot::DisableRoiBoxes() {
|
||||
for (auto &r : roiBoxes) {
|
||||
r->detach();
|
||||
void SlsQt2DPlot::DisableRoiBox() {
|
||||
if (roiBox != nullptr) {
|
||||
roiBox->detach();
|
||||
replot();
|
||||
}
|
||||
replot();
|
||||
}
|
||||
|
||||
} // namespace sls
|
||||
|
||||
@@ -539,7 +539,6 @@ void qDetectorMain::EnableTabs(bool enable) {
|
||||
tabDeveloper->Refresh();
|
||||
|
||||
tabPlot->Refresh();
|
||||
plot->UpdateROI();
|
||||
plot->StartAcquisition();
|
||||
} else { // to enable scan box
|
||||
tabPlot->Refresh();
|
||||
|
||||
@@ -608,6 +608,7 @@ void qDrawPlot::StartAcquisition() {
|
||||
currentFrame = 0;
|
||||
boxPlot->setTitle("Old Plot");
|
||||
det->clearAcquiringFlag(); // (from previous exit) or if running
|
||||
isRxRoiDisplayed = false;
|
||||
|
||||
// ensure data streaming in receiver (if plot enabled)
|
||||
if (isPlot) {
|
||||
@@ -631,34 +632,6 @@ void qDrawPlot::StartAcquisition() {
|
||||
LOG(logDEBUG) << "End of Starting Acquisition in qDrawPlot";
|
||||
}
|
||||
|
||||
void qDrawPlot::UpdateROI() {
|
||||
try {
|
||||
std::lock_guard<std::mutex> lock(mPlots);
|
||||
roi = det->getRxROI();
|
||||
roiDisplayInitialized = false;
|
||||
// roi enabled
|
||||
if (roi.size() > 1 || !roi[0].completeRoi()) {
|
||||
hasRoi = true;
|
||||
// update gap pixels
|
||||
// hardcoded gap pixels because only for eiger and jungfrau
|
||||
if (isGapPixels) {
|
||||
for (auto &r : roi) {
|
||||
r.xmin += ((r.xmin / 1024) * 6 + (r.xmin / 256) * 2);
|
||||
r.xmax += ((r.xmax / 1024) * 6 + (r.xmax / 256) * 2);
|
||||
r.ymin += ((r.ymin / 512) * 34 + (r.ymin / 256) * 2);
|
||||
r.ymax += ((r.ymax / 512) * 34 + (r.ymax / 256) * 2);
|
||||
}
|
||||
LOG(logINFO)
|
||||
<< "Roi recalculated with gap pixels: " << ToString(roi);
|
||||
}
|
||||
} else {
|
||||
hasRoi = false;
|
||||
}
|
||||
LOG(logDEBUG) << "Roi: " << ToString(roi);
|
||||
}
|
||||
CATCH_DISPLAY("Could not get reciver ROI.", "qDrawPlot::UpdateRoi")
|
||||
}
|
||||
|
||||
void qDrawPlot::AcquireThread() {
|
||||
LOG(logDEBUG) << "Acquire Thread";
|
||||
std::string mess;
|
||||
@@ -736,6 +709,7 @@ void qDrawPlot::GetData(detectorData *data, uint64_t frameIndex,
|
||||
<< " \t dynamic range: " << data->dynamicRange << std::endl
|
||||
<< " \t file index: " << data->fileIndex << std::endl
|
||||
<< " \t complete image: " << data->completeImage << std::endl
|
||||
<< " \t rx Roi: " << ToString(data->rxRoi) << std::endl
|
||||
<< " ]";
|
||||
|
||||
progress = data->progressIndex;
|
||||
@@ -743,6 +717,22 @@ void qDrawPlot::GetData(detectorData *data, uint64_t frameIndex,
|
||||
currentFrame = frameIndex;
|
||||
LOG(logDEBUG) << "[ Progress:" << progress << "%, Frame:" << currentFrame
|
||||
<< " ]";
|
||||
if (!isRxRoiDisplayed) {
|
||||
rxRoi.xmin = data->rxRoi[0];
|
||||
rxRoi.xmax = data->rxRoi[1];
|
||||
rxRoi.ymin = data->rxRoi[2];
|
||||
rxRoi.ymax = data->rxRoi[3];
|
||||
// only for 2d anyway
|
||||
if (isGapPixels) {
|
||||
rxRoi.xmin += ((rxRoi.xmin / 1024) * 6 + (rxRoi.xmin / 256) * 2);
|
||||
rxRoi.xmax += ((rxRoi.xmax / 1024) * 6 + (rxRoi.xmax / 256) * 2);
|
||||
rxRoi.ymin += ((rxRoi.ymin / 512) * 34 + (rxRoi.ymin / 256) * 2);
|
||||
rxRoi.ymax += ((rxRoi.ymax / 512) * 34 + (rxRoi.ymax / 256) * 2);
|
||||
LOG(logINFO) << "Rx_roi recalculated with gap pixels: "
|
||||
<< ToString(rxRoi);
|
||||
}
|
||||
LOG(logDEBUG) << "Rx_roi: " << ToString(rxRoi);
|
||||
}
|
||||
|
||||
// 1d check if npixelX has changed (m3 for different counters enabled)
|
||||
if (is1d && static_cast<int>(nPixelsX) != data->nx) {
|
||||
@@ -981,27 +971,30 @@ void qDrawPlot::Update1dPlot() {
|
||||
xyRangeChanged = false;
|
||||
}
|
||||
plot1d->DisableZoom(disableZoom);
|
||||
if (!roiDisplayInitialized) {
|
||||
roiDisplayInitialized = true;
|
||||
if (!hasRoi) {
|
||||
plot1d->DisableRoiBoxes();
|
||||
if (!isRxRoiDisplayed) {
|
||||
isRxRoiDisplayed = true;
|
||||
if (rxRoi.completeRoi()) {
|
||||
plot1d->DisableRoiBox();
|
||||
if (isGainDataExtracted) {
|
||||
gainplot1d->DisableRoiBoxes();
|
||||
gainplot1d->DisableRoiBox();
|
||||
}
|
||||
lblRxRoiEnabled->hide();
|
||||
} else {
|
||||
plot1d->EnableRoiBoxes(roi, (int)plot1d->GetYMinimum(),
|
||||
(int)plot1d->GetYMaximum());
|
||||
plot1d->EnableRoiBox(std::array<int, 4>{
|
||||
rxRoi.xmin, rxRoi.xmax, (int)plot1d->GetYMinimum(),
|
||||
(int)plot1d->GetYMaximum()});
|
||||
if (isGainDataExtracted) {
|
||||
gainplot1d->EnableRoiBoxes(roi, 0, 3);
|
||||
gainplot1d->EnableRoiBox(
|
||||
std::array<int, 4>{rxRoi.xmin, rxRoi.xmax, 0, 3});
|
||||
}
|
||||
lblRxRoiEnabled->show();
|
||||
}
|
||||
}
|
||||
// ymin and ymax could change (so replot roi every time)
|
||||
if (hasRoi) {
|
||||
plot1d->EnableRoiBoxes(roi, (int)plot1d->GetYMinimum(),
|
||||
(int)plot1d->GetYMaximum());
|
||||
if (!rxRoi.completeRoi()) {
|
||||
plot1d->EnableRoiBox(std::array<int, 4>{rxRoi.xmin, rxRoi.xmax,
|
||||
(int)plot1d->GetYMinimum(),
|
||||
(int)plot1d->GetYMaximum()});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1032,18 +1025,18 @@ void qDrawPlot::Update2dPlot() {
|
||||
}
|
||||
plot2d->DisableZoom(disableZoom);
|
||||
plot2d->SetZRange(isZRange[0], isZRange[1], zRange[0], zRange[1]);
|
||||
if (!roiDisplayInitialized) {
|
||||
roiDisplayInitialized = true;
|
||||
if (!hasRoi) {
|
||||
plot2d->DisableRoiBoxes();
|
||||
if (!isRxRoiDisplayed) {
|
||||
isRxRoiDisplayed = true;
|
||||
if (rxRoi.completeRoi()) {
|
||||
plot2d->DisableRoiBox();
|
||||
if (isGainDataExtracted) {
|
||||
gainplot2d->DisableRoiBoxes();
|
||||
gainplot2d->DisableRoiBox();
|
||||
}
|
||||
lblRxRoiEnabled->hide();
|
||||
} else {
|
||||
plot2d->EnableRoiBoxes(roi);
|
||||
plot2d->EnableRoiBox(rxRoi.getIntArray());
|
||||
if (isGainDataExtracted) {
|
||||
gainplot2d->EnableRoiBoxes(roi);
|
||||
gainplot2d->EnableRoiBox(rxRoi.getIntArray());
|
||||
}
|
||||
lblRxRoiEnabled->show();
|
||||
}
|
||||
|
||||
BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
Executable file
@@ -36,10 +36,6 @@ set_target_properties(jungfrauDetectorServer_virtual PROPERTIES
|
||||
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
|
||||
)
|
||||
|
||||
# to compile fore 32 bit on a 64 bit machine
|
||||
#target_compile_options(jungfrauDetectorServer_virtual PRIVATE -m32)
|
||||
#target_link_options(jungfrauDetectorServer_virtual PRIVATE -m32)
|
||||
|
||||
install(TARGETS jungfrauDetectorServer_virtual
|
||||
EXPORT "${TARGETS_EXPORT_NAME}"
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
|
||||
BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
Executable file
BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
Executable file
@@ -152,12 +152,12 @@ int main(int argc, char *argv[]) {
|
||||
strcpy(version, APIXILINXCTB);
|
||||
#endif
|
||||
LOG(logINFO, ("SLS Detector Server Version: %s\n", version));
|
||||
return EXIT_SUCCESS;
|
||||
exit(EXIT_SUCCESS);
|
||||
|
||||
case 'p':
|
||||
if (sscanf(optarg, "%d", &portno) != 1) {
|
||||
LOG(logERROR, ("Cannot scan port argument\n%s", helpMessage));
|
||||
return EXIT_FAILURE;
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
LOG(logINFO, ("Detected port: %d\n", portno));
|
||||
break;
|
||||
@@ -188,7 +188,7 @@ int main(int argc, char *argv[]) {
|
||||
ignoreConfigFileFlag = 1;
|
||||
#else
|
||||
LOG(logERROR, ("No server config files for this detector\n"));
|
||||
return EXIT_FAILURE;
|
||||
exit(EXIT_FAILURE);
|
||||
#endif
|
||||
break;
|
||||
|
||||
@@ -196,11 +196,11 @@ int main(int argc, char *argv[]) {
|
||||
#if !defined(VIRTUAL) && !defined(EIGERD)
|
||||
LOG(logERROR, ("Cannot set master via the detector server for this "
|
||||
"detector\n"));
|
||||
return EXIT_FAILURE;
|
||||
exit(EXIT_FAILURE);
|
||||
#elif defined(GOTTHARD2D) || defined(EIGERD) || defined(MYTHEN3D)
|
||||
if (sscanf(optarg, "%d", &masterCommandLine) != 1) {
|
||||
LOG(logERROR, ("Cannot scan master argument\n%s", helpMessage));
|
||||
return EXIT_FAILURE;
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
if (masterCommandLine == 1) {
|
||||
LOG(logINFO, ("Detector Master mode\n"));
|
||||
@@ -209,7 +209,7 @@ int main(int argc, char *argv[]) {
|
||||
}
|
||||
#else
|
||||
LOG(logERROR, ("No master implemented for this detector server\n"));
|
||||
return EXIT_FAILURE;
|
||||
exit(EXIT_FAILURE);
|
||||
#endif
|
||||
break;
|
||||
|
||||
@@ -217,7 +217,7 @@ int main(int argc, char *argv[]) {
|
||||
#ifdef EIGERD
|
||||
if (sscanf(optarg, "%d", &topCommandLine) != 1) {
|
||||
LOG(logERROR, ("Cannot scan top argument\n%s", helpMessage));
|
||||
return EXIT_FAILURE;
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
if (topCommandLine == 1) {
|
||||
LOG(logINFO, ("Detector Top mode\n"));
|
||||
@@ -226,16 +226,16 @@ int main(int argc, char *argv[]) {
|
||||
}
|
||||
#else
|
||||
LOG(logERROR, ("No top implemented for this detector server\n"));
|
||||
return EXIT_FAILURE;
|
||||
exit(EXIT_FAILURE);
|
||||
#endif
|
||||
break;
|
||||
|
||||
case 'h':
|
||||
printf("%s", helpMessage);
|
||||
return EXIT_SUCCESS;
|
||||
exit(EXIT_SUCCESS);
|
||||
default:
|
||||
printf("\n%s", helpMessage);
|
||||
return EXIT_FAILURE;
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -376,5 +376,5 @@ int main(int argc, char *argv[]) {
|
||||
#endif
|
||||
}
|
||||
LOG(logINFO, ("Goodbye!\n"));
|
||||
return EXIT_SUCCESS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -5342,8 +5342,7 @@ int set_dest_udp_mac(int file_des) {
|
||||
|
||||
if (receiveData(file_des, &arg, sizeof(arg), INT64) < 0)
|
||||
return printSocketReadError();
|
||||
LOG(logINFO,
|
||||
("Setting udp destination mac: 0x%llx\n", (long long unsigned)arg));
|
||||
LOG(logINFO, ("Setting udp destination mac: 0x%lx\n", arg));
|
||||
|
||||
// only set
|
||||
if (Server_VerifyLock() == OK) {
|
||||
@@ -5364,8 +5363,7 @@ int get_dest_udp_mac(int file_des) {
|
||||
LOG(logDEBUG1, ("Getting udp destination mac\n"));
|
||||
// get only
|
||||
retval = udpDetails[0].dstmac;
|
||||
LOG(logDEBUG1,
|
||||
("udp destination mac retval: 0x%llx\n", (long long unsigned)retval));
|
||||
LOG(logDEBUG1, ("udp destination mac retval: 0x%lx\n", retval));
|
||||
return Server_SendResult(file_des, INT64, &retval, sizeof(retval));
|
||||
}
|
||||
|
||||
@@ -7257,8 +7255,7 @@ int get_receiver_parameters(int file_des) {
|
||||
// dynamic range
|
||||
ret = getDynamicRange(&i32);
|
||||
if (ret == FAIL) {
|
||||
sprintf(mess, "Could not get dynamic range.\n");
|
||||
return sendError(file_des);
|
||||
i32 = 0;
|
||||
}
|
||||
n += sendData(file_des, &i32, sizeof(i32), INT32);
|
||||
if (n < 0)
|
||||
@@ -7437,20 +7434,6 @@ int get_receiver_parameters(int file_des) {
|
||||
u32 = 0;
|
||||
#endif
|
||||
n += sendData(file_des, &u32, sizeof(u32), INT32);
|
||||
if (n < 0)
|
||||
return printSocketReadError();
|
||||
|
||||
// readout speed
|
||||
#if !defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD)
|
||||
ret = getReadoutSpeed(&i32);
|
||||
if (ret == FAIL) {
|
||||
sprintf(mess, "Could not get readout speed.\n");
|
||||
return sendError(file_des);
|
||||
}
|
||||
#else
|
||||
i32 = 0;
|
||||
#endif
|
||||
n += sendData(file_des, &i32, sizeof(i32), INT32);
|
||||
if (n < 0)
|
||||
return printSocketReadError();
|
||||
|
||||
@@ -9192,7 +9175,7 @@ int get_dest_udp_list(int file_des) {
|
||||
memset(mess, 0, sizeof(mess));
|
||||
uint32_t arg = 0;
|
||||
uint16_t retvals16[2] = {};
|
||||
uint32_t retvals32[2] = {};
|
||||
uint32_t retvals32[3] = {};
|
||||
uint64_t retvals64[2] = {};
|
||||
|
||||
if (receiveData(file_des, &arg, sizeof(arg), INT32) < 0)
|
||||
|
||||
@@ -100,6 +100,7 @@ if(SLS_USE_TEXTCLIENT)
|
||||
target_link_libraries(${val1}
|
||||
slsDetectorStatic
|
||||
pthread
|
||||
rt
|
||||
)
|
||||
SET_SOURCE_FILES_PROPERTIES( src/Caller.cpp PROPERTIES COMPILE_FLAGS "-Wno-unused-variable -Wno-unused-but-set-variable")
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// This file is used as input to generate the caller class
|
||||
#pragma once
|
||||
|
||||
#include "CmdParser.h"
|
||||
#include "HelpDacs.h"
|
||||
#include "sls/Detector.h"
|
||||
@@ -21,8 +21,6 @@ class Caller {
|
||||
UdpDestination getUdpEntry();
|
||||
int GetLevelAndInsertIntoArgs(std::string levelSeparatedCommand);
|
||||
void WrongNumberOfParameters(size_t expected);
|
||||
std::vector<defs::ROI> parseRoiVector(const std::string &input);
|
||||
defs::ROI parseRoi(const std::vector<std::string> &args);
|
||||
|
||||
template <typename V> std::string OutStringHex(const V &value) {
|
||||
if (value.equal())
|
||||
|
||||
@@ -2193,6 +2193,20 @@ return 0
|
||||
}
|
||||
__rx_roi() {
|
||||
FCN_RETURN=""
|
||||
if [[ ${IS_GET} -eq 0 ]]; then
|
||||
if [[ "${cword}" == "2" ]]; then
|
||||
FCN_RETURN=""
|
||||
fi
|
||||
if [[ "${cword}" == "3" ]]; then
|
||||
FCN_RETURN=""
|
||||
fi
|
||||
if [[ "${cword}" == "4" ]]; then
|
||||
FCN_RETURN=""
|
||||
fi
|
||||
if [[ "${cword}" == "5" ]]; then
|
||||
FCN_RETURN=""
|
||||
fi
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
__rx_silent() {
|
||||
|
||||
@@ -2117,6 +2117,20 @@ return 0
|
||||
}
|
||||
__rx_roi() {
|
||||
FCN_RETURN=""
|
||||
if [[ ${IS_GET} -eq 0 ]]; then
|
||||
if [[ "${cword}" == "2" ]]; then
|
||||
FCN_RETURN=""
|
||||
fi
|
||||
if [[ "${cword}" == "3" ]]; then
|
||||
FCN_RETURN=""
|
||||
fi
|
||||
if [[ "${cword}" == "4" ]]; then
|
||||
FCN_RETURN=""
|
||||
fi
|
||||
if [[ "${cword}" == "5" ]]; then
|
||||
FCN_RETURN=""
|
||||
fi
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
__rx_silent() {
|
||||
|
||||
@@ -2466,15 +2466,6 @@ free:
|
||||
PUT:
|
||||
argc: 0
|
||||
|
||||
user:
|
||||
is_description: true
|
||||
actions:
|
||||
GET:
|
||||
argc: 0
|
||||
PUT:
|
||||
argc: 0
|
||||
|
||||
|
||||
hostname:
|
||||
is_description: true
|
||||
actions:
|
||||
@@ -2607,7 +2598,11 @@ rx_roi:
|
||||
GET:
|
||||
argc: 0
|
||||
PUT:
|
||||
argc: -1
|
||||
args:
|
||||
- argc: 2
|
||||
arg_types: [ int, int ]
|
||||
- argc: 4
|
||||
arg_types: [ int, int, int, int ]
|
||||
|
||||
ratecorr:
|
||||
is_description: true
|
||||
@@ -4288,6 +4283,14 @@ initialchecks:
|
||||
cast_input: [ true ]
|
||||
output: [ args.front() ]
|
||||
|
||||
user:
|
||||
help: "\n\tUser details from shared memory (hostname, type, PID, User, Date)."
|
||||
actions:
|
||||
GET:
|
||||
argc: 0
|
||||
check_det_id: true
|
||||
function: getUserDetails
|
||||
output: [ t ]
|
||||
|
||||
|
||||
|
||||
|
||||