410 Commits

Author	SHA1	Message	Date
Dhanya Thattil	b58c3e8951	solving merging conflicts from 3.1.0 to developer	2018-03-14 15:45:35 +01:00
Erik Frojdh	0d2dd93498	changed setBit and getBit to uint32_t	2018-03-08 17:13:13 +01:00
Erik Frojdh	339956e5de	changed from int to uint32_t in read and writeRegister	2018-03-08 16:08:31 +01:00
Dhanya Thattil	7859df6aa3	bug fix: 1000+ errors on gui startup(setreceiveronline not done), removed gui mesage popup for different output paths, fixed jungfrau to have multiple detectors in x dir in gui	2018-02-26 12:44:32 +01:00
Dhanya Thattil	c3d6852f97	fixed threshold returning 1 if a trimbit file missing for eiger, it now returns -1, as both values are different	2018-02-23 14:49:18 +01:00
Dhanya Thattil	a654febb7e	merge from 3.0.1 parallalize dr	2018-02-07 15:48:39 +01:00
Dhanya Thattil	94b61ea2c4	parallelized setting dynamic range	2018-02-07 15:45:59 +01:00
Dhanya Thattil	897cbac27d	merge from 3.0.1 for server binaries (adcphase,server dates, temp control, settings file	2018-02-07 11:02:36 +01:00
Dhanya Thattil	ecf1e9fac1	bugfix: returning pointer to local variable, char* to string in function definition	2018-02-07 10:14:52 +01:00
Dhanya Thattil	3da6a6df65	merge conflict removed, jungfrau server and eiger server re compiled	2018-02-05 12:33:05 +01:00
Dhanya Thattil	5d04067973	added auto comp disable feature	2018-02-02 18:01:01 +01:00
Dhanya Maliakal	2d6e4c95a2	temp_threshold, temp_control, temp_event done	2018-01-11 15:37:24 +01:00
Dhanya Maliakal	d2319459df	Merge branch '3.0.1' into developer	2017-12-11 18:03:01 +01:00
helfenstein_p	03de29de90	refine threadpool mutex, remove unlock before destroying, unlocking twice is undefined behaviour	2017-12-11 18:02:33 +01:00
Dhanya Maliakal	1e849097ea	merge conflict fixed in filename bug	2017-12-08 12:09:10 +01:00
Dhanya Maliakal	e19d564364	bug fix no reciever could not set file name for mythen for eg., also bug fix that did not allow _s, _S, _p, _d as suffix to file name	2017-12-08 12:06: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	2d14da545d	Merge branch '3.0.1' into developer	2017-12-05 13:47:09 +01:00
Dhanya Maliakal	ce1ec97571	some indentation in writing config file	2017-12-05 13:47:01 +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	1edb41242c	ensure gui gets measurement finished after dummy packet received from receiver/ext process	2017-11-29 15:22:10 +01:00
Dhanya Maliakal	397344a264	Merge branch '3.0.1' into developer	2017-11-29 12:13:09 +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	7c1423d654	zmqip fix to restart reciever streaming form command line, fix to not have sls_receiver_defs in zmqSocket.h incldue	2017-11-28 16:31:43 +01:00
Dhanya Maliakal	6a41b5ce3a	using file index from zmq	2017-11-28 14:45:29 +01:00
Dhanya Maliakal	ca19993149	makng the zmq work without external flag	2017-11-27 17:06:18 +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	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	ab5229bcbf	bugfix zmq ip was being overwritten	2017-11-23 17:48:30 +01:00
Dhanya Maliakal	5eb8402742	bugfix zmq streaming both on	2017-11-23 17:28:35 +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
Dhanya Maliakal	20dc338c90	when changing network parameter, switch off data streaming only if on	2017-11-23 17:00:12 +01:00
Dhanya Maliakal	a57e8edd88	jctb setting dr correctly	2017-11-23 16:15:38 +01:00
Dhanya Maliakal	8538604c0f	somewhere	2017-11-23 14:53:37 +01:00
Dhanya Maliakal	fb3c903c04	Merge branch '3.0.1' into developer	2017-11-22 17:06:51 +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	590fac9e07	making nx and ny available for jctb in call back	2017-11-22 15:08:09 +01:00
Dhanya Maliakal	8328b30cbd	removed merge conflicts from bug fix of zmq buffering while acquire from command line	2017-11-21 14:58:07 +01:00
Dhanya Maliakal	2067f47f34	Merge branch '3.0.1' into developer	2017-11-21 14:15:59 +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
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