0c045f0faa
WIP
2020-06-29 17:40:41 +02:00
902366fede
inbetween WIP, startstatemachien ugly
2020-06-26 19:08:03 +02:00
ee67c28711
WIP, all servers with virtual stop and start working
2020-06-26 16:47:58 +02:00
cfe9a431f9
WIP, moving virtual status stop to shm from files
2020-06-26 11:50:40 +02:00
301073e60b
WIP
2020-06-23 10:53:17 +02:00
801f2c4559
WIP
2020-06-22 09:33:09 +02:00
7cc05ead89
WIP
2020-06-18 12:41:10 +02:00
4300e95a8e
virtual, adding veto command
2020-05-27 14:37:52 +02:00
d71e40729a
external signals
2020-05-20 17:05:42 +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
6620027439
reset to hardware evn if no file
2020-05-08 18:14:59 +02:00
13c1f7c2d6
WIP
2020-05-08 16:31:26 +02:00
1623448086
minor
2020-05-07 17:14:51 +02:00
1a75170eed
mythen3: set trimbits (not settings, threshold yet), set all trimbits
2020-05-07 16:04:30 +02:00
671cf45fd7
format slsdetectorservers
2020-05-05 15:23:11 +02:00
86b39853a3
gotthard2, mythen3: making them clkdivider dependant and not clkfrequency, binaries not loaded yet
2020-04-28 17:04:57 +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
83283b672a
WIP
2020-04-06 19:38:35 +02:00
80e55cd4da
WIP
2020-04-06 17:28:05 +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
f2dd146e56
updates on servers (mainly virtual): indices, dbit clock not allowed for moench anymore
2020-03-31 16:54: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
Erik Frojdh
0de0d82a1a
replaced old logger
2020-03-11 12:40:12 +01:00
df2512fb1c
all servers: eiger, jungfrau, gotthard, ctb, moench, mythen3, gotthard2 updated
2020-03-10 15:57:27 +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
Dhanya Thattil
c64b09ee79
Jungfraufix ( #84 )
...
* jungfrau: added dbitphase, different pll clkindex 0 with different wr bit
2020-03-04 17:06:18 +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
89c774dbf7
nios programming: check file size first
2020-01-31 11:24:48 +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
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
