1544 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	fbb04f5ebe	Merge branch 'externalgui' into developer	2017-08-23 19:06:59 +02:00
Dhanya Maliakal	0bea688a83	changes for external gui	2017-08-23 19:06:40 +02:00
Dhanya Maliakal	19d973f5d6	Merge branch '3.0' into externalgui	2017-08-23 18:26:46 +02:00
Dhanya Maliakal	92d5143f81	Merge branch '3.0' into developer	2017-08-23 18:26:36 +02:00
Dhanya Maliakal	6332025bbc	frames caught in 9m was only looking at 1st receiver, now made to average	2017-08-23 18:26:25 +02:00
Dhanya Maliakal	bdccddfe97	in between	2017-08-23 18:24:48 +02:00
Dhanya Maliakal	a236a7a9aa	Merge branch '3.0' into externalgui	2017-08-23 18:01:58 +02:00
Dhanya Maliakal	72c4cbe871	Merge branch '3.0' into developer	2017-08-23 18:01:48 +02:00
Dhanya Maliakal	7ffd9b87b8	bug fix:removed 0x prefix for dr	2017-08-23 18:01:34 +02:00
Dhanya Maliakal	a657bac1b1	removed a print	2017-08-23 18:01:02 +02:00
Dhanya Maliakal	f4e2b819d2	changes for external gui	2017-08-23 16:31:32 +02:00
Dhanya Maliakal	2116070f02	Merge branch '3.0' into externalgui	2017-08-23 10:11:57 +02:00
Dhanya Maliakal	02c193118b	Merge branch '3.0' into developer	2017-08-23 09:41:27 +02:00
Dhanya Maliakal	b208acf4a0	moved doxy.config to here	2017-08-23 09:41:10 +02:00
Dhanya Maliakal	b2513cad23	Merge branch '3.0' into developer	2017-08-22 19:43:49 +02:00
Dhanya Maliakal	4f28df03ab	trials	2017-08-22 19:43:26 +02:00
Dhanya Maliakal	a7dab9a257	updating user documentation. another update required	2017-08-22 19:42:52 +02:00
Dhanya Maliakal	25886044ab	Merge branch '3.0' into developer	2017-08-21 09:21:41 +02:00
Dhanya Maliakal	4e374eb2cd	updaterev	2017-08-18 18:35:30 +02:00
Dhanya Maliakal	9868ca3eca	Merge branch '3.0-rc' into developer	2017-08-18 16:13:51 +02:00
Dhanya Maliakal	ec4be4f2c0	bugfix: framesl was not conected, exptime default time is 10 us	2017-08-18 16:11:49 +02:00
Dhanya Maliakal	181616fb67	Merge branch '3.0-rc' into developer	2017-08-17 17:24:30 +02:00
Dhanya Maliakal	cda7814c21	timing put for delay and period	2017-08-17 17:23:13 +02:00
Dhanya Maliakal	de5986e5dd	Merge branch '3.0-rc' into developer	2017-08-17 17:09:05 +02:00
Anna Bergamaschi	ff7b6c5abe	Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detector_software into 3.0-rc	2017-08-17 17:04:57 +02:00
Dhanya Maliakal	269227b093	Merge branch '3.0-rc' into developer	2017-08-17 17:04:30 +02:00
Dhanya Maliakal	355c0a8c11	command line docu. more coming up	2017-08-17 17:04:29 +02:00
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