4184 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Frojdh	2dd8093905	added project to CMakeLists and path for installing	2018-12-17 14:55:19 +01:00
Erik Frojdh	659faa9aaa	added it back	2018-12-12 16:31:36 +01:00
Erik Frojdh	feeaebb7e4	removed branch condition	2018-12-12 16:28:58 +01:00
Erik Frojdh	547efc48e3	added conda recipe	2018-12-12 16:27:35 +01:00
maliakal_d	a4de4bb475	Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor	2018-12-04 16:05:17 +01:00
maliakal_d	b3393fc18b	few gotthard bug fixes, including cs mask for adc	2018-12-04 16:02:24 +01:00
maliakal_d	4e65a1d964	gotthard server: minor fixes	2018-12-04 14:12:11 +01:00
maliakal_d	98b5e893b1	rd strobe fifo for only analog fifos	2018-12-03 14:33:32 +01:00
maliakal_d	8f3f9caf2b	almost done with ctb update, need to do slow adcs, split to moench and ctb	2018-11-30 10:39:26 +01:00
Erik Frojdh	d0665ce075	tests for socket	2018-11-29 12:21:02 +01:00
Erik Frojdh	284ce30a81	starting tests	2018-11-28 14:45:50 +01:00
maliakal_d	c19c787904	adcreg command line print	2018-11-12 15:14:37 +01:00
maliakal_d	e3a0c1373c	created AD9252 for old gotthard modules in use, it runs in both roi and non roi for old and new modules, data needs to be checked by Jiaguo to confirm some parts of the code that has FIXME to be checked later	2018-11-12 13:51:51 +01:00
maliakal_d	8942098a90	gotthard works, data to be authenticated when personnel available	2018-11-09 15:25:26 +01:00
maliakal_d	89fa30ee4b	client compiles	2018-11-08 18:10:03 +01:00
maliakal_d	2e37eda9d9	gotthard compiles	2018-11-08 18:09:11 +01:00
maliakal_d	a37be4b2e3	fixed eiger server compiler errors	2018-11-08 17:22:59 +01:00
maliakal_d	7a99d4155a	fixed jungfrau server compile errors	2018-11-08 17:20:41 +01:00
maliakal_d	91dd176a0f	gotthard server done editing	2018-11-08 17:15:48 +01:00
maliakal_d	a99584a0da	removed ndac from sls_detector_module and from the servers (not used), fixed setting module by eiger bug in sending number of channels	2018-11-02 17:08:25 +01:00
maliakal_d	d1c8d0b01c	jungfrau virtual server compiles	2018-11-02 14:52:27 +01:00
maliakal_d	833f0c164c	reciever hdf5 compiling error fixed	2018-11-02 14:31:36 +01:00
maliakal_d	742d4e6cb7	bug fix for mac addr format check	2018-11-02 14:13:59 +01:00
maliakal_d	d55c39ef08	minor print fixe	2018-11-02 14:09:40 +01:00
maliakal_d	a47db85350	gappixels only for eiger in receiver	2018-11-02 13:56:59 +01:00
maliakal_d	b43be57b6e	jungfrau server works	2018-11-02 13:50:00 +01:00
maliakal_d	92123069ce	virtual eiger server compiled	2018-10-31 15:13:31 +01:00
maliakal_d	17027962ea	log fix for eiger server	2018-10-31 15:02:43 +01:00
maliakal_d	e0cbbde01d	log fix for servers. eiger server done	2018-10-31 14:57:22 +01:00
maliakal_d	aec8c031de	kept the same client interface:tb changed when fixing error codes/exceptions, modified multi print, fixed roi bug in indexing to sls	2018-10-31 14:30:30 +01:00
Erik Frojdh	3d40d5d058	format	2018-10-30 14:57:30 +01:00
Erik Frojdh	af550b4c70	Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor	2018-10-30 14:46:19 +01:00
maliakal_d	70a1b87603	merge conflict resolved	2018-10-30 14:31:20 +01:00
maliakal_d	dfa8cf7381	runs, prints right in reciever	2018-10-30 13:35:20 +01:00
maliakal_d	92fc837eb4	compiles, but doesnt run	2018-10-29 15:23:52 +01:00
maliakal_d	33ac63d14a	still updating slsdetector.cpp	2018-10-26 17:40:18 +02:00
maliakal_d	cf87b6ca83	still updating slsdetector.cpp	2018-10-25 16:24:05 +02:00
maliakal_d	261849d69c	eiger server compiles, client side of interface to do	2018-10-23 16:20:40 +02:00
Erik Frojdh	129e12fd97	moved test framework	2018-10-22 11:21:18 +02:00
Erik Frojdh	ab2eb607c8	replced usleep with chrono and thread	2018-10-19 15:47:36 +02:00
Erik Frojdh	5671f1c87b	using split in add multiple detectors	2018-10-19 10:30:31 +02:00
Erik Frojdh	ff440f1325	clang-format on multi detector	2018-10-19 10:23:06 +02:00
maliakal_d	dfad145e14	still in the process of interfacing det and client	2018-10-18 18:08:34 +02:00
Erik Frojdh	500304024d	added base clang format	2018-10-18 17:06:43 +02:00
maliakal_d	86fb843021	in the process of rewriting detector client interface	2018-10-18 10:58:48 +02:00
Erik Frojdh	c95bc84458	formatting	2018-10-17 18:13:01 +02:00
Erik Frojdh	058de39d40	const qualifying	2018-10-17 17:51:26 +02:00
Erik Frojdh	b44039361d	renamed joinThread getter setter	2018-10-17 17:47:19 +02:00
Erik Frojdh	0070a79838	removed command threaded	2018-10-17 17:35:55 +02:00
Erik Frojdh	1d14dc6ff4	void signature of processData	2018-10-17 16:58:09 +02:00