236 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	d88253f643	versions update	2016-06-13 19:10:14 +02:00
Dhanya Maliakal	75a50a7ae0	receiver udp parameters should be sent to receiver everytime if rx_hostname is set	2016-05-10 17:13:27 +02:00
Dhanya Maliakal	d88b104aa8	bug fix for receiver call back	2016-03-15 15:28:50 +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	e508050be8	bug fix: converts any receiver other than eiger into a jungfrau receiver	2016-02-25 12:11:05 +01:00
Anna Bergamaschi	f113b1afbb	Added status stopped	2016-02-22 15:07:05 +01:00
Anna Bergamaschi	66eddb1afe	Added stopped status	2016-02-22 14:00:22 +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	5afb38c1ec	changing the print outs	2016-02-08 10:40:33 +01:00
Dhanya Maliakal	0c9806e17f	jungfrau header changed	2016-02-04 12:39:05 +01:00
Dhanya Maliakal	41f7743af9	included fifodepth for jungfrau. Needed else its stuck	2016-02-03 16:27:23 +01:00
Dhanya Maliakal	c217cb0978	merging with release	2016-02-03 14:58:32 +01:00
Dhanya Maliakal	ef8fbab1f4	10g bug fixed in previous branch merge	2016-02-03 11:34:47 +01:00
Dhanya Maliakal	fed17eb8eb	modified color of printout	2016-02-03 11:26:18 +01:00
Dhanya Maliakal	72cfd7a1d7	all changes done with bugs solved. need to test with image reconstruction	2016-02-02 18:57:20 +01:00
Dhanya Maliakal	f19031a736	all changes done	2016-02-02 18:52:24 +01:00
Dhanya Maliakal	3045876a86	solved bug problem	2016-02-02 17:33:57 +01:00
Dhanya Maliakal	39c3a712e1	solved a bit, but not the create fiel problem	2016-02-01 17:57:43 +01:00
Dhanya Maliakal	deb72feb91	still not resolved altho some changes	2016-01-19 14:39:58 +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	f16db2e6ca	10giga offset corrected	2015-12-02 09:39:16 +01:00
Dhanya Maliakal	34508012a8	prevnumber is unsigned before bug	2015-12-01 16:39:01 +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	0d86439589	some cleanup for rest	2015-11-23 11:54:55 +01:00
Dhanya Maliakal	8b0772abae	got rid of memory leak when using gui	2015-11-19 14:21:04 +01:00
Dhanya Maliakal	6600d82fc7	some small unimportant changes such as removign eiger header structure form generic socket and initializign differentlclients	2015-11-19 11:18:35 +01:00
Dhanya Maliakal	995f28ca52	just minor edit changes	2015-11-17 15:27:52 +01:00
Dhanya Maliakal	73f8d065b3	empty fifo at receiver start and comment waiting for packet	2015-11-17 12:27:18 +01:00
Dhanya Maliakal	777f04331d	implemented fifo depth configurable from client	2015-11-17 10:31:09 +01:00
Dhanya Maliakal	003d0255c3	fifodepth def change, and listening packets count right	2015-11-16 11:48:50 +01:00
Dhanya Maliakal	113e522399	refactoring and reducing overhead	2015-11-13 17:55:11 +01:00
Dhanya Maliakal	53f11c499d	memory leak fixed	2015-11-12 13:49:09 +01:00
Dhanya Maliakal	24438419d5	some changes for memory leak	2015-11-11 15:09:37 +01:00
Dhanya Maliakal	0627668090	some changes for memory leak	2015-11-11 15:08:50 +01:00
Dhanya Maliakal	455c9c5c80	some changes for memory leak	2015-11-09 17:16:24 +01:00
Dhanya Maliakal	98ab99c53f	fixed a bug of both threads not popping out(due to wrong frame packet) and end of acquisition wrongly inferred	2015-11-06 11:23:50 +01:00
Dhanya Maliakal	667c1c0304	some small changes	2015-11-05 12:05:31 +01:00
Dhanya Maliakal	e9f51e2ef5	put in the changes by Andrea to make it as static and remove as many destructors bugs	2015-11-02 17:33:10 +01:00
Dhanya Maliakal	f77b78b5c6	changes to compile server in defs file	2015-11-02 15:55:15 +01:00
Dhanya Maliakal	63507840e0	merging with master	2015-10-30 12:16:33 +01:00
Dhanya Maliakal	5c5e2edbf9	done	2015-10-29 17:45:24 +01:00
Dhanya Maliakal	1c9d01ea1c	done	2015-10-29 17:39:47 +01:00