3307 Commits

Author SHA1 Message Date
8aa7144252 mythen3: fix of external signals to not allow master output inversion, but can edge detect not configurable, and default dout pulse length 2020-05-28 13:09:09 +02:00
Erik Frojdh
e2eb1598d3 jf stuff 2020-05-28 09:28:53 +02:00
46daa7e2de merge from developer (mythen3 branch) 2020-05-27 14:19:33 +02:00
9493ae3da9 WIP 2020-05-27 11:30:47 +02:00
37cb0bb1c0 minor PR fixes 2020-05-26 08:57:48 +02:00
8ffb27c300 WIP 2020-05-25 11:05:51 +02:00
0a66605111 tests mainly and minor print 2020-05-22 15:23:56 +02:00
d71e40729a external signals 2020-05-20 17:05:42 +02:00
8973ef1aaa from timetest merge 2020-05-20 10:18:51 +02:00
5690914048 Merge branch 'mythen3' of github.com:slsdetectorgroup/slsDetectorPackage into mythen3 2020-05-20 10:15:04 +02:00
fa768e584e rxr 2020-05-20 10:14:57 +02:00
Erik Frojdh
30fc346e22 directly writing exptime 2020-05-20 09:47:41 +02:00
Erik Frojdh
761f93d753 exptime of gates 2020-05-20 09:36:43 +02:00
e208d3ebe8 WIP 2020-05-19 18:59:07 +02:00
cd90f09a30 WIP 2020-05-19 18:24:32 +02:00
ecc692ad9a start pattern without binaries 2020-05-15 17:06:08 +02:00
Erik Frojdh
2c83abcac7 merged detFuncs for c and c++ 2020-05-15 12:24:06 +02:00
Erik Frojdh
ea7cc9db8c less public headers 2020-05-15 10:52:23 +02:00
Erik Frojdh
0dd5a099c8 renamed FixedCap.. to StaticVector 2020-05-15 09:03:23 +02:00
Dhanya Thattil
ad42a61bae
Merge branch 'developer' into gotthard2 2020-05-14 11:53:59 +02:00
eea67014b7 gotthard2 with veto data on second interface 2020-05-13 17:50:18 +02:00
Erik Frojdh
3962714b48 format + exception.cpp 2020-05-13 14:48:52 +02:00
Erik Frojdh
f0f97f265a removed non used slsDetectorUsers 2020-05-13 14:05:05 +02:00
9a1fdc4104 Merge branch 'developer' into eiger26 2020-05-12 13:43:36 +02:00
Erik Frojdh
46afcfe694 removed logging 2020-05-12 11:49:49 +02:00
d7563fdd1a Merge branch 'developer' into eiger26 2020-05-12 11:39:29 +02:00
Erik Frojdh
ed8d606eb2 WIP 2020-05-11 19:19:49 +02:00
Erik Frojdh
eff664e790 cleanup 2020-05-11 18:28:06 +02:00
Erik Frojdh
1ed1b5da86 migrate to return values 2020-05-11 12:15:16 +02:00
Erik Frojdh
353b8d0057 migrate to return values 2020-05-11 11:48:18 +02:00
Erik Frojdh
bbe9108fb9 migrate to return values 2020-05-11 11:39:11 +02:00
Erik Frojdh
1998f9541e reorder read settings func 2020-05-11 10:30:55 +02:00
13c1f7c2d6 WIP 2020-05-08 16:31:26 +02:00
2e75f36fa0 pr fixes 2020-05-08 12:24:12 +02:00
1a75170eed mythen3: set trimbits (not settings, threshold yet), set all trimbits 2020-05-07 16:04:30 +02:00
Erik Frojdh
e599bb7c24 format receiver 2020-05-05 10:04:52 +02:00
Erik Frojdh
959fd562d3 clang-format 2020-05-04 16:30:00 +02:00
Erik Frojdh
337e56d9bf cleaned up LTO detection 2020-04-23 08:23:36 +02:00
39fa5e0185 client recieve rx parameters as a struct 2020-04-09 09:34:20 +02:00
373e177274 WIP 2020-04-09 08:35:30 +02:00
6dd6685e7d minor 2020-04-09 08:24:16 +02:00
38c31fdada WIP 2020-04-08 20:27:10 +02:00
b3fe0e79bc WIP 2020-04-08 16:43:28 +02:00
215e4a56fd Merge branch 'developer' into setrxhostname 2020-04-08 12:00:21 +02:00
71a68c2022 eiger transmitting fix in 10g mode (stop servers informed about 10g mode) 2020-04-08 11:58:59 +02:00
55f8497eac WIP 2020-04-08 11:05:06 +02:00
07cd71f0c7 removed update shared memory from detector, check if eiger firmware >=26: have same top and bottom addresses 2020-04-07 17:19:47 +02:00
9f3ad4e2f4 merge from 4.2.0 2020-04-07 15:14:27 +02:00
a86ae0cb47 WIP 2020-04-07 12:14:22 +02:00
bdf0f9e2b9 fixed start stop tests 2020-04-07 10:39:50 +02:00