Commit Graph

9502 Commits

Author SHA1 Message Date
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
fd304b3d95 Merge pull request #1355 from slsdetectorgroup/fix/pattern
All checks were successful
Build on local RHEL9 / build (push) Successful in 1m27s
Build on local RHEL8 / build (push) Successful in 3m32s
Build on RHEL9 / build (push) Successful in 3m35s
Build on RHEL8 / build (push) Successful in 4m57s
Allow sls::Pattern in d.pattern in python
2026-01-21 17:29:00 +01:00
froejdh_e
06cd6c9eb7 docstring and release
All checks were successful
Build on RHEL9 / build (push) Successful in 3m45s
Build on RHEL8 / build (push) Successful in 4m31s
2026-01-21 16:52:12 +01:00
Erik Fröjdh
3d49e91aed Merge branch 'developer' into fix/pattern 2026-01-21 16:37:57 +01:00
8769f1e70a xilinx tsamples upper limit increased (#1365)
Some checks failed
Build on local RHEL9 / build (push) Successful in 1m25s
Build on local RHEL8 / build (push) Successful in 3m33s
Build on RHEL8 / build (push) Failing after 10m55s
Build on RHEL9 / build (push) Successful in 3m39s
2026-01-21 16:13:22 +01:00
Erik Fröjdh
89927d6b46 Merge branch 'developer' into fix/pattern
All checks were successful
Build on RHEL9 / build (push) Successful in 3m43s
Build on RHEL8 / build (push) Successful in 4m44s
2026-01-20 17:04:29 +01:00
b2f1ed3022 python setBit backwards compatible (#1359)
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 3m48s
Build on RHEL8 / build (push) Successful in 4m33s
2026-01-16 10:10:44 +01:00
0ba1139741 remove hardcoded MH02 startup
All checks were successful
Build on RHEL9 / build (push) Successful in 3m45s
Build on RHEL8 / build (push) Successful in 4m51s
Build on local RHEL9 / build (push) Successful in 1m25s
Build on local RHEL8 / build (push) Successful in 3m32s
2026-01-13 11:05:37 +01:00
Erik Fröjdh
60a1aad6ff allow sls::Pattern in python d.pattern 2026-01-09 15:28:57 +01:00
045d9440de Dev/include file (#1306)
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 4m17s
Build on RHEL8 / build (push) Successful in 4m35s
* create a include command calling the same function as parameters (cmd generation and autocompletion), testing parameters and include

* added include in command line and python and its supposed to do the same as parameters command. both are tested

* added colorama

* moved test_free and test_command python tests to tests/scripts folder from python/tests due to CI issues with dependencies

* generated commands

* formatting

---------

Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
2026-01-07 10:45:26 +01:00
874ff353e5 virtual servers compile fix for xilinxfmc (#1352)
All checks were successful
Build on local RHEL9 / build (push) Successful in 1m25s
Build on local RHEL8 / build (push) Successful in 3m31s
Build on RHEL8 / build (push) Successful in 4m36s
Build on RHEL9 / build (push) Successful in 4m36s
2026-01-06 14:38:11 +01:00
Martin Mueller
10879d32da Merge pull request #1351 from slsdetectorgroup/MH02_debug
XCTB updates
2026-01-06 11:42:29 +01:00
66f9664bc4 fprintf should return 2 including terminating character as well. formatting.
Some checks failed
Build on RHEL9 / build (push) Failing after 31s
Build on RHEL8 / build (push) Successful in 4m58s
2026-01-06 09:53:55 +01:00
c154164eff refactoring
Some checks failed
Build on RHEL9 / build (push) Failing after 30s
Build on RHEL8 / build (push) Successful in 4m43s
2026-01-05 17:51:54 +01:00
d95dff56e4 add back XCTB server binary 2026-01-05 17:03:50 +01:00
32c7afa134 Merge branch 'developer' into MH01_debug 2026-01-05 15:26:15 +01:00
3dd07bf2be Dev/define cmd (#1312)
All checks were successful
Build on local RHEL9 / build (push) Successful in 1m25s
Build on RHEL9 / build (push) Successful in 3m15s
Build on local RHEL8 / build (push) Successful in 3m31s
Build on RHEL8 / build (push) Successful in 4m44s
* basic ctb config api for register and bit names

* tests for define and definelist pass. yet to implement using them for reg, setbit, clearbit and getbit

* improved autocomplete for getbit,setbit, clearbit

* validate autocomplete

* definelist has no put

* updating help

* converting char array+int in runtimeerror compiles but throws at runtime.Fixed.Tested for it. Also check if string or int before using getregisterdefinitonbyvalue to see if it threw to call the other function. because both of it can throw and we should differentiate the issues for both

* removed std::vector<std::pair<string,int> to std::map<string, int> for defiitions list

* Dev/define cmd tie bit to reg (#1328)

* strong type

* moved everythign to bit_utils class

* pybindings

* added tests for python

* removed duplicates

* removed bit names in reg

* changed BitPosition to BitAddress

* Using define reg/bit from python (#1344)

* define_bit, define_addr in python. 
* setBit/clearBit takes int or addr

* added example using bits

* split define into 2 commands define_reg and define_bit, definelist into 2: definelist_reg and definelist_bit

* allow string for register and bit names in c++ api

* refactor from github comments

* naming refactoring (getRegisterDefnition to retunr name and address specifically

* added marker for 8 cmd tests connected to define, changed macro to static constexpr

* changed bitPosition from int to uint32_t

* got rid of setbitposition and setaddress, instead overloaded constructor to take in strings so that the conversion from string to bit address members, takes place within the class for easy maintainance in case type changes

* Removing implicit conversions:
RegisterAddresss and RegisterValue: Removed the implicit conversions.
RegisterAddress: Changed member name from address_ to value_ and method as well to value().
RegisterValue: Also added | operator to be able to concatenate with uint32_t. Same in python bindings (but could not find the tests to modify

* Allowed concatenation with other RegisterValue, made them all constexpr

* fix a ctbConfig test

* Maponstack works with integration tests, but need unit tests

* tests on mapstack

* fixed ctb tests and FixedString being initialized with gibberish

* removing parsing from string inside the class RegisterAddress, BitAddress and RegisterValue

* updated python bindings

* fixed bit utils test

* renaming getRegisterDefintiionAddress/Name=>getRegisterAddress/Name and similary for getBitDefinitionAddress/Name

* updated python bindings

* fix tests (format)

* a few python tests added and python bindings corrected

* replaceing str with __str__ for bit.cpp

* repr reimplemented for bit.cpp

* removed make with registerAddress etc

* starting server for tests per session and nor module

* killprocess throws if no process found-> github runs fails, changed to pkill and not throw

* clean shm shouldnt raise, in ci binary not found

* ignoring these tests for CI, which fail on CI because simulators are not generated in CI. This is in another PR, where it should work

---------

Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
Co-authored-by: froejdh_e <erik.frojdh@psi.ch>
2026-01-05 15:10:46 +01:00
df654ca23d Merge branch 'developer' into MH02_debug 2026-01-05 14:51:37 +01:00
d939dc7e4a update APIXILINXCTB 2026-01-05 14:30:30 +01:00
bcd22af9ba switch XCTB regDefs to cheby output 2026-01-05 13:53:30 +01:00
dece2e16b4 update registerDefs.h
All checks were successful
Build on RHEL9 / build (push) Successful in 3m9s
Build on RHEL8 / build (push) Successful in 4m35s
2026-01-05 09:31:32 +01:00
7d1d5e9809 Merge pull request #1347 from slsdetectorgroup/fix/self-assign
All checks were successful
Build on local RHEL9 / build (push) Successful in 1m22s
Build on local RHEL8 / build (push) Successful in 3m26s
Build on RHEL9 / build (push) Successful in 3m45s
Build on RHEL8 / build (push) Successful in 4m52s
clang-tidy [unhandled-self-assignment]
2025-12-17 13:01:17 +01:00
froejdh_e
cfaaf5a973 removed depricated check, handle self assignment 2025-12-16 16:35:53 +01:00
497b3ed00e Merge pull request #1343 from slsdetectorgroup/dev/update_release_notes
All checks were successful
Build on local RHEL9 / build (push) Successful in 1m23s
Build on local RHEL8 / build (push) Successful in 3m26s
Build on RHEL9 / build (push) Successful in 3m35s
Build on RHEL8 / build (push) Successful in 5m10s
updated release notes
2025-12-11 09:52:56 +01:00
300a296c20 updated release notes 2025-12-10 16:21:00 +01:00
01e392b112 Merge pull request #1342 from slsdetectorgroup/dev/dbitorder
All checks were successful
Build on local RHEL9 / build (push) Successful in 1m22s
Build on local RHEL8 / build (push) Successful in 3m26s
Build on RHEL9 / build (push) Successful in 3m49s
Build on RHEL8 / build (push) Successful in 4m31s
Preserve order in receiver dbit list
2025-12-04 16:03:48 +01:00
5409cec73e adapted test to test no reorder behavior
All checks were successful
Build on RHEL9 / build (push) Successful in 4m12s
Build on RHEL8 / build (push) Successful in 4m30s
2025-12-04 10:58:37 +01:00
Erik Fröjdh
1c31a85a43 added function to remove duplicates, preserve order of dbit 2025-12-03 12:14:35 +01:00
134137ead0 build RH8 in conda env
All checks were successful
Build on local RHEL8 / build (push) Successful in 3m24s
Build on RHEL9 / build (push) Successful in 3m24s
Build on local RHEL9 / build (push) Successful in 1m21s
Build on RHEL8 / build (push) Successful in 5m25s
2025-11-27 16:28:21 +01:00
6d3922f487 typo
All checks were successful
Build on RHEL9 / build (push) Successful in 3m24s
Build on RHEL8 / build (push) Successful in 5m14s
Build on local RHEL9 / build (push) Successful in 1m22s
Build on local RHEL8 / build (push) Successful in 3m23s
2025-11-27 15:27:17 +01:00
f14cfb0b31 deploy python ui
Some checks failed
Build on local RHEL9 / build (push) Successful in 1m23s
Build on local RHEL8 / build (push) Successful in 3m23s
Build on RHEL9 / build (push) Successful in 4m26s
Build on RHEL8 / build (push) Has been cancelled
2025-11-27 15:21:34 +01:00
cf4e6b65c1 Merge branch 'dev/NFS_testing' into developer 2025-11-27 11:00:29 +01:00
0da80cd898 local runners only for developer
All checks were successful
Build on RHEL9 / build (push) Successful in 3m53s
Build on RHEL8 / build (push) Successful in 5m30s
2025-11-27 10:43:51 +01:00
8e7921ae45 Merge pull request #1339 from slsdetectorgroup/dev/python_cmd_for_ROI
All checks were successful
Build on RHEL9 / build (push) Successful in 4m30s
Build on RHEL8 / build (push) Successful in 5m46s
Dev/python cmd for roi
2025-11-26 15:29:40 +01:00