2172 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	33a7375c72	changes to test	2017-03-24 08:12:10 +01:00
Dhanya Maliakal	97bad0fcb9	changes	2017-03-24 08:06:09 +01:00
Dhanya Maliakal	059711af37	retrying a test	2017-03-24 07:59:36 +01:00
Dhanya Maliakal	f0c5106764	trying a test	2017-03-24 07:59:14 +01:00
Dhanya Maliakal	4182615aa9	trying a test	2017-03-24 07:58:27 +01:00
Dhanya Maliakal	ff2c42e921	Merge branch '2.3' into developer	2017-03-23 15:38:48 +01:00
Dhanya Maliakal	44be9829d4	removed anna from support as she prefered it	2017-03-23 15:38:24 +01:00
Dhanya Maliakal	7dfb1b7192	added a release text	2017-03-23 15:17:03 +01:00
Dhanya Maliakal	6d4c0d0d46	modified users for new callback argument without filepointer	2017-03-23 14:07:56 +01:00
Dhanya Maliakal	5c230e2ac5	updaterev	2017-03-23 13:48:12 +01:00
Dhanya Maliakal	9e658e7947	udpaterev	2017-03-23 13:46:02 +01:00
Dhanya Maliakal	bf57be309f	updated server	2017-03-23 13:44:44 +01:00
Dhanya Maliakal	c47f2f3449	solved the gui 4 bit bug where no data was displayed: due to byterperchannel being int and a 0	2017-03-23 13:31:22 +01:00
Dhanya Maliakal	5dcacaae2a	frame and packet counters for the delay was buggy, not looking at lsb and msb, fixed	2017-03-23 12:38:19 +01:00
Dhanya Maliakal	78078f4ef3	esrf suggestion for volatile in multithread threadpool	2017-03-23 11:55:56 +01:00
Gemma Tinti	ea66f2d12f	manual	2017-03-20 14:51:18 +01:00
Gemma Tinti	de16c2a7f1	manual	2017-03-20 12:42:28 +01:00
Dhanya Maliakal	aae4e3f993	removed unnessary printout	2017-03-20 11:22:35 +01:00
Dhanya Maliakal	911ff49238	changes for merges from 2.3 incl standard packet header	2017-03-20 11:22:07 +01:00
Dhanya Maliakal	6731c39ce2	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer	2017-03-20 10:48:54 +01:00
Dhanya Maliakal	81eade8ede	Merge branch '2.3' into developer	2017-03-20 10:48:38 +01:00
Dhanya Maliakal	1ab80b0517	updaterev	2017-03-20 09:28:02 +01:00
Dhanya Maliakal	4b388f56b2	fixed gui for new header	2017-03-20 09:27:38 +01:00
Dhanya Maliakal	fb91ba25f3	uncomment gui. insignificant	2017-03-20 09:26:13 +01:00
Gemma Tinti	4d5506a0a8	manual	2017-03-15 15:52:19 +01:00
Dhanya Maliakal	dc77b07c92	update rev	2017-03-15 15:02:22 +01:00
Dhanya Maliakal	47a769e677	modified users receiver to have all objects defined in one	2017-03-15 15:00:01 +01:00
Dhanya Maliakal	ecaa8e45a4	some changes to the command help	2017-03-15 14:52:19 +01:00
Dhanya Maliakal	4a8f2b5a69	Merge branch '2.3-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 2.3-rc	2017-03-14 08:22:29 +01:00
Dhanya Maliakal	22e0332833	changes to callback	2017-03-14 08:21:27 +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
Gemma Tinti	1cbbf9409f	manual	2017-03-09 09:23:57 +01:00
Gemma Tinti	0ff79b7d5a	manual	2017-03-09 09:21:50 +01:00
Dhanya Maliakal	679e747b5c	Merge branch '2.3-rc' into developer	2017-03-07 07:30:40 +01:00
Gemma Tinti	b16757e8d1	adapt eiger noise	2017-03-06 12:18:32 +01:00
Gemma Tinti	daaf13d99c	manual with new calibration scheme	2017-03-03 16:45:25 +01:00
Gemma Tinti	6c3165b31a	manual with new calibration scheme	2017-03-03 16:42:03 +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	bd7f3567f8	Merge branch 'developer' into hdf5	2017-03-03 09:33:53 +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