1047 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
70c2165df4 check of fifo level before trying to push in successfully 2017-08-18 15:21:30 +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
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
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
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
Dhanya Maliakal
0cd18a3b7a more comments 2017-08-07 10:39:29 +02:00
Dhanya Maliakal
5027f66d77 changed usleep 2017-07-28 12:20:54 +02:00
Dhanya Maliakal
f5773de068 changes for single images with index 0 not realized as caught and therefore no virtual file created, fixed 2017-07-28 12:16:07 +02:00
Dhanya Maliakal
88b6fabb0d bug did not give error when switching to hdf5 2017-07-28 11:54:22 +02:00
Dhanya Maliakal
5713cd6092 addin usleep to reduce cpu 2017-07-28 11:28:03 +02:00
Dhanya Maliakal
0fcf768772 basename for hdf5 fixes 2017-07-27 09:31:14 +02:00
Dhanya Maliakal
8a8e76e839 added usleep to remove the 100%cpu, removed a insignificant printout 2017-07-26 11:36:31 +02:00
Dhanya Maliakal
0bacb903ea rest implementation, index issues 2017-07-13 14:44:03 +02:00