279 Commits

Author SHA1 Message Date
Dhanya Maliakal
5af05c24c1 added iodelay with setttings 2016-02-24 18:05:17 +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
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
1fae912cb2 jungfrau server making it uniform, left to do: register confirmation and server_defs 2016-02-04 16:18:01 +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
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
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
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
l_msdetect
fa80d6a205 change settings for eiger 2015-11-13 11:43:19 +01:00
Dhanya Maliakal
bc6dfca552 ensuring vthreshold returns the right value 2015-11-03 15:22:57 +01:00
Dhanya Maliakal
2152eb1d28 detector id returns a number form a file or 0 if no file: eiger 2015-11-02 12:31:19 +01:00
Dhanya Maliakal
25dbaa4e09 fixed the gain and offset default values uploaded for eiger 2015-10-14 10:38:39 +02:00
Dhanya Maliakal
a770389c90 including subframe index from receiver to client and also sending this to gui 2015-09-23 11:50:02 +02:00
Dhanya Maliakal
271838b2b5 changes to includes clkdivider and flags in gui and modify the server for proper checks 2015-09-10 11:29:15 +02:00
Dhanya Maliakal
584b9e6036 added gain and offsets to the shared memory, that are sent along with sls_detector_module, only for eiger 2015-09-04 15:54:12 +02:00
7f168e3a70 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-09-03 15:40:11 +02:00
681ed0f34f added function to read 4 energy calibration coefficients for eiger, comments on how to add them to the software 2015-09-03 15:39:54 +02:00
Dhanya Maliakal
cae286941a added subframe exposure time settable 2015-09-03 15:16:48 +02:00
84ad2912c6 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-08-28 10:55:22 +02:00
dc05e58a57 may be changes to jungfrau detector server 2015-08-28 10:54:59 +02:00
Dhanya Maliakal
a8fc34c92b included propix for client 2015-07-21 16:26:50 +02:00
Dhanya Maliakal
a3a2db1f73 fixed 32 progress problem, and increased debugging 2015-06-30 17:20:23 +02:00
de0f35afb3 some jctb changes 2015-06-12 13:00:13 +02:00
ba377ec273 Command adcreg added to write to adc registers 2015-05-04 13:48:46 +02:00
Dhanya Maliakal
7e44648da9 different between acquisition index and frame index 2015-03-12 12:22:19 +01:00
Dhanya Maliakal
cdd18182a8 resolved client side memory leak caused from gui 2015-03-04 16:24:03 +01:00
Dhanya Maliakal
85ccf64175 print receiver configurations for all detectors added 2015-03-02 13:56:23 +01:00
4f84bb19da Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-02-04 09:28:09 +01:00
Dhanya Maliakal
aeffb4b93f get detector and receiver status bug fixed 2015-02-02 16:31:28 +01:00
9ac08e5e76 supports frames with many samples for jctb - obtained by faking number of chips in case of many samples 2015-01-30 12:58:53 +01:00
785f025d1b Jungfrau server with changed ADC phase 2014-12-19 14:28:41 +01:00
94a73ecd45 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2014-12-03 10:23:25 +01:00
8eea6f1d83 Mofifications to jungfrau server and pattern generator 2014-12-03 10:23:05 +01:00
Maliakal Dhanya
f79f8558f0 mostly to do with better testing methods in eiger server and separating acquisition, inclding start receiver etc 2014-11-28 14:26:47 +01:00
Maliakal Dhanya
4649de2742 some changes for better testing in eiger server, including using set receiver, and changed to top/bottom instead of master slave 2014-11-28 14:26:19 +01:00
d10335e4a9 pattern generator produces binary file as well; adc clock frequency can be changed as well as run clock frequency 2014-11-25 11:38:19 +01:00
327c2106df Some fixes for the CTB 2014-10-14 17:43:25 +02:00
308b3aa9b1 Client and jungfrau server funcs added for pattern generator 2014-10-14 17:03:13 +02:00