508 Commits

Author SHA1 Message Date
Xiaoqiang Wang
7c344d4a39 recompile with -fPIC flag 2017-11-08 15:14:34 +01:00
Dhanya Maliakal
589a5c7852 Merge branch '3.0.1' into gappixels 2017-11-02 10:55:05 +01:00
Xiaoqiang Wang
7157b2817d update to zmq 4.0.8
among other fixes, this fixes the tmpnam warning
2017-11-02 10:49:24 +01:00
Dhanya Maliakal
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
Dhanya Maliakal
ce7386e230 merge solved from developer, xcoord from detector if given 2017-10-23 17:21:45 +02:00
Dhanya Maliakal
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
Dhanya Maliakal
210bcb081d xcoord should not be hardcoded for this version for eiger and jungfrau 2017-10-20 10:49:02 +02: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
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
5388b54eff updaterev 2017-10-18 15:52:08 +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
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
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
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
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
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
5f90db723c increased default fifo depth for gotthard 2017-08-16 17:27:31 +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
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
df11f41416 reworked version 2017-08-10 10:04:00 +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
c0d6958e37 no changE 2017-08-04 15:40:21 +02:00
Dhanya Maliakal
429bf7f13d updaterev 2017-08-04 14:20:21 +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