Commit Graph

293 Commits

Author SHA1 Message Date
maliakal_d 0e5e0f346b rewrote settings enums, gainmode enums 2021-08-04 13:07:48 +02:00
maliakal_d 550810a3ca wip 2021-08-03 20:47:26 +02:00
maliakal_d 9370fd3ab0 refactor 2021-08-03 20:13:25 +02:00
maliakal_d 9c4ecf0506 jungfrau: comp disable time 2021-08-03 13:12:58 +02:00
maliakal_d 9ed3a294ce jungfrau: gainmode 2021-08-02 12:44:57 +02:00
maliakal_d 6c15f5216d Merge branch 'jungfrau1.1' into j5resetdacs 2021-07-29 18:10:40 +02:00
maliakal_d fc7efb2410 refactor 2021-07-29 18:08:41 +02:00
maliakal_d 9f11dae703 fix 2021-07-29 17:26:45 +02:00
maliakal_d 9c03e83ef1 reset default dacs 2021-07-29 16:34:38 +02:00
maliakal_d de7f4489af defaultdac upto detector side, settings is undefined when none given 2021-07-28 20:11:58 +02:00
maliakal_d cce2511f7a removed forceswitch enum, removed fixgain1 and 2 from jungfrau settings (kept enum for g2 2021-07-23 17:12:48 +02:00
maliakal_d cb293f9945 j: 1. chipversion 2021-07-22 16:48:35 +02:00
maliakal_d 5b05a30287 merge conflict fix 2021-07-22 13:52:55 +02:00
maliakal_d 3d47db7e60 bug fix for virtual datastream and client 2021-07-22 13:47:18 +02:00
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 8ba37e99a7 added enum left right top bottom 2021-07-21 09:25:27 +02:00
maliakal_d ec7ba7c508 wip to change to enum for portposition 2021-07-20 16:05:08 +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
maliakal_d 7158dab9f5 fix to ensure numinterfaces is not called for g2 2021-07-15 17:03:29 +02:00
maliakal_d 780d4bfe0a gotthard2: vetostream (detector: only 3gbe, 10gbe via numudpinterfaces) 2021-07-15 16:21:17 +02:00
maliakal_d 4d7fb4e4e0 wip 2021-07-15 14:48:41 +02:00
maliakal_d 8354395f64 wip 2021-07-15 13:44:42 +02:00
maliakal_d cbdb05a3a8 wip 2021-07-01 15:11:22 +02:00
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 61c5018a46 wip 2021-06-23 10:28:14 +02:00
maliakal_d 755738a42e wip 2021-06-22 20:50:50 +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 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 0afe093afc wip 2021-06-04 12:30:59 +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 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
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
Erik Fröjdh a15d8dd30a Moving headers into include/sls (#212) 2020-11-02 16:05:28 +01:00
Dhanya Thattil 47018b61cd M3readout (#209)
* m3: readout command
2020-10-26 16:13:48 +01:00
maliakal_d 6c1035aa99 zmq hwm are specified to 2 for gui and restreaming of receiver if all zmq not closed at end of acquiistion 2020-10-08 13:01:01 +02:00
maliakal_d 688fe4e3f7 fix zmqport and rx_zmqport, must restart zmq streaming 2020-10-07 14:17:34 +02:00
Dhanya Thattil fe81963873 rxr: udp socket size max of INT_MAX/2 (#191) 2020-09-25 10:15:39 +02:00
Dhanya Thattil 2c1fddee84 Cmddacs (#189)
Moved dacs to it's own command for command line. 
Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2020-09-24 17:16:34 +02:00
Erik Frojdh 0b0f5c94d5 master file no index 2020-09-23 16:28:50 +02:00