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
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
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
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
24fc5de58d
clang-tidy header include order
2019-05-14 17:34:51 +02:00
Erik Frojdh
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
Erik Frojdh
9231dff626
clang tidy implicit bool
2019-05-03 14:49:47 +02:00
Erik Frojdh
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
Erik Frojdh
c4aa5ef7bb
sendToDetectorStop
2019-04-26 15:15:56 +02:00
266520741a
ctb patterns interface rewritten
2019-04-18 15:29:43 +02:00
Erik Frojdh
f591adccb8
added getPatternLoop
2019-04-18 09:33:14 +02:00
Erik Frojdh
849d3ba049
removed create and delete module
2019-04-17 17:17:59 +02:00
Erik Frojdh
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
