a690e4d830
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software
2014-10-27 12:01:54 +01:00
72ba2ae901
offset added to receiver funcs
2014-10-27 12:01:29 +01:00
Maliakal Dhanya
b85490b528
the version given to esrf
2014-10-16 14:14:20 +02:00
cd3a502167
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software
2014-10-15 09:22:40 +02:00
f2dddd88cd
JUNGFRAU detector type added
2014-10-15 09:22:17 +02:00
Maliakal Dhanya
e94e678f7d
receiver bottom module included, and image reconstruction works for all bit modes, receiver still for a half module each, although two of them combined to make one module image
2014-10-14 15:42:32 +02:00
Maliakal Dhanya
665401669e
udpport2 module
2014-09-26 11:19:26 +02: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
f05248cd32
fixes
2014-09-22 14:09:31 +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
Maliakal Dhanya
5cfe7b4338
32 bit image, and 32 bit mode frame number for eiger fixed, startframeindex included in readframe for all det in tcpip class
2014-09-16 16:29:36 +02:00
cfacc6ad6e
modified to support REST receiver, still not properly working
2014-09-15 16:52:53 +02:00
7986746194
from private to protected
2014-09-15 16:33:57 +02:00
e0ee1fb386
fixed bug in config reading; added printout in MAkefile
2014-09-12 16:09:43 +02:00
eb1f9db9af
added build dir
2014-09-12 13:25:01 +02:00
50d049539e
minor
2014-09-10 10:17:36 +02:00
3e0f618fbe
cleaning
2014-09-10 10:09:29 +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
3d08fc3e58
update gitignore
2014-09-10 09:20:49 +02:00
27780d02d8
cleaning the project
2014-09-10 09:19:35 +02:00
dc04efbbb1
working logger!
2014-09-09 18:13:31 +02:00
811bac16ec
trying to make it work...
2014-09-09 17:16:51 +02:00
Maliakal Dhanya
c2b885f230
version
2014-09-09 17:01:43 +02:00
c62594c7ab
added REST and Standard implementations
2014-09-09 16:38:27 +02:00
51b610e32a
added logger
2014-09-09 16:37:35 +02:00
59980a4b90
beginning of reimplementation of the REST interface
2014-09-09 15:46:58 +02:00
5641101705
added logger
2014-09-08 16:01:18 +02:00
87efbf764e
cleaning
2014-09-08 11:45:52 +02:00
9a7e45aa56
cleaning
2014-09-08 11:45:33 +02:00
9489cb8040
moved config reading to utilities.h
...
using GetOpt for CLI option reading
2014-09-08 11:44:58 +02:00
dc6045a14c
first factory-based version compiling, still very very preliminary
2014-09-05 16:54:32 +02:00
68dfe6f6a6
added old (workaround) EigerReceiver. Still not using slsReceiverBase
2014-08-05 11:08:11 +02:00
Maliakal Dhanya
3e36b603f9
receiver nth frame and acquisition indices for eiger
2014-07-31 12:13:15 +02:00
91c0a083b3
argv, argc moved from tcpip interface to slsReceiver
2014-07-25 10:28:56 +02:00
4f04fc5457
removed callbacks from tcpip interface
2014-07-18 12:57:10 +02:00
Maliakal Dhanya
b957cae85f
added receiver interface, have not separated from eigerDummyReceiver yet
2014-07-18 12:27:32 +02:00
Maliakal Dhanya
4814fd56c1
slsdetectorcalibration is a repository on its own
2014-07-16 15:34:58 +02:00
Maliakal Dhanya
bbb0a05fca
incorporating ten giga into the receiver
2014-07-11 12:53:53 +02:00
Maliakal Dhanya
8369153d60
eiger receiver, receiving many packets at a time, with 16,8, 4 bitmode sort of working
2014-07-02 10:51:13 +02:00
Maliakal Dhanya
5f82381b1e
eiger gui works and can read frames, other gui functionalities not implemented
2014-06-18 16:35:34 +02:00
Maliakal Dhanya
3a71049f1c
added multiple listenign threads to incorporate multiple eiger ports, refactored the code a little bit
2014-06-16 16:53:36 +02:00
Maliakal Dhanya
c922005f07
git version history
2014-06-03 13:56:16 +02:00
Maliakal Dhanya
21a3b68d81
git version history
2014-06-03 12:06:57 +02:00
Maliakal Dhanya
d133d7eb8f
some changes on the eiger receiver side
2014-05-28 18:06:00 +02:00
Maliakal Dhanya
90f5fb39db
started receiver start on a separate thread and returns, whereas stop receiver will end udp, tcp socket and exit thread
2014-05-23 18:28:42 +02:00
Maliakal Dhanya
567501c6f7
included the stop receiver function for the users
2014-05-23 14:50:11 +02:00
Maliakal Dhanya
af89269c0c
ignoring binaries
2014-05-21 10:41:33 +02:00
Maliakal Dhanya
8c72246ce7
new separate receiver
2014-05-21 09:59:37 +02:00
