35 Commits

Author SHA1 Message Date
Erik Frojdh
170aca0e1f zmqip now uint 2019-06-06 18:17:04 +02:00
b74ce95b24 removed colon in commands. affects dac, adc and extsig 2019-06-04 12:10:26 +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
877bdb8979 Using FixedCapacityContainer for rxDbitList (#22)
* fixed capacity container

* changed shm date
2019-05-15 09:16:18 +02:00
Erik Frojdh
bf0847e967 removed ClientInterface 2019-05-15 08:38:49 +02:00
Erik Frojdh
7314c52c63 removed unneccecary includes 2019-05-14 17:32:21 +02:00
Erik Frojdh
bc4d0452af removed unused error_defs.h 2019-05-14 17:25:43 +02:00
Erik Fröjdh
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
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
a55ae38874 changed to matching names 2019-05-02 18:11:36 +02:00
b0cffcd570 master file option, adcdisable changed to adcenable 2019-04-30 12:13:28 +02:00
668cff1c65 fix for corrupt merge 2019-04-29 11:30:19 +02:00
Erik Frojdh
33efd42bdc fix merge 2019-04-26 17:06:59 +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
a3342f86d8 names 2019-04-26 16:47:08 +02:00
Erik Frojdh
554f9dc2ee minor 2019-04-26 16:28:21 +02:00
Erik Frojdh
c4aa5ef7bb sendToDetectorStop 2019-04-26 15:15:56 +02:00
Erik Frojdh
d7eadd5782 sendToReceiver 2019-04-26 12:58:40 +02:00
Erik Frojdh
b76d123df1 shorter functino 2019-04-25 17:56:20 +02:00
Erik Frojdh
b853bd92c8 template for sending to detector 2019-04-25 17:01:04 +02:00
Erik Frojdh
4da85b15a0 cleaning 2019-04-25 13:55:45 +02:00
Erik Frojdh
02fd4b356e adding config for tests 2019-04-23 17:37:02 +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
ee20cfab1e removed pointers added constructor 2019-04-17 16:19:18 +02:00
Erik Frojdh
b46e107f35 moved detParameters to sls_detector_defs 2019-04-17 14:28:53 +02:00
Erik Frojdh
c7169f3c36 moved setDetectorSpecific parameters to constructor of detectorParameters 2019-04-16 12:15:31 +02:00
Erik Frojdh
bad8b99b25 clang-tidy fix 2019-04-16 10:21:35 +02:00
Erik Frojdh
001ce4a93e clang-tidy warnings 2019-04-16 09:28:29 +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