Commit Graph

2880 Commits

Author SHA1 Message Date
maliakal_d 18fe63f594 wip 2021-06-28 13:32:44 +02:00
maliakal_d 8b22b5dbe7 wip 2021-06-25 17:13:40 +02:00
maliakal_d 1b525abfa1 wip 2021-06-25 17:11:36 +02:00
maliakal_d 47d6ed053c removed slave master difference in stop acquiistion 2021-06-15 16:58:32 +02:00
maliakal_d 994f0a71a6 wip 2021-06-15 16:27:09 +02:00
maliakal_d 22bcac4c0b gotthard stop server should also know if there is a master for ismaster() to work 2021-06-15 14:59:50 +02:00
maliakal_d b11f6c56e7 getmaster through stop server, allowing stopacq to first go to slave for eiger, eiger stop to first check reg value to send complete frames before calling stop 2021-06-15 12:59:54 +02:00
maliakal_d f111ac733b without getmaster, getmaster needs to go to stop server 2021-06-15 12:45:58 +02:00
maliakal_d bdc3a5f3d9 connect ismaster for eiger and gotthard1 and using ismaster to stop master last for eiger 2021-06-09 17:40:05 +02:00
maliakal_d 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
maliakal_d 6f54291a84 documentation, wip 2021-06-08 12:14:06 +02:00
maliakal_d 0afe093afc wip 2021-06-04 12:30:59 +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
maliakal_d c5ee7ac958 tests updated 2021-05-28 15:37:32 +02:00
maliakal_d 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
maliakal_d 54c24b3de7 tests m3 for vth and counters 2021-05-26 19:55:47 +02:00
maliakal_d 0a7b0a6d5e ctb tests dac fixed 2021-05-26 18:57:29 +02:00
maliakal_d a69e6e7faa other detectors dac tests 2021-05-26 18:51:10 +02:00
maliakal_d 2809d2b83d tests dac depreciated fix for m3 2021-05-26 18:37:34 +02:00
Erik Frojdh 085ea3aee7 dont add detector id for .trim 2021-04-27 08:28:05 +02:00
Erik Frojdh c054ad3af3 Merge branch 'my3regs' into developer 2021-04-26 08:39:46 +02:00
brueckner_m d5c10aa3e7 stop command: Support single (half)module stop 2021-04-21 15:40:51 +02:00
Erik Frojdh be5fee8126 M3: fixed gain bits with negative polarity 2021-04-12 16:44:47 +02:00
Erik Frojdh d9cd780386 p gaincap 0 2021-04-12 13:31:10 +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 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
Erik Frojdh 06dbf82e93 clang-format 2020-11-18 18:01:39 +01:00
Erik Frojdh 902919f2df minor 2020-11-18 09:11:48 +01:00
Erik Frojdh 1efdc90719 clean 2020-11-18 08:57:35 +01:00
maliakal_d 7fcac35549 gui exception thrown from acquire caught properly in gui 2020-11-17 17:39:34 +01:00
Erik Frojdh 40f6eb8ede WIP 2020-11-17 15:33:09 +01:00
maliakal_d 146d605d19 gui callback exception caught 2020-11-17 14:01:53 +01:00
maliakal_d 5ee95cf811 tests wip 2020-11-17 11:16:34 +01:00
maliakal_d 59e12bbed8 tests wip 2020-11-17 10:51:40 +01:00
maliakal_d bd76a66770 tests rx_missingpackets not working 2020-11-17 08:52:30 +01:00
maliakal_d f592b98beb tests eiger wip 2020-11-16 19:51:15 +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
maliakal_d b6b9a5d598 updated release notes and changed a few command names, now->runtime, timestamp->frametime, nframes->framecounter, startingfnum->startframenumber 2020-11-12 16:48:49 +01:00
Erik Fröjdh 121a3ad733 Static libraries (#213) 2020-11-03 18:54:11 +01:00
Erik Frojdh f6fff9d916 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-11-03 08:44:37 +01:00
Erik Frojdh 707601832f minor fix to build 2020-11-03 08:44:29 +01:00
maliakal_d 5687bdd6a2 test fix 2020-11-02 18:30:36 +01:00
maliakal_d e7a1960741 test fix 2020-11-02 18:27:10 +01:00
maliakal_d 64be2e0297 test fix 2020-11-02 18:23:56 +01:00
maliakal_d 66df5fe8ee test fix 2020-11-02 18:17:35 +01:00