Commit Graph

3729 Commits

Author SHA1 Message Date
maliakal_d 40210ae26f jungfrauserver adcphase fix: bug was if adcphase was same as previous value, it still shifted gotthardDoubleModule 2018-03-14 17:20:26 +01:00
maliakal_d dd6301d66d updated for compilation 2018-03-14 16:19:30 +01:00
maliakal_d b58c3e8951 solving merging conflicts from 3.1.0 to developer 2018-03-14 15:45:35 +01:00
maliakal_d 85aa47b835 updated link in documentation 2018-03-12 16:38:01 +01:00
maliakal_d da9b0bdc0b updated link in documentation 2018-03-12 16:27:45 +01:00
maliakal_d 258de4947a updated doc 2018-03-12 15:46:20 +01:00
maliakal_d 9197ab6e4b sls detector install omitted, added 2018-03-12 15:36:36 +01:00
maliakal_d 6c1c203782 documentation updated 2018-03-12 15:01:23 +01:00
maliakal_d 721d2a30f2 read me updated 2018-03-12 14:25:39 +01:00
maliakal_d 72970c9669 updated binaries, updated manuals, updated git versioning 2018-03-12 14:21:02 +01:00
Erik Frojdh b389402d64 Merge branch '3.1.0-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 3.1.0-rc 2018-03-08 17:13:20 +01:00
Erik Frojdh 0d2dd93498 changed setBit and getBit to uint32_t 2018-03-08 17:13:13 +01:00
maliakal_d fee6465213 eiger and jungfrau servers int to uint32_t for read and write registers 2018-03-08 16:46:15 +01:00
Erik Frojdh 8b02aa9e91 Merge branch '3.1.0-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 3.1.0-rc 2018-03-08 16:08:45 +01:00
Erik Frojdh 339956e5de changed from int to uint32_t in read and writeRegister 2018-03-08 16:08:31 +01:00
maliakal_d deb59530ab eiger gui fix: delay after trigger and number of gates upon measurements tab refresh doesnt exist for eiger/jungfrau 2018-03-08 15:49:01 +01:00
maliakal_d ec5e779225 added binary 2018-03-08 15:19:11 +01:00
maliakal_d 3878212ffd jungfrau server adcphase not responding to a get properly 2018-03-08 15:17:14 +01:00
maliakal_d 7649865a8f jungfrau bug fix: adc phase corrected to correctly return value in -1 2018-03-08 14:02:02 +01:00
Erik Frojdh 06cdf8ad92 overloading access operator 2018-02-28 17:34:55 +01:00
maliakal_d 28101bed22 updated binaries 2018-02-27 14:37:46 +01:00
maliakal_d 1f6c289fd4 gotthard server : bugfix for getting id 2018-02-27 14:33:58 +01:00
maliakal_d 675d69392a updating versions 2018-02-27 12:52:48 +01:00
maliakal_d 61e7c0148f updating versions to 3.1.0 2018-02-27 12:40:53 +01:00
maliakal_d 12e4530702 changes to documentation 2018-02-27 12:09:36 +01:00
maliakal_d 64c18469bd release changes, gui compile via anaconda changes 2018-02-27 10:29:56 +01:00
maliakal_d aa2c535b4f possibility to use router mac in config file to have detip and rx_udpip in different subnets 2018-02-26 18:31:49 +01:00
maliakal_d 5849725b97 posisibility to overwrite rx_udpmac even with receiver 2018-02-26 18:22:07 +01:00
maliakal_d 74f327a959 gotthard server: red in stopping server for debugging 2018-02-26 17:34:35 +01:00
maliakal_d f67323d1cc updated gotthard examples to not use extsig of indices 1, 2 and 3 2018-02-26 17:13:51 +01:00
maliakal_d de3bfd85a1 fixed gothard not taking initial images after configuring MAC of detector. 2018-02-26 17:07:12 +01:00
maliakal_d ac9d9f6a93 removing --f from the gui options help, bugfix gotthard auto to trigger to auto mode and changing tabs will result in num gates and delay being enabled 2018-02-26 16:58:45 +01:00
maliakal_d cef9ae39c3 gotthard dac fix vrefcomp from 887 to 350 2018-02-26 16:15:03 +01:00
maliakal_d d14234ee38 jungfrau server bianries 2018-02-26 14:43:53 +01:00
maliakal_d a4aa862ee4 bugfix jungfrau server : tdma bit also needs to be set to enable 2018-02-26 14:43:11 +01:00
maliakal_d 0b017b886c added release documentation 2018-02-26 13:28:31 +01:00
maliakal_d 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
maliakal_d ebe1ff4563 jungfrau virtual server needed the stop server as well 2018-02-23 15:32:05 +01:00
maliakal_d 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
maliakal_d bacc4073f7 png compile fails in gui, removing it from cmakelists.txt in gui 2018-02-23 14:10:53 +01:00
maliakal_d 50b515f94d changes to documentation 2018-02-23 13:46:17 +01:00
maliakal_d 1e479a5c77 Merge branch '3.0.1' of github.com:slsdetectorgroup/slsDetectorPackage into 3.0.1 2018-02-23 12:48:25 +01:00
maliakal_d 9322c176f2 jungfrau server virtual 2018-02-23 12:48:11 +01:00
maliakal_d 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
lopez_c 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
maliakal_d 9fe7293dab Merge branch '3.0.1' of github.com:slsdetectorgroup/slsDetectorPackage into 3.0.1 2018-02-09 16:14:57 +01:00