detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-05-08 08:32:04 +02:00
Code Issues Actions Packages Releases Activity
5,810 Commits 40 Branches 103 Tags
959fd562d3c21f94de2007361671ad4b515fdebd
Commit Graph

5810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
maliakal_d a37bbc50fe updated server binaries 2018-05-02 17:48:46 +02:00
maliakal_d 5b01b4cbd8 Merge branch 'developer' into esrfchanges 2018-05-02 16:57:03 +02:00
maliakal_d d3a0319863 esrf changes: Listener, DataProcessor, DataStreamer, Fifo, ZmqSocket constructors return an exception when it fails 2018-05-02 16:49:27 +02:00
maliakal_d fdd19bc316 slsReceiver: udp socket buffer size, additional prints 2018-05-01 12:01:33 +02:00
maliakal_d 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
bergamaschi 9ae1289616 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2018-04-27 15:14:19 +02:00
bergamaschi 3baa677a2e minor changes by Anna 2018-04-27 15:14:09 +02:00
lopez_c 516336963e [CTB] - Modified memory map address shift for the interface between FPGA and Blackfin SOM. Shift has to be set to 1 since the basic AMC data transfers is 8-bit and not 16-bit. 2018-04-27 15:11:37 +02:00
maliakal_d 99281e2690 esrf changes: previous commit compile 2018-04-26 16:43:07 +02:00
maliakal_d 501d2478a5 Merge branch 'jungfraunew' into esrfchanges 2018-04-26 16:37:33 +02:00
maliakal_d 08b6eb78c5 gui: always mask out gain bit for jungfrau, even if missing packet 2018-04-26 16:32:03 +02:00
maliakal_d d096a5efeb jungfrau server: default storage cell start is 0xf 2018-04-26 16:30:27 +02:00
maliakal_d 9f24bb0a98 jungfrauserver: bug fix: settings read correctly, forceswitchg2 mainly 2018-04-26 15:49:09 +02:00
maliakal_d 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
maliakal_d 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
maliakal_d 1247f760f2 virtual hdf file mapping fix for fnum-1 images 2018-04-25 17:39:09 +02:00
maliakal_d 11475316fd eiger binary updated 2018-04-25 17:11:52 +02:00
maliakal_d a09c2e38a3 storage cell fix in gui for non jungfrau detectors 2018-04-25 17:03:25 +02:00
maliakal_d 1c49fbb090 virtual hdf file mapping fnum-1 images, fixed 2018-04-25 16:52:14 +02:00
maliakal_d 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
maliakal_d 62a88dadba Merge branch 'jungfraunew' of github.com:slsdetectorgroup/slsDetectorPackage into esrfchanges 2018-04-23 17:45:12 +02:00
maliakal_d 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
maliakal_d d09a1a0a95 esrf changes: users class added API functionality getNMods 2018-04-23 17:38:40 +02:00
maliakal_d 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
maliakal_d c9675d111a jungfrau server: fixed the settings for gain2 stages 2018-04-23 16:11:04 +02:00
maliakal_d 8f9c657fa0 esrf remove changes: VRS to interpolate, not copy 2018-04-23 14:41:01 +02:00
bergamaschi c35203ebfb fixed gitinfo 2018-04-23 14:19:55 +02:00
maliakal_d 1069bf5979 esrf changes: slsDetector: fix setThresholdEnergy and slsDetectorAnalysis file read: 
* slsDetector: Proper cleanup and return when no interpolation is possible
 * slsDetectorAnalysis: treat CAL DAC as irrelevant when interpolating settings for two energies(do not abort if different), also including VRS in copying
 2018-04-23 13:31:05 +02:00
maliakal_d cac913831c esrf change: CMake: add support for GCC versions older than 6.1 2018-04-23 12:07:13 +02:00
maliakal_d 03e781a0ac subperiod for eiger implemented in client side 2018-04-23 11:03:23 +02:00
maliakal_d a5a3d4bc78 added jungfrau server binary 2018-04-13 17:42:04 +02:00
maliakal_d bc70cc3a26 jungfrau server: added storage start, connected auto_comp_disable, changed adcphase, added ADC_PORT_INVERT_VAL, ADC_OFST_HALF_SPEED_VAL, minimum exposure time 2018-04-13 17:33:46 +02:00
maliakal_d e024774323 added storage cells 2018-04-13 15:05:43 +02:00
maliakal_d bdcccb7732 jungfrau server, changed api, fixed regdefs 2018-04-13 11:43:30 +02:00
maliakal_d 5ff2e86060 jungfrau server configuring ASIC timer at server startup 2018-04-13 11:07:22 +02:00
maliakal_d 70e193b0fd valgrind leak from tasks not deleting funcs 2018-04-13 09:35:18 +02:00
maliakal_d c3a9d3c342 fixed a valgrind error 2018-04-12 17:38:15 +02:00
maliakal_d d3c807975f adding a semaphore to handle end of acq 2018-04-12 15:50:27 +02:00
maliakal_d 1c5250ea7f warning 2018-04-11 17:55:42 +02:00
maliakal_d 7cb3b3f8de Merge branch 'developer' into zmqhandler 2018-04-09 18:21:59 +02:00
maliakal_d 7cd35f24b8 added to users class receiverfifodepth, flowcontrol10g, 10gbe 2018-04-09 18:21:43 +02:00
maliakal_d 28af3c2642 insignificant print 2018-04-09 17:44:55 +02:00
maliakal_d 2bd8e6c166 zmq fixed to have additional json headers using rx_zmqjsonheader 2018-04-09 16:33:14 +02:00
maliakal_d ccdc7d22e9 gappixels also work with new zmq handler 2018-04-09 11:19:31 +02:00
maliakal_d 3831896a78 Merge branch 'developer' into zmqhandler 2018-04-09 11:13:37 +02:00
maliakal_d 9847729f3c gap pixels included in gui 2018-04-09 11:13:20 +02:00
maliakal_d 0eff9e1401 debug print 2018-04-09 10:13:14 +02:00
maliakal_d 4323a837ef Merge branch 'developer' into zmqhandler 2018-04-09 09:19:46 +02:00
maliakal_d 649cb0aed9 added reset frames caught in to users class 2018-04-09 09:18:56 +02:00
maliakal_d 8cf6e0cbd6 in between 2018-04-06 17:48:10 +02:00