301073e60b
WIP
2020-06-23 10:53:17 +02:00
7cc05ead89
WIP
2020-06-18 12:41:10 +02:00
a57f7943ee
WIP
2020-06-17 18:30:25 +02:00
1f3fd010a7
reordering WIP
2020-06-17 15:25:59 +02:00
Dhanya Thattil
f5160b0978
exposing receiver thread ids to client ( #102 )
...
* exposing receiver thread ids to client
Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2020-06-09 16:18:37 +02:00
099805ba8b
WIP
2020-06-04 17:02:56 +02:00
1e2a3f2767
WIP
2020-06-04 15:21:53 +02:00
9a8300ca08
WIP
2020-06-04 12:12:40 +02:00
4053594c4d
WIP
2020-06-03 14:40:51 +02:00
c6ff50d753
merge vetoheader
2020-05-29 10:50:33 +02:00
8aa7144252
mythen3: fix of external signals to not allow master output inversion, but can edge detect not configurable, and default dout pulse length
2020-05-28 13:09:09 +02:00
Erik Frojdh
e2eb1598d3
jf stuff
2020-05-28 09:28:53 +02:00
46daa7e2de
merge from developer (mythen3 branch)
2020-05-27 14:19:33 +02:00
9493ae3da9
WIP
2020-05-27 11:30:47 +02:00
d71e40729a
external signals
2020-05-20 17:05:42 +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
Erik Frojdh
ea7cc9db8c
less public headers
2020-05-15 10:52:23 +02:00
Dhanya Thattil
ad42a61bae
Merge branch 'developer' into gotthard2
2020-05-14 11:53:59 +02:00
eea67014b7
gotthard2 with veto data on second interface
2020-05-13 17:50:18 +02:00
Erik Frojdh
f0f97f265a
removed non used slsDetectorUsers
2020-05-13 14:05:05 +02:00
13c1f7c2d6
WIP
2020-05-08 16:31:26 +02:00
1a75170eed
mythen3: set trimbits (not settings, threshold yet), set all trimbits
2020-05-07 16:04:30 +02:00
Erik Frojdh
959fd562d3
clang-format
2020-05-04 16:30:00 +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
16d5321885
rx_hostname can be added with port and also concatenated
2020-03-19 14:06:16 +01:00
Erik Frojdh
6809bd6567
removed header
2020-03-12 12:38:00 +01:00
Erik Frojdh
f940397e3a
cleaning
2020-03-11 18:10:37 +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
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
Erik Frojdh
972f21258a
renamed multiSlsDetector
2020-02-03 14:57:37 +01:00
f0cccf9de8
initialchecks can be bypassed (version compatibility and oher tests at server start up)
2020-01-31 16:46:33 +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
bdf3a010c3
updated client doc for gotthard2: the timers that are used in continuous mode only
2020-01-21 10:26:11 +01:00
6cfd0f8962
gotthard2: first edit
2020-01-20 12:13:23 +01:00
95030bc55f
Merge branch 'developer' into gotthard2
2020-01-16 16:52:08 +01:00
e8bdf5a505
gotthard2: updated register map; powerchip checking detector type; internal and external period, frames, exptime; set/get delay, get actualtime, measurement, framesfromstart enabled; which detector comment updated in cmdproxy, detector and slsdetector
2020-01-16 15:33:35 +01:00
Erik Frojdh
9ac08ad5c9
clang-tidy header include order
2020-01-16 14:00:43 +01:00
Erik Frojdh
7a00732fa8
various minor things from clang-tidy
2020-01-16 11:39:35 +01:00
b6d9015ed0
rearranging
2020-01-15 15:08:01 +01:00
