|
|
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 |
|
|
|
91f8a07a9c
|
jungfrau server fix around for unexplained high current in powerchip (temp sol: start readout to dstip of 0 and auto, then set back
|
2021-10-07 15:18:59 +02:00 |
|
|
|
2c6793633e
|
jungfrau server: fixes for current source and configuring chipv1.1
|
2021-10-07 11:27:02 +02:00 |
|
Erik Frojdh
|
fac7e0fbb0
|
WIP
|
2021-10-07 11:15:02 +02:00 |
|
Erik Frojdh
|
5ed1e1f43f
|
added currentsource example for python
|
2021-10-07 10:59:00 +02:00 |
|
|
|
e2d7d12b3e
|
wip
|
2021-10-06 17:51:25 +02:00 |
|
|
|
46a8a2461c
|
Removed Padding option for Deactivated half modules.
|
2021-10-06 15:11:17 +02:00 |
|
|
|
6360506924
|
moving rebootcontroller in programfpga to detector level to sync all modules
|
2021-10-06 14:39:12 +02:00 |
|
|
|
ea77331a4a
|
updated release
|
2021-10-06 14:29:36 +02:00 |
|
|
|
34fb823675
|
changing ports only in shared memory and not going to detector/receiver server to change current tcp port
|
2021-10-06 14:24:57 +02:00 |
|
|
|
fcfbb7040a
|
binaries in
|
2021-10-06 14:07:36 +02:00 |
|
|
|
1cf0a05247
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2021-10-06 14:06:34 +02:00 |
|
|
|
cdae61c7ff
|
binaries in
|
2021-10-06 13:46:18 +02:00 |
|
|
|
5c3a408a89
|
jungfrau server: setting defaults for current source col registers when disabling current source, and 0.5 ms usleep between power chip and config chip to test
|
2021-10-06 13:41:50 +02:00 |
|
|
|
2fc2c34fad
|
jungfrau server bug fix: always reading chipversion as 1.1
|
2021-10-06 13:38:22 +02:00 |
|
Erik Frojdh
|
56b7dd3ca9
|
added currentsource to python
|
2021-10-05 17:13:32 +02:00 |
|
