4769 Commits

Author SHA1 Message Date
Gemma Tinti
c15e72510c new commands 2019-03-22 17:41:14 +01:00
Gemma Tinti
ac1511c3b0 rmem max 2019-03-22 16:35:42 +01:00
cd5aea895b jungfrau server: changes for new firmware, aligning adc deserializer. ctb serveR: removed unnecessary pll reset and polling mode for pll 2019-03-22 15:09:29 +01:00
5bf37a4f0d changes to jungfrau server 2019-03-22 11:27:15 +01:00
6cb043b2d9 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-03-21 16:30:25 +01:00
fa34ad435b server: pll fix 2019-03-21 16:30:18 +01:00
Gemma Tinti
c5178bc4de manual 2019-03-21 16:29:36 +01:00
Gemma Tinti
c89fad45a9 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-03-21 15:09:19 +01:00
Gemma Tinti
6c4fad01d4 manual 2019-03-21 15:09:10 +01:00
eb3dff3a6c eiger server 2019-03-21 14:15:52 +01:00
d9503bebf9 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-03-21 14:13:15 +01:00
b99606211b ctb server: altera pll odd division fix 2019-03-21 14:13:07 +01:00
Gemma Tinti
039e658773 manual 2019-03-21 11:46:38 +01:00
Gemma Tinti
92ca22fc09 manual 2019-03-20 18:34:44 +01:00
Erik Frojdh
d4ac6fe160 gitinfo as public 2019-03-20 17:48:01 +01:00
Erik Frojdh
8cb0f3a29c Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-03-20 17:41:57 +01:00
Erik Frojdh
c16f9b8c30 specify detector or receiver in error 2019-03-20 17:41:46 +01:00
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