1263 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	2a7a11b80f	changes	2016-11-01 09:12:58 +01:00
Dhanya Maliakal	5b4528925d	some changes	2016-11-01 08:10:52 +01:00
Dhanya Maliakal	d6d6a050bd	some changes	2016-11-01 08:06:21 +01:00
Dhanya Maliakal	a7288dc0de	some changes	2016-11-01 08:03:43 +01:00
Dhanya Maliakal	1c073b70bd	changed	2016-10-31 17:04:49 +01:00
Dhanya Maliakal	58228ed00f	trying	2016-10-31 16:43:45 +01:00
Dhanya Maliakal	5cc17a77c7	Merge branch 'developer' into jungfrauchange	2016-10-28 08:14:06 +02:00
Dhanya Maliakal	4c6c078442	settimer returning -1 now instead of 1 for different values	2016-10-28 08:12:55 +02:00
Dhanya Maliakal	f5f9e535de	acquiring flag cleared at configuration file load	2016-10-28 07:58:39 +02:00
Dhanya Maliakal	622e0a480e	added single module binary	2016-10-27 10:26:13 +02:00
Dhanya Maliakal	391ad67e8c	changing the mess return from acq finished eiger server:trial for 9m lag bug	2016-10-27 09:20:21 +02:00
Dhanya Maliakal	7541c2bcf0	some more change	2016-10-27 08:28:30 +02:00
Dhanya Maliakal	3c646c3545	untangled moench from jungfrau, quite a few changes	2016-10-27 07:26:47 +02:00
Dhanya Maliakal	d38989b340	added 9m binary	2016-10-25 17:03:56 +02:00
Dhanya Maliakal	b28c68127a	check for why gui doesnt show all data	2016-10-25 16:48:04 +02:00
Dhanya Maliakal	64094be4e3	check for why gui doesnt show all data	2016-10-25 16:45:52 +02:00
Dhanya Maliakal	fde7d2359c	check for why gui doesnt show all data	2016-10-25 16:22:03 +02:00
Dhanya Maliakal	f2abf0fbfd	check for why gui doesnt show all data	2016-10-25 16:08:36 +02:00
Dhanya Maliakal	a6fecca2b8	check for why gui doesnt show all data	2016-10-25 16:05:39 +02:00
Dhanya Maliakal	64965e2a1a	check for why gui doesnt show all data	2016-10-25 15:53:04 +02:00
Dhanya Maliakal	51c0ca8c6e	check for why gui doesnt show all data	2016-10-25 15:50:35 +02:00
Dhanya Maliakal	ac4c758636	check for why gui doesnt show all data	2016-10-25 15:44:31 +02:00
Dhanya Maliakal	7803e94d79	check for why gui doesnt show all data	2016-10-25 15:38:32 +02:00
Dhanya Maliakal	1e361bb3ba	check for why gui doesnt show all data	2016-10-25 15:35:00 +02:00
Dhanya Maliakal	f7898bc62b	check for why gui doesnt show all data	2016-10-25 15:13:38 +02:00
Dhanya Maliakal	994ccac75b	check for why gui doesnt show all data	2016-10-25 15:03:13 +02:00
Dhanya Maliakal	e312098e56	check for why gui doesnt show all data	2016-10-25 14:52:25 +02:00
Dhanya Maliakal	18c6e8208a	removed bug, setting dr24 sets dr 32 also for eiger, also added server executable	2016-10-25 12:01:31 +02:00
Dhanya Maliakal	7eda5f9de5	just finished the clock	2016-10-25 09:21:08 +02:00
Dhanya Maliakal	31d48411db	somewhere	2016-10-25 08:18:02 +02:00
Dhanya Maliakal	94ff6cb092	moenchserver should not be in jungfrau folder	2016-10-24 13:57:39 +02:00
Dhanya Maliakal	899adbce5b	merge fixed	2016-10-20 09:17:32 +02:00
Dhanya Maliakal	12574f4c05	merged zmqdata to developer	2016-10-20 08:46:48 +02:00
Dhanya Maliakal	fa7536e1d1	merge with 2.1.1-rc to be latest	2016-10-20 07:38:08 +02:00
Dhanya Maliakal	81d96a047d	slsDetector/slsDetectorCommand.cpp	2016-10-20 07:31:53 +02:00
Dhanya Maliakal	44a69e2aee	improved locking a bit	2016-10-19 10:46:03 +02:00
Dhanya Maliakal	121e9faf56	trying with the actual 1 getframescaught	2016-10-19 10:32:11 +02:00
Dhanya Maliakal	673e7c8f20	removed asking only 1 for framescaugh	2016-10-19 10:22:35 +02:00
Dhanya Maliakal	749c64204e	done showing error when detectors not added in sharedmemory due to connect failure	2016-10-19 08:15:52 +02:00
Dhanya Maliakal	e49f97a03c	done showing error when detectors not added in sharedmemory due to connect failure	2016-10-19 08:10:42 +02:00
Dhanya Maliakal	f535e11bba	check not done	2016-10-18 15:31:48 +02:00
Dhanya Maliakal	028ba57876	check for giving an error in gui if cannot connect to hostname	2016-10-18 15:06:01 +02:00
Dhanya Maliakal	ca89835035	check for giving an error in gui if cannot connect to hostname	2016-10-18 15:03:44 +02:00
Dhanya Maliakal	1e9ebc6f37	check for giving an error in gui if cannot connect to hostname	2016-10-18 14:50:25 +02:00
Dhanya Maliakal	4bfbd24144	check for giving an error in gui if cannot connect to hostname	2016-10-18 14:47:52 +02:00
Dhanya Maliakal	18046379ab	bugfix:seg fault for giving an error in gui if cannot connect to hostname	2016-10-18 14:44:13 +02:00
Dhanya Maliakal	8502a7b79f	giving	2016-10-18 14:36:04 +02:00
Dhanya Maliakal	a7e8ff1c42	back	2016-10-18 14:05:05 +02:00
Dhanya Maliakal	eec812f92c	switched	2016-10-18 12:33:47 +02:00
Dhanya Maliakal	de5037ae2b	switched	2016-10-18 12:19:20 +02:00