99 Commits

Author SHA1 Message Date
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
Dhanya Thattil
f5160b0978
exposing receiver thread ids to client (#102)
* exposing receiver thread ids to client

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2020-06-09 16:18:37 +02:00
d71e40729a external signals 2020-05-20 17:05:42 +02:00
cd90f09a30 WIP 2020-05-19 18:24:32 +02:00
Erik Frojdh
ea7cc9db8c less public headers 2020-05-15 10:52:23 +02:00
Erik Frojdh
3962714b48 format + exception.cpp 2020-05-13 14:48:52 +02:00
Erik Frojdh
eff664e790 cleanup 2020-05-11 18:28:06 +02:00
Erik Frojdh
ea4044e4b1 format support lib 2020-05-05 10:07:19 +02:00
Erik Frojdh
68f76e5356 more like UdpRxSocket 2020-04-20 17:24:53 +02:00
Erik Frojdh
655a410d43 cleaned up UdpRxSocket 2020-04-16 09:45:44 +02:00
9f3ad4e2f4 merge from 4.2.0 2020-04-07 15:14:27 +02:00
Dhanya Thattil
fdb6e3f3d4 Removeshm (#90)
* eiger: moved rate correction outside, fixed threshold energy bug in client (binaries not  updated yet)

* removed dr and deadtiem from shm

* help for rx_status and status to point them to rx_Start, rx_stop, start and stop

* moved progress to receiver

* removed currentsettings from eiger shm

* updated server binaries, and client api

* moench and ctb virtual servers compile fix

* gui: moved acquire to a concurrent qt thread so it doesnt block updateplot
2020-04-06 10:44:44 +02:00
Dhanya Thattil
d58eb1dc6e
Gappixels (#89)
* WIP

* WIP virtual delays, imagetest for saturation

* WIP, vertical and horizontal

* WIP

* gap pixels work, fixed 32 bit data out (10gbe=0) for virtual servers

* quad works (also in virtual), handling gappixels and quad

* jungfrau gapppixels work

* jungfrau: done

* complete image or missing packets given in json header and gui

* eiger virtual 4 bit mode bug fix

* working version of zmq add json header, except printout

* printout bug

* fix for json para

* to map WIP

* map done

* map print , mapwith result left

* json result works, testing added

* updated server binaries

* compiling on rhels7, variable size char array iniitalization

* zmqsocket parsing didnt need Document

* const to map, json para is strings not map

* json add header: mapping cleaner without insert make_pair
2020-03-30 14:54:35 +02:00
Erik Frojdh
fb051355b8 moved string conversion to .cpp 2020-03-26 15:06:23 +01:00
75692c3539 zmq server address copy warning fix 2020-03-19 11:36:32 +01:00
b608ec6fbd zmqsocket: fname to string to remove warning in copying maxstr in maxstr in json header 2020-03-19 10:24:08 +01:00
Dhanya Thattil
4813b5567a
Minimal shared memory for receiver 2020-03-19 07:01:32 +01:00