9004 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	6063c712f7	copy first frame to latest data no matter what and also copy only if more than packets per frame	2015-03-10 15:04:50 +01:00
Dhanya Maliakal	7a2e42d59a	changed the way gui polls receiver for data for nth frame and otherwise	2015-03-10 15:03:08 +01:00
Anna Bergamaschi	a37eb65dbc	new argv set merged	2015-03-06 10:57:06 +01:00
Anna Bergamaschi	b091b7e1a9	Smallish changes?	2015-03-06 10:44:07 +01:00
Anna Bergamaschi	cd67991357	Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software	2015-03-06 10:43:22 +01:00
Anna Bergamaschi	c7aea8f2a6	Some changes for the JCTB software	2015-03-06 10:43:05 +01:00
Dhanya Maliakal	71ad7ae2f0	some pointers deleted equalled to null	2015-03-05 15:30:21 +01:00
Dhanya Maliakal	2f82469531	fifo debug with color done	2015-03-05 15:21:12 +01:00
Anna Bergamaschi	985b4d71b4	Added jungfrau1.0 data structure (bad) and added xmap, ymap and getPixel method to the slsDetectorData base class	2015-03-05 13:04:31 +01:00
Dhanya Maliakal	cdd18182a8	resolved client side memory leak caused from gui	2015-03-04 16:24:03 +01:00
Dhanya Maliakal	24b9402e52	eiger ensures the mac address is the same as the software mac address	2015-03-03 16:35:52 +01:00
Dhanya Maliakal	7cca11637a	include gemmas 1 module testing as well as multi module testing for serial	2015-03-03 14:23:05 +01:00
Dhanya Maliakal	848569b216	print receiver configurations and some error messages upon exit	2015-03-02 14:04:27 +01:00
Dhanya Maliakal	2c69e45348	Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software	2015-03-02 13:56:52 +01:00
Dhanya Maliakal	85ccf64175	print receiver configurations for all detectors added	2015-03-02 13:56:23 +01:00
Brückner Martin (PSI)	ed50f83fe6	Added extra debug messages (-DMARTIN)	2015-03-02 12:12:23 +01:00
Dhanya Maliakal	5682a6b458	moved startframeindice to before stop listening for gotthard	2015-02-25 10:34:57 +01:00
Dhanya Maliakal	875ee02038	got ridf of warnings for eiger server	2015-02-25 10:34:18 +01:00
Dhanya Maliakal	3ee146a2ca	moved start of frame to after stoplistening, for eiger to ignore incomplete frames	2015-02-24 16:19:33 +01:00
Dhanya Maliakal	2c2d2171d2	get the last frame in eiger with acquiringdone	2015-02-24 16:10:31 +01:00
Dhanya Maliakal	3fa5191705	so that the dacs dont go negative in the gui, default timer reduced to 200ms so more frames can be shown	2015-02-23 15:26:14 +01:00
Dhanya Maliakal	651a13f811	so that gui can reread the same frame from receiver, guidataready is set to zero only once	2015-02-23 15:25:06 +01:00
Dhanya Maliakal	d658799b20	eiger reading master slave top bottom configuration from firmware;not reading from file anymore, serial is hardcoded for each master: also bug changes in gui getting frame from receiver in postprocessing	2015-02-23 15:18:02 +01:00
Anna Bergamaschi	8a79e94fa8	Added draft of moench02 JCTB data	2015-02-20 11:39:35 +01:00
Dhanya Maliakal	59c3d26c96	added script ot checkout	2015-02-18 13:48:08 +01:00
Dhanya Maliakal	e3e7b3a885	eiger settings files	2015-02-13 15:29:11 +01:00
Dhanya Maliakal	6d8fcaa423	debugging output change	2015-02-13 11:58:36 +01:00
Dhanya Maliakal	b2c7944014	type change in eiger server	2015-02-13 11:57:44 +01:00
Dhanya Maliakal	81bcb29f75	no hardcoded beb numbers	2015-02-12 12:08:21 +01:00
Dhanya Maliakal	8863a9f880	no change	2015-02-11 11:22:54 +01:00
Dhanya Maliakal	1e55577fc2	no change	2015-02-10 16:54:39 +01:00
Dhanya Maliakal	c5f8067735	Merge branch 'dhanya_devel'	2015-02-10 16:44:57 +01:00
Dhanya Maliakal	b54f3628ae	Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software	2015-02-10 16:00:09 +01:00
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