|
|
1b55fdad86
|
merged selected patches from 4.0.0 branch
|
2018-08-24 13:10:16 +02:00 |
|
|
|
f0ac49190a
|
slsReceiver:trying to get deactivate to work
|
2018-08-14 15:06:06 +02:00 |
|
|
|
0018fa46f8
|
slsDetectorSoftware: Eiger server, added 3 commands, measuredperiod,measuredsubperiod, status trigger. measured period is in 10ns in det server, status trigger reads reg,sets bit and unsets bit
|
2018-08-10 19:14:05 +02:00 |
|
|
|
c934e92a41
|
Merge branch 'mainexceptions' into developer
|
2018-08-10 17:10:15 +02:00 |
|
|
|
da4253fe13
|
Exception handling from constructors for slsDetector and multiSlsDetector, zmqsockets deleted first in multi freeshm/constructor, removed unnecessary exceptions from exceptions list, replaced in slsDetector socket assign from NULL to 0
|
2018-08-10 17:07:29 +02:00 |
|
Erik Frojdh
|
3cab1bc0fe
|
minor cleaning of ZmqSocket
|
2018-08-10 14:34:59 +02:00 |
|
|
|
823c855ef4
|
Zmqsocket merge with Erik's (removing header message) and mine(socketdescriptor safe destruction in constructor exception)
|
2018-08-09 18:19:47 +02:00 |
|
|
|
a0512a01d5
|
Exceptions: zmq socket class descriptors made into its own class for auto destruction upon construction exception, similarly for other try blocks. slsDetector and multislsdetector left to do
|
2018-08-09 18:12:56 +02:00 |
|
Erik Frojdh
|
dd3f4aa81d
|
switched from zmq_msg_revc to zmq_recv
|
2018-08-09 17:40:04 +02:00 |
|
|
|
ab7e63c20f
|
Moved sls_detector_exceptions to sls_receiver_exceptions & its consequences
|
2018-08-08 15:43:29 +02:00 |
|
|
|
0dc1e10bd3
|
slsDetectorSoftware: order of zmq deletion in multi destructor to first because api using zmq to get data will need to be deleted first
|
2018-07-30 18:51:18 +02:00 |
|
|
|
134f13fc52
|
slsDetectorSoftware: back to original multi threading setTimer (removed parallelCallDetectorMember) due to change in function signature
|
2018-07-30 18:00:18 +02:00 |
|
|
|
41fb6c26a2
|
slsDetectorSoftware: from 3.1.4: being able to get timer values individually from the users class since gotthard 25um master and slave will have different delay values
|
2018-07-30 17:47:37 +02:00 |
|
|
|
40c96b5562
|
Updated Makefiles, Cmakelists.txt to compile slsMultiReceiver properly and with HDF5 and fixed compiler warnings
|
2018-07-18 12:29:19 +02:00 |
|
|
|
c2b1eef75c
|
slsDetectorSoftware: removed warnings, and made compilable via make
|
2018-07-10 14:58:18 +02:00 |
|
|
|
ecd0c810ca
|
slsDetectorSoftware: Sharedmemory removed private methodf or removeshm, removed static isexisting as the usecases are all member method
|
2018-07-06 15:18:34 +02:00 |
|
|
|
c366e94a96
|
bit field for missing packets, added commands r_padding and r_discardpolicy, hdf5 bitfield metadata left to do
|
2018-07-05 13:47:20 +02:00 |
|
|
|
d7cc9fc023
|
slsDetectorSoftware: moved offsets from multi shm to sls shm, and moved updated offsets and createthreadpool to end of addmultipledetectors, so that it is not done each time per detector
|
2018-06-29 12:21:15 +02:00 |
|
|
|
11de3dfde2
|
slsDetectorSoftware: trimen in multi does not check for each value in slsdet, fixed
|
2018-06-28 18:06:53 +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 |
|
|
|
55517e6d4c
|
sharedmem: done with multi .h, sls and command line left
|
2018-06-20 17:12:48 +02:00 |
|
|
|
2853f97fe7
|
sharedmem: done with multi, sls and command line left to do
|
2018-06-20 14:06:10 +02:00 |
|
|
|
fc0f8ef9da
|
more changes for multi for shared mem
|
2018-06-19 16:38:18 +02:00 |
|
|
|
99bf6446fe
|
shared mem in the middle of modifying multi
|
2018-06-18 17:51:30 +02:00 |
|
|
|
2eecf43fbb
|
multi sharedmemory, basic done, left to go thru whole file, and slsDetector left to do
|
2018-06-12 18:00:26 +02:00 |
|
|
|
b294b3e8b1
|
in progress with integratign new shm in multi
|
2018-06-12 12:14:55 +02:00 |
|
Erik Frojdh
|
378392c0f5
|
fixed return storage cell
|
2018-05-29 18:10:36 +02:00 |
|
Erik Frojdh
|
fcde40b854
|
minor
|
2018-05-29 17:26:27 +02:00 |
|
Erik Frojdh
|
ceed0eaa9b
|
generic call for hostname and sgetDetectorsType
|
2018-05-29 16:59:55 +02:00 |
|
Erik Frojdh
|
e3088d822f
|
removed commented section
|
2018-05-29 16:09:09 +02:00 |
|
Erik Frojdh
|
27ebd9c713
|
applying callDetectorMember in getTimerLeft
|
2018-05-29 16:08:08 +02:00 |
|
Erik Frojdh
|
6cf7bf2e06
|
using callDetectorMember for portType
|
2018-05-29 15:51:55 +02:00 |
|
Erik Frojdh
|
fc7ae98eee
|
using parallel call for checkCompatibility
|
2018-05-29 15:45:13 +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
|
32c1a45e11
|
minor
|
2018-05-28 18:46:08 +02:00 |
|
Erik Frojdh
|
da1b6ad62d
|
more generalization in multi
|
2018-05-28 17:12:19 +02:00 |
|
Erik Frojdh
|
49d6dcb6e2
|
templated functions in multi
|
2018-05-28 13:23:30 +02:00 |
|
Erik Frojdh
|
9d3fdaaadc
|
minor clean
|
2018-05-28 12:22:25 +02:00 |
|
Erik Frojdh
|
06f84585af
|
compareRetrun.. to minusOneIf..
|
2018-05-28 11:55:11 +02:00 |
|
Erik Frojdh
|
4765849613
|
minor
|
2018-05-25 17:09:23 +02:00 |
|
Erik Frojdh
|
05ed8dca4e
|
more cleanup
|
2018-05-25 17:02:01 +02:00 |
|
Erik Frojdh
|
4f600f3129
|
even more
|
2018-05-25 16:32:40 +02:00 |
|
Erik Frojdh
|
4b72d685f3
|
migrating more multiSlsDetector calls to the generic function
|
2018-05-25 15:39:28 +02:00 |
|
Erik Frojdh
|
bbd7e7906a
|
replacing pulsechip with a generic algorithm
|
2018-05-25 15:10:57 +02:00 |
|
