ddfb66e999
not compiling
2019-08-08 15:58:00 +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
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
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
Dhanya Thattil
64a8dd2def
Stoppedflag ( #44 )
...
* removed stopped flag from multi and sls shm, since its removed from fixed pattern in sls, slsshmversion api also added to get hostname and type
* clang format
2019-07-29 11:35:21 +02:00
Dhanya Thattil
b524e0c95f
removed online flags, apiversion in shm, ret for ok and fail, bind socket help in exception message ( #43 )
...
* removed online flag, removed rxronline flag, added useReceier flag that is set only when rxr hostname is set, removed setonline, setreceiveronline flag, removed ret for ok or fail, using exceptions for this, changed cannot bind socket printout
* fixed python
2019-07-26 16:33:39 +02:00
Dhanya Thattil
fb2c015c5c
Setonline ( #42 )
...
* setonline and setreceiveronline removed from command line
* removed multi shm rxr online flag
* setonine and setreceiveronline not needed in gui
2019-07-24 16:25:02 +02:00
Erik Frojdh
35aff6bf76
format on multi
2019-07-24 09:36:42 +02:00
Erik Frojdh
e3db7099f1
removed non const getFileIndex in multi
2019-07-24 09:07:26 +02:00
Erik Frojdh
9cc1ff43a9
removed non const getFileIndex
2019-07-24 09:05:04 +02:00
Erik Fröjdh
2c453fc1be
Removed multiSlsDetector dependency from slsDetector ( #41 )
...
* WIP
* removed multiSlsDetector dependency from slsDetector
* removed comment
* review changes
2019-07-23 15:47:39 +02:00
Dhanya Thattil
e7a76ccea1
Quad ( #39 )
...
* making quad work in developer branch
* binary added
* minor changes
* bug fix to set quad to 0 when more than 1 detector
2019-07-22 16:41:03 +02:00
3ef8b392db
rx_hostname command line bug: should not setreceiveronline if connecting to a new receiver without clearing shm
2019-07-17 17:02:40 +02:00
0f2641f9fa
WIP
2019-07-12 18:24:23 +02:00
5e24591295
Merge branch 'developer' into gui
2019-07-12 10:36:54 +02:00
40c3c78024
client bug fix: framesl, cyclesl printed in float, fixed
2019-07-10 11:18:24 +02:00
8ac7d96ef3
WIP
2019-07-05 08:54:50 +02:00
c582ba15d5
WIP
2019-07-04 16:40:25 +02:00
0954bdd2d3
Merge branch 'developer' into gui
2019-07-02 17:29:50 +02:00
f4fa19b559
bugfix rxr: checkonline prints error msg, call receiverversion instead
2019-07-02 17:29:38 +02:00
975076043f
WIP
2019-07-02 13:50:20 +02:00
e22d03a744
WIP
2019-07-02 09:13:47 +02:00
a373609b08
WIP
2019-06-28 18:16:32 +02:00
