1150 Commits

Author SHA1 Message Date
Erik Fröjdh
2f2fe4dd47
Release of 5.1.0 (#237)
* Setting pattern from memory (#218)

* ToString accepts c-style arrays

* fixed patwait time bug in validation

* Introduced pattern class

* compile for servers too

* Python binding for Pattern

* added scanParameters in Python

* slsReceiver: avoid potential memory leak around Implementation::generalData

* additional constructors for scanPrameters in python

* bugfix: avoid potentital memory leak in receiver if called outside constructor context

* added scanParameters in Python

* additional constructors for scanPrameters in python

* M3defaultpattern (#227)

* default pattern for m3 and moench including Python bindings

* M3settings (#228)

* some changes to compile on RH7 and in the server to load the default chip status register at startup

* Updated mythen3DeectorServer_developer executable with correct initialization at startup

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
Co-authored-by: Anna Bergamaschi <anna.bergamaschi@psi.ch>

* Pattern.h as a public header files (#229)

* fixed buffer overflow but caused by using global instead of local enum

* replacing out of range trimbits with edge values

* replacing dac values that are out of range after interpolation

* updated pybind11 to 2.6.2

* Mythen3 improved synchronization (#231)

Disabling scans for multi module Mythen3, since there is no feedback of the detectors being ready
startDetector first starts the slaves then the master
acquire firs calls startDetector for the slaves then acquire on the master
getMaster to read back from hardware which one is master

* New server for JF to go with the new FW (#232)

* Modified Jungfrau speed settings for HW1.0 - FW fix version 1.1.1, compilation date 210218

* Corrected bug. DBIT clk phase is implemented in both HW version 1.0 and 2.0. Previous version did not update the DBIT phase shift on the configuration of a speed.

* fix for m3 scan with single module

* m3 fw version

* m3 server

* bugfix for bottom when setting quad

* new strategy for finding zmq based on cppzmq



Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
Co-authored-by: Dhanya Thattil <33750417+thattil@users.noreply.github.com>
Co-authored-by: Alejandro Homs Puron <ahoms@esrf.fr>
Co-authored-by: Anna Bergamaschi <anna.bergamaschi@psi.ch>
Co-authored-by: Xiaoqiang Wang <xiaoqiangwang@gmail.com>
Co-authored-by: lopez_c <carlos.lopez-cuenca@psi.ch>
2021-03-22 14:43:11 +01:00
Erik Frojdh
06dbf82e93 clang-format 2020-11-18 18:01:39 +01:00
abfc0dc266 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-11-18 10:12:35 +01:00
85a6d82d9f bugfix hdf5 threshold ev 2020-11-18 10:12:27 +01:00
Erik Frojdh
56be47669f more cmake cleaning 2020-11-18 09:43:07 +01:00
Erik Frojdh
b96b1849cd minor 2020-11-18 09:15:17 +01:00
Erik Frojdh
1efdc90719 clean 2020-11-18 08:57:35 +01:00
a534271aff back to normal receiver 2020-11-17 16:21:39 +01:00
Erik Frojdh
bfe8cb7020 Merge branch 'callbacksafe' of github.com:slsdetectorgroup/slsDetectorPackage into callbacksafe 2020-11-17 15:33:13 +01:00
Erik Frojdh
40f6eb8ede WIP 2020-11-17 15:33:09 +01:00
5c71dd7246 handling acquisitionfinished callback 2020-11-17 15:28:39 +01:00
918f3f3fde handling get data rxr callback exceptions 2020-11-17 13:53:54 +01:00
a36a294515 handling acquisition finished callback exception 2020-11-17 13:38:22 +01:00
f19bc8880a handling start acq call back exception 2020-11-17 13:34:51 +01:00
0cb7d62ad5 throw startacq callback exception 2020-11-17 12:57:14 +01:00
Erik Frojdh
2020407438 adding namespace sls to public receiver api 2020-11-09 11:23:11 +01:00
Erik Fröjdh
121a3ad733
Static libraries (#213) 2020-11-03 18:54:11 +01:00
Erik Fröjdh
a15d8dd30a
Moving headers into include/sls (#212) 2020-11-02 16:05:28 +01:00
e57f49086d allowing multi receiver with just 2 arguments (without call back as default) 2020-10-28 11:43:53 +01:00
a5d70c1214 print missing packets in signed 2020-10-20 15:47:09 +02:00
6c1035aa99 zmq hwm are specified to 2 for gui and restreaming of receiver if all zmq not closed at end of acquiistion 2020-10-08 13:01:01 +02:00
c9372f3d0e gui: rx_zmqfreq set to 0 in gui for fast detectors that overload the network unnecessarily 2020-10-01 11:45:45 +02:00
Dhanya Thattil
fe81963873
rxr: udp socket size max of INT_MAX/2 (#191) 2020-09-25 10:15:39 +02:00
99642dad69 g2 fix: cont trigger frames in rxr should be 1 2020-09-24 17:16:46 +02:00
Erik Frojdh
d945f39142 removed unused variables 2020-09-17 14:39:20 +02:00
Erik Frojdh
ac1e9569b5 removed unused fields and added popcount 2020-09-17 14:20:02 +02:00
Erik Frojdh
ea1b41c84a fixed bool ini with nullptr 2020-09-17 14:07:19 +02:00
f26d8e514b merged with g2continuous 2020-09-08 08:46:37 +02:00
e82e531fb1 server arguments like linux 2020-09-08 08:18:48 +02:00
503f83e8e3 Merge branch 'developer' into g2continuous 2020-09-07 17:07:09 +02:00
b20720686e gotthard2: changed order of burst mode enums, added a 4th burst mode cw internal burst mode 2020-09-07 16:13:33 +02:00
30e06c6386 Merge branch 'developer' into rxrmetadata 2020-09-07 11:53:41 +02:00
ea601fe1f7 lock to ensure json add header can be updated on the fly 2020-09-07 11:52:51 +02:00
f0c576c779 WIP 2020-09-07 11:15:51 +02:00
Erik Frojdh
fb8842e048 build and libname 2020-09-07 09:14:47 +02:00
5b182469a1 rxr: fixed all updates from rxParameters, connected them in masterAttributes, added json header and scan parametes in metadata 2020-09-04 13:49:30 +02:00
Erik Frojdh
a1b88d3a62 fix 2020-09-04 11:20:33 +02:00
abe34d573c WIP 2020-09-02 16:15:33 +02:00
39c2ab4743 rxr:minor removed unused function in general data for m3 to change size depending on dr 2020-08-19 12:27:40 +02:00
1d8f9a5aed more detail in packet loss statistic percentage 2020-08-14 17:21:35 +02:00
de69e666a9 progress changed to double 2020-08-14 12:16:35 +02:00
0c7759d7e4 formatting 2020-08-11 17:09:36 +02:00
21995b3d4a rxr: missed out on initializing function pointers to null (rxr) 2020-08-10 16:54:25 +02:00
Erik Frojdh
0e011a77b5 array init fix for old gcc 2020-08-10 10:35:26 +02:00
Erik Frojdh
b51290d0fe avoid conversions 2020-08-05 16:49:23 +02:00
Erik Frojdh
949c6a81ce vector to array 2020-08-05 13:54:56 +02:00
4aee113dda temp fix 2020-08-05 13:27:19 +02:00
6c3f0d18ec rxr:removed delte and initialize memebers 2020-08-05 13:23:45 +02:00
7b6f4d0b5b rxr chrono 2020-08-05 12:07:45 +02:00
Erik Frojdh
69d9680034 mior 2020-08-05 10:17:47 +02:00