2089 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	7707a6f9a7	eiger server corrected	2016-03-21 10:48:36 +01:00
Dhanya Maliakal	5b97ae104f	undefined enum changed, added binary file	2016-03-21 10:43:27 +01:00
Dhanya Maliakal	440d67ea85	added ansi to mythendetectorserver, undefed enum changed, recompiled mythen server	2016-03-21 10:16:23 +01:00
Dhanya Maliakal	4395aca607	aaded ansi and merged release to have changing dynamicrange and clock with eiger	2016-03-18 14:54:51 +01:00
Dhanya Maliakal	e5ccd18283	Merge branch 'release' into hotfix	2016-03-18 14:53:47 +01:00
Dhanya Maliakal	3bf899a3ca	recompiled server with undefned enum changed	2016-03-18 11:12:20 +01:00
Dhanya Maliakal	fcf9b4aafb	recompiled server with undefned enum changed	2016-03-18 11:05:43 +01:00
Dhanya Maliakal	7e4ebd3a5d	included execute trimming execution of pulseandmove	2016-03-16 18:26:53 +01:00
Dhanya Maliakal	a2c41b58d9	included parallelization for setsettings, setalltrimbits, pulsechip, pulsepixel, pulsepixelnmove	2016-03-16 11:18:35 +01:00
Dhanya Maliakal	e7dbbf4c1f	undefined enum fixed	2016-03-15 17:33:40 +01:00
Dhanya Maliakal	08e64aa8a2	undefined enum fix	2016-03-15 17:18:07 +01:00
Dhanya Maliakal	db26135e89	undefined enum changed	2016-03-15 17:13:37 +01:00
Dhanya Maliakal	26933bd8bd	fixed undefined gain enum to a large number	2016-03-15 16:50:44 +01:00
Dhanya Maliakal	6ad6c9e8bb	fixed undefined gain enum to a large number	2016-03-15 16:10:10 +01:00
Dhanya Maliakal	d88b104aa8	bug fix for receiver call back	2016-03-15 15:28:50 +01:00
Dhanya Maliakal	6261f5b47d	corrected trimbit files	2016-03-14 16:21:39 +01:00
Dhanya Maliakal	9cd9d17d68	Merge branch 'hotfix' into release	2016-03-14 16:17:35 +01:00
Dhanya Maliakal	7b7d42f253	fixed the 8 byte iodelay trimfile bug, now writes as 4 bytes	2016-03-14 14:39:40 +01:00
Dhanya Maliakal	2cf34999a9	added threadfiles dir to library for compile	2016-03-14 09:51:42 +01:00
Dhanya Maliakal	5a77d9e61b	added new calibration files	2016-03-14 09:48:13 +01:00
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