7473 Commits

Author SHA1 Message Date
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
Dhanya Thattil
c7326504eb
Merge pull request #282 from slsdetectorgroup/j9compdisable
Jungfrau features: 9. auto comp disable time
2021-08-03 20:29:56 +02:00
9370fd3ab0 refactor 2021-08-03 20:13:25 +02:00
5ba41894ef wip 2021-08-03 20:08:08 +02:00
0666afc642 added the other gain modes 2021-08-03 18:02:42 +02:00
e20022f139 jungfrau: settings should not be validated to undefined when special dacs are set individually 2021-08-03 14:51:00 +02:00
9c4ecf0506 jungfrau: comp disable time 2021-08-03 13:12:58 +02:00
Dhanya Thattil
44062f0226
Merge pull request #281 from slsdetectorgroup/revert-280-revert-279-j9compdisable
Revert "Revert "J9compdisable""
2021-08-02 17:15:57 +02:00
Dhanya Thattil
bdffcb1cf1
Revert "Revert "J9compdisable"" 2021-08-02 17:15:46 +02:00
Dhanya Thattil
044879a088
Merge pull request #280 from slsdetectorgroup/revert-279-j9compdisable
Revert "J9compdisable"
2021-08-02 17:11:45 +02:00
Dhanya Thattil
4a2d76164f
Revert "J9compdisable" 2021-08-02 17:11:03 +02:00
15f4dd97b5 wip, jungfrau: auto comp disable has time for 1.1 chip 2021-08-02 17:10:46 +02:00
Dhanya Thattil
35251da015
Merge pull request #277 from slsdetectorgroup/j6mode
Jungfrau features: 6. mode (redone)
2021-08-02 17:05:07 +02:00
c57caa4931 Wbinaries in 2021-08-02 16:49:01 +02:00
dd98a10bda changes in jungfrau frimware 2021-08-02 16:48:15 +02:00
Erik Frojdh
9c04344b79 automatically import enums to slsdet 2021-08-02 16:21:05 +02:00
c10dc203b2 binaries in 2021-08-02 12:45:56 +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
Dhanya Thattil
fc7e73809a
Merge pull request #278 from slsdetectorgroup/j8storagecells
Jungfrau features: 8. storagecells
2021-08-02 08:54:30 +02:00
6f81741931 fix for storagecell bitwise start 2021-07-30 15:51:23 +02:00
c989be1e17 minor 2021-07-30 15:35:57 +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
Dhanya Thattil
6467b04c37
Merge pull request #275 from slsdetectorgroup/j5resetdacs
Jungfrau features: 5. resetdacs
2021-07-30 11:03:36 +02:00
Erik Frojdh
a31b741f7b added python 2021-07-30 10:08:33 +02:00
6c15f5216d Merge branch 'jungfrau1.1' into j5resetdacs 2021-07-29 18:10:40 +02:00
Dhanya Thattil
770ce80473
Merge pull request #274 from slsdetectorgroup/j4defaultdacs
Jungfrau features: 4. defaultdacs
2021-07-29 18:09:58 +02:00
fc7efb2410 refactor 2021-07-29 18:08:41 +02:00
c0312c9bb6 wip done 2021-07-29 17:39:22 +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
e28d19f5be binaries in 2021-07-29 15:57:37 +02:00
a9663abc50 default dacs done 2021-07-29 15:56:32 +02:00
0665209389 Merge branch 'jungfrau1.1' into j4defaultdacs 2021-07-29 12:56:15 +02:00
Dhanya Thattil
ffc3d4ddd0
Merge pull request #269 from slsdetectorgroup/j3settings
Jungfrau features: 3. settings
2021-07-29 12:55:26 +02:00
6997a96aa4 binaries in 2021-07-29 12:52:48 +02:00
2732668548 refactor 2021-07-29 12:52:25 +02:00
e5b17fb8e2 wip 2021-07-29 12:45:05 +02:00
32b208f49f Merge branch 'j3settings' into j4defaultdacs 2021-07-29 10:31:04 +02:00
3f5661739e minor refactor 2021-07-29 10:29:23 +02:00
7a54ee8ea3 binaries in 2021-07-29 10:10:49 +02:00
b484f412ce refactor 2021-07-29 10:10:25 +02:00
4e268c329c refactor 2021-07-29 10:08:04 +02:00
b68cb8927a Merge branch 'jungfrau1.1' into j3settings 2021-07-29 09:11:22 +02:00