maliakal_d
96ec3b2123
merge conflict resolved
2020-04-29 14:17:07 +02:00
maliakal_d
1f6b0b5887
gotthard2: new default clk dividers
2020-04-29 12:51:05 +02:00
maliakal_d
f626db454e
updated gotthard2, mythen3 binaries
2020-04-28 17:07:18 +02:00
maliakal_d
86b39853a3
gotthard2, mythen3: making them clkdivider dependant and not clkfrequency, binaries not loaded yet
2020-04-28 17:04:57 +02:00
maliakal_d
2f33a1a479
updated binaries
2020-04-09 09:35:46 +02:00
maliakal_d
0652ff6b5a
updated binaries
2020-04-09 08:37:27 +02:00
maliakal_d
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
maliakal_d
bdf0f9e2b9
fixed start stop tests
2020-04-07 10:39:50 +02:00
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
maliakal_d
7c7f7e8c70
testing WIP
2020-04-03 16:20:05 +02:00
maliakal_d
262b4b0b16
more tests
2020-03-31 18:19:32 +02:00
maliakal_d
83010de9f4
updated all binaries, previous ones may not work
2020-03-31 16:58:35 +02:00
maliakal_d
f2dd146e56
updates on servers (mainly virtual): indices, dbit clock not allowed for moench anymore
2020-03-31 16:54:35 +02:00
maliakal_d
6289163ac8
virtual servers checked
2020-03-31 10:40:42 +02:00
maliakal_d
3ba9e5ec22
eiger, jungfrau, ctb, moench, gotthard virtual servers checked
2020-03-30 18:24:42 +02:00
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
maliakal_d
45c1d3a553
gotthard2: burst mode fix for all the registers
2020-03-13 19:36:23 +01:00
maliakal_d
17227be4df
gotthard2: burst mode fix
2020-03-13 17:39:16 +01:00
0de0d82a1a
replaced old logger
2020-03-11 12:40:12 +01:00
maliakal_d
2cb09a590a
gotthard2, mythen3: firmware type check added, others: minor print
2020-03-10 16:25:07 +01:00
maliakal_d
df2512fb1c
all servers: eiger, jungfrau, gotthard, ctb, moench, mythen3, gotthard2 updated
2020-03-10 15:57:27 +01:00
maliakal_d
e4942a5c8d
virtual servers warnings fixed
2020-03-10 15:53:44 +01:00
maliakal_d
ac1c40d6f9
virtual servers: redundant declarations fixed
2020-03-10 15:50:33 +01:00
maliakal_d
5192dae9c5
removed virtual server warnings
2020-03-10 15:15:09 +01:00
bd6529a64c
warnings for virtual servers
2020-03-10 09:27:23 +01:00
maliakal_d
4a802bd2e4
gotthard2: switching between continuous to burst mode (burstperiod got reset: fixed)
2020-03-05 16:35:52 +01:00
maliakal_d
9ca86c2edb
ctb, gotthard, gotthard2, jungfrau, mythen updated
2020-03-05 10:21:24 +01:00
maliakal_d
4e2f685b76
gotthard2: gain plot fix with clones
2020-03-04 14:39:44 +01:00
maliakal_d
032475fc14
gainplot clone revised
2020-03-04 10:17:51 +01:00
maliakal_d
134611c638
gotthard2: switching between period and burst period (not delay and burst period), internal frequency depending on timing source (for all except actualtime and measurement time)
2020-03-03 17:49:28 +01:00
maliakal_d
a769f7515c
gotthard2 bug fix: fixed pll freq was incorrect when 0 in front
2020-02-28 16:03:15 +01:00
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
maliakal_d
fe3a7b0faf
gotthard2: removed unnecessary casting
2020-02-26 11:02:28 +01:00
maliakal_d
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
maliakal_d
c03bc4a6b4
gotthard2: copy #frames and period when switching between continuous and burst mode
2020-02-24 17:20:51 +01:00
maliakal_d
02b367ffe8
mythen3 and gotthard2: updated clocks
2020-02-24 16:50:47 +01:00
maliakal_d
dfb1b9ad69
Revert "gotthard2: burst mode check"
...
This reverts commit 4d6996bd55
2020-02-04 15:29:43 +01:00
maliakal_d
4d6996bd55
gotthard2: burst mode check
2020-02-04 15:28:24 +01:00
maliakal_d
0ac28c0208
gotthard2: burst mode check for #frames
2020-02-04 15:27:18 +01:00
maliakal_d
37c3048c2a
gotthard2: bug fix from previosu commit
2020-02-04 12:32:37 +01:00
maliakal_d
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
maliakal_d
806a2736c1
gotthard2: longer wait for startup, period 0
2020-02-04 12:00:07 +01:00
maliakal_d
36bd91daa3
gotthard2: sleep before configuring on chip dacs, default exptime 0 and default period to 1ms
2020-02-04 10:50:01 +01:00
maliakal_d
89c774dbf7
nios programming: check file size first
2020-01-31 11:24:48 +01:00
5ca3a1b685
gotthard2 and mythen3: programming fpga, reboot; jungfrau, ctb: modified programming ( #74 )
2020-01-30 19:52:35 -08:00
maliakal_d
a9e375ed34
gotthard2: bursttype to burstmode
2020-01-23 11:03:14 +01:00
maliakal_d
f881133795
get/set timing, generate data for gotthard2, vref_rstore instead of restore for gotthard2
2020-01-22 18:18:56 +01:00
maliakal_d
8cbf3c62a9
merge from developer
2020-01-22 17:30:13 +01:00
maliakal_d
3ea2520615
PR minor changes
2020-01-22 13:55:10 +01:00
maliakal_d
e746256653
gotthard2: gain updated
2020-01-21 16:01:38 +01:00
maliakal_d
Dhanya Thattil