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
f0c576c779
WIP
2020-09-07 11:15:51 +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
abe34d573c
WIP
2020-09-02 16:15:33 +02:00
de69e666a9
progress changed to double
2020-08-14 12:16:35 +02:00
7b6f4d0b5b
rxr chrono
2020-08-05 12:07:45 +02:00
Erik Frojdh
69d9680034
mior
2020-08-05 10:17:47 +02:00
Erik Frojdh
ab05da4d0e
clean up
2020-08-05 09:13:53 +02:00
Erik Frojdh
e1de2f72ba
partial clean2
2020-08-04 17:40:17 +02:00
Erik Frojdh
857aa47ee7
partial clean
2020-08-04 17:00:20 +02:00
Erik Frojdh
a70d4e1e5d
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2020-08-04 15:38:45 +02:00
Erik Frojdh
3301a80d99
send string
2020-08-04 15:38:38 +02:00
Dhanya Thattil
ce25b3018c
Merge pull request #126 from slsdetectorgroup/m3
...
M3
2020-08-04 15:21:30 +02:00
Erik Frojdh
4174d193b4
removed exec_command from ClientInterface
2020-08-04 10:50:57 +02:00
8631f5e2b0
m3: counter mask in master file
2020-08-03 16:39:31 +02:00
885b22eca8
ratecorrectiosn addded to master file
2020-07-31 18:38:27 +02:00
Erik Fröjdh
1177e54602
Remove VLAs ( #124 )
...
Removing the use of VLAs in the client and receiver side code. In addition cleaning up sending jsonheader
2020-07-30 18:22:39 +02:00
a76ed6d8db
tengiga enable
2020-07-17 18:34:23 +02:00
b7cb341ee3
dr
2020-07-17 17:33:43 +02:00
67bb0dff1a
rx_zmqstartfnum, not tested
2020-07-16 12:18:18 +02:00
489fccb25c
removed GET_ flags, replaced -1 with GET_FLAG
2020-06-18 17:10:53 +02:00
7cc05ead89
WIP
2020-06-18 12:41:10 +02:00
1f3fd010a7
reordering WIP
2020-06-17 15:25:59 +02:00
b5781e1f9b
multisize to numberofdetectors
2020-06-17 09:57:56 +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
46daa7e2de
merge from developer (mythen3 branch)
2020-05-27 14:19:33 +02:00
e0ea08332f
gotthard2: fix in rxr for gotthard2
2020-05-26 17:44:31 +02:00
fa768e584e
rxr
2020-05-20 10:14:57 +02:00
Erik Frojdh
2c83abcac7
merged detFuncs for c and c++
2020-05-15 12:24:06 +02:00
Erik Frojdh
0dd5a099c8
renamed FixedCap.. to StaticVector
2020-05-15 09:03:23 +02:00
cbc2856c1c
rxr should print ip, mac, when set from structure
2020-05-13 18:35:46 +02:00
eea67014b7
gotthard2 with veto data on second interface
2020-05-13 17:50:18 +02:00
Erik Frojdh
e599bb7c24
format receiver
2020-05-05 10:04:52 +02:00
Erik Fröjdh
c1ae67ac46
Small refactor on ThreadObject and listener ( #93 )
...
* removed pointer, slight cleaning of loop
* removed semaphore, use getters
* removed redundant log msg
* removed comment
* added const
* removed comment
* changed header
2020-04-21 09:45:29 +02:00
Erik Frojdh
8afa11ed33
removed pointer to server socket
2020-04-20 17:20:33 +02:00
6dd6685e7d
minor
2020-04-09 08:24:16 +02:00
38c31fdada
WIP
2020-04-08 20:27:10 +02:00
55f8497eac
WIP
2020-04-08 11:05:06 +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
9230182e35
rxr: dont update index if fwrite 0
2020-03-19 15:21:21 +01:00
Dhanya Thattil
4813b5567a
Minimal shared memory for receiver
2020-03-19 07:01:32 +01:00
Erik Frojdh
0de0d82a1a
replaced old logger
2020-03-11 12:40:12 +01:00
6bbcf6173d
moench: first version
2020-03-02 18:34:10 +01:00
Erik Frojdh
40bfca588b
minor from clang-tidy
2020-02-04 10:36:03 +01:00
Erik Frojdh
ec66079f65
renamed ServerInterface
2020-02-04 08:57:35 +01:00
42124ca97c
eiger rxr: setting exptime now also sets subperiod in rxr master file
2020-02-03 15:54:41 +01:00
c4137dc309
gotthard2: works
2020-01-20 17:03:11 +01:00
Erik Frojdh
c1fac7cdb7
fixed conversion for IpAddr
2020-01-16 16:31:11 +01:00
