381 Commits

Author SHA1 Message Date
cf257cbc65 merge fix 2021-08-06 15:08:21 +02:00
7bf6cc3995 wip 2021-08-06 13:25:55 +02:00
7bf03c02b7 python filterresitor 2021-08-06 09:01:51 +02:00
074178848e minor 2021-08-05 17:29:43 +02:00
86126c7e27 filter resistor in 2021-08-05 16:56:53 +02:00
619f3b71c1 flippeddataoverxaxis changed to flipRows 2021-08-05 14:44:25 +02:00
c5d6dd0dd4 flippeddatax for jungfrau server 2021-08-05 12:39:04 +02:00
acd12bf2fa minor 2021-08-05 10:08:41 +02:00
3802f22ebe wip 2021-08-04 14:03:27 +02:00
0e5e0f346b rewrote settings enums, gainmode enums 2021-08-04 13:07:48 +02:00
6dfcd9607f Merge branch 'jungfrau1.1' into j11udpate 2021-08-03 20:31:43 +02:00
9370fd3ab0 refactor 2021-08-03 20:13:25 +02:00
0666afc642 added the other gain modes 2021-08-03 18:02:42 +02:00
9c4ecf0506 jungfrau: comp disable time 2021-08-03 13:12:58 +02:00
Erik Frojdh
9c04344b79 automatically import enums to slsdet 2021-08-02 16:21:05 +02:00
9ed3a294ce jungfrau: gainmode 2021-08-02 12:44:57 +02:00
d64df39301 storagecells for jungfrauvchip1.1: cannot set addl, storagecelldealy and storagecell start is only from 0-3 2021-07-30 15:32:36 +02:00
Erik Frojdh
a31b741f7b added python 2021-07-30 10:08:33 +02:00
d9ff946b1d jungfrau: special dacs have defined values for settings. getsettings give undefined if different values for special dacs 2021-07-28 16:44:57 +02:00
7535ea315b jungfrau server: chip configuration only for chip v 1.1 2021-07-27 18:16:30 +02:00
cce2511f7a removed forceswitch enum, removed fixgain1 and 2 from jungfrau settings (kept enum for g2 2021-07-23 17:12:48 +02:00
61a99c70df j: configurechip 2021-07-23 14:08:20 +02:00
cb293f9945 j: 1. chipversion 2021-07-22 16:48:35 +02:00
05b7e0ef42 conflict merge fix 2021-07-22 11:53:00 +02:00
da996314e7 merge conflict 2021-07-22 11:15:57 +02:00
Erik Frojdh
a301e223e9 python for datastream 2021-07-21 16:31:32 +02:00
10455b284e minor comment in python 2021-07-21 15:41:52 +02:00
Erik Frojdh
ae0d1cc0d4 python support for vetoalg 2021-07-21 14:38:45 +02:00
af16ad4040 vetoalg: wip 2021-07-20 12:58:05 +02:00
Erik Frojdh
09391b767a support for scoped enums and operators in Python 2021-07-16 14:48:22 +02:00
8354395f64 wip 2021-07-15 13:44:42 +02:00
18fe63f594 wip 2021-06-28 13:32:44 +02:00
0b2a4a879e removed masterflags enum, especially in gotthard server 2021-06-10 12:10:17 +02:00
2be8ee8079 udpated in python 2021-06-09 11:42:46 +02:00
6f54291a84 documentation, wip 2021-06-08 12:14:06 +02:00
Erik Frojdh
be5fee8126 M3: fixed gain bits with negative polarity 2021-04-12 16:44:47 +02:00
Erik Frojdh
779a2a0199 CSR in trim files 2021-04-01 08:09:04 +02:00
Erik Frojdh
fa25340e5c allow bitwise op on the gain cap 2021-03-29 16:14:10 +02:00
Erik Frojdh
7d605c2c87 names 2021-03-29 14:50:08 +02:00
Erik Frojdh
043d582616 initial implementation 2021-03-29 14:21:48 +02:00
Erik Frojdh
7c4f9ee044 read back of csr 2021-03-26 17:46:11 +01: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>
2021-03-22 14:43:11 +01:00
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
Dhanya Thattil
a6d696a0f8
Nextframenumber (#215) 2020-11-16 17:26:12 +01:00
Erik Fröjdh
a15d8dd30a
Moving headers into include/sls (#212) 2020-11-02 16:05:28 +01:00
Erik Frojdh
c0be5ab8cb merge args fix 2020-09-25 11:55:55 +02:00
Erik Frojdh
30f4c80031 fix 2020-09-25 11:00:51 +02:00