394 Commits

Author	SHA1	Message	Date
Dhanya Maliakal	cae286941a	added subframe exposure time settable	2015-09-03 15:16:48 +02:00
Anna Bergamaschi	84ad2912c6	Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software	2015-08-28 10:55:22 +02:00
Anna Bergamaschi	dc05e58a57	may be changes to jungfrau detector server	2015-08-28 10:54:59 +02:00
Dhanya Maliakal	704c0f796a	reset acquiringDone before acquistion	2015-08-19 16:56:17 +02:00
Dhanya Maliakal	c9a952a748	changing file name prefix orders, reset frames caught command from command line	2015-08-19 11:38:09 +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	a8fc34c92b	included propix for client	2015-07-21 16:26:50 +02:00
Dhanya Maliakal	a3a2db1f73	fixed 32 progress problem, and increased debugging	2015-06-30 17:20:23 +02:00
Dhanya Maliakal	8202e4aa0a	git rev in	2015-06-29 16:56:34 +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
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	9c66e96770	receiver stop command line should not have receiver readout, acquire doesnt hacve it anymore	2015-05-21 11:11:17 +02:00
Anna Bergamaschi	ba377ec273	Command adcreg added to write to adc registers	2015-05-04 13:48:46 +02:00
Anna Bergamaschi	1edcdff936	Updates for JCTB: adcvpp, save parameters. jungfrauDetectorServer works with JMCBv0.1	2015-03-31 13:54:59 +02:00
Dhanya Maliakal	7e44648da9	different between acquisition index and frame index	2015-03-12 12:22:19 +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
Dhanya Maliakal	cdd18182a8	resolved client side memory leak caused from gui	2015-03-04 16:24:03 +01:00
Dhanya Maliakal	85ccf64175	print receiver configurations for all detectors added	2015-03-02 13:56:23 +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	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
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
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	193c62dc42	updating version numbers	2014-12-08 10:20:09 +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	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	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	dd8f48929c	the version given to esrf	2014-10-16 14:14:00 +02:00
Anna Bergamaschi	327c2106df	Some fixes for the CTB	2014-10-14 17:43:25 +02:00
Anna Bergamaschi	308b3aa9b1	Client and jungfrau server funcs added for pattern generator	2014-10-14 17:03:13 +02:00
Maliakal Dhanya	d8c7201749	module udpport2	2014-09-26 11:18:59 +02:00
Maliakal Dhanya	62464441ee	vtrimbit size and vthreshold common for eiger	2014-09-09 17:00:26 +02:00
Maliakal Dhanya	7faac70c3f	trimbits work.	2014-09-09 15:42:16 +02:00
Maliakal Dhanya	c5a4f357bf	got rid of extra servers for eiger, converted to c and it works	2014-08-29 16:41:19 +02:00
Maliakal Dhanya	56da3f42cc	trimbits not working yet, nth frame works for eiger, scans work for eiger	2014-07-31 12:11:33 +02:00
Maliakal Dhanya	7e46a407c6	added trimval function, but sending trimbits from char to int bug	2014-07-21 16:39:36 +02:00
Maliakal Dhanya	5e6153af9e	fixed bug mv in dacs for command line	2014-07-16 10:45:35 +02:00
Maliakal Dhanya	828a2dbd17	10Gbe, some functions in gotthard and eiger servers including mv in dacs, mv in dacs, changing settings file	2014-07-11 13:06:48 +02:00
Maliakal Dhanya	018b800117	eiger receiver, receiving many packets at a time, with 16,8, 4 bitmode sort of working	2014-07-02 10:55:32 +02:00
Maliakal Dhanya	cf52d85f73	getdata from commandline was getting stuck:fixed,eiger server remembers frame and exptime period cuz getstatus doesn work for now, request images, added setting image number in eigerserver, packetsize fixed in eigerserver	2014-06-16 17:00:21 +02:00
Maliakal Dhanya	73ba765647	git version history	2014-06-03 13:55:41 +02:00
Maliakal Dhanya	35035405a0	git version history	2014-06-03 12:26:45 +02:00
Maliakal Dhanya	de319249cd	latest update from Ian in eiger server	2014-05-27 15:03:08 +02:00