3484 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	68840b4544	Merge branch '3.0-rc' into developer	2017-08-17 16:50:18 +02:00
Dhanya Maliakal	e2af1de83f	Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0-rc	2017-08-17 16:49:54 +02:00
Dhanya Maliakal	7156d2e7b3	updated client docu. more coming up	2017-08-17 16:49:48 +02:00
Dhanya Maliakal	e2d451a400	Merge branch '3.0-rc' into developer	2017-08-17 16:46:49 +02:00
Dhanya Maliakal	3189bd5359	command line docu. more coming up	2017-08-17 16:46:48 +02:00
Gemma Tinti	c3fce9822f	Merge branch '3.0-rc' into developer	2017-08-17 16:40:35 +02:00
Gemma Tinti	ca02a8fd72	manual	2017-08-17 16:39:48 +02:00
Dhanya Maliakal	3c3a5062bd	Merge branch '3.0-rc' into developer	2017-08-17 16:25:05 +02:00
Dhanya Maliakal	edfa8493d8	command line docu. more coming up	2017-08-17 16:25:04 +02:00
Dhanya Maliakal	52223e61d4	Merge branch '3.0-rc' into developer	2017-08-17 16:25:02 +02:00
Dhanya Maliakal	827ce17fac	command line docu. more coming up	2017-08-17 16:25:01 +02:00
Dhanya Maliakal	96700d42b4	Merge branch '3.0-rc' into developer	2017-08-17 14:34:24 +02:00
Dhanya Maliakal	56e61de863	command line docu. more coming up	2017-08-17 14:34:09 +02:00
Dhanya Maliakal	2932a954ab	Merge branch '3.0-rc' into developer	2017-08-17 14:32:46 +02:00
Dhanya Maliakal	de7bb0b979	command line docu. more coming up	2017-08-17 14:32:45 +02:00
Dhanya Maliakal	6ef4aa9715	Merge branch '3.0-rc' into developer	2017-08-17 14:32:44 +02:00
Dhanya Maliakal	e333eb15cd	command line docu. more coming up	2017-08-17 14:32:43 +02:00
Dhanya Maliakal	80c8ff9f20	Merge branch '3.0-rc' into developer	2017-08-17 14:17:16 +02:00
Dhanya Maliakal	3da71c9274	command line docu. more coming up	2017-08-17 14:17:10 +02:00
Dhanya Maliakal	3a887eb604	Merge branch '3.0-rc' into developer	2017-08-17 14:17:05 +02:00
Dhanya Maliakal	c6549694a8	command line docu. more coming up	2017-08-17 14:16:54 +02:00
Dhanya Maliakal	b9cd0054a9	Merge branch '3.0-rc' into developer	2017-08-17 13:56:09 +02:00
Dhanya Maliakal	cf5137723d	command line docu update. more coming	2017-08-17 13:56:00 +02:00
Dhanya Maliakal	945a7ed10f	Merge branch '3.0-rc' into developer	2017-08-17 13:55:52 +02:00
Dhanya Maliakal	5ef0012518	command line docu update. more coming	2017-08-17 13:55:44 +02:00
Dhanya Maliakal	94e3874545	docu for bug fix eiger serbver	2017-08-17 12:07:57 +02:00
Dhanya Maliakal	722fb58010	bugfix:trimval gave first pixel value and not -1 if all are different	2017-08-17 12:04:54 +02:00
Dhanya Maliakal	d63933b2de	fixed 9m hv	2017-08-17 11:09:26 +02:00
Dhanya Maliakal	c6c0819a5e	Merge branch '3.0-rc' into developer	2017-08-16 19:06:24 +02:00
Dhanya Maliakal	45681f86ce	update client command doc	2017-08-16 19:06:17 +02:00
Dhanya Maliakal	50c5c12523	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer	2017-08-16 19:05:42 +02:00
Dhanya Maliakal	4f773120b2	Merge branch '3.0-rc' into developer	2017-08-16 19:05:36 +02:00
Dhanya Maliakal	4ffefc99a2	Merge branch '3.0-rc' into developer	2017-08-16 19:05:28 +02:00
Dhanya Maliakal	16fc44b3ab	update client command doc	2017-08-16 19:05:17 +02:00
Dhanya Maliakal	e8cfadaae3	Merge branch '3.0-rc' into developer	2017-08-16 18:46:19 +02:00
Dhanya Maliakal	ac6720e27d	appears double in the intro list	2017-08-16 18:46:10 +02:00
Dhanya Maliakal	65c76e10be	Merge branch '3.0-rc' into developer	2017-08-16 18:37:30 +02:00
Dhanya Maliakal	ae7255953d	compile error bug fix	2017-08-16 18:37:10 +02:00
Gemma Tinti	0bbee8d91e	Merge branch '3.0-rc' into developer	2017-08-16 18:21:01 +02:00
Gemma Tinti	24d6d2c24a	Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0-rc	2017-08-16 18:18:48 +02:00
Gemma Tinti	28e9605ab7	eiger documentation	2017-08-16 18:18:31 +02:00
Anna Bergamaschi	6b28201f72	comments merged	2017-08-16 17:50:46 +02:00
Anna Bergamaschi	ae49c04dcd	added documentation to slsDetectorCommand.cpp	2017-08-16 17:29:04 +02:00
Dhanya Maliakal	87abe15227	Merge branch '3.0-rc' into developer	2017-08-16 17:28:09 +02:00
Dhanya Maliakal	5f90db723c	increased default fifo depth for gotthard	2017-08-16 17:27:31 +02:00
Dhanya Maliakal	2ab90ae2ed	Merge branch 'faststreamer' into 3.0-rc	2017-08-16 17:25:25 +02:00
Dhanya Maliakal	4b7970c191	Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0-rc	2017-08-16 17:23:50 +02:00
Dhanya Maliakal	3cf092d058	updating cmd line help	2017-08-16 17:23:37 +02:00
Dhanya Maliakal	0be51b69fb	Merge branch '3.0-rc' into developer	2017-08-16 17:12:40 +02:00
Dhanya Maliakal	57537a350f	updating cmd line help; other detectors other than eiger will complain cannot set timer 14 (subexptime) when setting receiver	2017-08-16 17:12:23 +02:00