5764 Commits

Author SHA1 Message Date
6091271f37 somenthing on calibration 2020-03-19 11:41:55 +01:00
272a8bfaf1 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-03-19 11:36:44 +01:00
75692c3539 zmq server address copy warning fix 2020-03-19 11:36:32 +01:00
Erik Frojdh
46e9b450c0 assume dec unless 0x 2020-03-19 11:09:20 +01:00
Erik Frojdh
40c5ccfe37 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-03-19 10:30:15 +01:00
Erik Frojdh
bf1b1a2d9e string conversion for uint 2020-03-19 10:30:05 +01:00
b608ec6fbd zmqsocket: fname to string to remove warning in copying maxstr in maxstr in json header 2020-03-19 10:24:08 +01:00
Dhanya Thattil
4813b5567a
Minimal shared memory for receiver 2020-03-19 07:01:32 +01:00
Erik Frojdh
8ab742c2b7 docs 2020-03-18 17:53:57 +01:00
Erik Frojdh
cb8403f1b0 zmq 2020.03.18dev2 2020-03-18 12:38:06 +01:00
Erik Frojdh
b751238fc1 ZmqSocket 2020-03-18 12:12:01 +01:00
Erik Frojdh
5479d3a198 fix 2020-03-18 11:11:00 +01:00
Erik Frojdh
e1768905dd build interface 2020-03-18 11:06:37 +01:00
Erik Frojdh
775d0842e9 build interface 2020-03-18 11:00:54 +01:00
Erik Frojdh
e7e201bd2a export and include 2020-03-18 10:20:01 +01:00
Erik Frojdh
ec9f8305e9 not export gui 2020.03.18dev1 2020-03-18 08:41:25 +01:00
Erik Frojdh
3307bfab1b fix 2020.03.18dev0 2020-03-17 19:11:29 +01:00
Erik Frojdh
ce2c62000d include cmake in build 2020-03-17 18:57:19 +01:00
Erik Frojdh
cf817c4ec1 WIP 2020.03.17dev0 2020-03-17 18:29:51 +01:00
Erik Frojdh
bd01a5f2d2 cmake pkg 2020-03-16 19:36:18 +01:00
Erik Frojdh
b059ba7c90 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-03-16 15:43:55 +01:00
Erik Frojdh
89d70097f6 WIP 2020-03-16 15:43:46 +01:00
41d115a394 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-03-13 19:36:38 +01:00
45c1d3a553 gotthard2: burst mode fix for all the registers 2020-03-13 19:36:23 +01:00
17227be4df gotthard2: burst mode fix 2020-03-13 17:39:16 +01:00
Erik Frojdh
7f4f8e8f09 help bug emax 2020-03-13 09:56:11 +01:00
Erik Frojdh
6809bd6567 removed header 2020-03-12 12:38:00 +01:00
Erik Frojdh
711d40a56e added sendToReceiver 2020-03-12 11:45:12 +01:00
Erik Frojdh
81911fae3c new version of send to detector 2020-03-11 19:18:26 +01:00
Erik Frojdh
f940397e3a cleaning 2020-03-11 18:10:37 +01:00
Erik Frojdh
dc53887a48 minor clean 2020-03-11 17:49:32 +01:00
Erik Frojdh
5784ce8231 slsDetector -> Module 2020.03.11.dev0 2020-03-11 16:16:15 +01:00
Erik Frojdh
012c66bbbf minor 2020-03-11 15:57:10 +01:00
Erik Frojdh
3dbd6a33f7 removed genericSocket 2020-03-11 13:39:40 +01:00
Erik Frojdh
0de0d82a1a replaced old logger 2020-03-11 12:40:12 +01:00
Erik Frojdh
4aeb8bf62e introducing new logger 2020-03-11 10:54:55 +01:00
Dhanya Thattil
2acf64b09c
gui changes (#87) 2020-03-11 10:08:30 +01:00
dea8cba985 changes from 4.2.0-rc: eiger check for max trimbits; end of eigerserver: if detector ip, set activate; update both control and stop server for activate 2020-03-10 16:49:08 +01:00
9467b4c610 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-03-10 16:25:15 +01:00
2cb09a590a gotthard2, mythen3: firmware type check added, others: minor print 2020-03-10 16:25:07 +01:00
Erik Frojdh
5900403f20 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-03-10 16:10:09 +01:00
Erik Frojdh
53749c3b77 clean 2020-03-10 16:09:59 +01:00
1d2f4a8af0 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-03-10 15:59:35 +01:00
df2512fb1c all servers: eiger, jungfrau, gotthard, ctb, moench, mythen3, gotthard2 updated 2020-03-10 15:57:27 +01:00
e4942a5c8d virtual servers warnings fixed 2020-03-10 15:53:44 +01:00
ac1c40d6f9 virtual servers: redundant declarations fixed 2020-03-10 15:50:33 +01:00
Erik Frojdh
8ba0ef093e cmap 2020-03-10 15:50:14 +01:00
Erik Frojdh
cb268aa43f cmap 2020-03-10 15:49:54 +01:00
5192dae9c5 removed virtual server warnings 2020-03-10 15:15:09 +01:00
Erik Frojdh
d818e2570f clang-tidy nullptr 2020-03-10 15:06:51 +01:00