Commit Graph

729 Commits

Author SHA1 Message Date
maliakal_d 06bd6dfd53 Merge branch 'developer' into moenchUpdated 2020-03-03 16:37:31 +01:00
Erik Frojdh 1efacc9475 cleaning up headers 2020-03-03 11:33:28 +01:00
Erik Frojdh b2d88b441a removed comments 2020-03-03 11:17:26 +01:00
maliakal_d 6bbcf6173d moench: first version 2020-03-02 18:34:10 +01:00
maliakal_d 87d48fd943 bugfix rxr numpacketscaught if stopped 2020-02-24 15:02:01 +01:00
Erik Frojdh f1bce15a57 replaced udp socket 2020-02-17 17:43:14 +01:00
Erik Frojdh 40bfca588b minor from clang-tidy 2020-02-04 10:36:03 +01:00
Erik Frojdh ec66079f65 renamed ServerInterface 2020-02-04 08:57:35 +01:00
maliakal_d 42124ca97c eiger rxr: setting exptime now also sets subperiod in rxr master file 2020-02-03 15:54:41 +01:00
Erik Frojdh 6bb1188c37 renamed exes 2020-02-03 14:43:40 +01:00
Erik Frojdh 254e8f85d8 moved non public headers 2020-02-03 14:38:24 +01:00
maliakal_d af2f2708ad rxr: remove file buffering 2020-01-28 13:55:44 +01:00
maliakal_d c42b4b8c0e incorrect printout to MB 2020-01-28 10:43:06 +01:00
maliakal_d d9b88ea7d2 performance optimization in fifodepth, ensure memory is allocated by writing something in the beginning 2020-01-27 20:10:49 +01:00
maliakal_d 9f22c80081 Revert "performance optimization in fifodepth, ensure memory is allocated by writing something in the beginning"
This reverts commit ab6f448e1f.
2020-01-27 19:59:18 +01:00
maliakal_d ab6f448e1f performance optimization in fifodepth, ensure memory is allocated by writing something in the beginning 2020-01-27 18:34:10 +01:00
maliakal_d 53e5a097ab rxr: semaphore instead of keeprunning variable at startup 2020-01-27 18:03:03 +01:00
maliakal_d e527aad6ab bugfix: high fifo depth more than 32 bit 2020-01-27 15:25:41 +01:00
maliakal_d a0208778c1 bugfix: high fifo depth more than 32 bit 2020-01-27 15:21:19 +01:00
maliakal_d c4137dc309 gotthard2: works 2020-01-20 17:03:11 +01:00
maliakal_d 69dd5f3b5e Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-01-16 16:37:44 +01:00
Erik Frojdh c1fac7cdb7 fixed conversion for IpAddr 2020-01-16 16:31:11 +01:00
maliakal_d fb75986c55 mythne3: counters fixed 2020-01-16 16:13:40 +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
maliakal_d 1a8337540a rxr: switched to threads for threadObject (from pthread), moved priorities to threadObject, mutex 2019-11-29 16:19:02 +01:00
maliakal_d 16bec25b0c rxr: pthread to thread and created and destroyed tcp thread in constructor and destructor 2019-11-29 15:17:41 +01:00
maliakal_d 2ece6b945e rxr: warnings shouldnt throw exception 2019-11-29 11:09:41 +01:00
maliakal_d 1d6be74ee5 rxr: removed return ok or fail and replaced with exceptions 2019-11-29 10:29:36 +01:00
maliakal_d 9455a5fba1 ctb: adcenable10g included, 10g readout enables included 2019-11-27 17:28:57 +01:00
maliakal_d b0073597f7 rxr: effective userid option in rxr 2019-11-22 17:03:08 +01:00
maliakal_d 8727a93e3e WIP 2019-11-21 12:35:07 +01:00
maliakal_d 83221ee955 Rxr: rearrangng in implementation 2019-11-21 12:23:32 +01:00
maliakal_d 398f3734ec rxr: missing packets, stopacquistion lets rxr know to calculate missing packets from last frame caught 2019-11-20 16:16:14 +01:00
maliakal_d f96f716f39 rxr: stop printing forever about weird carry flag frame 2019-11-20 12:13:35 +01:00
maliakal_d dfc886a65b mythen3 gui 2019-11-18 17:57:19 +01:00
maliakal_d c4e7086d99 rxr: renamed files, removed unnecessary comments 2019-11-18 16:19:46 +01:00
maliakal_d 5ce79ec9fa WIP 2019-11-18 15:20:58 +01:00
maliakal_d dc78e23449 rxr: removed slsReceiverUsers, start() and stop() 2019-11-18 15:16:20 +01:00
maliakal_d f2c0ff7f98 rxr: removed char array memebers in rxrimplementation 2019-11-18 14:29:01 +01:00
maliakal_d 38ad5d7931 mythen3 rxr 2019-11-08 18:11:27 +01:00
maliakal_d 18b8720c17 separated parameters and versions 2019-11-06 16:43:59 +01:00
maliakal_d 031241ae28 timer split up 2019-11-04 16:40:11 +01:00
maliakal_d fe467cdf70 jungfrau dacs named 2019-10-29 18:11:16 +01:00
maliakal_d eb2040f0a7 fixed effects of scan 2019-10-29 14:43:51 +01:00
maliakal_d 4b2cb7ecc1 WIP 2019-10-29 11:35:25 +01:00
maliakal_d badff47663 WIP 2019-10-29 11:05:20 +01: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
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
Dhanya Thattil 5bcde789ac Readoutflags (#61)
* WIP

* eiger binary back wih versioning

* fixed readout flag in ctbgui, added speedLevel enum

* ctbgui: fixed a print out error

* ctb readout bug fix

* WIP

* WIP

* WIP
2019-09-02 19:27:27 +02:00
maliakal_d a98271f0c2 merge resolved 2019-08-21 14:25:21 +02:00