Commit Graph

7057 Commits

Author SHA1 Message Date
maliakal_d 4d7fb4e4e0 wip 2021-07-15 14:48:41 +02:00
maliakal_d 8354395f64 wip 2021-07-15 13:44:42 +02:00
maliakal_d a127f8c97a g2: badchanels moved to a new register base 2021-07-14 16:03:13 +02:00
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>
5.1.0
2021-03-22 14:43:11 +01:00
maliakal_d 64de9f3ad0 Merge branch 'main-rc' into b5.0.1 5.0.1 2020-11-30 17:24:50 +01:00
maliakal_d 390a842b97 Merge branch 'main-rc' into b5.0.0 5.0.0 2020-11-30 17:21:06 +01:00
maliakal_d 040cc9c14f Merge branch 'main-rc' into b4.2.0 4.2.0 2020-11-30 17:14:08 +01:00
maliakal_d 0a1c4992e2 Merge branch 'main-rc' into b4.1.1 4.1.1 2020-11-30 17:12:26 +01:00
maliakal_d 59b56c764f Merge branch 'main-rc' into b4.1.0 4.1.0 2020-11-30 17:09:23 +01:00
maliakal_d ff7afd0de7 Merge branch 'main-rc' into b4.0.2 4.0.2 2020-11-30 17:05:39 +01:00
maliakal_d 835e62425f Merge branch 'main-rc' into b4.0.1 4.0.1 2020-11-30 17:03:16 +01:00
maliakal_d c8cdbfc488 Merge branch 'main-rc' into b4.0.0 4.0.0 2020-11-30 17:00:57 +01:00
maliakal_d 2f75143245 Merge branch 'main-rc' into b3.1.5 3.1.5 2020-11-30 16:58:53 +01:00
maliakal_d 6f7c31b747 Merge branch 'main-rc' into b3.1.4 3.1.4 2020-11-30 16:57:17 +01:00
maliakal_d 75c2d987c4 Merge branch 'main-rc' into b3.1.3 3.1.3 2020-11-30 16:56:01 +01:00
maliakal_d 726f5eba29 Merge branch 'main-rc' into b3.1.2 3.1.2 2020-11-30 16:54:56 +01:00
maliakal_d 4404ee717a Merge branch 'main-rc' into b3.1.1 3.1.1 2020-11-30 16:52:52 +01:00
maliakal_d 54530ab103 Merge branch 'main-rc' into b3.1.0 3.1.0 2020-11-30 16:50:15 +01:00
maliakal_d 6126780660 Merge branch 'main-rc' into b3.0.1 3.0.1 2020-11-30 16:45:00 +01:00
maliakal_d 9b7f9b1be1 Merge branch 'main-rc' into b3.0.0 3.0.0 2020-11-30 16:42:35 +01:00
maliakal_d 26c829d766 Merge branch 'main-rc' into b2.3.4 2.3.4 2020-11-30 16:38:04 +01:00
maliakal_d 3fde5c5b55 Merge branch 'main-rc' into b2.3.3 2.3.3 2020-11-30 16:36:24 +01:00
maliakal_d 3e5f546ebe Merge branch 'main-rc' into b2.3.2 2.3.2 2020-11-30 16:26:44 +01:00
maliakal_d 9833a7d330 Merge branch 'main-rc' into b2.3.1 2.3.1 2020-11-30 16:25:23 +01:00
maliakal_d 8f9155e578 Merge branch 'main-rc' into b2.3.0 2.3.0 2020-11-30 16:23:50 +01:00
maliakal_d 9df1eac3c1 Merge branch 'main-rc' into b2.2.0 2.2.0 2020-11-30 15:46:45 +01:00
maliakal_d 5ededf9be4 Merge branch 'main-rc' into b2.1.1 2.1.1 2020-11-30 15:16:57 +01:00
maliakal_d 3e8774798a Merge branch 'main-rc' into b2.1.0 2.1.0 2020-11-30 15:13:43 +01:00
maliakal_d 08ea179519 update client version to 5.0.1 2020-11-25 16:27:28 +01:00
maliakal_d 8e6dfe9b0f update docs 2020-11-25 16:22:24 +01:00
maliakal_d 6901368fd6 release update 2020-11-25 15:42:41 +01:00
maliakal_d 3f1dbb7d67 release update 2020-11-25 15:32:57 +01:00
Erik Frojdh f6126abe31 added cmake in release notes 2020-11-25 10:22:58 +01:00
maliakal_d 1e8dacf9b8 update release 2020-11-24 20:01:37 +01:00
Erik Frojdh 58fb5321f0 WIP 2020-11-23 15:33:10 +01:00
maliakal_d faf885d2e0 python change from tiemstamp to frametime 2020-11-23 11:26:59 +01:00
Erik Frojdh d5dcc8e138 runtime, zmqwhm rx_zmqhwm in python 2020-11-23 09:15:10 +01:00
Erik Frojdh 90a9cea670 better cmake for python and pybind11 2.6.1 2020-11-23 08:57:00 +01:00
Erik Frojdh 2eea1882d2 updated broken python bindings 2020-11-23 08:42:05 +01:00
maliakal_d c6eefac0eb Merge branch 'main' into test 2020-11-20 14:30:32 +01:00
maliakal_d 46e0c0abed Merge branch 'main' into test 2020-11-20 14:29:21 +01:00
maliakal_d a5f0f6eb34 Merge branch 'main' into test 2020-11-20 14:28:29 +01:00
maliakal_d 62c86f56b1 Merge branch 'main' into test 2020-11-20 14:27:25 +01:00
maliakal_d 77080a524a Merge branch 'main' into test 2020-11-20 14:26:37 +01:00
maliakal_d 3dce1e46f9 Merge branch 'main' into test 2020-11-20 14:25:45 +01:00
maliakal_d 08ecc1e52d Merge branch 'main' into test 2020-11-20 14:24:14 +01:00
maliakal_d 8c1974b34e Merge branch 'main' into test 2020-11-20 14:13:20 +01:00
maliakal_d d89d349247 Merge branch 'main' into test 2020-11-20 14:10:35 +01:00
maliakal_d 910961cf41 Merge branch 'main' into test 2020-11-20 14:05:53 +01:00
maliakal_d 595b7aa5e8 Merge branch 'main' into test 2020-11-20 14:03:36 +01:00