343 Commits

Author	SHA1	Message	Date
Dhanya Maliakal	2227265357	removed external gui flag, acquiring flag is now not reset in stop acquisition, slsdet does not have acquiring flag anymore, busy accomodating acquiringflag, acquire cleanup, in acquire made lock for receiver more local, moved setacquiringflag false to bottom of acquire	2017-11-30 16:25:23 +01:00
Dhanya Maliakal	712c9a4524	zmq connect earlier in gui to prevent losing first messages	2017-11-29 12:13:02 +01:00
Dhanya Maliakal	386ef7766c	zmq streaming should work with external gui now	2017-11-27 16:01:12 +01:00
Dhanya Maliakal	65d7922286	merge solved	2017-11-23 18:24:24 +01:00
Dhanya Maliakal	16e4fbf8dd	receiver read freq should save value in shm even if no receiver present	2017-11-23 18:21:54 +01:00
Dhanya Maliakal	5eb8402742	bugfix zmq streaming both on	2017-11-23 17:28:35 +01:00
Dhanya Maliakal	20dc338c90	when changing network parameter, switch off data streaming only if on	2017-11-23 17:00:12 +01:00
Dhanya Maliakal	8538604c0f	somewhere	2017-11-23 14:53:37 +01:00
Dhanya Maliakal	6753f8ba6c	network parameter should return with extra plus at the end like hostname	2017-11-22 17:06:43 +01:00
Dhanya Maliakal	167a6cff3e	restart streaming if port changed in multi level, sls detector level:need to take care of it on your own	2017-11-21 13:42:11 +01:00
Dhanya Maliakal	7dee07b9c5	somewhere	2017-11-16 09:12:54 +01:00
Dhanya Maliakal	fd34bab34b	in between separating datastreaming in client and receiver	2017-11-15 17:19:07 +01:00
Dhanya Maliakal	dda86cfe9b	somewhere in separating zmq rxr and client	2017-11-14 16:26:17 +01:00
Dhanya Maliakal	70848c9891	bugfix ratecorr always gave back -100	2017-11-13 13:39:28 +01:00
Dhanya Thattil	f2f061ae18	bug fix: using int instead of int64_t , eg exptime is -1 on return	2017-10-12 09:47:13 +02:00
Dhanya Maliakal	44bf4c52ed	changes for eiger server to return error if error	2017-10-06 13:48:06 +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	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	5b0fd60775	parallelized ratecorrection	2017-09-18 17:49:08 +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	54d231d3c6	parallelized set timer, file index	2017-09-15 14:51:43 +02:00
Dhanya Maliakal	67cdfe8b41	in between	2017-09-14 16:58:39 +02:00
Dhanya Maliakal	0bea688a83	changes for external gui	2017-08-23 19:06:40 +02:00
Dhanya Maliakal	19d973f5d6	Merge branch '3.0' into externalgui	2017-08-23 18:26:46 +02:00
Dhanya Maliakal	6332025bbc	frames caught in 9m was only looking at 1st receiver, now made to average	2017-08-23 18:26:25 +02:00
Dhanya Maliakal	bdccddfe97	in between	2017-08-23 18:24:48 +02:00
Dhanya Maliakal	4f28df03ab	trials	2017-08-22 19:43:26 +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	389f356a3a	high voltage reflects the master only, if 2 masters reflects -1	2017-08-10 11:09:44 +02:00
Dhanya Maliakal	558e5e2e9a	added busy command, converted get frames etc to an integer output	2017-08-08 19:15:20 +02:00
Dhanya Maliakal	e3667f6827	can set zmqport from receiver	2017-07-13 12:18:07 +02:00
Dhanya Maliakal	931a5840e8	changes to gotthard server to include write adc, and also changes to fix the dma=dma+1	2017-07-11 10:54:21 +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	c2980b3c44	changes for setting threshold without trimbits for eiger	2017-06-28 10:24:07 +02:00
Dhanya Maliakal	1ed4407c11	parallelizing adcs and dacs	2017-06-23 17:26:46 +02:00
Dhanya Maliakal	57ae305c7d	parallelized enabledatastreaming	2017-06-22 16:59:41 +02:00
Dhanya Maliakal	bbbd4731d7	ensuring acquire, p receiver start and the gui enables and disables data streaming accordingly. those with api will have to know what they want before acquiring	2017-06-22 16:44:29 +02:00
Dhanya Maliakal	fe73e09aa4	removing unnecessary printouts, ensuring lost packets are 0xff	2017-06-21 17:05:47 +02:00
Dhanya Maliakal	48f853aa1a	fixed gui getting stuck (wrong datathreadmask more than 64 bits cuz of 72 sockets)	2017-06-20 12:38:59 +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
Dhanya Maliakal	15424149cd	removed leak from postprocessing, moved delete task to earlier in threadpool and deleting threadpool	2017-05-12 10:32:16 +02:00
Dhanya Maliakal	0722ef3125	changes including warnings and zmq	2017-05-04 17:52:47 +02:00
Dhanya Maliakal	066550d38c	zmq changes for no dummy data end	2017-05-01 14:02:13 +02:00
Dhanya Maliakal	445da80df8	resolved warnings, also from esrf: todo: include changes in zmq	2017-05-01 13:11:10 +02:00
Dhanya Maliakal	536f8937cb	merging	2017-03-24 09:10:09 +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	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	4b388f56b2	fixed gui for new header	2017-03-20 09:27:38 +01:00