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
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
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
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
Dhanya Thattil
4813b5567a
Minimal shared memory for receiver
2020-03-19 07:01:32 +01:00
Erik Frojdh
f940397e3a
cleaning
2020-03-11 18:10:37 +01:00
Erik Frojdh
5784ce8231
slsDetector -> Module
2020-03-11 16:16:15 +01:00
Erik Frojdh
4aeb8bf62e
introducing new logger
2020-03-11 10:54:55 +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
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
Erik Frojdh
e6340456f6
minor
2020-02-04 08:47:22 +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
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
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
Dhanya Thattil
de53747ddd
Counters ( #71 )
...
* mythen3: adding counters mask, firmware still takes only number of counters for now
* mythen3: checking if module attached before powering on chip
* bug fix: loop inital declaration not allowed in c
* fix scope eiger test
* mythen3: renamed setCounters to setCounterMask and getCounterMask in API
* mythen3 replacing counting bits with popcount
Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
2020-01-14 17:40:46 +01:00
Erik Frojdh
f4cdd759b0
clang-tidy
2019-11-27 18:42:16 +01:00
ad0fb44573
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2019-11-27 17:29:26 +01:00
9455a5fba1
ctb: adcenable10g included, 10g readout enables included
2019-11-27 17:28:57 +01:00
Erik Frojdh
a28fa66e54
renamed CmdLineParser to CmdParser
2019-11-27 13:56:14 +01:00
398f3734ec
rxr: missing packets, stopacquistion lets rxr know to calculate missing packets from last frame caught
2019-11-20 16:16:14 +01:00
Erik Fröjdh
fa2c842745
New command line app and removing slsDetectorCommand ( #69 )
...
* WIP
* WIP
* WIP
* WIP
* config2 working
* removed slsDetectorCommand
* WIP
* added test file
* more tests
2019-11-18 09:29:17 +01:00
6a27207875
gotthard2: vetoref, burstmode
2019-11-15 18:59:27 +01:00
5518531620
gotthard2: veto reference
2019-11-14 19:01:10 +01:00
28a5aa8342
injectchannel WIP
2019-11-13 15:11:11 +01:00
d7e2ab8ec4
gotthard2: on chip dacs
2019-11-08 17:09:57 +01:00
18b8720c17
separated parameters and versions
2019-11-06 16:43:59 +01:00
1f64d2a4e2
speed separated
2019-11-05 18:50:35 +01:00
031241ae28
timer split up
2019-11-04 16:40:11 +01:00
ba9a0c7917
removed unused multi functions
2019-10-30 18:20:16 +01:00
4155e301b8
WIP
2019-10-28 16:48:13 +01:00
3fdae431b0
WIP
2019-10-28 15:47:18 +01:00
19b85b8e40
WIP
2019-10-28 11:56:15 +01:00
61d7c76d55
WIP
2019-10-28 11:34:58 +01:00
f4a0780b51
patloops done
2019-10-24 18:59:23 +02:00
Dhanya Thattil
995f0924e5
Commandline ( #66 )
...
* WIP
* WIP
* removed status to string from defs
* WIP
* WIP
* WIP removed unused functions in multi
* WIP
* print hex in a terrible way
* WIP, loadconfig error
* WIP, type to string
* WIP
* fix to conversion
* WIP, hostname doesnt work
* WIP
* WIP
* WIP
* WIP, threshold
* WIP, threshold
* WIP
* WIP, triggers
* WIP, cycles to triggers
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* rx_udsocksize fx, WIP
* WIP
* WIP
* WIP
* file index (64 bit), WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* merge
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* New python mod
2019-10-21 10:29:06 +02:00
be50344b45
set clock divider, phase and get clock freq for gotthard2, priliminary
2019-10-17 16:39:41 +02:00
Dhanya Thattil
ca054626e6
Removeudpcache ( #65 )
...
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* solved eiger 1-10g issue
* some fixes for remove udp cache to work
* bug fix virtual
* removed special handling of rx_udpip
2019-09-30 14:46:25 +02:00
Erik Frojdh
07f71d3886
more funcs
2019-09-20 17:46:52 +02:00
