 Dhanya Maliakal
|
8bba57e77d
|
fix to not have sls_receiver_defs in zmqSocket.h incldue
|
2017-11-28 16:32:15 +01:00 |
|
|
Dhanya Maliakal
|
8388d1f503
|
using file index from zmq
|
2017-11-28 14:45:48 +01:00 |
|
|
Dhanya Maliakal
|
a89847538d
|
merge ocnflict for white background
|
2017-11-28 11:29:15 +01:00 |
|
|
Dhanya Maliakal
|
a351fa8f28
|
switching from black to white background for receiver
|
2017-11-28 11:18:30 +01:00 |
|
|
Dhanya Maliakal
|
4466213882
|
makng the zmq work without external flag
|
2017-11-27 17:06:27 +01:00 |
|
|
Dhanya Maliakal
|
2c276db579
|
solved merge conflict in changes to use ZmqSocket.h externally
|
2017-11-23 16:35:31 +01:00 |
|
|
Dhanya Maliakal
|
b14ea217ee
|
Merge branch '3.0.1' into zmqchange
|
2017-11-23 16:34:14 +01:00 |
|
|
Dhanya Maliakal
|
da3ca9f306
|
changes to use ZmqSocket.h externally without further changes
|
2017-11-23 16:28:02 +01:00 |
|
|
Dhanya Maliakal
|
ad64df01c7
|
somewhere
|
2017-11-23 14:53:40 +01:00 |
|
|
Dhanya Maliakal
|
114c45c04a
|
making gui work temporarily for jctb
|
2017-11-22 09:27:42 +01:00 |
|
|
Dhanya Maliakal
|
3a26c95c0d
|
Merge branch '3.0.1' into developer
|
2017-11-21 15:46:21 +01:00 |
|
|
Dhanya Maliakal
|
8c45f94496
|
updated npixelsy for jungfrau effecting hdf5 mapping
|
2017-11-21 15:46:10 +01:00 |
|
|
Dhanya Maliakal
|
5d34358f44
|
changin zmqip in rxr should also restart streaming
|
2017-11-21 15:11:29 +01:00 |
|
|
Dhanya Maliakal
|
a0ad1fb3a3
|
Merge branch '3.0.1' into developer
|
2017-11-21 14:15:59 +01:00 |
|
|
Dhanya Maliakal
|
d00df32e49
|
changing zmq rxr port should restart data streaming
|
2017-11-21 13:39:49 +01:00 |
|
|
Dhanya Maliakal
|
662f502d4c
|
zmq always needs an ip in header
|
2017-11-17 17:40:57 +01:00 |
|
|
Dhanya Maliakal
|
1dee950870
|
merge conflict from 3.0.1
|
2017-11-17 11:35:15 +01:00 |
|
|
Dhanya Maliakal
|
823d537825
|
fixed warnings
|
2017-11-17 09:26:20 +01:00 |
|
|
Dhanya Maliakal
|
c69ae52e76
|
somewhere
|
2017-11-16 09:12:57 +01:00 |
|
|
Dhanya Maliakal
|
32d32dbcdc
|
in between separating datastreaming in client and receiver
|
2017-11-15 16:16:59 +01:00 |
|
|
Dhanya Maliakal
|
db2fef5d69
|
conflict resolved in merge from 3.0.1 to include file index in zmq streaming
|
2017-11-14 12:14:26 +01:00 |
|
|
Dhanya Maliakal
|
0ae706d9a5
|
file index sent along with zmq stream
|
2017-11-14 12:13:06 +01:00 |
|
|
Dhanya Maliakal
|
6fa4e4cef8
|
Merge branch '3.0.1' into gappixels
|
2017-11-10 16:37:28 +01:00 |
|
|
Dhanya Maliakal
|
e1c7176c00
|
Merge branch '3.0.1' of git.psi.ch:sls_detectors_software/sls_receiver_software into 3.0.1
|
2017-11-10 16:31:01 +01:00 |
|
|
Dhanya Maliakal
|
53caebe0f3
|
replaced gethostbyname with getaddrinfo as it is not thread safe
|
2017-11-10 16:30:48 +01:00 |
|
|
Dhanya Maliakal
|
9255cdde8a
|
bug fixx for the 9m gethostbyname being not thread safe
|
2017-11-09 13:42:57 +01:00 |
|
|
Xiaoqiang Wang
|
7c344d4a39
|
recompile with -fPIC flag
|
2017-11-08 15:14:34 +01:00 |
|
|
Dhanya Maliakal
|
589a5c7852
|
Merge branch '3.0.1' into gappixels
|
2017-11-02 10:55:05 +01:00 |
|
|
Xiaoqiang Wang
|
7157b2817d
|
update to zmq 4.0.8
among other fixes, this fixes the tmpnam warning
|
2017-11-02 10:49:24 +01:00 |
|
|
Dhanya Maliakal
|
3da8bca462
|
allowing receiver to know of gap pixels enable even in 4 bit mode, but not doing anything useful
|
2017-10-31 12:39:36 +01:00 |
|
|
Dhanya Maliakal
|
ce7386e230
|
merge solved from developer, xcoord from detector if given
|
2017-10-23 17:21:45 +02:00 |
|
|
Dhanya Maliakal
|
1f138abac1
|
fix in receiver as x, y and z are properly integrated with detector server for eiger and jungfrau, and handling previous versions of detector where x y and z were all 0 (hardcoding them in 1 d)
|
2017-10-23 12:21:41 +02:00 |
|
|
Dhanya Maliakal
|
210bcb081d
|
xcoord should not be hardcoded for this version for eiger and jungfrau
|
2017-10-20 10:49:02 +02:00 |
|
|
Dhanya Maliakal
|
b6ae3300a9
|
merge conflict fixed with developer(patches for file write disable, xcoord)
|
2017-10-19 15:35:34 +02:00 |
|
|
Dhanya Maliakal
|
1cddb9a542
|
merge from 3.0.1 with patches for file write disable
|
2017-10-18 17:53:55 +02:00 |
|
|
Dhanya Maliakal
|
72b71cd680
|
merge from 3.0 hotfixes done
|
2017-10-18 17:39:19 +02:00 |
|
|
Dhanya Maliakal
|
5388b54eff
|
updaterev
|
2017-10-18 15:52:08 +02:00 |
|
|
Dhanya Maliakal
|
75b94e6614
|
fixed file write enable bug from the last patch
|
2017-10-18 12:29:46 +02:00 |
|
 maliakal_d
|
d30a839eff
|
file writer class should be created only if file write enabled, x coord fixed to reflect hardcoded values as detector does not send this value yet
|
2017-10-10 16:54:50 +02:00 |
|
|
Dhanya Maliakal
|
2e5f64d9bc
|
gap pixels for 8, 16, 32 in receiver at udp level
|
2017-10-05 15:59:07 +02:00 |
|
|
Dhanya Maliakal
|
e54767b69d
|
conflict resolution with developer
|
2017-10-03 15:12:56 +02:00 |
|
|
Dhanya Maliakal
|
0b82aabd2b
|
merge with 3.0.1 conflicts resolved
|
2017-10-03 14:52:53 +02:00 |
|
|
Dhanya Maliakal
|
4669d408d4
|
somewhere in between
|
2017-10-03 12:09:31 +02:00 |
|
|
Dhanya Maliakal
|
7cde5dbe38
|
changes upto the receiver, not incl gui
|
2017-10-03 10:44:08 +02:00 |
|
|
Dhanya Maliakal
|
d0b379a2d5
|
double* changed to char* in gui data call back, effect in receiver is change in zmqsocket.h from int* to char*
|
2017-10-02 13:21:49 +02:00 |
|
|
Dhanya Maliakal
|
6a8aad4c2b
|
added silent mode in receiver during real time acquisition, doesnt print packet loss regularly or file name created each time
|
2017-09-27 10:11:31 +02:00 |
|
|
Dhanya Maliakal
|
e8bb186ff8
|
removed setframeindexenable from being set by client, redundant. removed read_frame from list of functions, obsolete.
|
2017-09-22 12:25:08 +02:00 |
|
|
Dhanya Maliakal
|
c5ff578d10
|
Merge branch '3.0.1' into developer
|
2017-09-21 13:35:16 +02:00 |
|
|
Dhanya Maliakal
|
11d58beec2
|
updaterev
|
2017-09-20 19:00:20 +02:00 |
|
|
Dhanya Maliakal
|
5ff574b33f
|
made default streamer to be the ip related to hostname, otherwise can be specified from the client, also made it compatible with chip test board detector now
|
2017-09-12 15:04:56 +02:00 |
|