6499 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	4fbfe186ef	done	2015-08-04 15:20:00 +02:00
Dhanya Maliakal	902ab36705	almost done	2015-08-03 16:29:59 +02:00
Dhanya Maliakal	d766d1ff37	merge with 10g fix from master	2015-07-30 12:00:38 +02:00
Dhanya Maliakal	c0f2e5c6c2	onepacketsize not consistent for 10g bug fix	2015-07-30 11:00:36 +02:00
Dhanya Maliakal	d49da66dae	almost done with changes	2015-07-30 10:42:10 +02:00
Dhanya Maliakal	e9a301dd97	merge master into partial_Frames, including changes of propix	2015-07-29 10:23:35 +02:00
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	ceba5b8331	Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_calibration	2015-06-29 16:53:37 +02:00
Dhanya Maliakal	51bd146178	flip bytes incorporated	2015-06-29 16:52:52 +02:00
Anna Bergamaschi	90340d76b4	lookup table for the IR intensity	2015-06-26 16:55:38 +02:00
Anna Bergamaschi	2a719390cb	adding script for gifs	2015-06-26 16:32:10 +02:00
Dhanya Maliakal	7e02a9d3d1	resolved flip bytes in eiger	2015-06-26 15:57:28 +02:00
Dhanya Maliakal	47d51674b4	resolved flip bytes in eiger	2015-06-26 15:57:10 +02:00
Dhanya Maliakal	49ef6659d4	eiger dynamic range offline header, moved eiger specific stuff from slsDetectorData to eigerHalfmodule	2015-06-26 15:45:38 +02:00
Dhanya Maliakal	1f9f474670	Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_calibration	2015-06-26 11:53:01 +02:00
Dhanya Maliakal	9041c48bbf	offline headers for dynamic range, fixed port to be same 1 bit always	2015-06-26 11:52:17 +02:00
Dhanya Maliakal	237c5286ca	includes dynamic range in offline headers for eiger	2015-06-26 11:49:26 +02:00
Anna Bergamaschi	b820ae0cad	checkFrameNumber added to moench03 read data	2015-06-23 11:03:49 +02:00
Anna Bergamaschi	92e1029fec	Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_calibration	2015-06-23 09:15:46 +02:00
Anna Bergamaschi	1941ecb3c3	Adedde sturctures for moench03 10Gb data	2015-06-23 09:15:23 +02:00
Dhanya Maliakal	f3d5de70bf	firmware version for eiger added	2015-06-22 17:09:47 +02:00
Anna Bergamaschi	23a21b373e	modified readMoench03 by Marco	2015-06-18 14:16:43 +02:00
Gemma Tinti	e16cda9509	fix a typo and makefile	2015-06-17 17:30:41 +02:00