2860 Commits

Author SHA1 Message Date
Erik Frojdh
085ea3aee7 dont add detector id for .trim 2021-04-27 08:28:05 +02:00
Erik Frojdh
c054ad3af3 Merge branch 'my3regs' into developer 2021-04-26 08:39:46 +02:00
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
d9cd780386 p gaincap 0 2021-04-12 13:31:10 +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 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
06dbf82e93 clang-format 2020-11-18 18:01:39 +01:00
Erik Frojdh
902919f2df minor 2020-11-18 09:11:48 +01:00
Erik Frojdh
1efdc90719 clean 2020-11-18 08:57:35 +01:00
7fcac35549 gui exception thrown from acquire caught properly in gui 2020-11-17 17:39:34 +01:00
Erik Frojdh
40f6eb8ede WIP 2020-11-17 15:33:09 +01:00
146d605d19 gui callback exception caught 2020-11-17 14:01:53 +01:00
5ee95cf811 tests wip 2020-11-17 11:16:34 +01:00
59e12bbed8 tests wip 2020-11-17 10:51:40 +01:00
bd76a66770 tests rx_missingpackets not working 2020-11-17 08:52:30 +01:00
f592b98beb tests eiger wip 2020-11-16 19:51:15 +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
b6b9a5d598 updated release notes and changed a few command names, now->runtime, timestamp->frametime, nframes->framecounter, startingfnum->startframenumber 2020-11-12 16:48:49 +01:00
Erik Fröjdh
121a3ad733
Static libraries (#213) 2020-11-03 18:54:11 +01:00
Erik Frojdh
f6fff9d916 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-11-03 08:44:37 +01:00
Erik Frojdh
707601832f minor fix to build 2020-11-03 08:44:29 +01:00
5687bdd6a2 test fix 2020-11-02 18:30:36 +01:00
e7a1960741 test fix 2020-11-02 18:27:10 +01:00
64be2e0297 test fix 2020-11-02 18:23:56 +01:00
66df5fe8ee test fix 2020-11-02 18:17:35 +01:00
Erik Fröjdh
a15d8dd30a
Moving headers into include/sls (#212) 2020-11-02 16:05:28 +01:00
Erik Frojdh
139db216fe added function to read depreciated commands 2020-10-30 11:50:42 +01:00
671ee3179e bug fix for gap pixels with multi frames in gui (issue with overwriting original npixelsx and npixelsy with gap values 2020-10-27 16:50:42 +01:00
Dhanya Thattil
47018b61cd
M3readout (#209)
* m3: readout command
2020-10-26 16:13:48 +01:00
b9234ee7f2 update doc 2020-10-23 15:34:20 +02:00
cefddff848 scan trimbits_scan changed to trimbits 2020-10-20 12:31:08 +02:00
5cd89487b6 blackfin fpga programming: if client socket killed or failure while writing to flash, only file pointer closed but fpga not asked to pick up from flash and client exception thrown. If all good and picking up from flash takes more than 10s, it will also throw exception in client. Client exception will prevent a reboot and hence allowing user to try to flash again. 2020-10-16 15:02:45 +02:00
a838830090 ran tests and fixed 2020-10-08 15:44:15 +02:00
7f189629fb commands, set multi level but get module level enabled 2020-10-08 14:31:18 +02:00
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
688fe4e3f7 fix zmqport and rx_zmqport, must restart zmq streaming 2020-10-07 14:17:34 +02:00
a730a13cbe wip 2020-10-01 17:57:07 +02:00
f31260030b bugfix: cannot stop detector if rxr crashed 2020-10-01 17:54:08 +02:00
91d688f18c minor doc 2020-10-01 11:47:08 +02:00
3a3c5b0a6e minor readframefromrxr using unique ptrs 2020-09-29 14:37:43 +02:00
603ddb0d75 updated docs, execcommand multiple words 2020-09-25 19:24:26 +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
18cd363f8f tests in 2020-09-23 16:34:18 +02:00
Erik Frojdh
0b0f5c94d5 master file no index 2020-09-23 16:28:50 +02:00