Erik Frojdh
|
72091f47d9
|
format and mod constructor
|
2019-04-23 10:48:31 +02:00 |
|
|
|
21cab38921
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-04-18 17:18:14 +02:00 |
|
|
|
3d40fb2d2c
|
ctb address check, integration test added for ctb pattern
|
2019-04-18 17:18:01 +02:00 |
|
Erik Frojdh
|
83c2775d6c
|
fixed python
|
2019-04-18 15:57:59 +02:00 |
|
Erik Frojdh
|
e3859c3097
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-04-18 15:40:30 +02:00 |
|
Erik Frojdh
|
833ca071c4
|
fix
|
2019-04-18 15:40:20 +02:00 |
|
|
|
45884a72da
|
eiger binary updated
|
2019-04-18 15:35:36 +02:00 |
|
|
|
61aa673be9
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-04-18 15:32:25 +02:00 |
|
|
|
1bc6e7f978
|
conflict resolved
|
2019-04-18 15:32:07 +02:00 |
|
Erik Frojdh
|
202d88d6be
|
experimental python
|
2019-04-18 15:31:07 +02:00 |
|
|
|
266520741a
|
ctb patterns interface rewritten
|
2019-04-18 15:29:43 +02:00 |
|
Erik Frojdh
|
faf7e0db82
|
fix
|
2019-04-18 15:09:36 +02:00 |
|
Erik Frojdh
|
7aaaeae30c
|
minor
|
2019-04-18 15:06:17 +02:00 |
|
Erik Frojdh
|
86afb2bd0e
|
more ctb commands
|
2019-04-18 15:03:01 +02:00 |
|
Erik Frojdh
|
a29466b396
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-04-18 13:39:53 +02:00 |
|
Erik Frojdh
|
c7259538e9
|
python commands
|
2019-04-18 13:39:43 +02:00 |
|
|
|
ff4ce48e5d
|
receiver memory alignment: all data and header is a multiple of 64 bit, just the fifo header size needed to be 8
|
2019-04-18 11:35:08 +02:00 |
|
|
|
f3beda6bcf
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-04-18 11:16:33 +02:00 |
|
|
|
8256b7ba84
|
eiger receiver fix: setting eth2 as well for eiger
|
2019-04-18 11:16:02 +02:00 |
|
Erik Frojdh
|
7c4aa7f3a7
|
added commands to python
|
2019-04-18 10:53:06 +02:00 |
|
Erik Frojdh
|
1e19b99a78
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-04-18 09:33:23 +02:00 |
|
Erik Frojdh
|
f591adccb8
|
added getPatternLoop
|
2019-04-18 09:33:14 +02:00 |
|
|
|
7abe070ea8
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-04-18 09:27:26 +02:00 |
|
|
|
708975acb5
|
receiver bug fix: function pointer not initialized as null in dataprocessor
|
2019-04-18 09:27:02 +02:00 |
|
Erik Frojdh
|
849d3ba049
|
removed create and delete module
|
2019-04-17 17:17:59 +02:00 |
|
Erik Frojdh
|
ee20cfab1e
|
removed pointers added constructor
|
2019-04-17 16:19:18 +02:00 |
|
Erik Frojdh
|
b46e107f35
|
moved detParameters to sls_detector_defs
|
2019-04-17 14:28:53 +02:00 |
|
Erik Frojdh
|
91813a2c68
|
moved sls_detector_module outside slsDetectorDefs class
|
2019-04-17 09:27:45 +02:00 |
|
Erik Frojdh
|
cedde395a0
|
conda meta
|
2019-04-17 09:05:21 +02:00 |
|
Erik Frojdh
|
c7169f3c36
|
moved setDetectorSpecific parameters to constructor of detectorParameters
|
2019-04-16 12:15:31 +02:00 |
|
Erik Frojdh
|
dd6bb85230
|
clang-tidy fix
|
2019-04-16 10:31:04 +02:00 |
|
Erik Frojdh
|
bad8b99b25
|
clang-tidy fix
|
2019-04-16 10:21:35 +02:00 |
|
Erik Frojdh
|
001ce4a93e
|
clang-tidy warnings
|
2019-04-16 09:28:29 +02:00 |
|
Erik Frojdh
|
0527880747
|
slsDetector implicit conversion
|
2019-04-16 09:15:17 +02:00 |
|
Erik Frojdh
|
d31446ce07
|
unused values and comments
|
2019-04-15 18:14:58 +02:00 |
|
Erik Frojdh
|
0cc0c2715b
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-04-15 17:22:40 +02:00 |
|
Erik Frojdh
|
248306d570
|
minor
|
2019-04-15 17:22:31 +02:00 |
|
|
|
6b4d6084f5
|
merge conflict resolved
|
2019-04-12 19:23:16 +02:00 |
|
|
|
79c6f5310b
|
eiger server and client: cleaning up setting of dynamic range for eiger, where multi client takes care of checking rate correction in a separate call, tests included
|
2019-04-12 19:20:31 +02:00 |
|
|
|
f59b172cfd
|
adding python to cmk.sh
|
2019-04-12 17:14:11 +02:00 |
|
|
|
25d7781878
|
ctb bug fix:digitial io delay and led were checking if receiver was online instead of detector
|
2019-04-12 15:33:15 +02:00 |
|
|
|
721f80a493
|
Merge branch 'refactor' into dynamicrange
|
2019-04-12 14:16:20 +02:00 |
|
|
|
192ac229e9
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-04-12 14:05:46 +02:00 |
|
|
|
4cbf8483ba
|
ctb version update
|
2019-04-12 14:05:25 +02:00 |
|
Erik Frojdh
|
77c1ffffb1
|
fix
|
2019-04-12 11:32:46 +02:00 |
|
Erik Frojdh
|
c16b19ed1f
|
supress waring on gcc<6
|
2019-04-12 11:31:03 +02:00 |
|
Erik Frojdh
|
cafca86bbf
|
removed ascii from file formats
|
2019-04-12 11:12:58 +02:00 |
|
|
|
89a06f099c
|
merging refactor (replacing)
|
2019-04-12 10:53:09 +02:00 |
|
|
|
6c7c91307b
|
Merge branch 'developer' into refactor (keeping everything from refactor -s ours)
|
2019-04-12 10:51:05 +02:00 |
|
|
|
5fdb090926
|
fixing warnings, and completing bug fix of gui and data gui call back
|
2019-04-12 10:13:02 +02:00 |
|
