3997 Commits

Author SHA1 Message Date
cef9ae39c3 gotthard dac fix vrefcomp from 887 to 350 2018-02-26 16:15:03 +01:00
d14234ee38 jungfrau server bianries 2018-02-26 14:43:53 +01:00
a4aa862ee4 bugfix jungfrau server : tdma bit also needs to be set to enable 2018-02-26 14:43:11 +01:00
0b017b886c added release documentation 2018-02-26 13:28:31 +01:00
7859df6aa3 bug fix: 1000+ errors on gui startup(setreceiveronline not done), removed gui mesage popup for different output paths, fixed jungfrau to have multiple detectors in x dir in gui 2018-02-26 12:44:32 +01:00
ebe1ff4563 jungfrau virtual server needed the stop server as well 2018-02-23 15:32:05 +01:00
c3d6852f97 fixed threshold returning 1 if a trimbit file missing for eiger, it now returns -1, as both values are different 2018-02-23 14:49:18 +01:00
bacc4073f7 png compile fails in gui, removing it from cmakelists.txt in gui 2018-02-23 14:10:53 +01:00
50b515f94d changes to documentation 2018-02-23 13:46:17 +01:00
1e479a5c77 Merge branch '3.0.1' of github.com:slsdetectorgroup/slsDetectorPackage into 3.0.1 2018-02-23 12:48:25 +01:00
9322c176f2 jungfrau server virtual 2018-02-23 12:48:11 +01:00
639fdac232 created jungfrau virtual server(in next commit), edited install manual to give out html pages without subsection toc, links, navigaion, spilit into as many sections etc for wiki page 2018-02-23 12:45:31 +01:00
7364f674ed [JUNGFRAU] - Modified memory map address shift for the interface between FPGA and Blackfin SOM. Shift has to be set to 1 since the basic AMC data transfers is 8-bit and not 16-bit. 2018-02-22 11:15:24 +01:00
Erik Frojdh
a536f8ac9b added png and Qt in CMakesList for gui 2018-02-19 17:44:57 +01:00
Erik Frojdh
76bd2c69bc added vrs to Eiger dacs to interpolate 2018-02-19 12:04:05 +01:00
Erik Frojdh
77aa3fa215 added overloading of call operator for access detector 2018-02-16 15:25:35 +01:00
Erik Frojdh
bc6fc51f6a linking cmake 2018-02-12 19:15:12 +01:00
9fe7293dab Merge branch '3.0.1' of github.com:slsdetectorgroup/slsDetectorPackage into 3.0.1 2018-02-09 16:14:57 +01:00
3e417fdaa7 update release 2018-02-09 16:14:47 +01:00
Erik Frojdh
f8c90b6da6 gui cmake 2018-02-09 15:27:25 +01:00
b6e5fa1944 updated Readme.md 2018-02-09 15:00:12 +01:00
daff1c9a09 updated Readme.md 2018-02-09 14:46:49 +01:00
c7b345237a updated Readme.md 2018-02-09 14:44:59 +01:00
a12694b5d0 updated Readme.md 2018-02-09 14:42:03 +01:00
40ce08d33e updated Readme.md 2018-02-09 14:40:34 +01:00
19e77bf303 updated Readme.md 2018-02-09 14:39:16 +01:00
f95b9e8d8d updated Readme.md 2018-02-09 14:37:17 +01:00
9371208a2e updated Readme.md 2018-02-09 14:35:12 +01:00
472d96cd94 updated Readme.md 2018-02-09 14:33:04 +01:00
d48ca4a9fe merge from 3.0.1 in readme and makefle for manual 2018-02-09 14:12:27 +01:00
1609f1d495 release.txt is not pushed in by default 2018-02-09 14:06:09 +01:00
7a6b6e1fea updated Readme.md 2018-02-09 14:02:57 +01:00
1b6ca913b2 removed checkout.sh as it is a single repository now 2018-02-09 13:45:13 +01:00
18c2b8d725 updated Readme.md 2018-02-09 12:27:10 +01:00
a29e70c52f updated Readme.md 2018-02-09 12:26:19 +01:00
98010057ce updated Readme.md 2018-02-09 12:24:05 +01:00
14eff53798 updated Readme.md 2018-02-09 12:23:34 +01:00
2cf150bb30 updated Readme.md 2018-02-09 12:21:25 +01:00
d2a2a2729e updated Readme.md 2018-02-09 12:19:19 +01:00
298663f143 updated Readme.md 2018-02-09 12:15:45 +01:00
5c23fd6502 updated manuals 2018-02-09 11:25:21 +01:00
2429af754f added -t option in release.txt 2018-02-09 11:08:33 +01:00
ef574e6620 indentation in release 2018-02-09 10:23:26 +01:00
0dd0486aa5 indentation in release 2018-02-09 10:22:17 +01:00
7196bfb9a5 updated release.txt 2018-02-09 10:16:06 +01:00
459b588b9f merge from 3.0.1 for gotthard 25um server start acq delay 2018-02-08 15:17:52 +01:00
8bf03a7712 Merge branch '3.0.1' into developer 2018-02-08 15:16:49 +01:00
4338217bda jungfrau 25um server, added start acq delay to server config file 2018-02-08 15:16:23 +01:00
895f8ccf81 Merge branch '3.0.1' into developer 2018-02-08 14:51:20 +01:00
Erik Frojdh
0cb5941fc4 Merge branch '3.0.1' into condatest 2018-02-08 13:52:51 +01:00