maliakal_d
37cb0bb1c0
minor PR fixes
2020-05-26 08:57:48 +02:00
maliakal_d
0a66605111
tests mainly and minor print
2020-05-22 15:23:56 +02:00
maliakal_d
d71e40729a
external signals
2020-05-20 17:05:42 +02:00
maliakal_d
8973ef1aaa
from timetest merge
2020-05-20 10:18:51 +02:00
maliakal_d
5690914048
Merge branch 'mythen3' of github.com:slsdetectorgroup/slsDetectorPackage into mythen3
2020-05-20 10:15:04 +02:00
maliakal_d
fa768e584e
rxr
2020-05-20 10:14:57 +02:00
30fc346e22
directly writing exptime
2020-05-20 09:47:41 +02:00
761f93d753
exptime of gates
2020-05-20 09:36:43 +02:00
maliakal_d
e208d3ebe8
WIP
2020-05-19 18:59:07 +02:00
maliakal_d
cd90f09a30
WIP
2020-05-19 18:24:32 +02:00
maliakal_d
ecc692ad9a
start pattern without binaries
2020-05-15 17:06:08 +02:00
2c83abcac7
merged detFuncs for c and c++
2020-05-15 12:24:06 +02:00
0dd5a099c8
renamed FixedCap.. to StaticVector
2020-05-15 09:03:23 +02:00
ad42a61bae
Merge branch 'developer' into gotthard2
2020-05-14 11:53:59 +02:00
maliakal_d
eea67014b7
gotthard2 with veto data on second interface
2020-05-13 17:50:18 +02:00
3962714b48
format + exception.cpp
2020-05-13 14:48:52 +02:00
f0f97f265a
removed non used slsDetectorUsers
2020-05-13 14:05:05 +02:00
maliakal_d
9a1fdc4104
Merge branch 'developer' into eiger26
2020-05-12 13:43:36 +02:00
46afcfe694
removed logging
2020-05-12 11:49:49 +02:00
maliakal_d
d7563fdd1a
Merge branch 'developer' into eiger26
2020-05-12 11:39:29 +02:00
ed8d606eb2
WIP
2020-05-11 19:19:49 +02:00
eff664e790
cleanup
2020-05-11 18:28:06 +02:00
1ed1b5da86
migrate to return values
2020-05-11 12:15:16 +02:00
353b8d0057
migrate to return values
2020-05-11 11:48:18 +02:00
bbe9108fb9
migrate to return values
2020-05-11 11:39:11 +02:00
1998f9541e
reorder read settings func
2020-05-11 10:30:55 +02:00
maliakal_d
13c1f7c2d6
WIP
2020-05-08 16:31:26 +02:00
maliakal_d
2e75f36fa0
pr fixes
2020-05-08 12:24:12 +02:00
maliakal_d
1a75170eed
mythen3: set trimbits (not settings, threshold yet), set all trimbits
2020-05-07 16:04:30 +02:00
e599bb7c24
format receiver
2020-05-05 10:04:52 +02:00
959fd562d3
clang-format
2020-05-04 16:30:00 +02:00
maliakal_d
39fa5e0185
client recieve rx parameters as a struct
2020-04-09 09:34:20 +02:00
maliakal_d
373e177274
WIP
2020-04-09 08:35:30 +02:00
maliakal_d
6dd6685e7d
minor
2020-04-09 08:24:16 +02:00
maliakal_d
38c31fdada
WIP
2020-04-08 20:27:10 +02:00
maliakal_d
b3fe0e79bc
WIP
2020-04-08 16:43:28 +02:00
maliakal_d
215e4a56fd
Merge branch 'developer' into setrxhostname
2020-04-08 12:00:21 +02:00
maliakal_d
71a68c2022
eiger transmitting fix in 10g mode (stop servers informed about 10g mode)
2020-04-08 11:58:59 +02:00
maliakal_d
55f8497eac
WIP
2020-04-08 11:05:06 +02:00
maliakal_d
07cd71f0c7
removed update shared memory from detector, check if eiger firmware >=26: have same top and bottom addresses
2020-04-07 17:19:47 +02:00
maliakal_d
9f3ad4e2f4
merge from 4.2.0
2020-04-07 15:14:27 +02:00
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
maliakal_d
f2dd146e56
updates on servers (mainly virtual): indices, dbit clock not allowed for moench anymore
2020-03-31 16:54:35 +02:00
maliakal_d
6289163ac8
virtual servers checked
2020-03-31 10:40:42 +02:00
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
maliakal_d
6a6af528ef
testing WIP
2020-03-30 13:25:39 +02:00
maliakal_d
112d120a89
testing WIP
2020-03-27 18:54:46 +01:00
maliakal_d
d488f4bea8
updated all receiver testing
2020-03-27 16:59:16 +01:00
maliakal_d
8f7adb130f
conflict fix
2020-03-19 14:07:33 +01:00
maliakal_d
16d5321885
rx_hostname can be added with port and also concatenated
2020-03-19 14:06:16 +01:00
maliakal_d
Erik Frojdh