183 Commits

Author SHA1 Message Date
Dhanya Maliakal
86ab51ec41 solved bug of offsets 2016-06-13 19:00:34 +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
5e337debd1 Merge branch 'master' into parallel 2016-03-21 15:00:51 +01:00
Dhanya Maliakal
71129714e4 usability for eiger dr32 sets clk to 2 and dr 16 sets clk to 1 2016-03-21 15:00:15 +01:00
038f45edfd threadpool is initialized 2016-03-21 14:38:38 +01:00
Dhanya Maliakal
7e4ebd3a5d included execute trimming execution of pulseandmove 2016-03-16 18:26:53 +01:00
Dhanya Maliakal
a2c41b58d9 included parallelization for setsettings, setalltrimbits, pulsechip, pulsepixel, pulsepixelnmove 2016-03-16 11:18:35 +01:00
Dhanya Maliakal
4c5736db5e works for get setttings and for loadsettingsfile 2016-03-10 18:18:50 +01:00
Dhanya Maliakal
f8a850ccb2 sd 2016-03-10 17:28:23 +01:00
Dhanya Maliakal
d3a7d3bad3 something 2016-03-10 17:25:47 +01:00
Dhanya Maliakal
6e52c72307 eiger user: setting clk to 2 for 32 dr, and 1 for 16 dr 2016-02-25 16:35:22 +01:00
Dhanya Maliakal
e0f645ed4b some change 2016-02-25 16:25:27 +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
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
07f1bd5c82 mid way, had to change to fix bug 2016-02-08 10:40:54 +01:00
Dhanya Maliakal
0958a4544e jungfrau works 2015-11-27 15:56:29 +01:00
Dhanya Maliakal
ac53cb2ae4 resetting the acquiringflag whenever acquisition stop is called 2015-11-24 15:25:42 +01:00
Dhanya Maliakal
8ae1e812e6 pulse chip fixed 2015-11-20 16:41:27 +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
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
dd1233bc7c outdir for multi is for all 2015-10-26 11:26:16 +01: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
8ebb34dd42 fixed long file names in guireducing redundancy in name 2015-08-28 10:23:21 +02:00
Dhanya Maliakal
f546814d39 reduced size of file names in gui 2015-08-27 10:44:24 +02:00
Dhanya Maliakal
29c62b1721 offsets corrected for 1.5m 2015-07-17 13:55:02 +02:00
Dhanya Maliakal
c4e0f2967f solved detector organisation in client side 2015-06-30 11:54: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
Dhanya Maliakal
d658799b20 eiger reading master slave top bottom configuration from firmware;not reading from file anymore, serial is hardcoded for each master: also bug changes in gui getting frame from receiver in postprocessing 2015-02-23 15:18:02 +01:00
Dhanya Maliakal
8863a9f880 no change 2015-02-11 11:22:54 +01:00
Dhanya Maliakal
5c34db9cb1 Merge branch 'dhanya_devel' 2015-02-10 14:43:17 +01:00
Dhanya Maliakal
aeffb4b93f get detector and receiver status bug fixed 2015-02-02 16:31:28 +01:00
Dhanya Maliakal
058f988586 Merge branch 'master' into dhanya_devel 2015-01-29 15:15:16 +01:00
Dhanya Maliakal
36d6538104 got rid of segmentation fault in update offfsets 2015-01-26 16:57:03 +01:00
Maliakal Dhanya
d1aa3021fb includes handling dynamic range for multiple receivers for eiger 2015-01-14 10:18:54 +01:00
Maliakal Dhanya
255f9e3fee eiger: trimbits changed such that it works for multi modules, ;general: loading multislsdetectr list with y dir first, updating the readframefromreceiver to load all the data interswapped for 16 bit; nthframe works better 2014-12-11 14:16:43 +01:00
Maliakal Dhanya
28b7a73b13 working version for eiger detector before branching to gemma 2014-12-01 17:15:31 +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
5fe8c6e457 multiSlsDetector merging fixed 2014-11-25 12:00:08 +01:00
91344f54d9 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
Conflicts:
	multiSlsDetector/multiSlsDetector.cpp
2014-11-25 11:46:34 +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