4221 Commits

Author SHA1 Message Date
b38a41493b bug fix, clock divider hangs due to incorrect number of arguments 2019-01-10 16:27:23 +01:00
Erik Frojdh
37c22dfeb2 range based loops and bool literals 2019-01-10 16:07:47 +01:00
Erik Frojdh
15235ab4fc default initializer for slsDetector 2019-01-10 16:02:29 +01:00
Erik Frojdh
230c335c29 using default initializer arguments for multiSlsDetector 2019-01-10 15:53:09 +01:00
Erik Frojdh
0f50b9f161 clang-tidy nullptr 2019-01-10 15:28:43 +01:00
Erik Frojdh
58f97d4f46 clang-tidy push_back -> emplace_back 2019-01-10 15:24:58 +01:00
42ed65076c jungfrau server works now, need to be tested with pedestals for dac 2019-01-10 12:22:43 +01:00
b5b5ce5c37 eiger server works 2019-01-10 11:03:31 +01:00
55c57e4c3f Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-01-10 10:35:58 +01:00
52785c6642 gotthard server works 2019-01-10 10:35:49 +01:00
Erik Frojdh
f815e7ffb6 long -> int64_t 2019-01-10 09:33:59 +01:00
0a2c1d1406 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-01-09 17:41:19 +01:00
b1570bde9c updated max1932, modified ltc2620 2019-01-09 17:41:10 +01:00
Erik Frojdh
93ec5f5ef7 minor 2019-01-09 16:22:14 +01:00
Erik Frojdh
feaa276284 range based loops 2019-01-09 14:20:48 +01:00
Erik Frojdh
26f8ca3221 clang-tidy fix from NULL 0 etc to nullptr 2019-01-09 12:02:49 +01:00
Erik Frojdh
b7aac059c3 moved string stuff to string_utils.h/.cpp 2019-01-09 11:19:16 +01:00
81a49babda gotthard server fixed: also for revision 1 boards 2019-01-08 11:52:14 +01:00
553633651a insignificant 2019-01-08 07:52:24 +01:00
bf4ba9d08b some minor modifications 2019-01-08 06:57:04 +01:00
4b007b003a gotthard server works, fine tuning left 2019-01-08 06:52:28 +01:00
06a6d53a3f gotthard, cmakefiles language line removed 2019-01-04 16:34:34 +01:00
bfda07d262 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-12-19 17:16:54 +01:00
a013734af8 moench and lookinginto max1932 2018-12-19 17:16:41 +01:00
Erik Frojdh
84a67870a0 slight cleanup of dumpDetectorSetup 2018-12-19 16:38:18 +01:00
f161d68efc fix in ltc, added moench, separated servers, left to do max1932, client side for moench and more detailed in ctb server side 2018-12-19 16:38:18 +01:00
Erik Frojdh
1ca8bf204a added string_utils and strcpy_safe 2018-12-19 15:44:21 +01:00
Erik Frojdh
89d9204e1c changed fd and some unused store 2018-12-19 12:24:02 +01:00
Erik Frojdh
88b9a93b3e fixed 2018-12-19 11:51:42 +01:00
Erik Frojdh
1af2d95462 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-12-19 11:45:24 +01:00
Erik Frojdh
d07f53cd6f removed using namespace std in slsDetectorCommand.cpp 2018-12-19 11:31:49 +01:00
6533a474d1 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-12-18 18:07:27 +01:00
Erik Frojdh
7a432befa3 removed gui from meta.yaml 2018-12-17 15:19:14 +01:00
Erik Frojdh
f68321af43 disable GUI in conda build 2018-12-17 15:05:22 +01:00
Erik Frojdh
2dd8093905 added project to CMakeLists and path for installing 2018-12-17 14:55:19 +01:00
Erik Frojdh
659faa9aaa added it back 2018-12-12 16:31:36 +01:00
Erik Frojdh
feeaebb7e4 removed branch condition 2018-12-12 16:28:58 +01:00
Erik Frojdh
547efc48e3 added conda recipe 2018-12-12 16:27:35 +01:00
1c59c5c4f4 in between 2018-12-12 11:20:39 +01:00
79693a38f5 in between 2018-12-12 11:20:27 +01:00
87f7563035 gothard server bug fix: conf gain val instead of always dynamic gain 2018-12-05 10:35:57 +01:00
a4de4bb475 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-12-04 16:05:17 +01:00
b3393fc18b few gotthard bug fixes, including cs mask for adc 2018-12-04 16:02:24 +01:00
4e65a1d964 gotthard server: minor fixes 2018-12-04 14:12:11 +01:00
98b5e893b1 rd strobe fifo for only analog fifos 2018-12-03 14:33:32 +01:00
8f3f9caf2b almost done with ctb update, need to do slow adcs, split to moench and ctb 2018-11-30 10:39:26 +01:00
Erik Frojdh
d0665ce075 tests for socket 2018-11-29 12:21:02 +01:00
Erik Frojdh
284ce30a81 starting tests 2018-11-28 14:45:50 +01:00
c19c787904 adcreg command line print 2018-11-12 15:14:37 +01:00
e3a0c1373c created AD9252 for old gotthard modules in use, it runs in both roi and non roi for old and new modules, data needs to be checked by Jiaguo to confirm some parts of the code that has FIXME to be checked later 2018-11-12 13:51:51 +01:00