Commit Graph

98 Commits

Author SHA1 Message Date
05b7e0ef42 conflict merge fix 2021-07-22 11:53:00 +02:00
da996314e7 merge conflict 2021-07-22 11:15:57 +02:00
af16ad4040 vetoalg: wip 2021-07-20 12:58:05 +02:00
09391b767a support for scoped enums and operators in Python 2021-07-16 14:48:22 +02:00
789d0df81c wip 2021-06-21 12:31:35 +02:00
ac613171ec added conda pkgs for moench 2021-05-11 10:22:15 +02:00
01c785271f WIP 2021-03-31 16:26:36 +02:00
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
f9f50f1d84 M3settings (#228)
* added temp m3 settings files

* renames settings noise to trim

* get threshold for M3

* 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>
2021-01-14 12:34:13 +01:00
d9b2a90651 Introduced pattern class 2020-11-27 10:03:15 +01:00
e63fa1d7c2 Setting pattern from memory (#218)
* ToString accepts c-style arrays

* added patternParameters to python

* fixed patwait time bug in validation

* moved load from file function to patterParameters

* server using patternparamters structure to get pattern

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2020-11-24 20:32:07 +01:00
06dbf82e93 clang-format 2020-11-18 18:01:39 +01:00
a15d8dd30a Moving headers into include/sls (#212) 2020-11-02 16:05:28 +01:00
2c1fddee84 Cmddacs (#189)
Moved dacs to it's own command for command line. 
Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2020-09-24 17:16:34 +02:00
0c7759d7e4 formatting 2020-08-11 17:09:36 +02:00
0369413201 rename fix 2020-08-05 15:22:47 +02:00
aa0c36713c Utility function to get a vector of set bits
Template function to return a vector with the positions of all set bits in a variable.
2020-08-05 13:42:57 +02:00
d31839e80e roi constructor added 2020-07-30 14:04:50 +02:00
5faf3c7336 format 2020-07-23 14:01:59 +02:00
4db3473e32 Merge pull request #111 from slsdetectorgroup/shm
Shm
2020-07-07 13:35:52 +02:00
39bbc5c688 OutString for scanParameters 2020-07-06 09:19:44 +02:00
05059c1176 Test 2020-07-03 17:14:45 +02:00
5780cabe8d clang-tidy nullptr 2020-06-29 17:48:22 +02:00
19e40cf0e6 using .empty() on stl containers 2020-06-29 17:20:56 +02:00
159b0a0367 WIP 2020-06-23 09:30:17 +02:00
5bf6b7a338 Refactor of ZmqSocket (#109)
Changed data type of address from char[1000] to string to reduce stack size of object.

Removed redundant calls to Close

Removed function exposing the socket descriptor

Using functions from network_utils instead of duplicates

Added tests
2020-06-19 12:41:03 +02:00
12b40a44a2 first test for ZmqSocket 2020-06-18 17:49:40 +02:00
ab72d342c9 formatting 2020-06-10 17:29:28 +02:00
f5160b0978 exposing receiver thread ids to client (#102)
* exposing receiver thread ids to client

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2020-06-09 16:18:37 +02:00
761f93d753 exptime of gates 2020-05-20 09:36:43 +02:00
ea7cc9db8c less public headers 2020-05-15 10:52:23 +02:00
0dd5a099c8 renamed FixedCap.. to StaticVector 2020-05-15 09:03:23 +02:00
3962714b48 format + exception.cpp 2020-05-13 14:48:52 +02:00
eff664e790 cleanup 2020-05-11 18:28:06 +02:00
28bafb012a fixed test for new default values 2020-05-08 15:09:12 +02:00
ea4044e4b1 format support lib 2020-05-05 10:07:19 +02:00
655a410d43 cleaned up UdpRxSocket 2020-04-16 09:45:44 +02:00
97ba81d923 fixed test 2020-04-14 16:58:37 +02:00
fb051355b8 moved string conversion to .cpp 2020-03-26 15:06:23 +01:00
d0c3e006fb printing of std::map 2020-03-26 12:39:56 +01:00
8fc1578a5e added support for MSG_PEEK 2020-03-24 09:20:38 +01:00
9a6f521f6a other replacements for string 2020-03-19 12:39:42 +01:00
46e9b450c0 assume dec unless 0x 2020-03-19 11:09:20 +01:00
bf1b1a2d9e string conversion for uint 2020-03-19 10:30:05 +01:00
4813b5567a Minimal shared memory for receiver 2020-03-19 07:01:32 +01:00
4aeb8bf62e introducing new logger 2020-03-11 10:54:55 +01:00
c6ddd19c0f WIP 2020-03-04 15:38:21 +01:00
661adaf4ed WIP 2020-03-04 15:25:49 +01:00
ff9c37701b WIP 2020-03-04 12:35:41 +01:00
3431752649 WIP 2020-03-03 17:01:45 +01:00