710 Commits

Author SHA1 Message Date
08a588bb01 wip: eiger stop acquisition send complete frmes 2021-06-09 12:31:26 +02:00
e00c62a7a5 m3 server: fixed absolute addressing for isMaster 2021-06-08 11:37:11 +02:00
6e9ad425f8 binaries in 2021-06-08 09:49:10 +02:00
1e640d90de refactor minor 2021-06-08 09:47:15 +02:00
65b022a946 binaries in 2021-05-28 15:39:02 +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
47c3d7fc47 binaries in 2021-05-26 13:00:11 +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
89898beced m3:different exception message for vths when counter disabled 2021-05-26 12:23:46 +02:00
240ec12485 binaries in 2021-05-25 16:46:56 +02:00
ff4472aecf Merge branch 'm3dacfix' of github.com:slsdetectorgroup/slsDetectorPackage into m3dacfix 2021-05-25 16:46:08 +02:00
d9525e9a92 m3: vthreshold and vthx gives correct exception messages (binaries not in) 2021-05-25 16:46:01 +02:00
bd8f51fb1a binaries in 2021-05-25 15:04:02 +02:00
9ac836c2f4 setting vthreshold exception message fix when not all counters enabled, appropriate message 2021-05-25 15:03:05 +02:00
45e7187e7c binaries in 2021-05-25 11:25:27 +02:00
a6a2a91fea m3 server: refactor 2021-05-20 16:46:10 +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
55b4a92453 using setChipStatusRegister 2021-04-07 16:27:40 +02:00
Erik Frojdh
779a2a0199 CSR in trim files 2021-04-01 08:09:04 +02:00
Erik Frojdh
01c785271f WIP 2021-03-31 16:26:36 +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
7004f43a9a Merge branch 'developer' into my3regs 2021-03-23 11:44:52 +01: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
7955426682 my3: added function to change the gain + some functions for my3 flags added 2021-02-26 18:02:48 +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
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
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
e382df21b9 updated binaries, links in serverBin and deleted v5.0.0 binaries 2020-11-27 14:26:15 +01:00
8e773c97dd pattern load and save works 2020-11-27 14:19:38 +01:00
0eb204bfd3 compile for servers too 2020-11-27 12:37:22 +01:00
a12dd153ef WIP 2020-11-25 15:29:46 +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
Erik Frojdh
06dbf82e93 clang-format 2020-11-18 18:01:39 +01:00
e852158b83 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-11-17 19:23:36 +01:00
f48eff49e9 gotthard2 server config file modified 2020-11-17 19:23:28 +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
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
4385df18b7 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-11-17 11:02:32 +01:00
121450b8cc binaries in 2020-11-17 11:02:23 +01:00
e7ecb38b29 gotthard2 bug fix vetophoton server client api 2020-11-17 11:01:17 +01:00