updated client versioning (#1061)

* dev: update 2d gain plot color map (if no x and ymin/max changes or window resizing): setFixedWidth was updating for window resize, updated virtual servers for g2 and jungfrau to keep changing gain and data for every frame. the data value (#819)

* Dev/jf/fix pedestal (#821)

* jf pedestal fix: touch enable bit last

* dev: jf sync: stopping master gives idle (#824)

* jf sync mode master could return idle when stopped and so not all modules return the same value and must check for 'stopped or idle', Also must throw if any of the module gives an error

* added contains_only to sls::Result (#827)

* added variadic template for checking if a result contains only specified values

* fix for gcc4.8

* renamed to Result::contains_only

* updated condition in Detector.cpp

* stop on only the positions

---------

Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>

* dev jf: change status reg bits  (#829)

* jf: rewrite of status reg bits, waiting state includes both wati for trigger and start frame, blocking trigger only waits if its not in waiting for trigger and run busy enabled, error state connected in firmware

* dev jf: reconfigure chip when touching electron collection mode bit (#831)

* jf: if bit 14 in reg 0x5d (electron mode collection bit) is changed, configure chip if v1.1 and powered on. so touch writeregister (setbit/clearbit also calls write register in the end). replace when electroncollectionmode command introduced

* eiger required fw version to 32: fix for blocking trigger in quad (#834)

* fix warning for prev_val (variable size array) in tests (#838)

* Dev: : gui acq finished callback for different status (#850)

* fix acquisition finished status to have different status for different modules, but does not have to be error. for eg. jf sync fw (2.4.1 gives idle for master and stopped for slaves when stopping acquiistion)

* handling inconsistent fnums to be -1 in gui, so when one sets 0 (change of value) will also give an exception (#854)

* Dev: fix py virtual test  (#846)

* draft to fix virtual test when it fails

* catching errors in tests and removing sigchild ignore so servers (process in background) executing commands will not fail (pclose no child processes, if sigchld is ignored) fixed

* uncommented python loading config

* somehow killal slsReciever in second detector test fails even though no receiver running

* fixing script for virtual simlator test:fixed issue with check if process running, fixed moench tests

* formatting

* tests for jf (#835)

* execute command inside server fixed (from fix simulator tests and exec command PR) (#857)

* dev: fix server logic in checking detector idle  (#861)

* fix buggy logic in checking detector idle and an argument check

* Dev: trigger signal issues handled at acquire (#864)

* if blocking and handling sync, only master gets blocking acq, slaves get non blocking as they are first and so dont get status or error caught when slaves dont get trigger (due to not connected etc) and acq returns with slaves still in waiting status. so check status of all in blocking acq

* for all dets with sync, ensure atleast one master when starting acq

* docs updated about sync

* minor fix for test_simulator

* updating docs

* fixed doc

* added python 3.12 to the conda build variants

* documentation and examples

* formatting

* forward declare zmq_msg_t and moved include (#869)

* forward declare zmq_msg_t and moved include

* removed zmq from pkg list

* removed zmq as dependency for slsdet (#870)

* dev: moench: min exptime (#865)

* moench: remove min clock cycles for setting exptime (had been ported from jf)

* commands code generation (#871)

* commands code generation  (#803)

* commands code generation for only frames command

* fix cmake file and add Caller files

* working exptime, fully extended commands file and its variants

* start adding template commands

* add INT_CMD_VEC_ID template

* add list command, generate multiple bins, format code

* reach 208 commands using the cpp macros

* add tests for command parser

* start adding tests for commands parser

* fix typo to use commands.yaml

* add more tests for command_parser

* add all template functions (up to 218 commands)

* finish template functions and add more CmdProxy.cpp functions (250+)

* 257 commands

* 300 commands the rest are very special commands

* add special commands without generation

* separate special functions from generated c++ file

* implementing one command for put and get (buggy)

* add infer action in a separate file

* generate header for special commands from yaml

* allow only 0 or 1 for bool inputs

* group all commands in gen_commands.py

* add help to gen_commands.py

* add autocomplete bash script

* autocompletion: add support for module levels and help

* remove debugging line

* add autocompletion, help to commands, change int [0,1] to bool

* copy tests for Caller.cpp. Tests pass

* update with the new developer branch changes

* fix errors after merging (there is problems with tests)

* fixed port/stopport in yaml (intput typo), added '_caller' to the test dac and test on chip dac command in global test for cmdcaller

* undo previous test simulator debug change

* add documentation for the generated code

* reducing the comment to be replaced in length so formatting does not split into 2 lines

* removed formatting specific style of C++11 in gen_commands.py to keep with the top level clang format of the project
* regeneratign code for commands

* automation generated

* Redirect deprecated commands (#872)

* working implementation, need to fix dac

* fixed deprecation redirect for dac command

* Detector specific autocomplete (#873)

* working implementation, need to fix dac

* fixed deprecation redirect for dac command

* detector specific completion for dac

* added autocomplete using detector specific

* fixed error when autocompleting partial words

* Generate commands/fix commands (#875)

* fix vm_a, im_a etc have deg Celsius suffix, also help missing or changed in some places

* dac: require det id for all, arg0 to be printed at output, help for onchip dac and dac, onchipdac: spacing

* getscan detid and blocking trigger help

* udp_Dstlist det_id fixed, but rx_id invalid

* cmdApp in line with cmdLineApp (missing version, receiver_id, not creating det object in help action

* added set_command to differentiate between check_det_id and require_det_id (mixed up), args: -1 needs to check for at least one argument

* reordering

* reordering and checked till integer_command_hex

* fixed a lot more commands

* fix caller tests for eiger

* changes to tests after Bechir left

* changing .cmd to .cmdcall for the caller commands

* fixed tests for caller, still warning for setexptime about cast input

* autocomplete ran

* add moench test

* regenerating autocomplete and commands

* fixing other things from merge conflicts (renaming slsDetectorDefs to defs in commands.yaml)

* formatting

* added code injection to help (#876)

* updated 3 commands to have get output that can be put into put (#877)

* updated some commands to have get output that can be put into put

* fix tests for clkdiv

* adding help to free (#878)

* removing old commands and renaming them, (also making it work for parameters command as it was still calling cmdproxy) (#879)

* More helpful error messages for unsupported actions (#880)

* removing old commands and renaming them, (also making it work for parameters command as it was still calling cmdproxy)

* Added specific help for unsupported actions

* fixed a vetofile get special exception message. more specific warning for special exception message instead of no function warning

* added condition checking true in exceptions for special message

---------
Co-authored-by: Bechir Brahem <bachbrahem@gmail.com>
Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>

* Generate commands/fix det command rename (#881)

* made a link to bash autocompletion script in main folder, and replaced all references to 'det' command with 'sls_detector'

* Generate commands/fix detp detg command rename (#882)

* replacing detp with sls_Detector_put and detg with sls_detector_get

* sls_detector_not implemented, but extended message to ask user to use sls_detector_get or sls_detector_put

* autocompletion also for sls_detector or det

* Xilinx ctb (#884)

* updated registers, arm64

* compiler set to aarch64 for xilinx server

* updated RegisterDefs.h

* merge into generate branch and resolving conflicts and adding the xilinx changes to callerspecial and commands.yaml

* compiles and can print firmware version (using a different csp0 address)

* fixing other servers (gotthard, jungfrau, moench, mythen3) that it returns in case of mapping failure, xilinxctb: added that it checks type, prints proper fw version, checks kernel date, added armprocessor define to use in common places, added specifiers to supress overflow and truncation warnings

* added detector ip and mac adddress to the printout

* fixed tests and recompiled servers

* Xilinx client tests (#887)

* implemented testbus, testfpga, set/get #frames, triggers, allowed that and for connection to client, also allowed, getnumchannels, configuremac, getrunstatus, setdetectorposition with dummy values

* allowing tests for xilinx

* binaries in

* Dev/xilinx defaults and pattern (#888)

* implemented testbus, testfpga, set/get #frames, triggers, allowed that and for connection to client, also allowed, getnumchannels, configuremac, getrunstatus, setdetectorposition with dummy values

* connected kernelversion, hardwareversion, versions, framesl, triggersl, dr, timingmode, pattern (except patioctrl) thats there for altera ctb

* replaced set/get64Bit to set/getU64bit in all loadpattern.c for (ctb and m3 also)

* minor

* updated commands generation

* formatting

* moench default speed set to after init readout configuration (half speed) (#886)

* Fixed path when building as submodule

* Moench v8 (#892)

* new rct structure for moench03

* new moench data structure for offline processing

* meonch raw data and zmq process files updated to 7.0.3 version

* implemented config file for Zmq file

* raw data and zmq work with config file, but only with one file/interface

* zmq config change

* added config examples for zmq and rawdata

* pmod for 7.0.3 and 8.0.0 from previous releases

* updated pmod 8.0.1 for rh7 and rh8

* m3 fix to get kernel version properly on nios without an incorrect error msg (#898)

* moench: changed max shifts of adc clk from 240 to 200 (#900)

* Protect from getenv("HOME") returning nullptr  (#907) (#908)

* Protect from getenv("HOME") returning nullptr (e.g., in case running in systemd)

* Write proper warning in Module.cpp

Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>

* Dev/xilinx acq (#901)

* period and exptime(patternwaittime level 0)

* added new regsieterdefs and updated api version and fixedpattern reg

* autogenerate commands

* formatting

* minor

* wip resetflow, readout mode, transceiver mask, transceiver enable

* acquisition, but streaming done bit and busy (exposing + read chip to fifo) not known yet from fw

* programming fpga and device tree done

* most configuration done, need to connect configuretransceiver to client

* stuck at resetting transciever timed out

* minor

* fixed virtual, added chip busyto fifo, streaming busy, set/getnext framenumber

* configuretransceiver from client, added help in client

* make formatt and command generation

* tests for xilinx ctb works

* command generation

* dacs added and tested, power not done

* power added

* added temp_fpga

* binaries in

* ctrlreg is 0 to enable chip=fixed, high dac val = min val= fixed, power regulators in weird order=fixed, device tree could be loaded with dacs before adcs=fixed

* start works

* virtual server sends

* receiver works

* tests

* python function and enum generation, commands generatorn and autocomplete, formatting, tests

* tests fail at start(transceiver not aligned)

* tests passed

* all binaries compiled

* eiger binary in

* added --nomodule cehck for xilinx

* updated binaries

* formatting

* moench server: changed default values of adcphase for full speed from 300 to 150 and dac vipre_cds from 800 to 1280 (#922)

* client bug fix: m3 multi module bad channel file throws bad allocation when modules skipped, needed to add vectors in 2d vector of bad channel list (#920)

Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>

* developer: blocking acquire stop with slave temporarily in waiting (#926)

* client: stopping a blocking acquire of multi modules checks status to catch slaves that might still be in waiting. Problem is (gotthard2 25um at least) slave is in waiting only temporarily before going go idle/stopped. So a 50ms sleep is necessary ot not throw an unnecessary error

* client: when stopping blocking acquire, wait up to 1s in 50ms increments for slave to stop waiting temporarily

* fix to rapidjson for build with gcc 14 (#929)

* Dev: m3 clkdiv0 20 (#924)

* m3: clk 0 changed from 10 to 20 (100MHz to 50MHz)

* g2: startup clk div back to 10 as in firmware but setting in software startup to 20

* m3: minor print error if clk divider > max

* G2: reconfigure chip (#927)

* changed common.c readADCFromFile to make it more general and move temperature calculation for Eiger out of this function and inside whereever it is called.
* g2 and m2: gethighvoltage was just a variable set in server, it is now moved to a get inside DAC5671 implementation (but not reading a measured value, instead what is set from a file), high voltage variable used inside DAC5671 for virtual servers
* g2: switching off hv (ifrom non zero to zero value) will wait for 10s; powering on chip reconfigures chip; powering off chip unconfigures chip; powering off chip also includes check if hv = 0, if not throw exception; chip configuration checked before acquring; at start up: hv switched off and chip powered on, so does not wait 10s to switch off hv;
* included test to check powering off chip when hv is on should throw an exception
* g2:  check if chip configured before acquiring

* nios: read hv value set from file and virtual still goes into DAC5671 for conversions to and fro dac to V, change common readadc to readparameter to generalize, make sethighvoltage into a get and set to catch errors in get as well, g2: if not at startup, remmeber hv value before setting it and after check if value was being switched off (from a non zero value) and wait 10s if it was (10s wait only for switching off from non zero and not at startup)

* developer: moench empty data callback  (#936)

* moench (feature to wait for post processing to be done in new sls_detector_acquire_zmq executable)

READOUT_ACTION_ZMQ added to action enums
sls_detector_acquire_zmq added to executables
empty data call back so that client listens to last dummy zmq packet from moench post processor
processor: remove NEWZMQ ifdefs and remove connect for zmq publisher socket

* fix to compile

* cmds generated and parsed

* dev: client: status for blocking acquire stop with slave temporarily in waiting (#944)

* acq finish call back gets status squashed with default error but before that need to wait for gotthard slaves to catch up from waiting to stopped

* bug fixes related to file saving (#931) (#946)

* fix the file path resetting issue of GUI in the case where different modules have different fpath setting.

* fix stack-buffer-overflow issue when using HDF5 HDF5DataFile::parameterDataTypes have 64bit type (i.e. STD_U64LE), the size of fill_value should be at least 8 bytes.

* change the type of fill_value to uint64_t

Co-authored-by: Z.H. Li <zhenghenge@gmail.com>

* updated documentation from martin (#948)

* Dev/xilinx ctb test (#942)

* voltage regulators only looks at dac and not at ctrl_reg

* xilinx: change dac max to 2048, setting dac ist not inverse conversion from dac to voltage anymore, but setting power is inverse, also there is max and min to power, a different min for vio and this is checked at funcs interface, not printign or converting to mv in dac for power regulators (as its conversion max and min are different)

* Use links for dacs/adc and adapt power rglt thresholds

* Remove wait for transceiver reset

* adc and dac device not used anymore and hence removed

* udp restucturing: arm has to be multiple of 16 and no byteswap in udp_gen, option to compile locally in arm architecture, memsize of the second udp memory has to be limited

---------

Co-authored-by: Martin Brückner <martin.brueckner@psi.ch>

* formatting

* dev: jungfrau HW 1.0: adc output clock phase to 120 (#952)

* jungfrau: change adc output clock phase from 180 to 120 for v1.0 boards for reliable readout of adc #2

* versioning

* formatting

* rx: moved creating fpath (if it doesnt exist) from setting file path to at the start of acquisition when creating file. This is done here so that it does not fail if fwrite is disabled anyway. Also fixed it in documentation. Changed in documentation that the default for fwrite is disabled (#957)

* added keepalive zmq socket option (after 60s of idle time, 10 probes every sec. Mainly because an issue at Max IV (#956)

* Moench mess from developer (#953)

* new moench data structure for offline processing

* Dev/zmq stream all ipv6 adn remove rx_zmqip (#958)

* enable ipv6 in zmq socket

* removed rx_zmqip API and field in gui, changed client updaterxrzip to updateclientzmqip to have the rx_hostname ip if 0. 

* updated command line for rx_zmqip to give a warning. 

* Replaced 'depreciated' to 'deprecated' everywhere

* switching from * to 0.0.0.0 works for rebinding zmq sockets

* fixed help in command line for rx_zmqip * to 0.0.0.0 and removed cmd in python

* remove publisher zmq socket ip also for moench post processing

* fixed tests

* publisher zmq ip macros to be reused

* fixed a warning about narrowing conversion from size_t to int (#963)

* fixed stop server not starting up with setup variables (#949)

* m3: fixed stop server not starting up with setup variables

* all servers except eiger fixed for virtual stop server to start up with setupDetector function called

* virtual tests work

* eiger: versions print neednt be in stop server

* jungfrau: stop server (not virtual) also needs to read config file

* ensuring master is setup for virtual and real servers

* Dev/pyctbgui merge (#960)

* added empty c extension

* added rotation to the decoding

* added color map, options and findex

* minor

* move checks to before acquisition

* added pixel map based decoder

* cleanup

* no thread creation for single thread processing

* added rotation and test to compare

* allow high and low water mark for zmq (also buffer size) for fast readouts

* removed roatation during decoding

* added Transpose to image and invert Y False to invert it

* retains the zoomed state after the first image of gui, catch and display exception if no detector connected

* moved start frame to dockable widget, removed extra frame number label, moved current measurement also to dockable widget, hide frame plot entirely when showing patternviewer

* first image dependin on which plot

* remember settings of main window size and position, dockewidget if docked, its size and posisiotn as well, then update it next time the gui is opened

* change in comment

* using c decoder for moench 04 and matterhorn

* catch exception from invalid image from decoder

* clean up

* update row and col when choosing image type, neeeded to show values

* fix for previous PR

* disable resetting colormap values
keep the range selected for every new acquisition

* fix typos + tested on virtual matterhorn

* minor print

* refactored Slow ADCs Tab

* refactored DAC tab

* refactored power supplies

* refactored signals tab

* refactored transceiver tab

* fix typo

* fix typo2

* remove commented code

* delete commented code

* delete commented code

* delete commented signals code

* remove commented code for transceiver tab

* refactor adc tab

* refactor Pattern Tab

* Refactor transceivers tab (PR#5) (#118)

* refactored transceiver tab

* remove commented code for transceiver tab

---------

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>

* refactor adc tab (PR#6) (#119)


* refactor adc tab

* refactored Plot and Acquisition Tabs

* fix the regression issue

* restructure project files

* applying singleton and renaming tabs to services

* working install using pip

* applies singleton to tab classes and remove CI erros

* added pyzmq and pillow

* remove the singleton implementation and keep changes

* fix merge errors in mainWindow

* moved misplaced init file

* rename service to tab

* reorganize imports

* iterate over tabs

* reorder tabs

* add slowadc to the list

* saving changes (buggy)
power supply ui not showing in the gui

* split power supply tab

* fixed tests

* add hardcoded values to defines file

* fix error

* separate power supply

* fix errors for powerSuppliesTab

* split dacs

* split slow adcs

* split signals tab

* added tests for bit_utils

* add slowAdc class to defines

* split transceiver ui file

* split adc.ui

* split pattern ui file

* split plot and acquisition ui file

* added basic test for parsing bit names

* removed redundant code in read_alias_file

* fix dacs ui position

* testing for correct exception

* cmd and args at split

* group radio buttons

* fix comments from PR#1

* show legend

* added python version and dev requirements to setup.py

* fix dac issue

* moved _decoder into pkg

* added inplace build

* removed clear

* fixed dependencies

* make tests run without slsdet

* updated name of action

* define colcount

* fixed loading of alias file

* add yapf and ruff

* apply formatting

* fix E and F rules

* add more ruff rules

* change variable name

* squashing gh debugging commits and add pre-commit

* update label values to mv units

* add hook for yapf

* reconfigure yapf precommit hook

* add format and check_format to makefile

* change gh actions

* update readme

* added check_format

* WIP

* added linting in github action

* updated readme]

* add more control for color choice

* remove useless file

* fix un-updated line after refactoring Defines
BIT0_31_MASK is not found in Defines.signals

* visually improve the interface

* fix last commit

* add only selected plots for legend

* add hide legend button

* change hide legend to show legend
checkbox show legend is checked by default

* add support for saving in numpy

* solve conversations

* fix acq index offset

* fix browse button in pattern error

* fix other browse button errors

* finish tests and add usage.md

* remove buffer

* add file,numpy-like interface and tests

* remove useless .npy files

* subscriptible npz files

* remove useless files

* remove repetetive tests

* save changes

* add mode r+, add with support,remove logging

* remove offset of acqIndex between raw and numpy saving

* fix only saving last frame

* save signals of multiple devices

* add comments and move condition for clearer code

* fix bug when vieweing pattern file

* iterate over enabled and plotted plots

* add padestal substraction to transceiver and analog data

* init pedestal frames to detector.frames

* restore old exception

* add pedestal substraction for digital signals

* remove frames spinbox from plotTab

* remove comments and use str instead of Path

* avoid saving all frames

* correct exception and log error's trace

* add gui tests

* add waveform test

* add pedestal test

* refactor by using fixtures

* add tests for moench analog and pattern

* add pytest-qt to dependencies

* add save and load gui parameters

* remove nohup file

* fix old bug IndexError

* save plot type

* a

* handle canceling load, loading matterhorn pedestal for moench

* remove comparing .png files for pattern test

* save plot type

* red error on status bar when shape mismatch for loaded pedestal

* fix makefile and docstrings

* fix PRs conversation

* move code into different function

* fix wrong function names for power supply

* removed old ctbgui

* removed unnecessary files

---------

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
Co-authored-by: Braham Bechir <braham_b@pc11979.psi.ch>
Co-authored-by: Bechir <bechir.braham@psi.ch>
Co-authored-by: Bechir <bechir.brahem420@gmail.com>

* Dev/xilinx mat update (#959)

* put back code to obtain adc and dac device indexafter loading device tree and then create folder iio_device_links and create symbolic links there according to device indices found. ln -sf operation not permitted, so folder has to be deleted and created everytime. Also refactored definitions to have all the xilinx name or detector specific stuff out of programbyArm.c

* uncommented waittransceiverreset at startup (should work now) and return of powering off chip at startup (error for transceiver alignment reset)

* updated registerdefs from firmware

* minor prints and updating names from registerdefs

* waittransceiverreset has been fixed in firmware and removing warnign for that, transceiver alignment check for powering off chip is not done in fw (giving a warning and returning ok for now)

* fixing ipchecksum (not done), removed startperiphery, allowing readout command to be allowed for xilinx when acquiring

* dont build doc for Tobi Schluter from libzmq, which uses iso-8859-1 and the umlaut cause compilation to fail on some machines (#973)

* 8.0.2 psi modules

* missed the rx_zmqip implementations in detector.h and python bindings (#975)

* rx_zmqip has been removed. Remove it also for pyctbgui (#979)

* format

* Dev/rx callbacks (#966)

* changed rxr callback signatures to all include structs
* removed datamodify call back as size can be changed in the original data call back now
* bringing some parameters (set functions) to dataProcessor class for its callback (namely udpport, quad, fliprows, totalframes, jsonheader), resulting in also removing totalframes from 2 other function signatures

* updated MultiReceiverApp to reflect the new callback signatures

* Dev/reg bit change no validate (#970)

- do not validate write reg, setbit and clearbit by default anymore
- --validate will force validation on the bitmask or entire reg
- remove return value for write reg (across server to client, but thankfully not in the Detector class)
- extend validation into writereg, setbit and clearbit for Eiger (always special)
-  need to check python (TODO)
- missed the rx_zmqip implementations in detector.h and python bindings

* sleep implemented for command line, mainly for config files for firmware developers (#982)

* change gain mode help from dynamicgain to dynamic (#988)

* fixing python version. allowing versions to execute even if no detector connected or in shared memory (#990)

* Jf: Electron collection mode (#983)

* electron collection mode for jungfrau. also removing the config chip when using register command
* collectionMode: HOLE/ELECTRON (enum)

* Dev/m3 readout speed (#985)

* added readoutspeed command to m3 (fullspeed - 10, half speed - 20, quarter speed - 40), removed reaodut pll, moved up system pll clock indices, leaving pll index in common altera code, default speed is half speed, allow only system_c0 to be set, the others can be obtained, same for clkphase, maxclkphaseshift, clkfreq. added to readoutspeedlist commands, updated help and updated tests

* updated readoutspeedlist command

* jf: timing info decoder (#987)

* timing_info_decoder command with options swissfel (default) and shine. added to python, command line generation, autocomplete, tostring, tests.

* updated jungfrau timing info decoder mask (#991)

* minor. removed warning print at startup for empty eth udp to listen to (#992)

* removed 'Caller/CALLER' from test names as there is only one command line now (#993)

* formatting

* Dev/g2 stop frame number (#980)

* get/set next frame number in G2 (firmware only has set, no get)
* firmware has issues: each stop keeps 2 frame header in fifo and the resetting frame number happens after that
* removed the option to set burstmode to burst external or continuwous internal
* needs to be revisited before 9.0.0

* formatting

* fix the command help in the command help generator for Gotthard2 about nextframenumber (#994)

* first draft at fixing nextframenumber properly with firmware (#995)

* fixing nextframenumber properly with firmware

* updated firmware to have getnextframenumber and fixed setnextframenumber to reset also the header fifo when stopping

* fix tests for gotthard2

* Dev/g2 fix next frame number (#996)

* binaries in

* formatting

* release notes

* release notes

* updating firmware dates

* release notes

* package release version and renaming server names

* updated client versioning

* updated moench fw release version

* 900/proper free (#1002)

* first draft of fixing the free function available within the class

* removed class member function freeSharedmemory for both Detector and Module; made the free function freeSharedmemory accessible to python interface; setHostname if there is already a module in shm will recreate the Detector object while freeing shm completely and keeping detsize and intitialchecks (previous commit), sethostname called from DetectorClass in virtual command to have one point of entry (previous commit), testing Module class frees shared memory using free function

* Detector class: added copy and move constructor and assignmentoperators due to explicit destructor (DetectorImpl fwd declared), DetectorImpl class: included ZmqSocket to remove destructor (should not be virtual in any case), Module class: removed explciit destructor to allow compiler generated constructor and operators

* formatting

* updated client version date

* minor fix for readme autocomplete

* setting detsize after hostname should throw also for single module for consistency (#999)

* 900/autocomplete documentation (#1003)

* fixed the gendoc to reflect the new parser, updated documentation to include info about autocomplete in the command line part, error in createing docs

* fixed list deprecated, fixed command help (to show properly on a html, fixed other help warnings

* minor indents

* 900/g2 chip configure at startup (#1008)

* g2: chip reconfigure variable not set when powering on at startup because readconfig is the one configuring the chip the first time to default chip settings

* cleaning up code

* 900/rm volatile (#1006)

* Removing volatile and replacing with atomic to ensure atomicity

* compiling header include issue

* 900/jf firmware rollback (#1010)

* jf: rolling back firmware required to v1.5 and 2.5, updated release notes, fixed a bug when updating server (when server name same as link name:throws with no message, pedestal mode check changed for the time being for loops to be 0xFF size

* compensating for jf fw bug for pedestalmode where loops should be 16 bit, but is 8 bit in fw. to be fixed in next version

* formatting

* fixed python test simulator to kill previous servers

* gui: hide 'complete image' and just show 'missing packets' when there are missing packets in that image form the receiver (#1013)

* release notes update (#1015)

* 900/detach pthreads not joining (#1017)

* detach the pthreads that are not joining else memory leak

* release notes

* removed the clean up comment, also refactored the pthread join/detach for ctb 1g

* 900/server malloc check (#1020)

* usleep in communication to actually relay the err message of memory allocation to the client (weird but test for now), function in server to handle memory allcoation issues (updates mess, ret and sendsit to the client and returns prior from function implementatin, setting fnum in client for the speicific functions that send to detector each argument separtely, they need to remember the fnum else they throw with the incorrect fnum

* server: every malloc must check if it succeeded, rearranging so that the free is clear as well (only in funcs so far)

* formatting

* fixed malloc checks in other places other than funcs.c

* bug fix return from previous commit

* pointer bug from previous commit

* formatting

* binaries in

* 900/document json ctb file format (#1027)

* docs receiver formats rewrite

* added documentation for all the receiver files, updated release notes, udpated help in commands help for timing, fixed by throwing exception for aa dividy by 0 error caused by not freeing memory (detsize) when switching between 1d and 2d detectors, removed unnecessary 'recevier up' printout, fixed dbit list 64 bit mask error in master json file (was not 64 bit before), fixed bug in reading gotthard1 data (needs to be tested)

* generating commands help and formatting, also fix help for trimen command line

* added ctb frame format documentation, added some links to some commands, added documentation about adding expat-devel in installation for rhel8 gui, fixed some indentation issues that screwed up command line help documentation

* added ctb frame format documentation

* updated documentation about zeromq-devel for <8.0.0 versions

* fixed typo in python for vb_pixbuf Jungfrau dac (#1030)

* fixed cli documentation (#1037)

* 900: legal gain values in jungfrau simulator (#1043)

* legal gain values in jungfrau simulator

* typo

* release notes

* 900/jungfrau temp control default enable (#1041)

* jungfrau: enabling temp control by default at server startup

* 900: fixed invalid arguments to slsmultireceiver (#1039)

* wasnt showing error message for invalid arguments to slsmultireceiver
* allow 0 arguments to act like an slsReceiver with start tcp port 1954 and just 1 receiver

* 9.0.0: version from file to cmake and python (#1024)

- renamed conda-recipe folder
- added a check to see if build and install folder exists in build.sh (conda recipe)
- created VERSION file that has '0.0.0'for developer but can be updated using update_version.py that takes in a version. The script checks for semantic versioning and updates VERSION file
- VERSION file also copied along with py files to slsdet in python cmakelist and build_pylib.sh (for conda), also copied in root folder for installations (for no coding purpose)
- init.py and setup.py reads this file to get the version (a bit differently to find the VERSION file)
- VERSION file read into cmake to get the version and also added to compile definition. So RELEASE removed from versionAPI.h (using SLS_DET_VERSION compile definiton instead) and also removed updateRelease script.
- conda getting project version from environment variable SLS_DET_VERSION that is set in build_pylib.sh prior.
- added 3.13 python to conda build
- anything related to ctb removed from release notes as users will always use developer
- sets 9.0.0 to VERSION file  by running update_version.py without an argument

* formatting

* finalized binaries

* updated m3 fw version (#1046)

* release notes

* fix cmake (cannot find VERSION file) when using package as subfolder as cmake_source_dir is not same anymore, add troubleshooting doc for m3 regarding loose control board for waiting status in auto timing mode, fix m3 tests to test register write (previously was read only) (#1047)

* 900: bumped pybind11 version and added setuptools on host (#1050)

* bumped pybind11 version and added setuptools on host

* updated pybind11 tarball to 2.13 and in cmakefile to get 2.13 frpm github, also updated documentation about pybind 2.13

* update release notes, doc

* updating readme

---------

Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>

* 900 cmake_source_dir (#1053)

* when package used as subdirectory (cmake-subfolder-example) it fails when python is used because the cmake_source_dir is now the one above package.

* changed cmake_current_list_dir to cmake_current_source_dir

* removing the unnecessary VERSION file installed in the root directory (from PR #1020)

* 900: pybind 2.13.6 and python 3.8 (#1054)

* changed pybind 2.13.0 to 2.13.6, kept conda at min 2.13.0

* changed min python version from 3.6 to 3.8

* 900/docs (#1056)

* minimum python is 3.8, so >=

* removed ctb frame documentation. should be in internal wiki

* updated release notes

* updated releate date

---------

Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
Co-authored-by: froejdh_e <erik.frojdh@psi.ch>
Co-authored-by: anberga <34126852+anberga@users.noreply.github.com>
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
Co-authored-by: Z.H. Li <zhenghenge@gmail.com>
Co-authored-by: Martin Brückner <martin.brueckner@psi.ch>
Co-authored-by: Braham Bechir <braham_b@pc11979.psi.ch>
Co-authored-by: Bechir <bechir.braham@psi.ch>
Co-authored-by: Bechir <bechir.brahem420@gmail.com>

.gitea/workflows/rh8-local.yml

@@ -1,33 +0,0 @@
-name: Build on local RHEL8
-
-on:
-  push:
-    branches:
-      - developer
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: "detectors-software-RH8"
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build library 
-        run: |
-            source /home/gitea_runner/.bashrc
-            conda activate det
-            mkdir build && cd build
-            conda activate det
-            cmake .. -DSLS_USE_PYTHON=ON
-            make -j 2 
-            cd ../pyctbgui
-            make
-
-      - name: Deploy to NFS update server
-        if: gitea.ref == 'refs/heads/developer'
-        run: |
-            sftp -r gitea_runner@mpc2935:/slsDetectorSoftware/RH8 <<< $'put build/bin'
-            sftp -r gitea_runner@mpc2935:/slsDetectorSoftware/RH8 <<< $'put pyctbgui'

.gitea/workflows/rh8-native.yml

@@ -1,29 +0,0 @@
-name: Build on RHEL8
-
-on:
-  push:
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: "ubuntu-latest"
-    container:
-      image: gitea.psi.ch/detectors/rhel8-detectors-dev
-    steps:
-      - name: Clone repository
-        run: |
-          echo Cloning ${{ github.ref_name }}
-          git clone https://${{secrets.GITHUB_TOKEN}}@gitea.psi.ch/${{ github.repository }}.git --branch=${{ github.ref_name }} .
-
-      - name: Build library 
-        run: |
-            mkdir build && cd build
-            cmake .. -DSLS_USE_PYTHON=ON -DSLS_USE_TESTS=ON -DSLS_USE_SIMULATOR=ON
-            make -j 2 
-
-      - name: C++ unit tests
-        working-directory: ${{gitea.workspace}}/build
-        run: ctest -j1  --rerun-failed --output-on-failure

.gitea/workflows/rh9-local.yml

@@ -1,30 +0,0 @@
-name: Build on local RHEL9
-
-on:
-  push:
-    branches:
-      - developer
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: "detectors-software-RH9"
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build library 
-        run: |
-            mkdir build && cd build
-            cmake  -DSLS_USE_PYTHON=ON -DPython_EXECUTABLE=/usr/bin/python3.13 -DPython_INCLUDE_DIR=/usr/include/python3.13 -DPython_LIBRARY=/usr/lib64/libpython3.13.so ..
-            make -j 2 
-            cd ../pyctbgui
-            make
-
-      - name: Deploy to NFS update server
-        if: gitea.ref == 'refs/heads/developer'
-        run: |
-            sftp -r gitea_runner@mpc2935:/slsDetectorSoftware/RH9 <<< $'put build/bin'
-            sftp -r gitea_runner@mpc2935:/slsDetectorSoftware/RH9 <<< $'put pyctbgui'

.gitea/workflows/rh9-native.yml

@@ -1,27 +0,0 @@
-name: Build on RHEL9
-
-on:
-  push:
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: "ubuntu-latest"
-    container:
-      image: gitea.psi.ch/detectors/rhel9-detectors-dev
-    steps:
-      - uses: actions/checkout@v4
-
-
-      - name: Build library 
-        run: |
-            mkdir build && cd build
-            cmake .. -DSLS_USE_PYTHON=ON -DSLS_USE_TESTS=ON  -DSLS_USE_SIMULATOR=ON
-            make -j 2 
-
-      - name: C++ unit tests
-        working-directory: ${{gitea.workspace}}/build
-        run: ctest -j1  --rerun-failed --output-on-failure

.github/workflows/build_wheel.yml

@@ -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==3.2.1
-
-      - 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

.github/workflows/cmake.yml

@@ -1,4 +1,4 @@
-name: Native CMake Build
+name: CMake
 
 on: [push, pull_request]
 
@@ -14,16 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     name: Configure and build using cmake
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: 3.12
-          cache: 'pip'
-      - run: pip install pytest numpy colorama
-
+      - uses: actions/checkout@v3
       - uses: awalsh128/cache-apt-pkgs-action@latest
         with:
-          packages: libhdf5-dev qtbase5-dev qt5-qmake libqt5svg5-dev libpng-dev libtiff-dev
+          packages: libhdf5-dev qtbase5-dev qt5-qmake libqt5svg5-dev
           version: 1.0
 
       - name: Configure CMake
@@ -33,15 +27,12 @@ jobs:
 
       - name: Build
         # Build your program with the given configuration
-        run: cmake --build ${{github.workspace}}/build -j4 --config ${{env.BUILD_TYPE}}
+        run: cmake --build ${{github.workspace}}/build -j2 --config ${{env.BUILD_TYPE}}
 
-      - name: C++ unit tests
+      - name: Test
         working-directory: ${{github.workspace}}/build
-        run: ctest -C ${{env.BUILD_TYPE}} -j1 --rerun-failed --output-on-failure
-
-      - name: Python unit tests
-        working-directory: ${{github.workspace}}/build/bin
-        run: |
-          python -m pytest ${{github.workspace}}/python/tests
+        # Execute tests defined by the CMake configuration.
+        # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+        run: ctest -C ${{env.BUILD_TYPE}} -j1
 
 

.github/workflows/conda_deploy_library.yaml

@@ -1,47 +0,0 @@
-name: Build and deploy slsdetlib
-
-on:
-  release:
-      types:
-        - published
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [ubuntu-latest, ] # macos-12, windows-2019]
-        python-version: ["3.12",]
-
-    runs-on: ${{ matrix.platform }}
-
-    # The setup-miniconda action needs this to activate miniconda
-    defaults:
-      run:
-        shell: "bash -l {0}"
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Get conda
-        uses: conda-incubator/setup-miniconda@v3.0.4
-        with:
-          python-version: ${{ matrix.python-version }}
-          channels: conda-forge
-
-      - name: Prepare
-        run: conda install conda-build conda-verify pytest anaconda-client
-
-      - name: Enable upload
-        run: conda config --set anaconda_upload yes
-
-      - name: Build
-        env:
-            CONDA_TOKEN: ${{ secrets.CONDA_TOKEN }}
-        run: conda build conda-recipes/main-library --user slsdetectorgroup --token ${CONDA_TOKEN} --output-folder build_output
-
-      - name: Upload all Conda to github as artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: conda-packages
-          path: build_output/**  # Uploads all packages

.github/workflows/conda_deploy_slsdet.yaml

@@ -1,47 +0,0 @@
-name: deploy slsdet
-
-on:
-  release:
-      types:
-        - published
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [ubuntu-latest, ] # macos-12, windows-2019]
-        python-version: ["3.12",]
-
-    runs-on: ${{ matrix.platform }}
-
-    # The setup-miniconda action needs this to activate miniconda
-    defaults:
-      run:
-        shell: "bash -l {0}"
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Get conda
-        uses: conda-incubator/setup-miniconda@v3.0.4
-        with:
-          python-version: ${{ matrix.python-version }}
-          channels: conda-forge
-
-      - name: Prepare
-        run: conda install conda-build conda-verify pytest anaconda-client
-
-      - name: Enable upload
-        run: conda config --set anaconda_upload yes
-
-      - name: Build
-        env:
-            CONDA_TOKEN: ${{ secrets.CONDA_TOKEN }}
-        run: conda build conda-recipes/python-client --user slsdetectorgroup --token ${CONDA_TOKEN} --output-folder build_output
-
-      - name: Upload all Conda packages
-        uses: actions/upload-artifact@v4
-        with:
-          name: conda-packages
-          path: build_output/**  # Uploads all packages

.github/workflows/conda_library.yaml

@@ -1,42 +0,0 @@
-name: Build slsdetlib
-
-on: [pull_request]
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [ubuntu-latest, ] # macos-12, windows-2019]
-        python-version: ["3.12",]
-
-    runs-on: ${{ matrix.platform }}
-
-    # The setup-miniconda action needs this to activate miniconda
-    defaults:
-      run:
-        shell: "bash -l {0}"
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Get conda
-        uses: conda-incubator/setup-miniconda@v3.0.4
-        with:
-          python-version: ${{ matrix.python-version }}
-          channels: conda-forge
-
-      - name: Prepare
-        run: conda install conda-build conda-verify pytest anaconda-client
-
-      - name: Disable upload
-        run: conda config --set anaconda_upload no
-
-      - name: Build
-        run: conda build conda-recipes/main-library --output-folder build_output
-
-      - name: Upload all Conda packages
-        uses: actions/upload-artifact@v4
-        with:
-          name: conda-packages
-          path: build_output/**  # Uploads all packages

.github/workflows/conda_python.yaml

@@ -1,42 +0,0 @@
-name: slsdet
-
-on: [pull_request]
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [ubuntu-latest, ] # macos-12, windows-2019]
-        python-version: ["3.12",]
-
-    runs-on: ${{ matrix.platform }}
-
-    # The setup-miniconda action needs this to activate miniconda
-    defaults:
-      run:
-        shell: "bash -l {0}"
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Get conda
-        uses: conda-incubator/setup-miniconda@v3.0.4
-        with:
-          python-version: ${{ matrix.python-version }}
-          channels: conda-forge
-
-      - name: Prepare
-        run: conda install conda-build conda-verify pytest anaconda-client
-
-      - name: Disable upload
-        run: conda config --set anaconda_upload no
-
-      - name: Build
-        run: conda build conda-recipes/python-client --output-folder build_output 
-
-      - name: Upload all Conda packages
-        uses: actions/upload-artifact@v4
-        with:
-          name: conda-packages
-          path: build_output/**  # Uploads all packages

CMakeFiles/cmake.check_cache

@@ -0,0 +1 @@
+# This file is generated by cmake for dependency checking of the CMakeCache.txt file

CMakeLists.txt

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-3.0-or-other
 # Copyright (C) 2021 Contributors to the SLS Detector Package
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.14)
 project(slsDetectorPackage)
 
 # Read VERSION file into project version
@@ -21,150 +21,50 @@ if (${CMAKE_VERSION} VERSION_GREATER "3.24")
 endif()
 include(cmake/project_version.cmake)
 include(cmake/SlsAddFlag.cmake)
-include(cmake/helpers.cmake)
 
 
-find_package(Threads REQUIRED)
-
-# POSIX threads are required for the moment but we use CMake to find them
-# Once migrated to std::thread this can be removed
-if(NOT CMAKE_USE_PTHREADS_INIT)
-    message(FATAL_ERROR "A POSIX threads (pthread) implementation is required, but was not found.")
-endif()
-
-
-option(SLS_USE_SYSTEM_ZMQ "Use system installed libzmq" OFF)
 
 # Using FetchContent to get libzmq
 include(FetchContent)
 option(SLS_FETCH_ZMQ_FROM_GITHUB "Fetch zmq from github" OFF)
 option(SLS_FETCH_PYBIND11_FROM_GITHUB "Fetch pybind11 from github" OFF)
 
-
-
-# Allow FetchContent_Populate to be called with a single argument
-# otherwise deprecated warning is issued
-# Note: From cmake 3.28 we can pass EXCLUDE_FROM_ALL to FetchContent_Declare
-# and avoid direct use of Populate
-if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.30")
-    cmake_policy(SET CMP0169 OLD) 
-endif()
-
-# Patch libzmq to set minimum cmake version to 3.15 to avoid warnings
-# with newer cmake versions
-# Patch is applied in the FetchContent_Declare
-set(SLS_LIBZMQ_VERSION "4.3.4")
-
-find_program(PATCH_EXECUTABLE patch)
-if(NOT PATCH_EXECUTABLE)
-    message(FATAL_ERROR "The 'patch' tool is required for patching lib zeromq. Please install it.")
-endif()
-
-if(SLS_USE_SYSTEM_ZMQ)
-    # find_package(ZeroMQ REQUIRED)
-    # 1) Try a CMake package config if available (vcpkg, Homebrew, source builds)
-    #    Many installs export either ZeroMQ::libzmq or libzmq.
-    find_package(ZeroMQ QUIET CONFIG)
-
-    set(ZEROMQ_TARGET "")
-
-    if (TARGET ZeroMQ::libzmq)
-        set(ZEROMQ_TARGET ZeroMQ::libzmq)
-        message(STATUS "Found target: ${ZEROMQ_TARGET} version: ${ZeroMQ_VERSION}")
-    elseif (TARGET libzmq)
-        set(ZEROMQ_TARGET libzmq)
-        message(STATUS "Found target: ${ZEROMQ_TARGET} version: ${ZeroMQ_VERSION}")
-    elseif (TARGET ZeroMQ::ZeroMQ) # rare older naming
-        set(ZEROMQ_TARGET ZeroMQ::ZeroMQ)
-        message(STATUS "Found target: ${ZEROMQ_TARGET} version: ${ZeroMQ_VERSION}")
-    endif()
-
-    # 2) Fallback: use pkg-config hints + manual find_* to create an imported target
-    if (NOT ZEROMQ_TARGET)
-        find_package(PkgConfig QUIET)
-        if (PkgConfig_FOUND)
-            pkg_check_modules(PC_ZeroMQ QUIET libzmq)
-        endif()
-
-        find_path(ZEROMQ_INCLUDE_DIR
-            NAMES zmq.h
-            HINTS ${PC_ZeroMQ_INCLUDE_DIRS}
-        )
-
-        find_library(ZEROMQ_LIBRARY
-            NAMES zmq libzmq
-            HINTS ${PC_ZeroMQ_LIBRARY_DIRS}
-        )
-
-        if (ZEROMQ_INCLUDE_DIR AND ZEROMQ_LIBRARY)
-            add_library(libzmq UNKNOWN IMPORTED)
-            set_target_properties(libzmq PROPERTIES
-            IMPORTED_LOCATION "${ZEROMQ_LIBRARY}"
-            INTERFACE_INCLUDE_DIRECTORIES "${ZEROMQ_INCLUDE_DIR}"
-            )
-            set(ZEROMQ_TARGET libzmq)
-        endif()
-        message(STATUS "ZeroMQ version (pkg-config): ${PC_ZeroMQ_VERSION}")
-        
-    endif()
-
-    # 3) Error out if still not found, with a helpful message
-    if (NOT ZEROMQ_TARGET)
-        message(FATAL_ERROR "ZeroMQ (libzmq) not found. Please install ZeroMQ development files.")
-    endif()
-
-# Use it
-# target_link_libraries(your_target PRIVATE ${ZEROMQ_TARGET})
-
-    message(STATUS "Using system installed libzmq: ${ZeroMQ_LIBRARIES}")
-    message(STATUS "ZeroMQ target: ${ZEROMQ_TARGET}")
-    message(STATUS "ZeroMQ include dirs: ${ZeroMQ_INCLUDE_DIRS}")
-else()
-    if(SLS_FETCH_ZMQ_FROM_GITHUB)
+if(SLS_FETCH_ZMQ_FROM_GITHUB)
     # Opt in to pull down a zmq version from github instead of
-        # using the bundled version
+    # using the bundled verison
     FetchContent_Declare(
         libzmq
         GIT_REPOSITORY https://github.com/zeromq/libzmq.git
-            GIT_TAG        v${SLS_LIBZMQ_VERSION}
-            PATCH_COMMAND ${CMAKE_COMMAND} -E chdir <SOURCE_DIR> patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/libs/libzmq/libzmq_cmake_version.patch
-            UPDATE_DISCONNECTED 1
+        GIT_TAG        v4.3.4
     )
-    else()
+else()
     # Standard behaviour use libzmq included in this repo (libs/libzmq)
     FetchContent_Declare(
         libzmq
-            URL ${CMAKE_CURRENT_SOURCE_DIR}/libs/libzmq/libzmq-${SLS_LIBZMQ_VERSION}.tar.gz
+        URL ${CMAKE_CURRENT_SOURCE_DIR}/libs/libzmq/libzmq-4.3.4.tar.gz
         URL_HASH MD5=cc20b769ac10afa352e5ed2769bb23b3
-            PATCH_COMMAND ${CMAKE_COMMAND} -E chdir <SOURCE_DIR> patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/libs/libzmq/libzmq_cmake_version.patch
-            UPDATE_DISCONNECTED 1
     )
-    endif()
+endif()
 
+# Disable unwanted options from libzmq
+set(BUILD_TESTS OFF CACHE BOOL "Switch off libzmq test build")
+set(BUILD_SHARED OFF CACHE BOOL "Switch off libzmq shared libs")
+set(WITH_PERF_TOOL OFF CACHE BOOL "")
+set(ENABLE_CPACK OFF CACHE BOOL "")
+set(ENABLE_CLANG OFF CACHE BOOL "")
+set(ENABLE_CURVE OFF CACHE BOOL "")
+set(ENABLE_DRAFTS OFF CACHE BOOL "")
 
-    # Disable unwanted options from libzmq
-    set(BUILD_TESTS OFF CACHE BOOL "Switch off libzmq test build")
-    set(BUILD_SHARED OFF CACHE BOOL "Switch off libzmq shared libs")
-    set(WITH_PERF_TOOL OFF CACHE BOOL "")
-    set(ENABLE_CPACK OFF CACHE BOOL "")
-    set(ENABLE_CLANG OFF CACHE BOOL "")
-    set(ENABLE_CURVE OFF CACHE BOOL "")
-    set(ENABLE_DRAFTS OFF CACHE BOOL "")
-    set(ENABLE_PRECOMPILED OFF CACHE BOOL "")
-    set(WITH_DOC OFF CACHE BOOL "")
-    set(WITH_DOCS OFF CACHE BOOL "")
-
-
-    # Using GetProperties and Populate to be able to exclude zmq
-    # from install (not possible with FetchContent_MakeAvailable(libzmq))
-    FetchContent_GetProperties(libzmq)
-    if(NOT libzmq_POPULATED)
+# Using GetProperties and Populate to be able to exclude zmq
+# from install (not possible with FetchContent_MakeAvailable(libzmq))
+FetchContent_GetProperties(libzmq)
+if(NOT libzmq_POPULATED)
   FetchContent_Populate(libzmq)
   add_subdirectory(${libzmq_SOURCE_DIR} ${libzmq_BINARY_DIR} EXCLUDE_FROM_ALL)
-    endif()
-
 endif()
 
+
+
 include(GNUInstallDirs)
 
 # If conda build, always set lib dir to 'lib'
@@ -192,7 +92,7 @@ endif()
 
 
 option(SLS_USE_HDF5 "HDF5 File format" OFF)
-option(SLS_BUILD_SHARED_LIBRARIES "Build shared libaries" OFF)
+option(SLS_BUILD_SHARED_LIBRARIES "Build shared libaries" ON)
 option(SLS_USE_TEXTCLIENT "Text Client" ON)
 option(SLS_USE_DETECTOR "Detector libs" ON)
 option(SLS_USE_RECEIVER "Receiver" ON)
@@ -264,9 +164,11 @@ find_package(ClangFormat)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-default_build_type("Release")
-set_std_fs_lib()
-message(STATUS "Extra linking to fs lib:${STD_FS_LIB}")
+if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+  message(STATUS "No build type selected, default to Release")
+  set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type (default Release)" FORCE)
+endif()
+
 
 #Enable LTO if available
 include(CheckIPOSupported)
@@ -289,7 +191,7 @@ endif()
 # to control options for the libraries
 if(NOT TARGET slsProjectOptions)
     add_library(slsProjectOptions INTERFACE)
-   target_compile_features(slsProjectOptions INTERFACE cxx_std_17)
+    target_compile_features(slsProjectOptions INTERFACE cxx_std_11)
 endif()
 
 if (NOT TARGET slsProjectWarnings)
@@ -341,17 +243,14 @@ if (NOT TARGET slsProjectCSettings)
                                                 -Wno-format-truncation
                                     )
     sls_disable_c_warning("-Wstringop-truncation")
-    target_link_libraries(slsProjectCSettings INTERFACE
-        Threads::Threads
-    )
 endif()
 
 
 if(SLS_USE_SANITIZER)
     target_compile_options(slsProjectOptions INTERFACE -fsanitize=address,undefined -fno-omit-frame-pointer)
     target_link_libraries(slsProjectOptions INTERFACE -fsanitize=address,undefined)
-    #target_compile_options(slsProjectOptions INTERFACE -fsanitize=thread -fno-omit-frame-pointer)
-    #target_link_libraries(slsProjectOptions INTERFACE -fsanitize=thread)
+    # target_compile_options(slsProjectOptions INTERFACE -fsanitize=thread)
+    # target_link_libraries(slsProjectOptions INTERFACE -fsanitize=thread)
 endif()
 
 
@@ -405,8 +304,7 @@ if (SLS_USE_INTEGRATION_TESTS)
 endif (SLS_USE_INTEGRATION_TESTS)
 
 if (SLS_USE_PYTHON)
-    find_package (Python 3.8 COMPONENTS Interpreter Development.Module REQUIRED)
-    set(PYBIND11_FINDPYTHON ON) # Needed for RH8
+    find_package (Python 3.8 COMPONENTS Interpreter Development)
     if(SLS_FETCH_PYBIND11_FROM_GITHUB)
         FetchContent_Declare(
             pybind11
@@ -431,15 +329,9 @@ if (SLS_USE_CTBGUI)
     add_subdirectory(pyctbgui)
 endif(SLS_USE_CTBGUI)
 
-# Workaround for file note being copied to build directory
-# when issuing a python -m build
-# TODO! Proper fix
-if(EXISTS ".clang-tidy")
-    configure_file(.clang-tidy  
+configure_file( .clang-tidy  
     ${CMAKE_BINARY_DIR}/.clang-tidy  
-    )
-endif()
-
+)
 
 if (SLS_BUILD_EXAMPLES)
     add_subdirectory(sample)

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+**:
@@ -304,4 +279,3 @@ 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

RELEASE.txt

@@ -1,51 +1,297 @@
-SLS Detector Package Major Release x.x.x released on xx.xx.202x
+SLS Detector Package Major Release 9.0.0 released on 26.11.2024
 ===============================================================
 
-This document describes the differences between vx.x.x and v10.0.0  
+This document describes the differences between v9.0.0 and v8.0.2
 
 
 
     CONTENTS
     --------
-    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           Compilation Changes
+    2           New or Changed Features
+        2.1         Breaking API
+        2.2         Resolved or Changed Features
+        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
+
+2 Compilation Changes
+=====================
+
+
+    *   Python version
+        Minimum python version is changed from 3.6 to 3.8
+
+
+    *   Pybind11 version
+        In-built version and the one picked up from github 
+        updated from v2.11.0 to v2.13.6
+
+
+    *   Python lib versioning
+        slsdet.__version__ now returns the package release version.
+
+
+    *   Python version in conda build
+        Added python 3.13 also to conda build
+
+
+
+2 New, Changed or Resolved Features
 =====================================
 
-Building shared libraries is disabled by default. If you need to link 
-against any of the libSls*.so libraries, you can enable this by passing
- -DSLS_BUILD_SHARED_LIBRARIES=ON to CMake.
 
-Added SLS_USE_SYSTEM_ZMQ option (default OFF) to use the libzmq of the host
-instead of the one included in our repo. 
 
-Experimental support for building the detector client (including python bindings) on macOS
+2.1 Breaking API
+==================
+
+
+    Receiver
+    --------
+
+
+    *   Receiver callbacks
+        Brought much more metadata to receiver callbacks to construct the image.
+        Update MultiReceiverApp to reflect this change.
+
+
+    *   File path
+        At start of acquisition or at rx_start command, the file path is only 
+        then verified if it exists and created if it does not.
+
+
+    Client
+    ------
+
+
+    *   Removed receiver/publisher ZMQ IP
+        Command line: rx_zmqip gives a warning and does nothing
+        Python : rx_zmqip removed
+        C++ API: get/setRxZmqIP removed
+
+        Publisher zmq IP set to '0.0.0.0' or to listen on all interfaces.
+        The publisher will determine which interface to stream out from based on
+        the network route to the subscriber IP. Hence, receiver zmq IP is not 
+        required.
+
+
+    *   Write register, Set or Clear bit
+        Validation for this advanced feature has been removed by default. 
+        One can force validation by using --validate in the command line or by 
+        setting the validate option in the API.
+       
+
+    ZMQ
+    ---
+
+
+    *   Publisher socket constructor does not take an IP anymore.
+        The details are above under 'Removed receiver/publisher ZMQ IP'.
+
+
+    GUI/ Client Callback
+    --------------------
+
+
+    *   completeImage member in detectorData attribute now returns false only
+        if any the sub images (from different udp ports) have completeImage
+        set to false in the JSON header. This is set if therea are any missing 
+        packets for that udp port on slsReceiver/slsMultiReceiver. 
+        
+        The different subimages are anyway not synchronized. This errs when
+        there are different missing images across multiple UDP ports. 
+
+        The Gui does not show "complete image" in the status bar anymore. 
+        If any of the udp ports have missing packets for that current disaplayed 
+        image, then the "missing packets" will show in red in the status bar.
+
+
+    Detector Server
+    ---------------
+
+
+    *   [Mythen3] Only run clock can be set
+        Clock 0 is now the run clock and the only one that can be set. 
+        The others are be read only.
+        This affects the following commands:
+        Command line or python API: clkdiv, clkfreq, clkphase, maxclkphaseshift
+        C++ API: get/setClockDivider, getClockFrequency, get/setClockPhase, 
+        getMaxClockPhaseShift
+
+
+    *   [Jungfrau] Temperature Control
+        Temperature control is enabled by default at on-board detector server 
+        startup. 
+        As before, the default temperature threshold is 65°C and crossing this
+        value will set a temperature event.
+
+
+
+2.2 Resolved or Changed Features
+================================
+
+
+    Compilation
+    -----------
+
+
+    *   cmake_source_dir
+        Fixed compilation error when using python and adding the slsDetectorPackage 
+        as a subfolder due to cmake source directory changing.
+
+
+    Client
+    ------
+
+
+    *   Command line Code Generation
+        The command line parsing code is now generated from a yaml file. This is
+        transparent to the user.
+
+    
+    *   Clearer error message about freeing shared memory.
+
+
+    Detector Server
+    ---------------
+
+
+    *   [Gotthard2] Chip reconfiguration
+
+            -   Powering off/on the chip will now switch off chip configuration 
+                property/ configure the chip every time.
+
+            -   Switching off high voltage from a non zero value will now wait 
+                10s to return for safety reasons.
+
+            -   Powering off the chip requires high voltage to have been 
+                switched off prior.
+
+            -   Acquisition requires chip to have been configured prior.
+
+
+    *   [Gotthard2] Burst mode options restricted
+        Burst mode external and continuous mode internal are not allowed to be set
+        anymore as they are anyway not implemented.
+
+
+    Receiver
+    --------
+
+
+    *   [Gotthard I] fixed header stripping fixing segfault.
+
+
+    *   Error or help message for invalid arguments to slsMultiReceiver.
+
+
+    Simulator
+    ---------
+
+
+    *   Refactored stop server to have better start up.
+
+
+    *   Fixed possible memory leak when taking non blocking acquisitions.
+
+
+    *   [Jungfrau] Valid gain values in data sent out. Previously, 2 was also sent out.
+
+   
+    ZMQ
+    ---
+
+
+    *   Publiser socket constructor
+
+        -   enables keep alive socket options to send heartbeat messages to prevent
+            discarded TCP flows if there is no packet for a longer period.
+
+        -   enables IPv6 interfaces
+
+    *   Prints specific error for ENOENT (endpoint does not exist)
+
+
+
+2.3 New Features
+================
+
+
+    Client
+    ------
+
+
+    *   Auto completion
+        bash_autocomplete.sh or zsh_autocomplete.sh must be sourced from the 
+        main package folder to enable auto completion of commands and arguments 
+        for the command line on that shell.
+
+
+    *   sls_detector
+        New executable that can be used instead of 'sls_detector_get' and 
+        'sls_detector_put' for most commands. It will infer from the number of 
+        arguments, which executable (sls_detector_put or sls_detector_get) to use. 
+        For the rare commands that cannot be inferred from the number of arguments,
+        it will complain accordingly.  
+
+
+    *   [Jungfrau] Timing Info Decoder (Advanced configuration)
+        Command line or python API: timing_info_decoder
+        C++ API: get/setTimingInfoDecoder. Options: SWISSFEL (Default), SHINE
+
+
+    *   [Jungfrau] Collection Mode (Advanced configuration)
+        Command line or python API: collectionmode 
+        C++ API: get/setCollectionMode. Options: ELECTRON, HOLE (Default)
+        If chip v1.1, also configures the chip afterwards. 
+        
+        
+    *   [Gotthard2] Next frame number
+        'Stop' in G2 25um is not synchronous and hence might trigger an extra set
+        of frames in the slave module, resulting in the next acquiistion starting
+        with inconsistent frame numbers between master and slave. Solved by 
+        setting next frame number to the larger value (max + 1) after a stop command. 
+        Requires a firmware update.
+
+        Command line or python API: nextframenumber
+        C++ API: get/setNextFrameNumber
+        Can set/get the starting frame number for the next acquistion.
+
+
+    *   [Mythen3] Readout speed
+        Command line, python API: readoutspeed. Options: full_speed (10MHz), 
+        half_speed (20MHz, default), quarter_speed (40MHz)
+        C++ API: get/setReadoutSpeed
+        Also affect: 
+        Command line, python API: readoutspeedlist
+        C++ API: getReadoutSpeedList
+
+
+    *   Sleep
+        Command line, python/ C++ API:  sleep
+        Client sleeps for required time. Advanced command mainly for firmware
+        developers to use in config files.
+
+
+    *   Xilinx Chip Test Board added
+
 
-``rx_dbitlist`` keeps the order of the passed bit list 
 
 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
+    Gotthard    9.0.0
+    Moench      9.0.0
   
 
     On-board Detector Server Upgrade
@@ -68,10 +314,11 @@ Experimental support for building the detector client (including python bindings
 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)
 
@@ -79,6 +326,9 @@ Experimental support for building the detector client (including python bindings
 
     Moench      26.10.2023 (v2.0)                   (updated in 8.0.2)
 
+    Gotthard    08.02.2018 (50um and 25um Master)
+                09.02.2018 (25 um Slave) 
+
 
     Detector Upgrade
     ----------------
@@ -91,6 +341,8 @@ Experimental support for building the detector client (including python bindings
     Gotthard2  via command <.rbf>
     Moench     via command <.pof>
 
+    Gotthard cannot be upgraded remotely  
+
     Except Eiger, 
         upgrade 
             Using command 'programfpga' or
@@ -108,7 +360,6 @@ Experimental support for building the detector client (including python bindings
 4 Kernel Requirements
 ======================
 
-
     Blackfin 
     --------
     Latest version: Fri Oct 29 00:00:00 2021
@@ -116,12 +367,10 @@ Experimental support for building the detector client (including python bindings
     Older ones will work, but might have issues with programming firmware via
     the package.
 
-
     Nios
     -----
     Compatible version: Mon May 10 18:00:21 CEST 2021
 
-
     Kernel Upgrade
     ---------------
     Eiger   via bit files
@@ -166,15 +415,6 @@ Experimental support for building the detector client (including python bindings
     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
 
@@ -201,14 +441,6 @@ Experimental support for building the detector client (including python bindings
         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
 
@@ -228,4 +460,3 @@ Experimental support for building the detector client (including python bindings
 
         dhanya.thattil@psi.ch
         erik.frojdh@psi.ch
-        alice.mazzoleni@psi.ch

VERSION

@@ -1 +1 @@
-0.0.0
+9.0.0

cmake/FindClangFormat.cmake

@@ -25,9 +25,7 @@ mark_as_advanced(
     ClangFormat_BIN)
 
 if(ClangFormat_FOUND)
-    execute_process(COMMAND ${ClangFormat_BIN} --version
-                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                 OUTPUT_VARIABLE CLANG_VERSION_TEXT)
+    exec_program(${ClangFormat_BIN} ${CMAKE_CURRENT_SOURCE_DIR} ARGS --version OUTPUT_VARIABLE CLANG_VERSION_TEXT)
     string(REGEX MATCH "([0-9]+)\\.[0-9]+\\.[0-9]+" CLANG_VERSION ${CLANG_VERSION_TEXT})
     if((${CLANG_VERSION} GREATER "9") OR (${CLANG_VERSION} EQUAL "9"))
         # A CMake script to find all source files and setup clang-format targets for them

cmake/helpers.cmake

@@ -1,46 +0,0 @@
-function(default_build_type val)
-if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  message(STATUS "No build type selected, default to Release")
-  set(CMAKE_BUILD_TYPE ${val} CACHE STRING "Build type (default ${val})" FORCE)
-endif()
-endfunction()
-
-function(set_std_fs_lib)
-# from pybind11
-# Check if we need to add -lstdc++fs or -lc++fs or nothing
-if(DEFINED CMAKE_CXX_STANDARD AND CMAKE_CXX_STANDARD LESS 17)
-  set(STD_FS_NO_LIB_NEEDED TRUE)
-elseif(MSVC)
-  set(STD_FS_NO_LIB_NEEDED TRUE)
-else()
-  file(
-    WRITE ${CMAKE_CURRENT_BINARY_DIR}/main.cpp
-    "#include <filesystem>\nint main(int argc, char ** argv) {\n  std::filesystem::path p(argv[0]);\n  return p.string().length();\n}"
-  )
-  try_compile(
-    STD_FS_NO_LIB_NEEDED ${CMAKE_CURRENT_BINARY_DIR}
-    SOURCES ${CMAKE_CURRENT_BINARY_DIR}/main.cpp
-    COMPILE_DEFINITIONS -std=c++17)
-  try_compile(
-    STD_FS_NEEDS_STDCXXFS ${CMAKE_CURRENT_BINARY_DIR}
-    SOURCES ${CMAKE_CURRENT_BINARY_DIR}/main.cpp
-    COMPILE_DEFINITIONS -std=c++17
-    LINK_LIBRARIES stdc++fs)
-  try_compile(
-    STD_FS_NEEDS_CXXFS ${CMAKE_CURRENT_BINARY_DIR}
-    SOURCES ${CMAKE_CURRENT_BINARY_DIR}/main.cpp
-    COMPILE_DEFINITIONS -std=c++17
-    LINK_LIBRARIES c++fs)
-endif()
-
-if(${STD_FS_NEEDS_STDCXXFS})
-  set(STD_FS_LIB stdc++fs PARENT_SCOPE)
-elseif(${STD_FS_NEEDS_CXXFS})
-  set(STD_FS_LIB c++fs PARENT_SCOPE)
-elseif(${STD_FS_NO_LIB_NEEDED})
-  set(STD_FS_LIB "" PARENT_SCOPE)
-else()
-  message(WARNING "Unknown C++17 compiler - not passing -lstdc++fs")
-  set(STD_FS_LIB "")
-endif()
-endfunction()

conda-recipe/build.sh

@@ -8,7 +8,7 @@ if [ ! -d "install" ]; then
     mkdir install
 fi
 cd build
-cmake .. -G Ninja \
+cmake .. \
       -DCMAKE_PREFIX_PATH=$CONDA_PREFIX \
       -DCMAKE_INSTALL_PREFIX=install \
       -DSLS_USE_TEXTCLIENT=ON \
@@ -18,8 +18,7 @@ cmake .. -G Ninja \
       -DSLS_USE_TESTS=ON \
       -DSLS_USE_PYTHON=OFF \
       -DCMAKE_BUILD_TYPE=Release \
-      -DSLS_USE_HDF5=OFF \
-      -DSLS_USE_SYSTEM_ZMQ=ON \
+      -DSLS_USE_HDF5=OFF\
      
 NCORES=$(getconf _NPROCESSORS_ONLN)
 echo "Building using: ${NCORES} cores"

conda-recipe/build_pylib.sh

@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-3.0-or-other
+# Copyright (C) 2021 Contributors to the SLS Detector Package
+
+echo "|<-------- starting python build"
+
+cd python
+
+# copy VERSION into slsdet for installation
+cp ../VERSION slsdet/VERSION
+
+${PYTHON} setup.py install 

conda-recipe/conda_build_config.yaml

@@ -0,0 +1,8 @@
+python:
+    - 3.8
+    - 3.9
+    - 3.10
+    - 3.11 
+    - 3.12
+    - 3.13
+

conda-recipe/copy_ctbgui.sh

@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-3.0-or-other
+# Copyright (C) 2021 Contributors to the SLS Detector Package
+mkdir $PREFIX/lib
+mkdir $PREFIX/bin
+mkdir $PREFIX/include
+
+
+
+cp build/bin/ctbGui $PREFIX/bin/.
+cp build/bin/libctbRootLib.so $PREFIX/lib/.
+

conda-recipe/copy_lib.sh

@@ -4,20 +4,18 @@
 mkdir -p $PREFIX/lib
 mkdir -p $PREFIX/bin
 mkdir -p $PREFIX/include/sls
+# mkdir $PREFIX/include/slsDetectorPackage
 
 #Shared and static libraries
 cp build/install/lib/* $PREFIX/lib/
 
 #Binaries
 cp build/install/bin/sls_detector_acquire $PREFIX/bin/.
-cp build/install/bin/sls_detector_acquire_zmq $PREFIX/bin/.
 cp build/install/bin/sls_detector_get $PREFIX/bin/.
 cp build/install/bin/sls_detector_put $PREFIX/bin/.
 cp build/install/bin/sls_detector_help $PREFIX/bin/.
-cp build/install/bin/sls_detector $PREFIX/bin/.
 cp build/install/bin/slsReceiver $PREFIX/bin/.
 cp build/install/bin/slsMultiReceiver $PREFIX/bin/.
-cp build/install/bin/slsFrameSynchronizer $PREFIX/bin/.
 
 
 cp build/install/include/sls/* $PREFIX/include/sls

conda-recipe/meta.yaml

@@ -0,0 +1,125 @@
+package:
+  name: sls_detector_software
+  version: {{ environ.get('GIT_DESCRIBE_TAG', '') }}
+
+
+source:
+  path: ..
+
+build:
+  number: 0
+  binary_relocation: True
+  rpaths: 
+    - lib/
+
+requirements:
+  build:
+    - {{ compiler('c') }}
+    - {{compiler('cxx')}}
+    - cmake
+    - qt 5.*
+    - xorg-libx11
+    - xorg-libice
+    - xorg-libxext
+    - xorg-libsm
+    - xorg-libxau
+    - xorg-libxrender
+    - xorg-libxfixes
+    - {{ cdt('mesa-libgl-devel') }}      # [linux]
+    - {{ cdt('mesa-libegl-devel') }}     # [linux]
+    - {{ cdt('mesa-dri-drivers') }}      # [linux]
+    - {{ cdt('libselinux') }}            # [linux]
+    - {{ cdt('libxdamage') }}            # [linux]
+    - {{ cdt('libxxf86vm') }}            # [linux]
+    - expat
+
+  host:
+    - libstdcxx-ng
+    - libgcc-ng
+    - xorg-libx11
+    - xorg-libice
+    - xorg-libxext
+    - xorg-libsm
+    - xorg-libxau
+    - xorg-libxrender
+    - xorg-libxfixes
+    - expat
+
+  run:
+    - libstdcxx-ng
+    - libgcc-ng 
+
+
+outputs:
+  - name: slsdetlib
+    script: copy_lib.sh
+
+    requirements:
+      build:
+        - {{ compiler('c') }}
+        - {{compiler('cxx')}}
+        - libstdcxx-ng
+        - libgcc-ng
+
+      run: 
+        - libstdcxx-ng
+        - libgcc-ng
+
+  - name: slsdet
+    script: build_pylib.sh
+
+    requirements:
+      build:
+        - python
+        - {{ compiler('c') }}
+        - {{compiler('cxx')}}
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
+        - setuptools
+        - pybind11=2.13
+
+      host:
+        - python
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
+        - setuptools
+        - pybind11=2.13
+
+
+      run:
+        - libstdcxx-ng
+        - libgcc-ng
+        - python
+        - numpy
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
+
+    test:
+      imports:
+        - slsdet
+
+
+  - name: slsdetgui
+    script: copy_gui.sh
+    requirements:
+
+      build:
+        - {{ compiler('c') }}
+        - {{compiler('cxx')}}
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
+
+      run:
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
+        - qt 5.*
+        - expat
+
+  - name: moenchzmq
+    script: copy_moench.sh
+    requirements:
+
+      build:
+        - {{ compiler('c') }}
+        - {{compiler('cxx')}}
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
+
+
+      run:
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
+        - expat

conda-recipe/run_test.sh

@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: LGPL-3.0-or-other
+# Copyright (C) 2021 Contributors to the SLS Detector Package
+ctest -j2

conda-recipes/main-library/conda_build_config.yaml

@@ -1,13 +0,0 @@
-
-c_compiler:
-  - gcc                        # [linux]
-
-c_stdlib:
-  - sysroot                    # [linux]
-
-cxx_compiler:
-  - gxx                        # [linux]
-
-
-c_stdlib_version:              # [linux]
-  - 2.17                       # [linux]

conda-recipes/main-library/meta.yaml

@@ -1,80 +0,0 @@
-source:
-  path: ../..
-
-{% set version = load_file_regex(load_file = 'VERSION', regex_pattern = '(\d+(?:\.\d+)*(?:[\+\w\.]+))').group(1) %}
-package:
-  name: sls_detector_software
-  version: {{ version }} 
-  
-build:
-  number: 0
-  binary_relocation: True
-  rpaths: 
-    - lib/
-
-requirements:
-  build:
-    - {{ compiler('c') }}
-    - {{ stdlib("c") }}
-    - {{ compiler('cxx') }}
-    - git
-    - cmake
-    - ninja
-    - qt 5.*
-
-  host:
-    - libstdcxx-ng
-    - libgcc-ng
-    - libgl-devel  # [linux]
-    - libtiff
-    - zlib
-    - expat
-    - zeromq
-  
-  run:
-    - libstdcxx-ng
-    - libgcc-ng 
-
-
-outputs:
-  - name: slsdetlib
-    script: copy_lib.sh
-
-    requirements:
-      build:
-        - {{ compiler('c') }}
-        - {{ stdlib("c") }}
-        - {{ compiler('cxx') }}
-
-      run: 
-        - libstdcxx-ng
-        - libgcc-ng
-
-
-  - name: slsdetgui
-    script: copy_gui.sh
-    requirements:
-
-      build:
-        - {{ compiler('c') }}
-        - {{compiler('cxx')}}
-        - {{ pin_subpackage('slsdetlib', exact=True) }}
-        
-
-      run:
-        - {{ pin_subpackage('slsdetlib', exact=True) }}
-        - qt 5.*
-
-
-  - name: moenchzmq
-    script: copy_moench.sh
-    requirements:
-
-      build:
-        - {{ compiler('c') }}
-        - {{compiler('cxx')}}
-        - {{ pin_subpackage('slsdetlib', exact=True) }}
-
-
-      run:
-        - {{ pin_subpackage('slsdetlib', exact=True) }}

conda-recipes/python-client/conda_build_config.yaml

@@ -1,18 +0,0 @@
-python:
-    - 3.11 
-    - 3.12
-    - 3.13
-    - 3.14
-
-
-c_compiler:
-  - gcc                        # [linux]
-
-c_stdlib:
-  - sysroot                    # [linux]
-
-cxx_compiler:
-  - gxx                        # [linux]
-
-c_stdlib_version:              # [linux]
-  - 2.17                       # [linux]

conda-recipes/python-client/meta.yaml

@@ -1,45 +0,0 @@
-source:
-  path: ../..
-
-{% set version = load_file_regex(load_file = 'VERSION', regex_pattern = '(\d+(?:\.\d+)*(?:[\+\w\.]+))').group(1) %}
-package:
-  name: slsdet
-  version: {{ version }} 
-
-build:
-  number: 0
-  script:
-    - unset CMAKE_GENERATOR && {{ PYTHON }} -m pip install . -vv --config-settings=cmake.define.SLS_USE_SYSTEM_ZMQ=ON # [not win]
-
-requirements:
-  build:
-    - python 
-    - {{ compiler('c') }}
-    - {{ stdlib("c") }}
-    - {{ compiler('cxx') }}
-
-  host:
-    - cmake
-    - ninja
-    - python 
-    - pip
-    - scikit-build-core
-    - pybind11 >=2.13.0
-    - fmt
-    - zeromq
-    - nlohmann_json
-    - catch2
-
-  run:
-    - python 
-    - numpy
-
-
-test:
-  imports:
-    - slsdet
-
-
-about:
-  summary: An example project built with pybind11 and scikit-build.
-  # license_file: LICENSE

docs/CMakeLists.txt

@@ -11,8 +11,7 @@ add_executable(gendoc src/gendoc.cpp)
 # This is a bit hacky, but better than exposing stuff? 
 target_include_directories(gendoc PRIVATE ${PROJECT_SOURCE_DIR}/slsDetectorSoftware/src)
 target_link_libraries(gendoc PRIVATE
-  slsDetectorStatic
-
+  slsDetectorShared
 )
 set_target_properties(gendoc PROPERTIES 
   RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
@@ -41,9 +40,7 @@ set(SPHINX_SOURCE_FILES
   src/pydetector.rst
   src/pyenums.rst
   src/pyexamples.rst
-  src/pyPatternGenerator.rst
   src/servers.rst
-  src/multidet.rst
   src/receiver_api.rst
   src/result.rst
   src/type_traits.rst
@@ -56,7 +53,6 @@ set(SPHINX_SOURCE_FILES
   src/serverdefaults.rst
   src/quick_start_guide.rst
   src/troubleshooting.rst
-  src/pattern.rst
   src/receivers.rst
   src/slsreceiver.rst
   src/udpheader.rst
@@ -68,9 +64,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})
@@ -88,16 +81,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

docs/conf.py.in

@@ -20,7 +20,7 @@ print(sys.path)
 
 # -- Project information -----------------------------------------------------
 
-project = 'slsDetectorPackage @PROJECT_VERSION@'
+project = 'slsDetectorPackage'
 copyright = '2020, PSD Detector Group'
 author = 'PSD Detector Group'
 version = '@PROJECT_VERSION@'
@@ -63,4 +63,4 @@ html_static_path = ['static']
 
 
 def setup(app):
-    app.add_css_file('css/extra.css')  # may also be an URL
+    app.add_stylesheet('css/extra.css')  # may also be an URL

docs/gen_server_doc.py.in

@@ -21,7 +21,7 @@ print('\n\n\n\n SERVER CSV')
 
 src = Path('@CMAKE_SOURCE_DIR@')/'slsDetectorServers/'
 detectors = ['Mythen3', 'Gotthard2', 'Eiger', 
-            'Jungfrau', 'Moench', 'Ctb']
+            'Jungfrau', 'Moench', 'Gotthard', 'Ctb']
 
 
 for det in detectors:

docs/images_src/system_communication_architecture.drawio

@@ -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="&lt;p&gt;&lt;font face=&quot;Courier New&quot; style=&quot;&quot;&gt;Client listening to&amp;nbsp;&lt;br&gt;&lt;font style=&quot;&quot;&gt;zmqport&lt;/font&gt; : &lt;font style=&quot;&quot;&gt;&lt;b style=&quot;&quot;&gt;30001&lt;/b&gt;&lt;/font&gt;&lt;br&gt;&lt;font style=&quot;&quot;&gt;zmqip&lt;/font&gt;&amp;nbsp; &amp;nbsp;: &lt;font style=&quot;&quot;&gt;&lt;b style=&quot;&quot;&gt;129.129.100.115&lt;/b&gt;&lt;/font&gt;&lt;/font&gt;&lt;/p&gt;" 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="&lt;font face=&quot;Comic Sans MS&quot;&gt;Client/ GUI&lt;/font&gt;" 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="&lt;font face=&quot;Courier New&quot;&gt;&amp;lt;&amp;lt;class&amp;gt;&amp;gt; Module&lt;/font&gt;" 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="&lt;font face=&quot;Courier New&quot;&gt;&amp;lt;&amp;lt;class&amp;gt;&amp;gt; Module&lt;/font&gt;" 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="&lt;font face=&quot;Courier New&quot;&gt;&amp;lt;&amp;lt;class&amp;gt;&amp;gt; Module&lt;/font&gt;" 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="&lt;font face=&quot;Courier New&quot;&gt;&amp;lt;&amp;lt;class&amp;gt;&amp;gt; Module (s)&lt;/font&gt;" 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="&lt;font face=&quot;Courier New&quot;&gt;Data Streamer&lt;/font&gt;" 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="&lt;font face=&quot;Courier New&quot;&gt;Listener&lt;/font&gt;" 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&amp;nbsp;&lt;div&gt;Processing&lt;/div&gt;&lt;div&gt;Chain&lt;/div&gt;" 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&amp;nbsp;&lt;span style=&quot;background-color: transparent; color: light-dark(rgb(102, 102, 102), rgb(149, 149, 149));&quot;&gt;1:1&lt;/span&gt;" 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&#xa;1952 / 1953&#xa;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&lt;div&gt;pc1234&lt;/div&gt;&lt;div&gt;&lt;b&gt;&lt;font style=&quot;color: rgb(0, 76, 153);&quot;&gt;10.0.1&lt;/font&gt;&lt;/b&gt;.100&lt;/div&gt;" 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="&lt;font face=&quot;Comic Sans MS&quot;&gt;External&amp;nbsp;&lt;/font&gt;&lt;div&gt;&lt;font face=&quot;Comic Sans MS&quot;&gt;Process&lt;/font&gt;&lt;/div&gt;&lt;div&gt;&lt;span&gt;&lt;font face=&quot;Comic Sans MS&quot; style=&quot;color: rgb(0, 76, 153);&quot;&gt;129.129.200.175&lt;/font&gt;&lt;/span&gt;&lt;/div&gt;" 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&amp;nbsp;&lt;div&gt;Packets&lt;/div&gt;" 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="&lt;font style=&quot;&quot; face=&quot;Courier New&quot;&gt;port&amp;nbsp; &amp;nbsp; &amp;nbsp;= 1952&lt;br&gt;stopport = 1953&lt;br&gt;hostname = bchip100&lt;/font&gt;" 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="&lt;pre style=&quot;&quot;&gt;&lt;pre&gt;udp src port: hardcoded (32410)&lt;br&gt;&lt;span style=&quot;background-color: transparent;&quot;&gt;udp_srcip&amp;nbsp;  : &lt;b&gt;&lt;font style=&quot;&quot;&gt;10.0.1&lt;/font&gt;&lt;/b&gt;.15&lt;/span&gt;&lt;/pre&gt;&lt;/pre&gt;" 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&lt;div&gt;bchip100&lt;/div&gt;" 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="&lt;pre style=&quot;&quot;&gt;udp_dstport: 50001&lt;br&gt;&lt;span style=&quot;background-color: transparent;&quot;&gt;udp_dstip&amp;nbsp; : &lt;b&gt;&lt;font style=&quot;&quot;&gt;10.0.1&lt;/font&gt;&lt;/b&gt;.100&lt;br&gt;&lt;/span&gt;&lt;span style=&quot;background-color: transparent;&quot;&gt;udp_dstmac : (specify for&lt;br&gt;&lt;/span&gt;&lt;span style=&quot;background-color: transparent;&quot;&gt;              custom receivers)&lt;/span&gt;&lt;/pre&gt;" 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&lt;div&gt;pc1234&lt;/div&gt;&lt;div&gt;&lt;font style=&quot;color: rgb(0, 76, 153);&quot;&gt;&lt;b style=&quot;&quot;&gt;10.0.2&lt;/b&gt;&lt;/font&gt;.100&lt;/div&gt;" 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&amp;nbsp;&lt;div&gt;Packets&lt;/div&gt;" 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&lt;div&gt;bchip101&lt;/div&gt;" 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="&lt;pre style=&quot;&quot;&gt;&lt;pre&gt;udp src port: hardcoded (32410)&lt;br&gt;&lt;span style=&quot;background-color: transparent;&quot;&gt;udp_srcip&amp;nbsp;  : &lt;b&gt;&lt;font style=&quot;&quot;&gt;10.0.2&lt;/font&gt;&lt;/b&gt;.15&lt;/span&gt;&lt;/pre&gt;&lt;/pre&gt;" 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="&lt;pre style=&quot;&quot;&gt;udp_dstport: 50002&lt;br&gt;&lt;span style=&quot;background-color: transparent;&quot;&gt;udp_dstip&amp;nbsp; : &lt;b&gt;&lt;font style=&quot;&quot;&gt;10.0.2&lt;/font&gt;&lt;/b&gt;.100&lt;br&gt;&lt;/span&gt;&lt;span style=&quot;background-color: transparent;&quot;&gt;udp_dstmac : (specify for&lt;br&gt;&lt;/span&gt;&lt;span style=&quot;background-color: transparent;&quot;&gt;              custom receivers)&lt;/span&gt;&lt;/pre&gt;" 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&#xa;1952 / 1953&#xa;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="&lt;font face=&quot;Courier New&quot;&gt;Receiver&lt;/font&gt;&lt;div&gt;&lt;span style=&quot;background-color: transparent; color: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));&quot;&gt;1954&lt;/span&gt;&lt;/div&gt;&lt;div&gt;pc1234&lt;span style=&quot;background-color: transparent; color: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));&quot;&gt;&lt;/span&gt;&lt;/div&gt;" 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="&lt;font face=&quot;Courier New&quot;&gt;Receiver&lt;br&gt;&lt;/font&gt;&lt;div&gt;&lt;span style=&quot;background-color: transparent; color: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));&quot;&gt;1955&lt;/span&gt;&lt;/div&gt;&lt;div&gt;pc1234&lt;/div&gt;" 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="&lt;font style=&quot;&quot; face=&quot;Courier New&quot;&gt;port&amp;nbsp; &amp;nbsp; &amp;nbsp;= 1952&lt;br&gt;stopport = 1953&lt;br&gt;hostname = bchip101&lt;/font&gt;" 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="&lt;font face=&quot;Courier New&quot; style=&quot;&quot;&gt;rx_tcpport&amp;nbsp; = 1954&lt;br&gt;rx_hostname = pc1234&lt;/font&gt;" 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="&lt;font face=&quot;Courier New&quot; style=&quot;&quot;&gt;rx_tcpport&amp;nbsp; = 1955&lt;br&gt;rx_hostname = pc1234&lt;/font&gt;" 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="&lt;font&gt;GUI:&amp;nbsp;&amp;nbsp;&lt;/font&gt;&lt;div&gt;rx_zmqport (30001)&amp;nbsp;&lt;span style=&quot;background-color: transparent; color: light-dark(rgb(136, 136, 255), rgb(105, 105, 207));&quot;&gt;=&amp;nbsp;&lt;/span&gt;&lt;span style=&quot;background-color: transparent; color: light-dark(rgb(136, 136, 255), rgb(105, 105, 207));&quot;&gt;zmqport (30001)&lt;/span&gt;&lt;/div&gt;" 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="&lt;pre style=&quot;&quot;&gt;&lt;span style=&quot;background-color: transparent;&quot;&gt;&lt;font style=&quot;&quot;&gt;Receiver streaming out&lt;br&gt;&lt;font style=&quot;&quot;&gt;rx_zmqport&lt;/font&gt;&amp;nbsp;= &lt;font style=&quot;&quot;&gt;&lt;b style=&quot;&quot;&gt;30001&lt;/b&gt;&lt;/font&gt;&lt;/font&gt;&lt;/span&gt;&lt;br&gt;&lt;/pre&gt;" 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="&lt;font face=&quot;Comic Sans MS&quot;&gt;Receiver&lt;/font&gt;&lt;div&gt;&lt;font face=&quot;Comic Sans MS&quot;&gt;pc1234&lt;/font&gt;&lt;/div&gt;&lt;div&gt;&lt;span&gt;&lt;font style=&quot;color: rgb(74, 123, 114);&quot; face=&quot;Comic Sans MS&quot;&gt;129.129.100.115&lt;/font&gt;&lt;/span&gt;&lt;/div&gt;" 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="&lt;font face=&quot;Comic Sans MS&quot;&gt;Receiver&lt;/font&gt;&lt;div&gt;&lt;font face=&quot;Comic Sans MS&quot;&gt;pc1234&lt;/font&gt;&lt;/div&gt;&lt;div&gt;&lt;span&gt;&lt;font face=&quot;Comic Sans MS&quot; style=&quot;color: rgb(74, 123, 114);&quot;&gt;129.129.100.115&lt;/font&gt;&lt;/span&gt;&lt;/div&gt;" 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="&lt;pre style=&quot;&quot;&gt;&lt;pre&gt;&lt;span style=&quot;background-color: transparent;&quot;&gt;&lt;font style=&quot;&quot;&gt;Receiver streaming out&lt;br&gt;&lt;font style=&quot;&quot;&gt;rx_zmqport&lt;/font&gt;&amp;nbsp;= &lt;font style=&quot;&quot;&gt;&lt;b style=&quot;&quot;&gt;30002&lt;/b&gt;&lt;/font&gt;&lt;/font&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/pre&gt;" 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="&lt;p&gt;&lt;font face=&quot;Courier New&quot; style=&quot;&quot;&gt;Client listening to&amp;nbsp;&lt;br&gt;&lt;font&gt;zmqport&lt;/font&gt; : &lt;font style=&quot;&quot;&gt;&lt;b style=&quot;&quot;&gt;30004&lt;/b&gt;&lt;/font&gt;&lt;br&gt;&lt;font&gt;zmqip&lt;/font&gt;&amp;nbsp; &amp;nbsp;: &lt;font style=&quot;&quot;&gt;&lt;b style=&quot;&quot;&gt;129.129.200.175 &lt;/b&gt;&lt;/font&gt;&lt;/font&gt;&lt;/p&gt;" 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="&lt;font style=&quot;font-size: 17px;&quot;&gt;External Process:&lt;/font&gt;&lt;div&gt;&lt;font style=&quot;font-size: 17px;&quot;&gt;rx_zmqport (30001)&amp;nbsp;&lt;/font&gt;&lt;span style=&quot;font-size: 17px; background-color: transparent; color: light-dark(rgb(136, 136, 255), rgb(105, 105, 207));&quot;&gt;!=&amp;nbsp;&lt;/span&gt;&lt;span style=&quot;font-size: 17px; background-color: transparent; color: light-dark(rgb(136, 136, 255), rgb(105, 105, 207));&quot;&gt;zmqport (30004)&lt;/span&gt;&lt;/div&gt;" 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="&lt;p&gt;&lt;font style=&quot;&quot; face=&quot;Courier New&quot;&gt;Client listening to&amp;nbsp;&lt;br&gt;&lt;font&gt;zmqport&lt;/font&gt; : &lt;font style=&quot;&quot;&gt;&lt;b style=&quot;&quot;&gt;30003&lt;/b&gt;&lt;/font&gt;&lt;br&gt;&lt;font&gt;zmqip&lt;/font&gt;&amp;nbsp; &amp;nbsp;: &lt;font style=&quot;&quot;&gt;&lt;b style=&quot;&quot;&gt;129.129.200.175 &lt;/b&gt;&lt;/font&gt;&lt;/font&gt;&lt;/p&gt;" 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="&lt;p&gt;&lt;font face=&quot;Courier New&quot; style=&quot;&quot;&gt;External Process&amp;nbsp;listening to&amp;nbsp;&lt;br&gt;Ports : &lt;font style=&quot;&quot;&gt;&lt;b&gt;30001, 30002&lt;/b&gt;&lt;/font&gt;&lt;br&gt;Ip&amp;nbsp; &amp;nbsp; : &lt;font style=&quot;&quot;&gt;&lt;b style=&quot;&quot;&gt;129.129.100.115 &lt;/b&gt;&lt;/font&gt;&lt;/font&gt;&lt;/p&gt;" 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="&lt;p&gt;&lt;font style=&quot;&quot; face=&quot;Courier New&quot;&gt;External Process&amp;nbsp;streaming out&amp;nbsp;&lt;br&gt;Ports : &lt;b&gt;30003, 30004&lt;/b&gt;&lt;/font&gt;&lt;/p&gt;" 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&amp;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="&lt;div&gt;&lt;font face=&quot;Courier New&quot;&gt;Control Server&lt;/font&gt;&lt;/div&gt;&lt;div&gt;&lt;font face=&quot;Courier New&quot;&gt;( C 98 )&lt;/font&gt;&lt;/div&gt;" 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="&lt;div&gt;&lt;font face=&quot;Courier New&quot;&gt;Stop Server&lt;/font&gt;&lt;/div&gt;&lt;div&gt;&lt;font face=&quot;Courier New&quot;&gt;( C 98 )&lt;/font&gt;&lt;/div&gt;" 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&amp;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="&lt;span style=&quot;background-color: transparent;&quot;&gt;Stop&lt;/span&gt;" 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="&lt;span style=&quot;background-color: transparent;&quot;&gt;Control&lt;/span&gt;" 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;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="&lt;span style=&quot;background-color: transparent;&quot;&gt;Spawns&lt;/span&gt;" 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="&lt;font face=&quot;Courier New&quot;&gt;On-board&amp;nbsp;&lt;/font&gt;&lt;div&gt;&lt;font face=&quot;Courier New&quot;&gt;Detector&amp;nbsp;&lt;/font&gt;&lt;span style=&quot;font-family: &amp;quot;Courier New&amp;quot;; background-color: transparent; color: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));&quot;&gt;Server&lt;/span&gt;&lt;/div&gt;" 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&amp;nbsp;&lt;div&gt;( *.bit, *.pof, *.rbf )&lt;/div&gt;" 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="&lt;font face=&quot;Courier New&quot;&gt;slsDetectorPackage&lt;/font&gt;&lt;div&gt;&lt;font face=&quot;Courier New&quot;&gt;( Client /&amp;amp; Receiver )&lt;/font&gt;&lt;/div&gt;" 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&lt;div&gt;&lt;span style=&quot;background-color: transparent; color: light-dark(rgb(102, 102, 102), rgb(149, 149, 149));&quot;&gt;Control&lt;/span&gt;&lt;/div&gt;" 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="&lt;span style=&quot;background-color: transparent; color: light-dark(rgb(102, 102, 102), rgb(149, 149, 149));&quot;&gt;TCP Port&lt;/span&gt;&lt;div&gt;&lt;span style=&quot;background-color: transparent; color: light-dark(rgb(102, 102, 102), rgb(149, 149, 149));&quot;&gt;Stop&lt;/span&gt;&lt;/div&gt;" 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="&lt;font face=&quot;Courier New&quot;&gt;Listener&lt;/font&gt;" 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="&lt;font face=&quot;Courier New&quot;&gt;Data Streamer&lt;/font&gt;" 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="&lt;font face=&quot;Courier New&quot;&gt;TCP Server&lt;/font&gt;" 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&amp;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&lt;div&gt;&lt;span style=&quot;background-color: transparent; color: light-dark(rgb(102, 102, 102), rgb(149, 149, 149));&quot;&gt;Control&lt;/span&gt;&lt;/div&gt;" 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&amp;nbsp;&lt;div&gt;&lt;span style=&quot;background-color: transparent; color: light-dark(rgb(102, 102, 102), rgb(149, 149, 149));&quot;&gt;into images in memory&lt;/span&gt;&lt;/div&gt;" 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&amp;nbsp;&lt;div&gt;for online processing&lt;/div&gt;" 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="&lt;div&gt;&lt;span style=&quot;background-color: transparent; color: light-dark(rgb(102, 102, 102), rgb(149, 149, 149));&quot;&gt;Data packets&lt;/span&gt;&lt;/div&gt;" 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="&lt;font face=&quot;Courier New&quot;&gt;C++ API&lt;/font&gt;" 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="&lt;font face=&quot;Courier New&quot;&gt;Python API&lt;/font&gt;&lt;span style=&quot;color: rgba(0, 0, 0, 0); font-family: monospace; font-size: 0px; text-align: start; text-wrap-mode: nowrap;&quot;&gt;%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&lt;/span&gt;" 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="&lt;font face=&quot;Courier New&quot;&gt;CLI&lt;/font&gt;" 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="&lt;font face=&quot;Courier New&quot;&gt;Qt GUI&lt;/font&gt;" 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="&lt;font face=&quot;Courier New&quot;&gt;&amp;lt;&amp;lt;class&amp;gt;&amp;gt; Detector&lt;/font&gt;" 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&lt;div&gt;Client ( C++17 )&lt;/div&gt;" 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="&lt;font face=&quot;Courier New&quot;&gt;Shared Memory (s)&lt;/font&gt;" 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="&lt;pre style=&quot;&quot;&gt;&lt;span style=&quot;background-color: transparent;&quot;&gt;&lt;font style=&quot;&quot;&gt;Receiver streaming out&lt;br&gt;&lt;font style=&quot;&quot;&gt;rx_zmqport&lt;/font&gt;&amp;nbsp;= &lt;font style=&quot;&quot;&gt;&lt;b style=&quot;&quot;&gt;30001&lt;/b&gt;&lt;/font&gt;&lt;/font&gt;&lt;/span&gt;&lt;br&gt;&lt;/pre&gt;" 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="&lt;font face=&quot;Comic Sans MS&quot;&gt;Receiver&lt;/font&gt;&lt;div&gt;&lt;font face=&quot;Comic Sans MS&quot;&gt;pc1234&lt;/font&gt;&lt;/div&gt;&lt;div&gt;&lt;span&gt;&lt;font style=&quot;color: rgb(74, 123, 114);&quot; face=&quot;Comic Sans MS&quot;&gt;129.129.100.115&lt;/font&gt;&lt;/span&gt;&lt;/div&gt;" 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="&lt;font face=&quot;Courier New&quot;&gt;Receiver&lt;/font&gt;&lt;div&gt;pc1234&lt;/div&gt;&lt;div&gt;&lt;span&gt;&lt;font style=&quot;color: rgb(74, 123, 114);&quot;&gt;129.129.100.115&lt;/font&gt;&lt;/span&gt;&lt;/div&gt;" 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="&lt;pre style=&quot;&quot;&gt;&lt;pre&gt;&lt;span style=&quot;background-color: transparent;&quot;&gt;&lt;font style=&quot;&quot;&gt;Receiver streaming out&lt;br&gt;&lt;font style=&quot;&quot;&gt;rx_zmqport&lt;/font&gt;&amp;nbsp;= &lt;font style=&quot;&quot;&gt;&lt;b style=&quot;&quot;&gt;30002&lt;/b&gt;&lt;/font&gt;&lt;/font&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/pre&gt;" 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="&lt;font face=&quot;Comic Sans MS&quot;&gt;Client/ GUI&lt;/font&gt;" 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="&lt;p&gt;&lt;font face=&quot;Courier New&quot; style=&quot;&quot;&gt;Client listening to&amp;nbsp;&lt;br&gt;&lt;font style=&quot;&quot;&gt;zmqport&lt;/font&gt; : &lt;font style=&quot;&quot;&gt;&lt;b style=&quot;&quot;&gt;30001&lt;/b&gt;&lt;/font&gt;&lt;br&gt;&lt;font style=&quot;&quot;&gt;zmqip&lt;/font&gt;&amp;nbsp; &amp;nbsp;: &lt;font style=&quot;&quot;&gt;&lt;b style=&quot;&quot;&gt;129.129.100.115&lt;/b&gt;&lt;/font&gt;&lt;/font&gt;&lt;/p&gt;" 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="&lt;font style=&quot;font-size: 17px;&quot; face=&quot;Comic Sans MS&quot;&gt;Detector&lt;/font&gt;" 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>

docs/src/binaryfileformat.rst

@@ -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:
@@ -323,6 +320,61 @@ Moench
         }
     }
 
+Gotthard I
+^^^^^^^^^^^
+
+.. code-block:: text
+
+    {
+        "Version": 7.2,
+        "Timestamp": "Wed Nov 13 15:16:19 2024",
+        "Detector Type": "Gotthard",
+        "Timing Mode": "auto",
+        "Geometry": {
+            "x": 1,
+            "y": 1
+        },
+        "Image Size in bytes": 2560,
+        "Pixels": {
+            "x": 1280,
+            "y": 1
+        },
+        "Max Frames Per File": 20000,
+        "Frame Discard Policy": "nodiscard",
+        "Frame Padding": 1,
+        "Scan Parameters": "[disabled]",
+        "Total Frames": 1,
+        "Receiver Roi": {
+            "xmin": 4294967295,
+            "xmax": 4294967295,
+            "ymin": 4294967295,
+            "ymax": 4294967295
+        },
+        "Exptime": "1.00001ms",
+        "Period": "1s",
+        "Detector Roi": {
+            "xmin": 4294967295,
+            "xmax": 4294967295
+        },
+        "Frames in File": 1,
+        "Frame Header Format": {
+            "Frame Number": "8 bytes",
+            "SubFrame Number/ExpLength": "4 bytes",
+            "Packet Number": "4 bytes",
+            "Bunch ID": "8 bytes",
+            "Timestamp": "8 bytes",
+            "Module Id": "2 bytes",
+            "Row": "2 bytes",
+            "Column": "2 bytes",
+            "Reserved": "2 bytes",
+            "Debug": "4 bytes",
+            "Round Robin Number": "2 bytes",
+            "Detector Type": "1 byte",
+            "Header Version": "1 byte",
+            "Packets Caught Mask": "64 bytes"
+        }
+    }
+
 Chip Test Board
 ^^^^^^^^^^^^^^^
 
@@ -362,7 +414,6 @@ Chip Test Board
         "Digital Flag": 0,
         "Digital Samples": 1000,
         "Dbit Offset": 0,
-        "Dbit Reorder": 1, 
         "Dbit Bitset": 0,
         "Transceiver Mask": "0x3",
         "Transceiver Flag": 0,

docs/src/commandline.rst

@@ -4,56 +4,11 @@ Command line interface
 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.
-
-    .. code-block::
-
-        # Applies to all modules of detector 0
-        sls_detector_put exptime 5s
-
-        # Applies to only the 4th module
-        sls_detector_put 3:exptime 5s
-
-
-Detector index
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-This index is useful when configuring multiple detectors from a single host. Each detector uses a unique shared memory identified by a detector index, derived again from the hostname command. It is followed by a '-'. 
-
-    .. code-block::
-
-        # For detector with index 2 in shared memory
-        sls_detector_put 2-hostname bchip133+bchip123+bchip456
-        
-        # Without '-', the detector index defaults to 0
-        sls_detector_put hostname bchip133+bchip123+bchip456
-
-        # Accessing all modules with detector index 2
-        sls_detector_put 2-exptime
-
-        # Starting acquisition only for detector with index 2
-        sls_detector_put 2-start
-
-        # Applies only to the 2nd detector, 4th module
-        sls_detector_put 1-3:exptime 5s
-
-
-Command Execution
-^^^^^^^^^^^^^^^^^^^^^^^
-Commands can be executed using:
-
-*   **sls_detector_put**: setting values
-*   **sls_detector_get**: getting values
-*   **sls_detector**: automatically infers based on the number of arguments.
-*   **sls_detector_help**: gets help on the specific command
-*   **sls_detector_acquire**: initiates acquisition with the detector. This command blocks until the entire acquisition process is completed.
+Commands can be used either with sls_detector_get or sls_detector_put
 
+.. code-block::
 
+    sls_detector_get exptime
 
 Help
 --------
@@ -73,17 +28,14 @@ Help
     # list of deprecated commands
     list deprecated
 
-
-Autocompletion
----------------
-
-bash_autocomplete.sh or zsh_autocomplete.sh must be sourced from the main package folder to enable auto completion of commands and arguments for the command line on that shell.
-
-.. code-block::
-
+    # autocompletion
+    # bash_autocomplete.sh or zsh_autocomplete.sh must be sourced from the 
+    # main package folder to enable auto completion of commands and arguments 
+    # for the command line on that shell.
     source bash_autocomplete.sh
 
   
+
 Commands
 -----------
 

docs/src/configcommands.rst

@@ -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)

docs/src/dataformat.rst

@@ -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).
-
-

docs/src/dependencies.rst

@@ -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

docs/src/detector.rst

@@ -13,6 +13,7 @@ containing results from all modules. (:ref:`Result class<Result Class>`)
 
 Here are some :ref:`examples <Cplusplus Api Examples>` on how to use the API.
 
+.. _Cplusplus Api Examples:
 .. doxygenclass:: sls::Detector
    :members:
    :undoc-members:

docs/src/fileformat.rst

@@ -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.

docs/src/firmware.rst

@@ -1,5 +1,3 @@
-.. _firmware upgrade:
-
 Firmware Upgrade
 =================
 
@@ -133,6 +131,42 @@ Program from console
 
 
 
+Gotthard I
+-----------
+
+Download 
+^^^^^^^^^^^^^
+- detector server corresponding to package in slsDetectorPackage/serverBin
+
+- `pof files <https://github.com/slsdetectorgroup/slsDetectorFirmware>`__
+
+
+.. _firmware upgrade using blaster for blackfin:
+
+Upgrade
+^^^^^^^^
+.. warning ::
+    | Gotthard firmware cannot be upgraded remotely and requires the use of USB-Blaster.
+    | It is generally updated by us.
+
+#. Download `Altera Quartus software or Quartus programmer <https://fpgasoftware.intel.com/20.1/?edition=standard&platform=linux&product=qprogrammer#tabs-4>`__.
+   
+
+#. Start Quartus programmer, click on Hardware Setup. In the "Currently selected hardware" window, select USB-Blaster.
+
+#. In the Mode combo box, select "Active Serial Programming".
+
+#. Plug the end of your USB-Blaster with the adaptor provided to the connector 'AS config' on the Gotthard board.
+
+#. Click on 'Add file'. Select programming (pof) file provided by us.
+
+#. Check "Program/Configure" and "Verify". Push the start button. Wait until the programming process is finished.
+
+#. In case of error messages, check the polarity of cable (that pin1 corresponds) and that the correct programming connector is selected.
+
+#. Reboot the detector.
+
+
 Mythen III
 -----------
 
@@ -362,3 +396,7 @@ How to get back mtd3 drive remotely (udpating kernel)
             more /proc/mtd # verify mtd3 is listed
             
 
+Last Resort using USB Blaster
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If none of these steps work, the last resort might be physically upgrading the firmware using a USB blaster, which also requires opening up the detector. Instructions for all the blackfin detectors are the same as the one for :ref:`gotthard firmware upgrade <firmware upgrade using blaster for blackfin>`.

docs/src/hdf5fileformat.rst

@@ -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
 ------------------

docs/src/index.rst

@@ -3,13 +3,13 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-slsDetectorPackage
+Welcome to slsDetectorPackage's documentation!
 ==============================================
 
 .. note :: 
 
     This is the documentation for the latest development version of slsDetectorPackage.
-    For further detector specific documentation, visit `this page <https://www.psi.ch/en/detectors/documentation>`__. 
+    For further documentation, visit the official page: https://www.psi.ch/en/detectors/documentation
 
 .. toctree::
     :maxdepth: 3
@@ -19,17 +19,6 @@ slsDetectorPackage
     dependencies
     consuming
    
-
-.. toctree::
-    :caption: how to
-    :maxdepth: 2
-
-    softwarearchitecture
-    configcommands
-    quick_start_guide
-    dataformat
-    multidet
-   
 .. toctree::
     :caption: C++ API
     :maxdepth: 2
@@ -39,9 +28,6 @@ slsDetectorPackage
     receiver_api
     examples
 
-
-
-    
 .. toctree::
     :caption: Python API
     :maxdepth: 2
@@ -50,15 +36,13 @@ slsDetectorPackage
     pydetector
     pyenums
     pyexamples
-    pyPatternGenerator
-    pattern
 
 .. toctree::
     :caption: Command line
-    :maxdepth: 1
+    :maxdepth: 2
 
     commandline  
-
+    quick_start_guide
 
 .. toctree::
     :caption: Developer
@@ -95,9 +79,8 @@ slsDetectorPackage
     :caption: Receiver
     :maxdepth: 2
 
-    slsreceiver
     receivers
-    
+    slsreceiver
 
 .. toctree::
     :caption: Receiver Files
@@ -105,7 +88,6 @@ slsDetectorPackage
 
     fileformat
     slsreceiverheaderformat
-    dataformat
     masterfileattributes
     binaryfileformat
     hdf5fileformat

docs/src/installation.rst

@@ -6,47 +6,28 @@
 Installation
 ===============
 
-.. contents::
-   :local:
-   :depth: 2
-   :backlinks: top
+One can either install pre-built binaries using conda or build from source.
 
+.. warning ::
     
-Overview
---------------
-
-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.
-
-:ref:`conda pre-built binaries`: 
-Install pre-built binaries for the C++ client, receiver, GUI and the Python API (``slsdet``), simplifying setup across platforms.
-
-:ref:`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.
-
-:ref:`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 :doc:`dependencies <../dependencies>` installed. If installing using conda, conda will manage the dependencies. Avoid installing packages with pip and conda simultaneously.
+    Before building from source make sure that you have the 
+    :doc:`dependencies <../dependencies>` installed. If installing using conda, conda will 
+    manage the dependencies. Avoid also installing packages with pip. 
    
 
 
-   
-.. _conda pre-built binaries:
-
-1. Install pre-built binaries using conda (Recommended)
---------------------------------------------------------
+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 four different packages available:
-    ==============     =============================================
-    Package             Description
-    ==============     =============================================
-    slsdetlib           shared libraries and command line utilities 
-    slsdetgui           GUI
-    slsdet              Python bindings
-    moenchzmq           moench
-    ==============     =============================================
+We have three different packages available:
+
+    * **slsdetlib** shared libraries and command line utilities 
+    * **slsdetgui** GUI
+    * **slsdet** Python bindings
 
 .. code-block:: bash
 
@@ -62,7 +43,7 @@ We have four different packages available:
 
     #ready to use
     sls_detector_get exptime
-    ...
+    etc ...
 
 
 .. code-block:: bash
@@ -74,33 +55,14 @@ We have four different packages available:
     conda search slsdet
     # gui
     conda search slsdetgui
-    # moench
-    conda search moenchzmq
 
 
-.. _pip:
-
-2. Pip
--------
-The Python extension module ``slsdet`` can be installed using pip. This is available from v9.2.0 onwards.
-
-.. code-block:: bash
-    
-    #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 .
 
 
-.. _build from source:
+Build from source
+----------------------
 
-3. Build from source
--------------------------
-
-3.1. Download Source Code from github
+1. Download Source Code from github
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. code-block:: bash
@@ -115,53 +77,30 @@ The Python extension module ``slsdet`` can be installed using pip. This is avail
 
 
 
-3.2. Build from Source
+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
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-
 .. 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.
 
@@ -190,7 +129,7 @@ Example cmake options               Comment
     For v7.x.x of slsDetectorPackage and older, refer :ref:`zeromq notes for cmake option to hint library location. <zeromq for different slsDetectorPackage versions>` 
 
 
-3.2.2. Build using in-built cmk.sh script
+Build using in-built cmk.sh script
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
@@ -240,10 +179,10 @@ Example cmake options               Comment
     For v7.x.x of slsDetectorPackage and older, refer :ref:`zeromq notes for cmk script option to hint library location. <zeromq for different slsDetectorPackage versions>` 
 
 
-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
 
@@ -265,7 +204,7 @@ using this compiler
 
 
 
-3.4. Build slsDetectorGui (Qt5)
+Build slsDetectorGui (Qt5)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 1. Using pre-built binary on conda
@@ -326,7 +265,7 @@ using this compiler
 
 
 
-3.5. Build this documentation
+Build this documentation
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The documentation for the slsDetectorPackage is build using a combination 
@@ -349,8 +288,8 @@ is to use conda
     make rst # rst only, saves time in case the API did not change
 
 
-4. Pybind and Zeromq
--------------------------
+Pybind and Zeromq
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. _pybind for different slsDetectorPackage versions:
 

docs/src/masterfileattributes.rst

@@ -1,6 +1,5 @@
 
 .. _master file attributes:
-
 Master File Attributes
 =======================
 
@@ -288,6 +287,56 @@ Moench
    | Frame Header Format   | Expected frame header format for the data files |
    +-----------------------+-------------------------------------------------+
 
+Gotthard I
+^^^^^^^^^^^
+
+   +-----------------------+-------------------------------------------------+
+   | **Key**               | **Description**                                 |
+   +-----------------------+-------------------------------------------------+
+   | Version               | Version of the master file                      |
+   |                       | Current value:8.0                               |
+   +-----------------------+-------------------------------------------------+
+   | Timestamp             | Timestamp of creation of master file            |
+   +-----------------------+-------------------------------------------------+
+   | Detector Type         | Detector type                                   |
+   +-----------------------+-------------------------------------------------+
+   | Timing Mode           | Timing Mode                                     |
+   +-----------------------+-------------------------------------------------+
+   | Geometry              | Number of UDP ports in x and y dimension for    |
+   |                       | complete detector                               |
+   +-----------------------+-------------------------------------------------+
+   | Image Size in bytes   | Image size in bytes per UDP port                |
+   +-----------------------+-------------------------------------------------+
+   | Pixels                | Number of pixels in x and y dimension           |
+   |                       | per UDP port                                    |
+   +-----------------------+-------------------------------------------------+
+   | Max Frames Per File   | Maximum frames per file                         |
+   +-----------------------+-------------------------------------------------+
+   | Frame Discard Policy  | Receiever Frame discard policy                  |
+   |                       | for partial frames                              |
+   +-----------------------+-------------------------------------------------+
+   | Frame Padding         | Receiver Frame padding enable                   |
+   |                       | for partial frames                              |
+   +-----------------------+-------------------------------------------------+
+   | Scan Parameters       | Scanning mode on detector                       |
+   +-----------------------+-------------------------------------------------+
+   | Total Frames          | Total number of frames and triggers expected    |
+   +-----------------------+-------------------------------------------------+
+   | Receiver Roi          | Receiver ROI in file including xmax and ymax    |
+   +-----------------------+-------------------------------------------------+
+   | Exptime               | Exposure time                                   |
+   +-----------------------+-------------------------------------------------+
+   | Period                | Period between frames                           |
+   +-----------------------+-------------------------------------------------+
+   | Detector Roi          | Roi in detector restricted to an ADC.           |
+   |                       | Includes xmax                                   |
+   +-----------------------+-------------------------------------------------+
+   | Burst Mode            | Burst mode of detector                          |
+   +-----------------------+-------------------------------------------------+
+   | Frames in File        | Number of frames written to file by Receiver 0  |
+   +-----------------------+-------------------------------------------------+
+   | Frame Header Format   | Expected frame header format for the data files |
+   +-----------------------+-------------------------------------------------+
 
 Chip Test Board
 ^^^^^^^^^^^^^^^
@@ -345,9 +394,6 @@ Chip Test Board
    +-----------------------+-------------------------------------------------+
    | Dbit Offset           | Digital offset of valid data in bytes           |
    +-----------------------+-------------------------------------------------+
-   | Dbit Reorder          | Reorder such that it groups each signal (0-63)  |
-   |                       | from all the different samples together         |                 
-   +-----------------------+-------------------------------------------------+
    | Dbit Bitset           | Digital 64 bit mask of bits enabled in receiver |
    +-----------------------+-------------------------------------------------+
    | Transceiver Mask      | Mask of channels enabled in Transceiver         |

docs/src/multidet.rst

@@ -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!
-

docs/src/pattern.rst

@@ -1,130 +0,0 @@
-Pattern
-========================
-
-This is a test and development feature implemented only for Ctb, Xilinx_Ctb and Mythen3.
-
-A pattern is a sequence of 64-bit words which is executed using a clock on the FPGA. Each of the 64 bits is connected to a pin or internal signal of the FPGA. The purpose of a pattern is to provide a way to change these 64 signals with precise timing. Commands run by the detector server could manipulate the same signals as the pattern, but they cannot enforce a change in a specific clock cycle.
-
-**Usage**
-
-A pattern is written to memory on the FPGA using the patword command.
-
-.. code-block::
-
-   patword 0x0000 0x000000000000000A
-   patword 0x0001 0x000000000000000B
-   patword 0x0002 0x000000000000000C
-   patword 0x0003 0x000000000000000D
-   patword 0x0004 0x000000000000000E
-
-The example above writes a five-word pattern into FPGA memory. The first argument is the memory address, the second argument is the content to be written into this address. Before executing a pattern one has to set the address limits of the pattern:
-
-.. code-block::
-
-   patlimits 0x0000 0x0004
-
-This instructs the firmware to execute the commands from address 0 to 4 (including 0 and 4). The execution can be started from the pyctbgui or with the commands
-
-.. code-block::
-
-   start [Ctb, Xilinx_Ctb]
-   patternstart [Mythen3, Ctb, Xilinx_Ctb]
-
-The maximal number of patword addresses is 8192. However, it is possible to extend the length of the pattern sequence using loops and wait commands. Loops can be configured with the following commands:
-
-.. code-block::
-
-   patloop 0 0x0001 0x0003
-   patnloop 0 7
-
-The first argument of both commands is the ID of the loop. Ctb and Xilinx_Ctb can have 6 loops (ID 0-5), Mythen3 can have 4 loop definitions. The commands above configure the loop with ID 0 to run 7 times and jump from the patword with address 3 to the patword with address 1. Important: If patnloop is set to 1, the addresses 0x1-0x3 will execute exactly once; if it is set to 0, the pattern addresses will be skipped.
-
-The same idea is used to introduce wait times. The example below causes the patword at address 0x0002 to be active for 9 clock cycles before the execution continues.
-
-.. code-block::
-
-   patwait 0 0x0002
-   patwaittime 0 9
-
-Waits can be placed inside a loop and loops can be nested.
-
-**patioctrl**
-
-The function of each bit in the sequence of 64-bit words depends on the connected detector and firmware version. Some of the 64 bits might connect directly to pads of a chip. The patioctrl command is used to configure the direction of some of these signals (not all of them !! See tables below). Signals where the corresponding bit in the argument of patioctrl is set to 1 will be driven from the FPGA.
-
-**patsetbit and patmask**
-
-The functions patsetbit and patmask can be used to ignore a specific bit of the pattern.
-Example:
-
-.. code-block::
-
-   patmask 0x0101
-   patsetbit 0x0001
-
-Patmask configures bit 0 and 8 of the pattern to be set to their value in patsetbit. These bits will be ignored during pattern execution and will always be 0 (bit 8) and 1 (bit 0).
-
-The mappings of bit positions in the pattern word to signals/pads of the FPGA are listed below for the three detector types where patterns are used. In the case of the two CTB's, connections of the signals to actual pads of a chip depend on the layout of the used detector adapter board. Therefore, each type of detector adapter board adds an additional mapping layer.
-
-**CTB Pattern Bit Mapping**
-
-.. table:: 
-
-   +----+---+------+----+----------+----------+----------------+
-   | 63 | 62| 61-57| 56 |  55-48   |  47-32   |  31-0          |
-   +----+---+------+----+----------+----------+----------------+
-   |  A |  D|  --- |  T | EXTIO    | DO       | DIO            |
-   +----+---+------+----+----------+----------+----------------+
-
-DIO: Driving the 32 FPGA pins corresponding to the lowest 32 bits of the patioctrl command. If bits in patioctrl are 0, the same bit positions in DIO will switch to input pins and connect to dbit sampling. Additionally, some of these 32 bits have an automatic override by detector-specific statemachines which is active whenever one of these statemachines is running (currently bits 7,8,11,14 and 20).
-
-DO: Directly connected to 16 FPGA pins. Output only. Not influenced by patioctrl. Also connected to bit 47-32 in all Ctb dbit samples. All of them can be used as dbit sample trigger. In addition, every bit of DO can be selected as trigger for sending out a udp packet with samples to the receiver.
-
-EXTIO: Similar to DIO, but not used as input to the fpga. With the corresponding patioctrl bits set to 0 these pins will switch to a high impedance mode and be ignored by the firmware.
-
-T: trigger output
-
-D: enable signal for digital sampling
-
-A: adc enable
-
-**Xilinx_CTB Pattern Bit Mapping**
-
-.. table:: 
-
-   +-------+----------------+
-   | 63-32 |  31-0          |
-   +-------+----------------+
-   |  ---  | DIO            |
-   +-------+----------------+
-
-DIO: Driving the 32 FPGA pins corresponding to the lowest 32 bits of the patioctrl command. If bits in patioctrl are 0, the same bit positions in DIO will switch to input pins and connect to dbit sampling. Additionally, some of these 32 bits have an automatic override by detector-specific statemachines which is active whenever these sm's are running (currently bits 7,8,11,14 and 20).
-
-
-**Mythen3 Pattern Bit Mapping**
-
-.. table:: 
-
-   +-------+--------+-------+--------+------------+----------+----------+-----+-----+
-   | 63-33 |  32    | 31-25 |  24    | 23         |  22      | 21       | 20  | 19  |
-   +-------+--------+-------+--------+------------+----------+----------+-----+-----+
-   |  ---  | signARD|  ---  | CHSclk |  cnt_rst   |  sto_rst | STATLOAD | STO | SIN |
-   +-------+--------+-------+--------+------------+----------+----------+-----+-----+
-
-.. table:: 
-
-   +---------+-----+-------+-------+----+-------+---------+--------+
-   | 18      | 17  | 16-14 | 13    | 12 | 11    | 10      | 9-0    |
-   +---------+-----+-------+-------+----+-------+---------+--------+
-   | SR_MODE | clk | EN    | PULSE | RD | CHSIN | ANAMode | TBLOAD |
-   +---------+-----+-------+-------+----+-------+---------+--------+
-
-For Mythen3 the pattern word only connects to output pins of the FPGA when the pattern is running. Afterwards the signals will switch back to other logic in the FPGA. Both CTB's hold the last executed pattern word until a new pattern is started.
-
-**Relation of received data to pattern execution**
-
-In the default configuration the Ctb will send out udp packets to the sls_receiver for every end of a pattern execution. This behavior can be changed using STREAMING_CTRL_REG, where one can configure a bit position in the 64-bit pattern word to trigger udp packets. This allows to send more than one packet per pattern or also no packets at all.
-
-The "patternstart" command on the ctb exectues the pattern. As long as streaming_ctrl_reg is disabeld, every pattern execution using this command will not send UDP packets.
-
-For Mythen3 the sending of udp packets is not connected to pattern execution.

docs/src/pyPatternGenerator.rst

@@ -1,34 +0,0 @@
-PatternGenerator
-=====================================================
-
-Python class to generate patterns for the Chip Test Board.
-
-.. code-block:: python
-
-    from slsdet import PatternGenerator
-
-    p = PatternGenerator()
-    p.SB(5)
-    p.PW()
-    p.SB(8,9)
-    p.PW()
-    p.CB(5)
-
-Created a pattern like this:
-
-.. code-block:: bash
-
-    patword 0x0000 0x0000000000000020
-    patword 0x0001 0x0000000000000320
-    patword 0x0002 0x0000000000000300
-    patioctrl 0x0000000000000000
-    patlimits 0x0000 0x0002
-    ...
-
-.. py:currentmodule:: slsdet
-
-.. autoclass:: PatternGenerator
-    :members:  
-    :undoc-members:
-    :show-inheritance:
-    :inherited-members:

docs/src/pyexamples.rst

@@ -50,12 +50,6 @@ datetime.timedelta, DurationWrapper or by setting the time in seconds.
     >>> d.getExptime()
     [sls::DurationWrapper(total_seconds: 181.23 count: 181230000000)]
 
-    # In C++ it is possible to use chrono literals to set time more easily
-    # d.setExptime(7ms). However, this is not possible due to pythons syntax.
-    # instead we can create a unit that we use for conversion.
-    >>> ms = dt.timedelta(milliseconds = 1)
-    >>> d.exptime = 7.5*ms
-
 
 
 ------------------------------------

docs/src/pygettingstarted.rst

@@ -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 
 --------------------

docs/src/quick_start_guide.rst

@@ -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
@@ -128,31 +128,6 @@ For Multiple Modules
         # set file path
         fpath /tmp
 
-.. 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
 ----
 

docs/src/receivers.rst

@@ -1,25 +1,25 @@
-Custom Receiver
+Receivers
 =================
 
-The receiver essentially listens to UDP data packets sent out by the detector.
-
-To know more about detector receiver setup in the config file, please check out :ref:`the detector-receiver UDP configuration in the config file<detector udp header config>` and the :ref:`detector udp format<detector udp header>`.
+Receiver processes can be run on same or different machines as the client, receives the data from the detector (via UDP packets).
+When using the slsReceiver/ slsMultiReceiver, they can be further configured by the client control software (via TCP/IP) to set file name, file path, progress of acquisition etc.
 
 
-| Please note the following when using a custom receiver:
+To know more about detector receiver configuration, please check out :ref:`detector udp header and udp commands in the config file <detector udp header>`
 
-* **udp_dstmac** must be configured in the config file. This parameter is not required when using an in-built receiver.
+Custom Receiver
+----------------
 
-* Cannot use "auto" for **udp_dstip**.
+| When using  custom receiver with our package, ensure that **udp_dstmac** is also configured in the config file. This parameter is not required when using slsReceiver.
 
-* No **rx_** commands in the config file. These commands are for configuring the slsReceiver.
+| Cannot use "auto" for **udp_dstip**.
 
-
-
-The main difference is the lack of **rx_** commands or file commands (eg. **f**write, **f**path) and the **udp_dstmac** is required in config file.
+| Also ensure that there are no **rx_** commands in the config file. These commands are for configuring the slsReceiver.
 
 Example of a custom receiver config file
 
+* The main difference is the lack of **rx_** commands or file commands (eg. fwrite, fpath) and the udp_dstmac is required in config file.
+
 .. code-block:: bash
 
     # detector hostname

docs/src/serverdefaults.rst

@@ -89,3 +89,18 @@ DACS
    :widths: 35, 35
    :header-rows: 1
 
+Gotthard
+-------------
+
+.. csv-table:: Default values
+   :file: gotthard.csv
+   :widths: 35, 35
+   :header-rows: 1
+
+DACS
+^^^^^^^^^^^^^
+
+.. csv-table:: Gotthard DACS
+   :file: gotthard-dacs.csv
+   :widths: 35, 35
+   :header-rows: 1

docs/src/servers.rst

@@ -1,5 +1,3 @@
-.. _detector_servers:
-
 Getting Started
 ===============
 
@@ -29,24 +27,25 @@ Arguments
          -p, --port <port>        : TCP communication port with client. 
          -g, --nomodule           : [Mythen3][Gotthard2] 
                                     Generic or No Module mode. Skips detector type checks. 
+         -f, --phaseshift <value> : [Gotthard] only. Sets phase shift. 
          -d, --devel              : Developer mode. Skips firmware checks. 
          -u, --update             : Update mode. Skips firmware checks and initial detector setup. 
-         -i, --ignore-config      : [Eiger][Jungfrau][Gotthard2][Moench] 
+         -i, --ignore-config      : [Eiger][Jungfrau][Gotthard][Gotthard2][Moench] 
                                     Ignore config file. 
-         -m, --master <master>    : [Eiger][Mythen3][Gotthard2] 
+         -m, --master <master>    : [Eiger][Mythen3][Gotthard][Gotthard2] 
                                     Set Master to 0 or 1. Precedence over config file. Only for virtual servers except Eiger. 
          -t, --top <top>          : [Eiger] Set Top to 0 or 1. Precedence over config file. 
          -s, --stopserver         : Stop server. Do not use as it is created by control server 
 
 
 .. _Automatic start servers:
-
 Automatic start 
 ------------------
 
 One can start the on-board detector server automatically upon powering on the board.
 
-#. Create a soft link to the binary on board:
+#. Create a soft link to the binary on board 
+   :
       .. code-block:: bash
       
          ln -sf someDetectorServervx.x.x someDetectorServer
@@ -66,7 +65,7 @@ One can start the on-board detector server automatically upon powering on the bo
          /home/root/executables/eigerDetectorServer &> /dev/null &
          exit 0
 
-   Jungfrau | Moench | CTB
+   Jungfrau | Moench | CTB | Gotthard I
       .. code-block:: bash
 
          # Edit inittab on board
@@ -88,7 +87,8 @@ One can start the on-board detector server automatically upon powering on the bo
          /root/xxxDetectorServer >> /dev/null &
 
 
-#. Sync, reboot and verify:
+#. Sync, reboot and verify
+   :
       .. code-block:: bash
       
          sync

docs/src/serverupgrade.rst

@@ -1,5 +1,4 @@
 .. _Detector Server Upgrade:
-
 Upgrade
 ========
 

docs/src/slsreceiver.rst

@@ -1,78 +1,16 @@
-In-built Receiver   
+slsReceiver/ slsMultiReceiver
 ================================
 
-
-
-The receiver essentially listens to UDP data packets sent out by the detector. It's main features are:
-
-- **Listening**: Receives UDP data from the detector.
-- **Writing to File**: Optionally writes received data to disk.
-- **Streaming via ZMQ**: Optionally streams out the data using ZeroMQ.
-
-Each of these operations runs asynchronously and in parallel for each UDP port.
-
-
-.. note ::   
-
-    * Can be run on the same or different machine as the client.
-    * Can be configured by the client. (set file name/ discard policy, get progress etc.)
-    * Has to be started before the client runs any receiver specific command.
-
-
-Receiver Variants
------------------
-There are three main receiver types. How to start them is described :ref:`below<Starting up the Receiver>`.
-
-+----------------------+--------------------+-----------------------------------------+--------------------------------+
-| Receiver Type        | slsReceiver        | slsMultiReceiver                        |slsFrameSynchronizer            | 
-+======================+====================+=========================================+================================+
-| Modules Supported    | 1                  | Multiple                                | Multiple                       |
-+----------------------+--------------------+-----------------------------------------+--------------------------------+
-| Internal Architecture| Threads per porttt | Multiple child processes of slsReceiver | Multi-threading of slsReceiver |
-+----------------------+--------------------+-----------------------------------------+--------------------------------+
-| ZMQ Streaming        | Disabled by default| Disabled by default                     | Enabled, not optional          |
-+----------------------+--------------------+-----------------------------------------+--------------------------------+
-| ZMQ Synchronization  | No                 | No                                      | Yes, across ports              |
-+----------------------+--------------------+-----------------------------------------+--------------------------------+
-| Image Reconstruction | No                 | No                                      | No                             |
-+----------------------+--------------------+-----------------------------------------+--------------------------------+
-
-
-.. _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. 
-
-
-
+| One has to start the slsReceiver before loading config file or using any receiver commands (prefix: **rx_** )
 
 For a Single Module
     .. code-block:: bash  
 
-        slsReceiver # default port 1954
+        # default port 1954
+        slsReceiver
 
-        slsReceiver -p 2012 # custom port 2012
+        # custom port 2012
+        slsReceiver -t2012
 
 
 For Multiple Modules
@@ -80,66 +18,57 @@ For Multiple Modules
 
         # each receiver (for each module) requires a unique tcp port (if all on same machine)
 
-        # option 1 (one for each module)
+        # using slsReceiver in multiple consoles
         slsReceiver
-        slsReceiver -p 1955
+        slsReceiver -t1955
 
-        # option 2
-        slsMultiReceiver -p 2012 -n 2
-
-        # option 3
-        slsFrameSynchronizer -p 2012 -n 2
+        # slsMultiReceiver [starting port] [number of receivers]
+        slsMultiReceiver 2012 2
 
+        # slsMultiReceiver [starting port] [number of receivers] [print each frame header for debugging]
+        slsMultiReceiver 2012 2 1
 
 
 Client Commands 
 -----------------
 
-* Client commands to the receiver begin with **rx_** or **f_** (file commands).
+| One can remove **udp_dstmac** from the config file, as the slsReceiver fetches this from the **udp_ip**.
 
-* **rx_hostname** has to be the first command to the receiver so the client knows which receiver process to communicate with.
+| One can use "auto" for **udp_dstip** if one wants to use default ip of **rx_hostname**.
 
-* Can use 'auto' for **udp_dstip** if using 1GbE interface or the :ref:`virtual simulators<Virtual Detector Servers>`.
-
-
-To know more about detector receiver setup in the config file, please check out :ref:`the detector-receiver UDP configuration in the config file<detector udp header config>` and the :ref:`detector udp format<detector udp header>`.
-
-
-The following are the different ways to establish contact using **rx_hostname** command.
+| The first command to the receiver (**rx_** commands) should be **rx_hostname**. The following are the different ways to establish contact.
 
     .. code-block:: bash  
 
-        # ---single module---
-
-        # default receiver port at 1954
+        # default receiver tcp port (1954)
         rx_hostname xxx
 
         # custom receiver port
-        rx_hostname xxx:1957 # option 1
+        rx_hostname xxx:1957
 
-        rx_tcpport 1957  # option 2
+        # custom receiver port
+        rx_tcpport 1954
         rx_hostname xxx
 
+        # multi modules with custom ports
+        rx_hostname xxx:1955+xxx:1956+
         
-        # ---multi module---
         
-        # using increasing tcp ports
+        # multi modules using increasing tcp ports when using multi detector command
         rx_tcpport 1955
         rx_hostname xxx
 
-        # custom ports
-        rx_hostname xxx:1955+xxx:1958+ # option 1
-
-        0:rx_tcpport 1954 # option 2
+        # or specify multi modules with custom ports on same rxr pc
+        0:rx_tcpport 1954
         1:rx_tcpport 1955
         2:rx_tcpport 1956
         rx_hostname xxx
 
-        # custom ports on different receiver machines
+        # multi modules with custom ports on different rxr pc
         0:rx_tcpport 1954
         0:rx_hostname xxx
         1:rx_tcpport 1955
-        1:rx_hostname yyyrxr
+        1:rx_hostname yyy
 
 
 | Example commands:
@@ -162,32 +91,6 @@ The following are the different ways to establish contact using **rx_hostname**
         sls_detector_get -h rx_framescaught
 
 
-Example of a config file using in-built receiver
-
-.. code-block:: bash
-
-    # detector hostname
-    hostname bchip052+bchip053+
-
-    # udp destination port (receiver)
-    # sets increasing destination udp ports starting at 50004
-    udp_dstport 50004
-
-    # udp destination ip (receiver)
-    0:udp_dstip 10.0.1.100
-    1:udp_dstip 10.0.2.100
-
-    # udp source ip (same subnet as udp_dstip)
-    0:udp_srcip 10.0.1.184
-    1:udp_srcip 10.0.2.184
-
-    # udp destination mac - not required (picked up from udp_dstip)
-    #udp_dstmac 22:47:d5:48:ad:ef
-
-    # connects to receivers at increasing tcp port starting at 1954
-    rx_hostname mpc3434
-    # same as rx_hostname mpc3434:1954+mpc3434:1955+
-
 
 
 Performance 

docs/src/softwarearchitecture.rst

@@ -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.
-

docs/src/troubleshooting.rst

@@ -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
@@ -435,6 +385,14 @@ Cannot get data without a module attached
 You cannot get data without a module attached as a specific pin is floating. Attach module to get data.
 
 
+Gotthard
+----------
+
+
+Missing first frame or next frame after a delay
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Connect the data link from the Module directly to receiver pc or to a private network.
+
 
 Mythen3
 --------

docs/src/udpconfig.rst

@@ -1,4 +1,4 @@
-.. _detector udp header config:
+.. _detector udp header:
 
 
 Config file

docs/src/udpheader.rst

@@ -73,9 +73,9 @@ Description
 
 * **modId**: module ID picked up from det_id_[detector type].txt on the detector cpu.
 
-* **row**: row position of the module in the detector system. It is calculated by the order of the module in hostname command, as well as the detsize command. 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.
+* **row**: row position of the module in the detector system. It is calculated by the order of the module in hostname command, as well as the detsize command.
 
-* **column**: column position of the module in the detector system.  It is calculated by the order of the module in hostname command, as well as the detsize command. 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.
+* **column**: column position of the module in the detector system.  It is calculated by the order of the module in hostname command, as well as the detsize command.
 
 * **detType**: detector type from enum of detectorType in the package.
 
@@ -92,7 +92,7 @@ Detector Enum
     ================    ========
     GENERIC             0
     EIGER               1
-    GOTTHARD*           2    
+    GOTTHARD            2    
     JUNGFRAU            3    
     CHIPTESTBOARD       4        
     MOENCH              5
@@ -100,7 +100,6 @@ Detector Enum
     GOTTHARD2           7    
     ================    ========
 
-    * deprecated since v10.0.0
 
 
 Previous Versions

docs/src/virtualserver.rst

@@ -1,5 +1,4 @@
 .. _Virtual Detector Servers:
-
 Simulators
 ===========
 
@@ -23,6 +22,7 @@ Binaries
 
         eigerDetectorServer_virtual
         jungfrauDetectorServer_virtual
+        gotthardDetectorServer_virtual
         gotthard2DetectorServer_virtual
         mythen3DetectorServer_virtual
         moenchDetectorServer_virtual

examples/gotthard.config

@@ -0,0 +1,12 @@
+# detector hostname
+hostname bchip007
+
+# receiver pc hostname of 1Gb IP of the machine
+rx_hostname my_receiver_hostname
+
+# output directory
+fpath  /bigRAID/datadir_gotthard/rec_test_data
+
+# high voltage
+highvoltage 120
+

libs/libzmq/libzmq_cmake_version.patch

@@ -1,18 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dd3d8eb9..c0187747 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,11 +1,8 @@
- # CMake build script for ZeroMQ
- project(ZeroMQ)
- 
--if(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)
--  cmake_minimum_required(VERSION 3.0.2)
--else()
--  cmake_minimum_required(VERSION 2.8.12)
--endif()
-+cmake_minimum_required(VERSION 3.15)
-+message(STATUS "Patched cmake version")
- 
- include(CheckIncludeFiles)
- include(CheckCCompilerFlag)

psi-pmodules/DetectorSoftware/slsDetectorPackage/files/variants

@@ -11,7 +11,4 @@ slsDetectorPackage/8.0.1_rh7 stable cmake/3.15.5 Qt/5.12.10
 slsDetectorPackage/8.0.1_rh8 stable cmake/3.15.5 Qt/5.12.10
 slsDetectorPackage/8.0.2_rh7 stable cmake/3.15.5 Qt/5.12.10
 slsDetectorPackage/8.0.2_rh8 stable cmake/3.15.5 Qt/5.12.10
-slsDetectorPackage/9.0.0_rh8 stable cmake/3.15.5 Qt/5.12.10
-slsDetectorPackage/9.1.0_rh8 stable cmake/3.15.5 Qt/5.12.10
-slsDetectorPackage/9.1.1_rh8 stable cmake/3.15.5 Qt/5.12.10
-slsDetectorPackage/9.2.0_rh8 stable cmake/3.15.5 Qt/5.12.10
+

pyctbgui/pyctbgui/services/ADC.py

@@ -14,8 +14,6 @@ from pyctbgui.utils.defines import Defines
 import pyctbgui.utils.pixelmap as pm
 from pyctbgui.utils.recordOrApplyPedestal import recordOrApplyPedestal
 
-from slsdet import detectorType
-
 if typing.TYPE_CHECKING:
     from pyctbgui.services import AcquisitionTab, PlotTab
 
@@ -32,7 +30,6 @@ class AdcTab(QtWidgets.QWidget):
         self.acquisitionTab: AcquisitionTab | None = None
         self.legend: LegendItem | None = None
         self.logger = logging.getLogger('AdcTab')
-        self.tengiga = True
 
     def setup_ui(self):
         self.plotTab = self.mainWindow.plotTab
@@ -46,12 +43,6 @@ class AdcTab(QtWidgets.QWidget):
         # subscribe to toggle legend
         self.plotTab.subscribeToggleLegend(self.updateLegend)
 
-        if self.det.type == detectorType.XILINX_CHIPTESTBOARD:
-            self.view.checkBoxADC0_15Inv.setDisabled(True)
-            self.view.checkBoxADC16_31Inv.setDisabled(True)
-            self.view.lineEditADCInversion.setDisabled(True)
-            self.view.labelADCInversion.setDisabled(True)
-
     def initializeAllAnalogPlots(self):
         self.mainWindow.plotAnalogWaveform = pg.plot()
         self.mainWindow.plotAnalogWaveform.addLegend(colCount=Defines.colCount)
@@ -76,7 +67,6 @@ class AdcTab(QtWidgets.QWidget):
 
     def connect_ui(self):
         for i in range(Defines.adc.count):
-            if self.det.type == detectorType.CHIPTESTBOARD:
             getattr(self.view, f"checkBoxADC{i}Inv").stateChanged.connect(partial(self.setADCInv, i))
             getattr(self.view, f"checkBoxADC{i}En").stateChanged.connect(partial(self.setADCEnable, i))
             getattr(self.view, f"checkBoxADC{i}Plot").stateChanged.connect(partial(self.setADCEnablePlot, i))
@@ -87,16 +77,14 @@ class AdcTab(QtWidgets.QWidget):
         self.view.checkBoxADC0_15Plot.stateChanged.connect(partial(self.setADCEnablePlotRange, 0, Defines.adc.half))
         self.view.checkBoxADC16_31Plot.stateChanged.connect(
             partial(self.setADCEnablePlotRange, Defines.adc.half, Defines.adc.count))
-        self.view.lineEditADCEnable.editingFinished.connect(self.setADCEnableReg)
-        if self.det.type == detectorType.CHIPTESTBOARD:
         self.view.checkBoxADC0_15Inv.stateChanged.connect(partial(self.setADCInvRange, 0, Defines.adc.half))
         self.view.checkBoxADC16_31Inv.stateChanged.connect(
             partial(self.setADCInvRange, Defines.adc.half, Defines.adc.count))
         self.view.lineEditADCInversion.editingFinished.connect(self.setADCInvReg)
+        self.view.lineEditADCEnable.editingFinished.connect(self.setADCEnableReg)
 
     def refresh(self):
         self.updateADCNames()
-        if self.det.type == detectorType.CHIPTESTBOARD:
         self.updateADCInv()
         self.updateADCEnable()
 
@@ -154,8 +142,6 @@ class AdcTab(QtWidgets.QWidget):
                 self.mainWindow.analogPlots[i].setData(waveform)
                 plotName = getattr(self.view, f"labelADC{i}").text()
                 waveforms[plotName] = waveform
-            elif checkBoxEn.isChecked(): 
-                idx += 1
         return waveforms
 
     @recordOrApplyPedestal
@@ -210,11 +196,9 @@ class AdcTab(QtWidgets.QWidget):
         return decoder.decode(analog_array, pm.moench04_analog())
 
     def getADCEnableReg(self):
-        if self.det.type == detectorType.CHIPTESTBOARD:
-            self.tengiga = self.det.tengiga
-        retval = self.det.adcenable10g
-        if not self.tengiga:
         retval = self.det.adcenable
+        if self.det.tengiga:
+            retval = self.det.adcenable10g
         self.view.lineEditADCEnable.editingFinished.disconnect()
         self.view.lineEditADCEnable.setText("0x{:08x}".format(retval))
         self.view.lineEditADCEnable.editingFinished.connect(self.setADCEnableReg)
@@ -223,8 +207,8 @@ class AdcTab(QtWidgets.QWidget):
     def setADCEnableReg(self):
         self.view.lineEditADCEnable.editingFinished.disconnect()
         try:
-            mask = int(self.view.lineEditADCEnable.text(), 16)
-            if self.tengiga:
+            mask = int(self.mainWindow.lineEditADCEnable.text(), 16)
+            if self.det.tengiga:
                 self.det.adcenable10g = mask
             else:
                 self.det.adcenable = mask
@@ -255,7 +239,7 @@ class AdcTab(QtWidgets.QWidget):
     def setADCEnable(self, i):
         checkBox = getattr(self.view, f"checkBoxADC{i}En")
         try:
-            if self.tengiga:
+            if self.det.tengiga:
                 enableMask = manipulate_bit(checkBox.isChecked(), self.det.adcenable10g, i)
                 self.det.adcenable10g = enableMask
             else:
@@ -281,7 +265,7 @@ class AdcTab(QtWidgets.QWidget):
         for i in range(start_nr, end_nr):
             mask = manipulate_bit(checkBox.isChecked(), mask, i)
         try:
-            if self.tengiga:
+            if self.det.tengiga:
                 self.det.adcenable10g = mask
             else:
                 self.det.adcenable = mask
@@ -360,7 +344,7 @@ class AdcTab(QtWidgets.QWidget):
     def setADCInvReg(self):
         self.view.lineEditADCInversion.editingFinished.disconnect()
         try:
-            self.det.adcinvert = int(self.view.lineEditADCInversion.text(), 16)
+            self.det.adcinvert = int(self.mainWindow.lineEditADCInversion.text(), 16)
         except Exception as e:
             QtWidgets.QMessageBox.warning(self.mainWindow, "ADC Inversion Fail", str(e), QtWidgets.QMessageBox.Ok)
             pass
@@ -411,12 +395,7 @@ class AdcTab(QtWidgets.QWidget):
         self.updateADCInv()
 
     def saveParameters(self) -> list[str]:
-        if self.det.type == detectorType.CHIPTESTBOARD:
         return [
             f"adcenable {self.view.lineEditADCEnable.text()}",
             f"adcinvert {self.view.lineEditADCInversion.text()}",
         ]
-        else:
-            return [
-                f"adcenable {self.view.lineEditADCEnable.text()}"
-            ]     

pyctbgui/pyctbgui/services/Acquisition.py

@@ -7,7 +7,7 @@ import zmq
 from PyQt5 import QtWidgets, uic
 import logging
 
-from slsdet import readoutMode, runStatus, detectorType
+from slsdet import readoutMode, runStatus
 from pyctbgui.utils.defines import Defines
 from pyctbgui.utils.numpyWriter.npy_writer import NumpyFileManager
 from pyctbgui.utils.numpyWriter.npz_writer import NpzFileWriter
@@ -49,36 +49,18 @@ class AcquisitionTab(QtWidgets.QWidget):
         self.adcTab = self.mainWindow.adcTab
         self.plotTab = self.mainWindow.plotTab
         self.toggleStartButton(False)
-        if self.det.type == detectorType.XILINX_CHIPTESTBOARD:
-            self.view.labelADCPhase.setDisabled(True)
-            self.view.labelADCPipeline.setDisabled(True)
-            self.view.labelDBITPhase.setDisabled(True)
-            self.view.labelDBITPipeline.setDisabled(True)
-            self.view.spinBoxADCPhase.setDisabled(True)
-            self.view.spinBoxADCPipeline.setDisabled(True)
-            self.view.spinBoxDBITPhase.setDisabled(True)
-            self.view.spinBoxDBITPipeline.setDisabled(True)
-            self.view.labelRunF.setText("Run Clock Frequency (kHz):")
-            self.view.labelDBITF.setText("DBIT Clock Frequency (kHz):")
-            self.view.labelADCF.setText("ADC Clock Frequency (kHz):")
-            self.view.spinBoxRunF.setMaximum(250000)
-            self.view.spinBoxDBITF.setMaximum(250000)
-            self.view.spinBoxADCF.setMaximum(250000)
 
     def connect_ui(self):
         # For Acquistions Tab
         self.view.comboBoxROMode.currentIndexChanged.connect(self.setReadOut)
+        self.view.spinBoxRunF.editingFinished.connect(self.setRunFrequency)
         self.view.spinBoxTransceiver.editingFinished.connect(self.setTransceiver)
         self.view.spinBoxAnalog.editingFinished.connect(self.setAnalog)
         self.view.spinBoxDigital.editingFinished.connect(self.setDigital)
-        
-        if self.det.type in [detectorType.CHIPTESTBOARD, detectorType.XILINX_CHIPTESTBOARD]:
-            self.view.spinBoxRunF.editingFinished.connect(self.setRunFrequency)
         self.view.spinBoxADCF.editingFinished.connect(self.setADCFrequency)
-            self.view.spinBoxDBITF.editingFinished.connect(self.setDBITFrequency)
-        if self.det.type == detectorType.CHIPTESTBOARD:
         self.view.spinBoxADCPhase.editingFinished.connect(self.setADCPhase)
         self.view.spinBoxADCPipeline.editingFinished.connect(self.setADCPipeline)
+        self.view.spinBoxDBITF.editingFinished.connect(self.setDBITFrequency)
         self.view.spinBoxDBITPhase.editingFinished.connect(self.setDBITPhase)
         self.view.spinBoxDBITPipeline.editingFinished.connect(self.setDBITPipeline)
 
@@ -95,20 +77,16 @@ class AcquisitionTab(QtWidgets.QWidget):
 
     def refresh(self):
         self.getReadout()
+        self.getRunFrequency()
         self.getTransceiver()
         self.getAnalog()
         self.getDigital()
-
-        if self.det.type in [detectorType.CHIPTESTBOARD, detectorType.XILINX_CHIPTESTBOARD]:
-            self.getRunFrequency()
         self.getADCFrequency()
-            self.getDBITFrequency()
-        if self.det.type == detectorType.CHIPTESTBOARD:
         self.getADCPhase()
         self.getADCPipeline()
+        self.getDBITFrequency()
         self.getDBITPhase()
         self.getDBITPipeline()
-
         self.getFileWrite()
         self.getFileName()
         self.getFilePath()
@@ -719,7 +697,6 @@ class AcquisitionTab(QtWidgets.QWidget):
         self.socket.subscribe("")
 
     def saveParameters(self) -> list[str]:
-        if self.det.type == detectorType.CHIPTESTBOARD:
         return [
             f'romode {self.view.comboBoxROMode.currentText().lower()}',
             f'runclk {self.view.spinBoxRunF.value()}',
@@ -740,18 +717,3 @@ class AcquisitionTab(QtWidgets.QWidget):
             f'dsamples {self.view.spinBoxDigital.value()}',
             f'tsamples {self.view.spinBoxTransceiver.value()}',
         ]
-        else:
-            return [
-                f'romode {self.view.comboBoxROMode.currentText().lower()}',
-                f'fwrite {int(self.view.checkBoxFileWriteRaw.isChecked())}',
-                f'fname {self.view.lineEditFileName.text()}',
-                f'fpath {self.view.lineEditFilePath.text()}',
-                f'findex {self.view.spinBoxAcquisitionIndex.value()}',
-                f'frames {self.view.spinBoxFrames.value()}',
-                f'triggers {self.view.spinBoxTriggers.value()}',
-                f'period {self.view.spinBoxPeriod.value()} {self.view.comboBoxPeriod.currentText().lower()}',
-                f'asamples {self.view.spinBoxAnalog.value()}',
-                f'dsamples {self.view.spinBoxDigital.value()}',
-                f'tsamples {self.view.spinBoxTransceiver.value()}',
-            ] 
-

pyctbgui/pyctbgui/services/DACs.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from PyQt5 import QtWidgets, uic
 from pyctbgui.utils.defines import Defines
 
-from slsdet import dacIndex, detectorType
+from slsdet import dacIndex
 
 
 class DacTab(QtWidgets.QWidget):
@@ -19,14 +19,7 @@ class DacTab(QtWidgets.QWidget):
             dac = getattr(dacIndex, f"DAC_{i}")
             getattr(self.view, f"spinBoxDAC{i}").setValue(self.det.getDAC(dac)[0])
 
-        if self.det.type == detectorType.XILINX_CHIPTESTBOARD:
-            self.view.checkBoxHighVoltage.setDisabled(True)
-            self.view.spinBoxHighVoltage.setDisabled(True)
-            self.view.labelHighVoltage.setDisabled(True)
-            self.view.labelADCVppDacName.setDisabled(True)
-            self.view.labelADCVpp.setDisabled(True)
-            self.view.comboBoxADCVpp.setDisabled(True)
-        elif self.det.highvoltage == 0:
+        if self.det.highvoltage == 0:
             self.view.spinBoxHighVoltage.setDisabled(True)
             self.view.checkBoxHighVoltage.setChecked(False)
 
@@ -37,9 +30,7 @@ class DacTab(QtWidgets.QWidget):
             getattr(self.view, f"checkBoxDAC{i}").stateChanged.connect(partial(self.setDACTristate, i))
             getattr(self.view, f"checkBoxDAC{i}mV").stateChanged.connect(partial(self.getDAC, i))
 
-        if self.view.comboBoxADCVpp.isEnabled():
         self.view.comboBoxADCVpp.currentIndexChanged.connect(self.setADCVpp)
-        if self.view.checkBoxHighVoltage.isEnabled():
         self.view.spinBoxHighVoltage.editingFinished.connect(self.setHighVoltage)
         self.view.checkBoxHighVoltage.stateChanged.connect(self.setHighVoltage)
 
@@ -49,9 +40,7 @@ class DacTab(QtWidgets.QWidget):
             self.getDACTristate(i)
             self.getDAC(i)
 
-        if self.view.comboBoxADCVpp.isEnabled():
         self.getADCVpp()
-        if self.view.checkBoxHighVoltage.isEnabled():
         self.getHighVoltage()
 
     def updateDACNames(self):
@@ -176,8 +165,6 @@ class DacTab(QtWidgets.QWidget):
                 unit = " mV" if inMV else ""
                 commands.append(f"dac {i} {value}{unit}")
 
-        if self.view.comboBoxADCVpp.isEnabled():
         commands.append(f"adcvpp {self.view.comboBoxADCVpp.currentText()} mV")
-        if self.view.checkBoxHighVoltage.isEnabled():
         commands.append(f"highvoltage {self.view.spinBoxHighVoltage.value()}")
         return commands

pyctbgui/pyctbgui/services/Pattern.py

@@ -10,7 +10,6 @@ from matplotlib.backends.backend_qt5agg import NavigationToolbar2QT as Navigatio
 from pyctbgui.utils.defines import Defines
 from pyctbgui.utils.plotPattern import PlotPattern
 
-from slsdet import DurationWrapper
 
 class PatternTab(QtWidgets.QWidget):
 
@@ -62,10 +61,7 @@ class PatternTab(QtWidgets.QWidget):
             getattr(self.view, f"lineEditLoop{i}Wait").editingFinished.connect(partial(self.setPatLoopWaitAddress, i))
             getattr(self.view,
                     f"spinBoxLoop{i}Repetition").editingFinished.connect(partial(self.setPatLoopRepetition, i))
-            getattr(self.view, f"doubleSpinBoxLoop{i}WaitClocks").editingFinished.connect(partial(self.setPatLoopWaitClocks, i))
-            getattr(self.view, f"spinBoxLoop{i}WaitInterval").editingFinished.connect(partial(self.setPatLoopWaitInterval, i))
-            getattr(self.view, f"comboBoxLoop{i}WaitInterval").currentIndexChanged.connect(partial(self.setPatLoopWaitInterval, i))
-        self.view.toolButtonTogglePageWaitTime.clicked.connect(self.setTogglePageWaitTime)
+            getattr(self.view, f"spinBoxLoop{i}WaitTime").editingFinished.connect(partial(self.setPatLoopWaitTime, i))
         self.view.pushButtonCompiler.clicked.connect(self.setCompiler)
         self.view.pushButtonUncompiled.clicked.connect(self.setUncompiledPatternFile)
         self.view.pushButtonPatternFile.clicked.connect(self.setPatternFile)
@@ -95,8 +91,7 @@ class PatternTab(QtWidgets.QWidget):
             self.getPatLoopStartStopAddress(i)
             self.getPatLoopWaitAddress(i)
             self.getPatLoopRepetition(i)
-            self.getPatLoopWaitClocks(i)
-            self.getPatLoopWaitInterval(i)
+            self.getPatLoopWaitTime(i)
 
     # Pattern Tab functions
 
@@ -187,67 +182,17 @@ class PatternTab(QtWidgets.QWidget):
         self.det.patnloop[level] = spinBox.value()
         self.getPatLoopRepetition(level)
 
-    def getPatLoopWaitClocks(self, level):
+    def getPatLoopWaitTime(self, level):
         retval = self.det.patwaittime[level]
-        spinBox = getattr(self.view, f"doubleSpinBoxLoop{level}WaitClocks")
+        spinBox = getattr(self.view, f"spinBoxLoop{level}WaitTime")
         spinBox.editingFinished.disconnect()
         spinBox.setValue(retval)
-        spinBox.editingFinished.connect(partial(self.setPatLoopWaitClocks, level))
-
-    def setPatLoopWaitClocks(self, level):
-        spinBox = getattr(self.view, f"doubleSpinBoxLoop{level}WaitClocks")
-        self.det.patwaittime[level] = int(spinBox.value())
-        self.getPatLoopWaitClocks(level)
-
-    def getPatLoopWaitInterval(self, level):
-        retval = self.det.getPatternWaitInterval(level)[0].count()
-        spinBox = getattr(self.view, f"spinBoxLoop{level}WaitInterval")
-        comboBox = getattr(self.view, f"comboBoxLoop{level}WaitInterval")
-        spinBox.editingFinished.disconnect()
-        comboBox.currentIndexChanged.disconnect()
-        # Converting to right time unit for period
-        if retval >= 1e9:
-            comboBox.setCurrentIndex(0)
-            spinBox.setValue(retval / 1e9)
-        elif retval >= 1e6:
-            comboBox.setCurrentIndex(1)
-            spinBox.setValue(retval / 1e6)
-        elif retval >= 1e3:
-            comboBox.setCurrentIndex(2)
-            spinBox.setValue(retval / 1e3)
-        else:
-            comboBox.setCurrentIndex(3)
-            spinBox.setValue(retval)
-        spinBox.editingFinished.connect(partial(self.setPatLoopWaitInterval, level))
-        comboBox.currentIndexChanged.connect(partial(self.setPatLoopWaitInterval, level))
-
-    def setPatLoopWaitInterval(self, level):
-        spinBox = getattr(self.view, f"spinBoxLoop{level}WaitInterval")
-        comboBox = getattr(self.view, f"comboBoxLoop{level}WaitInterval")
-        value = spinBox.value()
-        if comboBox.currentIndex() == 0:
-            value *= 1e9
-        elif comboBox.currentIndex() == 1:
-            value *= 1e6
-        elif  comboBox.currentIndex() == 2:
-            value *= 1e3
-        t = DurationWrapper()
-        t.set_count(int(value))
-        self.det.patwaittime[level] =  t    
-        self.getPatLoopWaitInterval(level)
-
-    def setTogglePageWaitTime(self):
-        if self.view.stackedWidgetWaitTime.currentIndex() == 0:
-            self.view.stackedWidgetWaitTime.setCurrentIndex(1)
-            self.view.labelWaitTime.setText("Time")
-            for i in range(Defines.pattern.loops_count):
-                self.getPatLoopWaitInterval(i)
-        else:
-            self.view.stackedWidgetWaitTime.setCurrentIndex(0)
-            self.view.labelWaitTime.setText("Clocks")
-            for i in range(Defines.pattern.loops_count):
-                self.getPatLoopWaitClocks(i)
+        spinBox.editingFinished.connect(partial(self.setPatLoopWaitTime, level))
 
+    def setPatLoopWaitTime(self, level):
+        spinBox = getattr(self.view, f"spinBoxLoop{level}WaitTime")
+        self.det.patwaittime[level] = spinBox.value()
+        self.getPatLoopWaitTime(level)
 
     def setCompiler(self):
         response = QtWidgets.QFileDialog.getOpenFileName(
@@ -505,7 +450,7 @@ class PatternTab(QtWidgets.QWidget):
                             f"{getattr(self.view, f'lineEditLoop{i}Stop').text()}")
 
             commands.append(f"patwait {i} {getattr(self.view, f'lineEditLoop{i}Wait').text()}")
-            commands.append(f"patwaittime {i} {getattr(self.view, f'doubleSpinBoxLoop{i}WaitClocks').text()}")
+            commands.append(f"patwaittime {i} {getattr(self.view, f'spinBoxLoop{i}WaitTime').text()}")
         commands.append(f"patlimits {self.view.lineEditStartAddress.text()}, {self.view.lineEditStopAddress.text()}")
         # commands.append(f"patfname {self.view.lineEditPatternFile.text()}")
         return commands

pyctbgui/pyctbgui/services/PowerSupplies.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from PyQt5 import QtWidgets, uic
 from pyctbgui.utils.defines import Defines
 
-from slsdet import dacIndex, detectorType
+from slsdet import dacIndex
 
 
 class PowerSuppliesTab(QtWidgets.QWidget):
@@ -18,7 +18,6 @@ class PowerSuppliesTab(QtWidgets.QWidget):
         self.updateVoltageNames()
         for i in Defines.powerSupplies:
             self.getVoltage(i)
-            if self.det.type == detectorType.CHIPTESTBOARD:
             self.getCurrent(i)
 
     def connect_ui(self):
@@ -39,12 +38,6 @@ class PowerSuppliesTab(QtWidgets.QWidget):
             if retval == 0:
                 checkBox.setChecked(False)
                 spinBox.setDisabled(True)
-            if self.det.type == detectorType.XILINX_CHIPTESTBOARD:
-                label = getattr(self.view, f"labelI{i}")
-                label.setDisabled(True)
-        if self.det.type == detectorType.XILINX_CHIPTESTBOARD:
-            self.view.spinBoxVChip.setDisabled(True)
-
 
     def updateVoltageNames(self):
         retval = self.det.getPowerNames()
@@ -63,9 +56,6 @@ class PowerSuppliesTab(QtWidgets.QWidget):
         spinBox.editingFinished.disconnect()
         checkBox.stateChanged.disconnect()
 
-        if self.det.type == detectorType.XILINX_CHIPTESTBOARD:
-            retval = self.det.getPower(voltageIndex)[0]
-        else:
         retval = self.det.getMeasuredPower(voltageIndex)[0]
         # spinBox.setValue(retval)
         if retval > 1:
@@ -79,7 +69,6 @@ class PowerSuppliesTab(QtWidgets.QWidget):
         spinBox.editingFinished.connect(partial(self.setVoltage, i))
         checkBox.stateChanged.connect(partial(self.setVoltage, i))
 
-        if self.det.type == detectorType.CHIPTESTBOARD:
         self.getVChip()
 
         # TODO: handle multiple events when pressing enter (twice)
@@ -102,7 +91,6 @@ class PowerSuppliesTab(QtWidgets.QWidget):
         # TODO: (properly) disconnecting and connecting to handle multiple events (out of focus and pressing enter).
         spinBox.editingFinished.connect(partial(self.setVoltage, i))
         self.getVoltage(i)
-        if self.det.type == detectorType.CHIPTESTBOARD:
         self.getCurrent(i)
 
     def getCurrent(self, i):

pyctbgui/pyctbgui/services/Signals.py

@@ -22,7 +22,6 @@ class SignalsTab(QtWidgets.QWidget):
         self.plotTab = None
         self.legend: LegendItem | None = None
         self.rx_dbitoffset = None
-        self.rx_dbitreorder = None
         self.rx_dbitlist = None
 
     def refresh(self):
@@ -30,7 +29,6 @@ class SignalsTab(QtWidgets.QWidget):
         self.updateDigitalBitEnable()
         self.updateIOOut()
         self.getDBitOffset()
-        self.getDBitReorder()
 
     def connect_ui(self):
         for i in range(Defines.signals.count):
@@ -51,7 +49,6 @@ class SignalsTab(QtWidgets.QWidget):
             partial(self.setIOOutRange, Defines.signals.half, Defines.signals.count))
         self.view.lineEditPatIOCtrl.editingFinished.connect(self.setIOOutReg)
         self.view.spinBoxDBitOffset.editingFinished.connect(self.setDbitOffset)
-        self.view.checkBoxDBitReorder.stateChanged.connect(self.setDbitReorder)
 
     def setup_ui(self):
         self.plotTab = self.mainWindow.plotTab
@@ -90,79 +87,60 @@ class SignalsTab(QtWidgets.QWidget):
                 self.legend.addItem(plot, name)
 
     @recordOrApplyPedestal
-    def _processWaveformData(self, data, aSamples, dSamples, rx_dbitreorder, rx_dbitlist, isPlottedArray, romode,
+    def _processWaveformData(self, data, aSamples, dSamples, rx_dbitlist, isPlottedArray, rx_dbitoffset, romode,
                              nADCEnabled):
-        
-        #transform raw waveform data into a processed numpy array
-        #@param data:  raw waveform data
-    
-        start_digital_data = 0 
+        """
+        transform raw waveform data into a processed numpy array
+        @param data:  raw waveform data
+        """
+        dbitoffset = rx_dbitoffset
         if romode == 2:
-            start_digital_data += nADCEnabled * 2 * aSamples
-        digital_array = np.array(np.frombuffer(data, offset=start_digital_data, dtype=np.uint8)) 
-        if rx_dbitreorder:
-            samples_per_bit = np.empty((len(rx_dbitlist), dSamples), dtype=np.uint8) #stored per row all the corresponding signals of all samples 
+            dbitoffset += nADCEnabled * 2 * aSamples
+        digital_array = np.array(np.frombuffer(data, offset=dbitoffset, dtype=np.uint8))
         nbitsPerDBit = dSamples
         if nbitsPerDBit % 8 != 0:
             nbitsPerDBit += (8 - (dSamples % 8))
-            bit_index = 0
-            for idx, i in enumerate(rx_dbitlist):
+        offset = 0
+        arr = []
+        for i in rx_dbitlist:
             # where numbits * numsamples is not a multiple of 8
-                if bit_index % 8 != 0:
-                    bit_index += (8 - (bit_index % 8))
+            if offset % 8 != 0:
+                offset += (8 - (offset % 8))
             if not isPlottedArray[i]:
-                    bit_index += nbitsPerDBit
-                    samples_per_bit[idx, :] = np.nan
-                    continue
+                offset += nbitsPerDBit
+                return None
+            waveform = np.zeros(dSamples)
             for iSample in range(dSamples):
                 # all samples for digital bit together from slsReceiver
-                    index = int(bit_index / 8)
-                    iBit = bit_index % 8
+                index = int(offset / 8)
+                iBit = offset % 8
                 bit = (digital_array[index] >> iBit) & 1
-                    samples_per_bit[idx,iSample] = bit
-                    bit_index += 1
-            return samples_per_bit
-        else: 
-            nbitsPerSample = len(rx_dbitlist) if len(rx_dbitlist) % 8 == 0 else len(rx_dbitlist) + (8 - (len(rx_dbitlist) % 8))
-            bits_per_sample = np.empty((dSamples, len(rx_dbitlist)), dtype=np.uint8) #store per row all selected bits of a sample
-            for iSample in range(dSamples): 
-                bit_index = nbitsPerSample * iSample
-                for idx, i in enumerate(rx_dbitlist): 
-                    if not isPlottedArray[i]:
-                        bit_index += 1
-                        bits_per_sample[iSample, idx] = np.nan
-
-                    index = int(bit_index/8)
-                    iBit = idx % 8
-                    bit = (digital_array[index] >> iBit) & 1
-                    bits_per_sample[iSample, idx] = bit
-                    bit_index += 1
-            return bits_per_sample.T.copy() 
-
+                waveform[iSample] = bit
+                offset += 1
+            arr.append(waveform)
 
+        return np.array(arr)
 
     def processWaveformData(self, data, aSamples, dSamples):
-        
-        #view function
-        #plots processed waveform data
-        #data: raw waveform data
-        #dsamples: digital samples
-        #asamples: analog samples
-
-        self.refresh()
-        
+        """
+        view function
+        plots processed waveform data
+        data: raw waveform data
+        dsamples: digital samples
+        asamples: analog samples
+        """
         waveforms = {}
         isPlottedArray = {i: getattr(self.view, f"checkBoxBIT{i}Plot").isChecked() for i in self.rx_dbitlist}
 
-        digital_array = self._processWaveformData(data, aSamples, dSamples, self.rx_dbitreorder, self.rx_dbitlist, isPlottedArray,
-                                                  self.mainWindow.romode.value,
+        digital_array = self._processWaveformData(data, aSamples, dSamples, self.rx_dbitlist, isPlottedArray,
+                                                  self.rx_dbitoffset, self.mainWindow.romode.value,
                                                   self.mainWindow.nADCEnabled)
 
         irow = 0
         for idx, i in enumerate(self.rx_dbitlist):
             # bits enabled but not plotting
-            waveform = digital_array[idx, :]
-            if np.isnan(waveform[0]):
+            waveform = digital_array[idx]
+            if waveform is None:
                 continue
             self.mainWindow.digitalPlots[i].setData(waveform)
             plotName = getattr(self.view, f"labelBIT{i}").text()
@@ -173,10 +151,8 @@ class SignalsTab(QtWidgets.QWidget):
                 irow += 1
             else:
                 self.mainWindow.digitalPlots[i].setY(0)
-            
         return waveforms
 
-
     def initializeAllDigitalPlots(self):
         self.mainWindow.plotDigitalWaveform = pg.plot()
         self.mainWindow.plotDigitalWaveform.addLegend(colCount=Defines.colCount)
@@ -384,25 +360,14 @@ class SignalsTab(QtWidgets.QWidget):
         self.view.spinBoxDBitOffset.setValue(self.rx_dbitoffset)
         self.view.spinBoxDBitOffset.editingFinished.connect(self.setDbitOffset)
 
-    def getDBitReorder(self):
-        self.view.checkBoxDBitReorder.stateChanged.disconnect()
-        self.rx_dbitreorder = self.det.rx_dbitreorder
-        self.view.checkBoxDBitReorder.setChecked(self.rx_dbitreorder)
-        self.view.checkBoxDBitReorder.stateChanged.connect(self.setDbitReorder)
-
-
     def setDbitOffset(self):
         self.det.rx_dbitoffset = self.view.spinBoxDBitOffset.value()
 
-    def setDbitReorder(self):
-        self.det.rx_dbitreorder = self.view.checkBoxDBitReorder.isChecked()
-
     def saveParameters(self) -> list:
         commands = []
         dblist = [str(i) for i in range(Defines.signals.count) if getattr(self.view, f"checkBoxBIT{i}DB").isChecked()]
         if len(dblist) > 0:
             commands.append(f"rx_dbitlist {', '.join(dblist)}")
         commands.append(f"rx_dbitoffset {self.view.spinBoxDBitOffset.value()}")
-        commands.append(f"rx_dbitreorder {self.view.checkBoxDBitReorder.isChecked()}")
         commands.append(f"patioctrl {self.view.lineEditPatIOCtrl.text()}")
         return commands

pyctbgui/pyctbgui/services/SlowADCs.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from PyQt5 import uic, QtWidgets
 
 from pyctbgui.utils.defines import Defines
-from slsdet import dacIndex, detectorType
+from slsdet import dacIndex
 
 
 class SlowAdcTab(QtWidgets.QWidget):
@@ -17,8 +17,7 @@ class SlowAdcTab(QtWidgets.QWidget):
         self.det = None
 
     def setup_ui(self):
-        if self.det.type == detectorType.XILINX_CHIPTESTBOARD:
-            self.view.pushButtonTemp.setDisabled(True)      
+        pass
 
     def connect_ui(self):
         for i in range(Defines.slowAdc.count):
@@ -29,7 +28,6 @@ class SlowAdcTab(QtWidgets.QWidget):
         self.updateSlowAdcNames()
         for i in range(Defines.slowAdc.count):
             self.updateSlowAdc(i)
-        if self.det.type == detectorType.CHIPTESTBOARD:
         self.updateTemperature()
 
     def updateSlowAdcNames(self):

pyctbgui/pyctbgui/ui/Dacs.ui

@@ -817,7 +817,7 @@ Only pressing enter on spinbox will set DAC (with this condition).</string>
      </widget>
     </item>
     <item row="18" column="0">
-     <widget class="QLabel" name="labelADCVppDacName">
+     <widget class="QLabel" name="label_125">
       <property name="text">
        <string>ADC_VPP</string>
       </property>

pyctbgui/pyctbgui/ui/acquisition.ui

@@ -118,7 +118,7 @@
      </widget>
     </item>
     <item row="1" column="4">
-     <widget class="QLabel" name="labelRunF">
+     <widget class="QLabel" name="label_70">
       <property name="text">
        <string>Run Clock Frequency (MHz):</string>
       </property>
@@ -218,7 +218,7 @@
    </property>
    <layout class="QGridLayout" name="gridLayout_6">
     <item row="2" column="3">
-     <widget class="QLabel" name="labelDBITF">
+     <widget class="QLabel" name="label_74">
       <property name="minimumSize">
        <size>
         <width>200</width>
@@ -231,7 +231,7 @@
      </widget>
     </item>
     <item row="2" column="0">
-     <widget class="QLabel" name="labelADCF">
+     <widget class="QLabel" name="label_71">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
         <horstretch>0</horstretch>
@@ -278,7 +278,7 @@
      </widget>
     </item>
     <item row="4" column="3">
-     <widget class="QLabel" name="labelDBITPipeline">
+     <widget class="QLabel" name="label_76">
       <property name="text">
        <string>DBIT Pipeline:</string>
       </property>
@@ -338,21 +338,21 @@
      </widget>
     </item>
     <item row="4" column="0">
-     <widget class="QLabel" name="labelADCPipeline">
+     <widget class="QLabel" name="label_73">
       <property name="text">
        <string>ADC Pipeline:</string>
       </property>
      </widget>
     </item>
     <item row="3" column="0">
-     <widget class="QLabel" name="labelADCPhase">
+     <widget class="QLabel" name="label_72">
       <property name="text">
        <string>ADC Clock Phase (a.u.):</string>
       </property>
      </widget>
     </item>
     <item row="3" column="3">
-     <widget class="QLabel" name="labelDBITPhase">
+     <widget class="QLabel" name="label_75">
       <property name="text">
        <string>DBIT Clock Phase (a.u.):</string>
       </property>