7372 Commits

Author SHA1 Message Date
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
da4d47052d binaries in 2021-07-22 14:01:26 +02:00
5b05a30287 merge conflict fix 2021-07-22 13:52:55 +02:00
97ff58c978 binaries in 2021-07-22 13:48:17 +02:00
3d47db7e60 bug fix for virtual datastream and client 2021-07-22 13:47:18 +02:00
05b7e0ef42 conflict merge fix 2021-07-22 11:53:00 +02:00
da996314e7 merge conflict 2021-07-22 11:15:57 +02:00
Dhanya Thattil
fd6e44c396
Merge pull request #256 from slsdetectorgroup/disabledata
Disabledata
2021-07-21 17:02:25 +02:00
6e814ae6ec minor 2021-07-21 17:01:44 +02:00
Dhanya Thattil
7d3b7881d1
Merge pull request #265 from slsdetectorgroup/vetosel
G2: vetoalg
2021-07-21 16:47:12 +02:00
Erik Frojdh
a301e223e9 python for datastream 2021-07-21 16:31:32 +02:00
10455b284e minor comment in python 2021-07-21 15:41:52 +02:00
Erik Frojdh
ae0d1cc0d4 python support for vetoalg 2021-07-21 14:38:45 +02:00
d052efbd23 binaries in 2021-07-21 14:12:15 +02:00
69b04cc4f8 minor 2021-07-21 14:11:58 +02:00
3bee03bb3a minor 2021-07-21 14:11:27 +02:00
538b7d0925 minor 2021-07-21 14:10:34 +02:00
df300d29d2 minor 2021-07-21 14:08:47 +02:00
1e1c799223 eiger quad server: set and reset chip signals before and after trimming 2021-07-21 14:05:28 +02:00
91eba6a8b8 binaries in 2021-07-21 12:32:04 +02:00
8ba37e99a7 added enum left right top bottom 2021-07-21 09:25:27 +02:00
ec7ba7c508 wip to change to enum for portposition 2021-07-20 16:05:08 +02:00
cba49fbeae release update 2021-07-20 15:26:03 +02:00
d40d9d122b replace error 2021-07-20 15:05:43 +02:00