Commit Graph

5498 Commits

Author SHA1 Message Date
maliakal_d a9e375ed34 gotthard2: bursttype to burstmode 2020-01-23 11:03:14 +01:00
maliakal_d f881133795 get/set timing, generate data for gotthard2, vref_rstore instead of restore for gotthard2 2020-01-22 18:18:56 +01:00
maliakal_d 8cbf3c62a9 merge from developer 2020-01-22 17:30:13 +01:00
Dhanya Thattil ffc09ed19c Gotthard2 (#72)
* rearranging

* 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

* gotthard2: first edit

* gotthard2 bug fix: no module attached

* gotthard2: works

* updated client doc for gotthard2: the timers that are used in continuous mode only

* gotthard2 virtual server sends data

* gotthard2: gain updated
2020-01-22 14:03:59 +01:00
maliakal_d 3ea2520615 PR minor changes 2020-01-22 13:55:10 +01:00
Dhanya Thattil d8fccdcefa Merge branch 'developer' into gotthard2 2020-01-21 18:18:57 +01:00
maliakal_d 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
maliakal_d 7131f77a3a eiger: vcal set to 0 2020-01-21 16:10:15 +01:00
maliakal_d f08d430d16 eiger: vcal set to 0 2020-01-21 16:09:39 +01:00
maliakal_d 9c89f6a63d Merge branch 'developer' into gotthard2 2020-01-21 16:05:04 +01:00
maliakal_d e746256653 gotthard2: gain updated 2020-01-21 16:01:38 +01:00
maliakal_d 2e78484b61 gotthard2 virtual server sends data 2020-01-21 14:50:31 +01:00
Erik Frojdh 1908a82627 ctb 2020-01-21 10:44:43 +01:00
maliakal_d bdf3a010c3 updated client doc for gotthard2: the timers that are used in continuous mode only 2020-01-21 10:26:11 +01:00
Erik Frojdh 6bd0256172 pattern stuff 2020-01-21 10:22:26 +01:00
Erik Frojdh 5667353f47 WIP 2020-01-21 09:07:27 +01:00
maliakal_d c4137dc309 gotthard2: works 2020-01-20 17:03:11 +01:00
Erik Frojdh 4b7edf2e62 ctb 2020-01-20 16:46:38 +01:00
Erik Frojdh 0194d7ba1c ctb 2020-01-20 16:37:18 +01:00
maliakal_d 23dffa47df gotthard2 bug fix: no module attached 2020-01-20 14:42:06 +01:00
Erik Frojdh 5c35a33e02 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-01-20 14:27:30 +01:00
Erik Frojdh a0c222b3c6 constructor 2020-01-20 14:23:28 +01:00
maliakal_d 65d95480bd mythen3 bug fix: rxr needs to update dr 2020-01-20 13:50:50 +01:00
maliakal_d 6cfd0f8962 gotthard2: first edit 2020-01-20 12:13:23 +01:00
maliakal_d 6e47f0b7f7 merge resolved 2020-01-20 11:36:35 +01:00
maliakal_d 3c891495db mythen3: bug fix detector type 2020-01-20 11:32:02 +01:00
Erik Frojdh 66b837eb59 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-01-16 16:57:12 +01:00
Erik Frojdh 6170c42618 explicit also in MacAddr 2020-01-16 16:57:04 +01:00
maliakal_d 95030bc55f Merge branch 'developer' into gotthard2 2020-01-16 16:52:08 +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 de57146e1b Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-01-16 16:14:11 +01:00
maliakal_d fb75986c55 mythne3: counters fixed 2020-01-16 16:13:40 +01:00
maliakal_d 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 f3598c1f39 nullptr 2020-01-16 14:17:57 +01:00
Erik Frojdh 9ac08ad5c9 clang-tidy header include order 2020-01-16 14:00:43 +01:00
Erik Frojdh bcb4942793 cleaning 2020-01-16 12:26:22 +01:00
Erik Frojdh 4b69ac5cfc const string& in exceptions constructor 2020-01-16 11:44:01 +01:00
Erik Frojdh 7a00732fa8 various minor things from clang-tidy 2020-01-16 11:39:35 +01:00
Erik Frojdh 30a4a1740f added Mythen3 2020-01-15 17:56:08 +01:00
Erik Frojdh 39ec29c0e6 added counters to python 2020-01-15 17:26:07 +01:00
maliakal_d 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 70c54f4315 added jungfrau again 2020-01-13 18:26:24 +01:00
Erik Frojdh a709384fbb renamed python detector 2020-01-13 16:33:02 +01:00
Erik Frojdh a1abd7587c Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-01-13 16:13:52 +01:00
Erik Frojdh 8c8d213b56 python funcs 2020-01-13 16:13:47 +01:00
maliakal_d 7b31fbc002 eiger virtual server bug fix: increasing subdeadtime 2020-01-13 14:18:43 +01:00
maliakal_d db9aa7589a tests fix 2020-01-13 12:07:30 +01:00
maliakal_d 28f8a76dcc updated binaries 2020-01-10 09:05:26 +01:00