5575 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Frojdh	c9b5db4d7f	Matrix in conda2	2020-02-13 11:08:41 +01:00
Erik Frojdh	2e6378f241	Matrix in conda	2020-02-13 10:53:25 +01:00
Erik Frojdh	692584ced8	WIP	2020-02-12 17:27:44 +01:00
Erik Frojdh	4ae93dbc73	WIP	2020-02-12 11:54:41 +01:00
Erik Frojdh	f37ceaf517	WIP	2020-02-12 11:41:54 +01:00
Erik Frojdh	75a9002f2c	WIP	2020-02-12 11:26:47 +01:00
Erik Frojdh	cfec18e441	WIP	2020-02-12 11:13:26 +01:00
Erik Frojdh	3ff7654c29	WIP	2020-02-12 11:02:29 +01:00
Erik Frojdh	9781dbe49e	WIP	2020-02-12 10:51:26 +01:00
Erik Frojdh	e777c0fa79	WIP	2020-02-12 10:34:57 +01:00
Erik Frojdh	9981632b2d	fix	2020-02-12 09:18:59 +01:00
Erik Frojdh	d8436da540	conda	2020-02-12 09:05:34 +01:00
Erik Frojdh	4dc4c1ec0a	build	2020-02-11 19:33:33 +01:00
Erik Frojdh	6537aa1ceb	gui	2020-02-11 18:49:27 +01:00
Erik Frojdh	467be41ccb	zlib	2020-02-11 18:41:28 +01:00
Erik Frojdh	73a39fcafe	WIP	2020-02-11 18:22:28 +01:00
Erik Frojdh	041c9fefa0	WIP	2020-02-11 16:22:48 +01:00
Erik Frojdh	4f4f3baefc	Merge branch 'udp' of github.com:slsdetectorgroup/slsDetectorPackage into udp	2020-02-11 16:07:47 +01:00
Erik Frojdh	3523de8ba9	WIP	2020-02-11 16:01:32 +01:00
Erik Frojdh	e77a93021d	WIP	2020-02-10 17:59:29 +01:00
Erik Frojdh	4dc14bf9d6	fixed looking up interface	2020-02-06 08:51:34 +01:00
Erik Frojdh	a5cdd687e6	reverted server	2020-02-05 19:07:35 +01:00
Erik Frojdh	89175586b4	replaced socket	2020-02-05 19:04:25 +01:00
Erik Frojdh	c3bbe45b68	WIP	2020-02-04 17:50:21 +01:00
Erik Frojdh	8f64449117	initial fixing	2020-02-04 17:34:07 +01:00
Dhanya Thattil	94fcf52e64	Merge pull request #76 from slsdetectorgroup/exec ... Buffern in exec	2020-02-04 10:59:48 +01:00
Dhanya Thattil	64214f22f9	Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer	2020-02-04 10:50:14 +01:00
Dhanya Thattil	36bd91daa3	gotthard2: sleep before configuring on chip dacs, default exptime 0 and default period to 1ms	2020-02-04 10:50:01 +01:00
Erik Frojdh	40bfca588b	minor from clang-tidy	2020-02-04 10:36:03 +01:00
Erik Frojdh	b9446f40d1	fmt and minor	2020-02-04 10:11:27 +01:00
Erik Frojdh	ec66079f65	renamed ServerInterface	2020-02-04 08:57:35 +01:00
Erik Frojdh	e6340456f6	minor	2020-02-04 08:47:22 +01:00
Erik Frojdh	f42d591845	sizeof	2020-02-03 16:51:57 +01:00
Erik Frojdh	e9029ba8f2	removed unused functions	2020-02-03 16:44:14 +01:00
Erik Frojdh	121747352d	buffer	2020-02-03 16:35:30 +01:00
Erik Frojdh	4cfea36b93	Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer	2020-02-03 16:00:32 +01:00
Erik Frojdh	a829e69313	minor	2020-02-03 16:00:24 +01:00
Dhanya Thattil	42124ca97c	eiger rxr: setting exptime now also sets subperiod in rxr master file	2020-02-03 15:54:41 +01:00
Erik Frojdh	972f21258a	renamed multiSlsDetector	2020-02-03 14:57:37 +01:00
Erik Frojdh	6bb1188c37	renamed exes	2020-02-03 14:43:40 +01:00
Erik Frojdh	a57c677105	Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer	2020-02-03 14:38:31 +01:00
Erik Frojdh	254e8f85d8	moved non public headers	2020-02-03 14:38:24 +01:00
Dhanya Thattil	56484daf18	Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer	2020-02-03 12:25:40 +01:00
Erik Frojdh	6cc13f9dc1	naming	2020-02-03 12:05:52 +01:00
Dhanya Thattil	93ab8d05d7	eiger: change speed to full speed for dr of 4, 8, 16	2020-02-03 11:37:43 +01:00
Erik Frojdh	88c65c506f	Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer	2020-02-03 11:34:14 +01:00
Erik Frojdh	074636a7d6	minor cleaning	2020-02-03 11:34:07 +01:00
Dhanya Thattil	e432e6f90d	4.1.1 changes: software trigger via stop server, disentangling rxr streamin from register call back	2020-02-03 11:25:19 +01:00
Erik Frojdh	a3c686d271	renamed	2020-02-03 11:04:49 +01:00
Erik Frojdh	9f79f132b7	Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer	2020-02-03 10:34:51 +01:00