8643 Commits

Author SHA1 Message Date
c0eeae6d6d added gated clk for another pll for ctb 2022-09-28 17:35:45 +02:00
Dhanya Thattil
bac32dcba9
ctb 1g non blocking acquire (#555)
* allowing ctb and moench 1g to have non blocking acquisition also send data, refactoring wait for acquisition finished for all others
2022-09-16 17:45:51 +02:00
Dhanya Thattil
e385618d09
gui crash qtimer (#551)
* locks when qtimer runs out same time as acquisitionfinished

* fix for newer gcc
2022-09-16 17:02:03 +02:00
Dhanya Thattil
1df4aba8ec
updated g2 version for new fw (#554)
* updated g2 version for new fw
2022-09-12 15:04:11 +02:00
Erik Fröjdh
fdfdfd9f43
Option to install slsdet python extension in the install tree (#553)
* added option to install python ext
2022-09-09 13:47:27 +02:00
Erik Fröjdh
c0c8c8e21a
Hardcopy of pybind11 instead of using git submodules (#552)
* removed pybind as submodule
* added hardcopy of pybind11 2.10.0
* rename pybind11 folder to avoid conflicts when changing branch

Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
2022-09-09 10:42:43 +02:00
Erik Fröjdh
236f00c810
only get dacnames if modules are attached (#550) 2022-09-08 13:48:05 +02:00
Erik Frojdh
afff85b44b fix for broken build of zmq and ctb 2022-09-07 11:58:26 +02:00
Dhanya Thattil
1425382dbb
G2clkdiv (#547)
* g2 changing clkdivs 2 3 4 to defaults for burst and cw mode
2022-09-05 17:00:01 +02:00
Dhanya Thattil
76c18f3303
setting rx_hostname (or udp_dstip with rx_hostname not none) will always set udp_dstmac. solves problem of chaing udp_dstip and udp_dstmac stays the same (#544) 2022-09-05 16:57:54 +02:00
Dhanya Thattil
7de6f157b5
M3badchannels (#526)
* badchannels for m3 and modify for g2 (file from single and multi)

* m3: invert polarity of bit 7 and 11 signals from setmodule, allow commas in bad channel file

* badchannel file can take commas, colons and comments (also taking care of spaces at the end of channel numbers)

* tests 'badchannels' and 'Channel file reading' added, removing duplicates in badchannel list, defining macro for num counters in client side

* fix segfault when list from file is empty, 

* fix tests assertion for ctbconfig (adding message) for c++11

* fixed badchannels in m3server (clocking in trimming) 

* badchannel tests can be run from any folder (finds the file)
2022-09-01 15:30:04 +02:00
Dhanya Thattil
02322bb3c2
jungfrau reset core and usleep (fix for 6.1.1 now fixed in firmware) removed (#545) 2022-09-01 15:05:41 +02:00
Dhanya Thattil
4913c9c0b0
incorrect check for fwrite fail (#541) 2022-08-31 15:53:24 +02:00
Dhanya Thattil
d73d8994c0
g2 hdi type tolerance changed from 5 to 10 (#542) 2022-08-30 15:54:32 +02:00
aeb3e222c6 format 2022-08-30 15:31:38 +02:00
Erik Fröjdh
045a28b5de
Nanosecond times in Python (#522)
* initital implementation

* datetime replaces with sls::Duration in Python C bindings

* using custom type caster

* fix for conversion to seconds

* added set_count in python

* common header for pybind11 includes

authored-by: Erik Frojdh <erik.frojdh@psi.ch>
2022-08-26 11:48:40 +02:00
Erik Fröjdh
3970ed2560
Suppress -Wdeprecated-declarations for gcc (#536)
* Supress gcc warning from rapidjson include

Co-authored-by: Erik Frojdh <erik.frojdh@psi.ch>
2022-08-26 09:23:05 +02:00
Dhanya Thattil
5a22e8b926
ctb and moench fw fixed to work with pattern length so pattern command works (#535) 2022-08-25 15:01:59 +02:00
Dhanya Thattil
4638bf7cf8
Jungfrausync (#519)
* jungfrau sync
2022-08-23 10:29:16 +02:00
Dhanya Thattil
da16c1101c
G2 hdi id (#521)
* g2: hdi value in fpga is 3 bits, so using appropriate enum for it

* hdi id bits are determined

* fw date changed (g2)
2022-08-23 08:02:11 +02:00
Dhanya Thattil
67eea7ac36
Patdefault (#524)
* m3, ctb, moench set wait and loop addresses to 0x1fff

* update default pattern file for moench
2022-08-23 07:59:39 +02:00
c8e31ae6d7 formatting 2022-08-16 09:53:09 +02:00
Dhanya Thattil
809b0bdeb8
Jungfraumaster (#518)
* set jungfrau master only from client
* added tests, fixed a bug in ctb and moench (infinite recursion) that will never happen atm
2022-08-16 09:51:18 +02:00
Dhanya Thattil
01696ca89b
Jungfrautrigger (#516)
* jungfrau trigger added
* added blocking trigger
2022-08-16 09:41:47 +02:00
Dhanya Thattil
1bc4994be6
G2parallel (#514)
* g2: non parallel added
2022-08-16 09:35:39 +02:00
Dhanya Thattil
22b9562629
G2hdi (#510)
* g2: new hdi values, write hdi value to reg, set slave/master to reg, able to set master from server config file, server command line and client

* print versions for virtual as well
2022-08-16 09:31:13 +02:00
409a3977db Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2022-08-15 12:58:18 +02:00
81fbc45488 moench04CtbZmq10GbData.h corrected 2022-08-15 12:57:55 +02:00
Dhanya Thattil
9980a419f3
G2minor (#512)
* minor refactoring from old code

* binaries in
2022-08-11 09:17:35 +02:00
Dhanya Thattil
e0207cfac1
Udpsocket (#507)
* udp socket refactor from reuss: closing socket before throwing for bind error in constructor, closing socket at destructor and not at shutdown to allow other thread to read with a -1, so the object can still be accessed

* check for size of packet for every detector

* nullptr to unique ptr to call its destructor, when deallocating resources moved out of shutdown

* minor
2022-08-11 09:14:29 +02:00
Dhanya Thattil
07ff28e9e5
help should doesn't create detector object (#508)
* help should doesn't create detector object instead passing nullptr to the Proxy
2022-08-10 12:27:17 +02:00
Dhanya Thattil
6bf9dbf6d3
Format (#506)
Formatted package
2022-08-05 15:39:34 +02:00
Dhanya Thattil
7173785b29
Hdf5 para (#505)
* incorrect dimensions for virtual hdf5 parameter set

* fix for corner case bug in hdf5 virtual parameter dataset when frames caught is not a multiple of framesperfile

* reafctoring for readability and error prone hard numbers
2022-08-05 09:09:00 +02:00
Dhanya Thattil
89e293cb5a
Rxpointers (#504)
* gui message doesnt show if it has a '>' symbol in error msg

* minor refactoring for readability (size_t calc fifo size)

* refactoring listening udp socket code: activated and datastream dont create udp sockets anyway, rc<=- should be discarded in any case

* wip

* refactoring memory structure access

* wip: bugfix write header + data to binary

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* portRoi no roi effecto on progress

* fail at receiver progress, wip

* segfaults for char pointer in struct

* reference to header to get header and data

* refactoring

* use const defined for size of header of fifo

* updated release notes

* remove pointer in callback for sls_receiver_header pointer

* rx same name arguments in constructors

* rx: same name arguments in constructor

* rx: removing the '_' suffix in class data members

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* diff undo for clang later

* wip

* Wip

* const string&
2022-08-05 09:08:18 +02:00
Dhanya Thattil
9ac8dab8af
Rxclassmembers (#503)
* gui message doesnt show if it has a '>' symbol in error msg

* minor refactoring for readability (size_t calc fifo size)

* refactoring listening udp socket code: activated and datastream dont create udp sockets anyway, rc<=- should be discarded in any case

* wip

* refactoring memory structure access

* wip: bugfix write header + data to binary

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* portRoi no roi effecto on progress

* fail at receiver progress, wip

* segfaults for char pointer in struct

* reference to header to get header and data

* refactoring

* use const defined for size of header of fifo

* updated release notes

* remove pointer in callback for sls_receiver_header pointer

* rx same name arguments in constructors

* rx: same name arguments in constructor

* rx: removing the '_' suffix in class data members

* merge fix

* merge fix

* review fix refactoring
2022-07-25 14:02:11 +02:00
Dhanya Thattil
d132ad8d02
Callback rxheader (#502)
* gui message doesnt show if it has a '>' symbol in error msg

* minor refactoring for readability (size_t calc fifo size)

* refactoring listening udp socket code: activated and datastream dont create udp sockets anyway, rc<=- should be discarded in any case

* wip

* refactoring memory structure access

* wip: bugfix write header + data to binary

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* portRoi no roi effecto on progress

* fail at receiver progress, wip

* segfaults for char pointer in struct

* reference to header to get header and data

* refactoring

* use const defined for size of header of fifo

* updated release notes

* remove pointer in callback for sls_receiver_header pointer

* passing reference header for callback instead of copying it
2022-07-22 16:15:21 +02:00
Dhanya Thattil
4117cda79b
Rx: refactor memory structure and listener (#496)
* gui message doesnt show if it has a '>' symbol in error msg

* minor refactoring for readability (size_t calc fifo size)

* refactoring listening udp socket code: activated and datastream dont create udp sockets anyway, rc<=- should be discarded in any case

* wip

* refactoring memory structure access

* wip: bugfix write header + data to binary

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* portRoi no roi effecto on progress

* fail at receiver progress, wip

* segfaults for char pointer in struct

* reference to header to get header and data

* refactoring

* use const defined for size of header of fifo

* updated release notes

* refactoring from review: fwrite, static_cast
2022-07-22 15:32:41 +02:00
26cbfbdb30 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2022-07-14 12:19:45 +02:00
Bergamaschi Anna
3b9df5868e Added JF strixels cluster finder and gain bit for Moench04 2022-07-14 12:18:34 +02:00
Dhanya Thattil
8fcec81a67
Pattern 6 levels (#493)
* separating pattern levels from command name: command line done

* separated patten level from command in examples and default pattern files in servers

* command line and server works

* python: patnloop not verified, wip

* works except for patloop (set, and get does not list properly)

* minor

* fixed tests

* added 3 more levels for ctb and moench

* wip

* minor err msg

* minor

* binaries in

* separating pattern levels from command name: command line done

* separated patten level from command in examples and default pattern files in servers

* command line and server works

* python: patnloop not verified, wip

* works except for patloop (set, and get does not list properly)

* minor

* fixed tests

* added 3 more levels for ctb and moench

* wip

* minor err msg

* minor

* binaries in

* python working

* import fix

* changed fw version for ctb and moench. binaries in

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2022-07-14 12:00:07 +02:00
Dhanya Thattil
5be50785fb
rx noRoi should not create files for port (#499) 2022-07-14 10:09:48 +02:00
Erik Fröjdh
3d3e70c718
added defines for python (#498) 2022-07-14 10:07:26 +02:00
Dhanya Thattil
f1051246ad
Configfree (#492)
* prevent mem size check before Detector constructed (for loading config files), allowing freeing shm for submodules

* back to not allowing free submodules - consistency issues
2022-07-12 11:01:44 +02:00
Dhanya Thattil
0fc76a81b0
Zmqhint (#495)
* sorted the arguments of cmk.sh

* sorted arguments

* sorting arguments

* added q for zmq hint
2022-07-12 11:01:00 +02:00
Dhanya Thattil
b6db097800
udp_cleardst in fpga (#490)
* set number of destination in fpga as well when using udp_cleardst

* ensures fpga destinations are also cleared up

* binaries in
2022.07.06.dev0
2022-07-05 16:09:41 +02:00
c414d92b86 help script to update submodule 2022-07-05 14:52:23 +02:00
0358838dfb fixed ctb gui for namespace fix 2022-07-05 11:29:23 +02:00
704b67c846 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2022-06-13 16:52:39 +02:00
9ecafbf8d5 some updates to the moench data processing 2022-06-13 16:50:30 +02:00
aa93aed4ed updated client versioning 2022-06-09 13:50:41 +02:00