6469 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	4c5736db5e	works for get setttings and for loadsettingsfile	2016-03-10 18:18:50 +01:00
Dhanya Maliakal	f8a850ccb2	sd	2016-03-10 17:28:23 +01:00
Dhanya Maliakal	d3a7d3bad3	something	2016-03-10 17:25:47 +01:00
Dhanya Maliakal	4bb97fcfbf	included calibration wizards in checkout script	2016-03-09 12:36:59 +01:00
Dhanya Maliakal	c36db579b1	Merge branch 'master' into release	2016-03-09 11:29:41 +01:00
Dhanya Maliakal	b9e2a11adf	fixed high voltage index and bottom high voltage problem in server	2016-03-09 11:24:36 +01:00
Dhanya Maliakal	6e52c72307	eiger user: setting clk to 2 for 32 dr, and 1 for 16 dr	2016-02-25 16:35:22 +01:00
Dhanya Maliakal	e0f645ed4b	some change	2016-02-25 16:25:27 +01:00
Dhanya Maliakal	a563b82001	Merge branch 'master' into release	2016-02-25 14:34:07 +01:00
Dhanya Maliakal	7ace569daf	resolved conflicts in merging with release	2016-02-25 14:32:56 +01:00
Dhanya Maliakal	5b3aa45439	resolved conflicts in merging with release	2016-02-25 14:31:50 +01:00
Dhanya Maliakal	548ecba6dc	Merge branch 'release'	2016-02-25 14:24:45 +01:00
Dhanya Maliakal	83f3ab145e	resolved conflict in merging with release	2016-02-25 14:17:32 +01:00
Dhanya Maliakal	d4b388f434	unresolved conflict	2016-02-25 14:13:42 +01:00
Dhanya Maliakal	bda8b69e05	Merge branch 'master' into release	2016-02-25 14:01:22 +01:00
Dhanya Maliakal	683ea31963	removed comment entering missing zone	2016-02-25 13:56:23 +01:00
Dhanya Maliakal	1ef91414d6	Merge branch 'release' of git.psi.ch:sls_detectors_software/sls_receiver_software into release	2016-02-25 13:51:34 +01:00
Dhanya Maliakal	0fa33dc74c	added gotthard server version executable	2016-02-25 12:12:39 +01:00
Dhanya Maliakal	e508050be8	bug fix: converts any receiver other than eiger into a jungfrau receiver	2016-02-25 12:11:05 +01:00
Dhanya Maliakal	ebdb21ccfe	added iodelay with setttings	2016-02-24 18:10:59 +01:00
Dhanya Maliakal	7eda239e45	Merge branch 'release' of git.psi.ch:sls_detectors_software/sls_detectors_package into release	2016-02-24 18:09:28 +01:00
Dhanya Maliakal	59262c28c2	added iodelay with setttings	2016-02-24 18:09:16 +01:00
Dhanya Maliakal	98ef40b1b6	Merge branch 'release' of git.psi.ch:sls_detectors_software/sls_detector_software into release	2016-02-24 18:05:39 +01:00
Dhanya Maliakal	5af05c24c1	added iodelay with setttings	2016-02-24 18:05:17 +01:00
Anna Bergamaschi	d8007477b5	High Voltage index changed for jungfrau	2016-02-22 15:11:30 +01:00
Anna Bergamaschi	f113b1afbb	Added status stopped	2016-02-22 15:07:05 +01:00
Anna Bergamaschi	e7a7dd8c6b	Merging with anna's jungfrau detector server version	2016-02-22 15:02:42 +01:00
Anna Bergamaschi	66eddb1afe	Added stopped status	2016-02-22 14:00:22 +01:00
Anna Bergamaschi	13db6a7df5	New interface for PLL reconfig of Junfraus server; moved some_fifo_full_bit and added stopped status	2016-02-22 13:59:53 +01:00
Dhanya Maliakal	1633cc3f01	incorporated rate correction of eiger into gui	2016-02-17 18:04:24 +01:00
Dhanya Maliakal	0b1710c267	updated server bianry	2016-02-17 18:03:32 +01:00
Dhanya Maliakal	4eba07ca90	added error message tau/subexptime to error list	2016-02-17 18:01:58 +01:00
Dhanya Maliakal	cb1a30c450	added the script to change and add server with the version numbering	2016-02-17 15:18:39 +01:00
Dhanya Maliakal	8d2f54838a	fixed corrections for rate correction, needed to reset daq completely	2016-02-17 15:17:40 +01:00
Dhanya Maliakal	764078d465	something	2016-02-16 11:07:12 +01:00
Dhanya Maliakal	db2e75460e	fixed bug of wrong number of frames in receiver when server starts	2016-02-12 17:26:14 +01:00
Dhanya Maliakal	a0c6aad7c6	renamed eiger server final to reflect the revision	2016-02-12 15:26:37 +01:00
Gemma Tinti	e2133317f5	add missing commands and cleanup	2016-02-12 14:32:03 +01:00
Gemma Tinti	3225427043	spell check client manual	2016-02-12 14:04:54 +01:00
Anna Bergamaschi	75a75f3328	update	2016-02-12 11:09:47 +01:00
Anna Bergamaschi	bd91aea713	Some defs for JCTB receiver	2016-02-11 17:09:54 +01:00
Dhanya Maliakal	a3e2a6c37c	removed unnecessary eiger server executables	2016-02-11 14:24:21 +01:00
Dhanya Maliakal	5d3c427f11	changed setctrbit command to resmat	2016-02-11 10:48:58 +01:00
Dhanya Maliakal	1e3f9e8ead	fixed receiver toalso get frames*cycles as number of frames	2016-02-10 17:03:10 +01:00
Dhanya Maliakal	dbedc9b7df	rate correction for eiger implemented	2016-02-10 11:25:58 +01:00
Dhanya Maliakal	3c4b0c24c8	rate correction for eiger implemented	2016-02-10 11:24:49 +01:00
Dhanya Maliakal	9067da5e88	rate correction for eiger implemented	2016-02-10 11:22:59 +01:00
Dhanya Maliakal	5029eb0c86	bug fixed maximum sub exposure time is in 10 ns and not ns	2016-02-08 15:25:28 +01:00
Dhanya Maliakal	f0c4a4a7e4	almost done	2016-02-08 15:20:19 +01:00
Dhanya Maliakal	cf3e736d7e	fixed bug that still reads hostname and expects a 0XX format, also prints revision number in decimal and not hex	2016-02-08 11:25:10 +01:00