451 Commits

Author SHA1 Message Date
08a588bb01 wip: eiger stop acquisition send complete frmes 2021-06-09 12:31:26 +02:00
6ca3f075b7 binaries in after merge fix 2021-06-08 12:31:13 +02:00
74f5c52bc9 binaries in 2021-06-08 08:29:26 +02:00
9e32c746cd WIP 2021-06-07 16:43:39 +02:00
1b068cdf2d wip 2021-06-07 15:06:34 +02:00
16a228415d binaries in 2021-06-07 15:00:56 +02:00
48cef99e62 eiger blocking trigger WIP, new fw, 3 bits: 1 for exp, 1 for falling exp toggle, 1 for rising exp toggle 2021-06-07 15:00:06 +02:00
238b6e8753 binaries in 2021-06-04 17:15:43 +02:00
6949e22bf8 wip 2021-06-04 16:52:48 +02:00
28c1e2491b wip 2021-06-04 16:52:19 +02:00
d33cf25a95 wip 2021-06-04 16:51:36 +02:00
b5790983ce wip 2021-06-04 16:31:51 +02:00
5e17c9c525 Merge branch 'blocktrigger' of github.com:slsdetectorgroup/slsDetectorPackage into blocktrigger 2021-06-04 12:35:53 +02:00
0afe093afc wip 2021-06-04 12:30:59 +02:00
81aa8c9ac5 wip 2021-06-04 10:15:37 +02:00
be6e2d7fb3 binaries in 2021-06-02 17:06:15 +02:00
cf5d2cd97e WIP 2021-06-02 17:05:40 +02:00
cf7828e0ce eiger server: blocking software trigger 2021-06-02 16:59:20 +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
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
6563965787 binaries in 2020-11-17 16:52:49 +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
6838666802 Revert "updating sls subfolder in normal server bianries"
This reverts commit 420343eb31df0eef07c4c194e7428f5c7f0589d1.
2020-11-02 16:36:10 +01:00
420343eb31 updating sls subfolder in normal server bianries 2020-11-02 16:34:23 +01:00
Erik Fröjdh
a15d8dd30a
Moving headers into include/sls (#212) 2020-11-02 16:05:28 +01:00
a310ab9bfa updated all servers 2020-10-09 16:59:46 +02:00
e0e2c2efba updated binaries 2020-10-08 15:55:24 +02:00
33d85dbfc0 all servers compiled 2020-10-08 15:45:29 +02:00
5c0dff29ed binaries in 2020-10-07 12:27:35 +02:00
c2d9532a69 updated versionign server color minor 2020-10-05 09:56:47 +02:00
7855005590 updated 5.0.0-rc2 in binaries 2020-10-05 09:53:13 +02:00
b2f5208745 binaries in 2020-10-02 11:19:19 +02:00
91efecd4ca servers: updated fw-sw api version check error message, m3 and g2: updated min fw version 2020-10-02 11:17:11 +02:00
d028a120bb binaries in 2020-09-18 14:20:05 +02:00
f6dd02acc2 minor print in temp_Fpgafl in eiger 2020-09-18 14:18:19 +02:00
8ef79ce173 binaries in 2020-09-18 11:37:25 +02:00
e91420bd16 locking in list 2020-09-18 11:23:57 +02:00
515a0c05b9 removed locking in locallink 2020-09-18 11:23:46 +02:00
46b75c1429 minor 2020-09-18 11:23:33 +02:00