1069 Commits

Author SHA1 Message Date
54b9b9938c binaries in after merge conflict 2021-07-01 14:35:29 +02:00
9d666da4cf binaries in 2021-06-28 13:33:24 +02:00
18fe63f594 wip 2021-06-28 13:32:44 +02:00
c63f3b327f wip 2021-06-25 17:20:34 +02:00
61d62c57bc binaries in 2021-06-25 15:43:06 +02:00
69be046131 wip 2021-06-24 17:56:07 +02:00
755738a42e wip 2021-06-22 20:50:50 +02:00
1ab3bb8496 bianries in 2021-06-21 16:35:31 +02:00
137b0cc288 merge from developer 2021-06-21 16:34:42 +02:00
e4bf8a5d97 binaries in 2021-06-21 16:33:28 +02:00
5ca4c7f943 merged from developer 2021-06-21 16:32:36 +02:00
d0faf64014 binaries in 2021-06-21 16:21:51 +02:00
789d0df81c wip 2021-06-21 12:31:35 +02:00
ceeb4400a0 removing send complete frames fromstop acquisition 2021-06-16 10:25:49 +02:00
74ca9d6fcc binaries in 2021-06-15 16:57:23 +02:00
bfdd62253a binaries in 2021-06-15 15:00:15 +02:00
d0b2c13fa3 binaries in 2021-06-15 11:50:21 +02:00
d0d9ffb3b6 binaries in 2021-06-10 12:11:45 +02:00
2b8e4c8981 Merge branch 'stopacq' of github.com:slsdetectorgroup/slsDetectorPackage into stopacq 2021-06-10 12:10:28 +02:00
0b2a4a879e removed masterflags enum, especially in gotthard server 2021-06-10 12:10:17 +02:00
6fa9d7f367 binaries in 2021-06-09 17:41:54 +02:00
6ca3f075b7 binaries in after merge fix 2021-06-08 12:31:13 +02:00
45992b28a5 merge fix 2021-06-08 12:29:33 +02:00
Dhanya Thattil
ac5dece221
Merge pull request #242 from slsdetectorgroup/m3dacfix
m3dacfix
2021-06-08 12:19:46 +02:00
6e9ad425f8 binaries in 2021-06-08 09:49:10 +02:00
16a228415d binaries in 2021-06-07 15:00:56 +02:00
238b6e8753 binaries in 2021-06-04 17:15:43 +02:00
5e17c9c525 Merge branch 'blocktrigger' of github.com:slsdetectorgroup/slsDetectorPackage into blocktrigger 2021-06-04 12:35:53 +02:00
be6e2d7fb3 binaries in 2021-06-02 17:06:15 +02:00
Erik Fröjdh
201d304874
Better control of what is built (#247)
* allow for build only detector libs

* allow receiver libs only

* option for shared libraries
2021-06-02 16:09:28 +02:00
65b022a946 binaries in 2021-05-28 15:39:02 +02:00
47c3d7fc47 binaries in 2021-05-26 13:00:11 +02:00
45e7187e7c binaries in 2021-05-25 11:25:27 +02:00
Erik Frojdh
ac613171ec added conda pkgs for moench 2021-05-11 10:22:15 +02:00
Erik Frojdh
be5fee8126 M3: fixed gain bits with negative polarity 2021-04-12 16:44:47 +02:00
Erik Frojdh
0299d315d5 added command line option 2021-04-01 10:06:37 +02:00
Erik Frojdh
01c785271f WIP 2021-03-31 16:26:36 +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 Frojdh
2b3b5af303 report developer as version 2021-03-23 11:44:25 +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
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
1ce56764fa binaries in 2020-11-30 13:59:55 +01:00
95fe1720c0 removed commented out lines 2020-11-27 14:44:15 +01:00
e382df21b9 updated binaries, links in serverBin and deleted v5.0.0 binaries 2020-11-27 14:26:15 +01:00
d4518b2ca3 WIP 2020-11-27 13:56:57 +01:00