Commit Graph

148 Commits

Author SHA1 Message Date
maliakal_d 25d03f949e partialread changed to readnrows 2021-08-31 16:46:49 +02:00
maliakal_d c4c16ad9c0 wip 2021-08-17 14:05:59 +02:00
maliakal_d f72f678d45 Merge branch 'developer' into roundrobin 2021-08-17 11:06:13 +02:00
maliakal_d 5f8dc7a7f0 fixes 2021-08-16 14:30:47 +02:00
maliakal_d 5790e4961b wip 2021-08-13 17:10:46 +02:00
maliakal_d 62d697e91f readnlines->partialread, better debugging for TCP socket interface bug 2021-08-13 12:34:50 +02:00
maliakal_d ec01f98c26 wip 2021-08-12 17:37:55 +02:00
maliakal_d 7a76064223 vetoalg added hits and raw 2021-08-11 16:08:32 +02:00
maliakal_d c7293f88d0 done 2021-08-10 21:01:36 +02:00
maliakal_d fce35e35a1 wip 2021-08-10 17:26:26 +02:00
maliakal_d dc921733d0 merge fix 2021-08-06 16:41:39 +02:00
maliakal_d e92270565b changed gain mode. dynamic_gain_mode to dynamic only. binaries in 2021-08-06 16:38:05 +02:00
maliakal_d e62fc1907f binaries in, merge fix 2021-08-06 16:16:25 +02:00
maliakal_d 67916cc188 binaries in, merge fix 2021-08-06 16:14:53 +02:00
maliakal_d cc3aede979 merge fix 2021-08-06 16:11:58 +02:00
maliakal_d 2c53a134cd updated i3gbe to lll 2021-08-06 16:08:07 +02:00
maliakal_d 619f3b71c1 flippeddataoverxaxis changed to flipRows 2021-08-05 14:44:25 +02:00
maliakal_d 3802f22ebe wip 2021-08-04 14:03:27 +02:00
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 0666afc642 added the other gain modes 2021-08-03 18:02:42 +02:00
maliakal_d 9ed3a294ce jungfrau: gainmode 2021-08-02 12:44:57 +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 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 4d7fb4e4e0 wip 2021-07-15 14:48:41 +02:00
maliakal_d 8354395f64 wip 2021-07-15 13:44:42 +02:00
maliakal_d fdf6632356 wip 2021-07-05 15:20:34 +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 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
maliakal_d 95fe1720c0 removed commented out lines 2020-11-27 14:44:15 +01:00
maliakal_d d4518b2ca3 WIP 2020-11-27 13:56:57 +01:00
maliakal_d fd3108a61b WIP 2020-11-27 12:46:54 +01:00
Erik Frojdh d9b2a90651 Introduced pattern class 2020-11-27 10:03:15 +01:00
maliakal_d 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
maliakal_d ddf43dbd24 fix for Eiger firmware sending bad packets of size 8 bytes when doing a stop 2020-11-17 16:12:30 +01:00
Erik Fröjdh a15d8dd30a Moving headers into include/sls (#212) 2020-11-02 16:05:28 +01:00
maliakal_d cefddff848 scan trimbits_scan changed to trimbits 2020-10-20 12:31:08 +02:00
maliakal_d a838830090 ran tests and fixed 2020-10-08 15:44:15 +02: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
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
maliakal_d 8e49a114db moench: removed api that goes only to processor (future: one has to use rX_jsonaddheader or rx_jsonpara to set key and values) 2020-09-08 12:34:56 +02:00