4757 Commits

Author SHA1 Message Date
Samuel Debionne
3a8c7c6e2a Fix typo in conda install instructions 2019-05-13 10:58:54 +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
Erik Fröjdh
0e0e7ea81f
Merge pull request #18 from slsdetectorgroup/rxctb
Rxctb
2019-05-07 12:51:43 +02:00
df938c2535 review: removing size in sendtoDetector 2019-05-07 09:47:53 +02:00
932e377765 review fdback: using sendtoReceiver, not using size of for specifyng arguments to sendtodetector 2019-05-06 19:13:31 +02:00
0904d1db29 updated ctb binary 2019-05-03 20:46: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
e2f08da3e6 Merge branch 'tidywarning' into developer 2019-05-03 16:14:07 +02:00
Erik Frojdh
181ac4f509 small renaming 2019-05-03 16:13:32 +02:00
Gemma Tinti
a0f5224d09 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-05-03 15:27:20 +02:00
Gemma Tinti
6a0d44e358 rate capability plots 2019-05-03 15:27:11 +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
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
Erik Frojdh
aaa7576f7d clang-tidy 2019-05-03 14:15:13 +02:00
Gemma Tinti
96d7345124 delays in manual 2019-05-03 13:45:06 +02:00
Erik Frojdh
4f13b29c7f fixed copyserver bug 2019-05-02 18:18:49 +02:00
Erik Frojdh
a55ae38874 changed to matching names 2019-05-02 18:11:36 +02:00
7683b18fa3 ensuring only analog is not in callback 2019-05-01 20:18:46 +02:00
71dd43d252 connected analog databytes 2019-05-01 12:25:21 +02:00
fc7d3bcaea ctb callback used 2019-05-01 12:10:15 +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
56d1994b8c ctb file frame header back in 2019-04-30 11:18:09 +02:00
668cff1c65 fix for corrupt merge 2019-04-29 11:30:19 +02:00
06d4c7ce37 client: finishing up of gotthard for roi and ctb and moench for setting adcenablemask 2019-04-29 09:10:17 +02:00
Erik Frojdh
c0f06fcfca fix reset frames caught 2019-04-26 17:11:32 +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
65930002b3 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-04-25 19:20:25 +02:00
f5feb081ab removing header metadata for ctb binary files 2019-04-25 19:20:13 +02:00
Erik Frojdh
714e456d7d Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-04-25 17:56:32 +02:00
Erik Frojdh
b76d123df1 shorter functino 2019-04-25 17:56:20 +02:00
2eac75aa0b Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-04-25 17:39:56 +02:00
18558e1288 bug fix command line patnloops should print in decimal, receiver ctb: added p option to print data for debugging, fixed initializing of result in memory 2019-04-25 17:39:46 +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
77d34d5b6e fix 2019-04-25 08:24:56 +02:00
Erik Frojdh
6472cc4dd7 test for socket 2019-04-24 21:30:04 +02:00
67eef8ba75 fix for hdf5 compilation with new cmake 2019-04-24 18:09:53 +02:00
91a338cf52 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-04-24 16:17:07 +02:00
9b53a295e1 my302 receiver modified to be debugged later 2019-04-24 16:16:56 +02:00
Erik Frojdh
8cc8b58b05 sendToDetector 2019-04-24 15:24:56 +02:00
Erik Frojdh
ec9f360c75 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-04-24 14:39:20 +02:00