4741 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Frojdh	dce7dcbfd4	partial frames	2019-04-11 12:14:52 +02:00
Erik Frojdh	d00fd70d6d	integration test	2019-04-11 11:29:34 +02:00
Erik Frojdh	04146e683c	updated reading	2019-04-10 16:54:33 +02:00
Erik Frojdh	4b7c5c5950	getFileIndex	2019-04-10 14:16:04 +02:00
Erik Frojdh	92b674354d	Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor	2019-04-10 12:37:25 +02:00
Erik Frojdh	8cb123cdcb	more getters setters	2019-04-10 12:37:16 +02:00
Gemma Tinti	6b5aa5ff66	Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor	2019-04-10 12:31:34 +02:00
Gemma Tinti	2b377df0bd	manual	2019-04-10 12:31:28 +02:00
Erik Frojdh	ec17529c52	seperate get/set	2019-04-10 12:15:19 +02:00
Erik Frojdh	404d3fa677	error handling	2019-04-09 17:35:36 +02:00
Erik Frojdh	026d4019c5	minor	2019-04-09 17:32:54 +02:00
Erik Frojdh	31a4a46fb6	lzmq	2019-04-09 15:23:48 +02:00
Erik Frojdh	8c3691f767	mitigating clang-tidy warnings	2019-04-09 14:31:08 +02:00
Erik Frojdh	70b2a41d5e	clang tidy	2019-04-09 10:59:09 +02:00
Erik Frojdh	39221f1230	enable lto	2019-04-08 14:57:10 +02:00
Erik Frojdh	fad308754b	turned off -Wshadow for gcc	2019-04-08 09:28:40 +02:00
Erik Frojdh	33f726ff7e	shadowing variables	2019-04-05 17:01:29 +02:00
Erik Frojdh	cbacf471d6	tests and std::sort	2019-04-05 16:24:28 +02:00
Erik Frojdh	f11db00aef	removed old typedef	2019-04-05 10:14:41 +02:00
Erik Frojdh	951d4d6091	new try	2019-04-04 18:26:14 +02:00
Erik Frojdh	025b3a8d4c	cleaning	2019-04-04 18:04:24 +02:00
Erik Frojdh	acf32a5524	removed old error handling	2019-04-04 17:42:55 +02:00
Erik Frojdh	55ba2afc05	better test + conda	2019-04-04 17:39:31 +02:00
Erik Frojdh	498569a42a	update for trimEn	2019-04-04 12:31:46 +02:00
Erik Frojdh	d6360ca197	removed warning	2019-04-04 12:21:48 +02:00
Erik Frojdh	05720c12ac	Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor	2019-04-04 12:19:39 +02:00
Erik Frojdh	85516e42c0	trimEn now takes vector	2019-04-04 12:19:30 +02:00
Dhanya Thattil	b35a8f0650	ctb server updated	2019-04-04 11:51:37 +02:00
Erik Frojdh	c284b24397	operator<< test	2019-04-03 20:05:29 +02:00
Erik Frojdh	7256a1e422	added test	2019-04-03 19:59:37 +02:00
Erik Frojdh	69a11f8950	cleaning up	2019-04-03 18:41:21 +02:00
Erik Frojdh	0270e18882	new tests	2019-04-03 18:11:48 +02:00
Erik Frojdh	697c020a49	Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor	2019-04-03 16:17:16 +02:00
Erik Frojdh	90b257a74d	warnings	2019-04-03 16:17:09 +02:00
Dhanya Thattil	bb025adc09	cmake3 in cmk.sh and removed warnings	2019-04-03 16:03:19 +02:00
Erik Frojdh	1558ca2bb5	version check of compiler	2019-04-03 15:21:11 +02:00
Erik Frojdh	a7ab8aa9e6	Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor	2019-04-03 14:48:04 +02:00
Erik Frojdh	3b4d36c3d4	bumped cmake to 3.5	2019-04-03 14:47:58 +02:00
Dhanya Thattil	59a0f5fac9	Merge branch 'address' into refactor, including minor change in formal argument name	2019-04-03 14:22:10 +02:00
Dhanya Thattil	bbfb5df30d	conflict resolved, changed to using hex() instead of str() in configuremac	2019-04-03 14:11:01 +02:00
Dhanya Thattil	09f1a8956e	ignore .vscode	2019-04-03 10:22:00 +02:00
Erik Frojdh	d6c0f7be05	constexpr	2019-04-02 17:59:59 +02:00
Dhanya Thattil	11d7ebd298	Merge branch 'program2' into refactor	2019-04-02 17:29:56 +02:00
Dhanya Thattil	d9ea8e6747	Merge branch 'refactor' into program2	2019-04-02 17:29:00 +02:00
Dhanya Thattil	5131245f0a	all servers except eiger: easier to update firmware and software using update or copydetectorserver, rebootcontroller, and programfpga	2019-04-02 17:27:01 +02:00
Erik Frojdh	6fc388bf78	reset to info	2019-04-02 17:15:21 +02:00
Erik Frojdh	24f28f14f4	clean up	2019-04-02 17:00:00 +02:00
Erik Frojdh	45fd35b243	Merge branch 'refactor' into address	2019-04-02 15:44:57 +02:00
Erik Frojdh	11a452545c	added parallel call for void return	2019-04-02 15:44:19 +02:00
Erik Frojdh	b198b50377	class for Ip and Mac	2019-04-02 15:24:25 +02:00