66 Commits

Author SHA1 Message Date
l_msdetect
58bfa296be done 2015-10-28 17:40:55 +01:00
Dhanya Maliakal
5ac37c2154 some more 2015-10-13 15:22:30 +02:00
Dhanya Maliakal
e915245c10 additional change 2015-10-08 17:09:43 +02:00
Dhanya Maliakal
a3e88f96d6 some more changes 2015-10-08 12:19:07 +02:00
Dhanya Maliakal
c392348def big change half done 2015-09-30 11:40:39 +02:00
Dhanya Maliakal
7c0430572b included subframe into receiver and sends to gui 2015-09-22 16:21:41 +02:00
Dhanya Maliakal
c840305189 starting receiver only at set detector type works 2015-05-21 17:39:17 +02:00
Dhanya Maliakal
89ad2112c6 difference between acquisition index and frame index 2015-03-12 12:25:23 +01:00
f36d742cd3 Merge branch 'eiger_receiver' of gitorious.psi.ch:sls_det_software/sls_receiver_software into eiger_receiver 2014-11-17 15:52:43 +01:00
7c51b06777 Merge branch 'master' into eiger_receiver
Conflicts:
	include/slsReceiverTCPIPInterface.h
	slsReceiver/slsReceiver.cpp
	src/UDPStandardImplementation.cpp
	src/slsReceiverTCPIPInterface.cpp

it compiles
2014-11-11 15:54:12 +01:00
546d43dedb Merge branch 'eiger_receiver' of gitorious.psi.ch:sls_det_software/sls_receiver_software into eiger_receiver
Conflicts:
	include/UDPInterface.h
2014-09-22 14:46:34 +02:00
e5864d4343 Added status resetting for REST 2014-09-22 11:45:01 +02:00
b427452f39 able to send data to eigerbe
tweaks on logging

added configuration_map, to flexibly pass options to the different receivers

some more fixes to method overloads

still very preliminary
2014-09-17 15:56:27 +02:00
50d049539e minor 2014-09-10 10:17:36 +02:00
ce0b32b558 Merge branch 'eiger_receiver' into devel_leo
Conflicts:
	Makefile
	include/UDPInterface.h
	slsReceiver/Makefile
	slsReceiver/eigerReceiver/eigerReceiver.cpp
	slsReceiver/eigerReceiver/eigerReceiverDummy.cpp
	slsReceiver/eigerReceiver/eigerReceiverTest.cpp
2014-09-10 10:07:33 +02:00
59fc6fbaf8 moved .h into include. Second round of cleaning 2014-09-10 09:39:11 +02:00