7471 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	1611dde9d4	Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detectors_package	2015-03-25 15:37:31 +01:00
Dhanya Maliakal	24bcb04372	included flag for eiger fifo debug	2015-03-25 15:37:07 +01:00
Dhanya Maliakal	1ad0bc56e7	included slsDetectorUsers	2015-03-25 15:26:38 +01:00
Dhanya Maliakal	7924989fb1	some more changes for eiger mapping	2015-03-25 15:14:03 +01:00
Dhanya Maliakal	9b11df1c31	a trial version of eiger mapping data	2015-03-24 10:42:22 +01:00
Leonardo Sala	248848c666	Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software	2015-03-24 09:49:41 +01:00
Anna Bergamaschi	f461ddf2b7	slsDetectorUSers re-added to Makefile - don't remove it again	2015-03-23 15:42:12 +01:00
Leonardo Sala	1df89d4ce2	test	2015-03-23 11:41:19 +01:00
Leonardo Sala	9e78bae614	solved bad_alloc	2015-03-23 11:18:24 +01:00
Dhanya Maliakal	c9269d0f21	included a cstring include for compilation in slsReceiverData.h	2015-03-16 17:53:54 +01:00
Brückner Martin (PSI)	36191396b2	added pull.sh and fetch.sh	2015-03-13 13:35:40 +01:00
Dhanya Maliakal	5c14453c5d	fixed histogram issues	2015-03-13 11:20:00 +01:00
Dhanya Maliakal	477b2fb467	acquire works properly now	2015-03-12 16:47:20 +01:00
Dhanya Maliakal	2c6f0c49a7	lets gui know if old plot	2015-03-12 13:45:45 +01:00
Dhanya Maliakal	89ad2112c6	difference between acquisition index and frame index	2015-03-12 12:25:23 +01:00
Dhanya Maliakal	7e44648da9	different between acquisition index and frame index	2015-03-12 12:22:19 +01:00
Dhanya Maliakal	6232c6584a	put executables into git	2015-03-10 16:06:19 +01:00
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