Commit Graph

7078 Commits

Author SHA1 Message Date
maliakal_d efe26b2b0d minor enum modif 2021-07-20 14:59:42 +02:00
maliakal_d e02493d4e4 veotalg for g2 2021-07-20 14:57:31 +02:00
maliakal_d af16ad4040 vetoalg: wip 2021-07-20 12:58:05 +02:00
Dhanya Thattil 206c48c7a0 Merge pull request #264 from slsdetectorgroup/g2features
vetostream
2021-07-20 10:01:02 +02:00
Erik Frojdh 09391b767a support for scoped enums and operators in Python 2021-07-16 14:48:22 +02:00
maliakal_d 1b348f9b3a binaries in 2021-07-15 21:17:29 +02:00
maliakal_d 5e685ea5a6 resolving merge from 5.2.0-rc 2021-07-15 21:16:42 +02:00
Dhanya Thattil 4fd949a833 Merge pull request #259 from slsdetectorgroup/g2timejreset
G2timejreset
2021-07-15 21:06:09 +02:00
maliakal_d 3922789245 Merge branch 'g2features' of github.com:slsdetectorgroup/slsDetectorPackage into g2features 2021-07-15 17:03:36 +02:00
maliakal_d 7158dab9f5 fix to ensure numinterfaces is not called for g2 2021-07-15 17:03:29 +02:00
maliakal_d c3ad736d3c binaries in 2021-07-15 16:28:40 +02:00
maliakal_d 780d4bfe0a gotthard2: vetostream (detector: only 3gbe, 10gbe via numudpinterfaces) 2021-07-15 16:21:17 +02:00
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
maliakal_d 1870ee8ae3 Merge branch '5.2.0-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 5.2.0-rc 2021-07-14 15:42:59 +02:00
maliakal_d 823ceff328 minor 2021-07-14 15:42:53 +02:00
maliakal_d 86d1a18ca1 binaries in 2021-07-14 15:28:53 +02:00
maliakal_d 016d0d7fac jungfrau server: temporary fix made to reset core when stopping state machine. problem: stopping in trigger mode and then switching to auto mode blocks data streaming from detector 2021-07-14 15:28:09 +02:00
maliakal_d 8308d2833d Merge branch '5.2.0-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 5.2.0-rc 2021-07-14 15:21:26 +02:00
maliakal_d 6c0795ea63 done with all tests for time parameters for g2 2021-07-14 15:21:10 +02:00
maliakal_d 76ca4374e4 added tests to check time parameters tolerance for g2 2021-07-14 15:10:52 +02:00
maliakal_d e1c76fb04a binaries in 2021-07-14 12:27:30 +02:00
maliakal_d 2d182f3cee gotthard2 server: tolerance in time parameters fixed by adding 0.5 2021-07-14 12:26:29 +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