|
|
db2fef5d69
|
conflict resolved in merge from 3.0.1 to include file index in zmq streaming
|
2017-11-14 12:14:26 +01:00 |
|
|
|
0ae706d9a5
|
file index sent along with zmq stream
|
2017-11-14 12:13:06 +01:00 |
|
|
|
6fa4e4cef8
|
Merge branch '3.0.1' into gappixels
|
2017-11-10 16:37:28 +01:00 |
|
|
|
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 |
|
|
|
53caebe0f3
|
replaced gethostbyname with getaddrinfo as it is not thread safe
|
2017-11-10 16:30:48 +01:00 |
|
|
|
9255cdde8a
|
bug fixx for the 9m gethostbyname being not thread safe
|
2017-11-09 13:42:57 +01:00 |
|
|
|
7c344d4a39
|
recompile with -fPIC flag
|
2017-11-08 15:14:34 +01:00 |
|
|
|
589a5c7852
|
Merge branch '3.0.1' into gappixels
|
2017-11-02 10:55:05 +01:00 |
|
|
|
7157b2817d
|
update to zmq 4.0.8
among other fixes, this fixes the tmpnam warning
|
2017-11-02 10:49:24 +01:00 |
|
|
|
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 |
|
|
|
003239cddd
|
gap pixels for 4 bit mode restrictions, not completed
|
2017-10-24 14:16:08 +02:00 |
|
|
|
ce7386e230
|
merge solved from developer, xcoord from detector if given
|
2017-10-23 17:21:45 +02:00 |
|
|
|
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 |
|
|
|
210bcb081d
|
xcoord should not be hardcoded for this version for eiger and jungfrau
|
2017-10-20 10:49:02 +02:00 |
|
|
|
b6ae3300a9
|
merge conflict fixed with developer(patches for file write disable, xcoord)
|
2017-10-19 15:35:34 +02:00 |
|
|
|
801817b749
|
bug fix to the merge
|
2017-10-19 14:41:12 +02:00 |
|
|
|
1cddb9a542
|
merge from 3.0.1 with patches for file write disable
|
2017-10-18 17:53:55 +02:00 |
|
|
|
72b71cd680
|
merge from 3.0 hotfixes done
|
2017-10-18 17:39:19 +02:00 |
|
|
|
5388b54eff
|
updaterev
|
2017-10-18 15:52:08 +02:00 |
|
|
|
75b94e6614
|
fixed file write enable bug from the last patch
|
2017-10-18 12:29:46 +02:00 |
|
|
|
927e776353
|
Merge branch 'developer' into gappixels
|
2017-10-12 15:09:35 +02:00 |
|
|
|
4d92744dea
|
.project added to gitignore
|
2017-10-12 15:08:12 +02:00 |
|
|
|
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 |
|
|
|
2e5f64d9bc
|
gap pixels for 8, 16, 32 in receiver at udp level
|
2017-10-05 15:59:07 +02:00 |
|
|
|
e54767b69d
|
conflict resolution with developer
|
2017-10-03 15:12:56 +02:00 |
|
|
|
0b82aabd2b
|
merge with 3.0.1 conflicts resolved
|
2017-10-03 14:52:53 +02:00 |
|
|
|
4669d408d4
|
somewhere in between
|
2017-10-03 12:09:31 +02:00 |
|
|
|
7cde5dbe38
|
changes upto the receiver, not incl gui
|
2017-10-03 10:44:08 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
e0d82ad92d
|
only 3d positins in x y z coord, so receiver not overwriting them
|
2017-09-22 15:29:28 +02:00 |
|
|
|
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 |
|
|
|
c5ff578d10
|
Merge branch '3.0.1' into developer
|
2017-09-21 13:35:16 +02:00 |
|
|
|
11d58beec2
|
updaterev
|
2017-09-20 19:00:20 +02:00 |
|
|
|
e2832d2e1b
|
Merge branch '3.0.1' into developer
|
2017-09-19 17:19:37 +02:00 |
|
|
|
41db424837
|
got rid of usleep, changed to pause()
|
2017-09-19 16:32:15 +02:00 |
|
|
|
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 |
|
|
|
c37d3feae9
|
update revision
|
2017-09-01 13:59:18 +02:00 |
|
|
|
c086e9c19f
|
allow for slow joiner in zmq
|
2017-09-01 13:58:00 +02:00 |
|
|
|
84b0f9a91b
|
updaterev
|
2017-08-28 12:05:48 +02:00 |
|
|
|
05c5ad711b
|
solving the issue of deleting context by setting linger to 0 so that all open sockets are closed
|
2017-08-28 12:03:15 +02:00 |
|
|
|
2d52058a55
|
Printing thread Ids created and exited, others (if others) are zmqs internal threading, moved all zmq socket type to publish subscriber type: (non blocking in send if no client) as per Aldos gui and probably faster, as only clients to receiver standard impl is aldos gui/slsDetectorGui/xiaoqiangs call back via detector class
|
2017-08-24 16:06:00 +02:00 |
|
|
|
960dc5c62f
|
removing the print
|
2017-08-21 10:40:15 +02:00 |
|
|
|
03d9e1d182
|
check should be before and after the push or pull
|
2017-08-21 09:24:26 +02:00 |
|
|
|
f78a7b201b
|
updated master file to reflect all files(not just eiger)
|
2017-08-18 18:35:55 +02:00 |
|
|
|
cc5862533e
|
changes for the statistic moved to listener
|
2017-08-18 17:57:31 +02:00 |
|
|
|
d58dd1d035
|
reset fifo statistic at measurement startup
|
2017-08-18 17:24:56 +02:00 |
|
|
|
3b497eca36
|
reset fifo statistic at measurement startup
|
2017-08-18 17:23:52 +02:00 |
|
|
|
f4a11533be
|
removed prints
|
2017-08-18 17:02:09 +02:00 |
|
|
|
fe24c8fb86
|
changed check
|
2017-08-18 17:00:28 +02:00 |
|
