106 Commits

Author SHA1 Message Date
9370fd3ab0 refactor 2021-08-03 20:13:25 +02:00
9c4ecf0506 jungfrau: comp disable time 2021-08-03 13:12:58 +02:00
9ed3a294ce jungfrau: gainmode 2021-08-02 12:44:57 +02:00
Erik Frojdh
a31b741f7b added python 2021-07-30 10:08:33 +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
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
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
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
Erik Frojdh
be5fee8126 M3: fixed gain bits with negative polarity 2021-04-12 16:44:47 +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
Erik Fröjdh
10b315c2bd
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
2021-02-08 13:28:37 +01:00
Dhanya Thattil
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
Dhanya Thattil
a62e068a9a
M3defaultpattern (#227)
* default pattern for m3 and moench including Python bindings

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2020-12-09 13:28:39 +01:00
Erik Frojdh
7a2827f693 additional constructors for scanPrameters in python 2020-12-04 13:50:08 +01:00
Erik Frojdh
a6e23b0509 added scanParameters in Python 2020-12-01 18:40:45 +01:00
Erik Frojdh
d69e238e67 Python binding for Pattern 2020-11-27 17:05:39 +01:00
Erik Frojdh
d9b2a90651 Introduced pattern class 2020-11-27 10:03:15 +01:00
Erik Frojdh
8ca1d9c50c python wrapper 2020-11-26 14:44:39 +01:00
Dhanya Thattil
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
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
Dhanya Thattil
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
Erik Frojdh
0b0f5c94d5 master file no index 2020-09-23 16:28:50 +02:00
Erik Frojdh
6d01348bf4 removed setClockFrequency and added some python commands 2020-09-17 16:03:58 +02:00
Erik Frojdh
2bc33ad34a default value for setDAC 2020-09-10 14:45:31 +02:00
Erik Frojdh
a0f9c6fe8c updated python API 2020-09-09 15:15:36 +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
Erik Fröjdh
7eafceb0f9
Exposing vector of strings for loading parameters (#147) 2020-08-27 16:17:56 +02:00
Erik Frojdh
6cd8bbcb12 python templist 2020-08-20 15:23:15 +02:00
Erik Frojdh
8ef6f32be6 example and updated python bindings 2020-08-20 12:19:35 +02:00
Erik Frojdh
6e4b7f5bd7 fixed space in python enums 2020-08-03 11:10:01 +02:00
Erik Frojdh
35f95e603e removed patternClockControl removed from python 2020-06-23 11:45:13 +02:00
Erik Frojdh
f366e9ae6f fixed python enums 2020-06-19 14:14:52 +02:00
Erik Frojdh
f66345d128 removed store in ram from python 2020-06-18 15:36:43 +02:00
Dhanya Thattil
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
Erik Frojdh
e2eb1598d3 jf stuff 2020-05-28 09:28:53 +02:00
Erik Frojdh
6c753f3b50 veto 2020-05-28 08:48:11 +02:00
Erik Frojdh
f4ba46c19b update function and enum generation 2020-05-26 11:26:24 +02:00