6499 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	316ecf1b50	no change check	2016-02-02 11:10:49 +01:00
Dhanya Maliakal	d0a38d203d	Merge branch 'release' of git.psi.ch:sls_detectors_software/sls_detectors_package into release	2016-02-02 10:50:25 +01:00
Martin Brückner	d489b34824	Test commit, added a space in makefile	2016-02-02 10:49:40 +01:00
Dhanya Maliakal	b27e42f193	Merge branch 'release', remote branch 'origin' into release	2016-02-02 10:48:15 +01:00
Dhanya Maliakal	0ce03226ee	changed the checkout script to point to new remote repo	2016-02-02 10:42:59 +01:00
Dhanya Maliakal	39c3a712e1	solved a bit, but not the create fiel problem	2016-02-01 17:57:43 +01:00
Dhanya Maliakal	bef8d413d6	jungfrau done but not merged	2016-01-21 14:43:44 +01:00
Dhanya Maliakal	f477b7a5ac	not much changes	2016-01-19 16:25:48 +01:00
Dhanya Maliakal	deb72feb91	still not resolved altho some changes	2016-01-19 14:39:58 +01:00
Gemma Tinti	1477f67c4c	eiger documentation	2016-01-15 14:39:02 +01:00
Gemma Tinti	a785eb7d5e	newline after wrong command	2016-01-08 17:18:50 +01:00
Gemma Tinti	22cb739c7f	start to update manuals for Eiger	2016-01-08 17:13:48 +01:00
Martin Brückner	09807aae49	Added slsReceiverScript and xterms	2015-12-16 16:14:18 +01:00
Dhanya Maliakal	5c239ad45f	data call back form receiver includes both x and y dimensions	2015-12-16 15:01:00 +01:00
Martin Brückner	ff7a2d5185	Added slsReceiverScript and xterms	2015-12-15 16:31:18 +01:00
Wang Xiaoqiang	06e810169d	Revert "trying to fix for 2D detector(eiger)" ... This reverts commit 0a471f54edffb54a9871bbc8ebb241c22775451c.	2015-12-15 16:29:47 +01:00
Wang Xiaoqiang	54c1765f34	Revert "Revert "pulse chip fixed"" ... This reverts commit 356e6cb8cacec52ec6883e625a6b3639633f3b0e.	2015-12-15 16:29:35 +01:00
Wang Xiaoqiang	ca6f2b8588	Revert "pulse chip fixed" ... This reverts commit f85739e8b64a3b0c7af02d068a2cc429064ad103.	2015-12-15 16:26:44 +01:00
Dhanya Maliakal	7848b79cf2	2d noop for setdetectorsize	2015-12-15 16:24:43 +01:00
Dhanya Maliakal	cd80160e7d	getdetectorsize in users reflects 2d addon	2015-12-15 15:40:39 +01:00
Dhanya Maliakal	2dd2b577fd	getdetectorsize in users reflects 2d	2015-12-15 15:36:49 +01:00
Dhanya Maliakal	d6c4ec184a	should show progress for each measurement, not collectively	2015-12-15 14:25:53 +01:00
Dhanya Maliakal	921154e43a	detsizechan or maximum detecto size for users incorrectly implemented for only 1d	2015-12-15 12:07:28 +01:00
Dhanya Maliakal	bb78d1af73	solved recover from root permission error	2015-12-15 11:59:17 +01:00
Dhanya Maliakal	18eb1274c5	fixed fifodepth to return defualt size, also moved destroying and creating threads to fifostructure, had forgotten to override setnumberofframes calling fifostructure which is important for gotthard	2015-12-15 11:04:49 +01:00
Dhanya Maliakal	50d76f5537	iodelay set to 650, rxb_lb and rb set to 1100, 10g detectormac set to +1 of 1g	2015-12-14 15:15:27 +01:00
Dhanya Maliakal	532ac38ad5	dont know	2015-12-09 16:15:23 +01:00
Wang Xiaoqiang	4fc8065ef5	trying to fix for 2D detector(eiger)	2015-12-08 13:26:17 +01:00
l_msdetect	0c28dcec4f	added data structure file for m03 T mounting and data structure for m02	2015-12-03 10:17:26 +01:00
Anna Bergamaschi	0f6fa37ca1	new default files	2015-12-02 16:50:03 +01:00
Dhanya Maliakal	f16db2e6ca	10giga offset corrected	2015-12-02 09:39:16 +01:00
Dhanya Maliakal	700346fbbe	some changes for gui for settings for jungfrau	2015-12-01 17:15:41 +01:00
Dhanya Maliakal	4dc8213cf6	added jungfrau settings directories	2015-12-01 16:46:07 +01:00
Dhanya Maliakal	b05207221c	ansi and test server for jungfrau server	2015-12-01 16:45:18 +01:00
Dhanya Maliakal	61f0506c2c	settings for jungfrau	2015-12-01 16:43:23 +01:00
Dhanya Maliakal	34508012a8	prevnumber is unsigned before bug	2015-12-01 16:39:01 +01:00
Dhanya Maliakal	58dbc59af2	masking vvalues for jungfrau	2015-11-27 17:32:46 +01:00
Dhanya Maliakal	b803f3a32a	works for jungfrau	2015-11-27 17:30:45 +01:00
Dhanya Maliakal	6498292ee4	max packets per file forgotten at 5	2015-11-27 17:09:33 +01:00
Dhanya Maliakal	74b1baa9d8	solved packet loss problem	2015-11-27 17:07:57 +01:00
Dhanya Maliakal	3b0e2e611c	jungfrau works	2015-11-27 15:57:19 +01:00
Dhanya Maliakal	0958a4544e	jungfrau works	2015-11-27 15:56:29 +01:00
Dhanya Maliakal	ac53cb2ae4	resetting the acquiringflag whenever acquisition stop is called	2015-11-24 15:25:42 +01:00
Dhanya Maliakal	5012ea0c6c	unnecessary lock in acquire	2015-11-24 13:50:42 +01:00
Dhanya Maliakal	a00df5da35	dummy value changed	2015-11-24 12:09:10 +01:00
Dhanya Maliakal	a65ebbea99	merge to master	2015-11-23 12:40:24 +01:00
Dhanya Maliakal	0d86439589	some cleanup for rest	2015-11-23 11:54:55 +01:00
Dhanya Maliakal	8ae1e812e6	pulse chip fixed	2015-11-20 16:41:27 +01:00
Dhanya Maliakal	c097dfc8b3	two acquires at the same tiem should not be possile. using shared memory to set flag, made all connect use the standard connectControl etc	2015-11-20 16:28:48 +01:00
Dhanya Maliakal	a1bd54b16b	pulsing in client and server	2015-11-19 17:43:46 +01:00