115 Commits

Author SHA1 Message Date
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
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
95fe1720c0 removed commented out lines 2020-11-27 14:44:15 +01:00
d4518b2ca3 WIP 2020-11-27 13:56:57 +01:00
fd3108a61b WIP 2020-11-27 12:46:54 +01:00
Erik Frojdh
d9b2a90651 Introduced pattern class 2020-11-27 10:03:15 +01:00
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
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
cefddff848 scan trimbits_scan changed to trimbits 2020-10-20 12:31:08 +02:00
a838830090 ran tests and fixed 2020-10-08 15:44:15 +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
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
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
503f83e8e3 Merge branch 'developer' into g2continuous 2020-09-07 17:07:09 +02:00
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
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
ffd694eda1 temlist and tempvalues added 2020-08-20 15:16:28 +02:00
de69e666a9 progress changed to double 2020-08-14 12:16:35 +02:00
0c7759d7e4 formatting 2020-08-11 17:09:36 +02:00
7b6f4d0b5b rxr chrono 2020-08-05 12:07:45 +02:00
Erik Frojdh
3301a80d99 send string 2020-08-04 15:38:38 +02:00
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
85c958facf WIP det dependant master file attribtes 2020-07-30 18:05:47 +02:00
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
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
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 Thattil
4db3473e32
Merge pull request #111 from slsdetectorgroup/shm
Shm
2020-07-07 13:35:52 +02:00
05059c1176 Test 2020-07-03 17:14:45 +02:00
95089b5faa WIP 2020-07-03 16:06:12 +02:00
7c48ef8931 binaries and fix 2020-07-02 17:15:24 +02:00
93c5505285 WIP 2020-07-02 13:42:32 +02:00
a656668d73 WIP 2020-07-01 20:00:36 +02:00
Erik Frojdh
cec26f81e1 more using .empty() 2020-06-29 17:41:06 +02:00
902366fede inbetween WIP, startstatemachien ugly 2020-06-26 19:08:03 +02:00
301073e60b WIP 2020-06-23 10:53:17 +02:00
1d53dc65cd WIP 2020-06-23 08:48:54 +02:00
9d3bbc0a68 WIP 2020-06-22 15:02:28 +02:00
801f2c4559 WIP 2020-06-22 09:33:09 +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
1f3fd010a7 reordering WIP 2020-06-17 15:25:59 +02:00
Erik Frojdh
5f91198328 clang-tidy nullptr 2020-06-10 08:30:12 +02:00
Erik Frojdh
265e96d675 clang-tidy nullptr 2020-06-10 08:27:35 +02:00