228 Commits

Author SHA1 Message Date
cc3aede979 merge fix 2021-08-06 16:11:58 +02:00
2c53a134cd updated i3gbe to lll 2021-08-06 16:08:07 +02:00
2934ccbf2c filter cell (only chipv1.1) 2021-08-06 14:42:41 +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
e20022f139 jungfrau: settings should not be validated to undefined when special dacs are set individually 2021-08-03 14:51:00 +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
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
9c03e83ef1 reset default dacs 2021-07-29 16:34:38 +02:00
e5b17fb8e2 wip 2021-07-29 12:45:05 +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
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
8ba37e99a7 added enum left right top bottom 2021-07-21 09:25:27 +02:00
ec7ba7c508 wip to change to enum for portposition 2021-07-20 16:05:08 +02:00
e02493d4e4 veotalg for g2 2021-07-20 14:57:31 +02:00
780d4bfe0a gotthard2: vetostream (detector: only 3gbe, 10gbe via numudpinterfaces) 2021-07-15 16:21:17 +02:00
cbdb05a3a8 wip 2021-07-01 15:11:22 +02:00
18fe63f594 wip 2021-06-28 13:32:44 +02:00
755738a42e wip 2021-06-22 20:50:50 +02:00
137b0cc288 merge from developer 2021-06-21 16:34:42 +02:00
5ca4c7f943 merged from developer 2021-06-21 16:32:36 +02:00
9c19fc3272 wip 2021-06-21 13:39:20 +02:00
789d0df81c wip 2021-06-21 12:31:35 +02:00
665a3be6d8 wip 2021-06-18 19:38:47 +02:00
fd2cc856b8 wip 2021-06-18 12:25:14 +02:00
2ae2f84441 wip 2021-06-17 17:39:49 +02:00
028edd0d08 wip 2021-06-17 07:13:27 +02:00
a9f892483d wip 2021-06-11 17:29:01 +02:00
bdc3a5f3d9 connect ismaster for eiger and gotthard1 and using ismaster to stop master last for eiger 2021-06-09 17:40:05 +02:00
45992b28a5 merge fix 2021-06-08 12:29:33 +02:00
1e640d90de refactor minor 2021-06-08 09:47:15 +02:00
0afe093afc wip 2021-06-04 12:30:59 +02:00
daae52ca63 m3: vthreshold set/get only enabled counters but remember value, vth always overwrite, disable counter sets vth to 2800, enable counter sets saved values 2021-05-27 17:25:55 +02:00
3079e41c3b all loading pattern so far takes in logDEBUG5 print level as it is at detector start up. commands to call loadpattern can call logINFO level 2021-05-26 12:59:19 +02:00
224c8d9f8d m3 server: setting counter mask, set vth[i] for counter[i] and its M_VTH1, not VTH1 2021-05-20 14:51:37 +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
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
63259ec5c8 Modified my3 functions for the pattern generator and moved to separate file; created loadPattern function - but should still be used in readDefaultPattern 2021-02-26 16:53:30 +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
a12dd153ef WIP 2020-11-25 15:29:46 +01:00