Commit Graph

92 Commits

Author SHA1 Message Date
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
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
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
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
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
35aff6bf76 format on multi 2019-07-24 09:36:42 +02:00
e3db7099f1 removed non const getFileIndex in multi 2019-07-24 09:07:26 +02:00
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
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
0f2641f9fa WIP 2019-07-12 18:24:23 +02:00
c582ba15d5 WIP 2019-07-04 16:40:25 +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
33f5253831 QIP 2019-06-21 18:19:39 +02:00
ca9fca88c4 Merge branch 'developer' into gui 2019-06-13 09:37:54 +02:00
359970dfc2 bug fix from 4.0.2: powerchip multi should have delays, burst trigger added to users 2019-06-13 09:37:44 +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
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
073d06f143 removed unnecessary print that might have been used for debugging 2019-06-03 08:59:54 +02:00
a008c2b2c8 added ctbGui 2019-05-28 17:15:59 +02:00
f1a1391866 Factored out time conversion (#23)
* time conversion

* with comment

* lround in slsDetectorCommand
2019-05-15 10:22:38 +02:00
24fc5de58d clang-tidy header include order 2019-05-14 17:34:51 +02:00
1029ce9705 minor 2019-05-14 14:53:59 +02:00
c30485a65b advanced down 2019-05-08 16:44:08 +02:00
20720bc073 Merge branch 'developer' into rxctb 2019-05-03 20:38:32 +02:00
e14519c236 slsReceiver: removed special receiver config, added rx_dbitlist, rx_dbitoffset to put bits together in file, connected adcinvert, extsamplingsrc and extsampling properly to the detector, added tests 2019-05-03 20:37:40 +02:00
9231dff626 clang tidy implicit bool 2019-05-03 14:49:47 +02:00
92b447c83a minor fixes 2019-05-03 14:39:22 +02:00
2f3b0e0b06 ctb:separated analog and digital samples in server and send analog and digital data packed separately per frame to reciever 2019-04-30 18:55:32 +02:00
b0cffcd570 master file option, adcdisable changed to adcenable 2019-04-30 12:13:28 +02:00
af5eb9fc12 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-04-26 16:53:35 +02:00
61a939ef53 ctb: removed setroi, instead using adcenablemask 2019-04-26 16:53:23 +02:00
c4aa5ef7bb sendToDetectorStop 2019-04-26 15:15:56 +02:00
266520741a ctb patterns interface rewritten 2019-04-18 15:29:43 +02:00
f591adccb8 added getPatternLoop 2019-04-18 09:33:14 +02:00
849d3ba049 removed create and delete module 2019-04-17 17:17:59 +02:00
0527880747 slsDetector implicit conversion 2019-04-16 09:15:17 +02:00
79c6f5310b eiger server and client: cleaning up setting of dynamic range for eiger, where multi client takes care of checking rate correction in a separate call, tests included 2019-04-12 19:20:31 +02:00
89a06f099c merging refactor (replacing) 2019-04-12 10:53:09 +02:00