5470 Commits

Author SHA1 Message Date
Erik Frojdh
a0c222b3c6 constructor 2020-01-20 14:23:28 +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
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
de57146e1b Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-01-16 16:14:11 +01:00
fb75986c55 mythne3: counters fixed 2020-01-16 16:13:40 +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
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
7b31fbc002 eiger virtual server bug fix: increasing subdeadtime 2020-01-13 14:18:43 +01:00
db9aa7589a tests fix 2020-01-13 12:07:30 +01:00
28f8a76dcc updated binaries 2020-01-10 09:05:26 +01:00
Erik Frojdh
dac5ecd123 dbit 2020-01-08 16:44:42 +01:00
Erik Frojdh
71b0ed271e CTB 2020-01-08 15:33:28 +01:00
Erik Frojdh
c223f00511 Eiger 2020-01-08 14:55:16 +01:00
Erik Frojdh
639ed52d65 pybind 2.4 2020-01-07 16:30:59 +01:00
Erik Frojdh
6943763e3d Updated pybind11 to 2.4.3 2020-01-07 16:30:12 +01:00
Erik Frojdh
4b3b518401 asamples dsamples 2020-01-07 16:18:36 +01:00
Erik Frojdh
7379b1e2ef added python3.8 2020-01-07 15:48:38 +01:00
Erik Fröjdh
ed2a69744b
Auto generating Python bindings (#70)
Auto generating python bindings
2020-01-07 15:47:38 +01:00
086cbacd84 mythen3: connected busy signal insttead of timer 2019-12-10 11:03:27 +01:00
af9b25fd67 eiger: validate trimval range 2019-12-10 10:32:28 +01:00
504fc2d095 ctb: validate asampes and dsamples > 0 for romode; client: exception caught in acquire to stop receiver and clear busy flag 2019-12-10 10:25:14 +01:00
5cf1502287 ctb bug fix: 10g adc enable mask 2019-12-09 11:30:54 +01:00
8881542156 ctb bug fix: clkioctrl not taken in hex 2019-12-05 17:15:31 +01:00
Erik Frojdh
d9ae9a8cc6 eiger test 2019-12-05 11:00:55 +01:00
Erik Frojdh
6765eb0c94 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-12-04 10:25:25 +01:00
Erik Frojdh
be3d82b7b4 format 2019-12-04 10:25:17 +01:00
Dhanya Thattil
4e0d1fa711
ctb rxr for pawel: updated packetsize to 8192 (datasize to 8144) 2019-12-03 17:25:39 +01:00
Erik Frojdh
619106e05f eiger tests 2019-12-03 11:47:49 +01:00
Erik Frojdh
9bc60518d8 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-12-03 10:12:58 +01:00
Erik Frojdh
12d168a6ef const strref 2019-12-03 10:12:47 +01:00
1a8337540a rxr: switched to threads for threadObject (from pthread), moved priorities to threadObject, mutex 2019-11-29 16:19:02 +01:00
16bec25b0c rxr: pthread to thread and created and destroyed tcp thread in constructor and destructor 2019-11-29 15:17:41 +01:00
f178b0da39 Merge branch 'rxr' into developer 2019-11-29 11:10:05 +01:00
2ece6b945e rxr: warnings shouldnt throw exception 2019-11-29 11:09:41 +01:00
1d6be74ee5 rxr: removed return ok or fail and replaced with exceptions 2019-11-29 10:29:36 +01:00
Erik Frojdh
07455bb11e Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-11-27 18:42:27 +01:00
Erik Frojdh
f4cdd759b0 clang-tidy 2019-11-27 18:42:16 +01:00
796890d1c8 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-11-27 18:25:14 +01:00