72bf64ff57
cleaning
2014-11-11 17:02:04 +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
eb0ca1c944
commented overloaded data members
2014-11-07 16:02:28 +01:00
3a07f0d785
fixed dr bug
2014-11-07 15:49:06 +01:00
9ec5541b58
removed hardcoded DR and nframes
2014-11-07 14:43:17 +01:00
8a63e7e184
added log printouts. Added hardcoded REST configuration
2014-11-05 11:44:00 +01:00
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
b24f374155
setting number of frames had a bug in eiger server, refactored code a bit
2014-10-20 17:33:22 +02:00
Maliakal Dhanya
5acb1419af
the version given to esrf
2014-10-16 14:14:34 +02:00
Maliakal Dhanya
b85490b528
the version given to esrf
2014-10-16 14:14:20 +02:00
Maliakal Dhanya
dd8f48929c
the version given to esrf
2014-10-16 14:14:00 +02:00
Maliakal Dhanya
5a5372350f
stop server incl in makefile, master chosen based on top or bottom module at the moment
2014-10-16 13:49:56 +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
327c2106df
Some fixes for the CTB
2014-10-14 17:43:25 +02:00
74ef04e726
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2014-10-14 17:03:50 +02:00
308b3aa9b1
Client and jungfrau server funcs added for pattern generator
2014-10-14 17:03:13 +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
0896fb137f
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2014-10-14 15:39:11 +02:00
Maliakal Dhanya
bbf26927dd
full module server works now, slave and master yet to be done
2014-10-14 15:38:45 +02:00
Maliakal Dhanya
347a36b7c1
module acquisition works, edit getrunstatus, added a small code for master incomplete, adjusted server to look for element in position 1 instead of zero
2014-10-06 11:01:51 +02:00
Maliakal Dhanya
1679977cad
some eiger setup file changes
2014-10-06 10:56:01 +02:00
2d66e1f731
Added pattern generator - must still implement client-server commands
2014-10-03 10:43:12 +02:00
18188cd095
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
2014-10-01 10:39:23 +02:00
fec9a30e6a
Added jungfrau detector server (not functional, though)
2014-10-01 10:38:47 +02:00
Maliakal Dhanya
665401669e
udpport2 module
2014-09-26 11:19:26 +02:00
Maliakal Dhanya
d8c7201749
module udpport2
2014-09-26 11:18:59 +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
fa6ab0b324
usleep added for 32 bit mode and debug statements for eiger server
2014-09-16 16:31:51 +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
4971e26d7b
modified Makefiles to support REST interface
2014-09-15 16:51:59 +02:00
7986746194
from private to protected
2014-09-15 16:33:57 +02:00
3d4b2e9fee
Merge branch 'eiger_receiver_temp' into eiger_receiver
...
Conflicts:
client/Makefile
2014-09-12 16:22:59 +02:00
13a54224eb
updating makefiles
2014-09-12 16:22:22 +02:00
03b04bca74
Merge branch 'eiger_receiver' of gitorious.psi.ch:sls_det_software/sls_detectors_package into eiger_receiver
...
Conflicts:
Makefile
2014-09-12 16:18:34 +02:00
388f96c046
Makefile updates
2014-09-12 16:16:10 +02:00
e0ee1fb386
fixed bug in config reading; added printout in MAkefile
2014-09-12 16:09:43 +02:00
056fb4e119
updating Makefile
2014-09-12 13:47:19 +02:00
81132f4d78
updating Makefile
2014-09-12 13:47:05 +02:00
102f9a2d05
updating Makefile
2014-09-12 13:46:48 +02:00
eb1f9db9af
added build dir
2014-09-12 13:25:01 +02:00
Maliakal Dhanya
baf65e8318
some clone changes and setting the gui image read frequency to be one for eiger in gui
2014-09-10 14:39:02 +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
