6a0c108e96
added comments
2019-08-07 15:37:30 +02:00
65ebd0baf0
WIP
2019-08-07 15:36:27 +02:00
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
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
e20b5e6952
added const overloads for sendToDetector and sendToReceiver ( #46 )
2019-08-06 16:58:22 +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
e3db7099f1
removed non const getFileIndex in multi
2019-07-24 09:07:26 +02:00
9cc1ff43a9
removed non const getFileIndex
2019-07-24 09:05:04 +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
maliakal_d
e22d03a744
WIP
2019-07-02 09:13:47 +02:00
maliakal_d
a373609b08
WIP
2019-06-28 18:16:32 +02:00
maliakal_d
bd3e439d87
Merge branch 'developer' into gui
2019-06-25 10:51:17 +02:00
maliakal_d
3db09bc0cd
Merge branch 'developer' into gui
2019-06-25 09:08:29 +02:00
c466623e86
fix
2019-06-21 17:38:49 +02:00
e80ce1b4c4
added -h --help option to display help
2019-06-21 17:27:47 +02:00
6c33f7de7b
adding list command ( #34 )
2019-06-19 09:26:11 +02:00
maliakal_d
ca9fca88c4
Merge branch 'developer' into gui
2019-06-13 09:37:54 +02:00
maliakal_d
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
maliakal_d
3c1df02414
merge resolved
2019-06-11 15:56:13 +02:00
maliakal_d
1bab010d0b
WIP
2019-06-11 10:15:40 +02:00
170aca0e1f
zmqip now uint
2019-06-06 18:17:04 +02:00
maliakal_d
bb760f3210
WIP datatoutput
2019-06-06 15:04:05 +02:00
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
maliakal_d
ffbc0a0fc3
Merge branch 'developer' into gui
2019-06-04 12:18:20 +02:00
maliakal_d
b74ce95b24
removed colon in commands. affects dac, adc and extsig
2019-06-04 12:10:26 +02:00
maliakal_d
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
4b1a9bea32
Integration tests for the command line ( #26 )
...
* WIP
* first test
* format
* test frames
* also 0:
2019-05-31 14:40:45 +02:00
d935e78763
clang-format
2019-05-28 18:15:43 +02:00
0f869e1215
fixed acquire not working
2019-05-28 18:15:15 +02:00
788ad8d3b6
Command proxy ( #25 )
...
* added cmd proxy
* minor
* minor
* WIP
* clean up
* added comment
2019-05-28 18:01:26 +02:00
bergamaschi
a008c2b2c8
added ctbGui
2019-05-28 17:15:59 +02:00
maliakal_d
7b817fa194
Merge branch 'developer' into jungfrauv0.8
2019-05-17 19:21:01 +02:00
maliakal_d
1a1c6b9b42
jungfrau server: feature finish: switching between 2 interfaces
2019-05-17 19:19:03 +02:00
fff79fbbb6
const char* for command
2019-05-16 16:58:03 +02:00
f1a1391866
Factored out time conversion ( #23 )
...
* time conversion
* with comment
* lround in slsDetectorCommand
2019-05-15 10:22:38 +02:00
877bdb8979
Using FixedCapacityContainer for rxDbitList ( #22 )
...
* fixed capacity container
* changed shm date
2019-05-15 09:16:18 +02:00
bf0847e967
removed ClientInterface
2019-05-15 08:38:49 +02:00
7314c52c63
removed unneccecary includes
2019-05-14 17:32:21 +02:00
bc4d0452af
removed unused error_defs.h
2019-05-14 17:25:43 +02:00
maliakal_d
c30485a65b
advanced down
2019-05-08 16:44:08 +02:00
2a1c89f712
Fixed container ( #19 )
...
* added FixedCapacityContainer
* added empty to FixedCapacityContainer
* removed commented out section
* added FixedCapacityContainer to public headers
2019-05-08 12:34:45 +02:00
maliakal_d
20720bc073
Merge branch 'developer' into rxctb
2019-05-03 20:38:32 +02:00
maliakal_d
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
1094d5d30c
Build doxygen documentation by cmake ( #17 )
...
* added cmake command to make doxygen docs
* added back doxyfile for users
2019-05-03 14:58:15 +02:00
a55ae38874
changed to matching names
2019-05-02 18:11:36 +02:00
Erik Frojdh
maliakal_d
bergamaschi