439 Commits

Author SHA1 Message Date
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
1dee950870 merge conflict from 3.0.1 2017-11-17 11:35:15 +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
b6ae3300a9 merge conflict fixed with developer(patches for file write disable, xcoord) 2017-10-19 15:35:34 +02:00
Dhanya Maliakal
801817b749 bug fix to the merge 2017-10-19 14:41:12 +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
75b94e6614 fixed file write enable bug from the last patch 2017-10-18 12:29:46 +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
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
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
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
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
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
5a45f15c7f fixed the frameindex bug (always 0) 2017-08-08 19:15:57 +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
0bacb903ea rest implementation, index issues 2017-07-13 14:44:03 +02:00
Dhanya Maliakal
39560969f4 can set zmqport from receiver, ensured proper destructors, and ctrl c should kill it 2017-07-13 12:17:49 +02:00
Dhanya Maliakal
460a44a9b1 made updatereceiver to actually update client in parameters that it can 2017-07-03 17:37:31 +02:00
Dhanya Maliakal
a4c07ba9a0 added black background for reciever to see gray font better 2017-06-30 12:19:27 +02:00
Dhanya Maliakal
3007694b77 bug (from eiger_newheader) with imagesize of fifo different from actual image size 2017-06-16 13:53:27 +02:00
Dhanya Maliakal
c012f2cda3 change for eiger 10g to work 2017-05-23 10:09:35 +02:00
Dhanya Maliakal
781fea0a96 fifo fill level included 2017-05-18 16:01:35 +02:00
Dhanya Maliakal
4aa73c607f print loss 2017-05-18 13:59:40 +02:00
Dhanya Maliakal
a276b6b7f5 fixed bug rx_hostname being hostname or ip in zmqsockt, and num packets correctly reflects num good frames 2017-05-18 10:53:29 +02:00
Dhanya Maliakal
cb008bb700 removed unnecessary functions in listener and dataprocessor and ensure processedin measurement is not same saas processed frames in acqustion 2017-05-17 15:37:51 +02:00
Dhanya Maliakal
001d6415bf removing thread prioritization for writer, streamer and tcp threads 2017-05-16 14:45:48 +02:00
Dhanya Maliakal
bd363b2c93 jungfrau finally works with new header 2017-05-15 17:02:37 +02:00
Dhanya Maliakal
205a3780d5 changes for jungfrau new header 2017-05-15 15:00:04 +02:00
Dhanya Maliakal
f53770a2fc some changes to remove possible warnings 2017-05-11 14:41:07 +02:00
Dhanya Maliakal
49b4ae2f56 changed zmq method, and resolved warnings and from esrf 2017-05-03 17:57:56 +02:00
Dhanya Maliakal
a11313fe96 removed copies 2017-03-24 15:15:30 +01:00
Dhanya Maliakal
86490226ed removing the return value usage in start acquisition callback, callbacks will be called if registered, and we will write files if file write enabled 2017-03-24 13:41:56 +01:00
Dhanya Maliakal
2bb8fa596a from the merge of 2.3 2017-03-24 12:22:49 +01:00
Dhanya Maliakal
404be013a2 changes to new callback arguments without filepointer 2017-03-23 14:08:43 +01:00
Dhanya Maliakal
6f34dddb5a changed the file header size t0 1kb and changed its description in the header 2017-03-23 13:41:37 +01:00
Dhanya Maliakal
b9eb3d5a52 somewere stuck with virtual template overloading 2017-03-23 11:56:17 +01:00
Dhanya Maliakal
575c9617c7 fixed gui for new header 2017-03-20 09:28:15 +01:00
Dhanya Maliakal
9f68fc6f3b fixed call backs with new standard header 2017-03-15 15:00:25 +01:00
Dhanya Maliakal
36e92c194d changes for callback to work 2017-03-14 08:23:47 +01:00
Dhanya Maliakal
53be854efd including subframe number 2017-03-13 11:33:06 +01:00
Dhanya Maliakal
1e94ec0c6a fixed short gotthard 2017-03-09 13:28:03 +01:00