2183 Commits

Author	SHA1	Message	Date
Dhanya Maliakal	0ea9cc34b0	changed gotthard dynamic gain value and fixed bug of writing settings enum with more offset to not mixup with conf gain value in firmware	2015-10-23 10:57:45 +02:00
Dhanya Maliakal	8ffdcb08c9	fixed the set trimbit getting stuck bug. was due to gain and offset not sent properly for eiger	2015-10-15 16:00:09 +02:00
Dhanya Maliakal	6ab7947b97	fixed the gain and offset default values uploaded for eiger	2015-10-14 10:47:43 +02:00
Dhanya Maliakal	25dbaa4e09	fixed the gain and offset default values uploaded for eiger	2015-10-14 10:38:39 +02:00
Martin Brückner	8972fa1143	EigerDetectorServer for firmware version 11, changes: direct write into udp block ram	2015-10-08 17:29:13 +02:00
Anna Bergamaschi	5057fd4eef	changed energyConversion.h to compile the calibration wizards	2015-09-24 11:10:12 +02:00
Anna Bergamaschi	11de59d87c	Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software	2015-09-24 10:54:48 +02:00
Anna Bergamaschi	33cf26648b	no real changes	2015-09-24 10:54:43 +02:00
Dhanya Maliakal	cf787c9e7d	minor warnings removed	2015-09-23 17:01:44 +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
Dhanya Maliakal	95324fc929	resets footer frame numbers	2015-09-02 11:06:07 +02:00
Anna Bergamaschi	34a1dac0fe	sls_detector_acquire [id-] should finally work	2015-08-31 14:44:40 +02:00
Anna Bergamaschi	d19b051860	reverting multiSlsDetectorClient to previous version otherwise the index of the detector does not work with default multidetector index. Use sls_detector_get 1-acquire for acquiring with multiple multi-detectors	2015-08-28 12:58:26 +02:00
Anna Bergamaschi	b073ecacb9	multiple detector on one PC should now work	2015-08-28 12:14:55 +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
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	2f160a7c28	reordered file name positions for gemma	2015-08-26 16:47:18 +02:00
Dhanya Maliakal	df1453568c	reverted the file name indices positioning as it doesnt work for gui	2015-08-26 12:50:45 +02:00
Dhanya Maliakal	704c0f796a	reset acquiringDone before acquistion	2015-08-19 16:56:17 +02:00
Dhanya Maliakal	79e13c6db7	using framescaught instead of frameindex in gui to get data	2015-08-19 15:48:14 +02:00
Dhanya Maliakal	225b67f5e5	some bug fix with file naming from previous change	2015-08-19 11:46:41 +02:00
Dhanya Maliakal	c9a952a748	changing file name prefix orders, reset frames caught command from command line	2015-08-19 11:38:09 +02:00
Dhanya Maliakal	24dcc45f5b	receiver crash solved	2015-07-24 10:45:11 +02:00
Dhanya Maliakal	0d83346943	continuous and storeinram variable	2015-07-24 09:21:38 +02:00
Dhanya Maliakal	a8fc34c92b	included propix for client	2015-07-21 16:26:50 +02:00
Dhanya Maliakal	74fc443db5	Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software	2015-07-17 13:56:04 +02:00
Dhanya Maliakal	29c62b1721	offsets corrected for 1.5m	2015-07-17 13:55:02 +02:00
Dhanya Maliakal	2ef27b718c	updated gotthardserver to reflect v1.0	2015-07-09 16:59:13 +02:00
Dhanya Maliakal	5f0741d882	trimbits flipped and works correctly for top and bottom	2015-07-01 15:00:17 +02:00
Dhanya Maliakal	a3a2db1f73	fixed 32 progress problem, and increased debugging	2015-06-30 17:20:23 +02:00
Dhanya Maliakal	f29f9b701d	check detector mac matches hardware mac only for 1Gbe	2015-06-30 12:28:44 +02:00
Dhanya Maliakal	c4e0f2967f	solved detector organisation in client side	2015-06-30 11:54:13 +02:00
Dhanya Maliakal	8202e4aa0a	git rev in	2015-06-29 16:56:34 +02:00
Dhanya Maliakal	f3d5de70bf	firmware version for eiger added	2015-06-22 17:09:47 +02:00
Dhanya Maliakal	861753a5d1	formatted changes made by Martin, which inclded resolving fifo full problem, first frame problem; 32 bit mode sub frame and 16 byte ignore	2015-06-16 11:59:07 +02:00
Dhanya Maliakal	8323f81e8a	beb includes read, write functions, so that it doesnt have to go to locallink interface	2015-06-15 17:41:48 +02:00
Dhanya Maliakal	b11b7c1c09	beb stop acquisiion return, some minor changes, increased the check time for receiver frame after detector read out done using acquisiingDone variable	2015-06-12 17:45:43 +02:00
Anna Bergamaschi	2b05ceb281	Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software	2015-06-12 13:00:21 +02:00
Anna Bergamaschi	de0f35afb3	some jctb changes	2015-06-12 13:00:13 +02:00
Martin Brückner	b193237df3	Making eigerDetectorServer running with the new firmware (request frames/packets is now done in HW)	2015-06-11 11:19:51 +02:00
Dhanya Maliakal	c0dac6fd27	receiver can return fail for a get and a message	2015-05-26 17:00:07 +02:00
Dhanya Maliakal	ee4fa791be	interleaving request messages to different ports of eiger detector	2015-05-26 12:07:43 +02:00
Dhanya Maliakal	9c66e96770	receiver stop command line should not have receiver readout, acquire doesnt hacve it anymore	2015-05-21 11:11:17 +02:00