|
|
114c45c04a
|
making gui work temporarily for jctb
|
2017-11-22 09:27:42 +01:00 |
|
|
|
5d34358f44
|
changin zmqip in rxr should also restart streaming
|
2017-11-21 15:11:29 +01:00 |
|
|
|
a0ad1fb3a3
|
Merge branch '3.0.1' into developer
|
2017-11-21 14:15:59 +01:00 |
|
|
|
d00df32e49
|
changing zmq rxr port should restart data streaming
|
2017-11-21 13:39:49 +01:00 |
|
|
|
46aeee00f1
|
somewhere
|
2017-11-21 12:30:58 +01:00 |
|
|
|
97260510f2
|
gap pixels should be allowed to set to 0 for other detectors
|
2017-11-20 09:43:41 +01:00 |
|
|
|
662f502d4c
|
zmq always needs an ip in header
|
2017-11-17 17:40:57 +01:00 |
|
|
|
2e234f1bbd
|
Merge branch '3.0.1' into developer
|
2017-11-17 11:36:02 +01:00 |
|
|
|
a79864a5ae
|
bugfix enabledata streaming send int for update
|
2017-11-17 11:35:54 +01:00 |
|
|
|
1dee950870
|
merge conflict from 3.0.1
|
2017-11-17 11:35:15 +01:00 |
|
|
|
823d537825
|
fixed warnings
|
2017-11-17 09:26:20 +01:00 |
|
|
|
c69ae52e76
|
somewhere
|
2017-11-16 09:12:57 +01:00 |
|
|
|
32d32dbcdc
|
in between separating datastreaming in client and receiver
|
2017-11-15 16:16:59 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
75b94e6614
|
fixed file write enable bug from the last patch
|
2017-10-18 12:29:46 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
608f292e4f
|
moved statistics to listener
|
2017-08-18 16:50:19 +02:00 |
|
|
|
e93f53f459
|
changes for min fifo level
|
2017-08-18 15:59:18 +02:00 |
|
|
|
70c2165df4
|
check of fifo level before trying to push in successfully
|
2017-08-18 15:21:30 +02:00 |
|
|
|
2ab90ae2ed
|
Merge branch 'faststreamer' into 3.0-rc
|
2017-08-16 17:25:25 +02:00 |
|
|
|
e8217b0867
|
do not complain when setting timers
|
2017-08-16 16:26:57 +02:00 |
|
