Commit Graph
127 Commits
Author SHA1 Message Date
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 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
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
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
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öjdhandGitHub 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 ThattilandGitHub fe81963873 rxr: udp socket size max of INT_MAX/2 (#191) 2020-09-25 10:15:39 +02:00
Dhanya ThattilandGitHub 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
maliakal_d 503f83e8e3 Merge branch 'developer' into g2continuous 2020-09-07 17:07:09 +02:00
maliakal_d b20720686e gotthard2: changed order of burst mode enums, added a 4th burst mode cw internal burst mode 2020-09-07 16:13:33 +02:00
maliakal_d 5b182469a1 rxr: fixed all updates from rxParameters, connected them in masterAttributes, added json header and scan parametes in metadata 2020-09-04 13:49:30 +02:00
maliakal_d ffd694eda1 temlist and tempvalues added 2020-08-20 15:16:28 +02:00
maliakal_d de69e666a9 progress changed to double 2020-08-14 12:16:35 +02:00
maliakal_d 0c7759d7e4 formatting 2020-08-11 17:09:36 +02:00
maliakal_d 7b6f4d0b5b rxr chrono 2020-08-05 12:07:45 +02:00
Erik Frojdh 3301a80d99 send string 2020-08-04 15:38:38 +02:00
maliakal_d 4702a76235 Merge branch 'developer' into eiger 2020-07-31 17:15:07 +02:00
Erik Frojdh d5b893e452 readErrorMessage 2020-07-31 13:32:53 +02:00
maliakal_d 85c958facf WIP det dependant master file attribtes 2020-07-30 18:05:47 +02:00
maliakal_d 7dfeb987db changing command from vhighvoltage to highvoltage 2020-07-30 11:50:03 +02:00
Erik Frojdh 5faf3c7336 format 2020-07-23 14:01:59 +02:00
Erik Frojdh 78a6896ae9 replaced usleep with sleep_for 2020-07-23 11:07:42 +02:00
Erik Frojdh 4cf5e81971 removed usleep 2020-07-23 10:48:59 +02:00
maliakal_d 35dbc3813d filter and cds gain, burst and continuous value to asic changed, bug fix to scanning function addresses in server_funcs.c 2020-07-14 17:09:51 +02:00
maliakal_d c67b7aab4d fix for datasocket and clientsocket, to be reviewed.
clientsocket: to print origin of error (rx/det) for tcp socket failure
datasocket: usleep only for send for rhel7, not for fedora.. when fpath /, fwrite 1, rx_start fails without sending exception
2020-07-14 13:04:33 +02:00
Dhanya ThattilandGitHub 4db3473e32 Merge pull request #111 from slsdetectorgroup/shm
Shm
2020-07-07 13:35:52 +02:00
maliakal_d 05059c1176 Test 2020-07-03 17:14:45 +02:00
maliakal_d 95089b5faa WIP 2020-07-03 16:06:12 +02:00
maliakal_d 7c48ef8931 binaries and fix 2020-07-02 17:15:24 +02:00