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
23ea16f4b8
not compiling
2019-08-08 15:59:51 +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
e7e4bf13c3
WIP
2019-08-08 11:07:41 +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
21046bcae0
multidet to multi shm
2019-08-07 16:32:12 +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
0a2a5933da
WIP
2019-08-07 15:51:25 +02:00
Erik Frojdh
704a26af70
WIP
2019-08-07 15:46:41 +02:00
Erik Frojdh
6a0c108e96
added comments
2019-08-07 15:37:30 +02:00
Erik Frojdh
65ebd0baf0
WIP
2019-08-07 15:36:27 +02:00
dc1e01b444
multidettype in one place
2019-08-07 15:33:55 +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
Dhanya Thattil
98ddf154b2
Partialreadout ( #47 )
...
* eiger server, rxr: partial readout, also gui messages: up last command, down clear command
* added binaries and resolved conflict
* bugfix eiger server: interrupt subframe is bit 2 and not bit number 3
* brackets in defs
2019-08-07 09:08:58 +02:00
Erik Fröjdh
e20b5e6952
added const overloads for sendToDetector and sendToReceiver ( #46 )
2019-08-06 16:58:22 +02:00
Dhanya Thattil
d72b6c3659
eiger server: quad, interrupt subframe, reg left and right ( #45 )
...
* eiger server: quad, interrupt subframe, reg left and right
* eiger server: beb can fail in setting up quad, quad and gap pixels
2019-08-06 10:12:34 +02:00
e17de0609c
pedestal fixed really
2019-07-30 11:29:24 +02:00
31a0161f42
gui: fixed pedestal
2019-07-30 10:53:03 +02:00
63c2599328
insignificant print
2019-07-30 10:33:25 +02:00
facbc60907
jungfrau server: changes for old and new boards
2019-07-30 09:32:10 +02:00
