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 |
|
|
|
5a483eaf29
|
WIP, new eiger serveR
|
2019-08-09 11:11:29 +02:00 |
|
Erik Frojdh
|
dfbf7ab39a
|
tsquash
|
2019-08-09 11:00:12 +02:00 |
|
Erik Frojdh
|
5292075a0a
|
WIP
|
2019-08-09 09:35:02 +02:00 |
|
|
|
0bd6563e45
|
WIP
|
2019-08-08 18:09:38 +02:00 |
|
|
|
b0f34f2d4b
|
Merge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya
|
2019-08-08 18:08:41 +02:00 |
|
|
|
6080e90bbb
|
WIP
|
2019-08-08 18:08:33 +02:00 |
|
Erik Frojdh
|
e76900ca9a
|
WIP
|
2019-08-08 17:40:35 +02:00 |
|
Erik Frojdh
|
cc0f1d9fcd
|
WIP
|
2019-08-08 17:34:25 +02:00 |
|
Erik Frojdh
|
dc24cfb9c3
|
fixed merge2
|
2019-08-08 17:16:02 +02:00 |
|
Erik Frojdh
|
869eee4d98
|
fixed merge
|
2019-08-08 17:14:54 +02:00 |
|
|
|
c34190f9f2
|
WIP
|
2019-08-08 17:13:25 +02:00 |
|
