26dfccf77e
binaries compiling, removed inline for c
2020-05-15 13:03:50 +02:00
Dhanya Thattil
ad42a61bae
Merge branch 'developer' into gotthard2
2020-05-14 11:53:59 +02:00
e34fbb4350
binaries in
2020-05-13 17:55:08 +02:00
Erik Frojdh
3962714b48
format + exception.cpp
2020-05-13 14:48:52 +02:00
a62b650e24
eiger binary in
2020-05-13 09:25:58 +02:00
ccf1889113
formatting
2020-05-11 20:09:45 +02:00
88f801061f
fix for reset
2020-05-11 20:09:09 +02:00
e3d3c88d74
update format
2020-05-11 19:53:50 +02:00
9a7d15bbf6
WIP
2020-05-11 19:36:12 +02:00
e148a584df
formatting
2020-05-11 19:27:49 +02:00
5aaefc8e00
fix using real detectors, moving readconfig to end (due to initialization)
2020-05-11 19:26:22 +02:00
9c7ff84b73
compiled all servers again
2020-05-08 13:57:23 +02:00
ab5cad4fde
formatted servers
2020-05-08 13:56:47 +02:00
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
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
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
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
17227be4df
gotthard2: burst mode fix
2020-03-13 17:39:16 +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
f255becffe
jungfrau: adcphase values nad dbit values done for new boards
2020-03-06 17:49:22 +01:00
a2e019ff36
moench: updated adcpipeline from 14 to 15
2020-03-06 10:47:21 +01:00
aeb9ddfe62
moench:dbit clock updated to 40
2020-03-05 17:10:37 +01:00
4a802bd2e4
gotthard2: switching between continuous to burst mode (burstperiod got reset: fixed)
2020-03-05 16:35:52 +01:00
e3f9ef0b25
moench and eiger updated as well
2020-03-05 10:24:59 +01:00
9ca86c2edb
ctb, gotthard, gotthard2, jungfrau, mythen updated
2020-03-05 10:21:24 +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
4e2f685b76
gotthard2: gain plot fix with clones
2020-03-04 14:39:44 +01:00
7859cf78e9
moench: allow power chip
2020-03-04 10:41:10 +01:00
1b996d1703
revised gain plot; updated version api
2020-03-04 10:25:38 +01:00
032475fc14
gainplot clone revised
2020-03-04 10:17:51 +01:00
