3358 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	2d52058a55	Printing thread Ids created and exited, others (if others) are zmqs internal threading, moved all zmq socket type to publish subscriber type: (non blocking in send if no client) as per Aldos gui and probably faster, as only clients to receiver standard impl is aldos gui/slsDetectorGui/xiaoqiangs call back via detector class	2017-08-24 16:06:00 +02:00
Dhanya Maliakal	e5c84fd11c	external gui unused variables	2017-08-24 16:03:31 +02:00
Dhanya Maliakal	598d163173	new gotthard server in bin	2017-08-24 16:02:51 +02:00
Dhanya Maliakal	6f09a5abff	Merge branch 'developer' into 3.0	2017-08-24 14:09:36 +02:00
Dhanya Maliakal	fbb04f5ebe	Merge branch 'externalgui' into developer	2017-08-23 19:06:59 +02:00
Dhanya Maliakal	0bea688a83	changes for external gui	2017-08-23 19:06:40 +02:00
Dhanya Maliakal	19d973f5d6	Merge branch '3.0' into externalgui	2017-08-23 18:26:46 +02:00
Dhanya Maliakal	92d5143f81	Merge branch '3.0' into developer	2017-08-23 18:26:36 +02:00
Dhanya Maliakal	6332025bbc	frames caught in 9m was only looking at 1st receiver, now made to average	2017-08-23 18:26:25 +02:00
Dhanya Maliakal	bdccddfe97	in between	2017-08-23 18:24:48 +02:00
Dhanya Maliakal	a236a7a9aa	Merge branch '3.0' into externalgui	2017-08-23 18:01:58 +02:00
Dhanya Maliakal	72c4cbe871	Merge branch '3.0' into developer	2017-08-23 18:01:48 +02:00
Dhanya Maliakal	7ffd9b87b8	bug fix:removed 0x prefix for dr	2017-08-23 18:01:34 +02:00
Dhanya Maliakal	a657bac1b1	removed a print	2017-08-23 18:01:02 +02:00
Dhanya Maliakal	f4e2b819d2	changes for external gui	2017-08-23 16:31:32 +02:00
Xiaoqiang Wang	634fbc748e	compile libraries with -fPIC flag	2017-08-23 16:13:36 +02:00
Gemma Tinti	8fde83499e	Merge branch '3.0' into developer	2017-08-23 12:10:29 +02:00
Gemma Tinti	5e90386fda	manual	2017-08-23 12:09:42 +02:00
Dhanya Maliakal	2116070f02	Merge branch '3.0' into externalgui	2017-08-23 10:11:57 +02:00
Dhanya Maliakal	02c193118b	Merge branch '3.0' into developer	2017-08-23 09:41:27 +02:00
Dhanya Maliakal	33894509e6	Merge branch '3.0' into developer	2017-08-23 09:41:26 +02:00
Dhanya Maliakal	b208acf4a0	moved doxy.config to here	2017-08-23 09:41:10 +02:00
Dhanya Maliakal	02f4b5f546	manual-main fixed, detaildoc not, but for developers and in next release	2017-08-23 09:40:53 +02:00
Dhanya Maliakal	b2513cad23	Merge branch '3.0' into developer	2017-08-22 19:43:49 +02:00
Dhanya Maliakal	4f28df03ab	trials	2017-08-22 19:43:26 +02:00
Dhanya Maliakal	a7dab9a257	updating user documentation. another update required	2017-08-22 19:42:52 +02:00
Dhanya Maliakal	ca756dbeee	Merge branch '3.0' into developer	2017-08-22 19:40:47 +02:00
Dhanya Maliakal	760ca98ee4	updating user documentation. another update required	2017-08-22 19:40:20 +02:00
Dhanya Maliakal	960dc5c62f	removing the print	2017-08-21 10:40:15 +02:00
Dhanya Maliakal	03d9e1d182	check should be before and after the push or pull	2017-08-21 09:24:26 +02:00
Dhanya Maliakal	25886044ab	Merge branch '3.0' into developer	2017-08-21 09:21:41 +02:00
Dhanya Maliakal	4dd7cafe32	Merge branch '3.0' into developer	2017-08-21 09:21:41 +02:00
Dhanya Maliakal	f78a7b201b	updated master file to reflect all files(not just eiger)	2017-08-18 18:35:55 +02:00
Dhanya Maliakal	4e374eb2cd	updaterev	2017-08-18 18:35:30 +02:00
Dhanya Maliakal	5b80ef6d04	changes to release	2017-08-18 18:35:04 +02:00
Dhanya Maliakal	cc5862533e	changes for the statistic moved to listener	2017-08-18 17:57:31 +02:00
Dhanya Maliakal	d58dd1d035	reset fifo statistic at measurement startup	2017-08-18 17:24:56 +02:00
Dhanya Maliakal	3b497eca36	reset fifo statistic at measurement startup	2017-08-18 17:23:52 +02:00
Dhanya Maliakal	f4a11533be	removed prints	2017-08-18 17:02:09 +02:00
Dhanya Maliakal	fe24c8fb86	changed check	2017-08-18 17:00:28 +02:00
Dhanya Maliakal	608f292e4f	moved statistics to listener	2017-08-18 16:50:19 +02:00
Dhanya Maliakal	9868ca3eca	Merge branch '3.0-rc' into developer	2017-08-18 16:13:51 +02:00
Dhanya Maliakal	de3c62fea4	Merge branch '3.0-rc' into developer	2017-08-18 16:13:51 +02:00
Dhanya Maliakal	4b6144c489	updated server binaries	2017-08-18 16:13:33 +02:00
Dhanya Maliakal	4838d6c037	updated server binaries	2017-08-18 16:13:09 +02:00
Dhanya Maliakal	ec4be4f2c0	bugfix: framesl was not conected, exptime default time is 10 us	2017-08-18 16:11:49 +02:00
Dhanya Maliakal	e93f53f459	changes for min fifo level	2017-08-18 15:59:18 +02:00
Dhanya Maliakal	efad86335f	made fifo bound volatile	2017-08-18 15:29:15 +02:00
Dhanya Maliakal	70c2165df4	check of fifo level before trying to push in successfully	2017-08-18 15:21:30 +02:00
Dhanya Maliakal	c1ea73d21c	some changes for release txt	2017-08-18 14:03:11 +02:00