detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 06:50:02 +02:00
Code Issues Actions Packages Releases Activity
4,905 Commits 44 Branches 100 Tags
Commit Graph

57 Commits

Author SHA1 Message Date
Dhanya Thattil
ca9fca88c4 Merge branch 'developer' into gui 2019-06-13 09:37:54 +02:00
Dhanya Thattil
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
Dhanya Thattil
3c1df02414 merge resolved 2019-06-11 15:56:13 +02:00
Dhanya Thattil
1bab010d0b WIP 2019-06-11 10:15:40 +02:00
Erik Frojdh
170aca0e1f zmqip now uint 2019-06-06 18:17:04 +02:00
Dhanya Thattil
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
Dhanya Thattil
ffbc0a0fc3 Merge branch 'developer' into gui 2019-06-04 12:18:20 +02:00
Dhanya Thattil
b74ce95b24 removed colon in commands. affects dac, adc and extsig 2019-06-04 12:10:26 +02:00
Dhanya Thattil
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
4b1a9bea32 Integration tests for the command line (#26) 
* WIP

* first test

* format

* test frames

* also 0:
 2019-05-31 14:40:45 +02:00
Erik Frojdh
d935e78763 clang-format 2019-05-28 18:15:43 +02:00
Erik Frojdh
0f869e1215 fixed acquire not working 2019-05-28 18:15:15 +02:00
Erik Fröjdh
788ad8d3b6 Command proxy (#25) 
* added cmd proxy

* minor

* minor

* WIP

* clean up

* added comment
 2019-05-28 18:01:26 +02:00
Anna Bergamaschi
a008c2b2c8 added ctbGui 2019-05-28 17:15:59 +02:00
Dhanya Thattil
7b817fa194 Merge branch 'developer' into jungfrauv0.8 2019-05-17 19:21:01 +02:00
Dhanya Thattil
1a1c6b9b42 jungfrau server: feature finish: switching between 2 interfaces 2019-05-17 19:19:03 +02:00
Erik Frojdh
fff79fbbb6 const char* for command 2019-05-16 16:58:03 +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 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
Dhanya Thattil
c30485a65b advanced down 2019-05-08 16:44:08 +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
Dhanya Thattil
20720bc073 Merge branch 'developer' into rxctb 2019-05-03 20:38:32 +02:00
Dhanya Thattil
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 Fröjdh
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
Erik Frojdh
a55ae38874 changed to matching names 2019-05-02 18:11:36 +02:00
Dhanya Thattil
b0cffcd570 master file option, adcdisable changed to adcenable 2019-04-30 12:13:28 +02:00
Dhanya Thattil
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
Dhanya Thattil
af5eb9fc12 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-04-26 16:53:35 +02:00
Dhanya Thattil
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
Dhanya Thattil
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