7459 Commits

Author SHA1 Message Date
c7c6d2d654 merge bugs 2021-08-09 11:56:51 +02:00
a32e19d74e moved a definition to server defs 2021-08-09 11:40:53 +02:00
f0c939e577 Merge branch 'jungfrau1.1' into j7filter 2021-08-06 19:16:37 +02:00
Dhanya Thattil
0438949536
Merge pull request #284 from slsdetectorgroup/j13flippeddatax
Jungfrau features: 13. flipped data x
2021-08-06 19:15:09 +02:00
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
6c1f09b8f5 binaries in 2021-08-06 16:12:49 +02:00
f9dc668ba4 binaries in 2021-08-06 16:12:20 +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
76c8fcc7b9 Merge branch 'j13flippeddatax' into j7filter 2021-08-06 15:13:39 +02:00
bd7af28601 minor 2021-08-06 15:13:10 +02:00
cf257cbc65 merge fix 2021-08-06 15:08:21 +02:00
36b107bbae Merge branch 'jungfrau1.1' into j13flippeddatax 2021-08-06 15:07:04 +02:00
69ca1e7fee merge fix 2021-08-06 15:06:32 +02:00
9f6b951988 merge fix 2021-08-06 15:04:25 +02:00
bc5d6a0309 biaries in 2021-08-06 15:02:43 +02:00
64535c2143 set for vetoalg, although currently no difference 2021-08-06 15:02:06 +02:00
7bf6cc3995 wip 2021-08-06 13:25:55 +02:00
a5ba93088f Merge branch 'jungfrau1.1' into j13flippeddatax 2021-08-06 11:53:11 +02:00
Dhanya Thattil
5c0dabbe4f
Merge pull request #283 from slsdetectorgroup/j11udpate
Jungfrau features: 11. update
2021-08-06 11:52:21 +02:00
7bf03c02b7 python filterresitor 2021-08-06 09:01:51 +02:00
69356cf232 filterresitsitor only in chipv1.1 2021-08-05 17:50:46 +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
cd396a1f11 wip 2021-08-04 17:28:51 +02:00
8f53845698 wip 2021-08-04 14:54:18 +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
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