1944 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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	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	c7d4582efa	versioning	2017-07-27 12:08:28 +02:00
Dhanya Maliakal	1d073b6897	sort of works, but needs simpler fix	2017-07-27 12:07:44 +02:00
Dhanya Maliakal	e360077e09	changes for the cmake	2017-07-27 10:17:55 +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	497f5289e6	new eiger server in serverbins	2017-07-26 11:37:23 +02:00
Dhanya Maliakal	086beea501	nothing really	2017-07-26 11:35:56 +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	7df21e1790	updated server bins	2017-07-13 14:45:10 +02:00
Dhanya Maliakal	04165a9da8	rest implementation, index issues	2017-07-13 14:44:34 +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	e3667f6827	can set zmqport from receiver	2017-07-13 12:18:07 +02:00
Dhanya Maliakal	68b1959a85	excluding detector server directories in makefile	2017-07-11 11:16:37 +02:00
Dhanya Maliakal	931a5840e8	changes to gotthard server to include write adc, and also changes to fix the dma=dma+1	2017-07-11 10:54:21 +02:00
Dhanya Maliakal	f430152f61	moved common git evaluation variables to the common folder	2017-07-10 11:22:56 +02:00
Dhanya Maliakal	dbce25fdea	some more changes to make file for automatic versioning	2017-07-10 11:20:15 +02:00
Dhanya Maliakal	a583f3d6e2	some more changes to make file for automatic versioning	2017-07-10 11:18:41 +02:00
Dhanya Maliakal	be6925c504	fixed temperature for jungfrau in server, also for negative values	2017-07-06 16:07:01 +02:00
Dhanya Maliakal	1e50bc4cc0	conflict git	2017-07-03 17:44:52 +02:00
Dhanya Maliakal	374b07a126	merge developer	2017-07-03 17:42:06 +02:00
Dhanya Maliakal	f944d7cae4	made updatereceiver to actually update client in parameters that it can	2017-07-03 17:37:24 +02:00
Dhanya Maliakal	b4309a9f60	changed jungfrau temperature conversion but binary to follow	2017-07-03 14:45:44 +02:00
Dhanya Maliakal	99dad79572	Somewhere	2017-07-03 13:46:06 +02:00
Dhanya Maliakal	da4ffb235c	ensuring set detector type is the first call	2017-07-03 13:32:10 +02:00
Dhanya Maliakal	7033d43e61	changed makefile to find libraries	2017-06-30 12:21:48 +02:00
Dhanya Maliakal	b05e9c194a	makefiles and versioning update complete	2017-06-29 17:10:10 +02:00
Dhanya Maliakal	7afbd8f0f0	makefiles and versioning update complete	2017-06-29 17:09:34 +02:00
Dhanya Maliakal	1a74ceca3e	ensuring file permissions	2017-06-28 18:16:55 +02:00
Dhanya Maliakal	7990dd6f77	fixed makefile and included correct versioning while compiling	2017-06-28 18:13:47 +02:00
Dhanya Maliakal	8992d51787	correct binary jungfrau	2017-06-28 11:26:35 +02:00
Dhanya Maliakal	e79827384a	included update git versionign in each server, removing the main one	2017-06-28 11:24:30 +02:00
Dhanya Maliakal	4905f49108	added updateversion into makefile while compiling	2017-06-28 11:23:19 +02:00
Dhanya Maliakal	fde7ddf832	added updateversion into makefile while compiling	2017-06-28 11:00:21 +02:00
Dhanya Maliakal	7a8d0b8dad	added updateversion into makefile while compiling	2017-06-28 10:57:39 +02:00
Dhanya Maliakal	56645a48af	added updateversion into makefile while compiling	2017-06-28 10:54:27 +02:00
Dhanya Maliakal	a7d3006cda	added updateversion into makefile while compiling	2017-06-28 10:48:03 +02:00
Dhanya Maliakal	c2624daa9a	uncommented a print	2017-06-28 10:27:40 +02:00
Dhanya Maliakal	2126e2a723	added updategit	2017-06-28 10:24:49 +02:00