Dhanya Maliakal
6d8fcaa423
debugging output change
2015-02-13 11:58:36 +01:00
Dhanya Maliakal
1e55577fc2
no change
2015-02-10 16:54:39 +01:00
Dhanya Maliakal
c5f8067735
Merge branch 'dhanya_devel'
2015-02-10 16:44:57 +01:00
Dhanya Maliakal
bea1791b4d
initializing variables and copying ot gui only full frames
2015-02-10 12:21:31 +01:00
Dhanya Maliakal
e975a75be9
some code refraction to get rid of memeory leakage
2015-02-04 16:11:13 +01:00
Dhanya Maliakal
7fd12f97b4
some unnecessary printouts
2015-01-30 16:49:30 +01:00
Dhanya Maliakal
f30833a460
got rid of unnecessary printouts in receiver
2015-01-30 15:03:35 +01:00
Dhanya Maliakal
2b248eb793
unnecessary long wait in receiver
2015-01-30 10:58:30 +01:00
Maliakal Dhanya
76c9d2c61b
lot of couts and some pre and post
2015-01-14 10:48:36 +01:00
Maliakal Dhanya
169c0a43ce
updating version numbers
2014-12-08 10:25:42 +01:00
Maliakal Dhanya
f79f3cf021
makefile crash if files dont exist in make clean, fixed
2014-12-08 09:17:56 +01:00
Maliakal Dhanya
dc4e74087d
makefile crash if files dont exist in make clean, fixed
2014-12-08 09:16:19 +01:00
Maliakal Dhanya
52d3140a3a
a version of receiver for gemma with bottom
2014-12-02 10:12:00 +01:00
Maliakal Dhanya
6787c2e1e0
got rid of unnecessary usleep before transmitting in receiver
2014-12-01 17:18:26 +01:00
Maliakal Dhanya
bc79546e4e
changes for eiger to compensate for 16 bytes and return while at the same time works for first frame being less than expected :266240
2014-11-28 14:29:09 +01:00
Maliakal Dhanya
5b2a896ed3
to return if it catches only 16 bytes or less than expected, but compensates for first frame being only 266240 for eiger
2014-11-28 14:28:56 +01:00
1d5580b0d4
JMCB max frames
2014-11-25 11:54:54 +01:00
Maliakal Dhanya
4770d74c12
return even if eiger got only 16 bytes of a packet
2014-11-18 17:29:12 +01:00
2eaefaba3a
added log level control
2014-11-18 10:51:52 +01:00
a2fdcce711
fixed non-rest compilation
2014-11-17 17:06:50 +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
3324667d05
proper thread handling for the REST receiver
2014-11-12 11:54:48 +01:00
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
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
