139 Commits

Author	SHA1	Message	Date
Dhanya Maliakal	bbbd4731d7	ensuring acquire, p receiver start and the gui enables and disables data streaming accordingly. those with api will have to know what they want before acquiring	2017-06-22 16:44:29 +02:00
Dhanya Maliakal	445da80df8	resolved warnings, also from esrf: todo: include changes in zmq	2017-05-01 13:11:10 +02:00
Dhanya Maliakal	cad8ffc0c6	resolved the recovering from receiver start error , but still does not acknowledge error in gui	2017-03-10 13:07:33 +01:00
Dhanya Maliakal	300bf85dae	uncommented extra comments	2017-03-09 11:40:26 +01:00
Anna Bergamaschi	987aeda6fb	sorted out problem with CPU read out	2016-12-22 17:24:53 +01:00
Anna Bergamaschi	68b13a0ecd	merged to developer	2016-12-19 12:26:53 +01:00
Anna Bergamaschi	12cd3d07a2	some changes for jctb	2016-12-19 12:05:59 +01:00
Dhanya Maliakal	2d1c91c0e0	bug in sem for new scans	2016-12-16 14:59:55 +01:00
Dhanya Maliakal	64843c1c76	made the scans work, where the the dummy message from rxr doesnt stop it from listening for the scans/measurement, only at set join thread	2016-12-16 14:46:54 +01:00
Dhanya Maliakal	c70f453de4	changed everything to depend on receiver online shared memory flag, and if it is online is only checked rarely	2016-11-22 14:01:07 +01:00
Anna Bergamaschi	cb879c61ca	changes for new chipterboard -now works with reduced dynamic range and analog/digital readout	2016-11-09 11:36:59 +01:00
Dhanya Maliakal	fa0580ccac	to see the frames	2016-11-02 11:01:59 +01:00
Dhanya Maliakal	4035f9263a	got rid completely of threaded proccessing	2016-11-02 07:28:29 +01:00
Dhanya Maliakal	7fc82723b5	some changes	2016-11-01 14:04:31 +01:00
Dhanya Maliakal	64965e2a1a	check for why gui doesnt show all data	2016-10-25 15:53:04 +02:00
Dhanya Maliakal	51c0ca8c6e	check for why gui doesnt show all data	2016-10-25 15:50:35 +02:00
Dhanya Maliakal	ac4c758636	check for why gui doesnt show all data	2016-10-25 15:44:31 +02:00
Dhanya Maliakal	899adbce5b	merge fixed	2016-10-20 09:17:32 +02:00
Dhanya Maliakal	12574f4c05	merged zmqdata to developer	2016-10-20 08:46:48 +02:00
Dhanya Maliakal	44a69e2aee	improved locking a bit	2016-10-19 10:46:03 +02:00
Dhanya Maliakal	a7e8ff1c42	back	2016-10-18 14:05:05 +02:00
Dhanya Maliakal	eec812f92c	switched	2016-10-18 12:33:47 +02:00
Dhanya Maliakal	de5037ae2b	switched	2016-10-18 12:19:20 +02:00
Dhanya Maliakal	3a6d97b4f3	trying	2016-10-18 12:08:11 +02:00
Dhanya Maliakal	9f28cc686c	done	2016-10-18 11:10:42 +02:00
Dhanya Maliakal	1bade91254	almost there	2016-10-18 08:43:16 +02:00
Dhanya Maliakal	6751132466	works	2016-10-07 14:26:41 +02:00
Dhanya Maliakal	125c3a789a	locking improved	2016-10-07 11:56:04 +02:00
Dhanya Maliakal	1545d37f36	some changes for quitting gui and continuing with acquire from command line	2016-10-07 11:40:51 +02:00
Dhanya Maliakal	dc16d52d49	switching off gui, and acqire should work	2016-10-07 10:21:22 +02:00
Dhanya Maliakal	6da59ca382	somewhere, but weird threads	2016-10-05 15:26:58 +02:00
Dhanya Maliakal	d0501c3139	creating and destroying sockets for each receiver start and stop in a single acquisition (to deal with scans etc)	2016-09-21 16:37:29 +02:00
Dhanya Maliakal	a1df8bdc15	done for eiger, some checks for frameindex=-1,socket closing earlier than last socket etc	2016-09-20 15:11:39 +02:00
Dhanya Maliakal	f517eb7a41	included json example with dummy values	2016-09-16 17:19:37 +02:00
Dhanya Maliakal	1263e80d21	done	2016-09-16 12:49:27 +02:00
Dhanya Maliakal	1da4b07e73	works, need to do json header and send dataready	2016-09-15 17:15:55 +02:00
Dhanya Maliakal	a821442b1a	almosst	2016-09-15 12:16:01 +02:00
Dhanya Maliakal	0f9a841c4a	almost done	2016-09-15 10:17:16 +02:00
Dhanya Maliakal	652d29f2d9	almost done	2016-09-09 17:51:36 +02:00
Dhanya Maliakal	fed40b02c4	fixed measurement progress bar bug that kepts getting reset for each measurement	2016-02-05 11:29:02 +01:00
Dhanya Maliakal	6cc22a350d	Merge branch 'release' into jungfrauv1.0	2016-02-03 15:05:50 +01:00
Dhanya Maliakal	d6c4ec184a	should show progress for each measurement, not collectively	2015-12-15 14:25:53 +01:00
Dhanya Maliakal	0958a4544e	jungfrau works	2015-11-27 15:56:29 +01:00
Dhanya Maliakal	5012ea0c6c	unnecessary lock in acquire	2015-11-24 13:50:42 +01:00
Dhanya Maliakal	c097dfc8b3	two acquires at the same tiem should not be possile. using shared memory to set flag, made all connect use the standard connectControl etc	2015-11-20 16:28:48 +01:00
Dhanya Maliakal	291fe8bc22	socket disconnecting in receiver	2015-11-19 11:10:59 +01:00
Dhanya Maliakal	c43af96487	some changes refactoring and reducing time spent	2015-11-13 17:47:44 +01:00
Dhanya Maliakal	62c92dd364	changing to random read when no gui at beginnning of acquire	2015-11-12 15:05:56 +01:00
Dhanya Maliakal	704c0f796a	reset acquiringDone before acquistion	2015-08-19 16:56:17 +02:00
Dhanya Maliakal	24dcc45f5b	receiver crash solved	2015-07-24 10:45:11 +02:00