7395 Commits

Author SHA1 Message Date
Dhanya Thattil
6467b04c37
Merge pull request #275 from slsdetectorgroup/j5resetdacs
Jungfrau features: 5. resetdacs
2021-07-30 11:03:36 +02:00
Erik Frojdh
a31b741f7b added python 2021-07-30 10:08:33 +02:00
6c15f5216d Merge branch 'jungfrau1.1' into j5resetdacs 2021-07-29 18:10:40 +02:00
Dhanya Thattil
770ce80473
Merge pull request #274 from slsdetectorgroup/j4defaultdacs
Jungfrau features: 4. defaultdacs
2021-07-29 18:09:58 +02:00
fc7efb2410 refactor 2021-07-29 18:08:41 +02:00
c0312c9bb6 wip done 2021-07-29 17:39:22 +02:00
3f08d6699c added test to check settings after resetdacs 2021-07-29 17:37:00 +02:00
9f11dae703 fix 2021-07-29 17:26:45 +02:00
9c03e83ef1 reset default dacs 2021-07-29 16:34:38 +02:00
e28d19f5be binaries in 2021-07-29 15:57:37 +02:00
a9663abc50 default dacs done 2021-07-29 15:56:32 +02:00
0665209389 Merge branch 'jungfrau1.1' into j4defaultdacs 2021-07-29 12:56:15 +02:00
Dhanya Thattil
ffc3d4ddd0
Merge pull request #269 from slsdetectorgroup/j3settings
Jungfrau features: 3. settings
2021-07-29 12:55:26 +02:00
6997a96aa4 binaries in 2021-07-29 12:52:48 +02:00
2732668548 refactor 2021-07-29 12:52:25 +02:00
e5b17fb8e2 wip 2021-07-29 12:45:05 +02:00
32b208f49f Merge branch 'j3settings' into j4defaultdacs 2021-07-29 10:31:04 +02:00
3f5661739e minor refactor 2021-07-29 10:29:23 +02:00
7a54ee8ea3 binaries in 2021-07-29 10:10:49 +02:00
b484f412ce refactor 2021-07-29 10:10:25 +02:00
4e268c329c refactor 2021-07-29 10:08:04 +02:00
b68cb8927a Merge branch 'jungfrau1.1' into j3settings 2021-07-29 09:11:22 +02:00
Dhanya Thattil
1161088ca5
Merge pull request #268 from slsdetectorgroup/j2configchip
Jungfrau features 2. config chip
2021-07-29 09:10:28 +02:00
de7f4489af defaultdac upto detector side, settings is undefined when none given 2021-07-28 20:11:58 +02:00
18bbfcaa5b using getlist in gui 2021-07-28 17:52:23 +02:00
7d933bad5e minor 2021-07-28 17:22:14 +02:00
89aff65182 get should not change parameters 2021-07-28 17:16:02 +02:00
d9ff946b1d jungfrau: special dacs have defined values for settings. getsettings give undefined if different values for special dacs 2021-07-28 16:44:57 +02:00
f8b14c694d jungfrau: special settings and configure chip if powered on (1.1 chip) 2021-07-28 13:34:32 +02:00
41bbe4e3cf merge conflict fix 2021-07-27 18:19:41 +02:00
a909874a15 binaries in 2021-07-27 18:17:13 +02:00
7535ea315b jungfrau server: chip configuration only for chip v 1.1 2021-07-27 18:16:30 +02:00
8cc9cd1c75 merge conflict fix 2021-07-27 17:58:01 +02:00
Dhanya Thattil
0eca60c791
Merge pull request #267 from slsdetectorgroup/jungfrauchip
Jungfrau features: 1. chip version
2021-07-27 17:56:10 +02:00
b15b66b82d jungfrau: chip1.1 incompatible with HW 1.0 2021-07-27 17:46:48 +02:00
6461fddc5d minor: server config fname size constst: binaries in 2021-07-27 17:38:02 +02:00
adf690cdcd merge fix conflict 2021-07-27 17:11:06 +02:00
122f0a4a87 merge from 5.2.0-rc 2021-07-27 17:08:59 +02:00
Dhanya Thattil
b634548a13
Merge pull request #273 from slsdetectorgroup/g2fix
g2moduleid
2021-07-27 17:05:15 +02:00
61198eed5f mythen3 binaries in 2021-07-27 17:04:48 +02:00
1e441af30b g2: allowing module id values for master and slave modules 2021-07-27 17:02:20 +02:00
252f5a3e7b eiger fix for status idle in blocking trigger, readyfortrigger is not up indefinitely, so have to look at status 2021-07-27 16:31:34 +02:00
10b8e7467a Wip 2021-07-25 22:49:40 +02:00
cce2511f7a removed forceswitch enum, removed fixgain1 and 2 from jungfrau settings (kept enum for g2 2021-07-23 17:12:48 +02:00
61a99c70df j: configurechip 2021-07-23 14:08:20 +02:00
e18d6d18e6 wip 2021-07-23 11:14:40 +02:00
0148710c4e binaries in 2021-07-23 11:01:42 +02:00
ba42120237 j:firmware versions 2021-07-23 11:01:26 +02:00
1d7915ef55 config file 2021-07-22 16:49:38 +02:00
cb293f9945 j: 1. chipversion 2021-07-22 16:48:35 +02:00