9176 Commits

Author SHA1 Message Date
2b68b2158b Debug 2025-03-13 16:02:24 +01:00
721d296712 Merge branch 'developer' into jf_h5reader 2025-03-13 11:01:47 +01:00
62dd5c8d4e Enforce compiler support for c++17 standard 2025-03-13 11:01:20 +01:00
35c37998f3 tweak file name 2025-03-11 11:55:53 +01:00
010f736e80
Merge pull request #1141 from slsdetectorgroup/dev/jf_firmware_dates_1.6_2.6
Dev/jf firmware dates 1.6 2.6
2025-03-11 09:35:39 +01:00
4dcbcad435 jungfrau server binary for fw 1.6 and 2.6 2025-03-11 09:34:37 +01:00
8f8a92b9c5 jungfrau firmware dates for fw v 1.6 and fw2.6 2025-03-11 09:32:44 +01:00
9b13ddf6be Merge branch 'developer' into jf_h5reader 2025-03-10 16:46:42 +01:00
49db2fbee7 Fix tiff filename 2025-03-10 16:46:04 +01:00
684eee984d
removed CMakeFiles folder. mistakenly added to repo (#1137) 2025-03-10 14:27:08 +01:00
297c3752e3
Dev/remove gotthard i (#1108)
* slsSupportLib done, at receiver rooting out in implementation

* removed from receiver and client

* removed everywhere except gui, python and client(commands.yaml and Detector.h)

* updated python

* fixed autocomplete to print what the issue is if there is one with ToString when running the autocomplete script to generate fixed.json. updated readme.md in generator folder

* formatting

* removed enums for dacs

* udpating autocomplete and generating commands

* removed gotthard from docs and release notes

* removed dac test

* bug from removing g1

* fixed virtual test for xilinx, was minor. so in this PR

* gui done

* binary in merge fix

* formatting and removing enums

* updated fixed and dump.json

* bash autocomplete

* updated doc on command line generation

* removing increments in dac enums for backward compatibility. Not required

* removed ROI from rxParameters  (only in g1), not needed to be backward compatible

* removed the phase shift option from det server staruip
2025-03-10 14:24:33 +01:00
670d4dbce4 Merge branch 'developer' into jf_h5reader 2025-03-10 12:24:33 +01:00
a0e5304df6 Modify tiff file name 2025-03-10 12:23:51 +01:00
fa504e6675
default filepath is now an empty string, SetupWriter will throw an error if path not set (#1133)
Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
2025-03-10 12:00:22 +01:00
2b8fbad47d reduce compiler warnings 2025-03-07 22:01:44 +01:00
a095a4ffce Fix double-free 2025-03-07 21:49:05 +01:00
d74da4cf04 Fix implicit conversion float->double compiler warning 2025-03-07 11:48:15 +01:00
9321d6d03a add SC to CMake 2025-03-06 20:32:45 +01:00
45a9a74137 Merge branch 'developer' into jf_h5reader 2025-03-06 17:14:17 +01:00
bede3003b6 Edit default rank 2025-03-06 17:06:45 +01:00
b9b4f1ae35
changed line 66 in docs/conf.py.in to app.add_css_file(filename) (#1131)
Co-authored-by: AliceMazzoleni99 <l_mazzol_a@pc17378.psi.ch>
2025-03-06 14:42:17 +01:00
3c2062f23e
Dev/m3 default period 0 (#1127)
* m3: default period 0, merge fix from 9.1.0

* from previous commit
2025-03-04 16:07:28 +01:00
e7247f1fee formatting 2025-03-04 10:48:13 +01:00
Martin Mueller
905a509a17
update xilinx regs (#1123)
Co-authored-by: Martin Mueller <martin.mueller@psi.ch>
2025-03-04 10:38:14 +01:00
b4dc1dde6c
patternX to pattern (#1120)
* pattern is not an issue for yaml. changing patternX to pattern everywhere

* added patternX to deprecated
2025-02-27 10:42:21 +01:00
964ab19b42
Dev/multi id ignored in config (#1115)
* warn that the multi id is ignored in config file? or throw?

* throw and not just warn with printouts as that could be silent as well

* throw for any multi id command in the file.
2025-02-27 10:41:17 +01:00
ce8911de10
when creating the python bindings for Detector class, it should ignore the assignment operators (#1107) 2025-02-26 12:21:06 +01:00
d1e5b0bc42
Dev: udpated help on multi module and multi command help (#1119)
* udpated help on multi module and multi command help

* fixed issues with empty lines and other syntax with docuemntation

* fixed some warningsin documentation

* some changes to documentation about command line usage

* minor
2025-02-26 11:14:15 +01:00
4b3ed22f76
jf binary in, jf: removed check to allow chipv1.0 also to set comp disable time (#1118) 2025-02-24 09:39:19 +01:00
aad1ab0cf4
file from Anna: could be reduce print out in zmq processing when using energy threshold (#1113) 2025-02-21 12:49:33 +01:00
117637863d
Xilinxctb/update reg (#1084)
* updated RegisterDefs.h from firmware update

* Revert "updated RegisterDefs.h from firmware update"

This reverts commit 64f1b2546e742f0b0513124a599cd9bcde11760c.

* updated registers and had it formatted

* Revert "updated registers and had it formatted"

This reverts commit 1641b705b0d8616bcff4a5cd796d8796d09391f2.

* udpated registers from firmware, reading config file in server (chip config, reset chip, enable_clock_pattern) specific for matterhorn,this is done when powering on chip, removed startreadout, fixed status register bits, updated firmware version

* fix for patioctrl allowed for zxilinx and adding readout pattern for scientists that like to push the acquire button

* fixing default enable clock and readout pattern for xilinx (patioctrl has to be 32 bit)

* Xilinxctb/first image (#1094)

* reduce xilinxCTB readout done checks to single register, increased clockEna pattern limits, clear FPGA FiFos and counters on powerchip, disable counters 1-3 in matterhorn configuration

* change print of xilinxctb server

* remove acquisition done check

---------

Co-authored-by: Martin Mueller <martin.mueller@psi.ch>

* binary xilinx in

* formatting

* added reset of udp buffer FIFO to xilinxCTB

---------

Co-authored-by: Martin Mueller <72937414+mmarti04@users.noreply.github.com>
Co-authored-by: Martin Mueller <martin.mueller@psi.ch>
2025-02-18 11:30:51 +01:00
e933a25453
Dev/frame synchronizer (#968)
* skeleton of structure for callbacks and funcitons updated

* updated callback header structures and implemented in receiver

* fixed bugs

* minor

* formatting

* wip: draft of frame synchronizer, semaphores not done yet

* signal handler not affecting semaphore inside lambda function

* finally works with sem

* install targets cmake error fix

* removed modified callback and instead passing by reference instead of value to the oriignal receiver data callback

* reducing the number of data call backs. incoming from developer

* added json header to receiver start acquiistion call back

* WIP: of synchronisation (#969)

* WIP of synchronisation

* working so far if everything goes right

* added all information into json headers

* valid json

* allow frame synchronizer to have access to static libzmq when compiling on conda (libzeromq-devel not installed by default

* upto date with multirecieverapp for invalid arguments and help

* formatting

* remove warnings

* changes to print

* removed prints

* no need for print frames to be called

* minor

* commnet

* adding json header in start callback, imagesize in data callback and formatted

* startcallback returns an unused int (changed to exceptions and forgotten in last modification to callbacks likely)

* fixed sanitizer issues. 1 left for ctrl+C
- zmq_msg_t should be deleted, not freed. Same with the char arrays and semaphores.

* fixed sanitizer issues and made it more readable

* moving clearing old frames to new startacq just in case it has to process soem frames before the callback

* fix cherry-pick merge of fixing sanitizer thread issues but has start callbacks signature change.fixed

---------

Co-authored-by: Felix Engelmann <felix-github@nlogn.org>
2025-02-18 11:28:21 +01:00
f1f369b48c
dev jf : bunch id decoder and auto comp disable (#1097)
* jf wip: bunch id decoder only in pcb v2.0 check and comments

* auto comp disable the same way for both chip versions. compdisabletime also available for 1.1 now

* fixed tests

* formatting

* binary in
2025-02-18 11:17:38 +01:00
6b149244d3
added documentation of order in hostname command in quick start guide, udp header format for row and column values and in command line hostname (#1099) 2025-02-18 11:11:33 +01:00
436d180e93
dont usleep if no transmission delay (#1101) 2025-02-18 11:10:06 +01:00
c43a4030a5
removed .str().c_str() (#1090) 2025-02-11 09:14:56 +01:00
5fd319725e include <mutex> 2025-02-10 20:05:13 +01:00
fb77bc7f1d Rework for mutex safety and RAII compliance 2025-02-10 20:01:36 +01:00
8a5bd21ecc Add constructor printout (debug) 2025-02-10 19:08:13 +01:00
cb99aa40cb Adapt main() for storage cell case 2025-02-10 17:45:05 +01:00
41bb7ca1ed Adapt file pointer setting + pedestal reading 2025-02-10 16:50:09 +01:00
d85d4f94d6 Adapt constructor for multithreaded storage cell use 2025-02-10 16:11:30 +01:00
ea288a1939 Globally implement Copy() function for deep copy of detector objects 2025-02-10 16:10:53 +01:00
be607e8a2e Fix missing includes 2025-02-07 21:49:06 +01:00
7396ceed54 Create copy constructor for singlePhotonDetector that creates a new mutex 2025-02-07 21:09:31 +01:00
243c555798 Remove explicit class member analogDetector<uint16_t>* dd[MAXTHREADS] 2025-02-07 16:32:09 +01:00
7b1e74f4a4 Adapt get and writeImage methods to storage cell data 2025-02-07 15:33:31 +01:00
fcbb87b71a Adapt multithreaded cluster finder to storage cell data - continued (non-functional) 2025-02-06 20:42:36 +01:00
3a1945116a First (unfinished) attempt to adapt multithreaded cluster finding to storage cell data; REVERT BACK TO PREVIOUS COMMIT IF THIS FAILS! 2025-02-05 20:17:46 +01:00
884104156b Minor debugging 2025-02-04 18:15:33 +01:00