3595c586d4
slsDetectorSoftware: slsDetectorUsers: added burst_trigger
2018-06-28 18:10:37 +02:00
11de3dfde2
slsDetectorSoftware: trimen in multi does not check for each value in slsdet, fixed
2018-06-28 18:06:53 +02:00
f6660c0dac
slsDetectorSoftware: updated shared memory to have _sls_ instead of _single_, and updated versions
2018-06-28 10:37:46 +02:00
3114512c3f
sharedmem: sls_detector_acquire multi and sls index scaning, error message when trying to acquire from a differet multi shm id, updateoffset and create threadpool after adding slsdetectors
2018-06-27 17:20:05 +02:00
95254619c6
sharedmem: config, sethostname call freesharedmemory and call setupmulti, freesharedmemoy(nonstatic) also cleans up member variables to make it consistent with shm, sharedmemory pointer set to 0 in non static free shared memory to be able to continue within application, sethostname frees memory only if detectors found in shm, add calls addmultipledetectors, replace replaces a detector in sls detector level, should also take lines in config file that has comments in between while ignoring the comments, sethostname in slsdetector also updates client, adding object in sls when creating new shm complains if shm existed and must delete again, removed remove commands
2018-06-27 15:38:03 +02:00
a0016cb005
sharedmem: working, need to add replace
2018-06-27 10:05:05 +02:00
0b140111b3
sharedmem: more modifications on command line to remove features such as id, remove, add
2018-06-26 12:10:50 +02:00
69c71e48f6
sharedmem: updated slsdetector, changes left
2018-06-25 18:19:19 +02:00
5e9871720b
sharedmem: slsdetector being modified intensively
2018-06-21 18:26:50 +02:00
fc0f8ef9da
more changes for multi for shared mem
2018-06-19 16:38:18 +02:00
b294b3e8b1
in progress with integratign new shm in multi
2018-06-12 12:14:55 +02:00
2339fb2a0e
slsDetectorSoftware: bug fix, changing dr didnt change the databytesinclgappixels immediately
2018-06-01 11:04:54 +02:00
15aaa93130
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2018-05-28 19:17:37 +02:00
cf8b0de433
slsReceiver, slsDetector, eiger and jungfrau server: client checks firmware and software an dreceiver compatibility for each time shared memory is cleaned up
2018-05-28 19:11:34 +02:00
Erik Frojdh
bbd7e7906a
replacing pulsechip with a generic algorithm
2018-05-25 15:10:57 +02:00
Erik Frojdh
f45e2b4ab9
changed type of getCalDir to std::string
2018-05-25 10:30:02 +02:00
Erik Frojdh
301600e720
chaning return type of getSettingsDir and setSettingsDir to std::string
2018-05-24 17:47:12 +02:00
ad3ac2cdee
Merge branch 'developer' into versioning
2018-05-24 16:56:39 +02:00
b10abd07ee
first draft of api versioning with client
2018-05-24 16:51:21 +02:00
Erik Frojdh
1dfdcfcb7e
finished removing using namespace std
2018-05-24 15:24:01 +02:00
Erik Frojdh
212218396a
removal of using namespace std from theadFiles
2018-05-24 14:47:45 +02:00
Erik Frojdh
b78b8425fd
ifstream and ofstream to std::
2018-05-24 14:27:01 +02:00
Erik Frojdh
12832a3a96
adding more std:: in slsDetectorActions.h
2018-05-24 14:24:10 +02:00
Erik Frojdh
621b7cfb2a
adding std:: where needed
2018-05-24 14:11:30 +02:00
Erik Frojdh
d71008bd10
removing using namespace std from headers in slsDetector
2018-05-24 12:18:25 +02:00
a154d0a088
slsDetectorUsers: added setthreshold without trimbits for eiger
2018-05-23 16:39:52 +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
bdf9373e0d
gotthard and jungfrau servers do not need to send whole module for sending settings anymore
2018-05-22 14:52:53 +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
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
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
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
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
