166 Commits

Author SHA1 Message Date
7552ea1e75 merge fix 2021-08-06 16:43:00 +02:00
dc921733d0 merge fix 2021-08-06 16:41:39 +02:00
e92270565b changed gain mode. dynamic_gain_mode to dynamic only. binaries in 2021-08-06 16:38:05 +02:00
dd3f2db3c5 binaries in, merge fix 2021-08-06 16:18:28 +02:00
e62fc1907f binaries in, merge fix 2021-08-06 16:16:25 +02:00
67916cc188 binaries in, merge fix 2021-08-06 16:14:53 +02:00
f9dc668ba4 binaries in 2021-08-06 16:12:20 +02:00
Dhanya Thattil
bdffcb1cf1
Revert "Revert "J9compdisable"" 2021-08-02 17:15:46 +02:00
Dhanya Thattil
4a2d76164f
Revert "J9compdisable" 2021-08-02 17:11:03 +02:00
c57caa4931 Wbinaries in 2021-08-02 16:49:01 +02:00
c10dc203b2 binaries in 2021-08-02 12:45:56 +02:00
e28d19f5be binaries in 2021-07-29 15:57:37 +02:00
6997a96aa4 binaries in 2021-07-29 12:52:48 +02:00
7a54ee8ea3 binaries in 2021-07-29 10:10:49 +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
41bbe4e3cf merge conflict fix 2021-07-27 18:19:41 +02:00
a909874a15 binaries in 2021-07-27 18:17:13 +02:00
8cc9cd1c75 merge conflict fix 2021-07-27 17:58:01 +02:00
b15b66b82d jungfrau: chip1.1 incompatible with HW 1.0 2021-07-27 17:46:48 +02:00
6461fddc5d minor: server config fname size constst: binaries in 2021-07-27 17:38:02 +02:00
adf690cdcd merge fix conflict 2021-07-27 17:11:06 +02:00
61a99c70df j: configurechip 2021-07-23 14:08:20 +02:00
0148710c4e binaries in 2021-07-23 11:01:42 +02:00
da4d47052d binaries in 2021-07-22 14:01:26 +02:00
5b05a30287 merge conflict fix 2021-07-22 13:52:55 +02:00
97ff58c978 binaries in 2021-07-22 13:48:17 +02:00
86d1a18ca1 binaries in 2021-07-14 15:28:53 +02:00
1ab3bb8496 bianries in 2021-06-21 16:35:31 +02:00
d0faf64014 binaries in 2021-06-21 16:21:51 +02:00
Erik Frojdh
7a67d7e88a minor cmake and servers now reflect developer 2021-03-23 10:54:01 +01:00
Erik Frojdh
60e3fb8aab fixing conflics after merging back release to developer 2021-03-23 10:50:09 +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
e8fe203940
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.

The new server has been compiled

Co-authored-by: lopez_c <carlos.lopez-cuenca@psi.ch>
2021-02-25 10:26:39 +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
1ce56764fa binaries in 2020-11-30 13:59:55 +01:00
e382df21b9 updated binaries, links in serverBin and deleted v5.0.0 binaries 2020-11-27 14:26:15 +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
10fa57ebb9 binaries updated to reflected developer branch 2020-11-19 16:44:40 +01:00
8be579ea53 binaries name changed 2020-11-17 18:41:18 +01:00
73d582744e updated binaries for 5.0.0 2020-11-17 16:49:03 +01:00
980d76a15a binaries in 2020-11-17 11:03:16 +01:00
121450b8cc binaries in 2020-11-17 11:02:23 +01:00
Dhanya Thattil
a6d696a0f8
Nextframenumber (#215) 2020-11-16 17:26:12 +01:00
Dhanya Thattil
4c4e2ccb6b
Defaultdacs (#214) 2020-11-13 08:31:02 +01:00
98fce317a8 binaries in 2020-11-02 16:39:06 +01:00
a86d70235c binaries in 2020-10-16 15:03:56 +02:00
c1c885edd2 merge conflict resolved 2020-10-09 17:07:01 +02:00
a310ab9bfa updated all servers 2020-10-09 16:59:46 +02:00
95f816ad64 binaries in 2020-10-09 15:06:14 +02:00
e0e2c2efba updated binaries 2020-10-08 15:55:24 +02:00