Commit Graph
9585 Commits
Author SHA1 Message Date
mazzol_a 38e2cc45aa refactored directory structure 2026-05-29 15:52:45 +02:00
mazzol_a 1422b41b0f PR Review 2026-05-29 15:34:36 +02:00
mazzol_a f07baa197c porper cleanup of matterhorn app 2026-05-29 15:33:42 +02:00
mazzol_a bd3e375819 wrong overload 2026-05-29 15:33:41 +02:00
mazzol_a 5c0e84979a added some more functions 2026-05-29 15:33:41 +02:00
mazzol_a ecba0bdb75 removed stopserver 2026-05-29 15:33:41 +02:00
mazzol_a 105ab9edbe added Server class usable for all detectors 2026-05-29 15:33:41 +02:00
mazzol_a 12182b6ef2 fixed build 2026-05-29 15:33:39 +02:00
mazzol_a f62aaf991f added udp functions to matterhornserver 2026-05-29 15:29:04 +02:00
mazzol_a 26fbde1020 WIP 2026-05-29 15:28:30 +02:00
mazzol_a bede4645c8 used CRTP for virtual detector 2026-05-29 15:28:30 +02:00
mazzol_a 7dc33522b3 WIP 2026-05-29 15:28:30 +02:00
mazzol_a 77940231a3 some format changes 2026-05-29 15:27:56 +02:00
mazzol_a 58453a5f33 properly added fmt as a dependency 2026-05-29 15:27:11 +02:00
mazzol_a 885093f990 oops given in hex 2026-05-29 15:25:12 +02:00
mazzol_a 0fd491860e generated register defs from csv file 2026-05-29 15:22:31 +02:00
mazzol_a 553bbf4c35 WIP 2026-05-29 15:20:56 +02:00
mazzol_a 6d27021d3e cleaned up logs 2026-05-29 15:20:53 +02:00
mazzol_a aa7edc3966 some refactoring 2026-05-29 15:19:29 +02:00
mazzol_a 836d43a1c8 solved merge conflict 2026-05-29 15:19:26 +02:00
mazzol_a 69ff723d0d linked fmt to slsProjectOptions 2026-05-29 15:18:35 +02:00
mazzol_a 7505b82570 WIP 2026-05-29 15:17:49 +02:00
mazzol_a 36b4646f38 WIP 2026-05-29 15:16:47 +02:00
mazzol_a 38ca06b1bc updated logger 2026-05-29 15:09:47 +02:00
mazzol_a 2e5353fcad dont use c project settings when building matterhornserver 2026-05-29 15:07:11 +02:00
mazzol_a 4977fb2ee0 WIP 2026-05-29 15:07:11 +02:00
mazzol_a fd14082b3b added compile option to set log level 2026-05-29 15:07:06 +02:00
mazzol_a f431076a5f bug: added std::signal for proper handling of ctr+c 2026-05-29 15:06:18 +02:00
mazzol_a ac3e4b2143 added cpp TCP Interface to slsDetectorServer 2026-05-29 15:06:18 +02:00
mazzol_a eef6be13b7 added first draft of matterhorn 2026-05-29 15:05:21 +02:00
mazzol_a 0b800b4290 added fetch fmt server library 2026-05-29 15:02:38 +02:00
mazzol_aandGitHub 4c02ce65cc generated python enums, moved ReturnCode to slsDetectorDefs class (#1467)
Build on RHEL9 docker image / build (push) Successful in 3m43s
Build on RHEL8 docker image / build (push) Successful in 5m24s
Build and Deploy on local RHEL9 / build (push) Successful in 2m0s
Build and Deploy on local RHEL8 / build (push) Successful in 5m2s
Run Simulator Tests on local RHEL9 / build (push) Successful in 18m17s
Run Simulator Tests on local RHEL8 / build (push) Successful in 21m53s
2026-05-27 10:36:16 +02:00
mazzol_aandGitHub 53d966d23b Fix/fmt install (#1468)
Build on RHEL9 docker image / build (push) Successful in 4m49s
Build on RHEL8 docker image / build (push) Successful in 5m35s
Build and Deploy on local RHEL9 / build (push) Successful in 2m15s
Build and Deploy on local RHEL8 / build (push) Successful in 5m8s
Run Simulator Tests on local RHEL9 / build (push) Successful in 18m16s
Run Simulator Tests on local RHEL8 / build (push) Successful in 21m53s
* fmt_install for local libs code

* fix: small python warning about escaped character \* in docstring

* copy with -r in copy_lib.sh due to cmake directory
2026-05-27 09:58:30 +02:00
7db29d55a7 CI: Use conda-build instead conda build (#1464)
Build and Deploy on local RHEL9 / build (push) Successful in 2m8s
Build on RHEL9 docker image / build (push) Successful in 3m44s
Build on RHEL8 docker image / build (push) Successful in 5m2s
Build and Deploy on local RHEL8 / build (push) Successful in 5m5s
Run Simulator Tests on local RHEL9 / build (push) Successful in 18m17s
Run Simulator Tests on local RHEL8 / build (push) Successful in 21m57s
* repalce conda build with conda-build, bump actions versions

* updated github actions versions to run on node 24

---------

Co-authored-by: Alice <alice.mazzoleni@psi.ch>
2026-05-21 15:56:23 +02:00
Erik Frojdh 1e725bac99 Revert "docstring"
Build and Deploy on local RHEL9 / build (push) Successful in 2m2s
Build on RHEL9 docker image / build (push) Successful in 3m56s
Build and Deploy on local RHEL8 / build (push) Successful in 5m2s
Build on RHEL8 docker image / build (push) Successful in 5m23s
Run Simulator Tests on local RHEL9 / build (push) Successful in 18m15s
Run Simulator Tests on local RHEL8 / build (push) Successful in 21m54s
This reverts commit f09dfde157.
2026-05-21 10:24:10 +02:00
Erik Frojdh f09dfde157 docstring 2026-05-21 10:21:24 +02:00
maliakal_dandGitHub 83cd91b93c updated release notes for past PRs to dev (v11.0.0.rc) (#1457)
Build and Deploy on local RHEL9 / build (push) Successful in 2m11s
Build on RHEL9 docker image / build (push) Successful in 3m35s
Build on RHEL8 docker image / build (push) Successful in 4m52s
Build and Deploy on local RHEL8 / build (push) Successful in 5m0s
Run Simulator Tests on local RHEL9 / build (push) Successful in 18m17s
Run Simulator Tests on local RHEL8 / build (push) Successful in 21m59s
2026-05-12 18:08:52 +02:00
Erik FröjdhandGitHub d94c0d0e72 removed unused function readDataFile/writeDataFile (#1456)
Build on RHEL9 docker image / build (push) Successful in 4m0s
Build on RHEL8 docker image / build (push) Successful in 4m54s
Build and Deploy on local RHEL9 / build (push) Successful in 2m7s
Build and Deploy on local RHEL8 / build (push) Successful in 5m4s
Run Simulator Tests on local RHEL9 / build (push) Successful in 18m18s
Run Simulator Tests on local RHEL8 / build (push) Successful in 21m52s
* removed unused function readDataFile/writeDataFile

* release notes
2026-05-12 12:01:09 +02:00
Erik FröjdhandGitHub 6044298374 Build virtual servers on macOS (#1450)
Build on RHEL9 docker image / build (push) Successful in 4m29s
Build on RHEL8 docker image / build (push) Successful in 5m16s
Build and Deploy on local RHEL9 / build (push) Successful in 2m0s
Build and Deploy on local RHEL8 / build (push) Successful in 5m0s
Run Simulator Tests on local RHEL9 / build (push) Successful in 18m15s
Run Simulator Tests on local RHEL8 / build (push) Successful in 21m53s
* macOS import guards to have servers compile
* SPI mock since we don't do any actual transfer using the virtual server
* /proc/self/exe alternative for macOS
2026-05-12 11:23:20 +02:00
mazzol_aandGitHub bc86449652 Dev/doc/add ctb to doc (#1455)
Build on RHEL9 docker image / build (push) Successful in 4m33s
Build on RHEL8 docker image / build (push) Successful in 5m10s
Build and Deploy on local RHEL9 / build (push) Successful in 2m0s
Build and Deploy on local RHEL8 / build (push) Successful in 5m0s
Run Simulator Tests on local RHEL9 / build (push) Successful in 18m17s
Run Simulator Tests on local RHEL8 / build (push) Successful in 21m50s
* added numpy for patterngenerator

* treat warnings as errors

* fix warnings during docu build

* added power and ctb to documentation
2026-05-12 09:25:35 +02:00
maliakal_dandGitHub 225f59bdfb removed the unzooming at the start of every acquisition so that right click zoom should stay (#1451)
Build and Deploy on local RHEL9 / build (push) Successful in 2m7s
Build on RHEL9 docker image / build (push) Successful in 3m39s
Build and Deploy on local RHEL8 / build (push) Successful in 5m3s
Build on RHEL8 docker image / build (push) Successful in 5m13s
Run Simulator Tests on local RHEL9 / build (push) Successful in 18m17s
Run Simulator Tests on local RHEL8 / build (push) Successful in 21m54s
2026-05-11 16:38:21 +02:00
Erik FröjdhandGitHub ac9306ad7d removed legacy patternGenerator (#1449)
Build on RHEL8 docker image / build (push) Successful in 4m57s
Build on RHEL9 docker image / build (push) Successful in 5m1s
Build and Deploy on local RHEL9 / build (push) Successful in 2m8s
Build and Deploy on local RHEL8 / build (push) Successful in 5m5s
Run Simulator Tests on local RHEL9 / build (push) Successful in 18m16s
Run Simulator Tests on local RHEL8 / build (push) Successful in 21m53s
2026-05-11 11:08:15 +02:00
74166a1ea1 fixed python simulator test fixture (#1350)
Build and Deploy on local RHEL9 / build (push) Successful in 2m10s
Build on RHEL9 docker image / build (push) Successful in 3m37s
Build on RHEL8 docker image / build (push) Successful in 4m50s
Build and Deploy on local RHEL8 / build (push) Successful in 5m7s
Run Simulator Tests on local RHEL9 / build (push) Successful in 18m16s
Run Simulator Tests on local RHEL8 / build (push) Successful in 21m52s
* fixed python simulator test fixture

* clear_roi after every test to bring it back to default state, test passing multiple parameters

* Exposing the ctb api tests now to CI

* Revert "Exposing the ctb api tests now to CI"

This reverts commit 411fad1b27.

* fixed tests removed uneccessary stuff

* did not save properly

* updated documentation, renamed file

---------

Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
2026-05-08 13:09:02 +02:00
maliakal_d 111d10cfa7 formatting
Build and Deploy on local RHEL9 / build (push) Successful in 2m6s
Build on RHEL9 docker image / build (push) Successful in 3m38s
Build on RHEL8 docker image / build (push) Successful in 4m52s
Build and Deploy on local RHEL8 / build (push) Successful in 4m57s
Run Simulator Tests on local RHEL9 / build (push) Successful in 16m3s
Run Simulator Tests on local RHEL8 / build (push) Successful in 19m34s
2026-05-06 15:57:26 +02:00
0837de2a5a CTB frequency rounding, CTB frequency measurement, CTB frequency units (#1423)
* round CTB clocks to next closest possible value, added freq measurement

* added time for firmware to measrue actual value after frequency change

* add check for backwards compatibility

* change CTB and XCTB clock values to MHz, TODO: units and validation errors

* changed runclk command to use units and float, TODO: dbit, adcclk, why is everything called StringTo ?

* do the same for dbit and adcclk

* added tolerance to exptime, fixed test

* update default values in server defs

* added virtual check in Altera_PLL, update testcases

* change python and pyctbgui to accept and return floating point MHz

* update help and comments

* Dev/ctb clocks fix (#1434)

* introduced new type Hz, typetraits, String conversions, command generation (not yet generated)

* incorrect unit typo

* cmd generation and compiles

* default to MHz, removed space between units for consistency with timers, min and max checks for clks

* in python, but need to change the default to Hz again for clean code and intuition

* allow ints, doubles, implicit conversions

* dont allow raw ints, doubles and implicit conversions

* fixed tests

* added operators for Hz in python

* fix test for min clk for xilinx ctb

* fix test

* fix python tests

* fixed xilinx period and default clks

* test fix

* removed the 3 clock cycle check for ctb and implemented properly the max adc clk frq for altera ctb

* removing 3 clock cycle code from xilinx as well

* formatting

* loadpattern before 3 clk cycles code

* actualtime and measurement time to be implemented in 100ns already in fw

* fix tests

* pyzmq dependency forthe tests

* fixed pyctbgui for freq

* insert tolerance check again

* also added tolerance check for patwaittime

* formatting

* minor: rounding test

* removed Rep redundant in ToString for freq

* intro frequency unit enums, removed unnecessary template behavior for ToString with freq unit, switching from parsing string unit argument to the enum argument for ToString, adding parsing string to unit at CLI boundary

* minor, and binaries

* minor, default clk vals are 0 but set up at detector setup

* get frequency only for that unit

* tolerance process

* missed in previous commit

* some more changes to exptime and validations

* ctb is probably done

* periodleft and delayleft

* fixed xilinx freq conv as well

* fixed m3 bug, binaries

* xilinx: setup also done in stop server so that the clk is not 0

* missed a test marker

* binaries in

* review fixes, simpler validation of timers in ctb and xilinx ctb

* typo fix

* format

* fix tests

---------

Co-authored-by: Martin Mueller <martin.mueller@psi.ch>
Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
2026-05-06 15:52:13 +02:00
bb1a73d718 Dev/matterhornserver (#1396)
Build and Deploy on local RHEL9 / build (push) Successful in 2m0s
Build on RHEL9 docker image / build (push) Successful in 3m34s
Build on RHEL8 docker image / build (push) Successful in 4m46s
Build and Deploy on local RHEL8 / build (push) Successful in 5m3s
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m43s
Run Simulator Tests on local RHEL8 / build (push) Successful in 18m15s
* added fetch fmt server library

* added first draft of matterhorn

* added enum ReturnCode

* added cpp TCP Interface to slsDetectorServer

* added fmt to workflows

* bug: added std::signal for proper handling of ctr+c

* added compile option to set log level

* WIP

* dont use c project settings when building matterhornserver

* updated logger

* WIP

* WIP

* linked fmt to slsProjectOptions

* solved merge conflict

* some refactoring

* cleaned up logs

* added fmt to workflow

* WIP

* generated register defs from csv file

* oops given in hex

* properly added fmt as a dependency

* add fmt to conda recipe

* some format changes

* dont use public headers of fmt

* WIP

* used CRTP for virtual detector

* WIP

* added udp functions to matterhornserver

* Matterhorn in tostring

* warning unused variable from other PR

* fixed build

* updated cmake

* added Server class usable for all detectors

* removed stopserver

* added some more functions

* wrong overload

* porper cleanup of matterhorn app

* PR Review

* refactored directory structure

* used pause insetad of sleep

---------

Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
2026-05-06 13:33:35 +02:00
4ffb81e7ff bugfix of current display on ctb (#1445)
Build and Deploy on local RHEL9 / build (push) Successful in 1m58s
Build on RHEL9 docker image / build (push) Successful in 4m0s
Build on RHEL8 docker image / build (push) Successful in 4m46s
Build and Deploy on local RHEL8 / build (push) Successful in 4m58s
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m40s
Run Simulator Tests on local RHEL8 / build (push) Successful in 18m18s
Co-authored-by: Martin Mueller <martin.mueller@psi.ch>
Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
2026-05-05 13:43:40 +02:00
Erik FröjdhandGitHub 5b41a72360 typed as np.int32 (#1446)
Build and Deploy on local RHEL9 / build (push) Successful in 2m12s
Build on RHEL9 docker image / build (push) Successful in 3m28s
Build on RHEL8 docker image / build (push) Successful in 4m51s
Build and Deploy on local RHEL8 / build (push) Successful in 5m0s
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m42s
Run Simulator Tests on local RHEL8 / build (push) Successful in 18m17s
2026-05-05 09:21:11 +02:00
Erik FröjdhandGitHub 753ef2be45 Add support for building RPMs (#1439)
Build and Deploy on local RHEL9 / build (push) Successful in 2m5s
Build on RHEL9 docker image / build (push) Successful in 3m30s
Build and Deploy on local RHEL8 / build (push) Successful in 4m52s
Build on RHEL8 docker image / build (push) Successful in 5m3s
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m43s
Run Simulator Tests on local RHEL8 / build (push) Successful in 18m15s
* rpm

* versioned binaries

* also zmq process

* use distro style naming

* added gui
2026-05-04 17:56:23 +02:00
6bbbce5dc3 CTB: simplify power monitoring (#1428)
Build on RHEL9 docker image / build (push) Successful in 4m23s
Build on RHEL8 docker image / build (push) Successful in 4m49s
Build and Deploy on local RHEL9 / build (push) Successful in 2m2s
Build and Deploy on local RHEL8 / build (push) Successful in 4m51s
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m41s
Run Simulator Tests on local RHEL8 / build (push) Successful in 18m18s
* simplify power monitoring

* removed register definitions not needed anymore, formatting

* binaries updated

---------

Co-authored-by: Martin Mueller <martin.mueller@psi.ch>
Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
2026-04-27 16:54:44 +02:00