c5262458d5
eiger and jungfrau server, updated virtual versions with start and stop acquisition
2018-05-23 15:28:39 +02:00
cb635d800a
eiger server: added overflow, noverflow to the flags to show/not show saturation when there is overflow in any of the single subframes in 32 bit mode
2018-05-22 18:43:13 +02:00
0ed82d4ef7
settingsdir for gotthard, jungfrau, propix, moench deleted, as these are default values in server
2018-05-22 15:13:26 +02:00
bdf9373e0d
gotthard and jungfrau servers do not need to send whole module for sending settings anymore
2018-05-22 14:52:53 +02:00
3f61206289
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2018-05-22 10:59:20 +02:00
e19a27bf62
eiger server: bug fix for saving trimbits to file, was copying from destination to source in server
2018-05-22 10:59:04 +02:00
Erik Frojdh
a1831c38ed
replace lostFocus with editingFinished for QT
2018-05-18 17:05:35 +02:00
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
563b1bb8b7
slsDetectorGui:added subexptime and subperiod to gui
2018-05-17 15:34:35 +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
23d73ae5ae
jungfrau server: programming allowed only in -update or -dev mode, -dev strictly for Carlos, in update mode one can only do programming
2018-05-11 13:42:46 +02:00
8986b008dd
jungfrau server: programfpga: handling bus error, and printing a message for user to restart servers when done in client command line
2018-05-09 15:57:18 +02:00
30f1e6ad3f
eiger and jungfrau server, updated binaries
2018-05-09 15:28:34 +02:00
02cc284422
added binaries
2018-05-09 15:27:28 +02:00
e6c0304af1
jungfrau server: programfpga: stop server also mapped during a reset, binaries added
2018-05-09 15:16:04 +02:00
16fe4d305e
Merge branch 'progfpga' into esrfchanges
2018-05-09 11:21:07 +02:00
68e9648854
created programming mode, where only programming is allowed, one has to restart servers afterwards
2018-05-09 11:20:54 +02:00
0417a7e97d
fixing warnings
2018-05-07 10:44:00 +02:00
6653cc9cb1
slsDetectorSoftware: jungfrau program fpga: mkstemp being used instead of creating file at source location
2018-05-03 11:22:02 +02:00
a37bbc50fe
updated server binaries
2018-05-02 17:48:46 +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
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
99281e2690
esrf changes: previous commit compile
2018-04-26 16:43:07 +02:00
501d2478a5
Merge branch 'jungfraunew' into esrfchanges
2018-04-26 16:37:33 +02:00
08b6eb78c5
gui: always mask out gain bit for jungfrau, even if missing packet
2018-04-26 16:32:03 +02:00
d096a5efeb
jungfrau server: default storage cell start is 0xf
2018-04-26 16:30:27 +02:00
9f24bb0a98
jungfrauserver: bug fix: settings read correctly, forceswitchg2 mainly
2018-04-26 15:49:09 +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
11475316fd
eiger binary updated
2018-04-25 17:11:52 +02:00
a09c2e38a3
storage cell fix in gui for non jungfrau detectors
2018-04-25 17:03:25 +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
62a88dadba
Merge branch 'jungfraunew' of github.com:slsdetectorgroup/slsDetectorPackage into esrfchanges
2018-04-23 17:45:12 +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
d09a1a0a95
esrf changes: users class added API functionality getNMods
2018-04-23 17:38:40 +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
c9675d111a
jungfrau server: fixed the settings for gain2 stages
2018-04-23 16:11:04 +02:00
8f9c657fa0
esrf remove changes: VRS to interpolate, not copy
2018-04-23 14:41:01 +02:00
c35203ebfb
fixed gitinfo
2018-04-23 14:19:55 +02:00
