 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
|
e0d82ad92d
|
only 3d positins in x y z coord, so receiver not overwriting them
|
2017-09-22 15:29:28 +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
|
e2832d2e1b
|
Merge branch '3.0.1' into developer
|
2017-09-19 17:19:37 +02:00 |
|
|
Dhanya Maliakal
|
41db424837
|
got rid of usleep, changed to pause()
|
2017-09-19 16:32:15 +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 |
|
|
Dhanya Maliakal
|
c37d3feae9
|
update revision
|
2017-09-01 13:59:18 +02:00 |
|
|
Dhanya Maliakal
|
c086e9c19f
|
allow for slow joiner in zmq
|
2017-09-01 13:58:00 +02:00 |
|
|
Dhanya Maliakal
|
84b0f9a91b
|
updaterev
|
2017-08-28 12:05:48 +02:00 |
|
|
Dhanya Maliakal
|
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 |
|
|
Dhanya Maliakal
|
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 |
|
|
Dhanya Maliakal
|
960dc5c62f
|
removing the print
|
2017-08-21 10:40:15 +02:00 |
|
|
Dhanya Maliakal
|
03d9e1d182
|
check should be before and after the push or pull
|
2017-08-21 09:24:26 +02:00 |
|
|
Dhanya Maliakal
|
f78a7b201b
|
updated master file to reflect all files(not just eiger)
|
2017-08-18 18:35:55 +02:00 |
|
|
Dhanya Maliakal
|
cc5862533e
|
changes for the statistic moved to listener
|
2017-08-18 17:57:31 +02:00 |
|
|
Dhanya Maliakal
|
d58dd1d035
|
reset fifo statistic at measurement startup
|
2017-08-18 17:24:56 +02:00 |
|
|
Dhanya Maliakal
|
3b497eca36
|
reset fifo statistic at measurement startup
|
2017-08-18 17:23:52 +02:00 |
|
|
Dhanya Maliakal
|
f4a11533be
|
removed prints
|
2017-08-18 17:02:09 +02:00 |
|
|
Dhanya Maliakal
|
fe24c8fb86
|
changed check
|
2017-08-18 17:00:28 +02:00 |
|
|
Dhanya Maliakal
|
608f292e4f
|
moved statistics to listener
|
2017-08-18 16:50:19 +02:00 |
|
|
Dhanya Maliakal
|
e93f53f459
|
changes for min fifo level
|
2017-08-18 15:59:18 +02:00 |
|
|
Dhanya Maliakal
|
efad86335f
|
made fifo bound volatile
|
2017-08-18 15:29:15 +02:00 |
|
|
Dhanya Maliakal
|
70c2165df4
|
check of fifo level before trying to push in successfully
|
2017-08-18 15:21:30 +02:00 |
|
|
Dhanya Maliakal
|
5f90db723c
|
increased default fifo depth for gotthard
|
2017-08-16 17:27:31 +02:00 |
|
|
Dhanya Maliakal
|
2ab90ae2ed
|
Merge branch 'faststreamer' into 3.0-rc
|
2017-08-16 17:25:25 +02:00 |
|
|
Dhanya Maliakal
|
e8217b0867
|
do not complain when setting timers
|
2017-08-16 16:26:57 +02:00 |
|
|
Dhanya Maliakal
|
f8bb6a04a9
|
so that the first image shows
|
2017-08-15 14:10:43 +02:00 |
|
|
Dhanya Maliakal
|
1e7932f09c
|
switched back to 200ms
|
2017-08-15 14:00:34 +02:00 |
|
|
Dhanya Maliakal
|
77d688e508
|
changes done
|
2017-08-14 13:33:11 +02:00 |
|
|
Dhanya Maliakal
|
1ec3a69e29
|
print memory allocated properly
|
2017-08-14 10:49:08 +02:00 |
|
|
Dhanya Maliakal
|
c724756b5f
|
included subexptime in metadata for hdf5
|
2017-08-10 17:33:32 +02:00 |
|
|
Dhanya Maliakal
|
ad3e3ce255
|
sending and writing subexptime in the receiver files, adding 0x in front of all numbers printed in command line which is hexa
|
2017-08-10 17:25:28 +02:00 |
|
|
Dhanya Maliakal
|
11943c4b5c
|
merge insignificant conflicts
|
2017-08-10 11:19:36 +02:00 |
|
|
Dhanya Maliakal
|
0219d09067
|
sub frame number for eiger in master ascii file, instead of exposure length
|
2017-08-10 11:07:56 +02:00 |
|
 sala
|
df11f41416
|
reworked version
|
2017-08-10 10:04:00 +02:00 |
|
|
Dhanya Maliakal
|
97330b65ca
|
to handle frame number 0s from firmware
|
2017-08-09 18:47:55 +02:00 |
|
|
Dhanya Maliakal
|
eed951016b
|
frame number 0 from firmware in eiger is dealt with
|
2017-08-09 18:13:23 +02:00 |
|
|
Dhanya Maliakal
|
39847c5db6
|
esrf bug, shut down socket, but being processed and object deleted, fixed
|
2017-08-09 17:25:23 +02:00 |
|
|
Dhanya Maliakal
|
5a45f15c7f
|
fixed the frameindex bug (always 0)
|
2017-08-08 19:15:57 +02:00 |
|
|
Dhanya Maliakal
|
557d190236
|
changes for rest implementation
|
2017-08-08 14:51:32 +02:00 |
|
|
sala
|
c98c5e469b
|
added warning in makefile
|
2017-08-08 07:06:43 +02:00 |
|
|
sala
|
d827ccc115
|
backported changes implemented in 2.3.2.rest
|
2017-08-08 06:55:52 +02:00 |
|
|
Dhanya Maliakal
|
a40d18f8b2
|
last packet even if many padded packets in between should be written (from carryoverflag)
|
2017-08-07 19:58:48 +02:00 |
|