345 Commits

Author SHA1 Message Date
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
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
Erik Frojdh
d1d730b779 WIP 2019-08-08 17:13:02 +02:00
b73b98ce3f Merge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya 2019-08-08 16:55:44 +02:00
ca2c284017 WIP 2019-08-08 16:55:37 +02:00
Erik Frojdh
ce9f76d017 WIP 2019-08-08 16:48:03 +02:00
Erik Frojdh
40bc498e9a WIP 2019-08-08 16:44:52 +02:00
eaf0d8668b WIP 2019-08-08 16:39:25 +02:00
dddd8eb849 merge resolved 2019-08-08 16:20:00 +02:00
a77964e1dd WIP 2019-08-08 16:18:04 +02:00
Erik Frojdh
9d5cff3b34 WIP 2019-08-08 16:09:29 +02:00
ca4618d8f4 Merge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya 2019-08-08 15:58:14 +02:00
ddfb66e999 not compiling 2019-08-08 15:58:00 +02:00
Erik Frojdh
7721787748 Merge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya 2019-08-08 15:51:29 +02:00
Erik Frojdh
e6349d0312 WIP 2019-08-08 15:51:21 +02:00
373cfad645 Merge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya 2019-08-08 15:51:06 +02:00
d79447ed3a WIP 2019-08-08 15:50:56 +02:00
Erik Frojdh
0b006b5080 WIP 2019-08-08 15:36:03 +02:00
6a780de22f WIP 2019-08-08 15:06:08 +02:00
d9ecec9bf7 merge resolved 2019-08-08 14:55:36 +02:00
8740e4f683 WIP 2019-08-08 14:49:13 +02:00
Erik Frojdh
79d6ea614a WIP 2019-08-08 14:30:02 +02:00
Erik Frojdh
f0e106f94f WIP 2019-08-08 13:49:28 +02:00
Erik Frojdh
1bdff2b681 WIP 2019-08-08 12:02:36 +02:00
553b7d8568 WIP 2019-08-08 11:11:08 +02:00
Erik Frojdh
095a7eac05 more ctb 2019-08-08 10:18:21 +02:00
Erik Frojdh
bba6e1667b some ctb funcs 2019-08-07 18:00:25 +02:00
eec7b22582 compiles 2019-08-07 16:11:42 +02:00
e246a33269 Merge branch 'developer' into apidhanya 2019-08-07 15:54:17 +02:00
Erik Frojdh
65ebd0baf0 WIP 2019-08-07 15:36:27 +02:00
6a71e61c12 WIP 2019-08-07 15:23:58 +02:00
615835f03d WIP 2019-08-07 12:32:59 +02:00
dd6a95d041 first one 2019-08-07 12:02:59 +02:00
cff4d162c1 commenting headers already done, adding positions for filename and filepath, pos instead of Positions{} 2019-08-07 11:52:03 +02:00
Dhanya Thattil
4ceee97c03
Api (#48)
* WIP

* WIP

* WIP

* cleaned up multi

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* split up python module

* WIP

* WIP

* WIP

* WIP

* WIP

* ok

* fixed bugs from rebase

* WIP

* fixed broken test

* WIP

* fixed python

* WIP

* sphinx help

* including new commands

* docs

* WIP

* WIP

* more tests

* added missing public header

* WIP
2019-08-07 11:21:07 +02:00