6653cc9cb1
slsDetectorSoftware: jungfrau program fpga: mkstemp being used instead of creating file at source location
2018-05-03 11:22:02 +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
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
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
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
fe2ba8621b
updating versioning to only have date
2018-03-27 11:00:15 +02:00
5340b8ef24
added error mask for loading/writing config file to be caught by python
2018-03-26 18:07:10 +02:00
b58c3e8951
solving merging conflicts from 3.1.0 to developer
2018-03-14 15:45:35 +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
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
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
5d04067973
added auto comp disable feature
2018-02-02 18:01:01 +01:00
Dhanya Maliakal
061abf7be0
jungfrau server: changes to ensure no update of detector during this, included power chip to read the status bit and give error if temp event is up
2018-01-11 16:52:08 +01:00
Dhanya Maliakal
2d6e4c95a2
temp_threshold, temp_control, temp_event done
2018-01-11 15:37:24 +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
1e849097ea
merge conflict fixed in filename bug
2017-12-08 12:09:10 +01:00
Dhanya Maliakal
e19d564364
bug fix no reciever could not set file name for mythen for eg., also bug fix that did not allow _s, _S, _p, _d as suffix to file name
2017-12-08 12:06:10 +01:00
Dhanya Maliakal
7577d03e75
Merge branch '3.0.1' into developer
2017-12-08 11:50:15 +01:00
Dhanya Maliakal
8c123982d2
get detector and receiver status only when necessary for stopacquisition
2017-12-08 11:50:10 +01:00
Dhanya Maliakal
6e876d79ee
conflict merged fix, lockin in stop and startandreadallnowait, r_restreamstop moved to stop
2017-12-08 11:45:29 +01:00
Dhanya Maliakal
40a7b3983a
put some locking in stop acquisition and startandreadallnowait (bugs threadpool with more evernts than normal due to main and processing thread with no locks for detector releated stuff, zmqthreadpool not required, r_restreamstop moved to status stop when idle
2017-12-08 11:40:07 +01:00
Dhanya Maliakal
24c305ec59
solved conflicts from merge of version being used to binary
2017-12-06 19:07:06 +01:00
Dhanya Maliakal
c4a242e10a
changed all variables from svn to git, included --version for receiver binary
2017-12-06 10:29:57 +01:00
Dhanya Maliakal
a51f4f1252
Merge branch '3.0.1' into developer
2017-12-05 14:49:32 +01:00
Dhanya Maliakal
7b1f935da2
allowing to read adcs/temp during acquire
2017-12-05 14:49:20 +01:00
Dhanya Maliakal
9150556209
merge from 3.0.1 added more to write config/paramters
2017-12-05 13:42:35 +01:00
Dhanya Maliakal
3b684c4662
Merge branch '3.0.1' into developer
2017-12-05 13:41:26 +01:00
Dhanya Maliakal
d00c837977
updated write config and write parameters list
2017-12-05 13:41:16 +01:00
Dhanya Maliakal
12348ac76c
merge conflict fix
2017-12-01 09:20:44 +01:00
Dhanya Maliakal
18422ce215
setbit and clear bit moved to slsdet, readreg, writereg,setbit,clearbit in multi cannot give -1, instead api gives error if checked
2017-12-01 09:18:42 +01:00
Dhanya Maliakal
5b88203bd9
merge conflict from 3.0.1 to restream stop from recieveR
2017-11-30 19:05:35 +01:00
Dhanya Maliakal
ca855e6d39
restream stop from receiver
2017-11-30 18:37:11 +01:00
Dhanya Maliakal
2227265357
removed external gui flag, acquiring flag is now not reset in stop acquisition, slsdet does not have acquiring flag anymore, busy accomodating acquiringflag, acquire cleanup, in acquire made lock for receiver more local, moved setacquiringflag false to bottom of acquire
2017-11-30 16:25:23 +01:00
Dhanya Maliakal
ca19993149
makng the zmq work without external flag
2017-11-27 17:06:18 +01:00
Dhanya Maliakal
c0a114345b
bug fix set error mask when setting wrong settings
2017-11-27 16:11:33 +01:00
Dhanya Maliakal
386ef7766c
zmq streaming should work with external gui now
2017-11-27 16:01:12 +01:00
