4879 Commits

Author SHA1 Message Date
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
Erik Frojdh
dbf927901f more of sendToDetector 2019-04-24 14:39:08 +02:00
9e16dcb1e6 reverting cmake policy change 2019-04-24 13:46:19 +02:00
eb88fabfbc receiver callback rearranging data for mythen302 2019-04-24 13:32:21 +02:00
92310f845c Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-04-24 13:31:06 +02:00
262140728f receiver callback rearranging data for mythen302 2019-04-24 13:30:57 +02:00
Erik Frojdh
834b1e58ea cleaning slsDetector 2019-04-24 10:57:02 +02:00
Erik Frojdh
5192be6784 more tests 2019-04-24 08:28:16 +02:00
Erik Frojdh
5c0e1643f2 complete dac test for EIGER 2019-04-23 18:02:05 +02:00
Erik Frojdh
7dc014f19c Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-04-23 17:37:11 +02:00
Erik Frojdh
02fd4b356e adding config for tests 2019-04-23 17:37:02 +02:00
eac992ee03 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-04-23 14:35:20 +02:00
4e3baf41cb ctb server: introducing 1 us delay between rd strobe and fifo read due to different clocks 2019-04-23 14:35:07 +02:00
Erik Frojdh
72091f47d9 format and mod constructor 2019-04-23 10:48:31 +02:00
21cab38921 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-04-18 17:18:14 +02:00
3d40fb2d2c ctb address check, integration test added for ctb pattern 2019-04-18 17:18:01 +02:00
Erik Frojdh
83c2775d6c fixed python 2019-04-18 15:57:59 +02:00
Erik Frojdh
e3859c3097 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-04-18 15:40:30 +02:00
Erik Frojdh
833ca071c4 fix 2019-04-18 15:40:20 +02:00
45884a72da eiger binary updated 2019-04-18 15:35:36 +02:00
61aa673be9 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-04-18 15:32:25 +02:00
1bc6e7f978 conflict resolved 2019-04-18 15:32:07 +02:00
Erik Frojdh
202d88d6be experimental python 2019-04-18 15:31:07 +02:00
266520741a ctb patterns interface rewritten 2019-04-18 15:29:43 +02:00
Erik Frojdh
faf7e0db82 fix 2019-04-18 15:09:36 +02:00
Erik Frojdh
7aaaeae30c minor 2019-04-18 15:06:17 +02:00
Erik Frojdh
86afb2bd0e more ctb commands 2019-04-18 15:03:01 +02:00
Erik Frojdh
a29466b396 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-04-18 13:39:53 +02:00
Erik Frojdh
c7259538e9 python commands 2019-04-18 13:39:43 +02:00