|
|
d3dc9a7690
|
gotthard2: disentangled burst mode #frames, exptime, period from start of acquisition, order dependent now for debugging
|
2020-02-04 12:23:58 +01:00 |
|
|
|
c4559fadb3
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-02-04 12:00:15 +01:00 |
|
|
|
806a2736c1
|
gotthard2: longer wait for startup, period 0
|
2020-02-04 12:00:07 +01:00 |
|
Dhanya Thattil
|
94fcf52e64
|
Merge pull request #76 from slsdetectorgroup/exec
Buffern in exec
|
2020-02-04 10:59:48 +01:00 |
|
|
|
64214f22f9
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-02-04 10:50:14 +01:00 |
|
|
|
36bd91daa3
|
gotthard2: sleep before configuring on chip dacs, default exptime 0 and default period to 1ms
|
2020-02-04 10:50:01 +01:00 |
|
Erik Frojdh
|
40bfca588b
|
minor from clang-tidy
|
2020-02-04 10:36:03 +01:00 |
|
Erik Frojdh
|
b9446f40d1
|
fmt and minor
|
2020-02-04 10:11:27 +01:00 |
|
Erik Frojdh
|
ec66079f65
|
renamed ServerInterface
|
2020-02-04 08:57:35 +01:00 |
|
Erik Frojdh
|
e6340456f6
|
minor
|
2020-02-04 08:47:22 +01:00 |
|
Erik Frojdh
|
f42d591845
|
sizeof
|
2020-02-03 16:51:57 +01:00 |
|
Erik Frojdh
|
e9029ba8f2
|
removed unused functions
|
2020-02-03 16:44:14 +01:00 |
|
Erik Frojdh
|
121747352d
|
buffer
|
2020-02-03 16:35:30 +01:00 |
|
Erik Frojdh
|
4cfea36b93
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-02-03 16:00:32 +01:00 |
|
Erik Frojdh
|
a829e69313
|
minor
|
2020-02-03 16:00:24 +01:00 |
|
|
|
42124ca97c
|
eiger rxr: setting exptime now also sets subperiod in rxr master file
|
2020-02-03 15:54:41 +01:00 |
|
Erik Frojdh
|
972f21258a
|
renamed multiSlsDetector
|
2020-02-03 14:57:37 +01:00 |
|
Erik Frojdh
|
6bb1188c37
|
renamed exes
|
2020-02-03 14:43:40 +01:00 |
|
Erik Frojdh
|
a57c677105
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-02-03 14:38:31 +01:00 |
|
Erik Frojdh
|
254e8f85d8
|
moved non public headers
|
2020-02-03 14:38:24 +01:00 |
|
|
|
56484daf18
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-02-03 12:25:40 +01:00 |
|
Erik Frojdh
|
6cc13f9dc1
|
naming
|
2020-02-03 12:05:52 +01:00 |
|
|
|
93ab8d05d7
|
eiger: change speed to full speed for dr of 4, 8, 16
|
2020-02-03 11:37:43 +01:00 |
|
Erik Frojdh
|
88c65c506f
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-02-03 11:34:14 +01:00 |
|
Erik Frojdh
|
074636a7d6
|
minor cleaning
|
2020-02-03 11:34:07 +01:00 |
|
|
|
e432e6f90d
|
4.1.1 changes: software trigger via stop server, disentangling rxr streamin from register call back
|
2020-02-03 11:25:19 +01:00 |
|
Erik Frojdh
|
a3c686d271
|
renamed
|
2020-02-03 11:04:49 +01:00 |
|
Erik Frojdh
|
9f79f132b7
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-02-03 10:34:51 +01:00 |
|
Erik Frojdh
|
4a7424d749
|
renamed circularFifo
|
2020-02-03 10:34:43 +01:00 |
|
Dhanya Thattil
|
e4f2072067
|
Merge pull request #75 from slsdetectorgroup/nohardexit
initialchecks can be bypassed (version compatibility and oher tests a…
|
2020-02-03 09:13:38 +01:00 |
|
|
|
8bae1059db
|
Merge branch 'developer' into nohardexit
|
2020-01-31 17:36:22 +01:00 |
|
|
|
4b39ca6e5f
|
gotthard2 gui
|
2020-01-31 17:35:56 +01:00 |
|
|
|
f0cccf9de8
|
initialchecks can be bypassed (version compatibility and oher tests at server start up)
|
2020-01-31 16:46:33 +01:00 |
|
|
|
89c774dbf7
|
nios programming: check file size first
|
2020-01-31 11:24:48 +01:00 |
|
Dhanya Thattil
|
5ca3a1b685
|
gotthard2 and mythen3: programming fpga, reboot; jungfrau, ctb: modified programming (#74)
|
2020-01-30 19:52:35 -08:00 |
|
|
|
7d7302a90c
|
mnior
|
2020-01-29 14:38:19 +01:00 |
|
|
|
ac3230c656
|
gotthard2 testing
|
2020-01-29 14:34:23 +01:00 |
|
|
|
5761642da0
|
Merge branch 'developer' into gotthard2testing
|
2020-01-29 11:37:59 +01:00 |
|
|
|
70ffdf9709
|
fixes for IpAddr and MacAddr in Gui
|
2020-01-28 15:00:05 +01:00 |
|
|
|
af2f2708ad
|
rxr: remove file buffering
|
2020-01-28 13:55:44 +01:00 |
|
|
|
c42b4b8c0e
|
incorrect printout to MB
|
2020-01-28 10:43:06 +01:00 |
|
|
|
d9b88ea7d2
|
performance optimization in fifodepth, ensure memory is allocated by writing something in the beginning
|
2020-01-27 20:10:49 +01:00 |
|
|
|
9f22c80081
|
Revert "performance optimization in fifodepth, ensure memory is allocated by writing something in the beginning"
This reverts commit ab6f448e1f1f14e4a6ee2bd90922c290a1c7a28a.
|
2020-01-27 19:59:18 +01:00 |
|
|
|
ab6f448e1f
|
performance optimization in fifodepth, ensure memory is allocated by writing something in the beginning
|
2020-01-27 18:34:10 +01:00 |
|
|
|
53e5a097ab
|
rxr: semaphore instead of keeprunning variable at startup
|
2020-01-27 18:03:03 +01:00 |
|
|
|
e527aad6ab
|
bugfix: high fifo depth more than 32 bit
|
2020-01-27 15:25:41 +01:00 |
|
|
|
a0208778c1
|
bugfix: high fifo depth more than 32 bit
|
2020-01-27 15:21:19 +01:00 |
|
|
|
69897d4c78
|
WIP testing
|
2020-01-27 13:56:44 +01:00 |
|
|
|
41035808e9
|
merge from mythen3 and gotthard2
|
2020-01-24 15:08:58 +01:00 |
|
|
|
2314fdabd1
|
merge from mythen3, and jungfrau fix
|
2020-01-23 16:44:01 +01:00 |
|
