163 Commits

Author	SHA1	Message	Date
maliakal_d	b58c3e8951	solving merging conflicts from 3.1.0 to developer	2018-03-14 15:45:35 +01:00
maliakal_d	258de4947a	updated doc	2018-03-12 15:46:20 +01:00
maliakal_d	9197ab6e4b	sls detector install omitted, added	2018-03-12 15:36:36 +01:00
maliakal_d	6c1c203782	documentation updated	2018-03-12 15:01:23 +01:00
maliakal_d	72970c9669	updated binaries, updated manuals, updated git versioning	2018-03-12 14:21:02 +01:00
maliakal_d	7649865a8f	jungfrau bug fix: adc phase corrected to correctly return value in -1	2018-03-08 14:02:02 +01:00
maliakal_d	675d69392a	updating versions	2018-02-27 12:52:48 +01:00
maliakal_d	12e4530702	changes to documentation	2018-02-27 12:09:36 +01:00
maliakal_d	64c18469bd	release changes, gui compile via anaconda changes	2018-02-27 10:29:56 +01:00
maliakal_d	50b515f94d	changes to documentation	2018-02-23 13:46:17 +01:00
maliakal_d	639fdac232	created jungfrau virtual server(in next commit), edited install manual to give out html pages without subsection toc, links, navigaion, spilit into as many sections etc for wiki page	2018-02-23 12:45:31 +01:00
maliakal_d	d48ca4a9fe	merge from 3.0.1 in readme and makefle for manual	2018-02-09 14:12:27 +01:00
maliakal_d	5c23fd6502	updated manuals	2018-02-09 11:25:21 +01:00
Gemma Tinti	09a707d7ff	Merge branch '3.0.1' into developer	2018-01-19 16:12:36 +01:00
Gemma Tinti	41240ac135	eiger manual	2018-01-19 16:05:15 +01:00
Dhanya Maliakal	65a91c519e	Merge branch '3.0.1' into developer	2017-12-14 14:29:16 +01:00
Dhanya Maliakal	0649626842	made the color fix for black/white backgrounds	2017-12-14 14:29:07 +01:00
Dhanya Maliakal	1e85482d09	make updated	2017-11-28 11:30:23 +01:00
Dhanya Maliakal	130f3d2e6f	Merge branch '3.0.1' into developer	2017-11-28 11:18:43 +01:00
Dhanya Maliakal	4825ace129	switching from black to white background for receiver	2017-11-28 11:18:22 +01:00
Dhanya Maliakal	ab93835ce2	merge conflict to include datastreaming in client comment	2017-11-23 10:29:08 +01:00
Dhanya Maliakal	3b292bdeb6	need to enable data streaming for client	2017-11-23 10:27:59 +01:00
Dhanya Maliakal	43140811bd	one measurement in users class	2017-11-23 10:25:35 +01:00
Dhanya Maliakal	29f3387d73	Merge branch '3.0.1' into developer	2017-11-23 09:34:22 +01:00
Dhanya Maliakal	4749e8c4e4	modified users client to work without config and better print out	2017-11-23 09:34:12 +01:00
Dhanya Maliakal	a1d325a115	Merge branch '3.0.1' into developer	2017-11-23 09:20:22 +01:00
Dhanya Maliakal	3034cf87d0	changes that might be reverted in detser	2017-11-23 09:20:20 +01:00
Dhanya Maliakal	447451231c	modified users client to work without config and better print out	2017-11-22 18:09:16 +01:00
Dhanya Maliakal	c0bfe46aa1	enabling client in developer user api	2017-11-22 18:00:41 +01:00
Dhanya Maliakal	ea3c722552	made a bin in manual api to be able to compile here	2017-11-22 17:47:16 +01:00
Dhanya Maliakal	4ecbfada5b	Merge branch '3.0.1' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0.1	2017-11-22 17:43:12 +01:00
Dhanya Maliakal	d47abb140f	removed detreceivernocall	2017-11-22 17:43:00 +01:00
Gemma Tinti	e023cb186f	manual	2017-11-21 15:34:56 +01:00
Gemma Tinti	d1d530f0e7	manual	2017-11-20 16:43:39 +01:00
Gemma Tinti	a3a30d9b50	manual	2017-11-14 15:18:39 +01:00
Gemma Tinti	b814515d0a	manual	2017-11-14 12:42:30 +01:00
Dhanya Maliakal	f4f03f659a	color code in user example depending on modID, instead of xcoord	2017-10-23 17:07:45 +02:00
Dhanya Maliakal	65fd5a3057	merged without call back and call back into one user example	2017-10-23 15:26:04 +02:00
Gemma Tinti	40cb2993fb	eiger manual	2017-10-12 12:15:43 +02:00
Dhanya Maliakal	e51d178eaa	added silent mode functionality and modified users class for it, updated manuals	2017-09-27 10:18:20 +02:00
l_msdetect	1c3b9c603c	manual	2017-09-21 20:26:35 +02:00
Dhanya Maliakal	6b6ad6efe0	added one without call back	2017-09-19 16:47:56 +02:00
Dhanya Maliakal	ae066fab93	modified userReceiver to make it work	2017-09-19 16:33:05 +02:00
Dhanya Maliakal	35dcdd62c9	links to libraries in manual	2017-08-28 14:15:57 +02:00
Gemma Tinti	ad4fdcfa1a	eiger manual	2017-08-26 13:32:00 +02:00
Gemma Tinti	2efe9cd40b	Eiger manual	2017-08-26 09:01:56 +02:00
Gemma Tinti	07594e0607	eiger manual	2017-08-25 16:14:53 +02:00
Dhanya Maliakal	705e1a762c	updating user documentation	2017-08-25 15:46:42 +02:00
Dhanya Maliakal	0de9682e72	Merge branch '3.0' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0	2017-08-25 15:45:37 +02:00
Dhanya Maliakal	ce0aa98b3f	updated users documentation	2017-08-25 15:42:56 +02:00