1951 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	fa156f337e	sorta done without missing packet identifiers	2015-07-28 18:15:09 +02:00
Dhanya Maliakal	5c5e9d349a	zmin zmax change finish	2015-07-27 19:18:32 +02:00
Dhanya Maliakal	b1a9689caf	solved some zmax zmin problems with gui	2015-07-27 18:53:16 +02:00
Dhanya Maliakal	f970baf1b8	write and copy to gui left	2015-07-27 12:36:45 +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	2d8ee637dc	adc update not stopped between acquisition	2015-07-22 10:35:26 +02:00
Dhanya Maliakal	db5412e599	propix integrated into gui	2015-07-22 10:06:38 +02:00
Dhanya Maliakal	b4a540b6c2	propix settigns file added	2015-07-21 16:34:11 +02:00
Dhanya Maliakal	a8fc34c92b	included propix for client	2015-07-21 16:26:50 +02:00
Dhanya Maliakal	4e52096991	included propix receiver	2015-07-21 16:25:56 +02:00
Dhanya Maliakal	878c12d43e	still long way to go	2015-07-21 13:36:14 +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	26a42d8f67	new way	2015-07-17 13:29:23 +02:00
Dhanya Maliakal	ca9f195f0b	starting of a new change	2015-07-16 13:33:34 +02:00
Dhanya Maliakal	476d1b452f	some changes	2015-07-10 16:04:29 +02:00
Dhanya Maliakal	2ef27b718c	updated gotthardserver to reflect v1.0	2015-07-09 16:59:13 +02:00
Dhanya Maliakal	fbfafb98fd	small change	2015-07-03 16:10:04 +02:00
Dhanya Maliakal	5f0741d882	trimbits flipped and works correctly for top and bottom	2015-07-01 15:00:17 +02:00
Dhanya Maliakal	88e96d45e7	getting dr from rxr fixed	2015-06-30 17:21:45 +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	3600fb6304	git rev in	2015-06-29 16:57:16 +02:00
Dhanya Maliakal	8202e4aa0a	git rev in	2015-06-29 16:56:34 +02:00
Dhanya Maliakal	a5e18833de	git rev in	2015-06-29 16:55:51 +02:00
Dhanya Maliakal	4ebc9dffac	git rev in	2015-06-29 16:55:26 +02:00
Dhanya Maliakal	7e02a9d3d1	resolved flip bytes in eiger	2015-06-26 15:57:28 +02:00
Dhanya Maliakal	237c5286ca	includes dynamic range in offline headers for eiger	2015-06-26 11:49:26 +02:00
Dhanya Maliakal	f3d5de70bf	firmware version for eiger added	2015-06-22 17:09:47 +02:00
Dhanya Maliakal	aa94f2f7be	write headers is compulsory for eiger and shouldnt be in makefile	2015-06-16 16:28:53 +02:00
Dhanya Maliakal	8b282e3bbe	write headers is compulsory for eiger	2015-06-16 16:28:24 +02:00
Dhanya Maliakal	9a61841ac7	git version update	2015-06-16 12:00:02 +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	7b2934fb73	git version update	2015-06-16 11:56:58 +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	bcf8d40fd2	minor changes, but posted semaphore in stop receiver so rxr not waiting forever for gui when it will never come	2015-06-12 17:46:50 +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
Dhanya Maliakal	e035eeaf08	not compulsory anymore for every frame for eiger	2015-06-12 17:44:30 +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
Dhanya Maliakal	67628c74e1	removed all the scripts for just gitall	2015-06-11 12:35:53 +02:00
Dhanya Maliakal	aa29f12bb8	removed all the scripts for just gitall	2015-06-11 12:34:44 +02:00
Dhanya Maliakal	13b35b319c	removed all the scripts for just gitall	2015-06-11 12:34:15 +02:00
Dhanya Maliakal	aca95703a9	tiny changes	2015-06-11 11:42:44 +02:00
Martin Brückner	b27f691d03	Revert "Solved merge conflicts" ... This reverts commit c222221d18bd5db7d9a8c86071fe2fbdc0ce25ac.	2015-06-11 11:30:40 +02:00
Martin Brückner	28ed7d6b2d	Solved merge conflicts	2015-06-11 11:25:49 +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	fdaca88225	includes 32 bit subframes	2015-06-10 13:26:51 +02:00