* 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>
* 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>
* shorter SHM names on macOS
* fix segfault on macOS when string is empty
* apple version of read exe path
* ifdef for linux specific API
* fixed test for shm and udp socket
* updated release notes
* add patternstart command for CTB, block end of execution udp packets if pattern was started by patternstart command
* update docs
* Dhanya's comments
* more Dhanya comments
* refactored
* fixed tests for startpatttern, also clkfrequency not properly used in server
* xilinx: fixed setfrequency, tick clock (with sync clock), clkfrequency set from getfrequency to get the exact value
* xilinx freq in kHz, updated default values and prints
---------
Co-authored-by: Martin Mueller <martin.mueller@psi.ch>
Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
* update ctb regDefs, included fill level of adc, transceiver and DBit fifos, added enable registers for cont. readout
* fix fifo fill level range bug
* updated ctb RegDefs, increased size of fifo fill level register
* added register to read the firmware git hash
* ctb: added altchip_id read register
* start with unification of pattern machinery for xctb, ctb, mythen
* udate addrs for d-server internal matterhorn startup
* update xctb reg defs
* move pattern loopdef start
* added zero trimbits to matterhorn config
* Revert "added zero trimbits to matterhorn config"
This reverts commit 7c347badd5.
* added adjustable clocks on Xilinx-CTB
* added support for fractional dividers of runclk
* XCTB: make frequencies adjustable from python gui
* update docs
* added support for patternstart command to XCTB
* XCTB: map pattern_ram directly into memory, removed rw strobe
* refactor Mythen pattern control addresses
* test altera ctb with common addresses, removed ifdefs
* change ordering of regdefs
* updated python help for dbitclk, adcclk and runclk (khz)
* xilinx: moved the wait for firmware to measure the actual frequency to the server side and removed it in the pyctbgui side
* will not be anymore in developer branch
* make format (exception RegisterDefs.h), rewrite XILINX PLL to have less consstants in the code
* bug: mixing && for &
---------
Co-authored-by: Martin Mueller <martin.mueller@psi.ch>
Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
- 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>
* 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>
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
