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
a77964e1dd
WIP
2019-08-08 16:18:04 +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
21046bcae0
multidet to multi shm
2019-08-07 16:32:12 +02:00
0a2a5933da
WIP
2019-08-07 15:51:25 +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
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
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
e3db7099f1
removed non const getFileIndex in multi
2019-07-24 09:07:26 +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
e22d03a744
WIP
2019-07-02 09:13:47 +02:00
a373609b08
WIP
2019-06-28 18:16:32 +02:00
3c1df02414
merge resolved
2019-06-11 15:56:13 +02:00
1bab010d0b
WIP
2019-06-11 10:15:40 +02:00
bb760f3210
WIP datatoutput
2019-06-06 15:04:05 +02:00
Erik Fröjdh
1db7521cfa
exceptions TCP ( #31 )
...
* WIP
* first test
* format
* test frames
* also 0:
* WIP
* WIP
* first test
* format
* test frames
* also 0:
* test and less local
* pass ret by value
* level
* WIP
* WIP
* cleaning up interface
* removed ref
* another
* updated api version
* cleanup
* cleanup
* WIP
* fixes
* fixed tests
2019-06-05 15:25:18 +02:00
ffbc0a0fc3
Merge branch 'developer' into gui
2019-06-04 12:18:20 +02:00
b74ce95b24
removed colon in commands. affects dac, adc and extsig
2019-06-04 12:10:26 +02:00
e7c164fb24
Merge branch 'developer' into gui
2019-06-03 11:13:03 +02:00
Dhanya Thattil
29141ac1a6
set starting frame number of next acquisition for both jungfrau and e… ( #27 )
...
* set starting frame number of next acquisition for both jungfrau and eiger. firmware has not implemented a get, so workaround. tests included. frame number 0 not allowed due to Eiger. Eiger max frame is 48 bit, while jungfrau is 64 bit
* made argument of setstartingframenumber const
2019-06-03 11:07:53 +02:00
Erik Fröjdh
f1a1391866
Factored out time conversion ( #23 )
...
* time conversion
* with comment
* lround in slsDetectorCommand
2019-05-15 10:22:38 +02:00
Erik Frojdh
bc4d0452af
removed unused error_defs.h
2019-05-14 17:25:43 +02:00
