3353 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Gemma Tinti	2b030abf0d	sync eiger manual	2017-08-16 16:32:53 +02:00
Dhanya Maliakal	e8217b0867	do not complain when setting timers	2017-08-16 16:26:57 +02:00
Dhanya Maliakal	83bb7c99ea	removed gotthard server binary..was for developer branch	2017-08-16 16:05:53 +02:00
Dhanya Maliakal	24d0d776b7	new gotthard server binary	2017-08-16 16:04:47 +02:00
Dhanya Maliakal	f4b01bc18b	rst to sw1 for all	2017-08-16 16:03:57 +02:00
Dhanya Maliakal	509d81ba7d	Merge branch '3.0-rc' into developer	2017-08-16 11:50:26 +02:00
Dhanya Maliakal	eaed8bab08	Merge branch '3.0-rc' into developer	2017-08-16 11:50:13 +02:00
Dhanya Maliakal	3c59b3b8dd	updated command line doc	2017-08-16 11:50:01 +02:00
Dhanya Maliakal	2935722b98	updated command line doc	2017-08-16 11:49:55 +02:00
Dhanya Maliakal	af5f61bd95	updated command line doc	2017-08-16 11:13:40 +02:00
Dhanya Maliakal	8bc039c95f	updated command line doc	2017-08-16 11:13:32 +02:00
Dhanya Maliakal	b0b3701fcf	moved the output dir of slsdetectorClientDocs	2017-08-16 11:11:26 +02:00
Dhanya Maliakal	c489aeb9dc	moved the output dir of slsdetectorClientDocs	2017-08-16 11:11:13 +02:00
Dhanya Maliakal	db983c5439	moved the output dir of slsdetectorClientDocs	2017-08-16 11:10:56 +02:00
Dhanya Maliakal	ca6fff9648	Merge branch '3.0-rc' into developer	2017-08-16 11:04:28 +02:00
Dhanya Maliakal	5de120f7e7	more changes to client docu. more coming up. removed slsDetectorClientDocs from here	2017-08-16 11:03:22 +02:00
Dhanya Maliakal	c21f7f371a	more changes to client docu. more coming up	2017-08-16 10:42:27 +02:00
Dhanya Maliakal	03cc80dc3c	more changes to client docu. more coming up	2017-08-16 10:36:25 +02:00
Dhanya Maliakal	413a944e70	fixed problem with datastream help	2017-08-16 10:11:39 +02:00
Dhanya Maliakal	25ece55d7f	more changes to client docu. more coming up	2017-08-16 10:09:27 +02:00
Dhanya Maliakal	4d493504e3	Merge branch '3.0-rc' into developer	2017-08-15 18:42:51 +02:00
Dhanya Maliakal	bb917b70f3	more changes to client docu. more coming up	2017-08-15 18:42:41 +02:00
Dhanya Maliakal	c0d0ebb104	Merge branch '3.0-rc' into developer	2017-08-15 18:31:12 +02:00
Dhanya Maliakal	f8060ef757	more changes to client docu. more coming up	2017-08-15 18:29:07 +02:00
Dhanya Maliakal	193139f06f	Merge branch '3.0-rc' into developer	2017-08-15 18:08:01 +02:00
Dhanya Maliakal	f92a6e58d3	Merge branch '3.0-rc' into developer	2017-08-15 18:07:17 +02:00
Dhanya Maliakal	8e1a841b42	in between command line documentation	2017-08-15 18:06:45 +02:00
Dhanya Maliakal	6a2c0ac86d	added command line documentation in release.txt	2017-08-15 18:06:20 +02:00
Dhanya Maliakal	9bb8a94c55	updated README	2017-08-15 14:14:47 +02:00
Dhanya Maliakal	f8bb6a04a9	so that the first image shows	2017-08-15 14:10:43 +02:00
Dhanya Maliakal	1e7932f09c	switched back to 200ms	2017-08-15 14:00:34 +02:00