Commit Graph

3461 Commits

Author SHA1 Message Date
284472b48f testing clkdiv one must ensure the exptime delay etc all are reset to the exact values for tests 2025-09-08 10:12:36 +02:00
6e3acbdf79 Dev/fix actual tests (#1285)
Some checks failed
Build on RHEL9 / build (push) Failing after 3m50s
Build on RHEL8 / build (push) Failing after 5m8s
- fix acquire fail in tests (adcreg test)
- roi tests fail after overlapping invalid test and acquire after
- print udp dest mac in server properly
- fixed udp dst list get (server was not sending entry proper size to match proper struct size in client)
- updated server binaries and updated hard links in serverBin
- added documentation regarding gui:  zmqport and zmqip in terms of gui, rx_zmqstream
- removed print - probably ended there for debuggung

---------

Co-authored-by: Alice <alice.mazzoleni@psi.ch>
2025-09-04 10:44:32 +02:00
5b069d85a8 Dev/shm fix remove (#1279)
Some checks failed
Build on RHEL9 / build (push) Failing after 3m30s
Build on RHEL8 / build (push) Failing after 5m9s
* one doesnt need to open shared memory to call removesharedmemory, and calling hasMemoryvalid without opening will cause segfault (not used now, but could in the future)

* fix test on shm
2025-08-25 16:20:19 +02:00
fff5fa73be Dev/verify shm (#1276)
Some checks failed
Build on RHEL9 / build (push) Failing after 3m41s
Build on RHEL8 / build (push) Failing after 5m10s
* removed verify, update, fixed getUser to be a free function, generated commands, python bindings yet to do

* python bindings

* fixed tests

* minor

* minor

* format
2025-08-23 10:23:27 +02:00
15cbaa509e Dev/shm free obsolete (#1274)
Some checks failed
Build on RHEL9 / build (push) Failing after 3m24s
Build on RHEL8 / build (push) Failing after 5m7s
* freeing obsolete shm withoua a 'isValid' should access raw pointers. Need to move this all into the shm class

* fixed obsolete shm free issue

* minor

* ensuring the test works platform independent for size of int
2025-08-21 14:32:15 +02:00
8ca251bbb7 Merge branch 'developer' into dev/fix_tests 2025-08-05 11:30:09 +02:00
f594826e95 python accessing freed shared memory object (#1253)
* added a 'isValid' member in shared memory (also updated shm version) with default true, any access to shared memory() checks also for validity. any free will set this to false and then unmap shm. Any access to shm will then check validity in python.

* fixed tests for shm

* added tests in python as well

---------

Co-authored-by: Alice <alice.mazzoleni@psi.ch>
2025-08-05 11:26:49 +02:00
071b142b10 fixed ctb dbit clock changing period in tests as it was setting run clock instead
All checks were successful
Build on RHEL9 / build (push) Successful in 3m36s
Build on RHEL8 / build (push) Successful in 5m10s
2025-08-04 14:11:51 +02:00
956103bbd4 fixed imagesize ctb issue (out values not transferred, setting any dbit values was not recalculatign image size in generaldata) 2025-08-04 12:12:30 +02:00
ee27f0bc1b readoutspeed in rx master file and other master file inconsistencies (#1245)
readout speed added to json and h5 master files.
Also fixed master file inconsistencies

Sserver binaries
- update server binaries because readoutspeed needs to be sent to receiver with rx_hostname command

API
- added const to Detector class set/getburstmode

Python
- updated python bindings (burstmode const and roi arguments)

Cmd generation
- added pragma once in Caller.in.h as Caller is included in test files

m3: num channels due to #counters < 3
* workaround for m3 for messed up num channels (client always assumes all counters enabled and adds them to num channels), fix for hdf5

g2: exptime master file inconsistency
- exptime didnt match because of round of when setting burst mode (sets to a different clk divider)
- so updating actual time for all timers (exptime, period, subexptime etc, )  in Module class, get timer values from detector when setting it and then send to receiver to write in master file

ctb image size incorrect:
-  write actual size into master file and not the reserved size (digital reduces depending on dbit list and dbit offset)
- added a calculate ctb image size free function in generalData.h that is used there as well as for the tests.


master file inconsistencies
- refactored master attributes writing using templates
-    names changed to keep it consistent between json and hdf5 master file (Version, Pixels, Exposure Times, GateDelays, Acquisition Period, etc.)
-  datatypes changed to keep it simple where possible: imageSize, dynamicRange, tengiga, quad, readnrows, analog, analogsamples, digital, digitalsamples, dbitreorder, dbitoffset, transceivermask, transeiver, transceiversamples, countermask, gates =>int
- replacing "toString" with arrays, objects etc for eg for scan, rois, etc.
- json header always written (empty dataset or empty brackets)
- hdf5 needs const char* so have to convert strings to it, but taking care that strings exist prior to push_back
- master attributes (redundant string literals->error prone

tests for master file
- suppressed deprecated functions in rapidjson warnings just for the tests
- added slsREceiverSoftware/src to allow access to receiver_defs.h to test binary/hdf5 version
- refactored acquire tests by moving all the acquire tests from individual detector type files to a single one=test-Caller-acquire.cpp
- set some default settings (loadBasicSettings) for a basic acquire at load config part for the test_simulator python scripts. so minimum number of settings for detector to be set for any acquire tests.
- added tests to test master files for json and hdf5= test-Caller-master-attributes.cpp
- added option to add '-m' markers for tests using test_simulator python script
2025-07-25 11:45:26 +02:00
d91585a39f Merge branch 'developer' into dev/multirxr_proper_cleanup_on_ctrlc 2025-07-11 10:56:00 +02:00
d210b0956e hdf5 definitions in test when not compiled with hdf5
All checks were successful
Build on RHEL9 / build (push) Successful in 3m38s
Build on RHEL8 / build (push) Successful in 5m4s
2025-07-09 11:18:13 +02:00
c3012ec06c merge fix from developer 2025-07-03 11:59:35 +02:00
34002f5be0 command line help
All checks were successful
Build on RHEL9 / build (push) Successful in 3m28s
Build on RHEL8 / build (push) Successful in 5m1s
2025-07-03 11:51:01 +02:00
94a9476550 formattin
All checks were successful
Build on RHEL9 / build (push) Successful in 2m53s
Build on RHEL8 / build (push) Successful in 4m57s
2025-07-02 19:44:44 +02:00
3bc594862c fix merge formatting and refactoring
All checks were successful
Build on RHEL9 / build (push) Successful in 2m52s
Build on RHEL8 / build (push) Successful in 4m54s
2025-07-02 14:10:02 +02:00
6c4c60ca71 refactoring 2025-07-02 14:08:00 +02:00
92fd3f0609 modified comments about ctb and xilinx not using roi
All checks were successful
Build on RHEL9 / build (push) Successful in 2m57s
Build on RHEL8 / build (push) Successful in 5m2s
2025-07-01 17:34:40 +02:00
929e441dc6 refactor command line parsing of roi 2025-07-01 17:31:49 +02:00
a28c78c47f refactor cmd line 2025-07-01 17:13:59 +02:00
f8a06d78f3 refactor cmd parsing (detid can be parsed directly) 2025-07-01 17:00:59 +02:00
274a338520 redundant getRxROI in Detector class for multi level and module level 2025-07-01 16:58:27 +02:00
36ed20117d minor 2025-07-01 15:33:30 +02:00
e274524c55 minor 2025-07-01 14:55:40 +02:00
f42609b66f minor fixes in command line and help
All checks were successful
Build on RHEL9 / build (push) Successful in 3m1s
Build on RHEL8 / build (push) Successful in 5m9s
2025-07-01 12:30:41 +02:00
5def4bdfc4 cmd generation and formatting
All checks were successful
Build on RHEL9 / build (push) Successful in 2m52s
Build on RHEL8 / build (push) Successful in 4m57s
2025-06-30 17:31:22 +02:00
5d31d86b83 format
All checks were successful
Build on RHEL9 / build (push) Successful in 2m57s
Build on RHEL8 / build (push) Successful in 5m0s
2025-06-30 12:32:05 +02:00
cbd0aed8e5 gui shows roi now 2025-06-30 12:03:39 +02:00
b775dd0efa get rx_roi from metadata from rxr, cant reconstruct. fixed clear roi should give 1 roi min
All checks were successful
Build on RHEL9 / build (push) Successful in 2m50s
Build on RHEL8 / build (push) Successful in 4m52s
2025-06-29 18:56:07 +02:00
72bf1fa257 check master file creation as well in rx_roi tests 2025-06-29 17:09:30 +02:00
8e20d08af2 rois test work on 1d as well 2025-06-29 15:13:51 +02:00
856ca1e558 1d fixes
All checks were successful
Build on RHEL9 / build (push) Successful in 2m50s
Build on RHEL8 / build (push) Successful in 4m55s
2025-06-29 01:06:34 +02:00
25e4070168 wip to fix tests
All checks were successful
Build on RHEL9 / build (push) Successful in 2m49s
Build on RHEL8 / build (push) Successful in 4m53s
2025-06-27 17:37:15 +02:00
ca3311da4c works for all rois 2025-06-27 17:17:19 +02:00
707bf023c6 wip, fails with master and virtual
All checks were successful
Build on RHEL9 / build (push) Successful in 2m48s
Build on RHEL8 / build (push) Successful in 4m48s
2025-06-25 16:42:33 +02:00
23f8981346 fix for eiger, added python test for testig roi in different module and detector type configurations 2025-06-25 13:41:47 +02:00
24fcfb3f9d fix for empty roi vectors (which shouldnt be) as you cant know if its all or not in roi 2025-06-24 17:05:40 +02:00
28792ea7e7 switched to vector instead of std::array<ROI, 2>>, which prints extra [-1, -1] when theres only 1 udp interface
All checks were successful
Build on RHEL9 / build (push) Successful in 2m49s
Build on RHEL8 / build (push) Successful in 4m48s
2025-06-24 09:39:28 +02:00
686eebd69b works for eiger as well 2025-06-23 21:31:52 +02:00
83482c8285 fixed rx_roi for multi modules jungfrau , tests for eiger, multi modules jungfrau in x and 2 interfaces 2025-06-23 20:01:32 +02:00
230d43d1fe all tests pased 2025-06-20 17:34:26 +02:00
24f878a17b rois shoudl work. left to implement tests for individual rois, create multiple datasets (1 for each roi) in the virutal data file. currently virutal dataset with roi is not implemented and a warning is given instead. wonder why since the inviduviaual roi files are clipped 2025-06-20 17:20:19 +02:00
aac3f8904b can get individual rois, but not connected to command yet
All checks were successful
Build on RHEL9 / build (push) Successful in 2m50s
Build on RHEL8 / build (push) Successful in 4m50s
2025-06-18 17:55:20 +02:00
8dd9165078 first level test
All checks were successful
Build on RHEL9 / build (push) Successful in 2m52s
Build on RHEL8 / build (push) Successful in 4m51s
2025-06-18 13:56:14 +02:00
982383980f wip
All checks were successful
Build on RHEL9 / build (push) Successful in 2m49s
Build on RHEL8 / build (push) Successful in 4m47s
2025-06-17 17:15:12 +02:00
56aa96e9b5 wip to parse vector of rois at command line
All checks were successful
Build on RHEL9 / build (push) Successful in 2m47s
Build on RHEL8 / build (push) Successful in 4m48s
2025-06-17 00:00:50 +02:00
06f06cfbf4 wip 2025-06-16 22:13:35 +02:00
e4f329466c wip 2025-06-16 17:25:21 +02:00
Erik Fröjdh
f84454fbc1 tests for bool in ToString/StringTo (#1230)
All checks were successful
Build on RHEL9 / build (push) Successful in 3m18s
Build on RHEL8 / build (push) Successful in 4m57s
- Added tests for ToString/StringTo<bool>
- Added overload for ToString of bool (previously went through int)
2025-06-03 08:36:29 +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