Erik Frojdh
a829e69313
minor
2020-02-03 16:00:24 +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
abe63acc79
jungfrau fix: wait for acquisition to be done before sending stop receiver
2020-01-23 16:41:09 +01:00
Dhanya Thattil
688e4e84d9
Merge pull request #73 from slsdetectorgroup/mythen3
...
mythen3: virtual server, connected timing mode, row and col in header…
2020-01-23 12:35:43 +01:00
Erik Frojdh
0210b7358c
autogen python bindings
2020-01-23 12:13:23 +01:00
Erik Frojdh
dd84337ef3
autogen enums
2020-01-23 11:45:33 +01:00
a9e375ed34
gotthard2: bursttype to burstmode
2020-01-23 11:03:14 +01:00
f881133795
get/set timing, generate data for gotthard2, vref_rstore instead of restore for gotthard2
2020-01-22 18:18:56 +01:00
8cbf3c62a9
merge from developer
2020-01-22 17:30:13 +01:00
Dhanya Thattil
ffc09ed19c
Gotthard2 ( #72 )
...
* rearranging
* gotthard2: updated register map; powerchip checking detector type; internal and external period, frames, exptime; set/get delay, get actualtime, measurement, framesfromstart enabled; which detector comment updated in cmdproxy, detector and slsdetector
* gotthard2: first edit
* gotthard2 bug fix: no module attached
* gotthard2: works
* updated client doc for gotthard2: the timers that are used in continuous mode only
* gotthard2 virtual server sends data
* gotthard2: gain updated
2020-01-22 14:03:59 +01:00
3ea2520615
PR minor changes
2020-01-22 13:55:10 +01:00
1dea112742
adding gotthard2 tests
2020-01-22 11:35:29 +01:00
Dhanya Thattil
d8fccdcefa
Merge branch 'developer' into gotthard2
2020-01-21 18:18:57 +01:00
981b13494c
mythen3: virtual server, connected timing mode, row and col in header, included pattern bit and mask
2020-01-21 18:16:27 +01:00
7131f77a3a
eiger: vcal set to 0
2020-01-21 16:10:15 +01:00
f08d430d16
eiger: vcal set to 0
2020-01-21 16:09:39 +01:00
9c89f6a63d
Merge branch 'developer' into gotthard2
2020-01-21 16:05:04 +01:00
