Commit Graph

1460 Commits

Author SHA1 Message Date
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
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
ae8c9175bf disable user id and port test 2025-11-26 12:24:48 +01:00
Erik Fröjdh
d3dc92b18b Using find_package(Threads REQUIRED) instead of linking pthread directly (#1324)
All checks were successful
Build on RHEL9 / build (push) Successful in 4m30s
Build on RHEL8 / build (push) Successful in 4m42s
* Linking to Threads::Threads instead of pthread directly 
* moved rt linking to slsSupportObject and only enable for linux
2025-10-27 16:30:40 +01:00
Erik Fröjdh
db91f06c02 added option to use system zmq (#1318)
* added option to use system zmq
* added notes in release.txt
2025-10-21 11:15:51 +02:00
6e006665ef added check if reciever is running (#1201)
Some checks failed
Build on RHEL9 / build (push) Failing after 3m32s
Build on RHEL8 / build (push) Failing after 4m55s
* added check if reciever is running

* added some tests

* uups dummy test - deleted test file

* changed test

* stopped receiver

* some tests dont run

* added some more tests as they also affect fifo structure

* fixed tests to work with test_simualtor for all cmdcall tests

* minor

---------

Co-authored-by: mazzol_a <mazzol_a@pc17378.psi.ch>
Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
2025-09-12 16:13:28 +02:00
776338a3d4 Dev/doc c standard (#1268)
Some checks failed
Build on RHEL9 / build (push) Failing after 4m21s
Build on RHEL8 / build (push) Failing after 4m56s
* updated c++11 to c++17

* more about c++11 and updating readme

* updated documentation for receiver arguments and also making receiver constructor explicit

* minor fix for rxr err message

* fixed doc about gcc version
2025-08-13 15:53:07 +02:00
89fe2a6329 fixed multi receiver and frames sync help throw of bad variant access (#1266)
Some checks failed
Build on RHEL9 / build (push) Failing after 5m18s
Build on RHEL8 / build (push) Failing after 6m32s
2025-08-12 11:40:16 +02:00
292e057004 fix roi test 2025-08-05 16:54:35 +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
09709f0f96 moving set signal handler to network utils 2025-07-11 10:52:08 +02:00
2698087efa fixed validation in network_utils, added a tests to throw for port 65535 in test mode (option on for sls_use_tests), multi:parent process checks child process exit status to send sigint to others 2025-07-11 10:38:00 +02:00
1bf3d5e67a check status of child exiting and use that to send sigint to all the child processes from the parent
All checks were successful
Build on RHEL9 / build (push) Successful in 3m36s
Build on RHEL8 / build (push) Successful in 5m2s
2025-07-10 12:36:45 +02:00
af51776eef minor test typo
All checks were successful
Build on RHEL9 / build (push) Successful in 3m37s
Build on RHEL8 / build (push) Successful in 5m5s
2025-07-09 17:20:46 +02:00
ef8d8a5fd2 raising a SIGINT when the child thread has an exception so that the parent thread can exit all the threads and clean up gracefully 2025-07-09 17:19:54 +02:00
d8ee0c2279 moved optstring and long options to the constructor 2025-07-09 15:02:12 +02:00
e1f8c4012f typo 2025-07-09 14:40:02 +02:00
3426ca9d32 Formatting 2025-07-09 10:44:23 +02:00
6b79fcc552 fixed help, -t for multi should not be supported as it never had it 2025-07-09 10:29:53 +02:00
e0aadbcc0f remove testing code, minor 2025-07-09 10:22:31 +02:00
767555c5cc unnecessary capture
All checks were successful
Build on RHEL9 / build (push) Successful in 2m52s
Build on RHEL8 / build (push) Successful in 4m55s
2025-07-08 17:58:38 +02:00
45f2dce3fc constexpr and checking if options object type is same 2025-07-08 17:55:49 +02:00
f0c6575a60 getuid issue on github workflow 2025-07-08 17:40:07 +02:00
2926904cf7 cleaning up properly , semaphore leaks, child process/thread throwing handled 2025-07-08 17:25:23 +02:00
fb4a25ecee fixed tests
Some checks failed
Build on RHEL8 / build (push) Failing after 1m7s
Build on RHEL9 / build (push) Failing after 2m43s
2025-07-08 15:20:28 +02:00
318b19ad79 wip test
Some checks failed
Build on RHEL8 / build (push) Failing after 1m15s
Build on RHEL9 / build (push) Successful in 2m58s
2025-07-07 17:36:40 +02:00
9a37cee4e9 made Commadnlineoptions into a class
Some checks failed
Build on RHEL9 / build (push) Failing after 12s
Build on RHEL8 / build (push) Failing after 18s
2025-07-07 14:52:01 +02:00
d18ea00b85 works, need to add tests 2025-07-07 12:20:40 +02:00
4ff29161d4 wip 2025-07-07 00:11:01 +02:00
e0810d973d refactored to take out repetitive code, need to adjust for slsMulti and slsFrameSync 2025-07-04 17:26:41 +02:00
1caf88858b minor comment
Some checks failed
Build on RHEL8 / build (push) Failing after 1m9s
Build on RHEL9 / build (push) Successful in 2m49s
2025-07-03 12:09:39 +02:00
396ef0a298 specified number of receiver error message
Some checks failed
Build on RHEL8 / build (push) Failing after 1m12s
Build on RHEL9 / build (push) Successful in 3m29s
2025-07-03 12:01:51 +02:00
c3012ec06c merge fix from developer 2025-07-03 11:59:35 +02:00
f9d41f1d66 to avoid confusion, moved default initialized, single sized declared vector of roi to be created at setDetectorType 2025-07-03 10:58:44 +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
313fc75950 wip refactoring 2025-07-02 19:44:30 +02:00
66ee7954db refactoring wip 2025-07-02 19:38:42 +02:00
67042e8315 refactorign 2025-07-02 18:11:19 +02:00
98d0612314 doesnt happen anymore 2025-07-01 15:03:33 +02:00
e274524c55 minor 2025-07-01 14:55:40 +02:00
da3037a8ea updated master file versions 2025-06-30 16:38:54 +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
8e20d08af2 rois test work on 1d as well 2025-06-29 15:13:51 +02:00
ca3311da4c works for all rois 2025-06-27 17:17:19 +02:00
3d4eaec178 wip, works for a single roi 2025-06-27 16:04:30 +02:00
91f33edcf8 works for complete roi 2025-06-27 15:18:05 +02:00