|
|
fd6e82e161
|
Merge branch 'j13flippeddatax' into j7filter
|
2021-08-06 16:41:51 +02:00 |
|
|
|
dc921733d0
|
merge fix
|
2021-08-06 16:41:39 +02:00 |
|
|
|
e92270565b
|
changed gain mode. dynamic_gain_mode to dynamic only. binaries in
|
2021-08-06 16:38:05 +02:00 |
|
|
|
4986a5e61a
|
Merge branch 'j13flippeddatax' into j7filter
|
2021-08-06 16:16:46 +02:00 |
|
|
|
e62fc1907f
|
binaries in, merge fix
|
2021-08-06 16:16:25 +02:00 |
|
|
|
67916cc188
|
binaries in, merge fix
|
2021-08-06 16:14:53 +02:00 |
|
|
|
cc3aede979
|
merge fix
|
2021-08-06 16:11:58 +02:00 |
|
|
|
2c53a134cd
|
updated i3gbe to lll
|
2021-08-06 16:08:07 +02:00 |
|
|
|
cf257cbc65
|
merge fix
|
2021-08-06 15:08:21 +02:00 |
|
|
|
7bf6cc3995
|
wip
|
2021-08-06 13:25:55 +02:00 |
|
|
|
86126c7e27
|
filter resistor in
|
2021-08-05 16:56:53 +02:00 |
|
|
|
619f3b71c1
|
flippeddataoverxaxis changed to flipRows
|
2021-08-05 14:44:25 +02:00 |
|
|
|
c5d6dd0dd4
|
flippeddatax for jungfrau server
|
2021-08-05 12:39:04 +02:00 |
|
|
|
1049e5fc71
|
wip
|
2021-08-04 14:35:07 +02:00 |
|
|
|
3802f22ebe
|
wip
|
2021-08-04 14:03:27 +02:00 |
|
|
|
0e5e0f346b
|
rewrote settings enums, gainmode enums
|
2021-08-04 13:07:48 +02:00 |
|
|
|
550810a3ca
|
wip
|
2021-08-03 20:47:26 +02:00 |
|
|
|
9370fd3ab0
|
refactor
|
2021-08-03 20:13:25 +02:00 |
|
|
|
9c4ecf0506
|
jungfrau: comp disable time
|
2021-08-03 13:12:58 +02:00 |
|
|
|
9ed3a294ce
|
jungfrau: gainmode
|
2021-08-02 12:44:57 +02:00 |
|
|
|
6c15f5216d
|
Merge branch 'jungfrau1.1' into j5resetdacs
|
2021-07-29 18:10:40 +02:00 |
|
|
|
fc7efb2410
|
refactor
|
2021-07-29 18:08:41 +02:00 |
|
|
|
9f11dae703
|
fix
|
2021-07-29 17:26:45 +02:00 |
|
|
|
9c03e83ef1
|
reset default dacs
|
2021-07-29 16:34:38 +02:00 |
|
|
|
de7f4489af
|
defaultdac upto detector side, settings is undefined when none given
|
2021-07-28 20:11:58 +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 |
|
|
|
cb293f9945
|
j: 1. chipversion
|
2021-07-22 16:48:35 +02:00 |
|
|
|
5b05a30287
|
merge conflict fix
|
2021-07-22 13:52:55 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
7158dab9f5
|
fix to ensure numinterfaces is not called for g2
|
2021-07-15 17:03:29 +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 |
|
|
|
cbdb05a3a8
|
wip
|
2021-07-01 15:11:22 +02:00 |
|
|
|
18fe63f594
|
wip
|
2021-06-28 13:32:44 +02:00 |
|
|
|
8b22b5dbe7
|
wip
|
2021-06-25 17:13:40 +02:00 |
|
|
|
61c5018a46
|
wip
|
2021-06-23 10:28:14 +02:00 |
|
|
|
755738a42e
|
wip
|
2021-06-22 20:50:50 +02:00 |
|
|
|
47d6ed053c
|
removed slave master difference in stop acquiistion
|
2021-06-15 16:58:32 +02:00 |
|
|
|
994f0a71a6
|
wip
|
2021-06-15 16:27:09 +02:00 |
|
|
|
b11f6c56e7
|
getmaster through stop server, allowing stopacq to first go to slave for eiger, eiger stop to first check reg value to send complete frames before calling stop
|
2021-06-15 12:59:54 +02:00 |
|
|
|
f111ac733b
|
without getmaster, getmaster needs to go to stop server
|
2021-06-15 12:45:58 +02:00 |
|
|
|
bdc3a5f3d9
|
connect ismaster for eiger and gotthard1 and using ismaster to stop master last for eiger
|
2021-06-09 17:40:05 +02:00 |
|
|
|
0afe093afc
|
wip
|
2021-06-04 12:30:59 +02:00 |
|
