1465 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	4b388f56b2	fixed gui for new header	2017-03-20 09:27:38 +01:00
Dhanya Maliakal	dc77b07c92	update rev	2017-03-15 15:02:22 +01:00
Dhanya Maliakal	ecaa8e45a4	some changes to the command help	2017-03-15 14:52:19 +01:00
Dhanya Maliakal	0a1aaec708	resolved the recovering from receiver start error , but still does not acknowledge error in gui	2017-03-10 13:24:00 +01:00
Dhanya Maliakal	cad8ffc0c6	resolved the recovering from receiver start error , but still does not acknowledge error in gui	2017-03-10 13:07:33 +01:00
Dhanya Maliakal	978b54dff9	somewhere	2017-03-10 10:51:37 +01:00
Dhanya Maliakal	300bf85dae	uncommented extra comments	2017-03-09 11:40:26 +01:00
Dhanya Maliakal	e86e9361b6	removed std:: to make round compile	2017-03-03 16:00:22 +01:00
Dhanya Maliakal	f3bf331b5f	solved bug of decoding data with distorted image	2017-03-03 13:48:47 +01:00
Dhanya Maliakal	7e00d9f395	Merge branch 'developer' into hdf5	2017-03-03 10:06:34 +01:00
Dhanya Maliakal	bd0f72c60e	removed std:: in front of round, else compile error	2017-03-03 09:12:19 +01:00
Dhanya Maliakal	ab4572f544	updaterev	2017-03-03 09:07:36 +01:00
Dhanya Maliakal	bdff083402	Merge branch '2.3-rc' into hdf5	2017-03-03 09:05:40 +01:00
Dhanya Maliakal	fa6d18e9b2	moving subframenumber into a 32 bit number	2017-02-28 15:29:53 +01:00
Dhanya Maliakal	475f0692a0	Merge branch '2.3-rc' of git.psi.ch:sls_detectors_software/sls_detector_software into 2.3-rc	2017-02-28 13:42:16 +01:00
Dhanya Maliakal	2024eb5d6e	gui works	2017-02-28 13:14:18 +01:00
Dhanya Maliakal	62de278f24	bug fix: loading trimbit file should not care about settings	2017-02-27 16:05:27 +01:00
Anna Bergamaschi	d90db50a60	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer	2017-02-23 12:05:55 +01:00
Anna Bergamaschi	f12df80c5b	some changes for chiptest board and mythen server now compiles	2017-02-23 12:05:34 +01:00
Erik Frojdh	9e9c109898	adding cmath and std:round interp	2017-02-22 11:31:01 +01:00
Dhanya Maliakal	19460a03f5	sending position id and num detectors in x and y dir	2017-02-21 15:13:27 +01:00
Dhanya Maliakal	549e346ad4	Merge branch '2.3-rc' into hdf5	2017-02-10 11:56:37 +01:00
Dhanya Maliakal	111f8beab3	updaterev	2017-02-10 11:51:29 +01:00
Dhanya Maliakal	4c351ba686	updated server with version variables	2017-02-10 11:51:05 +01:00
Dhanya Maliakal	3d2264fa56	updaterev	2017-02-10 11:50:13 +01:00
Dhanya Maliakal	5287441a65	removed warning	2017-02-07 08:52:05 +01:00
Dhanya Maliakal	9b3f4a3a66	commonFiles/error_defs.h	2017-02-03 14:34:05 +01:00
Dhanya Maliakal	490e756622	added the servers	2017-02-03 12:31:33 +01:00
Dhanya Maliakal	87ce1ed736	moved tau to settings file, removed gain and offset, setting threshold loads settings file, setting threshold only sets client variable	2017-02-03 12:29:44 +01:00
Dhanya Maliakal	bd31ac1d52	changes to variable name	2017-01-17 10:55:43 +01:00
Dhanya Maliakal	b16d087fd1	Merge branch '2.2-rc' into hdf5	2017-01-06 15:17:40 +01:00
Dhanya Maliakal	3563f0deec	Merge branch '2.2-rc' into developer	2017-01-06 15:17:14 +01:00
Dhanya Maliakal	111856ed7b	hv should work now	2017-01-06 15:16:05 +01:00
Dhanya Maliakal	0fdbac981e	should work for serial comm hv for 9m	2017-01-05 12:58:49 +01:00
Anna Bergamaschi	987aeda6fb	sorted out problem with CPU read out	2016-12-22 17:24:53 +01:00
Anna Bergamaschi	3eea80a121	compiles after merging	2016-12-19 13:50:25 +01:00
Anna Bergamaschi	68b13a0ecd	merged to developer	2016-12-19 12:26:53 +01:00
Anna Bergamaschi	12cd3d07a2	some changes for jctb	2016-12-19 12:05:59 +01:00
Dhanya Maliakal	ebf44704b2	merged error defs	2016-12-19 11:39:14 +01:00
Dhanya Maliakal	bd1601c2eb	fixwed the printing of errors but not error message	2016-12-19 11:37:14 +01:00
Dhanya Maliakal	d555bc6e75	fixwed the printing of errors but not error message	2016-12-19 11:33:16 +01:00
Dhanya Maliakal	b5f7dc29af	Merge branch '2.2-rc' into hdf5	2016-12-16 15:00:22 +01:00
Dhanya Maliakal	2d1c91c0e0	bug in sem for new scans	2016-12-16 14:59:55 +01:00
Dhanya Maliakal	b403aa20a6	Merge branch '2.2-rc' into hdf5	2016-12-16 14:51:08 +01:00
Dhanya Maliakal	64843c1c76	made the scans work, where the the dummy message from rxr doesnt stop it from listening for the scans/measurement, only at set join thread	2016-12-16 14:46:54 +01:00
Dhanya Maliakal	a971d87008	Merge branch '2.2-rc' into hdf5	2016-12-13 13:23:06 +01:00
Dhanya Maliakal	2a508435c7	change the filenaming according to det position and not det id	2016-12-13 11:41:27 +01:00
Dhanya Maliakal	e7621a6cd0	moving towards c++ api	2016-12-12 14:24:11 +01:00
Dhanya Maliakal	a67f9d50de	removed the allocating of memory for eiger and jungfrau to receive data via tcp from detector as this will not happen	2016-12-02 12:47:01 +01:00
Dhanya Maliakal	dd9387ef29	using detid to calculte zmq port in case of shmget error and det id does not start with 0 and 1 as in receiver zmq server ports	2016-12-02 08:53:08 +01:00