3428 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	84b0f9a91b	updaterev	2017-08-28 12:05:48 +02:00
Dhanya Maliakal	91fece87b2	updaterev	2017-08-28 12:05:42 +02:00
Dhanya Maliakal	05c5ad711b	solving the issue of deleting context by setting linger to 0 so that all open sockets are closed	2017-08-28 12:03:15 +02:00
Gemma Tinti	ad4fdcfa1a	eiger manual	2017-08-26 13:32:00 +02:00
Gemma Tinti	2efe9cd40b	Eiger manual	2017-08-26 09:01:56 +02:00
Gemma Tinti	07594e0607	eiger manual	2017-08-25 16:14:53 +02:00
Dhanya Maliakal	c4c063534e	update user doc	2017-08-25 15:56:30 +02:00
Dhanya Maliakal	705e1a762c	updating user documentation	2017-08-25 15:46:42 +02:00
Dhanya Maliakal	a8b41ca813	updating user documentation	2017-08-25 15:46:16 +02:00
Dhanya Maliakal	0de9682e72	Merge branch '3.0' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0	2017-08-25 15:45:37 +02:00
Dhanya Maliakal	ce0aa98b3f	updated users documentation	2017-08-25 15:42:56 +02:00
Gemma Tinti	57fee3d5ef	eiger manual	2017-08-25 14:24:42 +02:00
Dhanya Maliakal	891e76af0a	gotthard bug fix documented	2017-08-25 12:22:40 +02:00
Dhanya Maliakal	67e92fdf68	Merge branch '3.0' into developer	2017-08-25 12:08:26 +02:00
Dhanya Maliakal	13186e1ee2	modified examples	2017-08-25 12:08:14 +02:00
Dhanya Maliakal	14f97cbc10	Merge branch '3.0' into developer	2017-08-24 18:42:32 +02:00
Dhanya Maliakal	6d2072f198	removed unnecessary print in makefile for manual	2017-08-24 18:41:56 +02:00
Dhanya Maliakal	a78bc86bca	adc reader standalone for blackfin as well	2017-08-24 18:41:30 +02:00
Dhanya Maliakal	5e11e0a7db	added adc reader standalone	2017-08-24 18:40:52 +02:00
Dhanya Maliakal	319d883880	modified user example in manual/manual-api and regenerated documentation	2017-08-24 16:47:27 +02:00
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