Commit Graph

369 Commits

Author SHA1 Message Date
maliakal_d af16ad4040 vetoalg: wip 2021-07-20 12:58:05 +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
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 91d688f18c minor doc 2020-10-01 11:47:08 +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
maliakal_d d06e0d1e7f wip, doc 2020-09-23 15:07:12 +02:00
maliakal_d 750adffe6a wip, doc 2020-09-23 15:07:03 +02:00
maliakal_d b23410bc5e wip, doc 2020-09-23 14:58:25 +02:00
maliakal_d e786b9f037 wip, doc 2020-09-23 13:15:53 +02:00
maliakal_d bd4299fd15 Wip, doc 2020-09-23 12:32:51 +02:00
maliakal_d a4bdffd0b9 Merge branch 'eigerserverlock' into developer 2020-09-22 18:48:35 +02:00
maliakal_d bb575c6017 wip, doc 2020-09-22 18:39:46 +02:00
maliakal_d 65da9e701b wip, doc 2020-09-21 18:30:33 +02:00
maliakal_d 804ad0997c wip, doc 2020-09-21 18:20:59 +02:00
maliakal_d 4ad486fda0 Merge branch 'developer' into eigerserverlock 2020-09-21 17:28:38 +02:00
maliakal_d a8cc47d25c wip, doc 2020-09-21 17:27:49 +02:00
maliakal_d 54ca9f7ebb wip, doc 2020-09-21 17:09:39 +02:00
maliakal_d 569c014d3c WIP, doc 2020-09-21 11:23:46 +02:00
maliakal_d 0906efaf31 moving temp_fpgafl and temp_fpgafr back to the stop server 2020-09-18 14:09:23 +02:00
Erik Frojdh 6d01348bf4 removed setClockFrequency and added some python commands 2020-09-17 16:03:58 +02:00
maliakal_d 3376f7fa37 wip, doc 2020-09-14 15:39:21 +02:00
maliakal_d f061d2273a wip, doc 2020-09-14 15:18:48 +02:00
maliakal_d 01921bc016 WIp, doc 2020-09-11 16:05:53 +02:00
maliakal_d f644cba244 wip, doc 2020-09-11 15:19:22 +02:00
maliakal_d ad95f729dc subheadings in Detector API doc 2020-09-11 12:15:51 +02:00
maliakal_d 3b071cc43f WIP doc 2020-09-11 09:30:30 +02:00
Erik Frojdh 2bc33ad34a default value for setDAC 2020-09-10 14:45:31 +02:00
maliakal_d 11e7d89da3 Merge branch 'developer' into pydoc 2020-09-10 12:01:38 +02:00
Dhanya Thattil 4d499e231d Merge pull request #178 from slsdetectorgroup/eigertempblockingfix
eiger temp fix: tempfpgafl and tempfpgafr cannot be used during block…
2020-09-10 11:48:31 +02:00
maliakal_d 0a7809286b eiger temp fix: tempfpgafl and tempfpgafr cannot be used during blocking acquire as it goes through control server now 2020-09-10 11:47:42 +02:00
Dhanya Thattil 3cd4f3897b M3: software trigger (#175) 2020-09-10 10:15:45 +02:00
maliakal_d 02d4769f6a WIP 2020-09-09 16:39:48 +02:00
maliakal_d 67f1f9924a m3:software trigger 2020-09-08 15:45:35 +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 311cebcd00 m3:added parallel mode 2020-09-08 12:16:02 +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 e4274e3f95 WIP, doc 2020-08-31 14:17:09 +02:00
maliakal_d e0df9fcd99 wip, doc 2020-08-28 19:47:19 +02:00
maliakal_d 30307220e3 QIP, doc 2020-08-28 18:12:08 +02:00
maliakal_d b5669dc921 WIP, doc 2020-08-28 10:57:21 +02:00