6951 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	c097dfc8b3	two acquires at the same tiem should not be possile. using shared memory to set flag, made all connect use the standard connectControl etc	2015-11-20 16:28:48 +01:00
Dhanya Maliakal	a1bd54b16b	pulsing in client and server	2015-11-19 17:43:46 +01:00
Dhanya Maliakal	e0464ef782	pulsing client side, and bug fix server side for reset partially	2015-11-19 16:15:59 +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	291fe8bc22	socket disconnecting in receiver	2015-11-19 11:10:59 +01:00
Dhanya Maliakal	8b0895add0	reset counter bit in eiger detector partially or completely	2015-11-17 16:39:36 +01:00
Dhanya Maliakal	11dafc6ebf	resetting frame number done after resetting detector (prepareforacquisition) eiger server	2015-11-17 15:28:47 +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	bc55f9d1e4	edited getdatafromdetector to not stop detector for eiger	2015-11-17 12:00:42 +01:00
Dhanya Maliakal	777f04331d	implemented fifo depth configurable from client	2015-11-17 10:31:09 +01:00
Dhanya Maliakal	66db11421f	implemented fifo depth configurable from client	2015-11-17 10:30:53 +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	f68d6d0ab6	Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software	2015-11-13 17:49:36 +01:00
Dhanya Maliakal	c43af96487	some changes refactoring and reducing time spent	2015-11-13 17:47:44 +01:00
Dhanya Maliakal	c73d9f4103	merged and gotthard 2 det example	2015-11-13 17:44:24 +01:00
l_msdetect	041bfc8992	remove cout	2015-11-13 15:46:42 +01:00
Dhanya Maliakal	8ecc795574	corrected settings for eiger;removed loqwnoise to lowgain	2015-11-13 13:48:30 +01:00
l_msdetect	a6294a7737	default files	2015-11-13 12:12:40 +01:00
l_msdetect	c2c428254e	change eiger settings	2015-11-13 12:04:52 +01:00
l_msdetect	4cf263027a	change eiger setting dir	2015-11-13 11:51:17 +01:00
l_msdetect	fa80d6a205	change settings for eiger	2015-11-13 11:43:19 +01:00
Dhanya Maliakal	ab9e01f212	usleep in detector taken off	2015-11-12 15:30:56 +01:00
Dhanya Maliakal	62c92dd364	changing to random read when no gui at beginnning of acquire	2015-11-12 15:05:56 +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	816543f358	detector ip for eiger is replaced by hardware ip for 1g	2015-11-06 11:10:51 +01:00
Dhanya Maliakal	667c1c0304	some small changes	2015-11-05 12:05:31 +01:00
Marco Ramilli	0841467dc9	added xmap and ymap in moench02Ctb.h	2015-11-04 12:26:00 +01:00
Dhanya Maliakal	bc6dfca552	ensuring vthreshold returns the right value	2015-11-03 15:22:57 +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	2e701168b9	forgot to add eiger server	2015-11-02 12:32:56 +01:00
Dhanya Maliakal	2152eb1d28	detector id returns a number form a file or 0 if no file: eiger	2015-11-02 12:31:19 +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
Dhanya Maliakal	b5b7e7e529	done	2015-10-29 17:38:31 +01:00
Dhanya Maliakal	4c85a27f10	done	2015-10-29 17:34:19 +01:00
Dhanya Maliakal	963717215f	done	2015-10-29 17:23:39 +01:00
Anna Bergamaschi	9b449009ff	log	2015-10-29 13:33:24 +01:00
Anna Bergamaschi	eb5f481faa	detector type bug fix	2015-10-29 11:21:57 +01:00
Anna Bergamaschi	db54fbddde	detector type bug fix	2015-10-29 11:20:08 +01:00
l_msdetect	58bfa296be	done	2015-10-28 17:40:55 +01:00
Martin Brückner	eee739625f	Modified config_gen script	2015-10-28 11:08:19 +01:00