6d71d6cf9f
fix with virtual server
2020-05-19 19:11:05 +02:00
e208d3ebe8
WIP
2020-05-19 18:59:07 +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
3514b14bc9
servers: removing notification file as this will be done by daemon
2020-05-15 15:48:52 +02:00
50d2d21018
fix for virtual servers for rhel7
2020-05-15 12:44:44 +02:00
Erik Frojdh
2c83abcac7
merged detFuncs for c and c++
2020-05-15 12:24:06 +02:00
eea67014b7
gotthard2 with veto data on second interface
2020-05-13 17:50:18 +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
ab5cad4fde
formatted servers
2020-05-08 13:56:47 +02:00
61b86962bd
no binaries yet, malloc need no casting
2020-05-08 10:17:36 +02:00
2f11dbc2c9
nios, for variable delcaration in loop
2020-05-08 09:39:36 +02:00
1a75170eed
mythen3: set trimbits (not settings, threshold yet), set all trimbits
2020-05-07 16:04:30 +02:00
7d94ad51ab
format slsdetectorservers .c
2020-05-05 15:30:44 +02:00
96ec3b2123
merge conflict resolved
2020-04-29 14:17:07 +02:00
86b39853a3
gotthard2, mythen3: making them clkdivider dependant and not clkfrequency, binaries not loaded yet
2020-04-28 17:04:57 +02:00
39fa5e0185
client recieve rx parameters as a struct
2020-04-09 09:34:20 +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
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
fad10273ed
fix for server crashing when sending udp packets if no udp server present to listen to it (receiver): cannot use connect and write
2020-04-07 09:57:22 +02:00
83283b672a
WIP
2020-04-06 19:38:35 +02:00
456b96446f
WIP
2020-04-06 17:59:06 +02:00
80e55cd4da
WIP
2020-04-06 17:28:05 +02:00
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
f2dd146e56
updates on servers (mainly virtual): indices, dbit clock not allowed for moench anymore
2020-03-31 16:54:35 +02:00
3ba9e5ec22
eiger, jungfrau, ctb, moench, gotthard virtual servers checked
2020-03-30 18:24: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
Erik Frojdh
0de0d82a1a
replaced old logger
2020-03-11 12:40:12 +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
ac1c40d6f9
virtual servers: redundant declarations fixed
2020-03-10 15:50:33 +01:00
5192dae9c5
removed virtual server warnings
2020-03-10 15:15:09 +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
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
5f3af794ce
moench bug fix: power chip enable
2020-03-04 12:34:32 +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
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
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
dfb1b9ad69
Revert "gotthard2: burst mode check"
...
This reverts commit 4d6996bd556ea9788bb98b19fbe6537e0a41e16c.
2020-02-04 15:29:43 +01:00
4d6996bd55
gotthard2: burst mode check
2020-02-04 15:28:24 +01:00
