170 Commits

Author SHA1 Message Date
ee4aa94bbe WIP 2019-08-19 18:03:19 +02:00
eebd1552f2 WIP 2019-08-19 15:55:42 +02:00
26958e99ef WIP 2019-08-19 10:48:05 +02:00
d10d9462a3 virtual servers using command virtual numdet port 2019-08-16 19:31:26 +02:00
a0bdfcdae3 WIP 2019-08-16 17:38:41 +02:00
10ce82fc5f WIP 2019-08-16 17:07:30 +02:00
947252c852 WIP 2019-08-16 09:45:49 +02:00
8dae9243a5 t puMerge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya 2019-08-14 17:49:38 +02:00
ba0c6ff286 eiger bug fix: quad gap pixels 2019-08-14 17:49:09 +02:00
Erik Frojdh
d14fdc3a3f WIP 2019-08-14 17:40:30 +02:00
Erik Frojdh
8e2b89d488 fixed python 2019-08-14 11:54:03 +02:00
Erik Frojdh
5f0a3eaee4 Merge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya 2019-08-14 10:36:27 +02:00
Erik Frojdh
a23a3f4467 prepare private 2019-08-14 10:36:19 +02:00
7f5640dd4e updated multi shm 2019-08-14 10:32:56 +02:00
Erik Frojdh
d191cee548 Merge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya 2019-08-14 09:31:51 +02:00
Erik Frojdh
97192c5342 removed prepare acq 2019-08-14 09:31:42 +02:00
d4d8cbe9bc gotthard fixed roi only xmin and xmax.remove updateoffsets 2019-08-14 09:20:50 +02:00
2fe06c7163 WIP 2019-08-13 11:19:25 +02:00
Erik Frojdh
6f6ee19906 WIP 2019-08-13 09:16:29 +02:00
c2f57f5ab0 WIP 2019-08-12 19:55:42 +02:00
160ce17a91 WIP 2019-08-12 19:54:44 +02:00
9686f78300 doesnt compile 2019-08-12 19:13:33 +02:00
25eccdffab WIP 2019-08-12 18:57:53 +02:00
Erik Frojdh
4bff894782 merge fix 2019-08-12 16:38:16 +02:00
Erik Frojdh
1008944a6a ROI workaroud 2019-08-12 16:34:59 +02:00
0a34192a8d WIP 2019-08-12 15:57:55 +02:00
95751766cd WIP 2019-08-12 14:15:25 +02:00
100d748154 Merge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya 2019-08-09 17:19:19 +02:00
b2d39d4785 WIP done 2019-08-09 17:19:12 +02:00
Erik Frojdh
c350b53b7f Merge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya 2019-08-09 16:35:33 +02:00
Erik Frojdh
6a89e3e1a5 WIP 2019-08-09 16:35:26 +02:00
cac353748e Merge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya 2019-08-09 16:16:25 +02:00
4a97dd0eba WIP 2019-08-09 16:16:15 +02:00
Erik Frojdh
dea402a7e7 WIP 2019-08-09 16:12:26 +02:00
Erik Frojdh
206740efd6 WIP 2019-08-09 15:35:33 +02:00
Erik Frojdh
56703c4886 WIP 2019-08-09 15:20:53 +02:00
Erik Frojdh
1bd1d0d64d fixed merge 2019-08-09 14:48:01 +02:00
Erik Frojdh
6b363a16fe WIP 2019-08-09 14:45:07 +02:00
6691680091 Merge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya 2019-08-09 14:28:42 +02:00
2ac421365d WIP 2019-08-09 14:28:32 +02:00
9913194774 WIP 2019-08-09 14:28:18 +02:00
Erik Frojdh
a084ea2d0f Merge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya 2019-08-09 14:08:29 +02:00
Erik Frojdh
2f61764fd7 WIP 2019-08-09 14:08:21 +02:00
1a60b59a48 size 2019-08-09 12:11:42 +02:00
a3c5c16417 WIP 2019-08-09 12:01:01 +02:00
8c40c02fc5 Merge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya 2019-08-09 11:55:34 +02:00
bdfdd5dbda WIP 2019-08-09 11:55:27 +02:00
Erik Frojdh
1f549d51fa fixed merge 2019-08-09 11:45:06 +02:00
Erik Frojdh
fc78bb9384 Parallel returns Result 2019-08-09 11:40:57 +02:00
a6e8be2d67 merge resolved 2019-08-09 11:12:31 +02:00