1573 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anna Bergamaschi	be95de0963	Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detector_software into 3.0-rc	2017-08-17 17:04:27 +02:00
Anna Bergamaschi	0dd6567ce4	changed some sections in the documentation	2017-08-17 17:04:07 +02:00
Dhanya Maliakal	638a69ad23	Merge branch '3.0-rc' into developer	2017-08-17 17:02:43 +02:00
Dhanya Maliakal	7115ac19b6	command line docu. more coming up	2017-08-17 17:02:42 +02:00
Dhanya Maliakal	b20f994ac4	Merge branch '3.0-rc' into developer	2017-08-17 16:59:08 +02:00
Dhanya Maliakal	4adf3e9385	command line docu. more coming up	2017-08-17 16:59:07 +02:00
Anna Bergamaschi	ae13fbce72	changed some sections in the documentation	2017-08-17 16:57:06 +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
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	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	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	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	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	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
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	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
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	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	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
Anna Bergamaschi	ca865a6636	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer	2017-08-16 09:27:48 +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	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	9bb8a94c55	updated README	2017-08-15 14:14:47 +02:00
Anna Bergamaschi	3aeb15648c	Anna's modifications	2017-08-11 15:55:07 +02:00
Anna Bergamaschi	52e1bd32b9	Anna's modifications	2017-08-11 15:52:08 +02:00