8953 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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	834794ad98	gotthard renamed binaries	2017-12-19 18:04:44 +01:00
Dhanya Maliakal	59c0861131	Merge branch '3.0.1' into developer	2017-12-19 17:51:31 +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
Anna Bergamaschi	31589ce352	added and fixed gotthard 25um file and zmq photon finder	2017-12-19 13:40:05 +01:00
Anna Bergamaschi	7602ffc5ac	gotthard on the fly to be stested	2017-12-14 17:01:28 +01:00
Anna Bergamaschi	13078d0ef2	gotthardDataStructures added	2017-12-14 17:00:30 +01:00
Anna Bergamaschi	9f3468bd15	Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer	2017-12-14 16:59:04 +01:00
Anna Bergamaschi	b50c1d966a	on the fly moench photon finder and cluster saving	2017-12-14 16:58:22 +01:00
Dhanya Maliakal	65a91c519e	Merge branch '3.0.1' into developer	2017-12-14 14:29:16 +01:00
Dhanya Maliakal	0649626842	made the color fix for black/white backgrounds	2017-12-14 14:29:07 +01:00
Dhanya Maliakal	5958cf9278	Merge remote branch 'slsDetectorCalibration/developer' into developer	2017-12-12 11:14:38 +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	56c504abbb	Merge remote branch 'slsDetectorCalibration/2.3.4' into 2.3.4	2017-12-12 11:14:19 +01:00
Dhanya Maliakal	4d6346e678	Merge remote branch 'slsDetectorCalibration/2.3.3' into 2.3.3	2017-12-12 11:14:15 +01:00
Dhanya Maliakal	dc7e448759	Merge remote branch 'slsDetectorCalibration/2.3.2' into 2.3.2	2017-12-12 11:14:12 +01:00
Dhanya Maliakal	e658cbacda	Merge remote branch 'slsDetectorCalibration/2.3.1' into 2.3.1	2017-12-12 11:14:08 +01:00
Dhanya Maliakal	1e6c6dea71	Merge remote branch 'slsDetectorCalibration/2.3' into 2.3	2017-12-12 11:14:05 +01:00
Dhanya Maliakal	0e5d4d1d8e	Merge remote branch 'slsDetectorCalibration/2.2' into 2.2	2017-12-12 11:14:01 +01:00
Dhanya Maliakal	a2986784d3	Merge remote branch 'slsDetectorCalibration/2.1.1' into 2.1.1	2017-12-12 11:13:34 +01:00
Dhanya Maliakal	975cbb576e	Merge remote branch 'slsDetectorCalibration/2.1' into 2.1	2017-12-12 11:06:15 +01:00
Dhanya Maliakal	e48a92d9cd	Merge remote branch 'slsDetectorCalibration/2.0.5' into 2.0.5 2.0.5	2017-12-12 11:02:57 +01:00
Dhanya Maliakal	f6e1c21137	Merge branch '3.0.1' into developer	2017-12-12 09:05:50 +01:00
Dhanya Maliakal	8da5b8318f	removed a few stuff from gitignore	2017-12-12 09:05:39 +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	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	4c0a16cd75	Merge branch '3.0.1' into developer	2017-12-11 11:13:32 +01:00
Dhanya Maliakal	d6a4f83a99	ignore misleading indentation	2017-12-11 11:13:25 +01:00
Dhanya Maliakal	e39d0aee56	Merge branch '3.0.1' into developer	2017-12-11 10:51:28 +01:00
Dhanya Maliakal	29d66e455d	possible to make only certain components of system	2017-12-11 10:51:19 +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