|
|
e28d19f5be
|
binaries in
|
2021-07-29 15:57:37 +02:00 |
|
|
|
32b208f49f
|
Merge branch 'j3settings' into j4defaultdacs
|
2021-07-29 10:31:04 +02:00 |
|
|
|
7a54ee8ea3
|
binaries in
|
2021-07-29 10:10:49 +02:00 |
|
|
|
de7f4489af
|
defaultdac upto detector side, settings is undefined when none given
|
2021-07-28 20:11:58 +02:00 |
|
|
|
41bbe4e3cf
|
merge conflict fix
|
2021-07-27 18:19:41 +02:00 |
|
|
|
b15b66b82d
|
jungfrau: chip1.1 incompatible with HW 1.0
|
2021-07-27 17:46:48 +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 |
|
|
|
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 |
|
|
|
cce2511f7a
|
removed forceswitch enum, removed fixgain1 and 2 from jungfrau settings (kept enum for g2
|
2021-07-23 17:12:48 +02:00 |
|
|
|
0148710c4e
|
binaries in
|
2021-07-23 11:01:42 +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 |
|
|
|
05b7e0ef42
|
conflict merge fix
|
2021-07-22 11:53:00 +02:00 |
|
|
|
da996314e7
|
merge conflict
|
2021-07-22 11:15:57 +02:00 |
|
|
|
d052efbd23
|
binaries in
|
2021-07-21 14:12:15 +02:00 |
|
|
|
91eba6a8b8
|
binaries in
|
2021-07-21 12:32:04 +02:00 |
|
|
|
ec7ba7c508
|
wip to change to enum for portposition
|
2021-07-20 16:05:08 +02:00 |
|
|
|
efe26b2b0d
|
minor enum modif
|
2021-07-20 14:59:42 +02:00 |
|
|
|
e02493d4e4
|
veotalg for g2
|
2021-07-20 14:57:31 +02:00 |
|
|
|
af16ad4040
|
vetoalg: wip
|
2021-07-20 12:58:05 +02:00 |
|
Erik Frojdh
|
09391b767a
|
support for scoped enums and operators in Python
|
2021-07-16 14:48:22 +02:00 |
|
|
|
5e685ea5a6
|
resolving merge from 5.2.0-rc
|
2021-07-15 21:16:42 +02:00 |
|
|
|
c3ad736d3c
|
binaries in
|
2021-07-15 16:28:40 +02:00 |
|
|
|
780d4bfe0a
|
gotthard2: vetostream (detector: only 3gbe, 10gbe via numudpinterfaces)
|
2021-07-15 16:21:17 +02:00 |
|
|
|
4d7fb4e4e0
|
wip
|
2021-07-15 14:48:41 +02:00 |
|
|
|
8354395f64
|
wip
|
2021-07-15 13:44:42 +02:00 |
|
|
|
86d1a18ca1
|
binaries in
|
2021-07-14 15:28:53 +02:00 |
|
|
|
e1c76fb04a
|
binaries in
|
2021-07-14 12:27:30 +02:00 |
|
|
|
c6aaf2f8b1
|
binaries in
|
2021-07-14 09:41:50 +02:00 |
|
|
|
fdf6632356
|
wip
|
2021-07-05 15:20:34 +02:00 |
|
|
|
5ad2299e83
|
binaries in
|
2021-07-02 19:55:45 +02:00 |
|
|
|
cbdb05a3a8
|
wip
|
2021-07-01 15:11:22 +02:00 |
|
|
|
54b9b9938c
|
binaries in after merge conflict
|
2021-07-01 14:35:29 +02:00 |
|
|
|
9d666da4cf
|
binaries in
|
2021-06-28 13:33:24 +02:00 |
|
|
|
18fe63f594
|
wip
|
2021-06-28 13:32:44 +02:00 |
|
|
|
c63f3b327f
|
wip
|
2021-06-25 17:20:34 +02:00 |
|
|
|
61d62c57bc
|
binaries in
|
2021-06-25 15:43:06 +02:00 |
|
|
|
69be046131
|
wip
|
2021-06-24 17:56:07 +02:00 |
|
|
|
755738a42e
|
wip
|
2021-06-22 20:50:50 +02:00 |
|
|
|
1ab3bb8496
|
bianries in
|
2021-06-21 16:35:31 +02:00 |
|
|
|
137b0cc288
|
merge from developer
|
2021-06-21 16:34:42 +02:00 |
|
|
|
e4bf8a5d97
|
binaries in
|
2021-06-21 16:33:28 +02:00 |
|
|
|
5ca4c7f943
|
merged from developer
|
2021-06-21 16:32:36 +02:00 |
|
|
|
d0faf64014
|
binaries in
|
2021-06-21 16:21:51 +02:00 |
|
|
|
ceeb4400a0
|
removing send complete frames fromstop acquisition
|
2021-06-16 10:25:49 +02:00 |
|
