|
|
c01ce3d514
|
Merge branch 'developer' into g2cont
|
2020-09-24 17:18:04 +02:00 |
|
|
|
99642dad69
|
g2 fix: cont trigger frames in rxr should be 1
|
2020-09-24 17:16:46 +02:00 |
|
Dhanya Thattil
|
2c1fddee84
|
Cmddacs (#189)
Moved dacs to it's own command for command line.
Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
|
2020-09-24 17:16:34 +02:00 |
|
Erik Frojdh
|
c862f1df81
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-09-24 16:55:50 +02:00 |
|
Erik Frojdh
|
671a2724ac
|
more set_using_dict
|
2020-09-24 16:55:41 +02:00 |
|
|
|
9c5d8cfcd7
|
gui fix g2 disabling frame period in con ext
|
2020-09-24 16:05:43 +02:00 |
|
|
|
8483e05f4c
|
binary in
|
2020-09-24 15:44:07 +02:00 |
|
|
|
d96352f2ae
|
g2:fix for period in trigger cont
|
2020-09-24 15:43:14 +02:00 |
|
Erik Frojdh
|
0f65633ea3
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2020.09.24.dev0
|
2020-09-24 14:07:15 +02:00 |
|
Erik Frojdh
|
18d5c5e26d
|
more element
|
2020-09-24 14:06:58 +02:00 |
|
Dhanya Thattil
|
3f19f29c9e
|
G2ContTrigger (#188)
* g2: setting #frames to 1 and period to 0 for cont trigger, extra frame reg is set to #frames for cont auto and #trigger for cont trigger
|
2020-09-24 11:59:11 +02:00 |
|
Erik Frojdh
|
101f029eef
|
generalized set_using_dict
|
2020-09-24 11:01:51 +02:00 |
|
Erik Frojdh
|
97fea10ee2
|
more of @element
|
2020-09-24 08:39:12 +02:00 |
|
Erik Frojdh
|
d3fbfebeb7
|
generalized make_ for python
|
2020-09-23 17:44:19 +02:00 |
|
Erik Frojdh
|
50fd9276ce
|
removed unused tests
|
2020-09-23 17:14:38 +02:00 |
|
Erik Frojdh
|
1f31dd667b
|
more element and dict
|
2020-09-23 17:06:30 +02:00 |
|
Erik Frojdh
|
18cd363f8f
|
tests in
|
2020-09-23 16:34:18 +02:00 |
|
Erik Frojdh
|
0b0f5c94d5
|
master file no index
|
2020-09-23 16:28:50 +02:00 |
|
Erik Frojdh
|
23720e3c63
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-09-23 15:09:25 +02:00 |
|
Erik Frojdh
|
3432343adb
|
element
|
2020-09-23 15:09:16 +02:00 |
|
|
|
d06e0d1e7f
|
wip, doc
|
2020-09-23 15:07:12 +02:00 |
|
|
|
750adffe6a
|
wip, doc
|
2020-09-23 15:07:03 +02:00 |
|
|
|
0b02fabaf8
|
wip, doc
|
2020-09-23 14:59:27 +02:00 |
|
|
|
4aa33b5d7f
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-09-23 14:58:33 +02:00 |
|
|
|
40a1d27e3a
|
wip, doc
|
2020-09-23 14:58:30 +02:00 |
|
|
|
b23410bc5e
|
wip, doc
|
2020-09-23 14:58:25 +02:00 |
|
Erik Frojdh
|
b6d5efd441
|
fix for clientversion
|
2020-09-23 14:54:16 +02:00 |
|
Erik Frojdh
|
79a03c6c92
|
WIP
|
2020-09-23 14:25:51 +02:00 |
|
Erik Frojdh
|
330df3463a
|
version prints hex
|
2020-09-23 14:08:41 +02:00 |
|
Erik Frojdh
|
11754fbb5e
|
tempvalues gives int in case of single value or same values
|
2020-09-23 13:54:18 +02:00 |
|
|
|
e786b9f037
|
wip, doc
|
2020-09-23 13:15:53 +02:00 |
|
|
|
bd4299fd15
|
Wip, doc
|
2020-09-23 12:32:51 +02:00 |
|
|
|
a4bdffd0b9
|
Merge branch 'eigerserverlock' into developer
|
2020-09-22 18:48:35 +02:00 |
|
|
|
bb575c6017
|
wip, doc
|
2020-09-22 18:39:46 +02:00 |
|
|
|
65da9e701b
|
wip, doc
|
2020-09-21 18:30:33 +02:00 |
|
|
|
804ad0997c
|
wip, doc
|
2020-09-21 18:20:59 +02:00 |
|
|
|
2fc0768ad1
|
minor warning fix
|
2020-09-21 17:57:31 +02:00 |
|
Dhanya Thattil
|
ca0192e27e
|
Merge pull request #184 from slsdetectorgroup/eigerserverlock
Eigerserverlock
|
2020-09-21 17:29:03 +02:00 |
|
|
|
4ad486fda0
|
Merge branch 'developer' into eigerserverlock
|
2020-09-21 17:28:38 +02:00 |
|
|
|
cf8581caaa
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-09-21 17:28:03 +02:00 |
|
|
|
a8cc47d25c
|
wip, doc
|
2020-09-21 17:27:49 +02:00 |
|
Erik Frojdh
|
d50c40e2ad
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-09-21 17:18:43 +02:00 |
|
Erik Frojdh
|
f6a442fd10
|
detsize in python
|
2020-09-21 17:18:31 +02:00 |
|
|
|
f5b8681811
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-09-21 17:09:49 +02:00 |
|
|
|
54ca9f7ebb
|
wip, doc
|
2020-09-21 17:09:39 +02:00 |
|
Erik Frojdh
|
9920987b4d
|
dacvalues return int if same
|
2020-09-21 14:41:30 +02:00 |
|
|
|
569c014d3c
|
WIP, doc
|
2020-09-21 11:23:46 +02:00 |
|
|
|
608b71d5ea
|
Merge branch 'eigerserverlock' of github.com:slsdetectorgroup/slsDetectorPackage into eigerserverlock
|
2020-09-18 18:16:09 +02:00 |
|
|
|
c83daab56d
|
merge solved
|
2020-09-18 18:15:54 +02:00 |
|
Dhanya Thattil
|
d65030f5ca
|
Merge pull request #186 from slsdetectorgroup/g2cwframes
G2cwframes
|
2020-09-18 18:01:45 +02:00 |
|
