5326 Commits

Author SHA1 Message Date
6b7d9445aa jungfrau highvoltage added to config file 2019-07-19 12:17:27 +02:00
078a2e9e6a jungfrau server: firmware version update for v2.0 2019-07-18 11:32:50 +02:00
058e16b872 gui: fixed gain plot size 2019-07-18 10:20:33 +02:00
3ef8b392db rx_hostname command line bug: should not setreceiveronline if connecting to a new receiver without clearing shm 2019-07-17 17:02:40 +02:00
8cdfe4194f gui works, including clone plots 2019-07-17 16:58:04 +02:00
d3879bb834 WIP 2019-07-15 15:47:05 +02:00
4f5b8c17b2 WIP 2019-07-15 15:46:38 +02:00
0f2641f9fa WIP 2019-07-12 18:24:23 +02:00
5e24591295 Merge branch 'developer' into gui 2019-07-12 10:36:54 +02:00
40c3c78024 client bug fix: framesl, cyclesl printed in float, fixed 2019-07-10 11:18:24 +02:00
cc769c5a96 WIP 2019-07-10 09:23:11 +02:00
d344365470 WIP 2019-07-08 13:46:54 +02:00
74bb7a3f1b WIP 2019-07-08 12:18:29 +02:00
4b10991429 WIP 2019-07-05 19:12:46 +02:00
0e0e5db7c5 WIP 2019-07-05 18:17:55 +02:00
8ac7d96ef3 WIP 2019-07-05 08:54:50 +02:00
c582ba15d5 WIP 2019-07-04 16:40:25 +02:00
6a60f7d222 WIP 2019-07-03 18:21:44 +02:00
659e19a856 WIP 2019-07-02 17:59:21 +02:00
4c23c0290d Merge branch 'developer' into gui 2019-07-02 17:50:51 +02:00
d2e4adf483 eiger server bug fix: get dacs conversion wrong 2019-07-02 17:50:39 +02:00
0954bdd2d3 Merge branch 'developer' into gui 2019-07-02 17:29:50 +02:00
f4fa19b559 bugfix rxr: checkonline prints error msg, call receiverversion instead 2019-07-02 17:29:38 +02:00
864db79a13 WIP 2019-07-02 17:11:03 +02:00
455252f2f3 WIP 2019-07-02 13:51:31 +02:00
5e6eb45f56 Merge branch 'gui' of github.com:slsdetectorgroup/slsDetectorPackage into gui 2019-07-02 13:51:03 +02:00
975076043f WIP 2019-07-02 13:50:20 +02:00
Erik Frojdh
00eaad3416 cmake 2019-07-02 12:42:58 +02:00
Erik Frojdh
cbe979b4b9 fixed merge 2019-07-02 12:16:05 +02:00
Erik Frojdh
44aa3f655b cmath + cleaning 2019-07-02 12:11:45 +02:00
fc2cc7e00c WIP 2019-07-02 12:09:37 +02:00
Erik Frojdh
547ab8a749 Merge branch 'developer' into gui 2019-07-02 10:54:29 +02:00
e16b857ba2 ctb server: hv select is actually internal hv select 2019-07-02 10:15:25 +02:00
e22d03a744 WIP 2019-07-02 09:13:47 +02:00
a373609b08 WIP 2019-06-28 18:16:32 +02:00
039a725c5c WIP. removed qServer 2019-06-28 11:57:37 +02:00
9f61104f0d WIP 2019-06-27 16:39:53 +02:00
06834617de WIP 2019-06-27 11:54:17 +02:00
61b937e2e0 WIP. catching exceptions using macros to ignore socket and shm error 2019-06-25 17:27:30 +02:00
Erik Fröjdh
3bb0daeefb moved libs (#36) 2019-06-25 11:20:31 +02:00
Erik Fröjdh
d3101baacb receiver create path (#35) 2019-06-25 11:14:04 +02:00
bd3e439d87 Merge branch 'developer' into gui 2019-06-25 10:51:17 +02:00
136e00d15e Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-06-25 10:51:00 +02:00
7c18ad3c53 removed Critical and Noncritical exceptions 2019-06-25 10:50:52 +02:00
3db09bc0cd Merge branch 'developer' into gui 2019-06-25 09:08:29 +02:00
33f5253831 QIP 2019-06-21 18:19:39 +02:00
Erik Frojdh
c466623e86 fix 2019-06-21 17:38:49 +02:00
Erik Frojdh
e80ce1b4c4 added -h --help option to display help 2019-06-21 17:27:47 +02:00
Erik Frojdh
2d3f5a03ca syncclk for python 2019-06-19 17:31:49 +02:00
4b69c01357 ctb server: sync clk get added 2019-06-19 16:55:24 +02:00