297 Commits

Author	SHA1	Message	Date
Dhanya Maliakal	c0db1a89a8	deactivate for eiger	2016-08-02 10:32:37 +02:00
Dhanya Maliakal	ee26339fd7	added more accurate temperature sensors for eiger, and to gui	2016-07-22 10:40:58 +02:00
Dhanya Maliakal	bdf725be48	fixed the update on detector udpating acq period with subexptime	2016-07-15 15:45:40 +02:00
Dhanya Maliakal	4939e47305	fixed dimensions, fixed rate corr bug, moved rate corr to server because config resets memory and ratecorr depends on client variables	2016-07-14 16:23:03 +02:00
Dhanya Maliakal	09d0d3ba22	parallized setup receiver	2016-07-07 15:55:22 +02:00
Dhanya Maliakal	6823e3065b	feature: tau is now read from calib file. if not there, it is set to defalt in server value, but switched off. load trimbits will not touch rate correction	2016-07-05 12:01:41 +02:00
Dhanya Maliakal	35b02c9cf0	added burst_trigger mode for eiger to replace trigger_readout mode	2016-07-04 15:47:32 +02:00
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
Anna Bergamaschi	d8007477b5	High Voltage index changed for jungfrau	2016-02-22 15:11:30 +01:00
Anna Bergamaschi	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	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
Anna Bergamaschi	7f168e3a70	Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software	2015-09-03 15:40:11 +02:00
Anna Bergamaschi	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
Anna Bergamaschi	84ad2912c6	Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software	2015-08-28 10:55:22 +02:00
Anna Bergamaschi	dc05e58a57	may be changes to jungfrau detector server	2015-08-28 10:54:59 +02:00