4458 Commits

Author SHA1 Message Date
050854de36 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-03-20 17:34:37 +01:00
cb80cf5f09 receiver missing packets made to have signed for getting more packets than expected 2019-03-20 17:34:29 +01:00
Erik Frojdh
83e43b1bcf format ColumnLimit changed to 100 2019-03-20 17:31:19 +01:00
Erik Frojdh
2a01688683 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-03-20 17:07:29 +01:00
3ff01bf609 removed minor warnings for unused ret 2019-03-20 17:07:02 +01:00
Erik Frojdh
4b2c6af4f5 reorganizing of slsDetectorSoftware 2019-03-20 17:07:02 +01:00
Erik Fröjdh
03402d0e9e Error handling with exceptions in slsDetector and multiSlsDetector (#14)
* less error mask

* removing error mask from slsDetector

* removed ErrorMask

* setonline, setreceiveornline bug fix
2019-03-20 16:23:41 +01:00
9d489dc962 servers, gitinfo script updated; ctb/moench server: delay uses sync clock, 2019-03-20 14:39:24 +01:00
44f0dfc3c0 ctbserver: updated firmware version and api 2019-03-19 18:58:42 +01:00
685fcc31b6 setonline, setreceiveronline was never really setting offline flag, so was never really updating detector first time 2019-03-19 18:42:45 +01:00
Dhanya Thattil
ce6289afda
Merge pull request #13 from slsdetectorgroup/except
new socket overload
2019-03-19 18:01:09 +01:00
Erik Frojdh
4e56107015 new socket overload 2019-03-19 17:49:20 +01:00
430e0e3fb5 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-03-19 17:32:17 +01:00
d8c0fb522a ctb/ moench server fix: usleep of 10 for reading from fifo removed 2019-03-19 17:32:07 +01:00
Dhanya Thattil
ce25c06b41
Merge pull request #12 from slsdetectorgroup/except
refactor getID
2019-03-19 16:58:43 +01:00
Erik Frojdh
6759b2eeb8 refactor getID 2019-03-19 16:27:07 +01:00
Erik Frojdh
38bf540c1a fixed segfault on loading trimbits 2019-03-18 18:10:50 +01:00
Erik Frojdh
43012e4f28 more const more python 2019-03-18 17:38:44 +01:00
Erik Frojdh
98655ee7e3 added missing py file 2019-03-18 12:20:48 +01:00
Erik Frojdh
43d478076c Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-03-18 12:06:49 +01:00
Erik Frojdh
4036e6af8d const qualified multi calls, python fixes 2019-03-18 12:06:39 +01:00
fad73a57aa minor 2019-03-18 09:19:04 +01:00
Erik Frojdh
c0d5303b70 removed pycache 2019-03-15 17:59:36 +01:00
Erik Frojdh
3356c2d3f6 all python version 2019-03-15 15:01:44 +01:00
Erik Frojdh
3f45d39c8d deploy on all branches 2019-03-15 14:37:01 +01:00
Erik Frojdh
4e94995142 conda build 2019-03-15 14:23:51 +01:00
Erik Frojdh
c93b78c74f working 2019-03-15 13:50:50 +01:00
Erik Frojdh
73af4a744f added pybind11 v2.2 as submodule 2019-03-15 11:05:12 +01:00
Erik Frojdh
6ddde83c81 python 2019-03-15 11:01:36 +01:00
bb93147537 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-03-15 10:37:54 +01:00
1eff8485dd receiver listener bug fix from previous commit 2019-03-15 10:37:47 +01:00
Erik Frojdh
c153be95d1 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-03-15 10:15:50 +01:00
Erik Frojdh
4943983d10 det id const and ini shm in constructor 2019-03-15 10:15:42 +01:00
5fe7a86361 switching udpsocketbuffersize from uitn64_t to int64_t, printing socket exception into tcp error mess, changing an exception message 2019-03-15 10:00:22 +01:00
Erik Frojdh
7522a655df removing warning in gcc 2019-03-14 17:38:40 +01:00
Erik Frojdh
836eb8cde2 explicit override 2019-03-14 17:15:58 +01:00
Erik Frojdh
9f724f0c0d using only sls exceptions 2019-03-14 17:09:44 +01:00
Erik Frojdh
bad44f5bf4 moving SharedMemory into namespace sls 2019-03-14 16:51:38 +01:00
Erik Frojdh
40d2f66146 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-03-14 16:37:46 +01:00
Erik Frojdh
9639e480d9 new exceptions 2019-03-14 16:37:36 +01:00
8520492e4b lock server bug: sending lockstatus converts to littleendian for eiger, lastclient should have other as datatype for eiger 2019-03-14 14:14:14 +01:00
be33102164 checkonline, checkrecieveronline, retval has offline hostnames, online flag should be set no matter what the outcome 2019-03-14 13:18:42 +01:00
5235a87e93 Merge branch 'detshm' into refactor 2019-03-14 12:42:08 +01:00
cb687d805e merge conflict 2019-03-14 12:41:37 +01:00
327d08a016 removing comments, added one check for nullptr, updated current threshold when getting module, removing unsued function from header file (writesettingsfile) 2019-03-14 12:40:01 +01:00
Erik Frojdh
1960460e43 upgraded catch to 2.7 2019-03-14 10:47:43 +01:00
Erik Frojdh
e42e8f5bf6 option for sanitizers 2019-03-14 10:44:31 +01:00
Erik Frojdh
c9422befff fixed loading trimbits 2019-03-14 10:21:18 +01:00
c56efdec8a Merge branch 'refactor' into detshm 2019-03-14 09:11:27 +01:00
14131f93f1 sanitizer compile fail 2019-03-14 09:06:44 +01:00