Dhanya Maliakal
|
6d0ee4e738
|
Merge branch 'master' into partial_frames
|
2015-08-05 12:08:44 +02:00 |
|
Dhanya Maliakal
|
a4a0ea508e
|
proper freeng after udpsocket shutdown
|
2015-08-05 12:08:28 +02:00 |
|
Dhanya Maliakal
|
902ab36705
|
almost done
|
2015-08-03 16:29:59 +02:00 |
|
Dhanya Maliakal
|
d49da66dae
|
almost done with changes
|
2015-07-30 10:42:10 +02:00 |
|
Dhanya Maliakal
|
e9a301dd97
|
merge master into partial_Frames, including changes of propix
|
2015-07-29 10:23:35 +02:00 |
|
Dhanya Maliakal
|
fa156f337e
|
sorta done without missing packet identifiers
|
2015-07-28 18:15:09 +02:00 |
|
Dhanya Maliakal
|
f970baf1b8
|
write and copy to gui left
|
2015-07-27 12:36:45 +02:00 |
|
Dhanya Maliakal
|
4e52096991
|
included propix receiver
|
2015-07-21 16:25:56 +02:00 |
|
Dhanya Maliakal
|
878c12d43e
|
still long way to go
|
2015-07-21 13:36:14 +02:00 |
|
Dhanya Maliakal
|
26a42d8f67
|
new way
|
2015-07-17 13:29:23 +02:00 |
|
Dhanya Maliakal
|
ca9f195f0b
|
starting of a new change
|
2015-07-16 13:33:34 +02:00 |
|
Dhanya Maliakal
|
476d1b452f
|
some changes
|
2015-07-10 16:04:29 +02:00 |
|
Dhanya Maliakal
|
fbfafb98fd
|
small change
|
2015-07-03 16:10:04 +02:00 |
|
Dhanya Maliakal
|
3600fb6304
|
git rev in
|
2015-06-29 16:57:16 +02:00 |
|
Dhanya Maliakal
|
237c5286ca
|
includes dynamic range in offline headers for eiger
|
2015-06-26 11:49:26 +02:00 |
|
|
|
b27f691d03
|
Revert "Solved merge conflicts"
This reverts commit c222221d18bd5db7d9a8c86071fe2fbdc0ce25ac.
|
2015-06-11 11:30:40 +02:00 |
|
|
|
28ed7d6b2d
|
Solved merge conflicts
|
2015-06-11 11:25:49 +02:00 |
|
Dhanya Maliakal
|
849d0de5cb
|
not much valuable change
|
2015-06-10 12:23:38 +02:00 |
|
Dhanya Maliakal
|
cb51de145b
|
Merge branch 'startlater'
|
2015-05-26 12:31:51 +02:00 |
|
Dhanya Maliakal
|
99196aa272
|
ignore 16 byte messages
|
2015-05-26 12:08:21 +02:00 |
|
Dhanya Maliakal
|
c840305189
|
starting receiver only at set detector type works
|
2015-05-21 17:39:17 +02:00 |
|
Dhanya Maliakal
|
49b0dce727
|
not significant
|
2015-05-13 10:30:39 +02:00 |
|
Dhanya Maliakal
|
11f6d883be
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software
|
2015-05-12 14:28:48 +02:00 |
|
Dhanya Maliakal
|
d9809925af
|
debugging statements
|
2015-05-12 14:28:13 +02:00 |
|
|
|
992a298abc
|
added dunny implementation as an example to combine TCPIP interface and custom UDP reciever
|
2015-04-21 15:09:50 +02:00 |
|
|
|
a513ff2c79
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software
|
2015-04-15 10:16:44 +02:00 |
|
Dhanya Maliakal
|
15bbb099d3
|
for mapping 32 bit eiger
|
2015-04-14 17:11:56 +02:00 |
|
Dhanya Maliakal
|
6cd28165ca
|
top image reconstruct works with make flga
|
2015-04-10 17:11:26 +02:00 |
|
Dhanya Maliakal
|
e35867227f
|
writing frame number to the file for eiger
|
2015-03-30 17:16:31 +02:00 |
|
|
|
248848c666
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software
|
2015-03-24 09:49:41 +01:00 |
|
|
|
1df89d4ce2
|
test
|
2015-03-23 11:41:19 +01:00 |
|
Dhanya Maliakal
|
89ad2112c6
|
difference between acquisition index and frame index
|
2015-03-12 12:25:23 +01:00 |
|
|
|
cd67991357
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software
|
2015-03-06 10:43:22 +01:00 |
|
|
|
c7aea8f2a6
|
Some changes for the JCTB software
|
2015-03-06 10:43:05 +01:00 |
|
Dhanya Maliakal
|
2f82469531
|
fifo debug with color done
|
2015-03-05 15:21:12 +01:00 |
|
Dhanya Maliakal
|
6d8fcaa423
|
debugging output change
|
2015-02-13 11:58:36 +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 |
|
Maliakal Dhanya
|
52d3140a3a
|
a version of receiver for gemma with bottom
|
2014-12-02 10:12:00 +01:00 |
|
|
|
1d5580b0d4
|
JMCB max frames
|
2014-11-25 11:54:54 +01:00 |
|
|
|
2eaefaba3a
|
added log level control
|
2014-11-18 10:51:52 +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 |
|
|
|
8a63e7e184
|
added log printouts. Added hardcoded REST configuration
|
2014-11-05 11:44:00 +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 |
|
