9f84bf7175
gui: crashing when using roi fixed
2018-09-20 18:10:10 +02:00
c784f0f539
client: moved shortenable to roi in reciever, roi not yet written in master file
2018-09-19 17:35:26 +02:00
830f92dedc
client and receiver: silent mode put into shared memory, works properly now
2018-08-15 19:51:04 +02:00
87e8333dfd
slsDetectorSoftware & eiger server: fixed coordinates in 2 d, but switch to row (x), col(y); numdetx and numdety sent to all receivers now, likely bug fix virtual file linked in master for 1 mod jungfrau; xccoord and y coord calculated at setdetector pos and given to listener
2018-08-15 19:02:16 +02:00
f0ac49190a
slsReceiver:trying to get deactivate to work
2018-08-14 15:06:06 +02:00
3b6ead7783
slsReceiver: HDF5: unlimited max dimension in x (#numImages), x dim gets incremented by #frames when it gets an extra image, removed virtual_ naming in parameter names, small cased parameter names
2018-07-18 14:05:31 +02:00
40c96b5562
Updated Makefiles, Cmakelists.txt to compile slsMultiReceiver properly and with HDF5 and fixed compiler warnings
2018-07-18 12:29:19 +02:00
c366e94a96
bit field for missing packets, added commands r_padding and r_discardpolicy, hdf5 bitfield metadata left to do
2018-07-05 13:47:20 +02:00
542dda8ece
slsReceiver: deactivated no longer writes 0xFFFF, creates empty files
2018-05-29 14:32:14 +02:00
cf8b0de433
slsReceiver, slsDetector, eiger and jungfrau server: client checks firmware and software an dreceiver compatibility for each time shared memory is cleaned up
2018-05-28 19:11:34 +02:00
94ce042401
slsReceiver, fixed virtual hdf5 last row random values bug
2018-05-18 14:51:18 +02:00
8b39443197
slsReciever, slsDetector: configurable number of images per file, removed all the receiver threads from using generalData->maxframesperfile, yet to do: infinite images, bug fix, virtual hdf5 has -1 for all pixels in last image
2018-05-18 13:47:10 +02:00
b4d9a6a09d
slsReceiver, slsDetector(eiger server), client: added sub period to receiver, fixed eiger subperiod updates to client, added subperiod and subexptime to users, fixed hdf5 warnings
2018-05-17 12:34:18 +02:00
0417a7e97d
fixing warnings
2018-05-07 10:44:00 +02:00
d3a0319863
esrf changes: Listener, DataProcessor, DataStreamer, Fifo, ZmqSocket constructors return an exception when it fails
2018-05-02 16:49:27 +02:00
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
99281e2690
esrf changes: previous commit compile
2018-04-26 16:43:07 +02:00
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
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
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
2bd8e6c166
zmq fixed to have additional json headers using rx_zmqjsonheader
2018-04-09 16:33:14 +02:00
8cf6e0cbd6
in between
2018-04-06 17:48:10 +02:00
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
