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 |
|
Erik Frojdh
|
d21ceb0e75
|
only construct shared memory from a type with exact size
|
2019-03-13 17:43:48 +01:00 |
|
Erik Frojdh
|
9a08c85b2a
|
changed the shared memory of slsDetector
|
2019-03-13 17:38:27 +01:00 |
|
Erik Frojdh
|
85134443de
|
initial
|
2019-03-13 16:29:29 +01:00 |
|
|
7d3d2a8b31
|
ctb and moench server: pll vco clock changed from 400 to 800,ctb server: max adc clock from 40 to 65MHz
|
2019-03-13 16:03:11 +01:00 |
|
|
75ce111344
|
Merge branch 'shm' into refactor
|
2019-03-13 15:21:12 +01:00 |
|
|
f8aa0e3d6d
|
removed minor commented lines
|
2019-03-13 15:19:32 +01:00 |
|
|
2dcef909ca
|
Merge branch 'refactor' into shm
|
2019-03-13 14:22:26 +01:00 |
|
|
ec18db868f
|
ctb, moench, jungfrau server: changing phase only changes one clock in one direction. ctb and moench phase shift connected to adc clk, instead of run clk
|
2019-03-13 08:37:45 +01:00 |
|
Erik Frojdh
|
7e793539ca
|
removed typedef for shared struct
|
2019-03-12 14:42:27 +01:00 |
|
Erik Frojdh
|
d4e4fb8ffe
|
move constructor deleted copy constructor
|
2019-03-12 14:37:06 +01:00 |
|
Erik Frojdh
|
48e4cec56f
|
minor
|
2019-03-12 11:52:13 +01:00 |
|
Erik Frojdh
|
3b2c734efd
|
adding tests
|
2019-03-12 11:43:28 +01:00 |
|
Erik Frojdh
|
507a22ac05
|
default args
|
2019-03-12 10:14:24 +01:00 |
|
Erik Frojdh
|
a01d68a61f
|
initial changes
|
2019-03-12 08:22:07 +01:00 |
|
|
6765fd0dc8
|
ctb moench: bugfix for fifofull, should not read pattern, same as executing it
|
2019-03-08 16:59:44 +01:00 |
|
|
ae5938799f
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-03-08 16:16:53 +01:00 |
|
|
19b21dac88
|
Listener bug fix: switching to make_unique ptr side effects, the dummy socket still alive when destructor of listener called
|
2019-03-08 16:16:40 +01:00 |
|
Erik Frojdh
|
b8f071dcf6
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-03-08 15:13:23 +01:00 |
|