3338 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	2d6e4c95a2	temp_threshold, temp_control, temp_event done	2018-01-11 15:37:24 +01:00
Dhanya Maliakal	a87687199f	jungfrau server: minor typo in previous ocmmit	2018-01-11 11:36:40 +01:00
Dhanya Maliakal	d879379aa4	jungfrau server: incorporated transmission delay	2018-01-11 11:33:26 +01:00
Dhanya Maliakal	8fc3d97e78	jungfrau server: changed delay to trigger delay to have better trigger being caught	2018-01-11 09:26:50 +01:00
Dhanya Maliakal	beabd03be2	jungfrau server: (also previous commit) date changed to have only 6 nibbles in format yymmdd	2018-01-11 09:24:49 +01:00
Dhanya Maliakal	348a426242	updating to have developer's debug mode, resetfpga, programfpga and added api versioning, changed software date to only have date	2018-01-11 09:14:45 +01:00
Dhanya Maliakal	68d6c514a9	jungfrau server has same resetfpga, programfpga and debug mode as developer branch, eiger server has effects from debug flag, but not compiled	2018-01-10 15:49:40 +01:00
Dhanya Maliakal	6690335971	gotthard server bug fix, temp read	2017-12-19 17:50:20 +01:00
Dhanya Maliakal	bc8c706150	updated gotthard server binaries (3.0.0.6 was already used in 3.0.1)	2017-12-19 17:44:32 +01:00
Dhanya Maliakal	e39bee0113	gotthard server bug fix, temp fail	2017-12-19 17:33:27 +01:00
Dhanya Maliakal	a4dc00b252	gotthard server binary update	2017-12-19 17:08:28 +01:00
Dhanya Maliakal	6438238b55	gotthard server bug fix, read temp	2017-12-19 17:06:45 +01:00
Dhanya Maliakal	0649626842	made the color fix for black/white backgrounds	2017-12-14 14:29:07 +01:00
Dhanya Maliakal	e7f7e0f280	Merge remote branch 'slsDetectorCalibration/3.0.1' into 3.0.1	2017-12-12 11:14:30 +01:00
Dhanya Maliakal	735b8ea206	Merge remote branch 'slsDetectorCalibration/3.0' into 3.0	2017-12-12 11:14:24 +01:00
Dhanya Maliakal	8da5b8318f	removed a few stuff from gitignore	2017-12-12 09:05:39 +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	bb3e5351b4	solving warnings from latest linux	2017-12-11 13:51:11 +01:00
Dhanya Maliakal	d6a4f83a99	ignore misleading indentation	2017-12-11 11:13:25 +01:00
Dhanya Maliakal	29d66e455d	possible to make only certain components of system	2017-12-11 10:51:19 +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	8c123982d2	get detector and receiver status only when necessary for stopacquisition	2017-12-08 11:50:10 +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	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	7436d6c8d3	updaterev	2017-12-06 08:44:07 +01:00
Dhanya Maliakal	b498043ea6	remember old read freq if not 0 in gui	2017-12-05 16:04:10 +01:00
Dhanya Maliakal	7aaf95a565	-1 in getadc fixed in gui as well	2017-12-05 15:37:34 +01:00
Dhanya Maliakal	7b1f935da2	allowing to read adcs/temp during acquire	2017-12-05 14:49:20 +01:00
Dhanya Maliakal	ce1ec97571	some indentation in writing config file	2017-12-05 13:47:01 +01:00
Dhanya Maliakal	d00c837977	updated write config and write parameters list	2017-12-05 13:41:16 +01:00
Dhanya Maliakal	536203b6dc	one repo so need for gitall.sh	2017-12-05 11:16:22 +01:00
Dhanya Maliakal	65b4c69847	REST implementation removed from slsReceiver	2017-12-05 11:03:52 +01:00
Dhanya Maliakal	61791c078c	Merge remote branch 'slsDetectorGui/3.0.1' into 3.0.1	2017-12-04 16:48:17 +01:00
Dhanya Maliakal	36802cdb14	Merge remote branch 'slsReceiverSoftware/3.0.1' into 3.0.1	2017-12-04 16:48:17 +01:00
Dhanya Maliakal	e26cf3b673	Merge remote branch 'slsDetectorSoftware/3.0.1' into 3.0.1	2017-12-04 16:48:15 +01:00
Dhanya Maliakal	aab62fccc1	Merge remote branch 'slsDetectorGui/3.0' into 3.0	2017-12-04 16:48:09 +01:00
Dhanya Maliakal	73ce4abd58	Merge remote branch 'slsReceiverSoftware/3.0' into 3.0	2017-12-04 16:48:08 +01:00
Dhanya Maliakal	c12b137b79	Merge remote branch 'slsDetectorSoftware/3.0' into 3.0	2017-12-04 16:48:07 +01:00
Dhanya Maliakal	d1e3d50a87	cosmetic print outs	2017-12-01 12:43:14 +01:00
Dhanya Maliakal	a06f29f473	minor cosmetics	2017-12-01 11:23:17 +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	e9343a5bd0	remove warning	2017-11-30 19:07:05 +01:00
Dhanya Maliakal	70bf6eb4cb	restream stop from receiver	2017-11-30 18:39:08 +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	baee38802b	wait state between acquistion finished and ready for next acquire in gui, check if acquiringflag is set then reset it	2017-11-30 16:20:26 +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	b75985088d	twice connect bug fix in zmq	2017-11-28 18:50:18 +01:00
Dhanya Maliakal	a351fa8f28	switching from black to white background for receiver	2017-11-28 11:18:30 +01:00