dac9998161
updated all servers
2020-05-08 13:42:07 +02:00
d468641138
fix
2020-05-08 11:04:04 +02:00
2ac7451a99
eiger server
2020-05-08 10:53:34 +02:00
15b57b29fb
all binaries except eiger
2020-05-08 10:18:54 +02:00
eb3971fedc
all binaries except eiger
2020-05-08 10:18:29 +02:00
0e5a96e1ed
binaries mythen3, gotthard2
2020-05-08 09:42:29 +02:00
6872f24037
mythen3: binary
2020-05-07 16:07:24 +02:00
1a75170eed
mythen3: set trimbits (not settings, threshold yet), set all trimbits
2020-05-07 16:04:30 +02:00
Erik Frojdh
ea4044e4b1
format support lib
2020-05-05 10:07:19 +02:00
96ec3b2123
merge conflict resolved
2020-04-29 14:17:07 +02:00
b7805ae0d4
gotthard2, moench: remove leading spaces in config file on board detector server
2020-04-29 14:09:35 +02:00
1f6b0b5887
gotthard2: new default clk dividers
2020-04-29 12:51:05 +02:00
f626db454e
updated gotthard2, mythen3 binaries
2020-04-28 17:07:18 +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
2f33a1a479
updated binaries
2020-04-09 09:35:46 +02:00
3a1d87728c
updated client api
2020-04-09 08:38:37 +02:00
0652ff6b5a
updated binaries
2020-04-09 08:37:27 +02:00
38c31fdada
WIP
2020-04-08 20:27:10 +02:00
b3fe0e79bc
WIP
2020-04-08 16:43:28 +02:00
55f8497eac
WIP
2020-04-08 11:05:06 +02:00
738f341265
eiger server compiled from previous commit
2020-04-08 08:41:39 +02:00
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
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
83010de9f4
updated all binaries, previous ones may not work
2020-03-31 16:58:35 +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
Erik Frojdh
4d8a63eee1
ToString of Result<map>
2020-03-26 14:10:06 +01:00
Erik Frojdh
d0c3e006fb
printing of std::map
2020-03-26 12:39:56 +01:00
Erik Frojdh
8fc1578a5e
added support for MSG_PEEK
2020-03-24 09:20:38 +01:00
Erik Frojdh
9a6f521f6a
other replacements for string
2020-03-19 12:39:42 +01:00
Erik Frojdh
46e9b450c0
assume dec unless 0x
2020-03-19 11:09:20 +01:00
Erik Frojdh
40c5ccfe37
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2020-03-19 10:30:15 +01:00
Erik Frojdh
bf1b1a2d9e
string conversion for uint
2020-03-19 10:30:05 +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
Erik Frojdh
b751238fc1
ZmqSocket
2020-03-18 12:12:01 +01:00
Erik Frojdh
e7e201bd2a
export and include
2020-03-18 10:20:01 +01:00
17227be4df
gotthard2: burst mode fix
2020-03-13 17:39:16 +01:00
Erik Frojdh
6809bd6567
removed header
2020-03-12 12:38:00 +01:00
Erik Frojdh
3dbd6a33f7
removed genericSocket
2020-03-11 13:39:40 +01:00
Erik Frojdh
0de0d82a1a
replaced old logger
2020-03-11 12:40:12 +01:00
Erik Frojdh
4aeb8bf62e
introducing new logger
2020-03-11 10:54:55 +01:00
dea8cba985
changes from 4.2.0-rc: eiger check for max trimbits; end of eigerserver: if detector ip, set activate; update both control and stop server for activate
2020-03-10 16:49:08 +01:00
2cb09a590a
gotthard2, mythen3: firmware type check added, others: minor print
2020-03-10 16:25:07 +01:00
df2512fb1c
all servers: eiger, jungfrau, gotthard, ctb, moench, mythen3, gotthard2 updated
2020-03-10 15:57:27 +01:00
Dhanya Thattil
758afad02c
ctb, moench, eiger, gotthard: get number of channels for moench and ctb, others removed unnecessary variables in shm, added moench virtual sever ( #86 )
2020-03-10 09:08:08 +01:00
Dhanya Thattil
4c4ee3ae25
Merge pull request #83 from slsdetectorgroup/logger
...
New logger
2020-03-09 17:46:18 +01:00
Erik Frojdh
0e171f291d
added std::flush
2020-03-09 13:57:50 +01:00
