detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 11:20:04 +02:00
Code Issues Actions Packages Releases Activity
3,799 Commits 43 Branches 100 Tags
Commit Graph

413 Commits

Author SHA1 Message Date
Dhanya Thattil
d3a0319863 esrf changes: Listener, DataProcessor, DataStreamer, Fifo, ZmqSocket constructors return an exception when it fails 2018-05-02 16:49:27 +02:00
Dhanya Thattil
1152555663 esrf changes: rx_udpsocksize sets/gets udp socket buffer size to be set, rx_realudpsocksize gets the real udp sock size buffer. At receiver config and at rx_udpsocksize command, dummy udp sockets created to know if set udp sock size fails (if fail, set to previous value), and also to get the real udp sock buffer size 2018-05-01 11:55:48 +02:00
Dhanya Thattil
99281e2690 esrf changes: previous commit compile 2018-04-26 16:43:07 +02:00
Dhanya Thattil
173d8f740e esrf changes: slsReceiver: better checking of socket buffer pars. and warn on failures 
* not done. The 'setsockopt(SO_RECVBUF)' system call cannot set the socket buffer
  size lager than the specified in net.core.rmem_max. The requested value
  was 2 GB (commit 3b0e2e6), which is far too large for this application,
  so it was restored to the acceptable 100 MB value.

* The syscall does not fail if the requested buffer size is larger than
  net.core.rmem_max. Use 'setsockopt(SO_RECVBUFFORCE)' to actually force a
  value larger than the system limit, which can be done if run in a
  privileged context (capability CAP_NET_ADMIN set).

* The real value is read with 'getsockopt(SO_RECVBUF)'. If it
  corresponds to twice the requested value (see 'man 7 socket'), it is
  printed in green, otherwise it is signalled in red.

* The 'setsockopt(SO_RECVBUFFORCE)' syscall removes the need to write to
  /proc/sys/net/core/rmem_max, so this was was suppressed in the
  'UDPStandardImplementation' constructor.

* The test on EIGER detectors before setting the system
  buffers was removed. Was there for 9m/2m eiger, but one can take care of
  memory requirements using a customizable max socket buffer size(only with
  permissions). to be implmented later.

* The file /proc/sys/net/core/netdev_max_backlog is first read by the
  receiver to check is the current value is OK. If it is not, the receiver
  directly writes the good value into the file (instead of delegating to
  the system shell), printing a red error message if there is an access
  error (non-privileged user).
 2018-04-26 15:22:44 +02:00
Dhanya Thattil
b5909044f6 slsReceiver: remove static members in Listener, DataProcessing and DataStreamer: 
* Needed when more than one receiver is created by process
* Replace NumberofXxxx by explicit index in constructor
* Remove Error[Mask], use return value in constructor signature
* Replace RunningMask by individual Running flags
* Remove obsolete Mutex objects
 2018-04-25 09:24:39 +02:00
Dhanya Thattil
d38108e527 esrf changes: slsReceiver: extend CircularFifo to support blocking/non-blocking transfers: 
* Add blocking push (for performance) and non-blocking pop (for symmetry), default to blocking operations
* Fix memory fault if Fifo allocation fails
* Fix fifoFree initialisation to fifoSize elements (was fifoSize - 1)
 2018-04-23 17:32:40 +02:00
Dhanya Thattil
2bd8e6c166 zmq fixed to have additional json headers using rx_zmqjsonheader 2018-04-09 16:33:14 +02:00
Dhanya Thattil
8cf6e0cbd6 in between 2018-04-06 17:48:10 +02:00
Dhanya Thattil
14546247e4 adding a receiver callback to be able to give modified size from the callback 2018-03-22 14:34:03 +01:00
Dhanya Maliakal
65a91c519e Merge branch '3.0.1' into developer 2017-12-14 14:29:16 +01:00
Dhanya Maliakal
0649626842 made the color fix for black/white backgrounds 2017-12-14 14:29:07 +01:00
Dhanya Maliakal
d6bdbf8524 Merge branch '3.0.1' into developer 2017-12-11 13:51:20 +01:00
Dhanya Maliakal
bb3e5351b4 solving warnings from latest linux 2017-12-11 13:51:11 +01:00
Dhanya Maliakal
9f152ce1f3 merge conflict resolved 2017-12-01 12:44:34 +01:00
Dhanya Maliakal
d1e3d50a87 cosmetic print outs 2017-12-01 12:43:14 +01:00
Dhanya Maliakal
a06f29f473 minor cosmetics 2017-12-01 11:23:17 +01:00
Dhanya Maliakal
6f3898441e merge conflict from 3.0.1 to restream stop from recieveR 2017-11-30 19:05:47 +01:00
Dhanya Maliakal
70bf6eb4cb restream stop from receiver 2017-11-30 18:39:08 +01:00
Dhanya Maliakal
a89847538d merge ocnflict for white background 2017-11-28 11:29:15 +01:00
Dhanya Maliakal
a351fa8f28 switching from black to white background for receiver 2017-11-28 11:18:30 +01:00
Dhanya Maliakal
4466213882 makng the zmq work without external flag 2017-11-27 17:06:27 +01:00
Dhanya Maliakal
ad64df01c7 somewhere 2017-11-23 14:53:40 +01:00
Dhanya Maliakal
114c45c04a making gui work temporarily for jctb 2017-11-22 09:27:42 +01:00
Dhanya Maliakal
5d34358f44 changin zmqip in rxr should also restart streaming 2017-11-21 15:11:29 +01:00
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