Commit Graph

298 Commits

Author SHA1 Message Date
Dhanya Maliakal ebe01104e7 Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0-rc 2017-08-07 10:31:17 +02:00
Dhanya Maliakal 6b8b6b4b3d no need of quotes for gitall.sh 2017-08-07 10:31:11 +02:00
Xiaoqiang Wang 31026576f4 delete cache before (re-)running cmake 2017-08-07 09:54:03 +02:00
Dhanya Maliakal 2c58bc6a5c included numbe of compiler threads 2017-08-04 19:12:44 +02:00
Dhanya Maliakal 3ed2bcf3fa added cmk.sh to build cmake files and compile 2017-08-04 18:54:22 +02:00
Dhanya Maliakal 8f1e8b1196 cmake withotu hdf5 2017-08-04 15:40:44 +02:00
Dhanya Maliakal 3174bd1c85 addin usleep to reduce cpu 2017-07-28 11:27:35 +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 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 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 a1fd34ebb6 for users ensured proper destructors, and ctrl c should kill it 2017-07-13 12:18:45 +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 7033d43e61 changed makefile to find libraries 2017-06-30 12:21:48 +02:00
Dhanya Maliakal 7afbd8f0f0 makefiles and versioning update complete 2017-06-29 17:09:34 +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 c05b89a77d updating exe 2017-06-22 14:32:52 +02:00
Dhanya Maliakal 1c221d5844 insignificant uncommented gui in makefile 2017-06-20 12:47:25 +02:00
Dhanya Maliakal 8b3864969c updated server exe 2017-06-20 12:45:13 +02:00
Gemma Tinti 5481e19709 manual 2017-05-30 16:40:47 +02:00
Gemma Tinti db75f1c81e manual, rate corr 2017-05-26 17:47:08 +02:00
Dhanya Maliakal 4633c142a8 hdf5 by default disabled in makefile 2017-05-16 14:49:37 +02:00
Dhanya Maliakal 5e82b50a00 to not include hdf5 if no is given in Makefile.include 2017-05-12 15:29:34 +02:00
Dhanya Maliakal 78d1504d66 changed all -lpthread to -pthread 2017-05-01 09:39:19 +02:00
Dhanya Maliakal c6cb499758 added the jungfrau binary 2017-04-28 13:41:08 +02:00
Gemma Tinti faefcc4799 Merge branch '2.3' into developer 2017-03-29 11:25:28 +02:00
Gemma Tinti 1afb9e3e48 manual 2017-03-29 11:23:44 +02:00
Gemma Tinti 09d3372cc0 manual 2017-03-29 10:11:16 +02:00
Gemma Tinti 671587c029 manual 2017-03-29 10:09:52 +02:00
Dhanya Maliakal 72d89fefc3 modified release 2017-03-24 16:58:00 +01:00
Dhanya Maliakal aba3a67b80 Merge branch '2.3' into developer 2017-03-24 14:20:38 +01:00
Dhanya Maliakal eb203c93b2 removing the return value usage in start acquisition callback, callbacks will be called if registered, and we will write files if file write enabled 2017-03-24 13:41:30 +01:00
Dhanya Maliakal e8b14f8c8a done 2017-03-24 08:26:10 +01:00
Dhanya Maliakal aca09bcd4e done 2017-03-24 08:25:50 +01:00
Dhanya Maliakal fdb4fa28db retrying 2017-03-24 08:22:50 +01:00
Dhanya Maliakal 93362963e2 removed changes for test 2017-03-24 08:12:38 +01:00
Dhanya Maliakal 33a7375c72 changes to test 2017-03-24 08:12:10 +01:00