262 Commits

Author SHA1 Message Date
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
6289163ac8 virtual servers checked 2020-03-31 10:40:42 +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
d488f4bea8 updated all receiver testing 2020-03-27 16:59:16 +01:00
8f7adb130f conflict fix 2020-03-19 14:07:33 +01:00
16d5321885 rx_hostname can be added with port and also concatenated 2020-03-19 14:06:16 +01:00
Erik Frojdh
dee0aea378 replace stoi with StringTo<int> 2020-03-19 12:33:13 +01:00
Dhanya Thattil
4813b5567a
Minimal shared memory for receiver 2020-03-19 07:01:32 +01:00
Erik Frojdh
711d40a56e added sendToReceiver 2020-03-12 11:45:12 +01:00
Erik Frojdh
81911fae3c new version of send to detector 2020-03-11 19:18:26 +01:00
Erik Frojdh
5784ce8231 slsDetector -> Module 2020-03-11 16:16:15 +01:00