4726 Commits

Author SHA1 Message Date
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
d17fd54a9d undoing changes from refgui 2019-04-12 10:01:48 +02:00
9543171504 merge from refgui. not completed 2019-04-12 09:12:44 +02:00
74f2783b10 Client (data call back API) and Gui (Eiger 4 bit mode with multiple images) bug fix: npixelsx and npixelsy was not updated to complete detector level when calling call back function to give complete image 2019-04-11 16:21:25 +02:00
Erik Frojdh
4a5cb011f7 ver in meta 2019-04-11 14:38:49 +02:00
Erik Frojdh
dce7dcbfd4 partial frames 2019-04-11 12:14:52 +02:00
Erik Frojdh
d00fd70d6d integration test 2019-04-11 11:29:34 +02:00
Erik Frojdh
04146e683c updated reading 2019-04-10 16:54:33 +02:00
Erik Frojdh
4b7c5c5950 getFileIndex 2019-04-10 14:16:04 +02:00
Erik Frojdh
92b674354d Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-04-10 12:37:25 +02:00
Erik Frojdh
8cb123cdcb more getters setters 2019-04-10 12:37:16 +02:00
Gemma Tinti
6b5aa5ff66 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-04-10 12:31:34 +02:00
Gemma Tinti
2b377df0bd manual 2019-04-10 12:31:28 +02:00
Erik Frojdh
ec17529c52 seperate get/set 2019-04-10 12:15:19 +02:00
Erik Frojdh
404d3fa677 error handling 2019-04-09 17:35:36 +02:00
Erik Frojdh
026d4019c5 minor 2019-04-09 17:32:54 +02:00
Erik Frojdh
31a4a46fb6 lzmq 2019-04-09 15:23:48 +02:00
Erik Frojdh
8c3691f767 mitigating clang-tidy warnings 2019-04-09 14:31:08 +02:00
Erik Frojdh
70b2a41d5e clang tidy 2019-04-09 10:59:09 +02:00
Erik Frojdh
39221f1230 enable lto 2019-04-08 14:57:10 +02:00