7471 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	5c34db9cb1	Merge branch 'dhanya_devel'	2015-02-10 14:43:17 +01:00
Dhanya Maliakal	bea1791b4d	initializing variables and copying ot gui only full frames	2015-02-10 12:21:31 +01:00
Anna Bergamaschi	c69ddad821	jungfrau detector server starts in CPU_NOT_10GB mode; ADC VREF put to 1V	2015-02-10 10:16:43 +01:00
Anna Bergamaschi	5735aff30c	Added Moench03 common mode and photon finder/pedestal funcs	2015-02-10 10:15:16 +01:00
Dhanya Maliakal	e975a75be9	some code refraction to get rid of memeory leakage	2015-02-04 16:11:13 +01:00
Anna Bergamaschi	4f84bb19da	Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software	2015-02-04 09:28:09 +01:00
Dhanya Maliakal	aeffb4b93f	get detector and receiver status bug fixed	2015-02-02 16:31:28 +01:00
Dhanya Maliakal	7fd12f97b4	some unnecessary printouts	2015-01-30 16:49:30 +01:00
Dhanya Maliakal	f30833a460	got rid of unnecessary printouts in receiver	2015-01-30 15:03:35 +01:00
Anna Bergamaschi	9ac08e5e76	supports frames with many samples for jctb - obtained by faking number of chips in case of many samples	2015-01-30 12:58:53 +01:00
Dhanya Maliakal	2b248eb793	unnecessary long wait in receiver	2015-01-30 10:58:30 +01:00
Dhanya Maliakal	058f988586	Merge branch 'master' into dhanya_devel	2015-01-29 15:15:16 +01:00
Anna Bergamaschi	05755617f4	possibility of reading images, pedestal etc. for moench03 implemented	2015-01-29 11:20:24 +01:00
Anna Bergamaschi	02a69a0a6c	moench03Ctb data structure and readout funcs added	2015-01-27 17:34:20 +01:00
Dhanya Maliakal	36d6538104	got rid of segmentation fault in update offfsets	2015-01-26 16:57:03 +01:00
Maliakal Dhanya	76c9d2c61b	lot of couts and some pre and post	2015-01-14 10:48:36 +01:00
Maliakal Dhanya	4a755d96ce	revision update	2015-01-14 10:43:41 +01:00
Maliakal Dhanya	d1aa3021fb	includes handling dynamic range for multiple receivers for eiger	2015-01-14 10:18:54 +01:00
Anna Bergamaschi	a149d7fb2e	usleep adeed to reduce CPU consumption	2015-01-08 10:29:30 +01:00
Anna Bergamaschi	faca56f2e3	Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software	2014-12-19 14:29:06 +01:00
Anna Bergamaschi	785f025d1b	Jungfrau server with changed ADC phase	2014-12-19 14:28:41 +01:00
Maliakal Dhanya	f88cc1c47d	merged branch devel	2014-12-11 14:31:53 +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	169c0a43ce	updating version numbers	2014-12-08 10:25:42 +01:00
Maliakal Dhanya	193c62dc42	updating version numbers	2014-12-08 10:20:09 +01:00
Maliakal Dhanya	08a1034f63	back to only top gettgn acquisition	2014-12-08 10:16:31 +01:00
Maliakal Dhanya	f79f3cf021	makefile crash if files dont exist in make clean, fixed	2014-12-08 09:17:56 +01:00
Maliakal Dhanya	dc4e74087d	makefile crash if files dont exist in make clean, fixed	2014-12-08 09:16:19 +01:00
Maliakal Dhanya	0184970ef9	default dac values for eiger	2014-12-04 16:16:06 +01:00
Gemma Tinti	294a8a3098	no change	2014-12-04 11:20:15 +01:00
Maliakal Dhanya	d76200e68d	bottom allowed	2014-12-04 10:49:15 +01:00
Anna Bergamaschi	94a73ecd45	Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software	2014-12-03 10:23:25 +01:00
Anna Bergamaschi	8eea6f1d83	Mofifications to jungfrau server and pattern generator	2014-12-03 10:23:05 +01:00
Maliakal Dhanya	8dd7772bfe	stop server automatic for gemma	2014-12-02 16:12:45 +01:00
Maliakal Dhanya	52d3140a3a	a version of receiver for gemma with bottom	2014-12-02 10:12:00 +01:00
Maliakal Dhanya	6787c2e1e0	got rid of unnecessary usleep before transmitting in receiver	2014-12-01 17:18:26 +01:00
Maliakal Dhanya	28b7a73b13	working version for eiger detector before branching to gemma	2014-12-01 17:15:31 +01:00
Maliakal Dhanya	8dc41efad2	changed to linux argument type with --	2014-12-01 10:54:31 +01:00
Maliakal Dhanya	bc79546e4e	changes for eiger to compensate for 16 bytes and return while at the same time works for first frame being less than expected :266240	2014-11-28 14:29:09 +01:00
Maliakal Dhanya	5b2a896ed3	to return if it catches only 16 bytes or less than expected, but compensates for first frame being only 266240 for eiger	2014-11-28 14:28:56 +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
Anna Bergamaschi	9ad65bc374	First commit	2014-11-27 09:30:14 +01:00
Anna Bergamaschi	5fe8c6e457	multiSlsDetector merging fixed	2014-11-25 12:00:08 +01:00
Anna Bergamaschi	1d5580b0d4	JMCB max frames	2014-11-25 11:54:54 +01:00
Anna Bergamaschi	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
Anna Bergamaschi	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
Maliakal Dhanya	4770d74c12	return even if eiger got only 16 bytes of a packet	2014-11-18 17:29:12 +01:00
Sala Leonardo	2eaefaba3a	added log level control	2014-11-18 10:51:52 +01:00
Sala Leonardo	3921dc2bf8	added DEBUG flags ... added REST, DEBUG description in make help	2014-11-18 10:50:38 +01:00