ca298580f3
badchannels done
2020-07-15 18:24:17 +02:00
d7f490701b
confadc added to client, removed conf adc depending on burst mode
2020-07-15 13:30:30 +02:00
7752b86d97
veto file in
2020-07-14 18:51:47 +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
Dhanya Thattil
4db3473e32
Merge pull request #111 from slsdetectorgroup/shm
...
Shm
2020-07-07 13:35:52 +02:00
95089b5faa
WIP
2020-07-03 16:06:12 +02:00
Erik Frojdh
cec26f81e1
more using .empty()
2020-06-29 17:41:06 +02:00
Erik Frojdh
19e40cf0e6
using .empty() on stl containers
2020-06-29 17:20:56 +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
159b0a0367
WIP
2020-06-23 09:30:17 +02:00
f6911c4238
WIP
2020-06-23 09:02:26 +02:00
1d53dc65cd
WIP
2020-06-23 08:48:54 +02:00
7cc05ead89
WIP
2020-06-18 12:41:10 +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
099805ba8b
WIP
2020-06-04 17:02:56 +02:00
1e2a3f2767
WIP
2020-06-04 15:21:53 +02:00
4053594c4d
WIP
2020-06-03 14:40:51 +02:00
Erik Frojdh
e2eb1598d3
jf stuff
2020-05-28 09:28:53 +02:00
46daa7e2de
merge from developer (mythen3 branch)
2020-05-27 14:19:33 +02:00
9493ae3da9
WIP
2020-05-27 11:30:47 +02:00
d71e40729a
external signals
2020-05-20 17:05:42 +02:00
cd90f09a30
WIP
2020-05-19 18:24:32 +02:00
ecc692ad9a
start pattern without binaries
2020-05-15 17:06:08 +02:00
eea67014b7
gotthard2 with veto data on second interface
2020-05-13 17:50:18 +02:00
1a75170eed
mythen3: set trimbits (not settings, threshold yet), set all trimbits
2020-05-07 16:04:30 +02:00
Erik Frojdh
959fd562d3
clang-format
2020-05-04 16:30:00 +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
6a6af528ef
testing WIP
2020-03-30 13:25:39 +02: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
9a6f521f6a
other replacements for string
2020-03-19 12:39:42 +01:00
Erik Frojdh
dee0aea378
replace stoi with StringTo<int>
2020-03-19 12:33:13 +01:00
Erik Frojdh
46e9b450c0
assume dec unless 0x
2020-03-19 11:09:20 +01:00
Dhanya Thattil
4813b5567a
Minimal shared memory for receiver
2020-03-19 07:01:32 +01:00
Dhanya Thattil
c64b09ee79
Jungfraufix ( #84 )
...
* jungfrau: added dbitphase, different pll clkindex 0 with different wr bit
2020-03-04 17:06:18 +01:00
7859cf78e9
moench: allow power chip
2020-03-04 10:41:10 +01:00
8abc32e7f1
moench: default pattern file in server, settings, tests
2020-03-03 16:00:01 +01:00
6bbcf6173d
moench: first version
2020-03-02 18:34:10 +01:00
Dhanya Thattil
11e7737a2f
gotthard2: timingsource and currentsource features, (timing source external yet to be implemented in fpga to test ( #80 )
2020-02-28 12:45:02 +01:00
6a0a931e3e
gotthard2: bursts and burst period, written to same register as triggers and delay (kept in server as variables) and set if conditions meet. bursts and burst period only in auto timing and burst mode. Also updating theses registers when switching between timing modes or burst modes
2020-02-25 15:45:40 +01:00
d3dc9a7690
gotthard2: disentangled burst mode #frames, exptime, period from start of acquisition, order dependent now for debugging
2020-02-04 12:23:58 +01:00
f0cccf9de8
initialchecks can be bypassed (version compatibility and oher tests at server start up)
2020-01-31 16:46:33 +01:00
Dhanya Thattil
5ca3a1b685
gotthard2 and mythen3: programming fpga, reboot; jungfrau, ctb: modified programming ( #74 )
2020-01-30 19:52:35 -08:00
a9e375ed34
gotthard2: bursttype to burstmode
2020-01-23 11:03:14 +01:00
f881133795
get/set timing, generate data for gotthard2, vref_rstore instead of restore for gotthard2
2020-01-22 18:18:56 +01:00
8cbf3c62a9
merge from developer
2020-01-22 17:30:13 +01:00
981b13494c
mythen3: virtual server, connected timing mode, row and col in header, included pattern bit and mask
2020-01-21 18:16:27 +01:00
e746256653
gotthard2: gain updated
2020-01-21 16:01:38 +01:00
