9266 Commits

Author SHA1 Message Date
35bc4b9c92 minor changes that got lost in the merge of automate_version_part 2 PR 2025-05-27 16:29:53 +02:00
f40dc00757 raise an exception if the pull socket python script had errors at startup (for eg if pyzmq was not installed) 2025-05-27 15:52:03 +02:00
d0a946a919
Merge pull request #1209 from slsdetectorgroup/dev/automate_version_part2
All checks were successful
Build on RHEL9 / build (push) Successful in 2m49s
Build on RHEL8 / build (push) Successful in 4m50s
Dev/automate version part2
2025-05-27 10:17:17 +02:00
froejdh_e
ed142aa34e added expat to host section 2025-05-27 09:10:03 +02:00
1227574590
Merge branch 'developer' into dev/automate_version_part2
All checks were successful
Build on RHEL9 / build (push) Successful in 3m15s
Build on RHEL8 / build (push) Successful in 4m56s
2025-05-26 11:08:42 +02:00
mazzol_a
3ac7b579a0 formatted and updated versionAPI.h 2025-05-26 11:01:49 +02:00
mazzol_a
feb1b0868e dummy commit for versionAPI 2025-05-26 09:13:45 +02:00
mazzol_a
6d2f34ef1d adresses review comments 2025-05-23 11:41:56 +02:00
b36a5b9933 updating pmods
All checks were successful
Build on RHEL9 / build (push) Successful in 2m50s
Build on RHEL8 / build (push) Successful in 4m54s
2025-05-22 13:50:26 +02:00
froejdh_e
d8ce5eabb8 and now with link
All checks were successful
Build on RHEL9 / build (push) Successful in 2m48s
Build on RHEL8 / build (push) Successful in 4m56s
2025-05-22 10:39:32 +02:00
froejdh_e
ceecb0ca27 added extra fs link and fixed execute_program warning
Some checks failed
Build on RHEL9 / build (push) Successful in 2m52s
Build on RHEL8 / build (push) Failing after 4m51s
2025-05-22 10:20:16 +02:00
ac3670dcd2
Merge pull request #1215 from slsdetectorgroup/dev/doc_frame_sync
Dev//documentation for slsFrameSynchronizer
2025-05-22 08:43:53 +02:00
1c7bc61531 minor 2025-05-21 17:27:50 +02:00
58245a62a4 minor aesthetics 2025-05-21 17:06:08 +02:00
a464262558 typo 2025-05-21 16:47:15 +02:00
995d3e0034 rearranged receiver topics, differentiated btween receiver variants and added info about slsFrameSynchronizer 2025-05-21 16:47:07 +02:00
90d57cb6a9
Merge pull request #1214 from slsdetectorgroup/dev/fixStaticVector
Some checks failed
Build on RHEL9 / build (push) Successful in 3m18s
Build on RHEL8 / build (push) Failing after 4m48s
dev: rewrote end() for StaticVector
2025-05-21 16:34:49 +02:00
froejdh_e
30eab42294 rewrote end() for StaticVector 2025-05-21 16:26:32 +02:00
1d0eeea7ee
Merge pull request #1207 from slsdetectorgroup/fix_blackfin_read_access
Some checks failed
Build on RHEL9 / build (push) Successful in 2m58s
Build on RHEL8 / build (push) Failing after 4m51s
ctb: fix bug in blackfin read access to firmware registers
2025-05-19 16:18:24 +02:00
d7c012d306 formatting 2025-05-19 13:20:03 +02:00
1665937540 refactoring code and compiling binary 2025-05-19 13:19:32 +02:00
mazzol_a
9343e3c667 merged developer
Some checks failed
Build on RHEL9 / build (push) Successful in 2m51s
Build on RHEL8 / build (push) Failing after 4m48s
2025-05-15 17:20:52 +02:00
mazzol_a
b4c8fc1765 updated all makefiles 2025-05-15 17:08:27 +02:00
mazzol_a
3ad4e01a5d updates api version based on version file & converted shell script files to python 2025-05-15 16:35:09 +02:00
015b4add65
Merge pull request #1206 from slsdetectorgroup/dev/fix_frame_sync
Some checks failed
Build on RHEL9 / build (push) Successful in 2m48s
Build on RHEL8 / build (push) Failing after 4m54s
dev/fix_frame_sync
2025-05-12 01:00:08 +02:00
9051dae787 fix bug in blackfin read access to firmware registers 2025-05-08 15:40:13 +02:00
68bdd75c9c moving the erasure of the fnum to after sending the zmg packets and also deleteing all old frames when end of acquisition 2025-05-07 16:33:50 +02:00
a53873b695 typo 2025-05-07 16:04:12 +02:00
77a39b4ef2 minor 2025-05-07 15:58:28 +02:00
64be8b1e89 better error messageS 2025-05-07 15:56:41 +02:00
68bd9fb4f7 frame synchonrizer fixes: typo of iterator for loop and zmg_msg_t list cleaned up before sending multi part zmq; test written for the frame synchronizer, test_simulator.py rewritten for more robustness and refactoring commonality between both scripts 2025-05-07 15:44:32 +02:00
0d5d851585
Merge pull request #1199 from slsdetectorgroup/dev/test_all_acquire_file
Some checks failed
Build on RHEL9 / build (push) Successful in 4m0s
Build on RHEL8 / build (push) Failing after 4m45s
Dev/test all acquire file
2025-05-02 16:17:59 +02:00
eb3d51d20c removed -9 to kill with cleanup
Some checks failed
Build on RHEL9 / build (push) Successful in 4m4s
Build on RHEL8 / build (push) Failing after 4m46s
2025-05-02 15:40:10 +02:00
9f4298ac15 check if process running for kill -9 slsReceiver fail 2025-05-02 13:55:44 +02:00
fb79ba768c fixed bug found by @AliceMazzoleni99 that for ctb server is still shown in pgrep -f if xilinx server running, so now the pid is killed and looking for any DetectorServer_virtual instead. also reset color coding after Log 2025-05-02 11:30:08 +02:00
7bc48e3111 fix for slsreceiver killed but complaining for virtual tests with script
Some checks failed
Build on RHEL8 / build (push) Failing after 3m0s
Build on RHEL9 / build (push) Successful in 4m58s
2025-05-01 16:55:09 +02:00
53b90d92d7 typo 2025-05-01 16:46:23 +02:00
fb6ef8b818 alloweing all tests 2025-05-01 16:43:00 +02:00
8bb9de0de1 Merge branch 'developer' into dev/test_all_acquire_file 2025-05-01 16:42:39 +02:00
451b50dfed fix for xilinx ctb virtual 2025-05-01 16:42:11 +02:00
22f2662e3b trying to fix acquire for xilinx 2025-05-01 16:19:25 +02:00
ce3f555c08
Merge pull request #1202 from slsdetectorgroup/dev/fix/reorder_only_if_digitalmode
All checks were successful
Build on RHEL8 / build (push) Successful in 4m37s
Build on RHEL9 / build (push) Successful in 5m5s
only reorder bits if some sort of digital readout mode enabled
2025-05-01 16:01:01 +02:00
mazzol_a
dedab6010d only reorder bits if some sort of digital readout mode enabled 2025-05-01 15:53:37 +02:00
62a5fda33f fixed ctb tests, need to fix in develoepr (if digital modfe not enabled, should not take into accoutn dbitlist or dbitoffset or dbitreorder 2025-05-01 15:45:14 +02:00
5073769403 fixed hardcoded values of nchip nchan etc from detPArameters 2025-05-01 12:41:05 +02:00
aabec193ff fix 10g adc enable mask, switched with 1g 2025-05-01 12:10:33 +02:00
d4a1044fce incorrect counter mask tested 2025-05-01 12:08:29 +02:00
dca0edcfcc removed minor printout 2025-05-01 11:28:19 +02:00
5a24a79bf7 typo fixed 2025-05-01 11:26:38 +02:00
91f9c4fa83 minor printout removed 2025-05-01 11:25:34 +02:00