938 Commits

Author SHA1 Message Date
6dfcd9607f Merge branch 'jungfrau1.1' into j11udpate 2021-08-03 20:31:43 +02:00
9370fd3ab0 refactor 2021-08-03 20:13:25 +02:00
0666afc642 added the other gain modes 2021-08-03 18:02:42 +02:00
9c4ecf0506 jungfrau: comp disable time 2021-08-03 13:12:58 +02:00
15f4dd97b5 wip, jungfrau: auto comp disable has time for 1.1 chip 2021-08-02 17:10:46 +02:00
9ed3a294ce jungfrau: gainmode 2021-08-02 12:44:57 +02:00
526aa3273e Merge branch 'jungfrau1.1' into j6mode 2021-08-02 08:55:46 +02:00
d64df39301 storagecells for jungfrauvchip1.1: cannot set addl, storagecelldealy and storagecell start is only from 0-3 2021-07-30 15:32:36 +02:00
02d01b8561 qip 2021-07-30 12:04:04 +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
a9663abc50 default dacs done 2021-07-29 15:56:32 +02:00
de7f4489af defaultdac upto detector side, settings is undefined when none given 2021-07-28 20:11:58 +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
7535ea315b jungfrau server: chip configuration only for chip v 1.1 2021-07-27 18:16:30 +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
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
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
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
fdf6632356 wip 2021-07-05 15:20:34 +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
1b525abfa1 wip 2021-06-25 17:11:36 +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
45992b28a5 merge fix 2021-06-08 12:29:33 +02:00
6f54291a84 documentation, wip 2021-06-08 12:14:06 +02:00
0afe093afc wip 2021-06-04 12:30:59 +02:00