470 Commits

Author	SHA1	Message	Date
Dhanya Maliakal	7577d03e75	Merge branch '3.0.1' into developer	2017-12-08 11:50:15 +01:00
Dhanya Maliakal	8c123982d2	get detector and receiver status only when necessary for stopacquisition	2017-12-08 11:50:10 +01:00
Dhanya Maliakal	6e876d79ee	conflict merged fix, lockin in stop and startandreadallnowait, r_restreamstop moved to stop	2017-12-08 11:45:29 +01:00
Dhanya Maliakal	40a7b3983a	put some locking in stop acquisition and startandreadallnowait (bugs threadpool with more evernts than normal due to main and processing thread with no locks for detector releated stuff, zmqthreadpool not required, r_restreamstop moved to status stop when idle	2017-12-08 11:40:07 +01:00
Dhanya Maliakal	24c305ec59	solved conflicts from merge of version being used to binary	2017-12-06 19:07:06 +01:00
Dhanya Maliakal	c4a242e10a	changed all variables from svn to git, included --version for receiver binary	2017-12-06 10:29:57 +01:00
Dhanya Maliakal	a51f4f1252	Merge branch '3.0.1' into developer	2017-12-05 14:49:32 +01:00
Dhanya Maliakal	7b1f935da2	allowing to read adcs/temp during acquire	2017-12-05 14:49:20 +01:00
Dhanya Maliakal	9150556209	merge from 3.0.1 added more to write config/paramters	2017-12-05 13:42:35 +01:00
Dhanya Maliakal	3b684c4662	Merge branch '3.0.1' into developer	2017-12-05 13:41:26 +01:00
Dhanya Maliakal	d00c837977	updated write config and write parameters list	2017-12-05 13:41:16 +01:00
Dhanya Maliakal	12348ac76c	merge conflict fix	2017-12-01 09:20:44 +01:00
Dhanya Maliakal	18422ce215	setbit and clear bit moved to slsdet, readreg, writereg,setbit,clearbit in multi cannot give -1, instead api gives error if checked	2017-12-01 09:18:42 +01:00
Dhanya Maliakal	5b88203bd9	merge conflict from 3.0.1 to restream stop from recieveR	2017-11-30 19:05:35 +01:00
Dhanya Maliakal	ca855e6d39	restream stop from receiver	2017-11-30 18:37:11 +01:00
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	ca19993149	makng the zmq work without external flag	2017-11-27 17:06:18 +01:00
Dhanya Maliakal	c0a114345b	bug fix set error mask when setting wrong settings	2017-11-27 16:11:33 +01:00
Dhanya Maliakal	386ef7766c	zmq streaming should work with external gui now	2017-11-27 16:01:12 +01:00
Dhanya Maliakal	3439ccbec9	updates for merge for r_readfreq without reciever	2017-11-23 18:30:48 +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	ab5229bcbf	bugfix zmq ip was being overwritten	2017-11-23 17:48:30 +01:00
Dhanya Maliakal	585661412c	Merge branch '3.0.1' into developer	2017-11-23 17:20:13 +01:00
Dhanya Maliakal	dc5384f0f9	copy zmq port even if receiver not online, else it is lost	2017-11-23 17:20:07 +01:00
Dhanya Maliakal	935fecefde	copy zmq ip even if receiver not online, else it is lost	2017-11-23 17:18:40 +01:00
Anna Bergamaschi	400585be6a	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer	2017-11-22 12:34:28 +01:00
Anna Bergamaschi	dcfa6fb100	Fixed filename problem with CPU readout and trimval command for mythen	2017-11-22 12:34:14 +01:00
Dhanya Maliakal	2067f47f34	Merge branch '3.0.1' into developer	2017-11-21 14:15:59 +01:00
Dhanya Maliakal	2cc11f1ff0	bug fix: enabledatastreaming get should return shared memory variable and not from receiver, bug fix:zmq buffering when acquire form command line, stopping sockets when command line acquire or receiver start, restarting sockets at change of port numbers and a refresh button for the same	2017-11-21 13:39:12 +01:00
Anna Bergamaschi	5f0575236e	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer	2017-11-21 12:10:33 +01:00
Anna Bergamaschi	45e0cf71eb	put trimval should work also for MYTHEN	2017-11-21 12:09:52 +01:00
Dhanya Maliakal	bd228fac27	bug fix in cleanup code, indexing	2017-11-20 17:19:03 +01:00
Dhanya Maliakal	b7ca7f5319	just cleanuped code	2017-11-20 17:15:13 +01:00
Dhanya Maliakal	99037449f4	in between moench stuff	2017-11-20 14:23:32 +01:00
Dhanya Maliakal	c5c23e73d5	works zmq separated for client and rx, ports and ip included in expert advanced mode	2017-11-17 17:39:04 +01:00
Dhanya Maliakal	23b415d837	streaming port set return same as get simple change	2017-11-17 14:04:03 +01:00
Dhanya Maliakal	428855d801	in between	2017-11-17 14:02:00 +01:00
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