64 Commits

Author SHA1 Message Date
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
902919f2df minor 2020-11-18 09:11:48 +01:00
Erik Frojdh
1efdc90719 clean 2020-11-18 08:57:35 +01:00
Erik Fröjdh
121a3ad733
Static libraries (#213) 2020-11-03 18:54:11 +01:00
Erik Frojdh
707601832f minor fix to build 2020-11-03 08:44:29 +01:00
Erik Fröjdh
a15d8dd30a
Moving headers into include/sls (#212) 2020-11-02 16:05:28 +01:00
Erik Frojdh
fb8842e048 build and libname 2020-09-07 09:14:47 +02:00
Erik Frojdh
514346c3ba static support lib 2020-09-04 11:00:34 +02:00
Erik Fröjdh
5bf6b7a338
Refactor of ZmqSocket (#109)
Changed data type of address from char[1000] to string to reduce stack size of object.

Removed redundant calls to Close

Removed function exposing the socket descriptor

Using functions from network_utils instead of duplicates

Added tests
2020-06-19 12:41:03 +02:00
Erik Frojdh
f0f97f265a removed non used slsDetectorUsers 2020-05-13 14:05:05 +02:00
Erik Frojdh
337e56d9bf cleaned up LTO detection 2020-04-23 08:23:36 +02:00
Erik Frojdh
5479d3a198 fix 2020-03-18 11:11:00 +01:00
Erik Frojdh
775d0842e9 build interface 2020-03-18 11:00:54 +01:00
Erik Frojdh
e7e201bd2a export and include 2020-03-18 10:20:01 +01:00
Erik Frojdh
5784ce8231 slsDetector -> Module 2020-03-11 16:16:15 +01:00
Erik Frojdh
f1bce15a57 replaced udp socket 2020-02-17 17:43:14 +01:00
Erik Frojdh
972f21258a renamed multiSlsDetector 2020-02-03 14:57:37 +01:00
Erik Frojdh
a28fa66e54 renamed CmdLineParser to CmdParser 2019-11-27 13:56:14 +01:00
Erik Frojdh
c951b10b0f fixed public header list 2019-11-25 12:11:23 +01:00
Erik Fröjdh
fa2c842745 New command line app and removing slsDetectorCommand (#69)
* WIP

* WIP

* WIP

* WIP

* config2 working

* removed slsDetectorCommand

* WIP

* added test file

* more tests
2019-11-18 09:29:17 +01:00
Erik Frojdh
2f2e4da628 Moved CmdLineProxy 2019-11-05 11:07:07 +01:00
ba3bc9c408 starting of users class 2019-10-30 15:13:16 +01:00
Dhanya Thattil
995f0924e5
Commandline (#66)
* WIP

* WIP

* removed status to string from defs

* WIP

* WIP

* WIP removed unused functions in multi

* WIP

* print hex in a terrible way

* WIP, loadconfig error

* WIP, type to string

* WIP

* fix to conversion

* WIP, hostname doesnt work

* WIP

* WIP

* WIP

* WIP, threshold

* WIP, threshold

* WIP

* WIP, triggers

* WIP, cycles to triggers

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* rx_udsocksize fx, WIP

* WIP

* WIP

* WIP

* file index (64 bit), WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* merge

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* New python mod
2019-10-21 10:29:06 +02:00
Erik Fröjdh
5c06549982 Cleanup of the CmdProxy and migrated some commands (#52)
* migrated rx_fifodepth

* Moved and cleand CmdProxy

* rx_slient

* new commands

* examples

* fixed result string print
2019-08-23 14:32:44 +02:00
Erik Frojdh
7afe0c510e multiSlsDetectorClient.cpp added .h cleaned 2019-08-23 10:28:50 +02:00
Dhanya Thattil
4ceee97c03
Api (#48)
* WIP

* WIP

* WIP

* cleaned up multi

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* split up python module

* WIP

* WIP

* WIP

* WIP

* WIP

* ok

* fixed bugs from rebase

* WIP

* fixed broken test

* WIP

* fixed python

* WIP

* sphinx help

* including new commands

* docs

* WIP

* WIP

* more tests

* added missing public header

* WIP
2019-08-07 11:21:07 +02:00
Erik Fröjdh
1094d5d30c Build doxygen documentation by cmake (#17)
* added cmake command to make doxygen docs

* added back doxyfile for users
2019-05-03 14:58:15 +02:00
89a06f099c merging refactor (replacing) 2019-04-12 10:53:09 +02:00
Samuel Debionne
e13ecc8625 Add slsReceiver and slsDetector targets to the export set (used by donwstream project)
set TARGETS_EXPORT_NAME if the project is built directly.
2019-02-05 11:51:03 +01:00
Erik Frojdh
73ae8c6151 removing static libs 2019-01-15 17:24:20 +01:00
ab7e63c20f Moved sls_detector_exceptions to sls_receiver_exceptions & its consequences 2018-08-08 15:43:29 +02:00
a0016cb005 sharedmem: working, need to add replace 2018-06-27 10:05:05 +02:00
16428f3828 esrf changes: CMake: support to be added and installed as a sub-project:
* Configure zmq as global imported library in slsReceiverSoftware
* Install zmq, necessary if linking to slsReceiver library
2018-04-25 18:24:08 +02:00
Erik Frojdh
dde032acc8 reverting locations 2018-02-08 10:54:07 +01:00
Erik Frojdh
ee9996908a test 2018-01-30 11:24:50 +01:00
Erik Frojdh
caf2548391 path 2018-01-30 11:15:31 +01:00
Erik Frojdh
8778fa0aca all files in bin 2018-01-30 11:05:43 +01:00
Erik Frojdh
d15fd90e8d hejhej 2018-01-29 17:31:32 +01:00
Erik Frojdh
a3293f4335 more headers 2018-01-29 17:27:32 +01:00
Erik Frojdh
3d0d86eb19 another 2018-01-29 17:22:15 +01:00
Erik Frojdh
915e0d19ca more 2018-01-29 17:20:44 +01:00
Erik Frojdh
44b8f482f0 multiheader 2018-01-29 17:17:43 +01:00
Erik Frojdh
e32a5263e8 file io stat 2018-01-29 17:15:00 +01:00
Erik Frojdh
e8d0bea1a0 file io 2018-01-29 17:13:39 +01:00
Erik Frojdh
1ecc194bf8 bc 2018-01-29 17:10:39 +01:00
Erik Frojdh
fbb8efa5f4 angular static 2018-01-29 17:07:24 +01:00
Erik Frojdh
b78b2bb678 angularConversion 2018-01-29 17:05:51 +01:00
Erik Frojdh
d9116ec0b9 detectorData.h 2018-01-29 17:03:46 +01:00
Erik Frojdh
b6f6122656 post processing header 2018-01-29 17:00:40 +01:00
Erik Frojdh
80c301f88e oj 2018-01-29 16:58:31 +01:00