2995 Commits

Author SHA1 Message Date
bd7af28601 minor 2021-08-06 15:13:10 +02:00
cf257cbc65 merge fix 2021-08-06 15:08:21 +02:00
2934ccbf2c filter cell (only chipv1.1) 2021-08-06 14:42:41 +02:00
7bf6cc3995 wip 2021-08-06 13:25:55 +02:00
42257d8f67 wip 2021-08-06 08:18:34 +02:00
57534fcbee Merge branch 'j7filter' into j14filtercell 2021-08-05 17:51:08 +02:00
69356cf232 filterresitsitor only in chipv1.1 2021-08-05 17:50:46 +02:00
d3bbb50fc8 wip 2021-08-05 17:41:21 +02:00
074178848e minor 2021-08-05 17:29:43 +02:00
86126c7e27 filter resistor in 2021-08-05 16:56:53 +02:00
9312ef0d65 merge 2021-08-05 14:47:34 +02:00
619f3b71c1 flippeddataoverxaxis changed to flipRows 2021-08-05 14:44:25 +02:00
dd12c7c2f5 wip 2021-08-05 13:39:55 +02:00
c5d6dd0dd4 flippeddatax for jungfrau server 2021-08-05 12:39:04 +02:00
acd12bf2fa minor 2021-08-05 10:08:41 +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
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
6f81741931 fix for storagecell bitwise start 2021-07-30 15:51:23 +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
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
a9663abc50 default dacs done 2021-07-29 15:56:32 +02:00
e5b17fb8e2 wip 2021-07-29 12:45:05 +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
6e814ae6ec minor 2021-07-21 17:01:44 +02:00
8ba37e99a7 added enum left right top bottom 2021-07-21 09:25:27 +02:00