168 Commits

Author SHA1 Message Date
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
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
9455a5fba1 ctb: adcenable10g included, 10g readout enables included 2019-11-27 17:28:57 +01:00
83221ee955 Rxr: rearrangng in implementation 2019-11-21 12:23:32 +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
031241ae28 timer split up 2019-11-04 16:40:11 +01:00
828859838b WIP 2019-10-29 10:44:10 +01:00
4155e301b8 WIP 2019-10-28 16:48:13 +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
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
f123a280bb added save pattern, printout of some of the pattern for command line 2019-08-27 16:41:38 +02:00
7abb18e5c8 added load paramaters to detector.h 2019-08-27 11:24:53 +02:00
Dhanya Thattil
aafe049a9b
Guidetector (#54)
* WIP

* dacWidget

* main WIP

* advanced WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* works

* updated gui to chrono

* review fixes

* unitque ptrs in gui
2019-08-26 19:14:22 +02:00
Erik Fröjdh
9a48d9b832
Intcmd (#53)
* migrated more

* more
2019-08-23 17:39:41 +02:00
4b0fb5029f WIP 2019-08-21 12:45:08 +02:00
62c4bfab64 WIP 2019-08-21 09:23:32 +02:00
28963e313b removed gotthard functions not used 2019-08-20 18:18:34 +02:00
ea5ac6ad03 WIP 2019-08-20 13:20:25 +02:00
0c4ae89cd9 WIP 2019-08-20 11:20:12 +02:00
38b7e23ac4 WIP 2019-08-20 10:55:55 +02:00
3881e2cd21 WIP 2019-08-19 20:36:42 +02:00
ee4aa94bbe WIP 2019-08-19 18:03:19 +02:00
eebd1552f2 WIP 2019-08-19 15:55:42 +02:00
a0bdfcdae3 WIP 2019-08-16 17:38:41 +02:00
947252c852 WIP 2019-08-16 09:45:49 +02:00
Erik Frojdh
d14fdc3a3f WIP 2019-08-14 17:40:30 +02:00
Erik Frojdh
8e2b89d488 fixed python 2019-08-14 11:54:03 +02:00
Erik Frojdh
d191cee548 Merge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya 2019-08-14 09:31:51 +02:00