71 Commits

Author SHA1 Message Date
38b7e23ac4 WIP 2019-08-20 10:55:55 +02:00
08ac9b4ce8 other detectors made to cmake 2019-08-20 09:12:32 +02:00
51a3f3fd4d changed logger.h to clogger.h for c files 2019-08-20 08:48:12 +02:00
29c788b9f7 WIP 2019-08-19 21:28:53 +02:00
0f37481972 WIP 2019-08-19 21:17:52 +02:00
0d787788ea WIP ctb 2019-08-19 21:14:45 +02:00
498a8bda9f WIP 2019-08-19 21:09:44 +02:00
Erik Fröjdh
3e874a3650 removed symlinks in jf server (#49) 2019-08-19 20:40:50 +02:00
d10d9462a3 virtual servers using command virtual numdet port 2019-08-16 19:31:26 +02:00
c6dddaba97 allowed virtual servers 2019-08-16 18:49:08 +02:00
a0bdfcdae3 WIP 2019-08-16 17:38:41 +02:00
d3e60eba80 eiger binary 2019-08-16 17:08:11 +02:00
947252c852 WIP 2019-08-16 09:45:49 +02:00
d4d8cbe9bc gotthard fixed roi only xmin and xmax.remove updateoffsets 2019-08-14 09:20:50 +02:00
f982a59a7c minor 2019-08-09 18:02:12 +02:00
5a483eaf29 WIP, new eiger serveR 2019-08-09 11:11:29 +02:00
Dhanya Thattil
98ddf154b2
Partialreadout (#47)
* eiger server, rxr: partial readout, also gui messages: up last command, down clear command

* added binaries and resolved conflict

* bugfix eiger server: interrupt subframe is bit 2 and not bit number 3

* brackets in defs
2019-08-07 09:08:58 +02:00
Dhanya Thattil
d72b6c3659 eiger server: quad, interrupt subframe, reg left and right (#45)
* eiger server: quad, interrupt subframe, reg left and right

*  eiger server: beb can fail in setting up quad, quad and gap pixels
2019-08-06 10:12:34 +02:00
facbc60907 jungfrau server: changes for old and new boards 2019-07-30 09:32:10 +02:00
c8d9503d5f jungfrau server: flow control 10g fixed 2019-07-24 15:19:01 +02:00
b63ec9d84a jungfrau server: updated get starting fnum and frames from start addresses 2019-07-23 15:47:00 +02:00
Dhanya Thattil
6e4e2c4524 Startingfnum (#40)
* starting fnum

* by default starting fnum disabled in gui

* insignificant change

* adding binary

* virtual eiger server working now

* test:: namespace
2019-07-23 14:15:08 +02:00
e3f151851c bug fix: internal hv used ofst instead of msk, insignificant bug though, would have worked 2019-07-23 14:13:41 +02:00
Dhanya Thattil
e7a76ccea1
Quad (#39)
* making quad work in developer branch

* binary added

* minor changes

* bug fix to set quad to 0 when more than 1 detector
2019-07-22 16:41:03 +02:00
078a2e9e6a jungfrau server: firmware version update for v2.0 2019-07-18 11:32:50 +02:00
8cdfe4194f gui works, including clone plots 2019-07-17 16:58:04 +02:00
d3879bb834 WIP 2019-07-15 15:47:05 +02:00
4f5b8c17b2 WIP 2019-07-15 15:46:38 +02:00
0f2641f9fa WIP 2019-07-12 18:24:23 +02:00
8ac7d96ef3 WIP 2019-07-05 08:54:50 +02:00
659e19a856 WIP 2019-07-02 17:59:21 +02:00
4c23c0290d Merge branch 'developer' into gui 2019-07-02 17:50:51 +02:00
d2e4adf483 eiger server bug fix: get dacs conversion wrong 2019-07-02 17:50:39 +02:00
0954bdd2d3 Merge branch 'developer' into gui 2019-07-02 17:29:50 +02:00
f4fa19b559 bugfix rxr: checkonline prints error msg, call receiverversion instead 2019-07-02 17:29:38 +02:00
fc2cc7e00c WIP 2019-07-02 12:09:37 +02:00
Erik Frojdh
547ab8a749 Merge branch 'developer' into gui 2019-07-02 10:54:29 +02:00
e16b857ba2 ctb server: hv select is actually internal hv select 2019-07-02 10:15:25 +02:00
3db09bc0cd Merge branch 'developer' into gui 2019-06-25 09:08:29 +02:00
4b69c01357 ctb server: sync clk get added 2019-06-19 16:55:24 +02:00
b6bba0b7bc Merge branch 'developer' into gui 2019-06-17 17:41:17 +02:00
6e14a2efe2 ctb fix: reset pll reset also adc and dbit phase (fixed), also required adcs to be configured again(due to adc clock being stopped temporarily 2019-06-17 17:24:59 +02:00
c96939cf94 neglible change 2019-06-17 11:45:56 +02:00
39be0770e3 ctb server fixed to have 180 adc output phase 2019-06-14 16:43:56 +02:00
862dc824ba WIP 2019-06-05 11:27:19 +02:00
a6144f658e ctb client and server bug fix: dac didnt compute indices correctly and set dac was not printing in server 2019-06-04 18:11:31 +02:00
3aea917175 updated binaries for the extsig api change 2019-06-04 12:18:06 +02:00
b74ce95b24 removed colon in commands. affects dac, adc and extsig 2019-06-04 12:10:26 +02:00
17f745b45d ctb server: simulator effects, increased fpga reset time from 1 to 2 seconds 2019-06-03 17:22:59 +02:00
Dhanya Thattil
29141ac1a6
set starting frame number of next acquisition for both jungfrau and e… (#27)
* set starting frame number of next acquisition for both jungfrau and eiger. firmware has not implemented a get, so workaround. tests included. frame number 0 not allowed due to Eiger. Eiger max frame is 48 bit, while jungfrau is 64 bit

* made argument of setstartingframenumber const
2019-06-03 11:07:53 +02:00