433 Commits

Author	SHA1	Message	Date
Dhanya Maliakal	51499fa503	merge conflict from 3.0.1	2017-11-17 11:35:02 +01:00
Dhanya Maliakal	8e0414d1b9	separating zmqport, enabling in client and receiver works	2017-11-16 15:01:22 +01:00
Dhanya Maliakal	7dee07b9c5	somewhere	2017-11-16 09:12:54 +01:00
Dhanya Maliakal	2b0d07387a	in between separating datastreaming in client and receiver	2017-11-15 17:16:47 +01:00
Dhanya Maliakal	dda86cfe9b	somewhere in separating zmq rxr and client	2017-11-14 16:26:17 +01:00
Dhanya Maliakal	1af065fdb1	infinite loop with gettotalnumberofchannels in gappixels initialization resulting in bus error fix	2017-11-13 11:13:26 +01:00
Dhanya Maliakal	678ef89e17	conflict resolved from merge developer to gappixels insignificant	2017-11-10 16:54:18 +01:00
Dhanya Maliakal	3886a0c9ad	merge fix from 3.0.1 regarding gethostbyname thread safety	2017-11-10 16:37:20 +01:00
Dhanya Maliakal	23ddb3d4b5	merge fix from 3.0.1 regarding gethostbyname thread safety	2017-11-10 16:34:31 +01:00
Dhanya Maliakal	739187943d	replaced gethostbyname with getaddrinfo as it is not thread safe	2017-11-10 16:30:38 +01:00
Dhanya Maliakal	82f503aa09	dynamic range also updates offsets, 4 bit mode gap pixels work in call back from gui	2017-10-31 12:50:31 +01:00
Dhanya Maliakal	79bce5e006	4 bit mode works without gappixels	2017-10-26 16:01:18 +02:00
Dhanya Maliakal	9c82a8f726	temp in between, trying to get 4 bitmode to work without gap pixels	2017-10-26 11:19:58 +02:00
Dhanya Maliakal	7f9ac86862	Merge branch 'developer' into gappixels	2017-10-23 17:09:13 +02:00
Dhanya Maliakal	d2fd0cbee9	x y and z coordinates are pushed into eiger server and its fixed in appropriate client side as well	2017-10-23 12:20:18 +02:00
Dhanya Maliakal	812606a7b4	conflict resolution with developer	2017-10-03 15:12:49 +02:00
Dhanya Maliakal	03a2f979a9	fixing merge conflict in error_Defs	2017-10-03 14:32:30 +02:00
Dhanya Maliakal	96caf728c8	setting receiver to none properly, ten giga set in shared memoery properly if no receiver involved	2017-10-03 14:17:48 +02:00
Dhanya Maliakal	bb817733ff	changes upto the receiver, not incl gui	2017-10-03 10:44:05 +02:00
Dhanya Maliakal	352ade6457	just skeleton of gappixels	2017-09-27 17:08:00 +02:00
Dhanya Maliakal	af98d2bb53	added silent mode in receiver during real time acquisition, doesnt print packet loss regularly or file name created each time	2017-09-27 10:09:02 +02:00
Dhanya Maliakal	986826cbe9	x y z and id are written to the udp header for eiger	2017-09-26 16:39:02 +02:00
Dhanya Maliakal	663fd557ff	client gives now 3d positions of detector to be configured in udp header, only in jungfrau firmware till now	2017-09-22 15:28:57 +02:00
Dhanya Maliakal	ab27437604	removed setframeindexenable from going to the receiver, it can figure it out on its own now	2017-09-22 12:23:39 +02:00
Dhanya Maliakal	092487c08e	Merge branch '3.0.1' into developer	2017-09-19 17:19:36 +02:00
Dhanya Maliakal	3a79f0ad9b	parallelizing file name has its consequences, file name prefix edited only in multi level	2017-09-19 11:37:54 +02:00
Dhanya Maliakal	90f899c936	replaced post incrementing by pre incrementing	2017-09-18 17:20:38 +02:00
Dhanya Maliakal	a95e2efdb0	parallelized settimer, setfileindex, setonline, setreceiveronline, getreceiverstatus, resetframescaught, setFrameIndex, setFileName, getFramesCaughtByReceiver; added getFramesCaughtbyAnyreceiver to avoid threadpool and to use in post processing	2017-09-18 16:47:22 +02:00
Dhanya Maliakal	c635b19941	fixed jungfrau image after programfpga, fixed resetfpga	2017-09-14 15:55:55 +02:00
Dhanya Maliakal	49378e6d09	added streamsrcip command to be able to change the interface from which receiver streams data from	2017-09-12 14:33:11 +02:00
Dhanya Maliakal	aef462da32	merge error fixed	2017-09-08 09:31:26 +02:00
Anna Bergamaschi	1ba325e902	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer	2017-09-07 11:27:52 +02:00
Dhanya Maliakal	bdccddfe97	in between	2017-08-23 18:24:48 +02:00
Dhanya Maliakal	a657bac1b1	removed a print	2017-08-23 18:01:02 +02:00
Dhanya Maliakal	f4e2b819d2	changes for external gui	2017-08-23 16:31:32 +02:00
Dhanya Maliakal	57537a350f	updating cmd line help; other detectors other than eiger will complain cannot set timer 14 (subexptime) when setting receiver	2017-08-16 17:12:23 +02:00
Anna Bergamaschi	3aeb15648c	Anna's modifications	2017-08-11 15:55:07 +02:00
Dhanya Maliakal	e8d83a085f	moved receiver start to status start and to startandreadall (acquire), parallelized status start, moved prepare and clean up to multi level and called by start and stop receiver for gotthard, moench and propix	2017-08-10 18:46:10 +02:00
Dhanya Maliakal	f084efd263	sending and writing subexptime in the receiver files, adding 0x in front of all numbers printed in command line which is hexa	2017-08-10 17:25:18 +02:00
Dhanya Maliakal	e3667f6827	can set zmqport from receiver	2017-07-13 12:18:07 +02:00
Dhanya Maliakal	f944d7cae4	made updatereceiver to actually update client in parameters that it can	2017-07-03 17:37:24 +02:00
Dhanya Maliakal	99dad79572	Somewhere	2017-07-03 13:46:06 +02:00
Dhanya Maliakal	da4ffb235c	ensuring set detector type is the first call	2017-07-03 13:32:10 +02:00
Dhanya Maliakal	b05e9c194a	makefiles and versioning update complete	2017-06-29 17:10:10 +02:00
Dhanya Maliakal	c2624daa9a	uncommented a print	2017-06-28 10:27:40 +02:00
Dhanya Maliakal	c2980b3c44	changes for setting threshold without trimbits for eiger	2017-06-28 10:24:07 +02:00
Anna Bergamaschi	ffd3cb6511	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer	2017-06-26 13:03:08 +02:00
Anna Bergamaschi	dfb8a1f7ad	small modifications for jctb and moench03 module	2017-06-26 13:03:01 +02:00
Dhanya Maliakal	fe73e09aa4	removing unnecessary printouts, ensuring lost packets are 0xff	2017-06-21 17:05:47 +02:00
Dhanya Maliakal	e2e25f6e62	changed API for setting network parameter to remove memory leak, fixed lock issues in streaming print outs to gui, deleted return from threadpool in the right place	2017-06-19 14:29:45 +02:00