848 Commits

Author	SHA1	Message	Date
Dhanya Thattil	40210ae26f	jungfrauserver adcphase fix: bug was if adcphase was same as previous value, it still shifted	2018-03-14 17:20:26 +01:00
Dhanya Thattil	dd6301d66d	updated for compilation	2018-03-14 16:19:30 +01:00
Dhanya Thattil	b58c3e8951	solving merging conflicts from 3.1.0 to developer	2018-03-14 15:45:35 +01:00
Dhanya Thattil	258de4947a	updated doc	2018-03-12 15:46:20 +01:00
Dhanya Thattil	72970c9669	updated binaries, updated manuals, updated git versioning	2018-03-12 14:21:02 +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	7649865a8f	jungfrau bug fix: adc phase corrected to correctly return value in -1	2018-03-08 14:02:02 +01:00
Dhanya Thattil	61e7c0148f	updating versions to 3.1.0	2018-02-27 12:40:53 +01:00
Dhanya Thattil	5849725b97	posisibility to overwrite rx_udpmac even with receiver	2018-02-26 18:22:07 +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	aa190fda7a	merge from 3.0.1: eiger server detip and mac client updated back	2018-02-07 15:24:44 +01:00
Dhanya Thattil	a6b917851c	finetuning printout	2018-02-07 15:22:19 +01:00
Dhanya Thattil	5198e67dbd	made the detector ip and detector mac update client in configuremac	2018-02-07 15:16:16 +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	618f6291cf	server binaries for all, jungfgrauserver with adcphase returning something, serverclient interface fixed for others not using tempcontrol, detectornumber not used for settings file for non eiger/mythen, server dates removing rev number	2018-02-07 09:23: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	e6bd874a88	modified jungfrau server and client to make auto_comp_disable a not yet implemented feature as it requires a firmware upgrade	2018-02-05 11:50:22 +01:00
Dhanya Thattil	5d04067973	added auto comp disable feature	2018-02-02 18:01:01 +01:00
Andrä Marie	3782a56ef2	second My3 commit	2018-01-30 11:02:08 +01:00
Andrä Marie	3aeb3f58d1	first mythen3Server commit	2018-01-22 14:01:46 +01:00
Dhanya Maliakal	061abf7be0	jungfrau server: changes to ensure no update of detector during this, included power chip to read the status bit and give error if temp event is up	2018-01-11 16:52:08 +01:00
Dhanya Maliakal	2d6e4c95a2	temp_threshold, temp_control, temp_event done	2018-01-11 15:37:24 +01:00
Dhanya Maliakal	d6bdbf8524	Merge branch '3.0.1' into developer	2017-12-11 13:51:20 +01:00
Dhanya Maliakal	bb3e5351b4	solving warnings from latest linux	2017-12-11 13:51:11 +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	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	4718378d0a	corrected bug fix in r_restreamstop	2017-12-06 19:21:28 +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	bf9905ad2a	possible to use binary --version or -v to get the branch and versionid	2017-12-06 19:05:35 +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	2f3dc8d109	Merge branch '3.0.1' into developer	2017-12-06 08:44:21 +01:00
Dhanya Maliakal	7436d6c8d3	updaterev	2017-12-06 08:44:07 +01:00
Dhanya Maliakal	98e09b29d5	merge conflict solved -1 in adc in gui	2017-12-05 15:39:02 +01:00
Dhanya Maliakal	7aaf95a565	-1 in getadc fixed in gui as well	2017-12-05 15:37:34 +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