c4b8c6385f
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2018-05-18 16:36:29 +02:00
f393751771
r_framesperfile configurable to have infinite frames in file with option 0
2018-05-18 16:35:50 +02:00
94ce042401
slsReceiver, fixed virtual hdf5 last row random values bug
2018-05-18 14:51:18 +02:00
Erik Frojdh
49b8024c43
added logger.h to publig headers
2018-05-18 14:15:17 +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
dcce66ee9f
slsReceiver: debug, insignificant
2018-05-17 15:57:16 +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
51fd9ed423
added subperiod in command line
2018-05-16 09:13:43 +02:00
0417a7e97d
fixing warnings
2018-05-07 10:44:00 +02:00
5b01b4cbd8
Merge branch 'developer' into esrfchanges
2018-05-02 16:57:03 +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
fdd19bc316
slsReceiver: udp socket buffer size, additional prints
2018-05-01 12:01:33 +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
16428f3828
esrf changes: CMake: support to be added and installed as a sub-project:
...
* Configure zmq as global imported library in slsReceiverSoftware
* Install zmq, necessary if linking to slsReceiver library
2018-04-25 18:24:08 +02:00
1247f760f2
virtual hdf file mapping fix for fnum-1 images
2018-04-25 17:39:09 +02:00
1c49fbb090
virtual hdf file mapping fnum-1 images, fixed
2018-04-25 16:52:14 +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
e0bb7d74f4
esrf changes: eiver: initialise global optind variable before calling getopt_long: Needed when multiple receivers are instantiated in the same process
2018-04-23 17:43:54 +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
c35203ebfb
fixed gitinfo
2018-04-23 14:19:55 +02:00
03e781a0ac
subperiod for eiger implemented in client side
2018-04-23 11:03:23 +02:00
e024774323
added storage cells
2018-04-13 15:05:43 +02:00
d3c807975f
adding a semaphore to handle end of acq
2018-04-12 15:50:27 +02:00
28af3c2642
insignificant print
2018-04-09 17:44:55 +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
61897cbd41
in between
2018-04-04 14:27:53 +02:00
fe2ba8621b
updating versioning to only have date
2018-03-27 11:00:15 +02:00
b029f1fa26
Common mode added, working for gotthard double modules
2018-03-26 09:07:27 +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
a74e8f68f7
size change in receiver call back API now streamed, gui allows smaller packet size than expected to be caught and replaced the rest with 0xFF
2018-03-21 17:08:38 +01:00
dd6301d66d
updated for compilation
2018-03-14 16:19:30 +01:00
b58c3e8951
solving merging conflicts from 3.1.0 to developer
2018-03-14 15:45:35 +01:00
72970c9669
updated binaries, updated manuals, updated git versioning
2018-03-12 14:21:02 +01:00
61e7c0148f
updating versions to 3.1.0
2018-02-27 12:40:53 +01:00
7859df6aa3
bug fix: 1000+ errors on gui startup(setreceiveronline not done), removed gui mesage popup for different output paths, fixed jungfrau to have multiple detectors in x dir in gui
2018-02-26 12:44:32 +01:00
895f8ccf81
Merge branch '3.0.1' into developer
2018-02-08 14:51:20 +01:00
Erik Frojdh
dde032acc8
reverting locations
2018-02-08 10:54:07 +01:00
Erik Frojdh
ee9996908a
test
2018-01-30 11:24:50 +01:00
Erik Frojdh
caf2548391
path
2018-01-30 11:15:31 +01:00
Erik Frojdh
8778fa0aca
all files in bin
2018-01-30 11:05:43 +01:00
Erik Frojdh
633284cbdd
hej
2018-01-29 17:28:54 +01:00
Erik Frojdh
a3293f4335
more headers
2018-01-29 17:27:32 +01:00
Erik Frojdh
2f59d58a50
receiver funcs
2018-01-29 16:33:35 +01:00
Erik Frojdh
ca059db4e9
path
2018-01-29 16:30:44 +01:00
Erik Frojdh
43a1d73522
ansi.h
2018-01-29 16:28:31 +01:00
Erik Frojdh
87d539a040
header
2018-01-29 16:18:12 +01:00
Erik Frojdh
2cc5557ec8
o
2018-01-24 10:05:45 +01:00
