2172 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	6d6133be59	Merge branch '3.0' into zmqseparate	2017-11-15 10:34:30 +01:00
Dhanya Maliakal	bee751cebb	updated binaries	2017-11-15 09:31:49 +01:00
Dhanya Maliakal	fee95d228e	Merge branch '3.0' into 3.0.1	2017-11-15 09:29:05 +01:00
Dhanya Maliakal	90fb8258ca	updated binaries	2017-11-14 17:52:51 +01:00
Dhanya Maliakal	dd1cf42a73	proper fix for settings, including dacs	2017-11-14 17:51:13 +01:00
Dhanya Maliakal	dda86cfe9b	somewhere in separating zmq rxr and client	2017-11-14 16:26:17 +01:00
Gemma Tinti	4f74f6d08f	Merge branch '3.0.1' into developer	2017-11-14 15:19:14 +01:00
Gemma Tinti	a3a30d9b50	manual	2017-11-14 15:18:39 +01:00
Gemma Tinti	2d962dfead	Merge branch '3.0.1' into developer	2017-11-14 12:43:19 +01:00
Gemma Tinti	b814515d0a	manual	2017-11-14 12:42:30 +01:00
Dhanya Maliakal	6693d08331	fixed help of acquire doing an actual acquisition	2017-11-14 11:53:37 +01:00
Dhanya Maliakal	cf4498cf78	Merge branch '3.0.1' into developer	2017-11-14 10:59:01 +01:00
Dhanya Maliakal	4903164f95	added high voltage to users class	2017-11-14 10:58:54 +01:00
Dhanya Maliakal	c127eebeaa	Merge branch '3.0.1' into developer	2017-11-14 09:13:39 +01:00
Dhanya Maliakal	ef257d12e7	prev bug fix of ratecorr for eiger from users, made simpler	2017-11-14 09:13:32 +01:00
Dhanya Maliakal	363aa9124e	Merge branch '3.0.1' into developer	2017-11-14 09:08:16 +01:00
Dhanya Maliakal	7e0af1cc7c	bugfix: users rate correction able to set for eiger	2017-11-14 09:08:08 +01:00
Dhanya Maliakal	4c4a26c0e3	Merge branch '3.0.1' into developer	2017-11-13 13:39:39 +01:00
Dhanya Maliakal	70848c9891	bugfix ratecorr always gave back -100	2017-11-13 13:39:28 +01:00
Dhanya Maliakal	e33ba2cd76	merge from 3.0.1 compiling with rpath and updating detector binaries	2017-11-13 12:32:08 +01:00
Dhanya Maliakal	dedc00f1bd	compiling with rflag	2017-11-13 12:28:27 +01:00
Dhanya Maliakal	1af065fdb1	infinite loop with gettotalnumberofchannels in gappixels initialization resulting in bus error fix	2017-11-13 11:13:26 +01:00
Dhanya Maliakal	678ef89e17	conflict resolved from merge developer to gappixels insignificant	2017-11-10 16:54:18 +01:00
Dhanya Maliakal	c0ec315b04	Merge branch 'developer' into gappixels	2017-11-10 16:53:14 +01:00
Dhanya Maliakal	3886a0c9ad	merge fix from 3.0.1 regarding gethostbyname thread safety	2017-11-10 16:37:20 +01:00
Dhanya Maliakal	23ddb3d4b5	merge fix from 3.0.1 regarding gethostbyname thread safety	2017-11-10 16:34:31 +01:00
Dhanya Maliakal	739187943d	replaced gethostbyname with getaddrinfo as it is not thread safe	2017-11-10 16:30:38 +01:00
Dhanya Maliakal	a2210c0118	Merge branch '3.0.1' into gappixels	2017-11-09 14:08:04 +01:00
Dhanya Maliakal	6d0f751104	Merge branch '3.0.1' into developer	2017-11-09 14:07:48 +01:00
Dhanya Maliakal	fb0afc282d	gotthard server, too fast now sets stopped bit high and stops acquisition, so polling status also made aware of stopped bit	2017-11-09 14:01:36 +01:00
Dhanya Maliakal	d24ab31d87	gotthard fix	2017-11-09 13:44:38 +01:00
Dhanya Maliakal	3c6d572369	including dynamic range in gui call back	2017-11-02 11:02:40 +01:00
Dhanya Maliakal	82f503aa09	dynamic range also updates offsets, 4 bit mode gap pixels work in call back from gui	2017-10-31 12:50:31 +01:00
Dhanya Maliakal	6ff249c3f2	Merge branch 'developer' into gappixels	2017-10-27 16:18:52 +02:00
Dhanya Maliakal	e12229633c	update binaries	2017-10-27 16:18:21 +02:00
Dhanya Maliakal	b75dde4613	merge bug fix of set module	2017-10-27 16:17:12 +02:00
Dhanya Maliakal	f6989d5539	merge bug fix of set module	2017-10-27 16:16:38 +02:00
Dhanya Maliakal	7ff23b25b3	merge bug fix of set module	2017-10-27 16:16:29 +02:00
Dhanya Maliakal	acfd9acc6c	update binaries	2017-10-27 16:09:46 +02:00
Dhanya Maliakal	1881cb0010	updated binaries	2017-10-27 16:07:42 +02:00
Dhanya Maliakal	1420921291	Merge branch '3.0' into 3.0.1	2017-10-27 15:47:15 +02:00
Dhanya Maliakal	045a7cfcb1	removed settings bug, highvoltage returning 60 when switched off	2017-10-27 15:38:07 +02:00
Dhanya Maliakal	92f988ddc1	somewhere	2017-10-27 14:00:57 +02:00
Dhanya Maliakal	79bce5e006	4 bit mode works without gappixels	2017-10-26 16:01:18 +02:00
Dhanya Maliakal	9c82a8f726	temp in between, trying to get 4 bitmode to work without gap pixels	2017-10-26 11:19:58 +02:00
Dhanya Maliakal	fde4194f9b	merged with developer, receiver call back merged with no call back	2017-10-23 17:12:00 +02:00
Dhanya Maliakal	7f9ac86862	Merge branch 'developer' into gappixels	2017-10-23 17:09:13 +02:00
Dhanya Maliakal	16a939c0c0	Merge branch '3.0.1' into developer	2017-10-23 17:08:12 +02: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	4084e2c31e	updated release doc	2017-10-23 17:06:12 +02:00