3153 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	96ce9ed7c1	if timer gives -1 in multi, it should not multiply answer with 1e-9 to get in seconds in slsdetectorocmmand	2017-08-04 14:09:56 +02:00
Dhanya Maliakal	41288302f4	fixed resolution for exptime, period and delay in server	2017-08-04 14:01:17 +02:00
Dhanya Maliakal	039092f292	bug fix: changes for the multipurpose reg in configuremac	2017-08-04 11:21:32 +02:00
Dhanya Maliakal	fbee70818a	25 um server using a config.txt file	2017-08-03 14:16:18 +02:00
Dhanya Maliakal	5027f66d77	changed usleep	2017-07-28 12:20:54 +02:00
Dhanya Maliakal	f5773de068	changes for single images with index 0 not realized as caught and therefore no virtual file created, fixed	2017-07-28 12:16:07 +02:00
Dhanya Maliakal	88b6fabb0d	bug did not give error when switching to hdf5	2017-07-28 11:54:22 +02:00
Dhanya Maliakal	37dd32f1b0	version	2017-07-28 11:30:21 +02:00
Dhanya Maliakal	5713cd6092	addin usleep to reduce cpu	2017-07-28 11:28:03 +02:00
Dhanya Maliakal	3174bd1c85	addin usleep to reduce cpu	2017-07-28 11:27:35 +02:00
Dhanya Maliakal	eb4da5ff0c	removed print of elapsed time	2017-07-28 10:19:33 +02:00
Dhanya Maliakal	98d5758ba1	Merge branch 'developer' into 3.0-rc	2017-07-27 14:40:50 +02:00
Dhanya Maliakal	c49c07b34a	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer	2017-07-27 14:40:25 +02:00
Dhanya Maliakal	058fcd8aba	Merge branch 'cmakefix' into developer	2017-07-27 14:40:17 +02:00
Dhanya Maliakal	699cce713b	Merge branch 'cmakefix' into 3.0-rc	2017-07-27 14:40:01 +02:00
Dhanya Maliakal	a88aa53d82	comment to compile statically	2017-07-27 14:39:00 +02:00
Xiaoqiang Wang	7fa13a5d5d	compatible with cmake 2.8.8	2017-07-27 14:28:14 +02:00
Gemma Tinti	56b420d68b	manual	2017-07-27 14:20:46 +02:00
Dhanya Maliakal	efd49ae92a	removing individual hdf5 path from cmakelists	2017-07-27 13:55:23 +02:00
Xiaoqiang Wang	71204172df	simplify hdf5 linking	2017-07-27 12:51:10 +02:00
Xiaoqiang Wang	6cb387e3a8	tab->space reformat	2017-07-27 12:45:27 +02:00
Xiaoqiang Wang	05b32ce26c	find hdf5 cxx component	2017-07-27 12:44:21 +02:00
Dhanya Maliakal	b920e52218	default no for hdf5 and rest	2017-07-27 12:31:12 +02:00
Dhanya Maliakal	f07816a0d1	hdf5 works now, but needs fixes	2017-07-27 12:08:51 +02:00
Dhanya Maliakal	c7d4582efa	versioning	2017-07-27 12:08:28 +02:00
Dhanya Maliakal	77dc4d3d77	solved some warnings	2017-07-27 12:08:12 +02:00
Dhanya Maliakal	1d073b6897	sort of works, but needs simpler fix	2017-07-27 12:07:44 +02:00
Dhanya Maliakal	56aaaf2e07	changes for the cmake	2017-07-27 10:18:07 +02:00
Dhanya Maliakal	e360077e09	changes for the cmake	2017-07-27 10:17:55 +02:00
Dhanya Maliakal	0fcf768772	basename for hdf5 fixes	2017-07-27 09:31:14 +02:00
Dhanya Maliakal	a5f3de61a9	should be able to compile in pcmoench as l_msdetect	2017-07-26 15:09:29 +02:00
Dhanya Maliakal	915fd41bf6	should be able to compile in pcmoench as l_msdetect	2017-07-26 15:09:24 +02:00
Dhanya Maliakal	497f5289e6	new eiger server in serverbins	2017-07-26 11:37:23 +02:00
Dhanya Maliakal	8a8e76e839	added usleep to remove the 100%cpu, removed a insignificant printout	2017-07-26 11:36:31 +02:00
Dhanya Maliakal	086beea501	nothing really	2017-07-26 11:35:56 +02:00
Dhanya Maliakal	1a522c6696	removed ui include files as they are generated anyway for every make	2017-07-26 11:14:17 +02:00
Dhanya Maliakal	91f8987b6c	removed ui include files as they are generated anyway for every make	2017-07-26 11:12:56 +02:00
Dhanya Maliakal	5771a3c722	includes in gui	2017-07-25 13:56:27 +02:00
Dhanya Maliakal	9d8faae375	fixed front end board temp	2017-07-25 13:55:27 +02:00
Dhanya Maliakal	2ddf4117d0	from package to compile receiver library as well	2017-07-25 12:25:24 +02:00
Dhanya Maliakal	68cbb63355	adding the form include files back into git	2017-07-25 12:15:58 +02:00
Dhanya Maliakal	7df21e1790	updated server bins	2017-07-13 14:45:10 +02:00
Dhanya Maliakal	c25239a398	updaterev	2017-07-13 14:44:52 +02:00
Dhanya Maliakal	04165a9da8	rest implementation, index issues	2017-07-13 14:44:34 +02:00
Dhanya Maliakal	0bacb903ea	rest implementation, index issues	2017-07-13 14:44:03 +02:00
Dhanya Maliakal	a1fd34ebb6	for users ensured proper destructors, and ctrl c should kill it	2017-07-13 12:18:45 +02:00
Dhanya Maliakal	126ad92ed8	can set zmqport from receiver	2017-07-13 12:18:19 +02:00
Dhanya Maliakal	e3667f6827	can set zmqport from receiver	2017-07-13 12:18:07 +02:00
Dhanya Maliakal	39560969f4	can set zmqport from receiver, ensured proper destructors, and ctrl c should kill it	2017-07-13 12:17:49 +02:00
Dhanya Maliakal	f1a77c4146	resolved issue with source not being looked at for compiling	2017-07-11 13:27:27 +02:00