8441 Commits

Author SHA1 Message Date
0ecc9a1c90 jf binary in 2021-10-08 17:36:13 +02:00
93c5b4aca6 jf 2.0 hw recalibrated with different settings 2021-10-08 17:34:40 +02:00
afdd8a90cd updated server and client binaries to 6.0.0-rc1 2021-10-08 16:09:36 +02:00
Dhanya Thattil
83b3488bc5
Merge pull request #311 from slsdetectorgroup/fixtests
Fixtests
2021-10-08 16:05:22 +02:00
388b68829c Merge branch 'developer' into fixtests 2021-10-08 15:42:56 +02:00
Dhanya Thattil
9717b7c414
Merge pull request #310 from slsdetectorgroup/currentsrc
currentsrc
2021-10-08 15:42:18 +02:00
7ac84f99ba Merge branch 'developer' into currentsrc 2021-10-08 15:41:58 +02:00
Dhanya Thattil
d433200f73
Merge pull request #309 from slsdetectorgroup/shmtests
fixed shm tests
2021-10-08 15:41:34 +02:00
cb32bfb0cd mythen3 works 2021-10-08 15:32:11 +02:00
6b843097e3 gotthard2 passes 2021-10-08 15:11:29 +02:00
4bcc1a24f0 eiger passed 2021-10-08 15:06:09 +02:00
6394fba85d removing trailing _ for members of currentsrcParameters 2021-10-08 12:52:37 +02:00
e6444bf060 fixed shm tests 2021-10-08 12:32:46 +02:00
41a585a969 Merge branch 'developer' into fixtests 2021-10-08 12:03:26 +02:00
Dhanya Thattil
5905404955
Merge pull request #308 from slsdetectorgroup/g2speed
G2speed
2021-10-08 12:03:10 +02:00
5b7918f50e Merge branch 'g2speed' into fixtests 2021-10-08 11:57:49 +02:00
29b9f71361 merge fix 2021-10-08 11:57:19 +02:00
bbae956619 updated eiger versioning 2021-10-08 11:55:05 +02:00
ddad045995 udpating tests 2021-10-08 11:50:28 +02:00
8d309fe051 Merge branch 'g2speed' into fixtests 2021-10-08 11:31:00 +02:00
635789ef85 Merge branch 'developer' into fixtests 2021-10-08 11:30:36 +02:00
3cb02b3d92 minor 2021-10-08 11:29:55 +02:00
5667d2bf30 updated release.txt 2021-10-08 11:08:24 +02:00
684fb81733 binaries in 2021-10-08 11:06:31 +02:00
8d3084d3e1 Merge branch 'g2speed' of github.com:slsdetectorgroup/slsDetectorPackage into g2speed 2021-10-08 11:05:43 +02:00
417bfbaf38 changing g_108MHz enum to g2_108MHZ (similarly 144), adding readoutspeedlist command 2021-10-08 11:05:25 +02:00
Erik Frojdh
975c94fd4b added tests for speedLevel string conversions 2021-10-08 10:56:02 +02:00
Erik Frojdh
b1ae47d189 Merge branch 'g2speed' of github.com:slsdetectorgroup/slsDetectorPackage into g2speed 2021-10-08 10:37:44 +02:00
Erik Frojdh
37b1ac3de4 changed speed to readoutspeed in Detector.py 2021-10-08 10:37:34 +02:00
b4a5a5cd5e binaries in 2021-10-08 10:36:45 +02:00
e107842863 Merge branch 'g2speed' of github.com:slsdetectorgroup/slsDetectorPackage into g2speed 2021-10-08 10:35:19 +02:00
ad9eb7fc19 another bug fix typo 2021-10-08 10:35:09 +02:00
Erik Frojdh
22d5898640 updated python bindings for functions and enums 2021-10-08 10:31:00 +02:00
b98ac198e7 binaries in 2021-10-08 09:45:46 +02:00
90968e1870 bugfix jungfrau readoutspeed from prev change 2021-10-08 09:45:10 +02:00
e3e3639829 binaries in and updated api versioning 2021-10-07 19:11:37 +02:00
6b0e6a72df changed speed to readoutspeed, added g2 speeds (108, 144) 2021-10-07 18:39:18 +02:00
Dhanya Thattil
e2aa426966
Merge pull request #307 from slsdetectorgroup/j1.1fix
J1.1fix
2021-10-07 16:46:27 +02:00
cfb604bbf4 Merge branch 'developer' into j1.1fix 2021-10-07 16:41:02 +02:00
Dhanya Thattil
81241bfc2c
Merge pull request #305 from slsdetectorgroup/programsync
Programsync
2021-10-07 16:40:40 +02:00
961ecba34e binaries in 2021-10-07 16:40:20 +02:00
8aa7ced83e Merge branch 'developer' into j1.1fix 2021-10-07 16:14:50 +02:00
0482e3bc37 Merge branch 'developer' into programsync 2021-10-07 16:12:03 +02:00
Dhanya Thattil
9adc4cff27
Merge pull request #306 from slsdetectorgroup/deactivatedpadding
Deactivated padding
2021-10-07 16:11:38 +02:00
bb1ad0c905 merge fix 2021-10-07 16:11:19 +02:00
5977103312 Merge branch 'developer' into programsync 2021-10-07 16:09:53 +02:00
Dhanya Thattil
4d6ba67c27
Merge pull request #304 from slsdetectorgroup/changeport
changing ports only in shared memory
2021-10-07 16:09:07 +02:00
4662711aa4 Merge branch 'developer' into changeport 2021-10-07 16:08:48 +02:00
Dhanya Thattil
b4a51ad529
Merge pull request #303 from slsdetectorgroup/pycurrent
Python Current Source
2021-10-07 16:07:38 +02:00
c996300806 minor 2021-10-07 16:05:30 +02:00