7675 Commits

Author SHA1 Message Date
f72f678d45 Merge branch 'developer' into roundrobin 2021-08-17 11:06:13 +02:00
Dhanya Thattil
6e85603f4c
Merge pull request #292 from slsdetectorgroup/jpartialfix
Jpartialfix
2021-08-17 09:58:17 +02:00
7e829ce9b3 binarie sin 2021-08-17 09:55:02 +02:00
24f012e6c7 jungfrau: cannot set partial readout while acquiring 2021-08-17 09:53:34 +02:00
Dhanya Thattil
3d90c1527a
Merge pull request #291 from slsdetectorgroup/j10partial
J10partial
2021-08-16 17:18:01 +02:00
6aaf7ec328 binaries in 2021-08-16 17:17:49 +02:00
33edb5c769 minor 2021-08-16 17:15:30 +02:00
75b992ed07 fixed for eiger 4 bit 2021-08-16 16:59:54 +02:00
cb22321006 fixed for eiger 4 bit 2021-08-16 16:59:35 +02:00
f8b5795c29 updated for partialread 2021-08-16 16:34:11 +02:00
334d58c3fd g2: fix for module id register 2021-08-16 15:38:19 +02:00
5f8dc7a7f0 fixes 2021-08-16 14:30:47 +02:00
5790e4961b wip 2021-08-13 17:10:46 +02:00
2548a0bfec updated client api 2021-08-13 12:35:22 +02:00
62d697e91f readnlines->partialread, better debugging for TCP socket interface bug 2021-08-13 12:34:50 +02:00
ec01f98c26 wip 2021-08-12 17:37:55 +02:00
Dhanya Thattil
eb652557b6
Merge pull request #290 from slsdetectorgroup/moduleid
G2: Moduleid
2021-08-12 11:24:02 +02:00
4e1a277c2a binaries in 2021-08-12 11:21:22 +02:00
200df88dcf module id instead of serial number 2021-08-12 11:16:10 +02:00
Dhanya Thattil
9e1716da56
Merge pull request #289 from slsdetectorgroup/g2features
G2features
2021-08-11 19:51:53 +02:00
2a44ec7d93 binaries in 2021-08-11 19:51:29 +02:00
58b734e843 binaries in 2021-08-11 19:51:13 +02:00
307abc7378 Merge branch 'g2features' of github.com:slsdetectorgroup/slsDetectorPackage into g2features 2021-08-11 19:50:36 +02:00
afad1a30bd minor 2021-08-11 19:50:29 +02:00
26d5f13faa binaries in 2021-08-11 19:43:31 +02:00
de6976599e redefined server definitions 2021-08-11 19:42:24 +02:00
be8172000f python fix for setserialnumber 2021-08-11 19:38:21 +02:00
a14434ad0a python fix for setserialnumber 2021-08-11 19:37:43 +02:00
3c04734b28 minor comment 2021-08-11 19:35:02 +02:00
c770bcfb7e minor comment 2021-08-11 19:34:23 +02:00
5ad124eebd binaries in 2021-08-11 19:32:33 +02:00
ff9eaaf3f3 serialnumber fixed to point to mod id reg 2021-08-11 19:30:25 +02:00
8e6a0cbfda python for setserialnumber 2021-08-11 19:01:15 +02:00
7494fb2b69 minor 2021-08-11 18:59:08 +02:00
c3a6293b68 binaries merge fix 2021-08-11 18:57:29 +02:00
aa8007da2a binaries in 2021-08-11 18:51:49 +02:00
6f54402aba g2: setting serialnumber allowed 2021-08-11 18:50:49 +02:00
9a777b13bb g2: dbitpipeline 2021-08-11 18:01:28 +02:00
7a76064223 vetoalg added hits and raw 2021-08-11 16:08:32 +02:00
0dbb6ff512 added module id register 2021-08-11 14:59:53 +02:00
0e797ba2ad g2: updated server config file 2021-08-11 14:44:48 +02:00
542c7dfb5a binary in 2021-08-11 14:42:22 +02:00
7c172898d9 jungfrau allow no config files to assume v1.0 2021-08-11 12:10:27 +02:00
Dhanya Thattil
799906a33a
Merge pull request #288 from slsdetectorgroup/jungfrau1.1
Jungfrau features for chipv1.1
2021-08-11 11:56:49 +02:00
4e44f95e71 binaries in after merge fix 2021-08-11 11:56:14 +02:00
40f4fced30 binaries in 2021-08-11 11:51:08 +02:00
Dhanya Thattil
34c8cffadf
Merge pull request #287 from slsdetectorgroup/j12currentsrc
Jungfrau features: 12. current source
2021-08-11 11:42:08 +02:00
f0a0243233 fixed tests 2021-08-11 11:12:28 +02:00
d5a3ddfe7e fixed 2021-08-11 10:46:20 +02:00
c7293f88d0 done 2021-08-10 21:01:36 +02:00