3839 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	0219d09067	sub frame number for eiger in master ascii file, instead of exposure length	2017-08-10 11:07:56 +02:00
Leonardo Sala	df11f41416	reworked version	2017-08-10 10:04:00 +02:00
Dhanya Maliakal	97330b65ca	to handle frame number 0s from firmware	2017-08-09 18:47:55 +02:00
Dhanya Maliakal	eed951016b	frame number 0 from firmware in eiger is dealt with	2017-08-09 18:13:23 +02:00
Dhanya Maliakal	39847c5db6	esrf bug, shut down socket, but being processed and object deleted, fixed	2017-08-09 17:25:23 +02:00
Dhanya Maliakal	12592c1206	updaterev	2017-08-09 17:24:43 +02:00
Dhanya Maliakal	cb90c3722d	esrf bug, shut down socket, but being processed and object deleted, fixed	2017-08-09 17:24:34 +02:00
Gemma Tinti	851914f0ae	manuals	2017-08-08 20:04:28 +02:00
Gemma Tinti	e85973ec8b	manuals	2017-08-08 19:48:32 +02:00
Dhanya Maliakal	7a30ab25bd	Merge branch '3.0-rc' into developer	2017-08-08 19:16:10 +02:00
Dhanya Maliakal	5a45f15c7f	fixed the frameindex bug (always 0)	2017-08-08 19:15:57 +02:00
Dhanya Maliakal	558e5e2e9a	added busy command, converted get frames etc to an integer output	2017-08-08 19:15:20 +02:00
Dhanya Maliakal	82d21b6971	changes to release.txt to include busy command and the frameindex bugfix	2017-08-08 19:13:22 +02:00
Dhanya Maliakal	ccc60dacf4	updated release.txt and the cmk.sh help script	2017-08-08 16:24:33 +02:00
Dhanya Maliakal	517dfdf523	Merge branch '3.0-rc' into developer	2017-08-08 14:59:07 +02:00
Dhanya Maliakal	43ba40ec4c	updaterev	2017-08-08 14:51:47 +02:00
Dhanya Maliakal	557d190236	changes for rest implementation	2017-08-08 14:51:32 +02:00
Dhanya Maliakal	5c6a99afca	changes for rest implementation	2017-08-08 14:51:00 +02:00
Leonardo Sala	c98c5e469b	added warning in makefile	2017-08-08 07:06:43 +02:00
Leonardo Sala	d827ccc115	backported changes implemented in 2.3.2.rest	2017-08-08 06:55:52 +02:00
Dhanya Maliakal	a40d18f8b2	last packet even if many padded packets in between should be written (from carryoverflag)	2017-08-07 19:58:48 +02:00
Dhanya Maliakal	0cd18a3b7a	more comments	2017-08-07 10:39:29 +02:00
Dhanya Maliakal	ebe01104e7	Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0-rc	2017-08-07 10:31:17 +02:00
Dhanya Maliakal	6b8b6b4b3d	no need of quotes for gitall.sh	2017-08-07 10:31:11 +02:00
Xiaoqiang Wang	31026576f4	delete cache before (re-)running cmake	2017-08-07 09:54:03 +02:00
Dhanya Maliakal	2c58bc6a5c	included numbe of compiler threads	2017-08-04 19:12:44 +02:00
Dhanya Maliakal	3ed2bcf3fa	added cmk.sh to build cmake files and compile	2017-08-04 18:54:22 +02:00
Dhanya Maliakal	8f1e8b1196	cmake withotu hdf5	2017-08-04 15:40:44 +02:00
Dhanya Maliakal	c0d6958e37	no changE	2017-08-04 15:40:21 +02:00
Dhanya Maliakal	d2d2959237	Merge branch '3.0-rc' into developer	2017-08-04 14:21:31 +02:00
Dhanya Maliakal	c31ee2d76f	allowing -1 in gui for spinbox	2017-08-04 14:20:51 +02:00
Dhanya Maliakal	dc318d3f47	updaterev	2017-08-04 14:20:33 +02:00
Dhanya Maliakal	429bf7f13d	updaterev	2017-08-04 14:20:21 +02:00
Dhanya Maliakal	96ce9ed7c1	if timer gives -1 in multi, it should not multiply answer with 1e-9 to get in seconds in slsdetectorocmmand	2017-08-04 14:09:56 +02:00
Dhanya Maliakal	41288302f4	fixed resolution for exptime, period and delay in server	2017-08-04 14:01:17 +02:00
Dhanya Maliakal	039092f292	bug fix: changes for the multipurpose reg in configuremac	2017-08-04 11:21:32 +02:00
Dhanya Maliakal	fbee70818a	25 um server using a config.txt file	2017-08-03 14:16:18 +02:00
Dhanya Maliakal	5027f66d77	changed usleep	2017-07-28 12:20:54 +02:00
Dhanya Maliakal	f5773de068	changes for single images with index 0 not realized as caught and therefore no virtual file created, fixed	2017-07-28 12:16:07 +02:00
Dhanya Maliakal	88b6fabb0d	bug did not give error when switching to hdf5	2017-07-28 11:54:22 +02:00
Dhanya Maliakal	37dd32f1b0	version	2017-07-28 11:30:21 +02:00
Dhanya Maliakal	5713cd6092	addin usleep to reduce cpu	2017-07-28 11:28:03 +02:00
Dhanya Maliakal	3174bd1c85	addin usleep to reduce cpu	2017-07-28 11:27:35 +02:00
Dhanya Maliakal	eb4da5ff0c	removed print of elapsed time	2017-07-28 10:19:33 +02:00
Dhanya Maliakal	98d5758ba1	Merge branch 'developer' into 3.0-rc	2017-07-27 14:40:50 +02:00
Dhanya Maliakal	c49c07b34a	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer	2017-07-27 14:40:25 +02:00
Dhanya Maliakal	058fcd8aba	Merge branch 'cmakefix' into developer	2017-07-27 14:40:17 +02:00
Dhanya Maliakal	699cce713b	Merge branch 'cmakefix' into 3.0-rc	2017-07-27 14:40:01 +02:00
Dhanya Maliakal	a88aa53d82	comment to compile statically	2017-07-27 14:39:00 +02:00
Xiaoqiang Wang	7fa13a5d5d	compatible with cmake 2.8.8	2017-07-27 14:28:14 +02:00