7353 Commits

Author SHA1 Message Date
10b8e7467a Wip 2021-07-25 22:49:40 +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
0148710c4e binaries in 2021-07-23 11:01:42 +02:00
ba42120237 j:firmware versions 2021-07-23 11:01:26 +02:00
1d7915ef55 config file 2021-07-22 16:49:38 +02:00
cb293f9945 j: 1. chipversion 2021-07-22 16:48:35 +02:00
da4d47052d binaries in 2021-07-22 14:01:26 +02:00
5b05a30287 merge conflict fix 2021-07-22 13:52:55 +02:00
97ff58c978 binaries in 2021-07-22 13:48:17 +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
Dhanya Thattil
fd6e44c396
Merge pull request #256 from slsdetectorgroup/disabledata
Disabledata
2021-07-21 17:02:25 +02:00
6e814ae6ec minor 2021-07-21 17:01:44 +02:00
Dhanya Thattil
7d3b7881d1
Merge pull request #265 from slsdetectorgroup/vetosel
G2: vetoalg
2021-07-21 16:47:12 +02:00
Erik Frojdh
a301e223e9 python for datastream 2021-07-21 16:31:32 +02:00
10455b284e minor comment in python 2021-07-21 15:41:52 +02:00
Erik Frojdh
ae0d1cc0d4 python support for vetoalg 2021-07-21 14:38:45 +02:00
d052efbd23 binaries in 2021-07-21 14:12:15 +02:00
69b04cc4f8 minor 2021-07-21 14:11:58 +02:00
3bee03bb3a minor 2021-07-21 14:11:27 +02:00
538b7d0925 minor 2021-07-21 14:10:34 +02:00
df300d29d2 minor 2021-07-21 14:08:47 +02:00
1e1c799223 eiger quad server: set and reset chip signals before and after trimming 2021-07-21 14:05:28 +02:00
91eba6a8b8 binaries in 2021-07-21 12:32:04 +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
cba49fbeae release update 2021-07-20 15:26:03 +02:00
d40d9d122b replace error 2021-07-20 15:05:43 +02:00
efe26b2b0d minor enum modif 2021-07-20 14:59:42 +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
Dhanya Thattil
206c48c7a0
Merge pull request #264 from slsdetectorgroup/g2features
vetostream
2021-07-20 10:01:02 +02:00
Erik Frojdh
09391b767a support for scoped enums and operators in Python 2021-07-16 14:48:22 +02:00
1b348f9b3a binaries in 2021-07-15 21:17:29 +02:00
5e685ea5a6 resolving merge from 5.2.0-rc 2021-07-15 21:16:42 +02:00
Dhanya Thattil
4fd949a833
Merge pull request #259 from slsdetectorgroup/g2timejreset
G2timejreset
2021-07-15 21:06:09 +02:00
3922789245 Merge branch 'g2features' of github.com:slsdetectorgroup/slsDetectorPackage into g2features 2021-07-15 17:03:36 +02:00
7158dab9f5 fix to ensure numinterfaces is not called for g2 2021-07-15 17:03:29 +02:00
c3ad736d3c binaries in 2021-07-15 16:28:40 +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
a127f8c97a g2: badchanels moved to a new register base 2021-07-14 16:03:13 +02:00
1870ee8ae3 Merge branch '5.2.0-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 5.2.0-rc 2021-07-14 15:42:59 +02:00
823ceff328 minor 2021-07-14 15:42:53 +02:00
86d1a18ca1 binaries in 2021-07-14 15:28:53 +02:00
016d0d7fac jungfrau server: temporary fix made to reset core when stopping state machine. problem: stopping in trigger mode and then switching to auto mode blocks data streaming from detector 2021-07-14 15:28:09 +02:00