951 Commits

Author SHA1 Message Date
Dhanya Maliakal
94d748a411 start receiver lets detectr prepare for acquistion only if receiver worked, removed to allow other receivers to work using receiver start, status start 2016-06-10 11:03:36 +02:00
Dhanya Maliakal
ae4eb88553 status start acqisition also has detector index now, eiger always has detector index 2016-05-11 11:29:27 +02:00
Dhanya Maliakal
7440ee2255 receiver udp parameters should be sent to receiver everytime if rx_hostname is set 2016-05-10 17:06:46 +02:00
Dhanya Maliakal
0511242846 insignificant details 2016-05-09 11:06:32 +02:00
Gemma Tinti
b8c86f7e83 Rate corrections are now passed in (ns) units. Improvement to the manual. 2016-04-27 15:42:50 +02:00
Dhanya Maliakal
7b7d42f253 fixed the 8 byte iodelay trimfile bug, now writes as 4 bytes 2016-03-14 14:39:40 +01:00
Dhanya Maliakal
7ace569daf resolved conflicts in merging with release 2016-02-25 14:32:56 +01:00
Dhanya Maliakal
5b3aa45439 resolved conflicts in merging with release 2016-02-25 14:31:50 +01:00
Dhanya Maliakal
98ef40b1b6 Merge branch 'release' of git.psi.ch:sls_detectors_software/sls_detector_software into release 2016-02-24 18:05:39 +01:00
Dhanya Maliakal
5af05c24c1 added iodelay with setttings 2016-02-24 18:05:17 +01:00
d8007477b5 High Voltage index changed for jungfrau 2016-02-22 15:11:30 +01:00
13db6a7df5 New interface for PLL reconfig of Junfraus server; moved some_fifo_full_bit and added stopped status 2016-02-22 13:59:53 +01:00
Dhanya Maliakal
4eba07ca90 added error message tau/subexptime to error list 2016-02-17 18:01:58 +01:00
Dhanya Maliakal
8d2f54838a fixed corrections for rate correction, needed to reset daq completely 2016-02-17 15:17:40 +01:00
Dhanya Maliakal
764078d465 something 2016-02-16 11:07:12 +01:00
Dhanya Maliakal
db2e75460e fixed bug of wrong number of frames in receiver when server starts 2016-02-12 17:26:14 +01:00
Dhanya Maliakal
5d3c427f11 changed setctrbit command to resmat 2016-02-11 10:48:58 +01:00
Dhanya Maliakal
1e3f9e8ead fixed receiver toalso get frames*cycles as number of frames 2016-02-10 17:03:10 +01:00
Dhanya Maliakal
9067da5e88 rate correction for eiger implemented 2016-02-10 11:22:59 +01:00
Dhanya Maliakal
f0c4a4a7e4 almost done 2016-02-08 15:20:19 +01:00
Dhanya Maliakal
fed40b02c4 fixed measurement progress bar bug that kepts getting reset for each measurement 2016-02-05 11:29:02 +01:00
Dhanya Maliakal
1fae912cb2 jungfrau server making it uniform, left to do: register confirmation and server_defs 2016-02-04 16:18:01 +01:00
Dhanya Maliakal
6cc22a350d Merge branch 'release' into jungfrauv1.0 2016-02-03 15:05:50 +01:00
Dhanya Maliakal
bef8d413d6 jungfrau done but not merged 2016-01-21 14:43:44 +01:00
Dhanya Maliakal
f477b7a5ac not much changes 2016-01-19 16:25:48 +01:00
Gemma Tinti
a785eb7d5e newline after wrong command 2016-01-08 17:18:50 +01:00
Dhanya Maliakal
5c239ad45f data call back form receiver includes both x and y dimensions 2015-12-16 15:01:00 +01:00
Wang Xiaoqiang
06e810169d Revert "trying to fix for 2D detector(eiger)"
This reverts commit 0a471f54edffb54a9871bbc8ebb241c22775451c.
2015-12-15 16:29:47 +01:00
Dhanya Maliakal
7848b79cf2 2d noop for setdetectorsize 2015-12-15 16:24:43 +01:00
Dhanya Maliakal
cd80160e7d getdetectorsize in users reflects 2d addon 2015-12-15 15:40:39 +01:00
Dhanya Maliakal
2dd2b577fd getdetectorsize in users reflects 2d 2015-12-15 15:36:49 +01:00
Dhanya Maliakal
d6c4ec184a should show progress for each measurement, not collectively 2015-12-15 14:25:53 +01:00
Dhanya Maliakal
921154e43a detsizechan or maximum detecto size for users incorrectly implemented for only 1d 2015-12-15 12:07:28 +01:00
Wang Xiaoqiang
4fc8065ef5 trying to fix for 2D detector(eiger) 2015-12-08 13:26:17 +01:00
Dhanya Maliakal
61f0506c2c settings for jungfrau 2015-12-01 16:43:23 +01:00
Dhanya Maliakal
58dbc59af2 masking vvalues for jungfrau 2015-11-27 17:32:46 +01:00
Dhanya Maliakal
0958a4544e jungfrau works 2015-11-27 15:56:29 +01:00
Dhanya Maliakal
5012ea0c6c unnecessary lock in acquire 2015-11-24 13:50:42 +01:00
Dhanya Maliakal
c097dfc8b3 two acquires at the same tiem should not be possile. using shared memory to set flag, made all connect use the standard connectControl etc 2015-11-20 16:28:48 +01:00
Dhanya Maliakal
a1bd54b16b pulsing in client and server 2015-11-19 17:43:46 +01:00
Dhanya Maliakal
e0464ef782 pulsing client side, and bug fix server side for reset partially 2015-11-19 16:15:59 +01:00
Dhanya Maliakal
291fe8bc22 socket disconnecting in receiver 2015-11-19 11:10:59 +01:00
Dhanya Maliakal
8b0895add0 reset counter bit in eiger detector partially or completely 2015-11-17 16:39:36 +01:00
Dhanya Maliakal
bc55f9d1e4 edited getdatafromdetector to not stop detector for eiger 2015-11-17 12:00:42 +01:00
Dhanya Maliakal
66db11421f implemented fifo depth configurable from client 2015-11-17 10:30:53 +01:00
Dhanya Maliakal
f68d6d0ab6 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-11-13 17:49:36 +01:00
Dhanya Maliakal
c43af96487 some changes refactoring and reducing time spent 2015-11-13 17:47:44 +01:00
l_msdetect
fa80d6a205 change settings for eiger 2015-11-13 11:43:19 +01:00
Dhanya Maliakal
62c92dd364 changing to random read when no gui at beginnning of acquire 2015-11-12 15:05:56 +01:00
Dhanya Maliakal
bc6dfca552 ensuring vthreshold returns the right value 2015-11-03 15:22:57 +01:00