Commit Graph

9535 Commits

Author SHA1 Message Date
0e1dad47db added fmt to workflow
Some checks failed
Run Simulator Tests on local RHEL9 / build (push) Failing after 4s
Run Simulator Tests on local RHEL8 / build (push) Failing after 8s
Build on RHEL9 / build (push) Failing after 7s
Build on RHEL8 / build (push) Failing after 14s
2026-02-23 16:57:52 +01:00
10ec7c4ae6 cleaned up logs 2026-02-23 16:56:04 +01:00
23a94b28cc some refactoring 2026-02-23 16:33:26 +01:00
d062b34a58 solved merge conflicts
Some checks failed
Run Simulator Tests on local RHEL9 / build (push) Failing after 5s
Run Simulator Tests on local RHEL8 / build (push) Failing after 7s
Build on RHEL9 / build (push) Failing after 7s
Build on RHEL8 / build (push) Failing after 14s
2026-02-23 14:54:52 +01:00
db7b79a0e8 solved merge conflict 2026-02-23 14:46:00 +01:00
8f07d2a464 Dev/xilinx set dac rewrite (#1389)
Some checks failed
Build on RHEL9 / build (push) Successful in 3m46s
Run Simulator Tests on local RHEL9 / build (push) Failing after 3m51s
Build on RHEL8 / build (push) Successful in 5m15s
Run Simulator Tests on local RHEL8 / build (push) Failing after 5m31s
Build on local RHEL8 / build (push) Failing after 3m31s
Build on local RHEL9 / build (push) Failing after 1m25s
* wip

* wip

* wip. xilinx left

* wip. xilinx

* wip

* wip. compiles

* fixed eiger test

* more fixes

* fixed virtual m3

* fix typos and bugs

* setting power to 0

* set power fixed

* updated server binaries

* minor

* refactoring

* get vchip refactoring

* eiger: unnecessary check for setsettings undefined

* retval pointer for printout

* eiger.wip, mV in boolean

* wip. gotthard2 and m3

* wip. jungfrau

* moench.wip

* compiles.wip

* fix eiger

* m3 fix vthresh

* fix ctband xilinx

* default pwr index = pwr_io

* minor:fn name and highvoltage to local var

* refactor funcs

* minor

* minor

* check dac voltage only for normal dacs and not for power dacs as the dac voltage range is different for ctb and xilinx ctb, also throw for -1 in set for set_dac in client itself. in the server its not clear if its set or get with a -1

* minor

* updated versioning

* review changes: removing validateDACValue and other minor stuff

* binaries in

* wip

* refactored m3 vth

* minor review

* minor review

* m3 serverdac index fix

* minor
2026-02-23 14:23:13 +01:00
f4658ab094 Dev/automate documentation build (#1357)
* some test about building docs

* indendation error

* typo -

* forgot to get package hdf5

* had to add shinx and doxygen as well

* oke created environmnet file

* typo

* dont use conda

* dont use conda

* cannot upload artefact commit to gh-pages

* correct copy

* mmh

* try with tokem

* set write permisison

* script to update main_index for versioned documentation

* rename main_index to index

* use absolute path in python script

* update main_index upon a release

* extract release type from version

* copy release notes

* updated links from devdoc to slsDetectorPackage, handling .md for new versions

* changed page source

* updated documentation link in README

* add guideline for Package Versioning to documentation also used as a test

* typo in workflow

* why didnt it copy?

* copied from build instead of docs

* change back - trigger for push

* only trigger for pull_requests and releases

* removed conda environment file

* automatically update documentation paths in release notes

* only keep templated README.md

* added README and updated links

* update Release notes template manually

* generate release notes script not needed anymore

* modified readme to reflect dependencies insides build from source

* subheadings in dependencies

---------

Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
2026-02-23 14:21:44 +01:00
f8723eb0d8 Dev/use aare in pyctbgui (#1379)
Some checks failed
Build on RHEL9 / build (push) Successful in 3m57s
Build on RHEL8 / build (push) Successful in 4m43s
Run Simulator Tests on local RHEL9 / build (push) Failing after 3m50s
Build on local RHEL9 / build (push) Failing after 1m24s
Run Simulator Tests on local RHEL8 / build (push) Failing after 5m28s
Build on local RHEL8 / build (push) Failing after 3m32s
* added CMakeLists.txt for pyctbgui

* using aare decoders

* removed c code

* showing proper error message

* dvjgj

---------

Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
2026-02-23 12:33:10 +01:00
c42f070ca7 linked fmt to slsProjectOptions
Some checks failed
Run Simulator Tests on local RHEL9 / build (push) Failing after 4s
Run Simulator Tests on local RHEL8 / build (push) Failing after 7s
Build on RHEL9 / build (push) Failing after 29s
Build on RHEL8 / build (push) Failing after 35s
2026-02-23 11:20:41 +01:00
6b6ce38099 WIP 2026-02-23 10:59:38 +01:00
14da1245b4 WIP
Some checks failed
Run Simulator Tests on local RHEL9 / build (push) Failing after 5s
Run Simulator Tests on local RHEL8 / build (push) Failing after 7s
Build on RHEL9 / build (push) Failing after 29s
Build on RHEL8 / build (push) Failing after 36s
2026-02-20 16:58:10 +01:00
5d0f7158ae updated logger 2026-02-20 16:56:33 +01:00
f50f600bb8 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into dev/matterhornserver 2026-02-19 10:41:21 +01:00
65c8f2c7d8 dev/handes trailing / in filepath (#1391)
Some checks failed
Build on RHEL9 / build (push) Successful in 3m22s
Run Simulator Tests on local RHEL9 / build (push) Failing after 3m49s
Build on local RHEL9 / build (push) Successful in 1m26s
Build on RHEL8 / build (push) Successful in 5m13s
Run Simulator Tests on local RHEL8 / build (push) Failing after 5m30s
Build on local RHEL8 / build (push) Successful in 3m33s
* member filePath in Implementation is std::filesystem::path, some refactoring

* PR Review

* adapted function signature - compiled with hdf5 on
2026-02-17 17:11:33 +01:00
c6d5b0b8f0 dont use c project settings when building matterhornserver 2026-02-16 16:46:19 +01:00
2ba38e5cc4 WIP
Some checks failed
Run Simulator Tests on local RHEL9 / build (push) Failing after 5s
Run Simulator Tests on local RHEL8 / build (push) Failing after 7s
Build on RHEL9 / build (push) Failing after 7s
Build on RHEL8 / build (push) Failing after 14s
2026-02-16 14:37:44 +01:00
3ec0a9337e added compile option to set log level 2026-02-16 14:33:14 +01:00
b6470b0d08 bug: added std::signal for proper handling of ctr+c 2026-02-16 10:48:35 +01:00
aa6f7c7ce1 added fmt to workflows 2026-02-13 18:27:17 +01:00
07ad019cd6 added cpp TCP Interface to slsDetectorServer 2026-02-13 18:16:41 +01:00
fcea29e991 added enum ReturnCode 2026-02-13 18:15:30 +01:00
5a8c31fec9 added first draft of matterhorn 2026-02-13 18:14:59 +01:00
e106c64fd8 added fetch fmt server library 2026-02-13 18:09:57 +01:00
26729b06cb added copy of ctbDetectorServer to auto-deploy
All checks were successful
Build on RHEL9 / build (push) Successful in 3m53s
Build on RHEL8 / build (push) Successful in 4m55s
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m38s
Build on local RHEL9 / build (push) Successful in 1m26s
Run Simulator Tests on local RHEL8 / build (push) Successful in 17m2s
Build on local RHEL8 / build (push) Successful in 3m34s
2026-02-10 16:14:01 +01:00
1c44a66964 formatted 2026-02-10 16:10:51 +01:00
1c18803dc9 Merge pull request #1385 from slsdetectorgroup/dev/fix_update_ctb
All checks were successful
Build on RHEL9 / build (push) Successful in 3m21s
Build on RHEL8 / build (push) Successful in 4m45s
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m40s
Build on local RHEL9 / build (push) Successful in 1m26s
Run Simulator Tests on local RHEL8 / build (push) Successful in 17m1s
Build on local RHEL8 / build (push) Successful in 3m32s
skip if not plotted
2026-02-09 15:22:16 +01:00
b3f5473385 Merge branch 'developer' into dev/fix_update_ctb
All checks were successful
Build on RHEL9 / build (push) Successful in 3m53s
Build on RHEL8 / build (push) Successful in 4m39s
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m40s
Run Simulator Tests on local RHEL8 / build (push) Successful in 16m58s
2026-02-09 15:17:02 +01:00
Erik Fröjdh
3f4df445f1 send back the result of the SPI write (#1387)
All checks were successful
Build on RHEL9 / build (push) Successful in 3m21s
Build on RHEL8 / build (push) Successful in 4m47s
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m39s
Build on local RHEL9 / build (push) Successful in 1m25s
Run Simulator Tests on local RHEL8 / build (push) Successful in 16m57s
Build on local RHEL8 / build (push) Successful in 3m32s
2026-02-09 13:50:35 +01:00
ec6a8b6d66 added range update
All checks were successful
Build on RHEL9 / build (push) Successful in 3m24s
Build on RHEL8 / build (push) Successful in 4m44s
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m41s
Run Simulator Tests on local RHEL8 / build (push) Successful in 17m0s
2026-02-09 12:42:35 +01:00
78044b2783 always write all wave data & uncheck plot if digital bit unchecked
All checks were successful
Build on RHEL9 / build (push) Successful in 3m28s
Build on RHEL8 / build (push) Successful in 4m45s
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m38s
Run Simulator Tests on local RHEL8 / build (push) Successful in 16m58s
2026-02-06 16:41:04 +01:00
7f5b26743f uff introduced another bug 2026-02-06 14:55:18 +01:00
92da709bda skip if not plotted 2026-02-06 14:39:11 +01:00
Erik Fröjdh
0992c7ae4c Read and write SPI for Xilinx CTB (#1381)
All checks were successful
Build on RHEL9 / build (push) Successful in 3m25s
Build on RHEL8 / build (push) Successful in 4m37s
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m42s
Build on local RHEL9 / build (push) Successful in 1m26s
Run Simulator Tests on local RHEL8 / build (push) Successful in 17m0s
Build on local RHEL8 / build (push) Successful in 3m32s
-readSpi and writeSpi in C++ and Python API
2026-02-05 17:20:47 +01:00
fb58fefe57 added RegDefs for 1G support on XCTB
All checks were successful
Build on RHEL9 / build (push) Successful in 3m28s
Build on RHEL8 / build (push) Successful in 4m36s
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m40s
Build on local RHEL9 / build (push) Successful in 1m26s
Run Simulator Tests on local RHEL8 / build (push) Successful in 16m59s
Build on local RHEL8 / build (push) Successful in 3m31s
2026-02-05 15:11:31 +01:00
28b2aa9673 Dev/add simulator tests in GitHub workflows (#1337)
All checks were successful
Build on RHEL9 / build (push) Successful in 3m50s
Build on RHEL8 / build (push) Successful in 4m46s
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m37s
Build on local RHEL9 / build (push) Successful in 1m26s
Run Simulator Tests on local RHEL8 / build (push) Successful in 16m57s
Build on local RHEL8 / build (push) Successful in 3m33s
* added simulator tests in github workflows

* indentation error

* typo

* debug

* Logging for debugging

* added more debug lines

* more debugging

* debug

* debug

* debug

* dont throw if process does not exist

* debug

* added absolute path to sls_detector commands

* some refactoring in test scripts

* added absolute path to all slsdet command

* typo

* ../tests/scripts/test_frame_synchronizer.py

* raise exception upon failure for github workflows

* removed hidden tags

* some refactoring in test scripts

* some refactoring

* fixed CMakeLists

* fixed unsuccesful merge

* updated python tests using simulators

* debug import error

* debug module import

* python -m runs module pytest as script - everything in path available

* removed integartion tests

* enable file write not to log files

* run tests without log files

* increased sleep time for udp packets

* added logg level variable to cmake

* added testing policies to documenattion

* disabled check for num_frames for jungfrau & xilinx

* set log level as cmake cached variable

* disable tests for jungfrau and xilinx_ctb

* check frames for HDF5

* updated Documentation of Testing

* changed withdetectorsimulators to detectorintegration

* replaced [.cmdcall] with [.detectorintegration]

* check_file_size only disabled for jungfrau - disable for all roi tests

* changed time to wait after receive to 5 ms

* take into account half modules of eiger

* num udp interfaces needs to be consistent across modules

* suppressed warning enclosing if

* config added 2 udp ports per default for moench and jungfrau

* write detector output to console

* allow jungfrau to tests num frames, remove unused variable (numinterfaces), add comment for future to handle traceback to know which calling function threw the files unmatched, added documentation for tests (examples for .detectoritnegration and how to disable marked tests, removed addditional argumetns to disable for test_simulator as one can just use ~, removed the check that checks for jungfrau checking number of frames at master attributes and at rx test, removed unused advanced_test_settings in test_simulator script, the num_mods check for multiple modules is removed and default num  modules set to 1 for test_simulator (to be increased later), back to raising exception for killprocess

* removed integration tests from cmakelists.txt and cmk.sh, modified the tests workflow command to reflect the disable argument and removed xilinx_ctb from test (fix fromdeveloper merge to be done)

* filtering by actual name for disable certain tests on github workflow

* minor refactor

* wip

* wip

* changes to run on local rh9 runner instead of github workfloa

* modified yml to remove some leftover from github workflow

* test

* fix build_dir in scripts (github workflow) and pytest dir in gitea workflow

* making the local machine use python3.13 binary

* pythonpath added

* changes for build_Dir back

* allowing ctb api tests

* allowed ctb api tests and set up slsdetname envt variable for shared memory being reserved just for these tests

* added rh8 workflow for local runner on gitea

* remnants from rh9 local runner

* remnants from rh9 local runner

* conda env for all shell for local runner

* allowing hdf5 to build on local runner

* run all tests for both the runners

* refactored fixtures a bit and merged some tests that use one session for entire server

* test fail

* test fix

* adding github workflow to test without data file checks and without logs

* documentation changes

* unnecessary import in conftest

* allowing the session_simulator to test for multiple modules and interfaces etc

* allow test_simulator script to run for 2 modules for all modules except ctb and xilinx ctb

* run upon push

* removing the disable file check on github workflow

* minor adjustment

* testing without synch

* reverting to previous

* with log file

* without the space

* summary from file and more error extracts from file to terminal

* minor

* trying nlf for more details

* updated with no log file to print everything to screen  also for det and rxr

* trying a no throw

* stoi was more about indent in yaml

* tries

* wip

* debug

* number of frames inconsistent fix=>just take first one, only test xilinx

* jungfrau tests without frames caught check

* extend the disable file check to everywhere that creates files

* specify path for test_simulator

* withoutprinting ==

* wip

* back with printing===, but not parsing file for errors anymore

* lang?

* wip

* safe log?

* wip2

* wip

* dont split error as its streaming live, just raise

* with log files

* lang?

* last resort

* wip

* test no det with general tests

* show tests live

* also include hidden integration tests

* without extra summary?

* revert

* last resort again

* tsquash on int64_t?

* tsquash on int64_t? mroe print

* writing to /tmp?

* all tests

* might be the fix?

* write to file

* fixed a few quiet mode no log file tests

* work on any branch for github tests, work on also release candidates for gitea tests

* added frame synchronizer tests to github workflow

* moved tests to run_tests.yaml from cmake.yaml

* documentation

* disabled general tests

---------

Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
2026-02-03 11:45:12 +01:00
a390e580d2 Merge pull request #1375 from slsdetectorgroup/dev/xilinx_rm_powerdown
All checks were successful
Build on local RHEL9 / build (push) Successful in 1m25s
Build on RHEL9 / build (push) Successful in 3m58s
Build on RHEL8 / build (push) Successful in 4m48s
Build on local RHEL8 / build (push) Successful in 3m32s
xilinx server: remove powerdown for power regulators
2026-02-02 13:53:53 +01:00
aeed4762cf Merge branch 'developer' into dev/xilinx_rm_powerdown
All checks were successful
Build on RHEL9 / build (push) Successful in 3m18s
Build on RHEL8 / build (push) Successful in 4m40s
2026-02-02 12:17:07 +01:00
809d70a950 Merge pull request #1376 from slsdetectorgroup/dev/mh1decode
All checks were successful
Build on local RHEL9 / build (push) Successful in 1m25s
Build on RHEL9 / build (push) Successful in 3m16s
Build on local RHEL8 / build (push) Successful in 3m33s
Build on RHEL8 / build (push) Successful in 4m40s
pyctbgui decoder for Matterhorn1 16 bits (1 and 4 counters)
2026-01-29 14:06:16 +01:00
Erik Fröjdh
c86263fc33 Merge branch 'developer' into dev/mh1decode
All checks were successful
Build on RHEL9 / build (push) Successful in 3m20s
Build on RHEL8 / build (push) Successful in 4m37s
2026-01-28 18:58:02 +01:00
froejdh_e
c500891eb5 removed comments
All checks were successful
Build on RHEL9 / build (push) Successful in 3m43s
Build on RHEL8 / build (push) Successful in 4m41s
2026-01-28 16:43:43 +01:00
froejdh_e
8a0191e3f6 using np.take and updated pixel map
All checks were successful
Build on RHEL9 / build (push) Successful in 3m47s
Build on RHEL8 / build (push) Successful in 4m42s
2026-01-28 15:54:27 +01:00
5811e4e9ab added tests to ensure startup val is not -1 or -100 after powerchip in config for xilinx 2026-01-28 15:30:42 +01:00
9e7952048a calling setPower instead of setDac as the conversion should happen here 2026-01-28 15:20:34 +01:00
froejdh_e
c3c3970f19 added 16bit 1 counter and 16bit 4 counters 2026-01-28 15:13:15 +01:00
9a876075ab updated binary 2026-01-28 15:12:55 +01:00
2c6ded89ad xilinx server: not allowing power down as default dac values for the power regulators and not allowing to be set to these in the future either 2026-01-28 14:59:49 +01:00
55ff222437 Dev/server/separate list header (#1373)
All checks were successful
Build on local RHEL9 / build (push) Successful in 1m25s
Build on RHEL9 / build (push) Successful in 3m14s
Build on local RHEL8 / build (push) Successful in 3m33s
Build on RHEL8 / build (push) Successful in 5m0s
* xilinx, ctb and eiger server: detangled list.h to its own detector file

* detangled list.h from all the detectors servers
2026-01-28 13:49:46 +01:00
3deb528087 xilinx tsamples test fixed for a value that a receiver can stomach for memory allocation (#1374) 2026-01-28 13:42:54 +01:00
e519633e16 added patternstart to python (#1368)
All checks were successful
Build on local RHEL9 / build (push) Successful in 1m27s
Build on local RHEL8 / build (push) Successful in 3m33s
Build on RHEL9 / build (push) Successful in 3m38s
Build on RHEL8 / build (push) Successful in 5m25s
* added patternstart to python

* release notesg
2026-01-22 14:55:03 +01:00
b70d3c5ad3 xilinx: start state machine started with start_f bit in flow control and not anymore the start_p from matterhornspictrl reg (so now if the user messes up the pattern, it will be stuck forever) (#1366)
All checks were successful
Build on local RHEL9 / build (push) Successful in 1m25s
Build on local RHEL8 / build (push) Successful in 3m32s
Build on RHEL9 / build (push) Successful in 3m39s
Build on RHEL8 / build (push) Successful in 5m3s
2026-01-22 10:00:25 +01:00