47b0e46f15
Merge branch 'developer' into testing
2020-04-06 10:55:41 +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
eeed102bf3
somewhere between fork and pipes, crashes at sendingudppacket at print
2020-04-03 20:18:16 +02:00
7c7f7e8c70
testing WIP
2020-04-03 16:20:05 +02:00
262b4b0b16
more tests
2020-03-31 18:19:32 +02:00
f2dd146e56
updates on servers (mainly virtual): indices, dbit clock not allowed for moench anymore
2020-03-31 16:54:35 +02:00
03af145ee8
test delay fix
2020-03-31 13:38:11 +02:00
043e62f9fd
delay test
2020-03-31 13:35:04 +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
6a6af528ef
testing WIP
2020-03-30 13:25:39 +02:00
112d120a89
testing WIP
2020-03-27 18:54:46 +01:00
8dfb55d476
testing
2020-03-27 17:00:14 +01:00
d488f4bea8
updated all receiver testing
2020-03-27 16:59:16 +01:00
Erik Frojdh
4d8a63eee1
ToString of Result<map>
2020-03-26 14:10:06 +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
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
Erik Frojdh
5479d3a198
fix
2020-03-18 11:11:00 +01:00
Erik Frojdh
775d0842e9
build interface
2020-03-18 11:00:54 +01:00
Erik Frojdh
e7e201bd2a
export and include
2020-03-18 10:20:01 +01:00
Erik Frojdh
7f4f8e8f09
help bug emax
2020-03-13 09:56:11 +01:00
Erik Frojdh
6809bd6567
removed header
2020-03-12 12:38:00 +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
f940397e3a
cleaning
2020-03-11 18:10:37 +01:00
Erik Frojdh
dc53887a48
minor clean
2020-03-11 17:49:32 +01:00
Erik Frojdh
5784ce8231
slsDetector -> Module
2020-03-11 16:16:15 +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
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
0a596c689b
sanitizer on, gui:removed qfuture, client: not implemented made specific as to what is not
2020-03-06 15:41:15 +01:00
dec4d00fbf
ctb: gui call back fix
2020-03-05 11:31:36 +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
fca7d51cb4
moench: removed hardcoding ny in call back for gui
2020-03-03 16:30:28 +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
2e2e91b219
ctb adc: get in uV and print in client in mV to get decimals
2020-02-27 15:43:42 +01:00
8c8032dc69
ctb bug fix: slow adcs incorrect mv read out, needed clk down and usleep before reading
2020-02-27 09:16:22 +01:00
d9cfc59df6
code refactor in slsdet: prevval for setnumtriggers
2020-02-26 11:27:24 +01:00
80304c2eaf
multi progress calculated in one function rather getting all of them from shm
2020-02-26 11:17:49 +01:00
ec76590f28
Merge branch 'developer' into bursts
2020-02-26 09:29:18 +01:00
2fcb2bff75
dac tests
2020-02-26 09:29:06 +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
