Commit Graph

60 Commits

Author SHA1 Message Date
maliakal_d 05b7e0ef42 conflict merge fix 2021-07-22 11:53:00 +02:00
maliakal_d da996314e7 merge conflict 2021-07-22 11:15:57 +02:00
maliakal_d af16ad4040 vetoalg: wip 2021-07-20 12:58:05 +02:00
Erik Frojdh 09391b767a support for scoped enums and operators in Python 2021-07-16 14:48:22 +02:00
Erik Frojdh 779a2a0199 CSR in trim files 2021-04-01 08:09:04 +02:00
Erik Frojdh fa25340e5c allow bitwise op on the gain cap 2021-03-29 16:14:10 +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 0b0f5c94d5 master file no index 2020-09-23 16:28:50 +02:00
Erik Frojdh 6d01348bf4 removed setClockFrequency and added some python commands 2020-09-17 16:03:58 +02:00
Erik Frojdh e8cd75a6ac more python commands 2020-09-17 15:10:02 +02:00
Erik Frojdh d70090967d python funcs 2020-09-10 16:47:34 +02:00
Erik Frojdh c94dfde17c updated compare script 2020-09-10 15:48:25 +02:00
Erik Frojdh b879a377ba python cmds 2020-09-10 15:28:29 +02:00
Erik Frojdh 2bc33ad34a default value for setDAC 2020-09-10 14:45:31 +02:00
Erik Frojdh 2733bc5320 added now 2020-09-10 14:02:25 +02:00
Erik Frojdh a95d8f664a added slowadc to python 2020-09-10 12:16:25 +02:00
Erik Frojdh 9ee67f2cfa python rx_jsonpara 2020-09-07 16:23:28 +02:00
Erik Frojdh 7048a75808 triggersl and print fix for acq 2020-09-03 16:21:15 +02:00
Erik Frojdh 22f14cacb0 virtual and vetofile 2020-09-03 15:33:12 +02:00
Erik Frojdh 508ec150f5 added Gotthard and Moench 2020-08-25 15:48:56 +02:00
Erik Frojdh e782fcce62 added gotthard2 2020-08-20 16:49:55 +02:00
Erik Frojdh a7cc2b38d8 temperature reading for eiger 2020-08-20 11:46:35 +02:00
Erik Frojdh 6e4b7f5bd7 fixed space in python enums 2020-08-03 11:10:01 +02:00
Erik Frojdh 104d91e8c6 more jf stuff 2020-05-28 11:33:52 +02:00
Erik Frojdh f4ba46c19b update function and enum generation 2020-05-26 11:26:24 +02:00
maliakal_d d488f4bea8 updated all receiver testing 2020-03-27 16:59:16 +01:00
Erik Frojdh 597c359ef8 added overload signatures in python binding 2020-03-19 17:12:35 +01:00
Erik Frojdh 75e083ae46 find tests and commands 2020-03-03 11:04:05 +01:00
Erik Frojdh 95d56ad545 lookup 2020-03-02 11:57:35 +01:00
Erik Frojdh dd84337ef3 autogen enums 2020-01-23 11:45:33 +01:00
maliakal_d f881133795 get/set timing, generate data for gotthard2, vref_rstore instead of restore for gotthard2 2020-01-22 18:18:56 +01:00
Erik Frojdh 5667353f47 WIP 2020-01-21 09:07:27 +01:00
Erik Frojdh 0194d7ba1c ctb 2020-01-20 16:37:18 +01:00
Erik Frojdh 30a4a1740f added Mythen3 2020-01-15 17:56:08 +01:00
Erik Frojdh 39ec29c0e6 added counters to python 2020-01-15 17:26:07 +01:00
Erik Frojdh 70c54f4315 added jungfrau again 2020-01-13 18:26:24 +01:00
Erik Frojdh 8c8d213b56 python funcs 2020-01-13 16:13:47 +01:00
Erik Frojdh dac5ecd123 dbit 2020-01-08 16:44:42 +01:00
Erik Frojdh 71b0ed271e CTB 2020-01-08 15:33:28 +01:00
Erik Frojdh c223f00511 Eiger 2020-01-08 14:55:16 +01:00
Erik Fröjdh ed2a69744b Auto generating Python bindings (#70)
Auto generating python bindings
2020-01-07 15:47:38 +01:00
Erik Frojdh 1322cff405 some eiger dacs 2019-11-26 21:37:57 +01:00
Erik Frojdh eaae54ebf5 fixed script for py36 2019-11-25 15:13:48 +01:00
Erik Frojdh a2dd35ae38 minor 2019-11-25 13:01:07 +01:00
Erik Frojdh e00c5068af added list of tests 2019-11-25 12:53:45 +01:00
Erik Frojdh 2f2e4da628 Moved CmdLineProxy 2019-11-05 11:07:07 +01:00
Erik Frojdh b3587bcee5 new enums 2019-11-05 10:20:25 +01:00
Dhanya Thattil 995f0924e5 Commandline (#66)
* WIP

* WIP

* removed status to string from defs

* WIP

* WIP

* WIP removed unused functions in multi

* WIP

* print hex in a terrible way

* WIP, loadconfig error

* WIP, type to string

* WIP

* fix to conversion

* WIP, hostname doesnt work

* WIP

* WIP

* WIP

* WIP, threshold

* WIP, threshold

* WIP

* WIP, triggers

* WIP, cycles to triggers

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* rx_udsocksize fx, WIP

* WIP

* WIP

* WIP

* file index (64 bit), WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* merge

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* New python mod
2019-10-21 10:29:06 +02:00