6653cc9cb1
slsDetectorSoftware: jungfrau program fpga: mkstemp being used instead of creating file at source location
2018-05-03 11:22:02 +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
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
d09a1a0a95
esrf changes: users class added API functionality getNMods
2018-04-23 17:38:40 +02:00
c35203ebfb
fixed gitinfo
2018-04-23 14:19:55 +02:00
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
03e781a0ac
subperiod for eiger implemented in client side
2018-04-23 11:03:23 +02:00
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
e024774323
added storage cells
2018-04-13 15:05:43 +02:00
70e193b0fd
valgrind leak from tasks not deleting funcs
2018-04-13 09:35:18 +02:00
1c5250ea7f
warning
2018-04-11 17:55:42 +02:00
7cb3b3f8de
Merge branch 'developer' into zmqhandler
2018-04-09 18:21:59 +02:00
7cd35f24b8
added to users class receiverfifodepth, flowcontrol10g, 10gbe
2018-04-09 18:21:43 +02:00
2bd8e6c166
zmq fixed to have additional json headers using rx_zmqjsonheader
2018-04-09 16:33:14 +02:00
4323a837ef
Merge branch 'developer' into zmqhandler
2018-04-09 09:19:46 +02:00
649cb0aed9
added reset frames caught in to users class
2018-04-09 09:18:56 +02:00
8cf6e0cbd6
in between
2018-04-06 17:48:10 +02:00
61897cbd41
in between
2018-04-04 14:27:53 +02:00
9e8d3e598f
added enablegappixels to users class
2018-03-28 10:41:52 +02:00
fe2ba8621b
updating versioning to only have date
2018-03-27 11:00:15 +02:00
b8bdbf4da6
updaterev
2018-03-26 18:10:14 +02:00
5340b8ef24
added error mask for loading/writing config file to be caught by python
2018-03-26 18:07:10 +02:00
b029f1fa26
Common mode added, working for gotthard double modules
2018-03-26 09:07:27 +02:00
a1936cb884
updated docu
2018-03-21 09:10:11 +01:00
a36b715eab
resolved conflicts from merging 3.1.1 in here
2018-03-21 09:03:31 +01:00
688dd15fe9
Jungfrau bug fix: cannot give same adcphase value to pll, updated recommended default of adcphase for half speed and quarter speed, updated client manuals for both adcphase and clkdivider
2018-03-20 12:12:38 +01:00
40210ae26f
jungfrauserver adcphase fix: bug was if adcphase was same as previous value, it still shifted
2018-03-14 17:20:26 +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
258de4947a
updated doc
2018-03-12 15:46:20 +01:00
72970c9669
updated binaries, updated manuals, updated git versioning
2018-03-12 14:21:02 +01:00
Erik Frojdh
0d2dd93498
changed setBit and getBit to uint32_t
2018-03-08 17:13:13 +01:00
Erik Frojdh
339956e5de
changed from int to uint32_t in read and writeRegister
2018-03-08 16:08:31 +01:00
7649865a8f
jungfrau bug fix: adc phase corrected to correctly return value in -1
2018-03-08 14:02:02 +01:00
61e7c0148f
updating versions to 3.1.0
2018-02-27 12:40:53 +01:00
5849725b97
posisibility to overwrite rx_udpmac even with receiver
2018-02-26 18:22:07 +01:00
c3d6852f97
fixed threshold returning 1 if a trimbit file missing for eiger, it now returns -1, as both values are different
2018-02-23 14:49:18 +01:00
aa190fda7a
merge from 3.0.1: eiger server detip and mac client updated back
2018-02-07 15:24:44 +01:00
a6b917851c
finetuning printout
2018-02-07 15:22:19 +01:00
5198e67dbd
made the detector ip and detector mac update client in configuremac
2018-02-07 15:16:16 +01:00
897cbac27d
merge from 3.0.1 for server binaries (adcphase,server dates, temp control, settings file
2018-02-07 11:02:36 +01:00
ecf1e9fac1
bugfix: returning pointer to local variable, char* to string in function definition
2018-02-07 10:14:52 +01:00
618f6291cf
server binaries for all, jungfgrauserver with adcphase returning something, serverclient interface fixed for others not using tempcontrol, detectornumber not used for settings file for non eiger/mythen, server dates removing rev number
2018-02-07 09:23:52 +01:00
3da6a6df65
merge conflict removed, jungfrau server and eiger server re compiled
2018-02-05 12:33:05 +01:00
e6bd874a88
modified jungfrau server and client to make auto_comp_disable a not yet implemented feature as it requires a firmware upgrade
2018-02-05 11:50:22 +01:00
5d04067973
added auto comp disable feature
2018-02-02 18:01:01 +01:00
Andrä Marie
3782a56ef2
second My3 commit
2018-01-30 11:02:08 +01:00
