|
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 |
|
|
c3366a6748
|
g2 binary in
|
2020-09-18 17:59:48 +02:00 |
|
|
7c21aa96a9
|
g2: setting continuous mode frames in naother reg, and when changing from burst to continous
|
2020-09-18 17:58:39 +02:00 |
|
|
d028a120bb
|
binaries in
|
2020-09-18 14:20:05 +02:00 |
|
|
f6dd02acc2
|
minor print in temp_Fpgafl in eiger
|
2020-09-18 14:18:19 +02:00 |
|
|
0906efaf31
|
moving temp_fpgafl and temp_fpgafr back to the stop server
|
2020-09-18 14:09:23 +02:00 |
|
|
8ef79ce173
|
binaries in
|
2020-09-18 11:37:25 +02:00 |
|
|
539c0c295b
|
replaced pthread_mutex_t with sem_t
|
2020-09-18 11:30:04 +02:00 |
|
|
e91420bd16
|
locking in list
|
2020-09-18 11:23:57 +02:00 |
|
|
515a0c05b9
|
removed locking in locallink
|
2020-09-18 11:23:46 +02:00 |
|
|
46b75c1429
|
minor
|
2020-09-18 11:23:33 +02:00 |
|
|
092b3fa8b9
|
eiger: locking for local link access in shared memory
|
2020-09-18 11:23:21 +02:00 |
|
Erik Frojdh
|
a7e24717a9
|
dacs
|
2020-09-17 17:29:57 +02:00 |
|
Erik Frojdh
|
e01e41926c
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-09-17 17:13:30 +02:00 |
|
Erik Frojdh
|
44a8ce864b
|
dacs for docs
|
2020-09-17 17:13:22 +02:00 |
|
|
e18f10051e
|
jungfrau and gotthard binaries in
|
2020-09-17 17:11:57 +02:00 |
|
|
d9bb028da2
|
added dacnames in server defs for g1 and jungfrau
|
2020-09-17 17:11:09 +02:00 |
|
Erik Frojdh
|
6d01348bf4
|
removed setClockFrequency and added some python commands
|
2020-09-17 16:03:58 +02:00 |
|
Erik Frojdh
|
e8cd75a6ac
|
more python commands
|
2020-09-17 15:10:02 +02:00 |
|
Erik Frojdh
|
d945f39142
|
removed unused variables
2020.09.17.dev0
|
2020-09-17 14:39:20 +02:00 |
|
Erik Frojdh
|
ac1e9569b5
|
removed unused fields and added popcount
|
2020-09-17 14:20:02 +02:00 |
|
Erik Frojdh
|
ea1b41c84a
|
fixed bool ini with nullptr
|
2020-09-17 14:07:19 +02:00 |
|
Dhanya Thattil
|
b0dd82c667
|
removing sem_wait in acquire (#182)
|
2020-09-17 13:55:20 +02:00 |
|
Dhanya Thattil
|
bf69951456
|
Merge pull request #183 from slsdetectorgroup/positions
Replacing initializer list with vector
|
2020-09-17 12:57:18 +02:00 |
|
Erik Frojdh
|
2d2e80469c
|
format
|
2020-09-17 12:18:34 +02:00 |
|
Erik Frojdh
|
5d648443fa
|
replaced remaning {}
|
2020-09-17 12:18:08 +02:00 |
|
Erik Frojdh
|
1fb7352378
|
added missing unit in test
|
2020-09-17 12:13:09 +02:00 |
|
Erik Frojdh
|
511c206787
|
replaced initializer list with vector for CmdProxy
|
2020-09-17 12:11:19 +02:00 |
|
Erik Frojdh
|
74edb6a1c1
|
test for single mod exptime
|
2020-09-17 11:42:44 +02:00 |
|
|
3376f7fa37
|
wip, doc
|
2020-09-14 15:39:21 +02:00 |
|
|
bfe36085f2
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-09-14 15:18:55 +02:00 |
|
|
f061d2273a
|
wip, doc
|
2020-09-14 15:18:48 +02:00 |
|
Dhanya Thattil
|
b12ae5d929
|
Merge pull request #180 from slsdetectorgroup/serverdoc
Adding auto generated server default #define in documentation
|
2020-09-14 10:44:01 +02:00 |
|
Erik Frojdh
|
2285061623
|
column wrap for long attributes
|
2020-09-11 17:47:28 +02:00 |
|
Erik Frojdh
|
e10ebe33d7
|
fixed cmake command
|
2020-09-11 17:25:27 +02:00 |
|
|
01921bc016
|
WIp, doc
|
2020-09-11 16:05:53 +02:00 |
|
Erik Frojdh
|
aa10c4665f
|
added ctb
|
2020-09-11 15:25:23 +02:00 |
|