5355 Commits

Author SHA1 Message Date
fd631ebb71 tests fixed for inj_ch 2019-11-13 16:54:20 +01:00
21d23be522 gotthard2: inejct channel done 2019-11-13 16:49:35 +01:00
28a5aa8342 injectchannel WIP 2019-11-13 15:11:11 +01:00
5ee3f5cf4c rxr bug fix: if no rxr, shm variables should remember so that there is no order to rxr commands in config file 2019-11-13 13:56:09 +01:00
72ac2745ea gotthard2: server fix enum for onchip dac 2019-11-12 12:11:52 +01:00
206041989f mythen3, reading dr back fix 2019-11-11 18:33:59 +01:00
2fff9f5bfe merge 2019-11-11 18:03:13 +01:00
90c34e4942 gotthard2, dacs and onchip dacs from config file 2019-11-11 18:02:08 +01:00
bb26b993ea servers, firmware check message to init message, minor 2019-11-11 12:00:04 +01:00
Marie Andrae
d7ad995dd1 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-11-11 11:40:27 +01:00
Marie Andrae
f53d260202 mythen3: change vph and vpl 2019-11-11 11:40:06 +01:00
35556e96d1 mythen3 channels size 2019-11-11 11:31:03 +01:00
2123fb47a5 mythen3: config reg enable all counters, dr 2019-11-11 10:41:42 +01:00
38ad5d7931 mythen3 rxr 2019-11-08 18:11:27 +01:00
aaeaeab576 gotthard2 on chip dacs: -1 should set for all chips 2019-11-08 17:20:47 +01:00
03ec2c53ab WIP 2019-11-08 17:10:28 +01:00
d7e2ab8ec4 gotthard2: on chip dacs 2019-11-08 17:09:57 +01:00
a92d931a8f mythen3 frequency fixes 2019-11-07 14:35:13 +01:00
615b3b2557 WIP 2019-11-06 19:07:00 +01:00
1797d39216 updated mythen3 to configure phase, freq, delay left, period left, actual time, measurement time, framesfrom start and othe register mappings 2019-11-06 18:58:22 +01:00
0f9fd5cd73 rename of clkdivider to clkfrequency in servers 2019-11-06 16:58:34 +01:00
73b5c3ac57 merge 2019-11-06 16:46:00 +01:00
18b8720c17 separated parameters and versions 2019-11-06 16:43:59 +01:00
Marie Andrae
7de9401bc7 powerchip for mythen3 2019-11-06 11:50:09 +01:00
705ddb7f42 WIP 2019-11-06 11:11:57 +01:00
8eb04c33b5 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-11-06 11:09:56 +01:00
cd5d327988 virtual servers updated 2019-11-06 11:09:48 +01:00
c3180737ed fixed jungfau virtual server as well 2019-11-06 11:05:02 +01:00
ba37a51858 eiger virtual server exptime fixed 2019-11-06 10:54:33 +01:00
Erik Frojdh
2417f9cd7b enums 2019-11-06 10:26:21 +01:00
b61ca18967 unrequired enum 2019-11-05 18:57:05 +01:00
567e821569 updated ieger server 2019-11-05 18:52:51 +01:00
1f64d2a4e2 speed separated 2019-11-05 18:50:35 +01:00
96d64778ee eiger virtual server bug fix, detectorip and detectormac of hostpc 2019-11-05 14:46:58 +01:00
Erik Frojdh
2f2e4da628 Moved CmdLineProxy 2019-11-05 11:07:07 +01:00
Erik Frojdh
b3587bcee5 new enums 2019-11-05 10:20:25 +01:00
40572b6b23 WIP 2019-11-04 16:48:40 +01:00
031241ae28 timer split up 2019-11-04 16:40:11 +01:00
f9fff97f8a mythen3 register mix up 2019-10-31 14:48:53 +01:00
6c5c4f00b3 mythen3 calc checksum 2019-10-31 12:31:51 +01:00
ba9a0c7917 removed unused multi functions 2019-10-30 18:20:16 +01:00
ba3bc9c408 starting of users class 2019-10-30 15:13:16 +01:00
026771f42d bug fix:temp in gui 2019-10-30 13:58:37 +01:00
d05be2519a WIP 2019-10-30 12:32:50 +01:00
11ea071543 adcinvert for jungfrau, gui for jungfrau dacs 2019-10-30 12:28:51 +01:00
4aba8b6ac0 daclist and dacvalues for ctb as well 2019-10-30 11:38:29 +01:00
82570bc084 daclist and dacvalues 2019-10-30 11:09:34 +01:00
fe467cdf70 jungfrau dacs named 2019-10-29 18:11:16 +01:00
925a750f9a WIP 2019-10-29 14:46:45 +01:00
eb2040f0a7 fixed effects of scan 2019-10-29 14:43:51 +01:00